Adapt terminal-life to personal use-case

This commit is contained in:
Hendrik Sokolowski 2022-08-13 12:59:42 +02:00
parent d36b32c84e
commit 8d084ac2cb
2 changed files with 13 additions and 20 deletions

View file

@ -47,7 +47,7 @@ in
watson
];
programs.neovim = import ./nvim { inherit config; inherit pkgs; };
programs.neovim = import ./nvim { inherit config; inherit pkgs; inherit lib; };
programs.fzf = import ./fzf { inherit config; inherit pkgs; };
programs.zsh = import ./zsh { inherit config; inherit pkgs; inherit self; };
};

View file

@ -1,4 +1,4 @@
{ config, pkgs, ... }:
{ config, pkgs, lib, ... }:
let
psCfg = config.pub-solar;
cfg = config.pub-solar.terminal-life;
@ -17,29 +17,22 @@ in
withRuby = true;
withPython3 = true;
extraPackages = with pkgs; lib.mkIf (!cfg.lite) [
ccls
extraPackages = with pkgs; [
rnix-lsp
universal-ctags
]
++ lib.optionals (!cfg.lite) [
gopls
nodejs
nodePackages.bash-language-server
nodePackages.dockerfile-language-server-nodejs
nodePackages.svelte-language-server
nodePackages.typescript
nodePackages.typescript-language-server
nodePackages.vim-language-server
nodePackages.vue-language-server
nodePackages.vscode-langservers-extracted
nodePackages.yaml-language-server
python39Packages.python-lsp-server
python3Full
solargraph
rnix-lsp
rust-analyzer
terraform-ls
universal-ctags
];
]
;
plugins = with pkgs.vimPlugins; [
]
++ lib.optionals (!cfg.lite) [
nvim-cmp
cmp-nvim-lsp
cmp_luasnip