refactor: modularize programs and services

hosts/nixos/modules/programs.nix

@@ -1,20 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  programs.zsh.enable = true;
-  programs.hyprland = {
-    enable = true;
-    withUWSM = true;
-    xwayland.enable = true;
-  };
-  programs.thunar = {
-    enable = true;
-    plugins = with pkgs.xfce; [
-      thunar-volman
-    ];
-  };
-  programs.xfconf.enable = true;
-  programs.ssh.startAgent = true;
-  programs.ydotool.enable = true;
-  programs.steam.enable = true;
-}

hosts/nixos/modules/programs/default.nix

@@ -0,0 +1,13 @@
+{ config, pkgs, ... }:
+
+{
+  imports = [
+    ./zsh.nix
+    ./hyprland.nix
+    ./thunar.nix
+    ./xfconf.nix
+    ./ssh.nix
+    ./ydotool.nix
+    ./steam.nix
+  ];
+}

hosts/nixos/modules/programs/hyprland.nix

@@ -0,0 +1,9 @@
+{ config, pkgs, ... }:
+
+{
+  programs.hyprland = {
+    enable = true;
+    withUWSM = true;
+    xwayland.enable = true;
+  };
+}

hosts/nixos/modules/programs/ssh.nix

@@ -0,0 +1,5 @@
+{ config, pkgs, ... }:
+
+{
+  programs.ssh.startAgent = true;
+}

hosts/nixos/modules/programs/steam.nix

@@ -0,0 +1,5 @@
+{ config, pkgs, ... }:
+
+{
+  programs.steam.enable = true;
+}

hosts/nixos/modules/programs/thunar.nix

@@ -0,0 +1,12 @@
+{ config, pkgs, ... }:
+
+{
+  programs.thunar = {
+    enable = true;
+    plugins = with pkgs.xfce; [
+      thunar-volman
+    ];
+  };
+  services.gvfs.enable = true; # Mount, trash, and other functionalities
+  services.tumbler.enable = true; # Thumbnail support for images 
+}

hosts/nixos/modules/programs/xfconf.nix

@@ -0,0 +1,5 @@
+{ config, pkgs, ... }:
+
+{
+  programs.xfconf.enable = true;
+}

hosts/nixos/modules/programs/ydotool.nix

@@ -0,0 +1,5 @@
+{ config, pkgs, ... }:
+
+{
+  programs.ydotool.enable = true;
+}

hosts/nixos/modules/programs/zsh.nix

@@ -0,0 +1,5 @@
+{ config, pkgs, ... }:
+
+{
+  programs.zsh.enable = true;
+}

hosts/nixos/modules/services.nix

@@ -1,47 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  services.xserver = {
-    xkb.layout = "us";
-    videoDrivers = [ "nvidia" ];
-  };
-
-  services.gvfs.enable = true; # Mount, trash, and other functionalities
-  services.tumbler.enable = true; # Thumbnail support for images 
-
-  services.greetd = {
-    enable = true;
-    settings = {
-      default_session = {
-        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --remember --remember-session";
-       user = "greeter";
-      }; 
-    };
-  };
-  services.tailscale = {
-    enable = true;
-    authKeyFile = config.sops.secrets."tailscale/authkey".path;
-  };
-  services.flatpak = {
-    enable = true;
-    packages = [
-      "org.prismlauncher.PrismLauncher"
-      "org.vinegarhq.Sober"
-      "org.vinegarhq.Vinegar"
-      "com.spotify.Client"
-    ];
-    overrides = {
-      "org.prismlauncher.PrismLauncher".Context = {
-        filesystems = [
-          "home"
-        ];
-      };
-      "org.vinegarhq.Sober".Context = {
-        filesystems = [
-          "xdg-run/app/com.discordapp.Discord:create"
-          "xdg-run/discord-ipc-0"
-        ];
-      };
-    };
-  };
-}

hosts/nixos/modules/services/default.nix

@@ -0,0 +1,10 @@
+{ config, pkgs, ... }:
+
+{
+  imports = [
+    ./xserver.nix
+    ./greetd.nix
+    ./tailscale.nix
+    ./flatpak.nix
+  ];
+}

hosts/nixos/modules/services/flatpak.nix

@@ -0,0 +1,26 @@
+{ config, pkgs, ... }:
+
+{
+  services.flatpak = {
+    enable = true;
+    packages = [
+      "org.prismlauncher.PrismLauncher"
+      "org.vinegarhq.Sober"
+      "org.vinegarhq.Vinegar"
+      "com.spotify.Client"
+    ];
+    overrides = {
+      "org.prismlauncher.PrismLauncher".Context = {
+        filesystems = [
+          "home"
+        ];
+      };
+      "org.vinegarhq.Sober".Context = {
+        filesystems = [
+          "xdg-run/app/com.discordapp.Discord:create"
+          "xdg-run/discord-ipc-0"
+        ];
+      };
+    };
+  };
+}

hosts/nixos/modules/services/greetd.nix

@@ -0,0 +1,13 @@
+{ config, pkgs, ... }:
+
+{
+  services.greetd = {
+    enable = true;
+    settings = {
+      default_session = {
+        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --remember --remember-session";
+       user = "greeter";
+      }; 
+    };
+  };
+}

hosts/nixos/modules/services/tailscale.nix

@@ -0,0 +1,10 @@
+{ config, pkgs, ... }:
+
+{
+  sops.secrets."tailscale/authkey" = { };
+
+  services.tailscale = {
+    enable = true;
+    authKeyFile = config.sops.secrets."tailscale/authkey".path;
+  };
+}

hosts/nixos/modules/services/xserver.nix

@@ -0,0 +1,8 @@
+{ config, pkgs, ... }:
+
+{
+  services.xserver = {
+    xkb.layout = "us";
+    videoDrivers = [ "nvidia" ];
+  };
+}

hosts/nixos/modules/sops.nix

@@ -5,6 +5,4 @@
   sops.defaultSopsFormat = "yaml";
 
   sops.age.keyFile = "/home/toast/.config/sops/age/keys.txt";
-
-  sops.secrets."tailscale/authkey" = { };
 }