update neovim

This commit is contained in:
Cyryl Płotnicki 2021-09-22 13:41:05 +01:00
parent 5a7d3ae236
commit 1f64abccfa
6 changed files with 73 additions and 52 deletions

View file

@ -44,6 +44,21 @@ set noshowmode
set showtabline=1 "only show tabline when more than 1 tab set showtabline=1 "only show tabline when more than 1 tab
set updatetime=300 set updatetime=300
" Don't pass messages to |ins-completion-menu|.
set shortmess+=c
" Give more space for displaying messages.
set cmdheight=2
" Always show the signcolumn, otherwise it would shift the text each time
" diagnostics appear/become resolved.
if has("nvim-0.5.0") || has("patch-8.1.1564")
" Recently vim can merge signcolumn and number column into one
set signcolumn=number
else
set signcolumn=yes
endif
" exclude quickfix from the buffers list " exclude quickfix from the buffers list
augroup qf augroup qf
autocmd! autocmd!

View file

@ -23,7 +23,10 @@
{ {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.users.cyryl = import ./nixos/home-manager; home-manager.users.cyryl = {
imports = [ ./nixos/home-manager ];
_module.args.inputs = inputs;
};
} }
]; ];

View file

@ -4,12 +4,12 @@
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
./tailscale-skinnyv.nix
../../boot.nix ../../boot.nix
../../common.nix ../../common.nix
../../gfx-intel.nix ../../gfx-intel.nix
../../i3 ../../i3
../../tailscale.nix ../../tailscale.nix
./tailscale-skinnyv.nix
../../distributed-builds.nix ../../distributed-builds.nix
../../gui ../../gui
../../git ../../git

View file

@ -1,4 +1,4 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, inputs, ... }:
{ {
imports = imports =
[ [
@ -52,7 +52,6 @@
''; '';
}; };
system = { system = {
stateVersion = "20.03"; stateVersion = "20.03";
}; };

View file

@ -1,4 +1,4 @@
{ config, pkgs, ... }: { config, pkgs, inputs, ... }:
{ {
home.sessionVariables = { home.sessionVariables = {

View file

@ -1,49 +1,53 @@
{ config, pkgs, ... }: { config, pkgs, inputs, ... }:
{ let
home.file.".vimrc".source = ../../../.vimrc.nixos; unstable = inputs.nixpkgs-nixos-unstable.legacyPackages.${pkgs.system};
home.packages = with pkgs; [ in
ripgrep {
]; home.file.".vimrc".source = ../../../.vimrc.nixos;
programs.neovim = { home.packages = with pkgs; [
enable = true; ripgrep
viAlias = true;
vimAlias = true;
vimdiffAlias = true;
withNodeJs = true;
withPython3 = true;
withRuby = true;
plugins = with pkgs.vimPlugins; [
ack-vim
coc-highlight
coc-nvim
coc-rust-analyzer
ctrlp-vim
editorconfig-vim
fzf-vim
quickfix-reflector-vim
rainbow
tabular
vim-airline
vim-airline-themes
vim-autoformat
vim-colors-solarized
vim-devicons
vim-dirdiff
vim-dispatch
vim-fugitive
vim-gitgutter
vim-markdown
vim-nix
vim-sensible
vim-startify
vim-surround
vim-toml
]; ];
extraConfig = '' programs.neovim = {
if filereadable($HOME . "/.vimrc") enable = true;
viAlias = true;
vimAlias = true;
vimdiffAlias = true;
withNodeJs = true;
withPython3 = true;
withRuby = true;
package = unstable.neovim-unwrapped;
plugins = with pkgs.vimPlugins; [
ack-vim
coc-highlight
coc-nvim
coc-rust-analyzer
ctrlp-vim
editorconfig-vim
fzf-vim
quickfix-reflector-vim
rainbow
tabular
vim-airline
vim-airline-themes
vim-autoformat
vim-colors-solarized
vim-devicons
vim-dirdiff
vim-dispatch
vim-fugitive
vim-gitgutter
vim-markdown
vim-nix
vim-sensible
vim-startify
vim-surround
vim-toml
];
extraConfig = ''
if filereadable($HOME . "/.vimrc")
source $HOME/.vimrc source $HOME/.vimrc
endif endif
''; '';
}; };
} }