more common stuff, prep for merge

hosts/desktop/configuration.nix

@@ -2,7 +2,9 @@
 {
   imports = [
     ./hardware-configuration.nix
+    ../../modules/nixos/nvidia.nix
     ../../modules/nixos/common.nix
+    ../../modules/nixos/bspwm.nix
     ../../modules/nixos/audio.nix
     ../../modules/nixos/shell.nix
     ../../modules/nixos/dev.nix
@@ -10,8 +12,6 @@
     ../../modules/nixos/gaming.nix
     ../../modules/nixos/apps.nix
     ../../modules/nixos/portals.nix
-    ../../modules/nixos/bspwm.nix
-    ../../modules/nixos/nvidia.nix
     ../../modules/nixos/cups.nix
   ];
 
@@ -20,18 +20,19 @@
 
   users.users.chris.extraGroups = [ "dialout" "storage" ];
 
-  environment.systemPackages = with pkgs; [
+  environment.systemPackages = with pkgs; [];
-    lazygit file disktui busybox nmap screen
-  ];
 
+  # Aliases
   programs.zsh.shellAliases.ssh-server = "ssh braincell@192.168.1.3";
 
+  # Mount the data drive
   fileSystems."/data" = {
     device = "/dev/disk/by-uuid/58c7b996-c436-47e8-8018-244417acf067";
     fsType = "ext4";
     options = [ "nofail" ];
   };
 
+  # Firewall stuff
   networking.firewall.allowedTCPPorts = [ 9999 ];
   networking.firewall.allowedUDPPorts = [ 9999 ];
 

hosts/p50/configuration.nix

@@ -3,9 +3,16 @@
 {
   imports = [
     ./hardware-configuration.nix
+    ../../modules/nixos/quadro-m1000m.nix
     ../../modules/nixos/common.nix
     ../../modules/nixos/bspwm.nix
-    ../../modules/nixos/quadro-m1000m.nix
+    ../../modules/nixos/audio.nix
+    ../../modules/nixos/shell.nix
+    ../../modules/nixos/dev.nix
+    ../../modules/nixos/storage.nix
+    ../../modules/nixos/apps.nix
+    ../../modules/nixos/portals.nix
+    ../../modules/nixos/cups.nix
   ];
 
   networking.hostName = "p50";
@@ -13,5 +20,10 @@
 
   boot.kernelPackages = pkgs.linuxPackages_latest;
 
+  users.users.chris.extraGroups = [ "dialout" "storage" ];
+
+  # Aliases
+  programs.zsh.shellAliases.ssh-server = "ssh braincell@192.168.1.3";
+
   system.stateVersion = "26.05"; # don't change
 }

modules/nixos/common.nix

@@ -47,6 +47,6 @@
   services.openssh.enable = true;
 
   environment.systemPackages = with pkgs; [
-    vim wget git helix nixd nixfmt btop fastfetch lazygit
+    vim wget git helix nixd nixfmt btop fastfetch lazygit file disktui busybox nmap screen
   ];
 }