diff --git a/configs/neovim.nix b/configs/neovim.nix index e848de2..1ff82fa 100644 --- a/configs/neovim.nix +++ b/configs/neovim.nix @@ -1,11 +1,15 @@ { pkgs, + lib, config, ... -}: { - environment.variables.EDITOR = pkgs.lib.mkForce "nvim"; - environment.shellAliases.vi = "nvim"; - environment.shellAliases.vim = "nvim"; +}: let + vim-kmein = (pkgs.vim-kmein.override { + # stylixColors = config.lib.stylix.colors; + colorscheme = "base16-gruvbox-dark-medium"; + }); +in { + environment.variables.EDITOR = lib.getExe vim-kmein; environment.shellAliases.view = "nvim -R"; home-manager.users.me = { @@ -35,10 +39,7 @@ environment.systemPackages = [ pkgs.vim-typewriter - (pkgs.vim-kmein.override { - # stylixColors = config.lib.stylix.colors; - colorscheme = "base16-gruvbox-dark-medium"; - }) + vim-kmein # language servers pkgs.pyright diff --git a/packages/vim-kmein/default.nix b/packages/vim-kmein/default.nix index 6d10e95..53910cf 100644 --- a/packages/vim-kmein/default.nix +++ b/packages/vim-kmein/default.nix @@ -10,7 +10,8 @@ ... }: (neovim.override { configure = { - vimAliases = true; + vimAlias = true; + viAlias = true; customRC = '' source ${./shared.vim} source ${./init.vim}