Minor refactor

hosts/common/packages.nix

@@ -9,7 +9,6 @@
     btop
     comma
     git
-    lazydocker
     micro
     neofetch
     # nix-your-shell # Currently only available in unstable
@@ -17,8 +16,6 @@
     tmux
     tree
     wget
-    # Package overrides
-    (nnn.override { withNerdIcons = true; })
   ];
 
   programs = {

hosts/desktops/common/hardware.nix

@@ -6,7 +6,10 @@
     bluetooth.enable = true;
     pulseaudio.enable = false; # Use pipewire instead
     steam-hardware.enable = true; # Allow steam client to manage controllers
-    opengl.driSupport32Bit = true; # For OpenGL games
+    opengl = {
+      driSupport32Bit = true; # For OpenGL games
+      mesaPackage = pkgs.mesa_22; # NixOS/nixpkgs/issues/223729
+    };
   };
 
   sound.enable = true;

hosts/desktops/common/packages.nix

@@ -23,7 +23,6 @@
     heroic
     inkscape
     # itch # Currently using unsafe electron version
-    jellyfin-media-player
     junction
     kolourpaint
     libfido2
@@ -46,9 +45,7 @@
     signal-desktop
     solvespace
     space-cadet-pinball
-    spotify
     steam-run
-    streamlink-twitch-gui-bin
     tdesktop
     thunderbird-wayland # Until thunderbird moves to using wayland by default
     ungoogled-chromium
@@ -59,9 +56,7 @@
     wezterm
     # Package overrides
     (appimage-run.override { extraPkgs = pkgs: [ libthai ]; })
-    # Packages from 3rd party overlays
-    agenix
-    chatterino7
+    # Packages from 3rd party
     koi
   ];
 

hosts/desktops/rotterdam.nix

@@ -10,8 +10,6 @@
     ./rotterdam
   ];
 
-  hardware.opengl.mesaPackage = pkgs.mesa_22;
-
   networking.hostName = "rotterdam";
 
   services.hardware.openrgb.enable = true;
@@ -42,7 +40,7 @@
     cemu
     retroarchFull
     rpcs3
-    #     yuzu-ea
+    yuzu-ea
     # Packages from 3rd party overlays
     emulationstation-de
   ];

hosts/servers/alexandria/default.nix

@@ -2,12 +2,12 @@
 
 {
   imports = [
-    ./hardware-configuration.nix
     ./containerised.nix
-    ./variables.nix
-    ./services.nix
-    ./security.nix
+    ./hardware-configuration.nix
     ./matrix.nix
+    ./security.nix
+    ./services.nix
     ./users.nix
+    ./variables.nix
   ];
 }

hosts/servers/alexandria/users.nix

@@ -2,10 +2,7 @@
 
 {
   users = {
-    users = {
-      nginx.extraGroups = [ "acme" ];
-      user.extraGroups = [ "docker" ];
-    };
+    users = { nginx.extraGroups = [ "acme" ]; };
     groups = {
       hosted = {
         gid = 1005;

hosts/servers/common/users.nix

@@ -1,5 +0,0 @@
-{ specialArgs, inputs, config, pkgs, lib, ... }:
-
-{
-  home-manager.users.user = import ../../../users/servers/user.nix";
-}