diff --git a/home/config.nix b/home/config.nix index b3d5797..a9d188f 100644 --- a/home/config.nix +++ b/home/config.nix @@ -2,35 +2,44 @@ let lib = (import {}).lib; in -{ + { - clementine.spotify = false; - whitelistedLicenses = with lib.licenses; [ wtfpl ]; - packageOverrides = pkgs: with pkgs; - let - myVimBundle = with pkgs.vimPlugins; { - # loaded on start - start = [ - ale - ctrlp - deoplete-jedi - fugitive - nerdtree - nerdtree-git-plugin - supertab - vim-pandoc - vim-pandoc-syntax - vim-nix - ]; - }; - in - rec { + clementine.spotify = false; + whitelistedLicenses = with lib.licenses; [ wtfpl ]; + vim = + { gui = "gtk3"; + python = true; + multibyteSupport = true; + }; + + packageOverrides = pkgs: with pkgs; + rec { + myVim = (vim_configurable.override {python = python3;}).customize { + # executable/ package name + name = "vim"; + vimrcConfig.packages.myVimPackage = with pkgs.vimPlugins; { + # loaded on start + start = [ + ale + ctrlp + deoplete-jedi + fugitive + nerdtree + nerdtree-git-plugin + supertab + vim-pandoc + vim-pandoc-syntax + vim-nix + ]; + }; + vimrcConfig.customRC = '' + if filereadable($HOME . "/.vimrc") + source ~/.vimrc + endif + ''; + }; # build with debug symbols and in debug mode (less optimized) - myVim = vim_configurable.customize { - name = "vim-with-plugins"; - vimrcConfig.packages.myVimPackage = myVimBundle; - }; opencvDebug = enableDebugging ((opencv3.override {enablePython=true; enableGtk3=true; enableDocs=true; pythonPackages=pkgs.python3Packages; }).overrideAttrs (oldAttrs: rec {cmakeBuildType = "Debug";})); }; -} + }