Update i3, nvim, env and shell files in template

master
Ian Mancini 4 years ago
parent ff41a41e5e
commit e17507adb1

@ -6,7 +6,7 @@ TERMINAL="alacritty"
BROWSER="chromium"
# bin
export PATH=/home/ianmethyst/.local/bin:$PATH
export PATH=/home/ianmethyst/.bin:/home/ianmethyst/.local/bin:$PATH
# Enable colors
eval "`dircolors -b`"
@ -24,16 +24,9 @@ export LESS_TERMCAP_ue=$'\E[0m'
export LESS_TERMCAP_us=$'\E[01;36m'
# fzf
export FZF_DEFAULT_COMMAND='ag --hidden -g ""'
export FZF_DEFAULT_COMMAND='ag --hidden --ignore .git -g ""'
export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND"
# Keychain
if [ -z ${DISPLAY+x} ]; then
eval "$(keychain --eval --quiet --noask --agents gpg,ssh id_rsa)"
else
eval "$(keychain --eval --quiet --agents gpg,ssh id_rsa)"
fi
# fnm
export PATH=/home/ianmethyst/.fnm:$PATH
eval "`fnm env --multi`"
@ -47,10 +40,17 @@ export PIP_DOWNLOAD_CACHE=$HOME/.pip/cache
# pyenv
export PYENV_ROOT="$HOME/.pyenv"
export PATH="$PYENV_ROOT/bin:$PATH"
if command -v pyenv 1>/dev/null 2>&1; then; eval "$(pyenv init -)"; fi
if command -v pyenv 1>/dev/null 2>&1; then eval "$(pyenv init -)"; fi
# pipenv
export PIPENV_VENV_IN_PROJECT=1
export PIPENV_SKIP_LOCK=true
export PIPENV_PYTHON=$PYENV_ROOT/shims/python
eval "$(pipenv --completion)"
# Keychain
if [ -z ${DISPLAY+x} ]; then
eval "$(keychain --eval --quiet --noask --agents gpg,ssh id_rsa)"
else
eval "$(keychain --eval --quiet --agents gpg,ssh id_rsa)"
fi

@ -0,0 +1,4 @@
XDG_DATA_HOME DEFAULT=@{HOME}/.local/share
XDG_CONFIG_HOME DEFAULT=@{HOME}/.config
XDG_CACHE_HOME DEFAULT=@{HOME}/.cache
XDG_CURRENT_DESKTOP DEFAULT=XFCE

@ -124,7 +124,7 @@ bindsym $mod+a focus parent
# bindsym $mod+d focus child
# Reload the configuration file
bindsym $mod+Shift+c reload
# bindsym $mod+Shift+c reload
# Restart i3 inplace (preserves your layout/session, can be used to upgrde i3)
bindsym $mod+Shift+r restart
@ -151,6 +151,8 @@ bindsym $mod+Shift+s exec --no-startup-id rofi -show ssh
bindsym $mod+Shift+e exec --no-startup-id rofimoji
bindsym $mod+Shift+p exec --no-startup-id ~/.bin/rofi-passmenu
bindsym $mod+p exec --no-startup-id ~/.bin/rofi-xrandr
bindsym $mod+Shift+c exec --no-startup-id ~/.bin/rofi-project
##############
# Workspaces #
@ -191,6 +193,7 @@ bindsym $mod+Shift+0 move container to workspace number $ws10
assign [class="^Nautilus$"] → $ws1
assign [class="^pcmanfm$"] → $ws1
assign [class="^Pcmanfm$"] → $ws1
assign [class="^Thunar$"] → $ws1
assign [class="^Firefox$"] → $ws2
assign [class="^Chromium$" window_role="^browser$"] → $ws2
@ -254,8 +257,8 @@ exec discord
exec telegram-desktop
exec steam
exec nm-applet
# exec blueman-applet
# exec pasystray
exec blueman-applet
exec pasystray
exec redshift-gtk
exec cbatticon BAT0 -l 25 -r 10
# exec clipit
@ -317,9 +320,9 @@ exec_always --no-startup-id $HOME/.bin/launch-polybar
# Volume
# PulseAudio
bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume 0 +2% #increase sound volume
bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume 0 -2% #decrease sound volume
bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute 0 toggle # mute sound
bindsym XF86AudioRaiseVolume exec --no-startup-id $HOME/.bin/manage_volume -i 2 -n
bindsym XF86AudioLowerVolume exec --no-startup-id $HOME/.bin/manage_volume -d 2 -n
bindsym XF86AudioMute exec --no-startup-id $HOME/.bin/manage_volume -t -n
# ALSA
#bindsym XF86AudioRaiseVolume exec --no-startup-id amixer -D pulse sset Master '2%+'

