felschr/nixos-config
1
1
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

feat(neovim): update config

Browse source
This commit is contained in:
Felix Schröter 2020-11-14 11:18:13 +01:00
parent 5a6de0b6c8
commit 906f41da4d
No known key found for this signature in database
GPG key ID: 910ACB9F6BD26F58
6 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
home/editors/lsp.nix
View file

@ -3,12 +3,12 @@
let let
omnisharp-roslyn = pkgs.omnisharp-roslyn.overrideAttrs (oldAttrs: rec { omnisharp-roslyn = pkgs.omnisharp-roslyn.overrideAttrs (oldAttrs: rec {
pname = "omnisharp-roslyn"; pname = "omnisharp-roslyn";
version = "1.37.1"; version = "1.37.3";
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = url =
"https://github.com/OmniSharp/omnisharp-roslyn/releases/download/v${version}/omnisharp-mono.tar.gz"; "https://github.com/OmniSharp/omnisharp-roslyn/releases/download/v${version}/omnisharp-mono.tar.gz";
sha256 = "04pyychzwhhcv0js0qyramz6nd0wz03qqqgvz1j9m9wxyiz0dv3c"; sha256 = "x0TRswtwlWWukx7fqjlfaV7/xF5ZMc0JT7zfzHX3BCY=";
}; };
}); });
in { in {

10
home/editors/neovim/default.nix
View file

@ -2,12 +2,12 @@
let let
neovim-unwrapped = pkgs.neovim-unwrapped.overrideAttrs (oldAttrs: rec { neovim-unwrapped = pkgs.neovim-unwrapped.overrideAttrs (oldAttrs: rec {
version = "2020-09-30"; version = "2020-11-03";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "neovim"; owner = "neovim";
repo = "neovim"; repo = "neovim";
rev = "e5d98d85693245fec811307e5a2ccfdea3a350cd"; rev = "432f3240f171e857beb3d1a554cbd8a649bb38ae";
sha256 = "119537lcrqn84n3sqj917jql4nrczk85idj27yqhp0dafc21raa8"; sha256 = "1drgaxnaazbv086pmy63254xm2madh8gl50kaynhbdwrrkxwcfzh";
}; };
nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ pkgs.utf8proc ]; nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ pkgs.utf8proc ];
}); });
@ -21,8 +21,8 @@ let
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "mfussenegger"; owner = "mfussenegger";
repo = "nvim-dap"; repo = "nvim-dap";
rev = "d3af0f3b470ee8a46aabb3837b97193dc16046e0"; rev = "59b312e95d7ee60bf66bbe199cfc168c62808d54";
sha256 = "0j09i8hhls8y5xd57vp4sbpp0gvdmwd6wmb355w5j2cda84xagmd"; sha256 = "0jvdrmgspgcs48zyfpwmywldjjpx539hdlibfjq6bdc1a8x8vis7";
}; };
}; };

2
home/editors/neovim/lsp/lsp.lua
View file

@ -25,7 +25,7 @@ nvim_lsp.terraformls.setup{}
nvim_lsp.hls.setup{} nvim_lsp.hls.setup{}
-- based on: https://github.com/mikew/vimrc/blob/master/src/nvim/coc-settings.json -- based on: https://github.com/mikew/vimrc/blob/master/src/nvim/coc-settings.json
-- multiple LSP's currently not supported: https://github.com/neovim/neovim/issues/12755 -- TODO breaks auto-completion when using with other lsp
-- nvim_lsp.diagnosticls.setup{ -- nvim_lsp.diagnosticls.setup{
-- on_attach = diagnosticls_on_attach; -- on_attach = diagnosticls_on_attach;
-- filetypes = { -- filetypes = {

2
home/editors/neovim/scripts.vim
View file

@ -2,7 +2,7 @@ if did_filetype()
finish finish
endif endif
if getline(1) =~ '^#!.*nix-shell' if getline(1) =~ '^#!.*nix-shell'
let s:matches = matchlist(getline(2), '^#!.*nix-shell -i \([^ \t\n]\+\)') let s:matches = matchlist(getline(2), '^#!.*nix-shell .*-i \([^ \t\n]\+\)')
let s:command = s:matches[1] let s:command = s:matches[1]
echo s:command echo s:command
if s:command != '' if s:command != ''

2
home/editors/neovim/test.vim
View file

@ -1 +1,3 @@
let g:test#strategy = 'neovim'
let g:test#csharp#runner = 'dotnettest' let g:test#csharp#runner = 'dotnettest'
" let test#csharp#dotnettest#options = '-v q'

4
home/felschr-rpi4.nix
View file

@ -20,9 +20,7 @@
programs.gpg.enable = true; programs.gpg.enable = true;
home.sessionVariables = with pkgs; { home.sessionVariables = with pkgs; { EDITOR = "nvim"; };
EDITOR = "nvim";
};
programs.neovim.enable = true; programs.neovim.enable = true;
programs.neovim.viAlias = true; programs.neovim.viAlias = true;
programs.neovim.vimAlias = true; programs.neovim.vimAlias = true;