diff --git a/hosts/desktop/hyprland/home.nix b/hosts/desktop/hyprland/home.nix index 00475bb..f5dc7cb 100644 --- a/hosts/desktop/hyprland/home.nix +++ b/hosts/desktop/hyprland/home.nix @@ -19,7 +19,7 @@ let iconThemeVariant = ""; # "" "purple" "pink" "red" "orange" "yellow" "green" "teal" "grey" iconThemeScheme = "nord"; # "" "nord" "dracula" "gruvbox" "everforest" "catppuccin" iconTheme = "Colloid-Dark"; - iconThemePkg = pkgs.colloid-icon-theme.override { + iconThemePkg = pkgs.colloid-icon-theme.override { schemeVariants = [ iconThemeScheme ]; colorVariants = [ "default" ]; }; @@ -159,11 +159,12 @@ in name = cursorTheme; size = cursorSize; }; - + dconf = { enable = true; settings = { "org/gnome/desktop/interface".cursor-theme = cursorTheme; + "org/gnome/desktop/interface".icon-theme = "Colloid-Nord-Dark"; }; }; @@ -181,7 +182,7 @@ in }; iconTheme = { - name = iconTheme; + name = "Colloid-Nord-Dark"; package = iconThemePkg; }; diff --git a/hosts/nas/networking.nix b/hosts/nas/networking.nix index 91439d9..b7292e3 100644 --- a/hosts/nas/networking.nix +++ b/hosts/nas/networking.nix @@ -2,7 +2,6 @@ let hostname = "jallen-nas"; ipAddress = "10.0.1.18"; - ipAddress2 = "10.0.1.19"; gateway = "10.0.1.1"; allowedPorts = [ 2342 diff --git a/hosts/nas/services.nix b/hosts/nas/services.nix index f0c75bf..7d20a6b 100644 --- a/hosts/nas/services.nix +++ b/hosts/nas/services.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: let enableDisplayManager = false; in @@ -9,7 +9,7 @@ in minecraft-server = { enable = true; eula = true; - declarative = true; + declarative = true; openFirewall = true; dataDir = "/media/nas/ssd/ssd_app_data/minecraft"; serverProperties = { @@ -28,7 +28,7 @@ in }; adguardhome = { - enable = false; + enable = true; allowDHCP = true; port = 1880; openFirewall = true; @@ -133,10 +133,15 @@ in }; tailscale = { - enable = false; + enable = true; openFirewall = true; useRoutingFeatures = "client"; extraUpFlags = [ "--advertise-exit-node" ]; + extraSetFlags = [ + "--advertise-exit-node" + "--hostname=jallen-nas" + "--webclient" + ]; authKeyFile = "/media/nas/ssd/nix-app-data/tailscale/auth"; }; diff --git a/share/impermanence/default.nix b/share/impermanence/default.nix index 4ff1508..6fd8162 100644 --- a/share/impermanence/default.nix +++ b/share/impermanence/default.nix @@ -28,4 +28,10 @@ "/etc/machine-id" ]; }; + + security.sudo.extraConfig = '' + # rollback results in sudo lectures after each reboot + Defaults lecture = never + ''; + }