Adding missing plugins in my vimrc
This commit is contained in:
eeva
parent
745cc894e9
commit
4a14f4505b
2 changed files with 61 additions and 32 deletions
|
|
@ -33,7 +33,7 @@
|
|||
oh-my-zsh stow
|
||||
lemonbar git st
|
||||
nethogs
|
||||
(import ./vim.nix)
|
||||
(import ./vim.nix)
|
||||
ghostscript
|
||||
pavucontrol
|
||||
arandr
|
||||
|
|
@ -55,7 +55,7 @@
|
|||
consoleFont = "Lat2-Terminus16";
|
||||
consoleKeyMap = "fr-bepo";
|
||||
defaultLocale = "en_US.UTF-8";
|
||||
supportedLocales = [
|
||||
supportedLocales = [
|
||||
"de_DE.UTF-8/UTF-8"
|
||||
"en_US.UTF-8/UTF-8"
|
||||
"fr_FR.UTF-8/UTF-8"
|
||||
|
|
@ -94,7 +94,7 @@
|
|||
|
||||
security = {
|
||||
sudo.wheelNeedsPassword = false;
|
||||
pki.certificates = [
|
||||
pki.certificates = [
|
||||
''
|
||||
-----BEGIN CERTIFICATE-----
|
||||
MIIDPTCCAiWgAwIBAgIJAMbx5WIu+oU+MA0GCSqGSIb3DQEBBQUAMDUxCzAJBgNV
|
||||
|
|
@ -122,8 +122,8 @@
|
|||
services = {
|
||||
udev.packages = with pkgs; [ crda ];
|
||||
peerflix = {
|
||||
enable = true;
|
||||
stateDir = "/tmp/peerflix";
|
||||
enable = true;
|
||||
stateDir = "/tmp/peerflix";
|
||||
};
|
||||
cron.enable = false;
|
||||
nixosManual.enable = false;
|
||||
|
|
@ -146,7 +146,7 @@
|
|||
enable = true;
|
||||
permitRootLogin = "no";
|
||||
passwordAuthentication = false;
|
||||
startWhenNeeded = true;
|
||||
startWhenNeeded = true;
|
||||
};
|
||||
|
||||
openvpn.servers.client = {
|
||||
|
|
@ -239,7 +239,7 @@
|
|||
sha256 = "b7b25ba01b7ae87ec201ebbb1bf82742d5979788ecc6773a356eebe7d90a9703";
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
}) ];
|
||||
|
||||
}
|
||||
|
|
|
|||
79
vim.nix
79
vim.nix
|
|
@ -1,46 +1,74 @@
|
|||
# Largely adapted from: https://www.mpscholten.de/nixos/2016/04/11/setting-up-vim-on-nixos.html
|
||||
with import <nixpkgs> {};
|
||||
|
||||
vim_configurable.customize {
|
||||
let plugins = let inherit (vimUtils) buildVimPluginFrom2Nix; in {
|
||||
"better-whitespace" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "better-whitespace";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/ntpeters/vim-better-whitespace";
|
||||
rev = "7729bada7ad8d341b910367da8a900490bd15e86";
|
||||
sha256 = "0kkj13jjzjyv2b17sk8bka2d55czz7v6xvv0zz1i8qidvg6lbniw";
|
||||
};
|
||||
dependencies = [];
|
||||
};
|
||||
"systemd-syntax" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "systemd-syntax";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/Matt-Deacalion/vim-systemd-syntax";
|
||||
rev = "05bd51f87628e4b714b9d1d16259e1ead845924a";
|
||||
sha256 = "04jlbm4cf47kvys22czz1i3fcqzz4zih2h6pkcfns9s8rs6clm3c";
|
||||
};
|
||||
dependencies = [];
|
||||
};
|
||||
"opencl-syntax" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "opencl-syntax";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/petRUShka/vim-opencl";
|
||||
rev = "a75693fdb1526cf0f2f2d1a6bdc23d6537ac1b6f";
|
||||
sha256 = "0ba3kj65h2lsn7s0fazhmbaa7nr8b9ssda3i54259mcc4nhwvi7b";
|
||||
};
|
||||
dependencies = [];
|
||||
};
|
||||
}; in vim_configurable.customize {
|
||||
name = "vim";
|
||||
vimrcConfig.vam.knownPlugins = pkgs.vimPlugins;
|
||||
vimrcConfig.vam.knownPlugins = pkgs.vimPlugins // plugins;
|
||||
vimrcConfig.vam.pluginDictionaries = [
|
||||
{ names = [
|
||||
"vim-nix"
|
||||
"Solarized"
|
||||
"better-whitespace"
|
||||
"systemd-syntax"
|
||||
"opencl-syntax"
|
||||
"elm-vim"
|
||||
"fugitive"
|
||||
"surround"
|
||||
"elm-vim"
|
||||
"vim-nix"
|
||||
"vimtex"
|
||||
#https://github.com/vim-voom/VOoM
|
||||
#https://github.com/ntpeters/vim-better-whitespace
|
||||
#https://github.com/Matt-Deacalion/vim-systemd-syntax
|
||||
#https://github.com/tpope/vim-obsession
|
||||
#https://github.com/petRUShka/vim-opencl
|
||||
]; }
|
||||
];
|
||||
vimrcConfig.customRC = ''
|
||||
" Must have for vim
|
||||
set nocompatible
|
||||
|
||||
|
||||
" Display nbsp
|
||||
set listchars=tab:\|\ ,nbsp:·
|
||||
set list
|
||||
|
||||
|
||||
" Remap ESC on ,,
|
||||
map ,, <ESC>
|
||||
imap ,, <ESC>
|
||||
|
||||
|
||||
scriptencoding utf-8
|
||||
|
||||
|
||||
" Must be *after* pathogen
|
||||
filetype plugin indent on
|
||||
|
||||
|
||||
" Leader
|
||||
let mapleader=","
|
||||
nnoremap <leader>a :echo("\<leader\> works! It is set to <leader>")<CR>
|
||||
" let maplocalleader = "-"
|
||||
|
||||
|
||||
" Highlighting
|
||||
syntax enable
|
||||
if has('gui_running')
|
||||
|
|
@ -52,45 +80,46 @@ vim_configurable.customize {
|
|||
" which colors it likes.
|
||||
set background=dark
|
||||
endif
|
||||
|
||||
|
||||
let g:solarized_termcolors=16
|
||||
colorscheme solarized
|
||||
|
||||
|
||||
" Set line numbering
|
||||
set number
|
||||
|
||||
|
||||
" Don't wrap lines, it's ugly
|
||||
set nowrap
|
||||
|
||||
|
||||
" Deal with tabs
|
||||
set softtabstop=2
|
||||
set tabstop=2 " 1 tab = 2 spaces
|
||||
set shiftwidth=2 " Indent with 2 spaces
|
||||
set expandtab " Insert spaces instead of tabs
|
||||
|
||||
|
||||
" Set par as default wrapper
|
||||
set formatprg=${par.outPath}/bin/par\ -w80
|
||||
|
||||
|
||||
" Set mouse on
|
||||
set mouse=a
|
||||
|
||||
|
||||
" Don't set timeout - this breaks the leader use
|
||||
set notimeout
|
||||
set ttimeout
|
||||
|
||||
|
||||
let &colorcolumn=join(range(81,999),",")
|
||||
|
||||
|
||||
" vimtex options
|
||||
let g:vimtex_fold_enabled=1
|
||||
let g:vimtex_fold_manual=1
|
||||
|
||||
let g:vimtex_latexmk_enabled=0
|
||||
|
||||
" nice pluginless stuff
|
||||
set path+=**
|
||||
set wildmenu
|
||||
|
||||
|
||||
" Tag generation
|
||||
command! MakeTags !ctags -R .
|
||||
|
||||
|
||||
" Less noise in netrw
|
||||
let g:netrw_banner=0
|
||||
let g:netrw_browse_split=4
|
||||
|
|
|
|||
Loading…
Reference in a new issue