Merge pull request 'nvim, nixos-option cherry-picks' (#57) from fix/cherry-picks-from-teutat3s into main

Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/57
Reviewed-by: Benjamin Bädorf <b12f@noreply.example.org>
This commit is contained in:
Benjamin Bädorf 2021-10-29 16:46:34 +00:00
commit dd3d8ab385
4 changed files with 28 additions and 27 deletions

View file

@ -1,4 +1,4 @@
{ lib, config, pkgs, ... }: { lib, config, pkgs, self, ... }:
with lib; with lib;
let let
psCfg = config.pub-solar; psCfg = config.pub-solar;
@ -37,7 +37,7 @@ in
programs.neovim = import ./nvim { inherit config; inherit pkgs; }; programs.neovim = import ./nvim { inherit config; inherit pkgs; };
programs.fzf = import ./fzf { inherit config; inherit pkgs; }; programs.fzf = import ./fzf { inherit config; inherit pkgs; };
programs.zsh = import ./zsh { inherit config; inherit pkgs; }; programs.zsh = import ./zsh { inherit config; inherit pkgs; inherit self; };
}; };
}; };
} }

View file

@ -69,73 +69,74 @@ in
]; ];
extraPackages = with pkgs; [ extraPackages = with pkgs; [
nodejs ccls
code-minimap code-minimap
gopls
nodejs
nodePackages.bash-language-server nodePackages.bash-language-server
nodePackages.dockerfile-language-server-nodejs nodePackages.dockerfile-language-server-nodejs
nodePackages.svelte-language-server nodePackages.svelte-language-server
nodePackages.typescript-language-server
nodePackages.typescript nodePackages.typescript
nodePackages.typescript-language-server
nodePackages.vim-language-server nodePackages.vim-language-server
nodePackages.vue-language-server nodePackages.vue-language-server
nodePackages.yaml-language-server
nodePackages.vscode-json-languageserver-bin
nodePackages.vscode-html-languageserver-bin
nodePackages.vscode-css-languageserver-bin nodePackages.vscode-css-languageserver-bin
python3Full nodePackages.vscode-html-languageserver-bin
nodePackages.vscode-json-languageserver-bin
nodePackages.yaml-language-server
python-language-server python-language-server
python3Full
solargraph solargraph
rust-analyzer
universal-ctags
ccls
rnix-lsp rnix-lsp
rust-analyzer
terraform-ls terraform-ls
universal-ctags
]; ];
plugins = with pkgs.vimPlugins; [ plugins = with pkgs.vimPlugins; [
nvim-lspconfig
lsp_extensions-nvim
completion-nvim completion-nvim
lsp_extensions-nvim
nvim-lspconfig
suda
ack-vim ack-vim
syntastic
airline airline
workspace
editorconfig-vim editorconfig-vim
vim-vinegar
vim-gutentags
minimap-vim minimap-vim
nnn-vim nnn-vim
suda
syntastic
vim-gutentags
vim-vinegar
workspace
sonokai sonokai
fugitive fugitive
vim-rhubarb
vim-gitgutter vim-gitgutter
vim-rhubarb
vimagit vimagit
vim-highlightedyank
fzf-vim fzf-vim
fzfWrapper fzfWrapper
vim-highlightedyank
beautify beautify
vim-surround vim-surround
vim-sensible
vim-bufkill vim-bufkill
vim-sensible
ansible-vim ansible-vim
emmet-vim emmet-vim
rust-vim rust-vim
vim-go vim-go
vim-vue
vim-javascript vim-javascript
vim-json vim-json
vim-markdown vim-markdown
yats-vim vim-nix
vim-ruby vim-ruby
vim-toml vim-toml
vim-nix vim-vue
yats-vim
]; ];
} }

View file

@ -6,7 +6,7 @@ let g:gutentags_file_list_command = 'git ls-files'
" Golang " Golang
" Go test shortcut " Go test shortcut
nmap <Leader>got :GoTest<CR> nmap <Leader>got :GoTest<CR>:botright copen<CR>
" Go formatting " Go formatting
autocmd FileType go setlocal noexpandtab shiftwidth=4 tabstop=4 softtabstop=4 nolist autocmd FileType go setlocal noexpandtab shiftwidth=4 tabstop=4 softtabstop=4 nolist

View file

@ -1,4 +1,4 @@
{ config, pkgs, ... }: { config, pkgs, self, ... }:
let let
psCfg = config.pub-solar; psCfg = config.pub-solar;
xdg = config.home-manager.users."${psCfg.user.name}".xdg; xdg = config.home-manager.users."${psCfg.user.name}".xdg;
@ -32,7 +32,7 @@ in
drone = "DRONE_TOKEN=$(secret-tool lookup drone token) drone"; drone = "DRONE_TOKEN=$(secret-tool lookup drone token) drone";
no = "manix \"\" | grep '^# ' | sed 's/^# \(.*\) (.*/\1/;s/ (.*//;s/^# //' | fzf --preview=\"manix '{}'\" | xargs manix"; no = "manix \"\" | grep '^# ' | sed 's/^# \(.*\) (.*/\1/;s/ (.*//;s/^# //' | fzf --preview=\"manix '{}'\" | xargs manix";
# fix nixos-option # fix nixos-option
nixos-option = "nixos-option -I nixpkgs=/etc/nixos/lib/compat"; nixos-option = "nixos-option -I nixpkgs=${self}/lib/compat";
}; };
zplug = { zplug = {
enable = true; enable = true;