From 889e07f91756e07bce92c36bba762c6d481c1872 Mon Sep 17 00:00:00 2001 From: Yadunand Prem Date: Tue, 22 Jul 2025 11:45:20 -0400 Subject: [PATCH] feat: migrate away from zpreszto --- flake.lock | 24 +++++++++++----------- flake.nix | 1 + modules/zsh.nix | 47 ++++++++++++++++++++++---------------------- penguin/home.nix | 7 ++++--- yadunut-mbp/home.nix | 3 +-- 5 files changed, 42 insertions(+), 40 deletions(-) diff --git a/flake.lock b/flake.lock index 1681637..e45169d 100644 --- a/flake.lock +++ b/flake.lock @@ -50,11 +50,11 @@ ] }, "locked": { - "lastModified": 1752541678, - "narHash": "sha256-dyhGzkld6jPqnT/UfGV2oqe7tYn7hppAqFvF3GZTyXY=", + "lastModified": 1753140376, + "narHash": "sha256-7lrVrE0jSvZHrxEzvnfHFE/Wkk9DDqb+mYCodI5uuB8=", "owner": "nix-community", "repo": "disko", - "rev": "2bf3421f7fed5c84d9392b62dcb9d76ef09796a7", + "rev": "545aba02960caa78a31bd9a8709a0ad4b6320a5c", "type": "github" }, "original": { @@ -166,11 +166,11 @@ ] }, "locked": { - "lastModified": 1752603129, - "narHash": "sha256-S+wmHhwNQ5Ru689L2Gu8n1OD6s9eU9n9mD827JNR+kw=", + "lastModified": 1753180535, + "narHash": "sha256-KEtlzMs2O7FDvciFtjk9W4hyau013Pj9qZNK9a0PxEc=", "owner": "nix-community", "repo": "home-manager", - "rev": "e8c19a3cec2814c754f031ab3ae7316b64da085b", + "rev": "847711c7ffa9944b0c5c39a8342ac8eb6a9f9abc", "type": "github" }, "original": { @@ -225,11 +225,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1752480373, - "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", + "lastModified": 1752950548, + "narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08", + "rev": "c87b95e25065c028d31a94f06a62927d18763fdf", "type": "github" }, "original": { @@ -265,11 +265,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1752546848, - "narHash": "sha256-WzHqmJ1wEZoUGAedomwcVLCuNsiB9bZzZXk7K9ZDBwk=", + "lastModified": 1752976861, + "narHash": "sha256-59HcrqHfbSJUdmpzrAa9x8fW1PoS+ZGhCjL5k5HbyV8=", "owner": "nix-community", "repo": "nixvim", - "rev": "1fb1bf8a73ccf207dbe967cdb7f2f4e0122c8bd5", + "rev": "0c50ed9349199219583cb1ed1a972d71e06039ec", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 1e294f7..fa71e3b 100644 --- a/flake.nix +++ b/flake.nix @@ -107,6 +107,7 @@ devShells.default = pkgs.mkShell { buildInputs = [ pkgs.nixd + agenix.packages.${system}.default ]; }; } diff --git a/modules/zsh.nix b/modules/zsh.nix index 5267f61..31399e2 100644 --- a/modules/zsh.nix +++ b/modules/zsh.nix @@ -1,7 +1,8 @@ { pkgs, ... -}: { +}: +{ home.packages = with pkgs; [ zsh-completions @@ -12,7 +13,6 @@ lazygit ]; - programs.bat = { enable = true; }; @@ -30,11 +30,12 @@ }; }; - programs.git.extraConfig = { - user.signingkey = "~/.ssh/id_ed25519.pub"; - }; programs.zsh = { enable = true; + enableCompletion = true; + syntaxHighlighting.enable = true; + autosuggestion.enable = true; + autocd = true; history = { size = 1000000; extended = true; @@ -44,23 +45,23 @@ ignoreAllDups = true; ignoreSpace = true; }; - syntaxHighlighting.enable = true; - prezto = { - enable = true; - editor.keymap = "vi"; - editor.dotExpansion = true; - pmodules = [ - "environment" - "terminal" - "utility" - "directory" - "editor" - "history" - "syntax-highlighting" - "history-substring-search" - "autosuggestions" - ]; - }; + historySubstringSearch.enable = true; + # prezto = { + # enable = true; + # editor.keymap = "vi"; + # editor.dotExpansion = true; + # pmodules = [ + # # "environment" + # # "terminal" + # # "utility" + # # "directory" + # # "editor" + # # "history" + # # "syntax-highlighting" + # # "history-substring-search" + # # "autosuggestions" + # ]; + # }; shellAliases = { cat = "bat --theme=\"$(defaults read -globalDomain AppleInterfaceStyle &> /dev/null && echo 'gruvbox-dark' || echo 'gruvbox-light')\""; lg = "lazygit"; @@ -77,7 +78,7 @@ programs.eza = { enable = true; enableZshIntegration = true; - extraOptions = ["--group-directories-first"]; + extraOptions = [ "--group-directories-first" ]; }; programs.starship = { diff --git a/penguin/home.nix b/penguin/home.nix index 2e6c961..987ecc1 100644 --- a/penguin/home.nix +++ b/penguin/home.nix @@ -1,4 +1,5 @@ -{pkgs, lib, ...}:{ +{ pkgs, lib, ... }: +{ home.username = "yadunut"; home.homeDirectory = "/home/yadunut"; @@ -33,8 +34,8 @@ programs.git.extraConfig = { user.signingkey = "~/.ssh/id_ed25519.pub"; credential.helper = lib.mkForce [ - "${pkgs.git.override { withLibsecret = true; }}/bin/git-credential-libsecret" - "${pkgs.git-credential-oauth}/bin/git-credential-oauth" + "${pkgs.git.override { withLibsecret = true; }}/bin/git-credential-libsecret" + "${pkgs.git-credential-oauth}/bin/git-credential-oauth" ]; }; home.stateVersion = "25.11"; diff --git a/yadunut-mbp/home.nix b/yadunut-mbp/home.nix index 96e8aa3..aca3d89 100644 --- a/yadunut-mbp/home.nix +++ b/yadunut-mbp/home.nix @@ -45,6 +45,7 @@ pkgs.emacs pkgs.devenv pkgs.jj + pkgs.dive # # It is sometimes useful to fine-tune packages, for example, by applying @@ -97,8 +98,6 @@ }; }; - programs.kitty.shellIntegration.enableZshIntegration = true; - # Let Home Manager install and manage itself. programs.home-manager.enable = true;