From 228978566f7774835b99c96dbc5bf5abcce85d1b Mon Sep 17 00:00:00 2001
From: Aly Raffauf <aly@raffauflabs.com>
Date: Fri, 27 Sep 2024 21:58:40 -0400
Subject: [PATCH] slateport: dorp aly-nox and declare simplified home config

---
 flake.nix                          | 30 ++++++++----------
 homes/aly/common.nix               | 51 ------------------------------
 homes/aly/{gui.nix => default.nix} | 36 +++++++++++++++++++--
 homes/aly/nox.nix                  | 13 --------
 hosts/slateport/home.nix           | 29 ++++++++++++++++-
 5 files changed, 76 insertions(+), 83 deletions(-)
 delete mode 100644 homes/aly/common.nix
 rename homes/aly/{gui.nix => default.nix} (57%)
 delete mode 100644 homes/aly/nox.nix

diff --git a/flake.nix b/flake.nix
index 07926002..332e7468 100644
--- a/flake.nix
+++ b/flake.nix
@@ -125,17 +125,21 @@
 
     homeManagerModules = {
       default = import ./homeManagerModules self;
-      aly = import ./homes/aly/gui.nix self;
-      aly-nox = import ./homes/aly/nox.nix self;
+      aly = import ./homes/aly self;
       dustin = import ./homes/dustin self;
       morgan = import ./homes/morgan self;
     };
 
     nixosModules = {
-      hw-framework-13-amd-7000 = import ./hwModules/framework/13/amd-7000;
-      hw-framework-13-intel-11th = import ./hwModules/framework/13/intel-11th;
-      hw-lenovo-yoga-9i-intel-13th = import ./hwModules/lenovo/yoga-9i/intel-13th;
-      hw-thinkpad-t440p = import ./hwModules/thinkpad/t440p;
+      common-auto-upgrade = import ./common/autoUpgrade.nix;
+      common-base = import ./common/base.nix;
+      common-locale = import ./common/locale.nix;
+      common-mauville-share = import ./common/samba.nix;
+      common-nix = import ./common/nix.nix;
+      common-overlays = import ./common/overlays.nix;
+      common-pkgs = import ./common/pkgs.nix;
+      common-tailscale = import ./common/tailscale.nix;
+      common-wifi-profiles = import ./common/wifi.nix;
 
       hw-common-amd-cpu = import ./hwModules/common/gpu/amd;
       hw-common-amd-gpu = import ./hwModules/common/cpu/amd;
@@ -146,16 +150,10 @@
       hw-common-laptop-amd-gpu = import ./hwModules/common/laptop/amd-gpu.nix;
       hw-common-laptop-intel-cpu = import ./hwModules/common/laptop/intel-cpu.nix;
       hw-common-ssd = import ./hwModules/common/ssd;
-
-      common-auto-upgrade = import ./common/autoUpgrade.nix;
-      common-base = import ./common/base.nix;
-      common-locale = import ./common/locale.nix;
-      common-mauville-share = import ./common/samba.nix;
-      common-nix = import ./common/nix.nix;
-      common-overlays = import ./common/overlays.nix;
-      common-pkgs = import ./common/pkgs.nix;
-      common-tailscale = import ./common/tailscale.nix;
-      common-wifi-profiles = import ./common/wifi.nix;
+      hw-framework-13-amd-7000 = import ./hwModules/framework/13/amd-7000;
+      hw-framework-13-intel-11th = import ./hwModules/framework/13/intel-11th;
+      hw-lenovo-yoga-9i-intel-13th = import ./hwModules/lenovo/yoga-9i/intel-13th;
+      hw-thinkpad-t440p = import ./hwModules/thinkpad/t440p;
 
       nixos = import ./nixosModules self;
       users = import ./userModules self;
diff --git a/homes/aly/common.nix b/homes/aly/common.nix
deleted file mode 100644
index a19804af..00000000
--- a/homes/aly/common.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{pkgs, ...}: {
-  home = {
-    homeDirectory = "/home/aly";
-
-    packages = with pkgs; [
-      curl
-    ];
-
-    stateVersion = "24.05";
-    username = "aly";
-  };
-
-  programs = {
-    git = {
-      enable = true;
-      lfs.enable = true;
-      userName = "Aly Raffauf";
-      userEmail = "aly@raffauflabs.com";
-
-      extraConfig = {
-        color.ui = true;
-        github.user = "alyraffauf";
-        push.autoSetupRemote = true;
-      };
-    };
-
-    gitui.enable = true;
-    home-manager.enable = true;
-
-    rbw = {
-      enable = true;
-
-      settings = {
-        base_url = "https://passwords.raffauflabs.com";
-        email = "alyraffauf@fastmail.com";
-        lock_timeout = 14400;
-      };
-    };
-  };
-
-  systemd.user.startServices = "legacy"; # Needed for auto-mounting agenix secrets.
-
-  ar.home = {
-    apps = {
-      fastfetch.enable = true;
-      helix.enable = true;
-      shell.enable = true;
-      yazi.enable = true;
-    };
-  };
-}
diff --git a/homes/aly/gui.nix b/homes/aly/default.nix
similarity index 57%
rename from homes/aly/gui.nix
rename to homes/aly/default.nix
index a822f57b..e7175a68 100644
--- a/homes/aly/gui.nix
+++ b/homes/aly/default.nix
@@ -1,6 +1,5 @@
 self: {pkgs, ...}: {
   imports = [
-    ./common.nix
     ./firefox
     ./mail
     ./secrets.nix
@@ -15,6 +14,7 @@ self: {pkgs, ...}: {
 
     packages = with pkgs; [
       bitwarden-desktop
+      curl
       fractal
       nicotine-plus
       obsidian
@@ -29,15 +29,47 @@ self: {pkgs, ...}: {
     username = "aly";
   };
 
-  programs.rbw.settings.pinentry = pkgs.pinentry-gnome3;
+  programs = {
+    git = {
+      enable = true;
+      lfs.enable = true;
+      userName = "Aly Raffauf";
+      userEmail = "aly@raffauflabs.com";
+
+      extraConfig = {
+        color.ui = true;
+        github.user = "alyraffauf";
+        push.autoSetupRemote = true;
+      };
+    };
+
+    gitui.enable = true;
+    home-manager.enable = true;
+
+    rbw = {
+      enable = true;
+
+      settings = {
+        base_url = "https://passwords.raffauflabs.com";
+        email = "alyraffauf@fastmail.com";
+        lock_timeout = 14400;
+        pinentry = pkgs.pinentry-gnome3;
+      };
+    };
+  };
+
   systemd.user.startServices = "legacy"; # Needed for auto-mounting agenix secrets.
 
   ar.home = {
     apps = {
       chromium.enable = true;
+      fastfetch.enable = true;
       firefox.enable = true;
+      helix.enable = true;
       kitty.enable = true;
+      shell.enable = true;
       vsCodium.enable = true;
+      yazi.enable = true;
     };
 
     defaultApps = {
diff --git a/homes/aly/nox.nix b/homes/aly/nox.nix
deleted file mode 100644
index ed5d5255..00000000
--- a/homes/aly/nox.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-self: {pkgs, ...}: {
-  imports = [
-    ./common.nix
-    ./secrets.nix
-    self.homeManagerModules.default
-    self.inputs.agenix.homeManagerModules.default
-  ];
-
-  programs = {
-    helix.defaultEditor = true;
-    rbw.settings.pinentry = pkgs.pinentry-tty;
-  };
-}
diff --git a/hosts/slateport/home.nix b/hosts/slateport/home.nix
index e8b35fb6..1b74acf6 100644
--- a/hosts/slateport/home.nix
+++ b/hosts/slateport/home.nix
@@ -3,5 +3,32 @@
   self,
   ...
 }: {
-  home-manager.users.aly = lib.mkForce self.homeManagerModules.aly-nox;
+  home-manager.users.aly = lib.mkForce (
+    {pkgs, ...}: {
+      imports = [self.homeManagerModules.default];
+
+      home = {
+        homeDirectory = "/home/aly";
+
+        packages = with pkgs; [
+          curl
+        ];
+
+        stateVersion = "24.05";
+        username = "aly";
+      };
+
+      programs = {
+        helix.defaultEditor = true;
+        home-manager.enable = true;
+      };
+
+      ar.home.apps = {
+        fastfetch.enable = true;
+        helix.enable = true;
+        shell.enable = true;
+        yazi.enable = true;
+      };
+    }
+  );
 }