diff options
| -rw-r--r-- | gui/pkgs/nvim-gui.nix | 5 | ||||
| -rw-r--r-- | gui/vim.nix | 22 | ||||
| -rw-r--r-- | home.nix | 4 |
3 files changed, 7 insertions, 24 deletions
diff --git a/gui/pkgs/nvim-gui.nix b/gui/pkgs/nvim-gui.nix deleted file mode 100644 index 5cca035..0000000 --- a/gui/pkgs/nvim-gui.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ config, pkgs, ... }: - -pkgs.neovim-qt.override { - neovim = config.custom.pkgs.custom-neovim; -} diff --git a/gui/vim.nix b/gui/vim.nix index 46ab079..b9189c1 100644 --- a/gui/vim.nix +++ b/gui/vim.nix @@ -2,18 +2,12 @@ { home = { - # vim is configured globally for all users but common is the only GUI user - file.".gvimrc".text = '' - set guifont=Iosevka\ 10 - set linespace=2 - set guioptions=agi - ''; - - # nvim-qt using vim configuration packages = let - nvim-gui = import ./pkgs/nvim-gui.nix { inherit pkgs config; }; + neovim-qt = pkgs.neovim-qt.override { + neovim = config.custom.pkgs.custom-neovim; + }; in [ - nvim-gui + neovim-qt pkgs.xclip # required to access clipboard in nvim-gui ]; @@ -25,14 +19,6 @@ ''; }; - gtk = { - gtk3.extraCss = '' - window#vim-main-window { - background-color: #161616; - } - ''; - }; - programs.fish = { enable = true; shellAliases = { @@ -1,7 +1,9 @@ { config, pkgs, ... }: { - custom.pkgs = import <mypkgs> { }; + custom.pkgs = import <mypkgs> { + pkgs = import <nixpkgs-unstable> { }; + }; imports = [ # define options custom to this config |