From b66ea884dfa44f9a126cd491c8cb7e91253ea104 Mon Sep 17 00:00:00 2001 From: schererleander Date: Sat, 10 May 2025 18:52:13 +0200 Subject: change terminal stuff --- hosts/darwin/home.nix | 1 - modules/foot.nix | 47 +++++++++++++++++++++++++++-------------------- modules/zsh.nix | 16 +++++++++++++++- 3 files changed, 42 insertions(+), 22 deletions(-) diff --git a/hosts/darwin/home.nix b/hosts/darwin/home.nix index 2eed3d7..a3aabf6 100644 --- a/hosts/darwin/home.nix +++ b/hosts/darwin/home.nix @@ -13,7 +13,6 @@ htop ffmpeg pfetch - zoxide mas #dev diff --git a/modules/foot.nix b/modules/foot.nix index 715c941..9804db4 100644 --- a/modules/foot.nix +++ b/modules/foot.nix @@ -19,28 +19,35 @@ in { line-height = 12; }; + cursor = { + style = "underline"; + unfocused-style = "unchanged"; + blink = true; + }; + colors = { alpha=0.9; - background = "000000"; - foreground = "f8f8f6"; - - regular0 = "232a2d"; - regular1 = "e57474"; - regular2 = "8ccf7e"; - regular3 = "e5c76b"; - regular4 = "67b0e8"; - regular5 = "c47fd5"; - regular6 = "6cbfbf"; - regular7 = "b3b9b8"; - - bright0 = "2d3437"; - bright1 = "ef7e7e"; - bright2 = "96d988"; - bright3 = "f4d67a"; - bright4 = "71baf2"; - bright5 = "ce89df"; - bright6 = "67cbe7"; - bright7 = "bdc3c2"; + # Gruvbox Theme + background = "000000"; + foreground = "ebdbb2"; + + regular0 = "282828"; + regular1 = "cc241d"; + regular2 = "98971a"; + regular3 = "d79921"; + regular4 = "458588"; + regular5 = "b16286"; + regular6 = "689d6a"; + regular7 = "a89984"; + + bright0 = "928374"; + bright1 = "fb4934"; + bright2 = "b8bb26"; + bright3 = "fabd2f"; + bright4 = "83a598"; + bright5 = "d3869b"; + bright6 = "8ec07c"; + bright7 = "ebdbb2"; }; }; }; diff --git a/modules/zsh.nix b/modules/zsh.nix index 9389d51..3aca8a7 100644 --- a/modules/zsh.nix +++ b/modules/zsh.nix @@ -6,6 +6,10 @@ in { options.zsh.enable = lib.mkEnableOption "Configure zsh"; config = lib.mkIf cfg.enable { + home.packages = with pkgs; [ + zoxide + ]; + programs.zsh = { enable = true; enableCompletion = true; @@ -18,14 +22,24 @@ in { zstyle ':completion:*' special-dirs true zstyle ':completion:*' squeeze-slashes true zstyle ':completion:*' add-space false + + # Case-insensitive completion + zstyle ':completion:*' matcher-list 'm:{a-z}={A-Z}' + + # vim keybdings + bindkey -v + eval "$(zoxide init zsh)" ''; + shellAliases = { + ls = "ls --color=auto"; + }; + zplug = { enable = true; plugins = [ { name = "mafredri/zsh-async"; } - { name = "zpm-zsh/colorize"; } { name = "sindresorhus/pure"; tags = [ "as:theme" "use:pure.zsh" ]; } { name = "zdharma-continuum/fast-syntax-highlighting"; } { name = "zsh-users/zsh-autosuggestions"; } -- cgit v1.3.1