clean up zsh config

flake.lock

@@ -1,5 +1,68 @@
 {
   "nodes": {
+    "agenix": {
+      "inputs": {
+        "darwin": "darwin",
+        "home-manager": "home-manager",
+        "nixpkgs": "nixpkgs",
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1754433428,
+        "narHash": "sha256-NA/FT2hVhKDftbHSwVnoRTFhes62+7dxZbxj5Gxvghs=",
+        "owner": "ryantm",
+        "repo": "agenix",
+        "rev": "9edb1787864c4f59ae5074ad498b6272b3ec308d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ryantm",
+        "repo": "agenix",
+        "type": "github"
+      }
+    },
+    "darwin": {
+      "inputs": {
+        "nixpkgs": [
+          "agenix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1744478979,
+        "narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=",
+        "owner": "lnl7",
+        "repo": "nix-darwin",
+        "rev": "43975d782b418ebf4969e9ccba82466728c2851b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "lnl7",
+        "ref": "master",
+        "repo": "nix-darwin",
+        "type": "github"
+      }
+    },
+    "disko": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1755519972,
+        "narHash": "sha256-bU4nqi3IpsUZJeyS8Jk85ytlX61i4b0KCxXX9YcOgVc=",
+        "owner": "nix-community",
+        "repo": "disko",
+        "rev": "4073ff2f481f9ef3501678ff479ed81402caae6d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "disko",
+        "type": "github"
+      }
+    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -39,7 +102,7 @@
     },
     "flake-utils": {
       "inputs": {
-        "systems": "systems"
+        "systems": "systems_2"
       },
       "locked": {
         "lastModified": 1731533236,
@@ -76,7 +139,7 @@
     },
     "flake-utils_2": {
       "inputs": {
-        "systems": "systems_3"
+        "systems": "systems_4"
       },
       "locked": {
         "lastModified": 1694529238,
@@ -93,6 +156,27 @@
       }
     },
     "home-manager": {
+      "inputs": {
+        "nixpkgs": [
+          "agenix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1745494811,
+        "narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "home-manager_2": {
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
@@ -141,6 +225,22 @@
       }
     },
     "nixpkgs": {
+      "locked": {
+        "lastModified": 1754028485,
+        "narHash": "sha256-IiiXB3BDTi6UqzAZcf2S797hWEPCRZOwyNThJIYhUfk=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "59e69648d345d6e8fef86158c555730fa12af9de",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-25.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
       "locked": {
         "lastModified": 1755186698,
         "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=",
@@ -163,7 +263,7 @@
           "nixpkgs"
         ],
         "nuschtosSearch": "nuschtosSearch",
-        "systems": "systems_2"
+        "systems": "systems_3"
       },
       "locked": {
         "lastModified": 1755095763,
@@ -204,8 +304,10 @@
     },
     "root": {
       "inputs": {
-        "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs",
+        "agenix": "agenix",
+        "disko": "disko",
+        "home-manager": "home-manager_2",
+        "nixpkgs": "nixpkgs_2",
         "nixvim": "nixvim",
         "snowfall-lib": "snowfall-lib"
       }
@@ -276,6 +378,21 @@
         "repo": "default",
         "type": "github"
       }
+    },
+    "systems_4": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -2,22 +2,24 @@
   description = "Yadunand's Configuration";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    snowfall-lib = {
-      url = "github:snowfallorg/lib";
+    agenix.url = "github:ryantm/agenix";
+    disko = {
+      url = "github:nix-community/disko";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     nixvim = {
       url = "github:nix-community/nixvim";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-
+    snowfall-lib = {
+      url = "github:snowfallorg/lib";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs =

homes/aarch64-darwin/yadunut@yadunut-mbp/default.nix

@@ -5,15 +5,6 @@
   ...
 }:
 {
-  # This value determines the Home Manager release that your configuration is
-  # compatible with. This helps avoid breakage when a new Home Manager release
-  # introduces backwards incompatible changes.
-  #
-  # You should not change this value, even if you update Home Manager. If you do
-  # want to update the value, then make sure to first check the Home Manager
-  # release notes.
-  home.stateVersion = "23.11"; # Please read the comment before changing.
-
   home.packages = [
     # pkgs.dive
     pkgs.entr
@@ -21,7 +12,6 @@
     pkgs.just
     pkgs.rsync
     pkgs.claude-code
-    pkgs.devenv
     pkgs.dive
   ];
 
@@ -37,6 +27,7 @@
   ];
 
   zsh.enable = true;
+  nushell.enable = false;
   neovim.enable = true;
   git = {
     enable = true;
@@ -44,9 +35,6 @@
     signingKey = "~/.ssh/yadunut_ed25519.pub";
   };
 
-  # Let Home Manager install and manage itself.
-  programs.home-manager.enable = true;
-
   targets.darwin = {
     defaults."com.apple.dock".autohide = true;
     defaults."com.apple.finder".AppleShowAllFiles = true;
@@ -54,4 +42,6 @@
     defaults.NSGlobalDomain.KeyRepeat = 2;
     defaults.NSGlobalDomain.ApplePressAndHoldEnabled = false;
   };
+  home.stateVersion = "23.11"; # Please read the comment before changing.
+  programs.home-manager.enable = true;
 }

homes/x86_64-linux/yadunut@penguin/default.nix

@@ -0,0 +1,48 @@
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}:
+{
+  home.packages = with pkgs; [
+    seahorse
+    wl-clipboard
+  ];
+  git = {
+    enable = true;
+    signingKey = "~/.ssh/id_ed25519.pub";
+  };
+  zsh.enable = true;
+  neovim.enable = true;
+
+  services = {
+    darkman.enable = true;
+    hyprpolkitagent.enable = true;
+    cliphist.enable = true;
+
+    ollama = {
+      enable = true;
+      host = "0.0.0.0";
+      port = 11434;
+    };
+  };
+
+  programs.git.extraConfig.credential.helper = lib.mkForce [
+    "${pkgs.git.override { withLibsecret = true; }}/bin/git-credential-libsecret"
+    "${pkgs.git-credential-oauth}/bin/git-credential-oauth"
+  ];
+
+  programs = {
+    waybar = {
+      enable = true;
+      systemd.enable = true;
+    };
+    gh.enable = true;
+    zed-editor.enable = true;
+    firefox.enable = true;
+  };
+
+  home.stateVersion = "25.11";
+  programs.home-manager.enable = true;
+}

modules/home/nushell/default.nix

@@ -0,0 +1,55 @@
+{
+  config,
+  lib,
+  pkgs,
+  inputs,
+  ...
+}:
+let
+  cfg = config.nushell;
+  inherit (lib) mkEnableOption mkIf mkOption;
+in
+{
+  options.nushell = {
+    enable = mkEnableOption "nushell";
+  };
+
+  config = mkIf cfg.enable {
+    programs = {
+      nushell = {
+        enable = true;
+      };
+      nix-your-shell = {
+        enable = true;
+        enableNushellIntegration = true;
+      };
+      direnv = {
+        enable = true;
+        enableNushellIntegration = true;
+        nix-direnv.enable = true;
+        config = {
+          hide_env_diff = true;
+        };
+      };
+      eza = {
+        enable = true;
+        enableNushellIntegration = true;
+        extraOptions = [ "--group-directories-first" ];
+      };
+      starship = {
+        enable = true;
+        enableNushellIntegration = false;
+        settings = {
+          nodejs.disabled = true;
+          package.disabled = true;
+          aws.disabled = true;
+          python.disabled = true;
+        };
+      };
+
+      zoxide = {
+        enableNushellIntegration = false;
+      };
+    };
+  };
+}

modules/home/zsh/default.nix

@@ -23,66 +23,72 @@ in
       ripgrep
       wget
       delta
+      devenv
     ];
 
-    programs.bat = {
-      enable = true;
-    };
-
-    programs.dircolors = {
-      enable = true;
-      enableZshIntegration = true;
-    };
-
-    programs.direnv = {
-      enable = true;
-      enableZshIntegration = true;
-      nix-direnv.enable = true;
-      config = {
-        hide_env_diff = true;
+    programs = {
+      bat = {
+        enable = true;
       };
-    };
-    programs.zsh = {
-      enable = true;
-      enableCompletion = true;
-      syntaxHighlighting.enable = true;
-      autosuggestion.enable = true;
-      autocd = true;
-      history = {
-        size = 1000000;
-        extended = true;
-        append = true;
-        expireDuplicatesFirst = true;
-        ignoreDups = true;
-        ignoreAllDups = true;
-        ignoreSpace = true;
+      dircolors = {
+        enable = true;
+        enableZshIntegration = true;
       };
-      historySubstringSearch.enable = true;
-      shellAliases = {
-        cat = "bat --theme=\"$(defaults read -globalDomain AppleInterfaceStyle &> /dev/null && echo 'gruvbox-dark' || echo 'gruvbox-light')\"";
-        diff = "delta";
+      direnv = {
+        enable = true;
+        enableZshIntegration = true;
+        nix-direnv.enable = true;
+        config = {
+          hide_env_diff = true;
+        };
       };
-    };
-    programs.fzf.enable = true;
-    programs.fzf.enableZshIntegration = true;
-
-    programs.zoxide.enable = true;
-    programs.zoxide.enableZshIntegration = true;
-
-    programs.eza = {
-      enable = true;
-      enableZshIntegration = true;
-      extraOptions = [ "--group-directories-first" ];
-    };
-
-    programs.starship = {
-      enable = true;
-      enableZshIntegration = true;
-      settings = {
-        nodejs.disabled = true;
-        package.disabled = true;
-        aws.disabled = true;
-        python.disabled = true;
+      nix-your-shell = {
+        enable = true;
+        enableZshIntegration = true;
+      };
+      zsh = {
+        enable = true;
+        enableCompletion = true;
+        syntaxHighlighting.enable = true;
+        autosuggestion.enable = true;
+        autocd = true;
+        history = {
+          size = 1000000;
+          extended = true;
+          append = true;
+          expireDuplicatesFirst = true;
+          ignoreDups = true;
+          ignoreAllDups = true;
+          ignoreSpace = true;
+        };
+        historySubstringSearch.enable = true;
+        shellAliases = {
+          cat = "bat --theme=\"$(defaults read -globalDomain AppleInterfaceStyle &> /dev/null && echo 'gruvbox-dark' || echo 'gruvbox-light')\"";
+          diff = "delta";
+        };
+      };
+      fzf = {
+        enable = true;
+        enableZshIntegration = true;
+      };
+      zoxide = {
+        enable = true;
+        enableZshIntegration = true;
+      };
+      eza = {
+        enable = true;
+        enableZshIntegration = true;
+        extraOptions = [ "--group-directories-first" ];
+      };
+      starship = {
+        enable = true;
+        enableZshIntegration = true;
+        settings = {
+          nodejs.disabled = true;
+          package.disabled = true;
+          aws.disabled = true;
+          python.disabled = true;
+        };
       };
     };
   };