Further modularize configuration by extracting desktop and security modules

Co-authored-by: jeremystucki <7629727+jeremystucki@users.noreply.github.com>

Author: Copilot

common/1password.nix

@@ -0,0 +1,30 @@
+{
+  config,
+  pkgs,
+  pkgs-unstable,
+  hostConfiguration,
+  ...
+}: {
+  programs._1password = {
+    enable = true;
+    package = pkgs-unstable._1password-cli;
+  };
+
+  programs._1password-gui = {
+    enable = true;
+    package = pkgs-unstable._1password-gui;
+    polkitPolicyOwners = [hostConfiguration.username];
+  };
+
+  programs.ssh.extraConfig = ''
+    Host *
+        IdentityAgent ${config.users.users.${hostConfiguration.username}.home}/.1password/agent.sock
+  '';
+
+  systemd.user.services._1password = {
+    script = "${pkgs._1password-gui}/bin/1password --silent";
+    after = ["graphical-session.target"];
+    partOf = ["graphical-session.target"];
+    wantedBy = ["graphical-session.target"];
+  };
+}

common/desktop-gnome.nix

@@ -0,0 +1,30 @@
+{...}: {
+  services.xserver = {
+    enable = true;
+
+    xkb = {
+      layout = "us";
+      variant = "";
+    };
+
+    displayManager.gdm.enable = true;
+    desktopManager.gnome.enable = true;
+  };
+
+  services.pulseaudio.enable = false;
+  security.rtkit.enable = true;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+  };
+
+  # Enable OpenGL
+  hardware.graphics = {
+    enable = true;
+    enable32Bit = true;
+  };
+
+  environment.sessionVariables.NIXOS_OZONE_WL = "1";
+}

common/nixos.nix

@@ -44,22 +44,6 @@
     };
   };
 
-  services.xserver = {
-    enable = true;
-
-    xkb = {
-      layout = "us";
-      variant = "";
-    };
-
-    displayManager = {
-      gdm.enable = true;
-    };
-    desktopManager = {
-      gnome.enable = true;
-    };
-  };
-
   services.openssh.enable = true;
   services.printing.enable = true;
   services.tailscale.enable = true;
@@ -71,21 +55,6 @@
     "hmac-sha2-512"
   ];
 
-  services.pulseaudio.enable = false;
-  security.rtkit.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-    # If you want to use JACK applications, uncomment this
-    #jack.enable = true;
-
-    # use the example session manager (no others are packaged yet so this is enabled by default,
-    # no need to redefine it in your config for now)
-    #media-session.enable = true;
-  };
-
   services.ratbagd.enable = true;
 
   virtualisation.docker.enable = true;
@@ -95,69 +64,25 @@
     defaultNetwork.settings.dns_enabled = true;
   };
 
-  # Some programs need SUID wrappers, can be configured further or are
-  # started in user sessions.
-  # programs.mtr.enable = true;
-  # programs.gnupg.agent = {
-  #   enable = true;
-  #   enableSSHSupport = true;
-  # };
-
   hardware.i2c.enable = true;
 
-  # Enable OpenGL
-  hardware.graphics = {
-    enable = true;
-    enable32Bit = true;
-  };
-
   fonts.packages = with pkgs; [
     pkgs.nerd-fonts.jetbrains-mono
     input-fonts
   ];
 
   programs.steam.enable = true;
-
-  programs._1password = {
-    enable = true;
-    package = pkgs-unstable._1password-cli;
-  };
-
-  programs._1password-gui = {
-    enable = true;
-    package = pkgs-unstable._1password-gui;
-
-    # Certain features, including CLI integration and system authentication support,
-    # require enabling PolKit integration on some desktop environments (e.g. Plasma).
-    polkitPolicyOwners = [hostConfiguration.username];
-  };
-
   programs.adb.enable = true;
 
-  programs.ssh.extraConfig = ''
-    Host *
-        IdentityAgent ${config.users.users.${hostConfiguration.username}.home}/.1password/agent.sock
-  '';
-
-  systemd.user.services._1password = {
-    script = "${pkgs._1password-gui}/bin/1password --silent";
-    after = ["graphical-session.target"];
-    partOf = ["graphical-session.target"];
-    wantedBy = ["graphical-session.target"];
-  };
-
   systemd.user.services.tmux = {
     script = "${pkgs.tmux}/bin/tmux new-session -d";
     wantedBy = ["default.target"];
     serviceConfig.Type = "forking";
   };
 
-  environment.sessionVariables = {
-    NIXOS_OZONE_WL = "1";
-    TZDIR = "/etc/zoneinfo";
-  };
-
   virtualisation.virtualbox.host.enable = true;
   users.extraGroups.vboxusers.members = [hostConfiguration.username];
   boot.kernelModules = ["vboxnetflt" "vboxnetadp"];
+
+  environment.sessionVariables.TZDIR = "/etc/zoneinfo";
 }

flake.nix

@@ -64,6 +64,8 @@
             modules = [
               {nixpkgs.pkgs = pkgs;}
               ./common/nixos.nix
+              ./common/desktop-gnome.nix
+              ./common/1password.nix
               ./common/nix-settings.nix
               nixosModule
               inputs.color-scheme-sync.nixosModules.default