master
Dustin Swan 4 years ago
parent add1a17b9f
commit bfacabf622

@ -8,7 +8,7 @@
home.sessionVariables = { home.sessionVariables = {
EDITOR = "vim"; EDITOR = "vim";
MANPAGER = "sh -c 'col -bx | bat -l man -p'"; MANPAGER = "sh -c 'col -bx | bat -l man -p'";
PATH = "$PATH:${builtins.getEnv "HOME"}/.emacs.d/bin"; PATH = "$PATH:${builtins.getEnv "HOME"}/.emacs.d/bin:${builtins.getEnv "HOME"}/.radicle/bin";
P4USER = "dswan"; P4USER = "dswan";
P4PORT = "humu.iocom.com:1666"; P4PORT = "humu.iocom.com:1666";
@ -25,6 +25,7 @@
keyMode = "vi"; keyMode = "vi";
baseIndex = 1; baseIndex = 1;
clock24 = true; clock24 = true;
newSession = true;
secureSocket = false; secureSocket = false;
plugins = with pkgs.tmuxPlugins; [ plugins = with pkgs.tmuxPlugins; [
sensible sensible
@ -49,6 +50,11 @@
''; '';
}; };
programs.lsd = {
enable = true;
enableAliases = true;
};
programs.zsh = { programs.zsh = {
enable = true; enable = true;
enableAutosuggestions = true; enableAutosuggestions = true;
@ -57,18 +63,18 @@
plugins = [ "git" ]; plugins = [ "git" ];
}; };
shellAliases = { shellAliases = {
l = "ls -la"; # l = "ls -la";
n = "nnn"; n = "nnn";
ta = "tmux attach -d"; t = "tmux attach -d";
er = "rm -rf logs; unzip -o"; er = "rm -rf logs; unzip -o";
srsync = "rsync --rsync-path='sudo rsync'"; srsync = "rsync --rsync-path='sudo rsync'";
}; };
}; };
programs.dircolors = { # programs.dircolors = {
enable = true; # enable = true;
enableZshIntegration = true; # enableZshIntegration = true;
}; # };
programs.direnv = { programs.direnv = {
enable = true; enable = true;
@ -132,8 +138,8 @@
vimAlias = true; vimAlias = true;
withNodeJs = true; withNodeJs = true;
withPython3 = true; withPython3 = true;
# unimpaired endwise textobj-word-column MatchTag vim-matchmaker vim-vertical-move stdtabs matchit splitjoin vimade floaterm fuzzymenu vim-markdown # unimpaired endwise textobj-word-column MatchTag vim-matchmaker vim-vertical-move stdtabs matchit splitjoin vimade fuzzymenu vim-markdown
plugins = with pkgs.vimPlugins; [ nord-vim vim-airline vim-airline-themes vim-sensible vim-repeat vim-surround vim-fugitive vim-speeddating jdaddy-vim ale vim-snippets fzf-vim vim-tmux-navigator vim-multiple-cursors vim-easymotion vim-sneak nerdcommenter emmet-vim undotree vim-signature vim-easy-align vim-better-whitespace vim-signify vim-expand-region vim-exchange argtextobj-vim goyo vim-orgmode vim-polyglot vim-devicons vim-startify vim-abolish vim-peekaboo vim-table-mode tabular coc-nvim coc-css coc-html coc-eslint coc-tsserver coc-json coc-fzf coc-snippets vim-highlightedyank vim-which-key]; plugins = with pkgs.vimPlugins; [ nord-vim vim-airline vim-airline-themes vim-sensible vim-repeat vim-surround vim-fugitive vim-speeddating jdaddy-vim ale vim-snippets fzf-vim vim-tmux-navigator vim-multiple-cursors vim-easymotion vim-sneak nerdcommenter emmet-vim undotree vim-signature vim-easy-align vim-better-whitespace vim-signify vim-expand-region vim-exchange argtextobj-vim goyo vim-orgmode vim-polyglot vim-devicons vim-startify vim-abolish vim-peekaboo vim-table-mode tabular coc-nvim coc-css coc-html coc-eslint coc-tsserver coc-json coc-fzf coc-snippets vim-highlightedyank vim-which-key vim-floaterm];
extraConfig = '' extraConfig = ''
set expandtab set expandtab
set tabstop=2 set tabstop=2
@ -153,6 +159,8 @@
let g:EasyMotion_smartcase = 1 let g:EasyMotion_smartcase = 1
let g:NERDSpaceDelims = 1
let g:coc_snippet_next = '<tab>' let g:coc_snippet_next = '<tab>'
let g:coc_snippet_prev = '<S-Tab>' let g:coc_snippet_prev = '<S-Tab>'
@ -180,7 +188,7 @@
nnoremap <silent> <leader>f :Files<CR> nnoremap <silent> <leader>f :Files<CR>
nnoremap <silent> <leader>b :Buffers<CR> nnoremap <silent> <leader>b :Buffers<CR>
nnoremap <silent> <leader>w :Windows<CR> nnoremap <silent> <leader>w :Windows<CR>
nnoremap <silent> <leader>c :Commands<CR> nnoremap <silent> <leader>C :Commands<CR>
nnoremap <silent> <leader>hf :History<CR> nnoremap <silent> <leader>hf :History<CR>
nnoremap <silent> <leader>hc :History:<CR> nnoremap <silent> <leader>hc :History:<CR>
nnoremap <silent> <leader>hs :History/<CR> nnoremap <silent> <leader>hs :History/<CR>
@ -197,6 +205,9 @@
imap <c-x><c-f> <plug>(fzf-complete-path) imap <c-x><c-f> <plug>(fzf-complete-path)
imap <c-x><c-j> <plug>(fzf-complete-file-ag) imap <c-x><c-j> <plug>(fzf-complete-file-ag)
imap <c-x><c-l> <plug>(fzf-complete-line) imap <c-x><c-l> <plug>(fzf-complete-line)
nnoremap <silent> <leader>n :FloatermNew nnn<CR>
nnoremap <silent> <leader>T :FloatermNew<CR>
''; '';
}; };

Loading…
Cancel
Save