aboutsummaryrefslogtreecommitdiff
path: root/gui
diff options
context:
space:
mode:
authorAdrian Kummerlaender2019-03-03 20:56:44 +0100
committerAdrian Kummerlaender2019-03-03 20:56:47 +0100
commit31bf8658c3d7992d7e7f1b76d7b9b68ce19e8c3b (patch)
tree0a742c2d7a4006dac86d5b27e975aa99c9db2a4a /gui
parent5b13a57a255c4b541a25f3b2ea1a460e9e68eaeb (diff)
downloadnixos_home-31bf8658c3d7992d7e7f1b76d7b9b68ce19e8c3b.tar
nixos_home-31bf8658c3d7992d7e7f1b76d7b9b68ce19e8c3b.tar.gz
nixos_home-31bf8658c3d7992d7e7f1b76d7b9b68ce19e8c3b.tar.bz2
nixos_home-31bf8658c3d7992d7e7f1b76d7b9b68ce19e8c3b.tar.lz
nixos_home-31bf8658c3d7992d7e7f1b76d7b9b68ce19e8c3b.tar.xz
nixos_home-31bf8658c3d7992d7e7f1b76d7b9b68ce19e8c3b.tar.zst
nixos_home-31bf8658c3d7992d7e7f1b76d7b9b68ce19e8c3b.zip
Update to use nvim by default
mypkgs builts on nixpkgs-unstable to get a current nvim version. Luckily this kind of mixture of various versions is yet another strong suit of Nix.
Diffstat (limited to 'gui')
-rw-r--r--gui/pkgs/nvim-gui.nix5
-rw-r--r--gui/vim.nix22
2 files changed, 4 insertions, 23 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 = {