diff --git a/nix/home/yt/chunk.nix b/nix/home/yt/chunk.nix index 6faaeb8..820a945 100644 --- a/nix/home/yt/chunk.nix +++ b/nix/home/yt/chunk.nix @@ -28,10 +28,6 @@ programs.neovim.enable = true; home.packages = with pkgs; [ - fzf - eza - zoxide - delta lua-language-server vim-language-server python312Packages.python-lsp-server diff --git a/nix/home/yt/ytnix.nix b/nix/home/yt/ytnix.nix index 0e2c6d1..67b3dfc 100644 --- a/nix/home/yt/ytnix.nix +++ b/nix/home/yt/ytnix.nix @@ -63,9 +63,6 @@ bitwarden-desktop bitwarden-cli aerc - delta - fzf - eza fastfetch discord nwg-look @@ -76,12 +73,9 @@ mpv yt-dlp signal-desktop - cosign azure-cli pavucontrol btop - stockfish - cutechess grim slurp rofi-wayland @@ -89,12 +83,9 @@ cliphist jq bash-language-server - duckdb sqlite usbutils llvmPackages_19.clang-tools - ghc - zola calibre tor-browser wtype @@ -113,7 +104,6 @@ foot minisign unzip - obsidian lm_sensors sshfs nextcloud-client diff --git a/nix/home/yt/zsh/default.nix b/nix/home/yt/zsh/default.nix index 920a46b..46424a5 100644 --- a/nix/home/yt/zsh/default.nix +++ b/nix/home/yt/zsh/default.nix @@ -20,9 +20,7 @@ "zsh-users/zsh-completions" "romkatv/powerlevel10k" "Aloxaf/fzf-tab" - "z-shell/zsh-eza" "ohmyzsh/ohmyzsh path:plugins/colored-man-pages" - "ohmyzsh/ohmyzsh path:plugins/git" ]; }; history = { @@ -56,6 +54,25 @@ "nrs" = "sudo nixos-rebuild switch --flake ."; "nrt" = "sudo nixos-rebuild test --flake ."; "hrs" = "home-manager switch --flake ."; + "g" = "git"; + "ga" = "git add"; + "gaa" = "git add --all"; + "gb" = "git branch"; + "gc" = "git commit --verbose"; + "gcmsg" = "git commit --message"; + "gd" = "git diff"; + "gdca" = "git diff --cached"; + "gds" = "git diff --staged"; + "gl" = "git log --stat"; + "glg" = "git log --graph"; + "glga" = "git log --graph --decorate --all"; + "glo" = "git log --oneline --decorate"; + "gp" = "git push"; + "gr" = "git remote"; + "gra" = "git remote add"; + "grv" = "git remote --verbose"; + "gs" = "git status --short"; + "gss" = "git status"; }; sessionVariables = { "FZF_DEFAULT_COMMAND" = "rg"; @@ -72,4 +89,9 @@ enableZshIntegration = true; options = [ "--cmd cd" ]; }; + + programs.eza = { + enable = true; + enableZshIntegration = true; + }; }