some more housecleaning and changing swap on cnixpad

2024-09-06 21:21:00 +02:00
parent 865c8c4ba9
commit 5d5b6fe8c8
29 changed files with 285 additions and 198 deletions
--- a/hosts/cnix/modules.nix
+++ b/hosts/cnix/modules.nix
@@ -65,63 +65,83 @@
      };
    };
    sysd = {
-      blueman = {
-        enable = true;
+      network = {
+        blueman = {
+          enable = true;
+        };
+        mullvad = {
+          enable = true;
+        };
+        samba = {
+          enable = false;
+        };
+        ssh = {
+          enable = true;
+        };
      };
-      dbus = {
-        enable = true;
-      };
-      fwupd = {
-        enable = true;
-      };
-      gnome-keyring = {
-        enable = true;
-      };
-      greetd = {
-        enable = true;
-      };
-      gvfs = {
-        enable = true;
-      };
-      locate = {
-        enable = true;
-      };
-      mullvad = {
-        enable = true;
-      };
-      pipewire = {
-        enable = true;
-      };
-      powerd = {
-        enable = true;
-      };
-      samba = {
-        enable = false;
-      };
-      ssh = {
-        enable = true;
-      };
-      udisks = {
-        enable = true;
-      };
-      pcscd = {
-        enable = true;
-      };
-      xserver = {
-        amd = {
-          hhkbse = {
+      security = {
+        agenix = {
+          enable = true;
+          cnix = {
            enable = true;
          };
        };
+        gnome-keyring = {
+          enable = true;
+        };
+      };
+      session = {
+        dbus = {
+          enable = true;
+        };
+        dconf = {
+          enable = true;
+        };
+        xserver = {
+          amd = {
+            hhkbse = {
+              enable = true;
+            };
+          };
+          nvidia = {
+            enable = false;
+          };
+        };
+      };
+      system = {
+        fwupd = {
+          enable = true;
+        };
+        greetd = {
+          enable = true;
+        };
+        gvfs = {
+          enable = true;
+        };
+        locate = {
+          enable = true;
+        };
+        nix-ld = {
+          enable = false;
+        };
+        pcscd = {
+          enable = true;
+        };
+        pipewire = {
+          enable = true;
+        };
+        powerd = {
+          enable = true;
+        };
+        udisks = {
+          enable = true;
+        };
+        zram = {
+          enable = true;
+        };
      };
    };
    utils = {
-      agenix = {
-        enable = true;
-        cnix = {
-          enable = true;
-        };
-      };
      android = {
        enable = true;
      };
@@ -134,9 +154,6 @@
      microfetch = {
        enable = true;
      };
-      nix-ld = {
-        enable = false;
-      };
      misc = {
        enable = true;
      };
--- a/hosts/cnixpad/default.nix
+++ b/hosts/cnixpad/default.nix
@@ -45,6 +45,13 @@ in {
    ];
  };

+  swapDevices = [
+    {
+      device = "var/lib/swapfile";
+      size = 32 * 1024;
+    }
+  ];
+
  # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
  system.stateVersion = lib.mkDefault "23.11";
 }
--- a/hosts/cnixpad/hardware-configuration.nix
+++ b/hosts/cnixpad/hardware-configuration.nix
@@ -38,8 +38,6 @@
    options = ["fmask=0022" "dmask=0022"];
  };

-  swapDevices = [];
-
  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
  # (the default) this is the recommended approach. When using systemd-networkd it's
  # still possible to use this option, but it's recommended to use it in conjunction
--- a/hosts/cnixpad/modules.nix
+++ b/hosts/cnixpad/modules.nix
@@ -65,49 +65,63 @@
      };
    };
    sysd = {
-      blueman = {
-        enable = true;
-      };
-      dbus = {
-        enable = true;
-      };
-      fwupd = {
-        enable = true;
-      };
-      gnome-keyring = {
-        enable = true;
-      };
-      greetd = {
-        enable = true;
-      };
-      gvfs = {
-        enable = true;
-      };
-      locate = {
-        enable = true;
-      };
-      mullvad = {
-        enable = true;
-      };
-      pipewire = {
-        enable = true;
-      };
-      powerd = {
-        enable = true;
-      };
-      samba = {
-        enable = false;
-      };
-      ssh = {
-        enable = true;
-      };
-      udisks = {
-        enable = true;
-      };
-      xserver = {
-        amd = {
+      network = {
+        blueman = {
          enable = true;
        };
+        mullvad = {
+          enable = true;
+        };
+        samba = {
+          enable = false;
+        };
+        ssh = {
+          enable = true;
+        };
+      };
+      security = {
+        gnome-keyring = {
+          enable = true;
+        };
+      };
+      session = {
+        dbus = {
+          enable = true;
+        };
+        dconf = {
+          enable = true;
+        };
+        xserver = {
+          amd = {
+            enable = true;
+          };
+        };
+      };
+      system = {
+        fwupd = {
+          enable = true;
+        };
+        greetd = {
+          enable = true;
+        };
+        gvfs = {
+          enable = true;
+        };
+        locate = {
+          enable = true;
+        };
+        pipewire = {
+          enable = true;
+        };
+        powerd = {
+          enable = true;
+        };
+        udisks = {
+          enable = true;
+        };
+        zram = {
+          enable = false;
+        };
      };
    };
    utils = {
--- a/hosts/toothpc/modules.nix
+++ b/hosts/toothpc/modules.nix
@@ -66,58 +66,75 @@
      };
    };
    sysd = {
-      blueman = {
-        enable = false;
+      network = {
+        blueman = {
+          enable = false;
+        };
+        mullvad = {
+          enable = true;
+        };
+        samba = {
+          enable = false;
+        };
+        ssh = {
+          enable = true;
+        };
      };
-      dbus = {
-        enable = true;
+      security = {
+        agenix = {
+          enable = true;
+          toothpc = {
+            enable = true;
+          };
+        };
+        gnome-keyring = {
+          enable = true;
+        };
      };
-      fwupd = {
-        enable = true;
+      session = {
+        dbus = {
+          enable = true;
+        };
+        dconf = {
+          enable = true;
+        };
+        xserver = {
+          nvidia = {
+            enable = true;
+          };
+        };
      };
-      gnome-keyring = {
-        enable = true;
-      };
-      greetd = {
-        enable = true;
-      };
-      gvfs = {
-        enable = true;
-      };
-      locate = {
-        enable = true;
-      };
-      mullvad = {
-        enable = true;
-      };
-      pipewire = {
-        enable = true;
-      };
-      powerd = {
-        enable = true;
-      };
-      samba = {
-        enable = false;
-      };
-      ssh = {
-        enable = true;
-      };
-      udisks = {
-        enable = true;
-      };
-      xserver = {
-        nvidia = {
+      system = {
+        fwupd = {
+          enable = true;
+        };
+        greetd = {
+          enable = true;
+        };
+        gvfs = {
+          enable = true;
+        };
+        locate = {
+          enable = true;
+        };
+        nix-ld = {
+          enable = false;
+        };
+        pipewire = {
+          enable = true;
+        };
+        powerd = {
+          enable = true;
+        };
+        udisks = {
+          enable = true;
+        };
+        zram = {
          enable = true;
        };
      };
    };
    utils = {
-      agenix = {
-        enable = true;
-        toothpc = {
-          enable = true;
-        };
-      };
      android = {
        enable = false;
      };
@@ -139,6 +156,9 @@
      npm = {
        enable = true;
      };
+      yubikey = {
+        enable = false;
+      };
    };
  };
 }
--- a/system/etc/default.nix
+++ b/system/etc/default.nix
@@ -6,7 +6,6 @@
    ./fonts
    ./security
    ./xdg
-    ./zram
    ./zsh
  ];
 }
--- a/system/modules/default.nix
+++ b/system/modules/default.nix
@@ -14,30 +14,32 @@
    "${systemModules}/studio/blender"
    "${systemModules}/studio/gimp"
    "${systemModules}/studio/inkscape"
-    "${systemModules}/sysd/blueman"
-    "${systemModules}/sysd/dbus"
-    "${systemModules}/sysd/fwupd"
-    "${systemModules}/sysd/gnome-keyring"
-    "${systemModules}/sysd/greetd"
-    "${systemModules}/sysd/gvfs"
-    "${systemModules}/sysd/locate"
-    "${systemModules}/sysd/mullvad"
-    "${systemModules}/sysd/pipewire"
-    "${systemModules}/sysd/powerd"
-    "${systemModules}/sysd/samba"
-    "${systemModules}/sysd/ssh"
-    "${systemModules}/sysd/pcscd"
-    "${systemModules}/sysd/udisks"
-    "${systemModules}/sysd/xserver/amd"
-    "${systemModules}/sysd/xserver/amd/hhkbse"
-    "${systemModules}/sysd/xserver/nvidia"
-    "${systemModules}/utils/agenix"
+    "${systemModules}/sysd/network/blueman"
+    "${systemModules}/sysd/network/mullvad"
+    "${systemModules}/sysd/network/samba"
+    "${systemModules}/sysd/network/ssh"
+    "${systemModules}/sysd/security/agenix"
+    "${systemModules}/sysd/security/gnome-keyring"
+    "${systemModules}/sysd/session/dbus"
+    "${systemModules}/sysd/session/dconf"
+    "${systemModules}/sysd/session/xserver/amd"
+    "${systemModules}/sysd/session/xserver/amd/hhkbse"
+    "${systemModules}/sysd/session/xserver/nvidia"
+    "${systemModules}/sysd/system/fwupd"
+    "${systemModules}/sysd/system/greetd"
+    "${systemModules}/sysd/system/gvfs"
+    "${systemModules}/sysd/system/locate"
+    "${systemModules}/sysd/system/nix-ld"
+    "${systemModules}/sysd/system/pcscd"
+    "${systemModules}/sysd/system/pipewire"
+    "${systemModules}/sysd/system/powerd"
+    "${systemModules}/sysd/system/udisks"
+    "${systemModules}/sysd/system/zram"
    "${systemModules}/utils/android"
    "${systemModules}/utils/anyrun"
    "${systemModules}/utils/corectrl"
    "${systemModules}/utils/microfetch"
    "${systemModules}/utils/misc"
-    "${systemModules}/utils/nix-ld"
    "${systemModules}/utils/npm"
    "${systemModules}/utils/yubikey"
  ];
--- a/system/modules/sysd/network/blueman/default.nix
+++ b/system/modules/sysd/network/blueman/default.nix
@@ -4,10 +4,10 @@
  ...
 }: let
  inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.sysd.blueman;
