From 37c6e842f196ea1af24caea79c71395fbd81710e Mon Sep 17 00:00:00 2001
From: rotterdam <foxtrot@rotterdam>
Date: Wed, 5 Apr 2023 11:46:03 -0300
Subject: [PATCH] Minor refactor

---
 hosts/common/packages.nix            |  3 --
 hosts/desktops/common/hardware.nix   |  5 ++-
 hosts/desktops/common/packages.nix   |  7 +---
 hosts/desktops/rotterdam.nix         |  4 +--
 hosts/servers/alexandria/default.nix |  8 ++---
 hosts/servers/alexandria/users.nix   |  5 +--
 hosts/servers/common/users.nix       |  5 ---
 users/common/programs.nix            | 52 +++++++++++++++++-----------
 users/desktops/common/default.nix    |  2 +-
 users/desktops/common/home.nix       |  1 +
 users/desktops/common/programs.nix   | 20 +++--------
 users/desktops/common/services.nix   |  5 ---
 12 files changed, 48 insertions(+), 69 deletions(-)
 delete mode 100644 hosts/servers/common/users.nix
 delete mode 100644 users/desktops/common/services.nix

diff --git a/hosts/common/packages.nix b/hosts/common/packages.nix
index 16312b9..0e0a33d 100644
--- a/hosts/common/packages.nix
+++ b/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 = {
diff --git a/hosts/desktops/common/hardware.nix b/hosts/desktops/common/hardware.nix
index 3f1bc35..271c0c2 100644
--- a/hosts/desktops/common/hardware.nix
+++ b/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;
diff --git a/hosts/desktops/common/packages.nix b/hosts/desktops/common/packages.nix
index b6684ed..ac33fd2 100644
--- a/hosts/desktops/common/packages.nix
+++ b/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
   ];
 
diff --git a/hosts/desktops/rotterdam.nix b/hosts/desktops/rotterdam.nix
index 1bd2973..2f0bd23 100644
--- a/hosts/desktops/rotterdam.nix
+++ b/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
   ];
diff --git a/hosts/servers/alexandria/default.nix b/hosts/servers/alexandria/default.nix
index 822e24d..d57b230 100644
--- a/hosts/servers/alexandria/default.nix
+++ b/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
   ];
 }
diff --git a/hosts/servers/alexandria/users.nix b/hosts/servers/alexandria/users.nix
index b8e884a..2b6e112 100644
--- a/hosts/servers/alexandria/users.nix
+++ b/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;
diff --git a/hosts/servers/common/users.nix b/hosts/servers/common/users.nix
deleted file mode 100644
index faf993d..0000000
--- a/hosts/servers/common/users.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ specialArgs, inputs, config, pkgs, lib, ... }:
-
-{
-  home-manager.users.user = import ../../../users/servers/user.nix";
-}
diff --git a/users/common/programs.nix b/users/common/programs.nix
index 05848e4..136ce76 100644
--- a/users/common/programs.nix
+++ b/users/common/programs.nix
@@ -11,6 +11,35 @@
       enable = true;
       enableFishIntegration = true;
     };
+    direnv = {
+      enable = true;
+      nix-direnv.enable = true;
+    };
+    tmux = {
+      enable = true;
+      clock24 = true;
+      extraConfig = "set -g mouse on";
+    };
+    starship = {
+      enable = true;
+      enableBashIntegration = true;
+      enableFishIntegration = true;
+    };
+    git = {
+      enable = true;
+      diff-so-fancy.enable = true;
+      userName = "William";
+      userEmail = "baduhai@proton.me";
+    };
+    btop = {
+      enable = true;
+      settings = {
+        color_theme = "catppuccin_mocha.theme";
+        theme_background = false;
+        proc_sorting = "cpu direct";
+        update_ms = 500;
+      };
+    };
     micro = {
       enable = true;
       settings = {
@@ -23,24 +52,10 @@
         relativeruler = true;
       };
     };