@ -1,3 +1,5 @@
{
"python.linting.enabled": false
"python.linting.enabled": false,
"eslint.enable": true,
"diagnostic.displayByAle": false
}

@ -14,9 +14,12 @@ Plug 'joshdick/onedark.vim'
Plug 'itchyny/lightline.vim'
Plug 'daviesjamie/vim-base16-lightline'
Plug 'maximbaz/lightline-ale'
"Plug 'maximbaz/lightline-ale'
Plug 'gioele/vim-autoswap' "Requires wmctrl
Plug 'glacambre/firenvim', { 'do': { _ -> firenvim#install(0) } }
Plug 'scrooloose/nerdcommenter'
Plug 'sheerun/vim-polyglot'
Plug 'sirtaj/vim-openscad'
@ -24,10 +27,12 @@ Plug 'othree/yajs.vim'
Plug 'othree/es.next.syntax.vim'
Plug 'othree/javascript-libraries-syntax.vim'
Plug 'styled-components/vim-styled-components', { 'branch': 'main' }
Plug 'hail2u/vim-css3-syntax'
Plug 'vim-pandoc/vim-pandoc-syntax'
Plug 'Vimjas/vim-python-pep8-indent'
Plug 'ntpeters/vim-better-whitespace'
Plug 'rhysd/clever-f.vim'
Plug 'junegunn/fzf.vim'
Plug 'scrooloose/nerdtree'
Plug 'xuyuanp/nerdtree-git-plugin'
@ -40,7 +45,7 @@ Plug 'lervag/vimtex'
Plug 'neoclide/coc.nvim', {'branch': 'release'}
Plug 'dense-analysis/ale'
" Plug 'dense-analysis/ale'
Plug 'tpope/vim-fugitive'
@ -76,6 +81,10 @@ let g:solarized_bold = 1
let g:solarized_underline = 1
let g:solarized_italic = 1
" Fix for styled-components
autocmd BufEnter *.{js,jsx,ts,tsx} :syntax sync fromstart
autocmd BufLeave *.{js,jsx,ts,tsx} :syntax sync clear
set termguicolors
colorscheme {{VIMCOLORSCHEME}}
set background={{VIMBACKGROUND}}
@ -121,7 +130,14 @@ set scrolloff=10
set cmdheight=2
set updatetime=300
set shortmess+=c
set signcolumn=yes
if has("patch-8.1.1564")
" Recently vim can merge signcolumn and number column into one
set signcolumn=number
else
set signcolumn=yes
endif
set lazyredraw " Redraw only when we need to.
set showmatch " Highlight matching [{()}]
@ -146,11 +162,13 @@ set foldopen=block,hor,insert,jump,mark,percent,quickfix,search,tag,undo
set mouse=a
" Backups
set backup
set backupdir=~/.vim-tmp,~/.tmp,~/tmp,/var/tmp,/tmp
set backupskip=/tmp/*,/private/tmp/*
set directory=~/.vim-tmp,~/.tmp,~/tmp,/var/tmp,/tmp
set writebackup
set directory=$XDG_DATA_HOME/nvim/swap/
set backupdir=$XDG_DATA_HOME/nvim/backup/
set backupskip=/tmp/*
set undodir=$XDG_DATA_HOME/nvim/undodir/
set undofile
set nobackup
set nowritebackup
" ###########
" # Keymaps #
@ -175,6 +193,17 @@ nnoremap <leader>s :mksession<CR>
" NERD Tree
map <C-n> :NERDTreeToggle<CR>
" Nerd commenter
vmap <C-_> <plug>NERDCommenterToggle
nmap <C-_> <plug>NERDCommenterToggle
let g:NERDSpaceDelims = 1
let g:NERDDefaultAlign = 'left'
let g:NERDCompactSexyComs = 1
let g:NERDCommentEmptyLines = 1
let g:NERDTrimTrailingWhitespace = 1
let g:NERDToggleCheckAllLines = 1
" Ale
nmap <silent> <leader>aj :ALENext<cr>
nmap <silent> <leader>ak :ALEPrevious<cr>
@ -207,16 +236,19 @@ let g:lightline = {
\ 'left': [ [ 'mode', 'paste' ],
\ [ 'gitbranch', 'readonly', 'filename', 'modified' ],
\ [ 'hunksummary' ] ],
\ 'right': [ [ 'linter_checking', 'linter_errors', 'linter_warnings', 'linter_ok' ],
\ 'right': [ [ 'cocstatus' ],
\ [ 'percent', 'lineinfo'],
\ [ 'fileformat', 'fileencoding', 'filetype'] ]
\ },
\ 'component_function': {
\ 'cocstatus': 'coc#status',
\ 'gitbranch': 'FugitiveHead',
\ 'hunksummary': 'GitStatus'
\ },
\}
"'right': [ [ 'linter_checking', 'linter_errors', 'linter_warnings', 'linter_ok' ],
function! GitStatus()
let [a,m,r] = GitGutterGetHunkSummary()
return printf('+%d ~%d -%d', a, m, r)
@ -241,14 +273,16 @@ let g:ale_linters = {
\ 'javascriptreact': ['eslint'],
\ 'javascript.jsx': ['eslint'],
\ 'vim': ['vint'],
\ 'python': ['flake8']
\ 'python': ['flake8'],
\ 'json': ['fixjson']
\}
let b:ale_fixers = {
let g:ale_fixers = {
\ 'javascript': ['eslint'],
\ 'javascriptreact': ['eslint'],
\ 'javascript.jsx': ['eslint'],
\ 'python': ['yapf']
\ 'python': ['yapf'],
\ 'json': ['fixjson']
\}
let g:ale_pattern_options = {
@ -256,10 +290,10 @@ let g:ale_pattern_options = {
\ '\.min\.css$': {'ale_linters': [], 'ale_fixers': []},
\}
" Coc
let g:coc_global_extensions = [
\ 'coc-tsserver',
\ 'coc-eslint',
\ 'coc-json',
\ 'coc-css',
\ 'coc-html',
@ -268,30 +302,54 @@ let g:coc_global_extensions = [
\ 'coc-yaml',
\ 'coc-highlight',
\ 'coc-syntax',
\ 'coc-python'
\ 'coc-python',
\ 'coc-actions',
\ 'coc-vimlsp',
\ 'coc-sh',
\ 'coc-svg'
\]
" Use tab for trigger completion with characters ahead and navigate.
" Use command ':verbose imap <tab>' to make sure tab is not mapped by other plugin.
inoremap <silent><expr> <TAB>
\ pumvisible() ? "\<C-n>" :
\ <SID>check_back_space() ? "\<TAB>" :
\ coc#refresh()
inoremap <expr><S-TAB> pumvisible() ? "\<C-p>" : "\<C-h>"
function! s:check_back_space() abort
let col = col('.') - 1
return !col || getline('.')[col - 1] =~# '\s'
endfunction
inoremap <silent><expr> <TAB>
\ pumvisible() ? "\<C-n>" :
\ <SID>check_back_space() ? "\<TAB>" :
\ coc#refresh()
inoremap <expr><S-TAB> pumvisible() ? "\<C-p>" : "\<C-h>"
function! s:check_back_space() abort
let col = col('.') - 1
return !col || getline('.')[col - 1] =~# '\s'
endfunction
" Use <C-l> for trigger snippet expand.
imap <C-l> <Plug>(coc-snippets-expand)
" Use <C-j> for select text for visual placeholder of snippet.
vmap <C-j> <Plug>(coc-snippets-select)
" Use <C-j> for jump to next placeholder, it's default of coc.nvim
let g:coc_snippet_next = '<c-j>'
" Use <C-k> for jump to previous placeholder, it's default of coc.nvim
let g:coc_snippet_prev = '<c-k>'
" Use <C-j> for both expand and jump (make expand higher priority.)
imap <C-j> <Plug>(coc-snippets-expand-jump)
let g:coc_snippet_next = '<tab>'
" Use <c-space> to trigger completion.
inoremap <silent><expr> <c-space> coc#refresh()
" Use <cr> to confirm completion, `<C-g>u` means break undo chain at current position.
" Coc only does snippet and additional edit on confirm.
inoremap <expr> <cr> pumvisible() ? "\<C-y>" : "\<C-g>u\<CR>"
" Or use `complete_info` if your vim support it, like:
" inoremap <expr> <cr> complete_info()["selected"] != "-1" ? "\<C-y>" : "\<C-g>u\<CR>"
" Use <cr> to confirm completion, `<C-g>u` means break undo chain at current
" position. Coc only does snippet and additional edit on confirm.
" <cr> could be remapped by other vim plugin, try `:verbose imap <CR>`.
if exists('*complete_info')
inoremap <expr> <cr> complete_info()["selected"] != "-1" ? "\<C-y>" : "\<C-g>u\<CR>"
else
inoremap <expr> <cr> pumvisible() ? "\<C-y>" : "\<C-g>u\<CR>"
endif
" Use `[g` and `]g` to navigate diagnostics
nmap <silent> [g <Plug>(coc-diagnostic-prev)
@ -365,11 +423,13 @@ set statusline^=%{coc#status()}%{get(b:,'coc_current_function','')}
" Using CocList
" Show all diagnostics
nnoremap <silent> <space>a :<C-u>CocList diagnostics<cr>
nnoremap <silent> <space>d :<C-u>CocList diagnostics<cr>
" Manage extensions
nnoremap <silent> <space>e :<C-u>CocList extensions<cr>
" Show commands
nnoremap <silent> <space>c :<C-u>CocList commands<cr>
" Show actions
nnoremap <silent> <space>a :<C-u>CocList actions<cr>
" Find symbol of current document
nnoremap <silent> <space>o :<C-u>CocList outline<cr>
" Search workspace symbols
@ -381,5 +441,17 @@ nnoremap <silent> <space>k :<C-u>CocPrev<CR>
" Resume latest coc list
nnoremap <silent> <space>p :<C-u>CocListResume<CR>
" coc-actions
" Remap for do codeAction of selected region
function! s:cocActionsOpenFromSelected(type) abort
execute 'CocCommand actions.open ' . a:type
endfunction
xmap <silent> <leader>a :<C-u>execute 'CocCommand actions.open ' . visualmode()<CR>
nmap <silent> <leader>a :<C-u>set operatorfunc=<SID>cocActionsOpenFromSelected<CR>g@
" vim-rainbow
let g:rainbow_active = 1
" vimtex
let g:tex_flavor = 'latex'

@ -1,12 +1,6 @@
# Skip all this for non-interactive shells
[[ -z "$PS1" ]] && return
# Load aliases
[ -f "$HOME/.aliasrc" ] && source "$HOME/.aliasrc"
# Load environment
[ -f "$HOME/.aliasrc" ] && source "$HOME/.envrc"
#########
# zplug #
#########
@ -121,3 +115,10 @@ zstyle ':completion:*' cache-path ~/.zsh/cache
# bindkey "^[[B" history-beginning-search-forward
bindkey '^[[A' history-substring-search-up
bindkey '^[[B' history-substring-search-down
# Load aliases
[ -f "$HOME/.aliasrc" ] && source "$HOME/.aliasrc"
# Load environment
[ -f "$HOME/.aliasrc" ] && source "$HOME/.envrc"

Loading…
Cancel
Save