merge common-*.nix files

modules/common-doas.nix

@@ -1,15 +0,0 @@
-{ username, ... }:
-{
-  # doas replaces sudo on every host
-  security = {
-    doas.enable = true;
-    sudo.enable = false;
-    doas.extraRules = [
-      {
-        users = [ username ];
-        keepEnv = true;
-        persist = true;
-      }
-    ];
-  };
-}

modules/common-nix.nix

@@ -1,22 +0,0 @@
-{ lib, ... }:
-{
-  # Common Nix daemon settings. Host-specific overrides (binary cache substituters,
-  # gc retention) live in the host's default.nix.
-  nix = {
-    optimise.automatic = true;
-
-    gc = {
-      automatic = true;
-      dates = "weekly";
-      # Default retention: override per-host via lib.mkForce if different.
-      options = lib.mkDefault "--delete-older-than 30d";
-    };
-
-    settings = {
-      experimental-features = [
-        "nix-command"
-        "flakes"
-      ];
-    };
-  };
-}

modules/common-shell-fish.nix

@@ -1,16 +0,0 @@
-{ pkgs, lib, ... }:
-{
-  # https://nixos.wiki/wiki/Fish#Setting_fish_as_your_shell
-  # Login shells stay bash but immediately `exec fish` so fish is the effective shell
-  # without breaking scripts that hardcode #!/bin/bash.
-  programs.fish.enable = true;
-  programs.bash = {
-    interactiveShellInit = ''
-      if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]
-      then
-        shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""
-        exec ${lib.getExe pkgs.fish} $LOGIN_OPTION
-      fi
-    '';
-  };
-}

modules/common.nix

@@ -0,0 +1,75 @@
+{
+  config,
+  lib,
+  pkgs,
+  username,
+  ...
+}:
+{
+  # Common Nix daemon settings. Host-specific overrides (binary cache substituters,
+  # gc retention) live in the host's default.nix.
+  nix = {
+    optimise.automatic = true;
+
+    gc = {
+      automatic = true;
+      dates = "weekly";
+      # Default retention: override per-host via lib.mkForce if different.
+      options = lib.mkDefault "--delete-older-than 30d";
+    };
+
+    settings = {
+      experimental-features = [
+        "nix-command"
+        "flakes"
+      ];
+    };
+  };
+
+  # https://nixos.wiki/wiki/Fish#Setting_fish_as_your_shell
+  # Login shells stay bash but immediately `exec fish` so fish is the effective shell
+  # without breaking scripts that hardcode #!/bin/bash.
+  programs.fish.enable = true;
+  programs.bash = {
+    interactiveShellInit = ''
+      if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]
+      then
+        shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""
+        exec ${lib.getExe pkgs.fish} $LOGIN_OPTION
+      fi
+    '';
+  };
+
+  # doas replaces sudo on every host
+  security = {
+    doas.enable = true;
+    sudo.enable = false;
+    doas.extraRules = [
+      {
+        users = [ username ];
+        keepEnv = true;
+        persist = true;
+      }
+    ];
+  };
+
+  services.kmscon.enable = true;
+
+  environment.systemPackages = with pkgs; [
+    doas-sudo-shim
+  ];
+
+  hardware.enableRedistributableFirmware = true;
+  hardware.cpu.amd.updateMicrocode = true;
+
+  environment.etc = {
+    # override default nixos /etc/issue
+    "issue".text = "";
+  };
+
+  # for updating firmware
+  services.fwupd = {
+    enable = true;
+    extraRemotes = [ "lvfs-testing" ];
+  };
+}

modules/desktop-common.nix

@@ -10,10 +10,7 @@
 }:
 {
   imports = [
-    # shared across all hosts
-    ./common-doas.nix
-    ./common-shell-fish.nix
-    ./common-nix.nix
+    ./common.nix
 
     # desktop-only modules
     ./desktop-vm.nix
@@ -31,11 +28,6 @@
   # allow overclocking (I actually underclock but lol)
   hardware.amdgpu.overdrive.ppfeaturemask = "0xFFFFFFFF";
 
-  hardware.enableRedistributableFirmware = true;
-  hardware.cpu.amd.updateMicrocode = true;
-
-  services.kmscon.enable = true;
-
   # Add niri to display manager session packages
   services.displayManager.sessionPackages = [ niri-package ];
 
@@ -350,23 +342,10 @@
       # 1gb huge pages
       "hugepagesz=1G"
       "hugepages=3"
-
     ];
-
-  };
-
-  environment.etc = {
-    # override default nixos /etc/issue
-    "issue".text = "";
   };
 
   services = {
-    # fwupd for updating firmware
-    fwupd = {
-      enable = true;
-      extraRemotes = [ "lvfs-testing" ];
-    };
-
     # auto detect network printers
     avahi = {
       enable = true;
@@ -466,8 +445,6 @@
 
     dmidecode
 
-    doas-sudo-shim
-
     glib
     usbutils
     libmtp