From 665403ee0fb44c24298f7dfa53c36326b03528a7 Mon Sep 17 00:00:00 2001 From: Sam Willcocks Date: Sat, 28 Sep 2024 20:03:34 +0100 Subject: [PATCH] maybe don't clobber sessionvariables --- home/default.nix | 5 ++--- home/vim.nix | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/home/default.nix b/home/default.nix index 9ec6b44..80ad65f 100644 --- a/home/default.nix +++ b/home/default.nix @@ -6,9 +6,8 @@ in { home.packages = packages.all; home.sessionVariables = { - "PATH" = "$HOME/.local/bin:$PATH"; - "EDITOR" = "vim"; - "WORDCHARS" = "\${WORDCHARS//[\\/.=]/}"; # ctrl-w on paths without make angery + EDITOR = "vim"; # is overriden to nvim in vim.nix if needed + WORDCHARS = "\${WORDCHARS//[\\/.=]/}"; # ctrl-w on paths without make angery }; /* # For some reason this doesn't play nice when using home manager config from inside diff --git a/home/vim.nix b/home/vim.nix index 654ade8..b1d3e09 100644 --- a/home/vim.nix +++ b/home/vim.nix @@ -5,7 +5,7 @@ lib, ... }: { - home.sessionVariables = lib.mkForce {"EDITOR" = "nvim";}; + home.sessionVariables.EDITOR = lib.mkForce "nvim"; home.packages = with pkgs; [ripgrep]; programs.neovim = { enable = true;