From 0626d19c756f03852b07a71a0d0ed6133dd49532 Mon Sep 17 00:00:00 2001 From: Daniel Kempkens Date: Tue, 24 Dec 2024 01:41:50 +0100 Subject: [PATCH] zsh: update various systems --- home/config/nvim/nifoc/theme.fnl | 3 +-- home/config/wezterm/config.fnl | 3 +-- home/hosts/argon.nix | 2 +- home/hosts/mediaserver.nix | 1 - home/hosts/neon.nix | 2 +- home/hosts/tanker.nix | 2 +- home/programs/zsh/default.nix | 11 ++++++++++- system/hosts/argon.nix | 3 +-- system/hosts/mediaserver.nix | 1 - system/hosts/neon.nix | 3 +-- system/hosts/tanker.nix | 8 +++++--- 11 files changed, 22 insertions(+), 17 deletions(-) diff --git a/home/config/nvim/nifoc/theme.fnl b/home/config/nvim/nifoc/theme.fnl index afa221e..24ab268 100644 --- a/home/config/nvim/nifoc/theme.fnl +++ b/home/config/nvim/nifoc/theme.fnl @@ -14,8 +14,7 @@ (set mod.colors dracula-colors) (fn mod.setup [] - (set g.dracula_show_end_of_buffer false) - (set g.dracula_italic_comment true) + (dracula.setup {:show_end_of_buffer false :italic_comment true}) (set o.background :dark) (colorscheme :dracula) ;; Tabline diff --git a/home/config/wezterm/config.fnl b/home/config/wezterm/config.fnl index 84eaa08..07e54f7 100644 --- a/home/config/wezterm/config.fnl +++ b/home/config/wezterm/config.fnl @@ -173,8 +173,7 @@ :new_tab_hover {:bg_color colors.hover-background :fg_color colors.hover-foreground}}} ;; Fonts - :font (wezterm.font_with_fallback [{:family "Berkeley Mono" - :weight :Regular} + :font (wezterm.font_with_fallback ["Berkeley Mono" "Symbols Nerd Font" "Apple Symbols" "Apple Color Emoji" diff --git a/home/hosts/argon.nix b/home/hosts/argon.nix index f847c11..5a7529a 100644 --- a/home/hosts/argon.nix +++ b/home/hosts/argon.nix @@ -2,7 +2,7 @@ { imports = [ - ../programs/fish.nix + ../programs/zsh ../programs/atuin.nix ../programs/starship.nix diff --git a/home/hosts/mediaserver.nix b/home/hosts/mediaserver.nix index b4c102a..577fe5a 100644 --- a/home/hosts/mediaserver.nix +++ b/home/hosts/mediaserver.nix @@ -2,7 +2,6 @@ { imports = [ - ../programs/fish.nix ../programs/zsh ../programs/atuin.nix ../programs/starship.nix diff --git a/home/hosts/neon.nix b/home/hosts/neon.nix index da3e8e4..210867d 100644 --- a/home/hosts/neon.nix +++ b/home/hosts/neon.nix @@ -2,7 +2,7 @@ { imports = [ - ../programs/fish.nix + ../programs/zsh ../programs/starship.nix ../programs/git.nix diff --git a/home/hosts/tanker.nix b/home/hosts/tanker.nix index 17cb0b2..f453cb7 100644 --- a/home/hosts/tanker.nix +++ b/home/hosts/tanker.nix @@ -2,7 +2,7 @@ { imports = [ - ../programs/fish.nix + ../programs/zsh ../programs/atuin.nix ../programs/starship.nix diff --git a/home/programs/zsh/default.nix b/home/programs/zsh/default.nix index 7531bf1..b02c349 100644 --- a/home/programs/zsh/default.nix +++ b/home/programs/zsh/default.nix @@ -20,7 +20,6 @@ in syntaxHighlighting = { enable = true; - highlighters = [ "main" "brackets" ]; }; plugins = [ @@ -102,13 +101,23 @@ in }; initExtra = /* sh */ '' + # Options + setopt AUTO_CD + setopt AUTO_PUSHD + setopt PUSHD_IGNORE_DUPS + setopt INTERACTIVE_COMMENTS + # Keymaps bindkey '^[[1;3C' forward-word # Alt+Right bindkey '^[[1;3D' backward-word # Alt+Left # Plugins + ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets cursor) + typeset -gA ZSH_HIGHLIGHT_STYLES + ZSH_TAB_TITLE_ENABLE_FULL_COMMAND=true ZSH_TAB_TITLE_DEFAULT_DISABLE_PREFIX=true + ZSH_TAB_TITLE_ADDITIONAL_TERMS='wezterm' AUTO_NOTIFY_THRESHOLD=10 diff --git a/system/hosts/argon.nix b/system/hosts/argon.nix index d476e1a..be2d27c 100644 --- a/system/hosts/argon.nix +++ b/system/hosts/argon.nix @@ -215,7 +215,6 @@ in }; programs = { - fish.enable = true; zsh.enable = true; htop.enable = true; }; @@ -231,7 +230,7 @@ in home = "/home/daniel"; description = "Daniel"; extraGroups = [ "wheel" ]; - shell = pkgs.fish; + shell = pkgs.zsh; openssh.authorizedKeys.keys = [ ssh-keys.LAN ssh-keys.DanielsPhone ]; }; diff --git a/system/hosts/mediaserver.nix b/system/hosts/mediaserver.nix index 8cb9e55..89c0c49 100644 --- a/system/hosts/mediaserver.nix +++ b/system/hosts/mediaserver.nix @@ -154,7 +154,6 @@ in fonts.fontconfig.enable = false; programs = { - fish.enable = true; zsh.enable = true; htop.enable = true; }; diff --git a/system/hosts/neon.nix b/system/hosts/neon.nix index bddaca9..a73bf0c 100644 --- a/system/hosts/neon.nix +++ b/system/hosts/neon.nix @@ -149,7 +149,6 @@ in services.hardware.argonone.enable = true; programs = { - fish.enable = true; zsh.enable = true; htop.enable = true; }; @@ -165,7 +164,7 @@ in home = "/home/daniel"; description = "Daniel"; extraGroups = [ "wheel" ]; - shell = pkgs.fish; + shell = pkgs.zsh; openssh.authorizedKeys.keys = [ ssh-keys.LAN ]; }; }; diff --git a/system/hosts/tanker.nix b/system/hosts/tanker.nix index 8de54f1..d7dbfbf 100644 --- a/system/hosts/tanker.nix +++ b/system/hosts/tanker.nix @@ -174,8 +174,10 @@ in fonts.fontconfig.enable = false; - programs.fish.enable = true; - programs.htop.enable = true; + programs = { + htop.enable = true; + zsh.enable = true; + }; users.users = { root = { @@ -188,7 +190,7 @@ in home = "/home/daniel"; description = "Daniel"; extraGroups = [ "wheel" ]; - shell = pkgs.fish; + shell = pkgs.zsh; openssh.authorizedKeys.keys = [ ssh-keys.Hetzner ssh-keys.DanielsPhone ]; }; };