nixos: profiles: simplify

nixos/profiles/common/core/default.nix

@@ -32,6 +32,7 @@
   boot.initrd.systemd.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
   boot.loader.systemd-boot.enable = lib.mkDefault true; # mkDefault for Lanzaboote
+  boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_zen; # mkDefault for server
 
   ### Default Programs
   environment.defaultPackages = [];

nixos/profiles/common/graphical/default.nix

@@ -1,7 +1,32 @@
-{...}: {
+{pkgs, ...}: {
-  imports = [
+  # plymouth
-    ./gnome-keyring.nix
+  boot.plymouth.enable = true;
-    ./display-server.nix
+
-    ./polkit.nix
+  # xserver
-  ];
+  services.xserver = {
+    enable = true;
+    excludePackages = with pkgs; [xterm];
+    displayManager.startx.enable = true;
+  };
+
+  # gnome keyring
+  services.gnome.gnome-keyring.enable = true;
+  programs.seahorse.enable = true;
+
+  # polkit
+  security.polkit.enable = true;
+  environment.systemPackages = with pkgs; [polkit_gnome];
+  systemd.user.services.polkit-gnome-authentication-agent-1 = {
+    description = "polkit-gnome-authentication-agent-1";
+    wantedBy = ["graphical-session.target"];
+    wants = ["graphical-session.target"];
+    after = ["graphical-session.target"];
+    serviceConfig = {
+      Type = "simple";
+      ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
+      Restart = "on-failure";
+      RestartSec = 1;
+      TimeoutStopSec = 10;
+    };
+  };
 }

nixos/profiles/common/graphical/display-server.nix

@@ -1,15 +0,0 @@
-{pkgs, ...}: {
-  services.xserver = {
-    enable = true;
-    excludePackages = with pkgs; [xterm];
-    displayManager = {
-      startx.enable = true;
-    };
-    desktopManager = {
-      #plasma5.enable = true;
-    };
-    windowManager = {
-      #bspwm.enable = true;
-    };
-  };
-}

nixos/profiles/common/graphical/gnome-keyring.nix

@@ -1,5 +0,0 @@
-_: {
-  # gnome keyring
-  services.gnome.gnome-keyring.enable = true;
-  programs.seahorse.enable = true;
-}

nixos/profiles/common/graphical/polkit.nix

@@ -1,21 +0,0 @@
-{pkgs, ...}: {
-  security.polkit.enable = true;
-  environment.systemPackages = with pkgs; [polkit_gnome];
-
-  # polkit_gnome autostart for wms
-  systemd = {
-    user.services.polkit-gnome-authentication-agent-1 = {
-      description = "polkit-gnome-authentication-agent-1";
-      wantedBy = ["graphical-session.target"];
-      wants = ["graphical-session.target"];
-      after = ["graphical-session.target"];
-      serviceConfig = {
-        Type = "simple";
-        ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
-        Restart = "on-failure";
-        RestartSec = 1;
-        TimeoutStopSec = 10;
-      };
-    };
-  };
-}

nixos/profiles/common/physical/default.nix

@@ -0,0 +1,6 @@
+_: {
+  networking.stevenblack.enable = true;
+  services.system76-scheduler.enable = true;
+  services.power-profiles-daemon.enable = true;
+  services.thermald.enable = true;
+}

nixos/profiles/desktop/default.nix

@@ -1,14 +1,7 @@
-{pkgs, ...}: {
+{...}: {
   imports = [
     ../common/core
     ../common/graphical
+    ../common/physical
   ];
-
-  boot.kernelPackages = pkgs.linuxPackages_zen;
-  boot.plymouth.enable = true;
-  networking.stevenblack.enable = true;
-  services.system76-scheduler.enable = true;
-  services.power-profiles-daemon.enable = true;
-  services.thermald.enable = true;
-  #services.printing.enable = true;
 }

nixos/profiles/laptop/default.nix

@@ -1,5 +1,7 @@
 {...}: {
   imports = [
-    ../desktop
+    ../common/core
+    ../common/graphical
+    ../common/physical
   ];
 }

nixos/profiles/server/default.nix

@@ -1,7 +1,9 @@
-{...}:
+{pkgs, ...}:
 # no i dont actually own a server
 {
   imports = [
     ../common/minimal
   ];
+
+  boot.kernelPackages = pkgs.linuxPackages; # mkDefault for server
 }