-    starship = {
-      enable = true;
-      enableBashIntegration = true;
-      enableFishIntegration = true;
-    };
-    btop = {
-      enable = true;
-      settings = {
-        color_theme = "catppuccin_mocha.theme";
-        theme_background = false;
-        proc_sorting = "cpu direct";
-        update_ms = 500;
-      };
-    };
     fish = {
       enable = true;
-      # interactiveShellInit = "nix-your-shell fish | source"; # nix-your-shell only in unstable
-      # loginShellInit = "nix-your-shell fish | source";
+      interactiveShellInit = "nix-your-shell fish | source";
+      loginShellInit = "nix-your-shell fish | source";
       shellAliases = {
         nano = "micro";
         wget = ''wget --hsts-file="$XDG_DATA_HOME/wget-hsts"'';
@@ -74,10 +89,5 @@
         }
       ];
     };
-    tmux = {
-      enable = true;
-      clock24 = true;
-      extraConfig = "set -g mouse on";
-    };
   };
 }
diff --git a/users/desktops/common/default.nix b/users/desktops/common/default.nix
index 89d0d0e..f9dfb30 100644
--- a/users/desktops/common/default.nix
+++ b/users/desktops/common/default.nix
@@ -1,5 +1,5 @@
 { ... }:
 
 {
-  imports = [ ./home.nix ./programs.nix ./services.nix ];
+  imports = [ ./home.nix ./programs.nix ];
 }
diff --git a/users/desktops/common/home.nix b/users/desktops/common/home.nix
index 3891fe0..c83d207 100644
--- a/users/desktops/common/home.nix
+++ b/users/desktops/common/home.nix
@@ -2,6 +2,7 @@
 
 {
   home = {
+    packages = with pkgs; [ nix-your-shell ];
     pointerCursor = {
       size = 24;
       gtk.enable = true;
diff --git a/users/desktops/common/programs.nix b/users/desktops/common/programs.nix
index 15dc338..08f5a2a 100644
--- a/users/desktops/common/programs.nix
+++ b/users/desktops/common/programs.nix
@@ -25,10 +25,6 @@
       enable = true;
       enableSessionWide = true;
     };
-    direnv = {
-      enable = true;
-      nix-direnv.enable = true;
-    };
     obs-studio = {
       enable = true;
       plugins = [
@@ -36,24 +32,16 @@
         pkgs.obs-studio-plugins.obs-pipewire-audio-capture
       ];
     };
-    git = {
-      enable = true;
-      diff-so-fancy.enable = true;
-      userName = "William";
-      userEmail = "baduhai@proton.me";
-    };
     fish = {
-      interactiveShellInit = "nix-your-shell fish | source";
-      loginShellInit = "nix-your-shell fish | source";
       functions = {
         rebuild =
-          "rm ~/.gtkrc-2.0; sudo nixos-rebuild switch --flake '/home/user/Projects/personal/nix-config#'";
+          "sudo nixos-rebuild switch --flake '/home/user/Projects/personal/nix-config#'";
         rebuild-boot =
-          "rm ~/.gtkrc-2.0; sudo nixos-rebuild boot --flake '/home/user/Projects/personal/nix-config#'";
+          "sudo nixos-rebuild boot --flake '/home/user/Projects/personal/nix-config#'";
         upgrade =
-          "rm ~/.gtkrc-2.0; nix flake lock --update-input nixpkgs --commit-lock-file /home/user/Projects/personal/nix-config; sudo nixos-rebuild switch --upgrade --flake '/home/user/Projects/personal/nix-config#'";
+          "nix flake update --commit-lock-file /home/user/Projects/personal/nix-config";
         upgrade-boot =
-          "rm ~/.gtkrc-2.0; nix flake lock --update-input nixpkgs --commit-lock-file /home/user/Projects/personal/nix-config; sudo nixos-rebuild boot --upgrade --flake '/home/user/Projects/personal/nix-config#'";
+          "rm ~/.gtkrc-2.0; nix run '/home/user/Projects/personal/nix-config#homeConfigurations.desktop.activationPackage'";
       };
     };
   };
diff --git a/users/desktops/common/services.nix b/users/desktops/common/services.nix
deleted file mode 100644
index 58634da..0000000
--- a/users/desktops/common/services.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  services = { kdeconnect.enable = true; };
-}