add argocd

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1766682973,
+        "lastModified": 1765682243,
-        "narHash": "sha256-GKO35onS711ThCxwWcfuvbIBKXwriahGqs+WZuJ3v9E=",
+        "narHash": "sha256-yeCxFV/905Wr91yKt5zrVvK6O2CVXWRMSrxqlAZnLp0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "91cdb0e2d574c64fae80d221f4bf09d5592e9ec2",
+        "rev": "58bf3ecb2d0bba7bdf363fc8a6c4d49b4d509d03",
         "type": "github"
       },
       "original": {
@@ -27,11 +27,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1766784396,
+        "lastModified": 1765684049,
-        "narHash": "sha256-rIlgatT0JtwxsEpzq+UrrIJCRfVAXgbYPzose1DmAcM=",
+        "narHash": "sha256-svCS2r984qEowMT0y3kCrsD/m0J6zaF5I/UusS7QaH0=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "f0c8e1f6feb562b5db09cee9fb566a2f989e6b55",
+        "rev": "9b628e171bfaea1a3d1edf31eee46251e0fe4a33",
         "type": "github"
       },
       "original": {
@@ -42,11 +42,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1766747458,
+        "lastModified": 1765644376,
-        "narHash": "sha256-m63jjuo/ygo8ztkCziYh5OOIbTSXUDkKbqw3Vuqu4a4=",
+        "narHash": "sha256-yqHBL2wYGwjGL2GUF2w3tofWl8qO9tZEuI4wSqbCrtE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c633f572eded8c4f3c75b8010129854ed404a6ce",
+        "rev": "23735a82a828372c4ef92c660864e82fbe2f5fbe",
         "type": "github"
       },
       "original": {
@@ -74,11 +74,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1766697593,
+        "lastModified": 1765895443,
-        "narHash": "sha256-mGZBEN67mxeOsBhplBRLm6L+y++8jU46EEUYgemG1aQ=",
+        "narHash": "sha256-yftYGV0skUwV5neT1BJrs7RRbXPKozQTzC7d9c7kEFs=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "98d8f48ba80a4b6e3b56addad850d57132301075",
+        "rev": "bc7dfff92cb7919dfb213ea78c11ea0a4d265a56",
         "type": "github"
       },
       "original": {

flake.nix

@@ -28,103 +28,88 @@
     };
   };
 
-  outputs =
+  outputs = {
-    {
+    self,
-      self,
+    nixpkgs,
-      nixpkgs,
+    home-manager,
-      home-manager,
+    nix-darwin,
-      nix-darwin,
+    ...
-      ...
+  } @ inputs: let
-    }@inputs:
+    # Default username - can be overridden per-host if needed
-    let
+    username = "alice";
-      # Default username - can be overridden per-host if needed
-      username = "alice";
 
