diff options
author | makefu <github@syntax-fehler.de> | 2018-10-07 23:12:16 +0200 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2018-10-07 23:12:16 +0200 |
commit | 91023a11ebae6794caaecc882892da7f90deea28 (patch) | |
tree | 5bfd29cf49b1248cff80c4e001b0bf78b972ff26 /lass/2configs/vim.nix | |
parent | 9104af869e8c8ce299fc2ddbf7f2631bbbf48b1e (diff) | |
parent | 6b08d5aa46adc80d8a1ab4ed1d3e320c61a19f01 (diff) |
Merge remote-tracking branch 'lass/18.09' into 18.09
Diffstat (limited to 'lass/2configs/vim.nix')
-rw-r--r-- | lass/2configs/vim.nix | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/lass/2configs/vim.nix b/lass/2configs/vim.nix index 823d9a8ca..855c30b3e 100644 --- a/lass/2configs/vim.nix +++ b/lass/2configs/vim.nix @@ -2,20 +2,13 @@ with import <stockholm/lib>; let - unstable_nixpkgs = import (pkgs.fetchFromGitHub { - owner = "NixOS"; - repo = "nixpkgs"; - rev = "a8c71037e041725d40fbf2f3047347b6833b1703"; - sha256 = "1z4cchcw7qgjhy0x6mnz7iqvpswc2nfjpdynxc54zpm66khfrjqw"; - }) {}; out = { environment.systemPackages = [ (hiPrio vim) - pkgs.python35Packages.flake8 (pkgs.writeDashBin "govet" '' go vet "$@" '') - (hiPrio (unstable_nixpkgs.python3.withPackages (ps: [ + (hiPrio (pkgs.python3.withPackages (ps: [ ps.python-language-server ps.pyls-isort ]))) @@ -135,7 +128,7 @@ let pkgs.vimPlugins.undotree pkgs.vimPlugins.vim-go pkgs.vimPlugins.fzf-vim - unstable_nixpkgs.vimPlugins.LanguageClient-neovim + pkgs.vimPlugins.LanguageClient-neovim (pkgs.vimUtils.buildVimPlugin { name = "file-line-1.0"; src = pkgs.fetchFromGitHub { |