diff options
| author | nsfisis <nsfisis@gmail.com> | 2024-08-17 02:57:11 +0900 |
|---|---|---|
| committer | nsfisis <nsfisis@gmail.com> | 2024-08-17 02:57:11 +0900 |
| commit | 4d13f7def1bdfebde5b8bd35bdfc4de2b7e87140 (patch) | |
| tree | 646dcb42684ec9db3e568e24d68b9dd9c55011b5 /home-manager/home.nix | |
| parent | 5ac97e5aceeea6a30fcce64b2d1257071f18f47d (diff) | |
| parent | 9ceb2eecf2f2e0d00452d1a30e1692c05466ff26 (diff) | |
| download | dotfiles-4d13f7def1bdfebde5b8bd35bdfc4de2b7e87140.tar.gz dotfiles-4d13f7def1bdfebde5b8bd35bdfc4de2b7e87140.tar.zst dotfiles-4d13f7def1bdfebde5b8bd35bdfc4de2b7e87140.zip | |
Merge branch 'feat/fish'
Diffstat (limited to 'home-manager/home.nix')
| -rw-r--r-- | home-manager/home.nix | 29 |
1 files changed, 11 insertions, 18 deletions
diff --git a/home-manager/home.nix b/home-manager/home.nix index 1ee6c37..e74da8a 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -5,7 +5,6 @@ let clipboardCopyCommand = specialArgs.env.gui.clipboard.copyCommand; requiresWlClipboard = clipboardCopyCommand == "wl-copy"; terminalApp = specialArgs.env.gui.terminalApp; - useNixManagedZsh = specialArgs.env.useNixManagedZsh; in { home.username = username; @@ -85,6 +84,13 @@ in LC_ALL = ""; # Locale: Less LESSCHARSET = "utf-8"; + + # Editor + VISUAL = "nvim"; + EDITOR = "nvim"; + + # Bat + BAT_THEME = "base16"; }; programs.direnv = { @@ -121,28 +127,15 @@ in '' else ""; - shellConfig = if useNixManagedZsh then - '' - set-option -g default-shell ${homeDirectory}/.nix-profile/bin/zsh - '' - else - ""; in - commonConfig + clipboardConfig + terminalConfig + shellConfig; - }; - - programs.zsh = { - enable = true; - - envExtra = '' - export PATH="$HOME/bin:$HOME/.local/bin:$PATH" - ''; - - initExtra = builtins.readFile ../.zshrc; + commonConfig + clipboardConfig + terminalConfig; }; programs.fish = { enable = true; + + interactiveShellInit = builtins.readFile ./config/fish/config.fish; + shellInitLast = builtins.readFile ./config/fish/path.fish; }; programs.starship = { |