From 07349b7b342a87335aaeb5fc9704f1054bf84ddc Mon Sep 17 00:00:00 2001 From: nsfisis Date: Fri, 16 Aug 2024 00:42:27 +0900 Subject: fish: port zsh settings to fish --- home-manager/home.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'home-manager/home.nix') diff --git a/home-manager/home.nix b/home-manager/home.nix index 1ee6c37..1dba991 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,14 +127,8 @@ in '' else ""; - shellConfig = if useNixManagedZsh then - '' - set-option -g default-shell ${homeDirectory}/.nix-profile/bin/zsh - '' - else - ""; in - commonConfig + clipboardConfig + terminalConfig + shellConfig; + commonConfig + clipboardConfig + terminalConfig; }; programs.zsh = { @@ -143,6 +143,9 @@ in programs.fish = { enable = true; + + interactiveShellInit = builtins.readFile ./config/fish/config.fish; + shellInitLast = builtins.readFile ./config/fish/path.fish; }; programs.starship = { -- cgit v1.2.3-70-g09d2