From 68d03fe362b7e0df11662d8d6a1e01eac0bfae77 Mon Sep 17 00:00:00 2001 From: Freya Murphy Date: Wed, 17 Sep 2025 22:07:16 -0400 Subject: refactor: remove modules folder, fully split home and system modules --- home/zsh/default.nix | 29 +++++++++++------------------ home/zsh/zshrc | 3 --- 2 files changed, 11 insertions(+), 21 deletions(-) (limited to 'home/zsh') diff --git a/home/zsh/default.nix b/home/zsh/default.nix index 8bb12db..2df01ef 100644 --- a/home/zsh/default.nix +++ b/home/zsh/default.nix @@ -1,30 +1,23 @@ { config, - pkgs, + lib, ... }: { programs.zsh = { enable = true; enableCompletion = true; - enableGlobalCompInit = false; - autosuggestions.enable = true; + autosuggestion = { + enable = true; + highlight = "fg=#${config.theme.colors.subtext}"; + }; syntaxHighlighting.enable = true; - histSize = 10000; + history.size = 10000; + profileExtra = lib.fileContents ./zprofile; + envExtra = lib.fileContents ./zshrc; }; - home-manager.users.${config.user} = { - 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 = { - enable = true; - enableZshIntegration = true; - }; + programs.zoxide = { + enable = true; + enableZshIntegration = true; }; } diff --git a/home/zsh/zshrc b/home/zsh/zshrc index 0dd2904..6a366a0 100644 --- a/home/zsh/zshrc +++ b/home/zsh/zshrc @@ -72,6 +72,3 @@ bindkey "\e\d" undo # gpg export GPG_TTY=$(tty) export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) - -# nixos -source ~/.nixenv -- cgit v1.2.3-freya