+  cfg = config.modules.sysd.network.blueman;
 in {
  options = {
-    modules.sysd.blueman.enable = mkEnableOption "Enables blueman";
+    modules.sysd.network.blueman.enable = mkEnableOption "Enables blueman";
  };
  config = mkIf cfg.enable {
    services.blueman.enable = true;
--- a/system/modules/sysd/network/mullvad/default.nix
+++ b/system/modules/sysd/network/mullvad/default.nix
@@ -5,10 +5,10 @@
  ...
 }: let
  inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.sysd.mullvad;
+  cfg = config.modules.sysd.network.mullvad;
 in {
  options = {
-    modules.sysd.mullvad.enable = mkEnableOption "Enables mullvad";
+    modules.sysd.network.mullvad.enable = mkEnableOption "Enables mullvad";
  };
  config = mkIf cfg.enable {
    services.mullvad-vpn = {
--- a/system/modules/sysd/network/samba/default.nix
+++ b/system/modules/sysd/network/samba/default.nix
@@ -5,10 +5,10 @@
  ...
 }: let
  inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.sysd.samba;
+  cfg = config.modules.sysd.network.samba;
 in {
  options = {
-    modules.sysd.samba.enable = mkEnableOption "Enables samba";
+    modules.sysd.network.samba.enable = mkEnableOption "Enables samba";
  };
  config = mkIf cfg.enable {
    services = {
--- a/system/modules/sysd/network/ssh/default.nix
+++ b/system/modules/sysd/network/ssh/default.nix
@@ -4,10 +4,10 @@
  ...
 }: let
  inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.sysd.ssh;
+  cfg = config.modules.sysd.network.ssh;
 in {
  options = {
-    modules.sysd.ssh.enable = mkEnableOption "Enables ssh";
+    modules.sysd.network.ssh.enable = mkEnableOption "Enables ssh";
  };
  config = mkIf cfg.enable {
    services.openssh = {
--- a/system/modules/sysd/security/agenix/default.nix
+++ b/system/modules/sysd/security/agenix/default.nix
@@ -7,10 +7,10 @@
  ...
 }: let
  inherit (lib) mkIf mkEnableOption mkOption mkMerge;
-  cfg = config.modules.utils.agenix;
+  cfg = config.modules.sysd.security.agenix;
 in {
  options = {
-    modules.utils.agenix = {
+    modules.sysd.security.agenix = {
      enable = mkEnableOption "Enables agenix system environment";
      cnix.enable = mkOption {
        type = lib.types.bool;
--- a/system/modules/sysd/security/gnome-keyring/default.nix
+++ b/system/modules/sysd/security/gnome-keyring/default.nix
@@ -4,10 +4,10 @@
  ...
 }: let
  inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.sysd.gnome-keyring;
+  cfg = config.modules.sysd.security.gnome-keyring;
 in {
  options = {
-    modules.sysd.gnome-keyring.enable = mkEnableOption "Enables gnome-keyring";
+    modules.sysd.security.gnome-keyring.enable = mkEnableOption "Enables gnome-keyring";
  };
  config = mkIf cfg.enable {
    services.gnome.gnome-keyring.enable = true;
--- a/system/modules/sysd/session/dbus/default.nix
+++ b/system/modules/sysd/session/dbus/default.nix
@@ -5,10 +5,10 @@
  ...
 }: let
  inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.sysd.dbus;
+  cfg = config.modules.sysd.session.dbus;
 in {
  options = {
-    modules.sysd.dbus.enable = mkEnableOption "Enables dbus";
+    modules.sysd.session.dbus.enable = mkEnableOption "Enables dbus";
  };
  config = mkIf cfg.enable {
    services.dbus = {
--- a/system/modules/sysd/session/dconf/default.nix
+++ b/system/modules/sysd/session/dconf/default.nix
@@ -0,0 +1,15 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  cfg = config.modules.sysd.session.dconf;
+in {
+  options = {
+    modules.sysd.session.dconf.enable = mkEnableOption "Enables dconf";
+  };
+  config = mkIf cfg.enable {
+    programs.dconf.enable = true;
+  };
+}
--- a/system/modules/sysd/session/xserver/amd/default.nix
+++ b/system/modules/sysd/session/xserver/amd/default.nix
@@ -4,10 +4,10 @@
  ...
 }: let
  inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.sysd.xserver.amd;
+  cfg = config.modules.sysd.session.xserver.amd;
 in {
  options = {
-    modules.sysd.xserver.amd.enable = mkEnableOption "Enables xserver with amdgpu";
+    modules.sysd.session.xserver.amd.enable = mkEnableOption "Enables xserver with amdgpu";
  };
  config = mkIf cfg.enable {
    services.xserver = {
--- a/system/modules/sysd/session/xserver/amd/hhkbse/README.md
+++ b/system/modules/sysd/session/xserver/amd/hhkbse/README.md
--- a/system/modules/sysd/session/xserver/amd/hhkbse/default.nix
+++ b/system/modules/sysd/session/xserver/amd/hhkbse/default.nix
@@ -6,10 +6,10 @@
 }: let
  path = "${hostConfig}/cnix/xkb/symbols";
  inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.sysd.xserver.amd.hhkbse;
+  cfg = config.modules.sysd.session.xserver.amd.hhkbse;
 in {
  options = {
-    modules.sysd.xserver.amd.hhkbse.enable = mkEnableOption "Enables xserver for amdgpu with HHKBSE";
+    modules.sysd.session.xserver.amd.hhkbse.enable = mkEnableOption "Enables xserver for amdgpu with HHKBSE";
  };
  config = mkIf cfg.enable {
    services.xserver = {
--- a/system/modules/sysd/session/xserver/nvidia/default.nix
+++ b/system/modules/sysd/session/xserver/nvidia/default.nix
@@ -4,10 +4,10 @@
  ...
 }: let
  inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.sysd.xserver.nvidia;
+  cfg = config.modules.sysd.session.xserver.nvidia;
 in {
  options = {
-    modules.sysd.xserver.nvidia.enable = mkEnableOption "Enables xserver with nvidia";
+    modules.sysd.session.xserver.nvidia.enable = mkEnableOption "Enables xserver with nvidia";
  };
  config = mkIf cfg.enable {
    services.xserver = {
--- a/system/modules/sysd/system/fwupd/default.nix
+++ b/system/modules/sysd/system/fwupd/default.nix
@@ -4,10 +4,10 @@
  ...
 }: let
  inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.sysd.fwupd;
+  cfg = config.modules.sysd.system.fwupd;
 in {
  options = {
-    modules.sysd.fwupd.enable = mkEnableOption "Enables fwupd";
+    modules.sysd.system.fwupd.enable = mkEnableOption "Enables fwupd";
  };
  config = mkIf cfg.enable {
    services.fwupd.enable = true;
--- a/system/modules/sysd/system/greetd/default.nix
+++ b/system/modules/sysd/system/greetd/default.nix
@@ -5,10 +5,10 @@
  ...
 }: let
  inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.sysd.greetd;
+  cfg = config.modules.sysd.system.greetd;
 in {
  options = {
-    modules.sysd.greetd.enable = mkEnableOption "Enables greetd";
+    modules.sysd.system.greetd.enable = mkEnableOption "Enables greetd";
  };
  config = mkIf cfg.enable {
    services.greetd = {
--- a/system/modules/sysd/system/gvfs/default.nix
+++ b/system/modules/sysd/system/gvfs/default.nix
@@ -4,10 +4,10 @@
  ...
 }: let
  inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.sysd.gvfs;
+  cfg = config.modules.sysd.system.gvfs;
 in {
  options = {
-    modules.sysd.gvfs.enable = mkEnableOption "Enables gvfs";
+    modules.sysd.system.gvfs.enable = mkEnableOption "Enables gvfs";
  };
  config = mkIf cfg.enable {
    services.gvfs.enable = true;
--- a/system/modules/sysd/system/locate/default.nix
+++ b/system/modules/sysd/system/locate/default.nix
@@ -5,10 +5,10 @@
  ...
 }: let
  inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.sysd.locate;
+  cfg = config.modules.sysd.system.locate;
 in {
  options = {
-    modules.sysd.locate.enable = mkEnableOption "Enables plocate";
+    modules.sysd.system.locate.enable = mkEnableOption "Enables plocate";
  };
  config = mkIf cfg.enable {
    services.locate = {
--- a/system/modules/sysd/system/nix-ld/default.nix
+++ b/system/modules/sysd/system/nix-ld/default.nix
@@ -5,10 +5,10 @@
  ...
 }: let
  inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.utils.nix-ld;
+  cfg = config.modules.sysd.system.nix-ld;
 in {
  options = {
-    modules.utils.nix-ld.enable = mkEnableOption "Enables nix-ld";
+    modules.sysd.system.nix-ld.enable = mkEnableOption "Enables nix-ld";
  };
  config = mkIf cfg.enable {
    programs.nix-ld = {
--- a/system/modules/sysd/system/pcscd/default.nix
+++ b/system/modules/sysd/system/pcscd/default.nix
@@ -4,10 +4,10 @@
  ...
 }: let
  inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.sysd.pcscd;
+  cfg = config.modules.sysd.system.pcscd;
 in {
  options = {
-    modules.sysd.pcscd.enable = mkEnableOption "Enables pcscd";
+    modules.sysd.system.pcscd.enable = mkEnableOption "Enables pcscd";
  };
  config = mkIf cfg.enable {
    services.pcscd.enable = true;
--- a/system/modules/sysd/system/pipewire/default.nix
+++ b/system/modules/sysd/system/pipewire/default.nix
@@ -4,10 +4,10 @@
  ...
 }: let
  inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.sysd.pipewire;
+  cfg = config.modules.sysd.system.pipewire;
 in {
  options = {
-    modules.sysd.pipewire.enable = mkEnableOption "Enables pipewire";
+    modules.sysd.system.pipewire.enable = mkEnableOption "Enables pipewire";
  };
  config = mkIf cfg.enable {
    hardware.pulseaudio.enable = false;
--- a/system/modules/sysd/system/powerd/default.nix
+++ b/system/modules/sysd/system/powerd/default.nix
@@ -4,10 +4,10 @@
  ...
 }: let
  inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.sysd.powerd;
+  cfg = config.modules.sysd.system.powerd;
 in {
  options = {
-    modules.sysd.powerd.enable = mkEnableOption "Enables power-profiles-daemon";
+    modules.sysd.system.powerd.enable = mkEnableOption "Enables power-profiles-daemon";
  };
  config = mkIf cfg.enable {
    services = {
--- a/system/modules/sysd/system/udisks/default.nix
+++ b/system/modules/sysd/system/udisks/default.nix
@@ -4,10 +4,10 @@
  ...
 }: let
  inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.sysd.udisks;
+  cfg = config.modules.sysd.system.udisks;
 in {
  options = {
-    modules.sysd.udisks.enable = mkEnableOption "Enables udisks";
+    modules.sysd.system.udisks.enable = mkEnableOption "Enables udisks";
  };
  config = mkIf cfg.enable {
    services.udisks2.enable = true;
--- a/system/modules/sysd/system/zram/default.nix
+++ b/system/modules/sysd/system/zram/default.nix
@@ -0,0 +1,15 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  cfg = config.modules.sysd.system.zram;
+in {
+  options = {
+    modules.sysd.system.zram.enable = mkEnableOption "Enables zram";
+  };
+  config = mkIf cfg.enable {
+    zramSwap.enable = true;
+  };
+}