Move from features to option based configuration

hosts/alpheratz/home.nix

@@ -5,7 +5,9 @@
 }:
 {
 
-    imports = [];
+    imports = [
+    ../../modules/home
+    ];
 
     home = {
         username = "eesim";
@@ -17,42 +19,7 @@
     home.file.".config/waybar".source = ./dotfiles/waybar;
     home.file.".config/fish/config.fish".source = ./dotfiles/fish/config.fish;
 
-    programs.git = {
-        enable = true;
-        userName = "Ethan Simmons";
-        userEmail  = "eesimmons9105@gmail.com";
-        extraConfig = {
-            core.sshCommand = "'ssh -i /home/eesim/.ssh/id_ed25519'";
-        };
-    };
-
-    programs.direnv = {
-        enable = true;
-        enableBashIntegration = true;
-        nix-direnv.enable = true;
-    };
-
     programs.home-manager.enable = true;
 
-    gtk = {
-        enable = true;
-        cursorTheme = {
-            name = "phinger-cursors-dark";
-            package = pkgs.phinger-cursors;
-        };
-        theme = {
-            name = "adw-gtk3-dark";
-            package = pkgs.adw-gtk3;
-        };
-    };
-
-    qt = {
-        style = {
-            name = "adwaita-dark";
-            package = pkgs.adwaita-qt;
-        };
-    };
-
-
     home.stateVersion = "23.11";
 }

hosts/alpheratz/system.nix

@@ -36,13 +36,6 @@
         "/nix".options = [ "compress=zstd" "noatime" ];
     };
 
-    networking.hostName = "alpheratz";
-    networking.networkmanager.enable = true;
-    networking.nameservers = [ "192.168.0.100" ];
-
-    networking.firewall = {
-        allowedUDPPorts = [ 51820 ];
-    };
     networking.wg-quick.interfaces = {
         wg0 = {
             address = [ "10.6.0.5" ];
@@ -55,7 +48,7 @@
                     publicKey = "pEWHugUnnhWXkJzCIhXryRRZMoCAuvAITDeP4ItenQk=";
                     presharedKeyFile = "/root/wireguard-keys/wg0/preshared";
                     allowedIPs = [ "10.2.0.0/24" "192.168.0.0/24" ];
-                    endpoint = "jellyfin.simmer505.com:51820";
+                    endpoint = "simmer505.com:51820";
                     persistentKeepalive = 25;
                 }
             ];

hosts/ankaa/dotfiles/sway/config

@@ -280,7 +280,7 @@ exec --no-startup-id ydotoold
 exec --no-startup-id easyeffects --gapplication-service
 exec --no-startup-id wayland-pipewire-idle-inhibit
 exec --no-startup-id /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
-exec --no-startup-id protonmail-bridge
+exec --no-startup-id protonmail-bridge --noninteractive
 exec --no-startup-id swayidle -w \
                         timeout 600 'swaymsg "output * dpms off"' \
                         resume 'swaymsg "output * dpms on"'

hosts/ankaa/home.nix

@@ -3,9 +3,12 @@
     pkgs,
     ...
 }:
+
 {
 
-    imports = [];
+    imports = [
+        ../../modules/home
+    ];
 
     home = {
         username = "eesim";
@@ -22,39 +25,7 @@
     # Fix for slow steam download speeds https://old.reddit.com/r/linux_gaming/comments/16e1l4h/slow_steam_downloads_try_this/
     home.file.".steam/steam/steam_dev.cfg".source = ./dotfiles/steam/steam_dev.cfg;
 
-    programs.git = {
-        enable = true;
-        userName = "Ethan Simmons";
-        userEmail  = "eesimmons9105@gmail.com";
-    };
-
-    programs.direnv = {
-        enable = true;
-        enableBashIntegration = true;
-        nix-direnv.enable = true;
-    };
-
     programs.home-manager.enable = true;
 
-    gtk = {
-        enable = true;
-        iconTheme = {
-            name = "awaida-dark";
-            package = pkgs.gnome.adwaita-icon-theme;
-        };
-        theme = {
-            name = "adw-gtk3-dark";
-            package = pkgs.adw-gtk3;
-        };
-    };
-
-    qt = {
-        style = {
-            name = "adwaita-dark";
-            package = pkgs.adwaita-qt;
-        };
-    };
-
-
     home.stateVersion = "23.11";
 }

hosts/ankaa/system.nix

@@ -33,10 +33,6 @@
         "/nix".options = [ "compress=zstd" "noatime" ];
     };
 
-    networking.hostName = "ankaa";
-    networking.networkmanager.enable = true;
-    networking.nameservers = [ "192.168.0.100" ];
-
     # Set your time zone.
     time.timeZone = "America/Chicago";