neovim improvements

This commit is contained in:
Salar Rahmanian 2020-11-09 14:25:57 -08:00
parent 6f31d45933
commit 0e1b18cb0d

View file

@ -42,7 +42,7 @@
]; ];
extraConfig = { extraConfig = {
core = { core = {
editor = "emacs -nw"; editor = "nvim";
}; };
merge.tool = "intellij"; merge.tool = "intellij";
mergetool = { mergetool = {
@ -81,6 +81,12 @@
enableNixDirenvIntegration = true; enableNixDirenvIntegration = true;
}; };
programs.gh = {
enable = true;
editor = "nvim";
gitProtocol = "ssh";
};
programs.htop = { programs.htop = {
enable = true; enable = true;
sortDescending = true; sortDescending = true;
@ -104,16 +110,18 @@
vimAlias = true; vimAlias = true;
vimdiffAlias = true; vimdiffAlias = true;
plugins = with pkgs.vimPlugins; [ plugins = with pkgs.vimPlugins; [
vim-fish
vim-nix
fzf-vim fzf-vim
seoul256-vim seoul256-vim
vim-polyglot vim-polyglot
vim-gitgutter vim-gitgutter
rainbow rainbow
ack-vim ack-vim
auto-pairs
lightline-vim
vim-fugitive
]; ];
extraConfig = '' extraConfig = ''
set t_Co=256
set encoding=utf-8 set encoding=utf-8
syntax on syntax on
set expandtab set expandtab
@ -187,6 +195,16 @@
\ 'css': 0, \ 'css': 0,
\ } \ }
\} \}
let g:lightline = {
\ 'colorscheme': 'seoul256',
\ 'active': {
\ 'left': [ [ 'mode', 'paste' ],
\ [ 'gitbranch', 'readonly', 'filename', 'modified' ] ]
\ },
\ 'component_function': {
\ 'gitbranch': 'FugitiveHead'
\ },
\ }
''; '';
}; };
@ -224,6 +242,7 @@
]; ];
loginShellInit = '' loginShellInit = ''
set -xg TERM xterm-256color
if test -e /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh if test -e /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
fenv source /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh fenv source /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
end end
@ -240,6 +259,8 @@
set -xg JAVA_HOME /Users/salar/.nix-profile/bin set -xg JAVA_HOME /Users/salar/.nix-profile/bin
set -xg NIX_PATH $HOME/.nix-defexpr/channels $NIX_PATH
set -xg FZF_DEFAULT_OPTS "--preview='bat {} --color=always'" \n set -xg FZF_DEFAULT_OPTS "--preview='bat {} --color=always'" \n
''; '';
@ -271,7 +292,7 @@
nixup="nix-env -u"; nixup="nix-env -u";
nixversion="nix eval nixpkgs.lib.version"; nixversion="nix eval nixpkgs.lib.version";
nixdaemon="sudo launchctl load /Library/LaunchDaemons/org.nixos.nix-daemon.plist && launchctl start org.nixos.nix-daemon"; nixdaemon="sudo launchctl load /Library/LaunchDaemons/org.nixos.nix-daemon.plist && launchctl start org.nixos.nix-daemon";
v="emacs -nw"; v="nvim";
vc="emacsclient -c -a ''"; vc="emacsclient -c -a ''";
tabninecfg="vc /Users/salar/Library/Preferences/TabNine/TabNine.toml"; tabninecfg="vc /Users/salar/Library/Preferences/TabNine/TabNine.toml";
sshfre1="ssh salar@fre1.softinio.net"; sshfre1="ssh salar@fre1.softinio.net";