improved system setup

flake.lock

@@ -60,31 +60,7 @@
       "inputs": {
         "home-manager": "home-manager",
         "nix-darwin": "nix-darwin",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs"
-        "zen-browser": "zen-browser"
-      }
-    },
-    "zen-browser": {
-      "inputs": {
-        "home-manager": [
-          "home-manager"
-        ],
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1765895443,
-        "narHash": "sha256-yftYGV0skUwV5neT1BJrs7RRbXPKozQTzC7d9c7kEFs=",
-        "owner": "0xc000022070",
-        "repo": "zen-browser-flake",
-        "rev": "bc7dfff92cb7919dfb213ea78c11ea0a4d265a56",
-        "type": "github"
-      },
-      "original": {
-        "owner": "0xc000022070",
-        "repo": "zen-browser-flake",
-        "type": "github"
       }
     }
   },

flake.nix

@@ -16,16 +16,6 @@
       url = "github:LnL7/nix-darwin";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-
-    zen-browser = {
-      url = "github:0xc000022070/zen-browser-flake";
-      inputs = {
-        # IMPORTANT: we're using "libgbm" and is only available in unstable so ensure
-        # to have it up-to-date or simply don't specify the nixpkgs input
-        nixpkgs.follows = "nixpkgs";
-        home-manager.follows = "home-manager";
-      };
-    };
   };
 
   outputs = {

home/default.nix

@@ -7,13 +7,10 @@
   pkgs,
   lib,
   username,
-  inputs,
   ...
 }: {
   # Import shared modules
   imports = [
-    inputs.zen-browser.homeModules.beta
-
     # Shell configuration (zsh, starship, atuin, direnv, zoxide, fzf, pyenv)
     ../modules/home/shell.nix
 

home/personal.nix

@@ -73,7 +73,7 @@
 
     zen-browser = {
       enable = true;
-    };
+    }
   };
 
   # Personal-only packages

modules/darwin/system.nix

@@ -6,6 +6,11 @@
   username,
   ...
 }: {
+  # Import darwin modules
+  imports = [
+    ../modules/darwin/homebrew.nix
+  ];
+
   # Nix configuration
   nix = {
     settings = {

modules/home/apps.nix

@@ -64,41 +64,6 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
-    programs.zen-browser = lib.mkIf cfg.zen-browser.enable {
-      enable = true;
-      policies = let
-        mkExtensionSettings = builtins.mapAttrs (_: pluginId: {
-          install_url = "https://addons.mozilla.org/firefox/downloads/latest/${pluginId}/latest.xpi";
-          installation_mode = "force_installed";
-        });
-      in {
-        AutofillAddressEnabled = true;
-        AutofillCreditCardEnabled = false;
-        DisableAppUpdate = true;
-        DisableFeedbackCommands = true;
-        DisableFirefoxStudies = true;
-        DisablePocket = true;
-        DisableTelemetry = true;
-        DontCheckDefaultBrowser = true;
-        NoDefaultBookmarks = true;
-        OfferToSaveLogins = false;
-        EnableTrackingProtection = {
-          Value = true;
-          Locked = true;
-          Cryptomining = true;
-          Fingerprinting = true;
-        };
-
-        ExtensionSettings = mkExtensionSettings {
-          "78272b6fa58f4a1abaac99321d503a20@proton.me" = "proton-pass";
-          "{d7742d87-e61d-4b78-b8a1-b469842139fa}" = "vimium-ff";
-          "readeck@readeck.com" = "readeck";
-          "@testpilot-containers" = "multi-account-containers";
-          "uBlock0@raymondhill.net" = "ublock-origin";
-        };
-      };
-    };
-
     # Aerospace window manager configuration (macOS)
     # Placed at ~/.aerospace.toml
     home.file = lib.mkMerge [

modules/home/git.nix

@@ -80,26 +80,18 @@ in {
     programs.git = {
       enable = true;
 
+      # User configuration
+      userName = cfg.userName;
+      userEmail = cfg.userEmail;
+
       # Signing configuration with 1Password
       signing = {
         key = cfg.signingKey;
         signByDefault = true;
       };
 
-      # Conditional includes for project-specific configurations
+      # Extra configuration
-      includes = map (inc: {
+      extraConfig = {
-        condition = inc.condition;
-        path = inc.path;
-      }) cfg.includes;
-
-      # All git settings using the new unified settings option
-      settings = {
-        # User configuration
-        user = {
-          name = cfg.userName;
-          email = cfg.userEmail;
-        };
-
         # Core settings (pager is set by programs.delta)
         core = {
           hooksPath = "/dev/null";
@@ -152,9 +144,10 @@ in {
         "difftool \"nvimdiff\"" = {
           cmd = "nvim -d \"$LOCAL\" \"$REMOTE\"";
         };
+      };
 
       # Aliases
-        alias = {
+      aliases = {
         graph = "log --graph --color --pretty=format:\"%C(yellow)%H%C(green)%d%C(reset)%n%x20%cd%n%x20%cn%C(blue)%x20(%ce)%x20%C(cyan)[gpg:%GK%x20%G?]%C(reset)%n%x20%s%n\"";
         ll = "log --oneline";
         st = "status -sb";
@@ -168,7 +161,12 @@ in {
         undo = "reset HEAD~1 --mixed";
         unstage = "reset HEAD --";
       };
-      };
+
+      # Conditional includes for project-specific configurations
+      includes = map (inc: {
+        condition = inc.condition;
+        path = inc.path;
+      }) cfg.includes;
     };
   };
 }

modules/home/packages.nix

@@ -30,7 +30,6 @@
     duf # A better df alternative 
     hyperfine # A command-line benchmarking tool.
     choose # A human-friendly and fast alternative to cut and (sometimes) awk
-    coreutils
     yazi # File manager
 
     # ========================================================================
@@ -89,7 +88,6 @@
     k9s # Kubernetes TUI
     istioctl # Istio service mesh CLI
     fluxcd # GitOps toolkit
-    popeye # 
 
     # ========================================================================
     # Infrastructure and Cloud Tools

modules/home/shell.nix

@@ -69,6 +69,9 @@
         "--color=fg:#cdd6f4,header:#f38ba8,info:#cba6f7,pointer:#f5e0dc"
         "--color=marker:#f5e0dc,fg+:#cdd6f4,prompt:#cba6f7,hl+:#f38ba8"
       ];
+
+      # NVM directory
+      NVM_DIR = "$HOME/.nvm";
     };
 
     # Shell aliases (migrated from 01-env.sh and 01-nvim.sh)
@@ -234,6 +237,12 @@
     enableZshIntegration = true;
   };
 
+  # ==========================================================================
+  # NVM - Node Version Manager
+  # ==========================================================================
+  # NVM is installed via Homebrew and sourced in the shell
+  # This allows managing multiple Node.js versions per project
+
   # ==========================================================================
   # Pyenv - Python version management
   # ==========================================================================