diff options
| -rw-r--r-- | home/neovim/config.nix | 2 | ||||
| -rw-r--r-- | home/neovim/init.lua | 3 | ||||
| -rw-r--r-- | home/zsh/default.nix | 6 | ||||
| -rw-r--r-- | home/zsh/zshrc | 3 |
4 files changed, 9 insertions, 5 deletions
diff --git a/home/neovim/config.nix b/home/neovim/config.nix index 98895ed..b775e77 100644 --- a/home/neovim/config.nix +++ b/home/neovim/config.nix @@ -89,7 +89,7 @@ in base00 = "#${config.theme.colors.base}"; base01 = "#${config.theme.colors.surface}"; base02 = "#${config.theme.colors.surface}"; - base03 = "#${config.theme.colors.overlay}"; + base03 = "#${config.theme.colors.subtext}"; base04 = "#${config.theme.colors.subtext}"; base05 = "#${config.theme.colors.text}"; base06 = "#${config.theme.colors.text}"; diff --git a/home/neovim/init.lua b/home/neovim/init.lua index 7ff402a..7bfbae4 100644 --- a/home/neovim/init.lua +++ b/home/neovim/init.lua @@ -106,9 +106,6 @@ vim.api.nvim_set_hl(0, "Identifier", { fg = config.theme.colors.base05 }) vim.api.nvim_set_hl(0, "TSVariable", { fg = config.theme.colors.base05 }) -- macro should be colored as a keyword vim.api.nvim_set_hl(0, "TSFuncMacro", { fg = config.theme.colors.base0E }) --- comments are too dark -vim.api.nvim_set_hl(0, "Comment", { fg = config.theme.colors.base07 }) -vim.api.nvim_set_hl(0, "@comment", { link = "Comment" }) -- warnings should be yellow vim.api.nvim_set_hl(0, "DiagnosticWarn", { fg = config.theme.colors.base0A }) diff --git a/home/zsh/default.nix b/home/zsh/default.nix index 5de1c7c..b5f17ea 100644 --- a/home/zsh/default.nix +++ b/home/zsh/default.nix @@ -1,4 +1,4 @@ -{config, ...}: { +{config, pkgs, ...}: { programs.zsh = { enable = true; enableCompletion = true; @@ -12,6 +12,10 @@ home.file = { ".zshrc".source = ./zshrc; ".zprofile".source = ./zprofile; + ".nixenv".source = pkgs.writeText "nixenv" '' + # nix shell env auto generated file + export ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=#${config.theme.colors.subtext}' + ''; }; programs.zoxide = { diff --git a/home/zsh/zshrc b/home/zsh/zshrc index 6a366a0..0dd2904 100644 --- a/home/zsh/zshrc +++ b/home/zsh/zshrc @@ -72,3 +72,6 @@ bindkey "\e\d" undo # gpg export GPG_TTY=$(tty) export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) + +# nixos +source ~/.nixenv |