-      # Common special args passed to all modules
+    # Common special args passed to all modules
-      specialArgs = { inherit inputs username; };
+    specialArgs = {inherit inputs username;};
-    in
+  in {
-    {
+    # Darwin (macOS) system configurations
-      # Darwin (macOS) system configurations
+    darwinConfigurations = {
-      darwinConfigurations = {
+      # Personal machine configuration
-        # Personal machine configuration
+      "personal" = nix-darwin.lib.darwinSystem {
-        "personal" = nix-darwin.lib.darwinSystem {
+        system = "aarch64-darwin";
-          system = "aarch64-darwin";
+        inherit specialArgs;
-          inherit specialArgs;
+        modules = [
-          modules = [
+          # Host-specific darwin configuration
-            # Host-specific darwin configuration
+          ./hosts/personal
-            ./hosts/personal
 
-            # Home Manager as a darwin module
+          # Home Manager as a darwin module
-            home-manager.darwinModules.home-manager
+          home-manager.darwinModules.home-manager
-            {
-              home-manager = {
-                useGlobalPkgs = true;
-                useUserPackages = true;
-                extraSpecialArgs = specialArgs;
-                users.${username} =
-                  { ... }:
-                  {
-                    imports = [
-                      ./home
-                      ./home/personal.nix
-                    ];
-                  };
-              };
-            }
-          ];
-        };
-
-        # Work machine configuration
-        "work" = nix-darwin.lib.darwinSystem {
-          system = "aarch64-darwin";
-          inherit specialArgs;
-          modules = [
-            # Host-specific darwin configuration
-            ./hosts/work
-
-            # Home Manager as a darwin module
-            home-manager.darwinModules.home-manager
-            {
-              home-manager = {
-                useGlobalPkgs = true;
-                useUserPackages = true;
-                extraSpecialArgs = specialArgs;
-                users.${username} =
-                  { ... }:
-                  {
-                    imports = [
-                      ./home
-                      ./home/work.nix
-                    ];
-                  };
-              };
-            }
-          ];
-        };
-      };
-
-      # Development shell for working on this repository
-      devShells =
-        let
-          systems = [
-            "aarch64-darwin"
-            "x86_64-darwin"
-          ];
-          forAllSystems = nixpkgs.lib.genAttrs systems;
-        in
-        forAllSystems (
-          system:
-          let
-            pkgs = nixpkgs.legacyPackages.${system};
-          in
           {
-            default = pkgs.mkShell {
+            home-manager = {
-              packages = with pkgs; [
+              useGlobalPkgs = true;
-                nixfmt-rfc-style
+              useUserPackages = true;
-                nil # Nix LSP
+              extraSpecialArgs = specialArgs;
-              ];
+              users.${username} = {...}: {
+                imports = [
+                  ./home
+                  ./home/personal.nix
+                ];
+              };
             };
           }
-        );
+        ];
+      };
+
+      # Work machine configuration
+      "work" = nix-darwin.lib.darwinSystem {
+        system = "aarch64-darwin";
+        inherit specialArgs;
+        modules = [
+          # Host-specific darwin configuration
+          ./hosts/work
+
+          # Home Manager as a darwin module
+          home-manager.darwinModules.home-manager
+          {
+            home-manager = {
+              useGlobalPkgs = true;
+              useUserPackages = true;
+              extraSpecialArgs = specialArgs;
+              users.${username} = {...}: {
+                imports = [
+                  ./home
+                  ./home/work.nix
+                ];
+              };
+            };
+          }
+        ];
+      };
     };
+
+    # Development shell for working on this repository
+    devShells = let
+      systems = ["aarch64-darwin" "x86_64-darwin"];
+      forAllSystems = nixpkgs.lib.genAttrs systems;
+    in
+      forAllSystems (system: let
+        pkgs = nixpkgs.legacyPackages.${system};
+      in {
+        default = pkgs.mkShell {
+          packages = with pkgs; [
+            nixfmt-rfc-style
+            nil # Nix LSP
+          ];
+        };
+      });
+  };
 }

home/default.nix

@@ -9,8 +9,7 @@
   username,
   inputs,
   ...
-}:
+}: {
-{
   # Import shared modules
   imports = [
     inputs.zen-browser.homeModules.beta
@@ -33,7 +32,7 @@
 
   home = {
     # Home Manager needs a bit of information about you and the paths it should manage
-    inherit username;
+    username = username;
     homeDirectory = "/Users/${username}";
 
     # This value determines the Home Manager release that your configuration is

home/personal.nix

@@ -7,8 +7,7 @@
   pkgs,
   lib,
   ...
-}:
+}: {
-{
   # Import personal-specific modules
   imports = [
     ../modules/home/git.nix

home/work.nix

@@ -7,8 +7,7 @@
   pkgs,
   lib,
   ...
-}:
+}: {
-{
   # Import work-specific modules
   imports = [
     ../modules/home/git.nix

hosts/personal/default.nix

@@ -8,14 +8,14 @@
   lib,
   username,
   ...
-}:
+}: {
-{
   # Import darwin modules
   imports = [
     ../../modules/darwin/system.nix
     ../../modules/darwin/homebrew.nix
   ];
 
+
   # System-level programs
   programs = {
     # Enable zsh as it's the default macOS shell

hosts/work/default.nix

@@ -8,8 +8,7 @@
   lib,
   username,
   ...
-}:
+}: {
-{
   # Import darwin modules
   imports = [
     ../../modules/darwin/system.nix

mise.toml

@@ -1,2 +0,0 @@
-[tools]
-rust = "latest"

modules/darwin/homebrew.nix

@@ -9,11 +9,9 @@
   pkgs,
   ...
 }:
-with lib;
+with lib; let
-let
   cfg = config.modules.homebrew;
-in
+in {
-{
   options.modules.homebrew = {
     enable = mkEnableOption "Homebrew management via nix-darwin";
 
@@ -29,11 +27,9 @@ in
           # Terminal & Development
           "ghostty"
           "dbeaver-community"
-          "visual-studio-code"
 
           # Window management
           "aerospace"
-          "claude-code"
 
           # Productivity
           "raycast"
@@ -46,8 +42,6 @@ in
           # Networking & IoT
           "localsend"
           "home-assistant"
-
-          "cursor-cli"
         ];
         description = "Homebrew casks to install on all machines";
       };
@@ -65,7 +59,6 @@ in
 
           # Communication
           "signal"
-          "thunderbird"
 
           # Gaming
           "steam"
@@ -110,6 +103,7 @@ in
         "fluxcd/tap/flux"
         "sst/tap/opencode"
         "tree-sitter-cli"
+        "borders"
       ];
       description = "Homebrew formulae to install (for packages not in nixpkgs)";
     };
@@ -129,11 +123,7 @@ in
 
     # Cleanup behavior
     cleanup = mkOption {
-      type = types.enum [
+      type = types.enum ["none" "uninstall" "zap"];
-        "none"
-        "uninstall"
-        "zap"
-      ];
       default = "zap";
       description = ''
         Cleanup behavior for Homebrew packages:
@@ -156,7 +146,7 @@ in
         # Upgrade outdated packages
         upgrade = true;
         # Cleanup behavior for unmanaged packages
-        inherit (cfg) cleanup;
+        cleanup = cfg.cleanup;
       };
 
       # Global settings
@@ -168,18 +158,26 @@ in
       };
 
       # Taps (third-party repositories)
-      inherit (cfg) taps;
+      taps = cfg.taps;
 
       # Formulae (CLI tools from Homebrew)
-      inherit (cfg) brews;
+      brews = cfg.brews;
 
       caskArgs.no_quarantine = true;
 
       # Casks (GUI applications)
       casks =
         cfg.casks.shared
-        ++ (if cfg.casks.enablePersonal then cfg.casks.personal else [ ])
+        ++ (
-        ++ (if cfg.casks.enableWork then cfg.casks.work else [ ]);
+          if cfg.casks.enablePersonal
+          then cfg.casks.personal
+          else []
+        )
+        ++ (
+          if cfg.casks.enableWork
+          then cfg.casks.work
+          else []
+        );
     };
   };
 }

modules/darwin/system.nix

@@ -5,16 +5,12 @@
   lib,
   username,
   ...
-}:
+}: {
-{
   # Nix configuration
   nix = {
     settings = {
       # Enable flakes and new nix command
-      experimental-features = [
+      experimental-features = ["nix-command" "flakes"];
-        "nix-command"
-        "flakes"
-      ];
       # Avoid unwanted garbage collection when using nix-direnv
       keep-outputs = true;
       keep-derivations = true;
@@ -39,6 +35,7 @@
         DisableConsoleAccess = true;
       };
 
+
       dock = {
         autohide = true;
         autohide-delay = 0.0;

modules/home/apps.nix

@@ -7,11 +7,9 @@
   pkgs,
   lib,
   ...
-}:
+}: let
-let
   cfg = config.modules.apps;
-in
+in {
-{
   options.modules.apps = {
     enable = lib.mkEnableOption "application configurations";
 
@@ -31,6 +29,7 @@ in
       };
     };
 
+
     jellyfin-tui = {
       enable = lib.mkOption {
         type = lib.types.bool;
@@ -67,42 +66,37 @@ in
   config = lib.mkIf cfg.enable {
     programs.zen-browser = lib.mkIf cfg.zen-browser.enable {
       enable = true;
-      policies =
+      policies = let
-        let
+        mkExtensionSettings = builtins.mapAttrs (_: pluginId: {
-          mkExtensionSettings = builtins.mapAttrs (
+          install_url = "https://addons.mozilla.org/firefox/downloads/latest/${pluginId}/latest.xpi";
-            _: pluginId: {
+          installation_mode = "force_installed";
-              install_url = "https://addons.mozilla.org/firefox/downloads/latest/${pluginId}/latest.xpi";
+        });
-              installation_mode = "force_installed";
+      in {
-            }
+        AutofillAddressEnabled = true;
-          );
+        AutofillCreditCardEnabled = false;
-        in
+        DisableAppUpdate = true;
-        {
+        DisableFeedbackCommands = true;
-          AutofillAddressEnabled = true;
+        DisableFirefoxStudies = true;
-          AutofillCreditCardEnabled = false;
+        DisablePocket = true;
-          DisableAppUpdate = true;
+        DisableTelemetry = true;
-          DisableFeedbackCommands = true;
+        DontCheckDefaultBrowser = true;
-          DisableFirefoxStudies = true;
+        NoDefaultBookmarks = true;
-          DisablePocket = true;
+        OfferToSaveLogins = false;
-          DisableTelemetry = true;
+        EnableTrackingProtection = {
-          DontCheckDefaultBrowser = true;
+          Value = true;
-          NoDefaultBookmarks = true;
+          Locked = true;
-          OfferToSaveLogins = false;
+          Cryptomining = true;
-          EnableTrackingProtection = {
+          Fingerprinting = true;
-            Value = true;
-            Locked = true;
-            Cryptomining = true;
-            Fingerprinting = true;
-          };
-
-          ExtensionSettings = mkExtensionSettings {
-            #"78272b6fa58f4a1abaac99321d503a20@proton.me" = "proton-pass";
-            "{446900e4-71c2-419f-a6a7-df9c091e268b}" = "bitwarden-password-manager";
-            "{d7742d87-e61d-4b78-b8a1-b469842139fa}" = "vimium-ff";
-            "readeck@readeck.com" = "readeck";
-            "@testpilot-containers" = "multi-account-containers";
-            "uBlock0@raymondhill.net" = "ublock-origin";
-          };
         };
+
+        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)

modules/home/git-files.nix

@@ -13,42 +13,34 @@
   lib,
   ...
 }:
-with lib;
+with lib; let
-let
   cfg = config.modules.gitFiles;
 
   # Helper function to generate gitconfig content
-  mkGitConfig =
+  mkGitConfig = {
-    {
+    email,
-      email,
+    signingKey,
-      signingKey,
+    urlRewrites ? {},
-      urlRewrites ? { },
+  }: ''
-    }:
+    [user]
-    ''
+    	email = ${email}
-      [user]
+    	name = Morten Olsen
-      	email = ${email}
+      signingkey = ${signingKey}
-      	name = Morten Olsen
-        signingkey = ${signingKey}
 
-      [commit]
+    [commit]
-        gpgsign = true
+      gpgsign = true
 
-      [gpg]
+    [gpg]
-        format = ssh
+      format = ssh
 
-      [gpg "ssh"]
+    [gpg "ssh"]
-        program = "/Applications/1Password.app/Contents/MacOS/op-ssh-sign"
+      program = "/Applications/1Password.app/Contents/MacOS/op-ssh-sign"
-      ${optionalString (urlRewrites != { }) (
+    ${optionalString (urlRewrites != {}) (concatStringsSep "\n" (mapAttrsToList (name: value: ''
-        concatStringsSep "\n" (
-          mapAttrsToList (name: value: ''
 
-            [url "${name}"]
+    [url "${name}"]
-              insteadOf = ${value}'') urlRewrites
+      insteadOf = ${value}'') urlRewrites))}
-        )
+  '';
-      )}
+in {
-    '';
-in
-{
   options.modules.gitFiles = {
     enable = mkEnableOption "Project-specific git configuration files";
 
@@ -110,8 +102,8 @@ in
       # Used on personal machine for all projects under ~/Projects/
       (mkIf cfg.personal.enable {
         "Projects/.gitconfig".text = mkGitConfig {
-          inherit (cfg.personal) email;
+          email = cfg.personal.email;
-          inherit (cfg.personal) signingKey;
+          signingKey = cfg.personal.signingKey;
           urlRewrites = {
             "ssh://git@ssh-gitea.olsen.cloud:2205/" = "https://gitea.olsen.cloud/";
             "git@github-private:" = "https://github.com/";
@@ -123,8 +115,8 @@ in
       # Used on work machine for personal projects under ~/Projects/private/
       (mkIf cfg.private.enable {
         "Projects/private/.gitconfig".text = mkGitConfig {
-          inherit (cfg.private) email;
+          email = cfg.private.email;
-          inherit (cfg.private) signingKey;
+          signingKey = cfg.private.signingKey;
           urlRewrites = {
             "ssh://git@ssh-gitea.olsen.cloud:2205/" = "https://gitea.olsen.cloud/";
             "git@github-private:" = "https://github.com/";
@@ -136,8 +128,8 @@ in
       # Used on work machine for work projects under ~/Projects/zeronorth/
       (mkIf cfg.zeronorth.enable {
         "Projects/zeronorth/.gitconfig".text = mkGitConfig {
-          inherit (cfg.zeronorth) email;
+          email = cfg.zeronorth.email;
-          inherit (cfg.zeronorth) signingKey;
+          signingKey = cfg.zeronorth.signingKey;
           urlRewrites = {
             "git@github-zeronorth:" = "https://github.com/";
           };

modules/home/git.nix

@@ -11,11 +11,9 @@
   lib,
   ...
 }:
-with lib;
+with lib; let
-let
   cfg = config.modules.git;
-in
+in {
-{
   options.modules.git = {
     enable = mkEnableOption "Git configuration";
 
@@ -38,23 +36,21 @@ in
     };
 
     includes = mkOption {
-      type = types.listOf (
+      type = types.listOf (types.submodule {
-        types.submodule {
+        options = {
-          options = {
+          condition = mkOption {
-            condition = mkOption {
+            type = types.str;
-              type = types.str;
+            description = "The includeIf condition (e.g., gitdir:~/Projects/)";
-              description = "The includeIf condition (e.g., gitdir:~/Projects/)";
+            example = "gitdir:~/Projects/";
-              example = "gitdir:~/Projects/";
-            };
-            path = mkOption {
-              type = types.str;
-              description = "Path to the included gitconfig file";
-              example = "~/Projects/.gitconfig";
-            };
           };
-        }
+          path = mkOption {
-      );
+            type = types.str;
-      default = [ ];
+            description = "Path to the included gitconfig file";
+            example = "~/Projects/.gitconfig";
+          };
+        };
+      });
+      default = [];
       description = "List of conditional includes for project-specific git configurations";
     };
   };
@@ -92,8 +88,8 @@ in
 
       # Conditional includes for project-specific configurations
       includes = map (inc: {
-        inherit (inc) condition;
+        condition = inc.condition;
-        inherit (inc) path;
+        path = inc.path;
       }) cfg.includes;
 
       # All git settings using the new unified settings option

modules/home/packages.nix

@@ -9,8 +9,7 @@
   pkgs,
   lib,
   ...
-}:
+}: {
-{
   home.packages = with pkgs; [
     # ========================================================================
     # Shell Tools
@@ -64,6 +63,7 @@
     # Languages and Runtimes
     nodejs_22 # Node.js LTS (replaces NVM)
     deno # JavaScript/TypeScript runtime
+    rustup # Rust toolchain manager
     python313 # Python 3.13
     # pyenv is configured in shell.nix
     uv # Fast Python package installer
@@ -89,11 +89,8 @@
     k9s # Kubernetes TUI
     istioctl # Istio service mesh CLI
     fluxcd # GitOps toolkit
-    popeye
+    popeye # 
     argocd
-    kubeseal
-    kubebuilder
-    kind
 
     # ========================================================================
     # Infrastructure and Cloud Tools
@@ -136,12 +133,6 @@
     # ========================================================================
     nixfmt-rfc-style # Nix code formatter
     nil # Nix language server
-
-    # ========================================================================
-    # AAI tools
-    # ========================================================================
-    gemini-cli
-    opencode
   ];
 
   # ========================================================================

modules/home/shell.nix

@@ -13,8 +13,7 @@
   pkgs,
   lib,
   ...
-}:
+}: {
-{
   # ==========================================================================
   # Zsh Configuration
   # ==========================================================================
@@ -273,7 +272,6 @@
     ${pkgs.mise}/bin/mise use --global bun@latest
     ${pkgs.mise}/bin/mise use --global deno@latest
     ${pkgs.mise}/bin/mise use --global uv@latest
-    ${pkgs.mise}/bin/mise use --global rust@latest
   '';
 
   programs.nushell = {
@@ -305,7 +303,7 @@
       split row (char esep) |
       append /usr/bin/env
       )
-    '';
+      '';
     shellAliases = {
       vi = "hx";
       vim = "hx";

modules/home/ssh.nix

@@ -8,11 +8,9 @@
   lib,
   ...
 }:
-with lib;
+with lib; let
-let
   cfg = config.modules.ssh;
-in
+in {
-{
   options.modules.ssh = {
     enable = mkEnableOption "SSH configuration";
 
@@ -67,7 +65,7 @@ in
       enableDefaultConfig = false;
 
       # Include colima SSH config for container access
-      includes = [ "~/.colima/ssh_config" ];
+      includes = ["~/.colima/ssh_config"];
 
       # 1Password SSH agent integration (macOS)
       extraConfig = ''

modules/home/tmux.nix

@@ -7,8 +7,7 @@
   pkgs,
   lib,
   ...
-}:
+}: {
-{
   programs.tmux = {
     enable = true;
 
@@ -117,8 +116,6 @@
 
       # Utils - lazygit popup
       bind -r g display-popup -d '#{pane_current_path}' -w80% -h80% -E lazygit
-      bind -r o display-popup -d '#{pane_current_path}' -w80% -h80% -E yazi
-      bind -r p display-popup -d '#{pane_current_path}' -w80% -h80% -E $SHELL
     '';
   };
 }