again

homes/aarch64-darwin/evanreichard@MBP-Personal/default.nix

@@ -1,20 +1,36 @@
-{ pkgs, ... }:
+{ pkgs, lib, config, namespace, ... }:
+let
+  inherit (lib.${namespace}) enabled;
+in
 {
-  reichardnix = {
-    programs.btop.enable = true;
-    programs.direnv.enable = true;
-    programs.ghostty.enable = true;
-    programs.git.enable = true;
-    programs.k9s.enable = true;
-    programs.nvim.enable = true;
+  reichard = {
+    user = {
+      enable = true;
+      inherit (config.snowfallorg.user) name;
+    };
 
-    programs.hyprland.enable = false;
-    programs.aws.enable = false;
+    services = {
+      ssh-agent = enabled;
+    };
+
+    programs = {
+      graphical = {
+        ghostty = enabled;
+      };
+
+      terminal = {
+        btop = enabled;
+        direnv = enabled;
+        git = enabled;
+        k9s = enabled;
+        nvim = enabled;
+      };
+    };
   };
 
   # Global Packages
-  programs.jq.enable = true;
-  programs.pandoc.enable = true;
+  programs.jq = enabled;
+  programs.pandoc = enabled;
   home.packages = with pkgs; [
     android-tools
     imagemagick
@@ -31,7 +47,5 @@
     .mode column
   '';
 
-  # Enable Home Manager & Self Manage
   home.stateVersion = "24.11";
-  programs.home-manager.enable = true;
 }

homes/aarch64-darwin/evanreichard@MBP-Work/default.nix

@@ -1,75 +1,52 @@
-{ pkgs, ... }:
+{ pkgs, lib, config, namespace, ... }:
 let
-  inherit (pkgs.lib) mkForce;
-  inherit (pkgs.stdenv) isLinux;
+  inherit (lib.${namespace}) enabled;
 in
 {
-  reichardnix = {
-    programs.nvim.enable = true;
+  reichard = {
+    user = {
+      enable = true;
+      inherit (config.snowfallorg.user) name;
+    };
+
+    services = {
+      ssh-agent = enabled;
+    };
+
+    programs = {
+      graphical = {
+        ghostty = enabled;
+      };
+
+      terminal = {
+        btop = enabled;
+        direnv = enabled;
+        git = enabled;
+        k9s = enabled;
+        nvim = enabled;
+        aws = enabled;
+      };
+    };
   };
 
-  # Home Manager Config
-  home.stateVersion = "24.11";
-  home.username = "evanreichard";
-  home.homeDirectory = mkForce (if isLinux then "/home/evanreichard" else "/Users/evanreichard");
-  programs.home-manager.enable = true;
-
   # Global Packages
-  # home.packages = with pkgs; [
-  #   (nerdfonts.override { fonts = [ "Meslo" ]; })
-  #   # ghostty - Pending Darwin @ https://github.com/NixOS/nixpkgs/pull/369788
-  #   android-tools
-  #   awscli2
-  #   bashInteractive
-  #   cw
-  #   fastfetch
-  #   gitAndTools.gh
-  #   google-cloud-sdk
-  #   imagemagick
-  #   kubectl
-  #   kubernetes-helm
-  #   mosh
-  #   pre-commit
-  #   python311
-  #   ssm-session-manager-plugin
-  #   texliveSmall # Pandoc PDF Dep
-  #   thefuck
-  #   tldr
-  # ]
-  # ++ optionals isLinux [
-  #   ghostty
-  #   hyprpaper
-  #   firefox
-  # ]
-  # ++ optionals isDarwin [ ];
+  programs.jq = enabled;
+  programs.pandoc = enabled;
+  home.packages = with pkgs; [
+    android-tools
+    imagemagick
+    mosh
+    python311
+    texliveSmall # Pandoc PDF Dep
+    google-cloud-sdk
+    tldr
+  ];
 
-  # # GitHub CLI
-  # programs.gh = {
-  #   enable = true;
-  #   settings = {
-  #     git_protocol = "ssh";
-  #   };
-  # };
+  # SQLite Configuration
+  home.file.".sqliterc".text = ''
+    .headers on
+    .mode column
+  '';
 
-  # # Misc Programs
-  # programs.jq.enable = true;
-  # programs.k9s.enable = true;
-  # programs.pandoc.enable = true;
-
-  # # Enable Flakes & Commands
-  # nix = {
-  #   package = mkForce pkgs.nix;
-  #   settings = {
-  #     experimental-features = "nix-command flakes";
-  #   };
-  # };
-
-  # # SQLite Configuration
-  # home.file.".sqliterc".text = ''
-  #   .headers on
-  #   .mode column
-  # '';
-
-  # # Darwin Spotlight Indexing Hack
-  # disabledModules = [ "targets/darwin/linkapps.nix" ];
+  home.stateVersion = "24.11";
 }

homes/aarch64-linux/evanreichard@mbp-nixos/default.nix

@@ -1,31 +1,47 @@
-{ pkgs, config, ... }:
+{ pkgs, lib, config, namespace, ... }:
+let
+  inherit (lib.${namespace}) enabled;
+in
 {
-  reichardnix = {
+  reichard = {
     user = {
       enable = true;
       inherit (config.snowfallorg.user) name;
     };
 
-    programs = {
-      browsers.firefox = {
+    services = {
+      ssh-agent = enabled;
+      sops = {
         enable = true;
-        gpuAcceleration = true;
-        hardwareDecoding = true;
+        defaultSopsFile = lib.snowfall.fs.get-file "secrets/mbp-nixos/default.yaml";
+        sshKeyPaths = [ "${config.home.homeDirectory}/.ssh/id_ed25519" ];
+      };
+    };
+
+    programs = {
+      graphical = {
+        wms.hyprland = enabled;
+        ghostty = enabled;
+        browsers.firefox = {
+          enable = true;
+          gpuAcceleration = true;
+          hardwareDecoding = true;
+        };
       };
 
-      btop.enable = true;
-      direnv.enable = true;
-      ghostty.enable = true;
-      git.enable = true;
-      hyprland.enable = true;
-      k9s.enable = true;
-      nvim.enable = true;
+      terminal = {
+        btop = enabled;
+        direnv = enabled;
+        git = enabled;
+        k9s = enabled;
+        nvim = enabled;
+      };
     };
   };
 
   # Global Packages
-  programs.jq.enable = true;
-  programs.pandoc.enable = true;
+  programs.jq = enabled;
+  programs.pandoc = enabled;
   home.packages = with pkgs; [
     android-tools
     imagemagick