chore: move common packages into users/

README.md

@@ -4,7 +4,6 @@
 | ------- | ------- | ---------------------------------------- |
 | marr    | x86_64  | Laptop Workstation                       |
 | brontes | x86_64  | Desktop Workstation                      |
-| styrax  | x86_64  |                                          |
 | raptus  | x86_64  |                                          |
 | nihilus | aarch64 | Small Pi used to make "off-site" backups |
 

hosts/brontes/default.nix

@@ -2,7 +2,6 @@
 {
   pkgs,
   config,
-  inputs',
   ...
 }:
 let
@@ -116,17 +115,16 @@ in
   users = {
     defaultUserShell = pkgs.fish;
     users.${username} = {
-      packages = [
-        inputs'.nur.packages.grayjay-desktop
-      ];
       isNormalUser = true;
       createHome = true;
+      packages = with pkgs; [
+        prismlauncher
+        orca-slicer
+      ];
       extraGroups = [
         "networkmanager"
-        "wheel"
         "audio"
         "libvirtd" # VM OPs
-        "dialout" # Necessary for serial port interactions
       ];
     };
   };

hosts/brontes/home.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   inputs,
   ...
@@ -36,55 +35,8 @@ in
     };
 
     home = {
-      stateVersion = config.system.stateVersion;
+      inherit (config.system) stateVersion;
       inherit username;
-
-      packages = with pkgs; [
-        keepassxc
-        digikam
-        fragments
-        element-desktop
-        libreoffice
-        loupe
-        seahorse
-        gimp
-        pwvucontrol
-        thunderbird
-        keepassxc
-        protonmail-bridge-gui
-        varia
-        signal-desktop
-        tagger
-        prismlauncher
-        orca-slicer
-
-        kid3
-        soundconverter
-
-        # proprietary
-        obsidian
-
-        # CLI tools
-        jhead
-        fdupes
-        exiftool
-        sshfs
-        lazygit
-        wl-clipboard
-
-        # custom
-        nysh
-        scripts.nixedit
-        scripts.set-background
-        scripts.fishl
-        scripts.nrun
-        scripts.rpaste
-        scripts.genswitch
-        scripts.gentest
-        scripts.editsym
-        scripts.deployswitch
-        scripts.deploytest
-      ];
     };
   };
 }

users/ny/default.nix

@@ -1,7 +1,16 @@
-{ lib, ... }:
+{
+  lib,
+  inputs',
+  pkgs,
+  config,
+  ...
+}:
+let
+  inherit (config.modules.meta) username;
+in
 {
   hjem = {
-    users.ny = {
+    users.${username} = {
       enable = true;
       imports = [ ./programs ];
     };
@@ -10,4 +19,48 @@
     };
     clobberByDefault = true;
   };
+
+  users.users.${username}.packages =
+    [
+      inputs'.nur.packages.grayjay-desktop
+    ]
+    ++ (with pkgs; [
+      keepassxc
+      digikam
+      fragments
+      element-desktop
+      libreoffice
+      loupe
+      seahorse
+      pwvucontrol
+      thunderbird
+      keepassxc
+      protonmail-bridge-gui
+      signal-desktop
+      tagger
+      kid3
+
+      # proprietary
+      obsidian
+
+      # CLI tools
+      jhead
+      fdupes
+      exiftool
+      sshfs
+      wl-clipboard
+
+      # custom
+      nysh
+      scripts.nixedit
+      scripts.set-background
+      scripts.fishl
+      scripts.nrun
+      scripts.rpaste
+      scripts.genswitch
+      scripts.gentest
+      scripts.editsym
+      scripts.deployswitch
+      scripts.deploytest
+    ]);
 }