diff --git a/polybar/.config/polybar/config.ini b/polybar/.config/polybar/config.ini index c6d28f3..1817c92 100644 --- a/polybar/.config/polybar/config.ini +++ b/polybar/.config/polybar/config.ini @@ -52,7 +52,7 @@ secondary = #dddddd alert = #bd2c40 [bar/main] -monitor = ${env:MONITOR:HDMI-0} +monitor = ${env:MONITOR:HDMI-2} width = 100% height = 27 ;offset-x = 1% @@ -192,29 +192,28 @@ format-prefix-foreground = ${colors.foreground-alt} type = internal/network interface = wlan0 interval = 10 -label-connected =  SSID: %essid% %signal%% %local_ip% +label-connected = %essid% %signal%% %local_ip% format-background = #444444 -format-prefix =  -format-prefix-foreground = ${colors.foreground-alt} +format-connected-prefix =  +format-connected-prefix-foreground = ${colors.foreground-alt} [module/weather] type = custom/script -exec = ~/.scripts/i3_weather.sh +exec = ~/scripts/i3_weather.sh interval = 3600 click-left = alacritty --hold -e curl -Ss http://wttr.in -format-prefix = W format-prefix-foreground = ${colors.foreground-alt} [module/finance] type = custom/script format-prefix = " " -exec = ~/.scripts/i3_finance.sh +exec = ~/scripts/i3_finance.sh format-prefix-foreground = ${colors.foreground-alt} interval = 3600 [module/pacman] type = custom/script -exec = ~/.scripts/i3_pacman.sh +exec = ~/scripts/i3_pacman.sh interval = 3600 click-left = [[ $(checkupdates | wc -l) -gt 0 ]] && alacritty --hold -e checkupdates format-prefix =  diff --git a/vimrc/.vimrc b/vimrc/.vimrc index 1ab1583..68fd6f4 100644 --- a/vimrc/.vimrc +++ b/vimrc/.vimrc @@ -5,7 +5,8 @@ filetype indent plugin on syntax on " Add number rows -set number +set relativenumber +set scrolloff=999 " No swap file set noswapfile @@ -33,7 +34,8 @@ map O " Folding (move to python specific vim file?) set foldmethod=indent -set foldnestmax=2 +set foldnestmax=99 +set foldlevelstart=99 nnoremap za vnoremap zf @@ -56,3 +58,17 @@ map :wq " Lint autocmd FileType python map gl :w:exec '!python -m black' shellescape(@%, 1) + +" Automatically open NERDTree +autocmd VimEnter * NERDTree | wincmd p + +" Exit Vim if NERDTree is the only window remaining in the only tab. +autocmd BufEnter * if tabpagenr('$') == 1 && winnr('$') == 1 && exists('b:NERDTree') && b:NERDTree.isTabTree() | quit | endif + + +" If another buffer tries to replace NERDTree, put it in the other window, and bring back NERDTree. +autocmd BufEnter * if bufname('#') =~ 'NERD_tree_\d\+' && bufname('%') !~ 'NERD_tree_\d\+' && winnr('$') > 1 | + \ let buf=bufnr() | buffer# | execute "normal! \w" | execute 'buffer'.buf | endif + +" Open the existing NERDTree on each new tab. +autocmd BufWinEnter * if getcmdwintype() == '' | silent NERDTreeMirror | endif diff --git a/zsh/.zshrc b/zsh/.zshrc index f9fcd97..86f92d5 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -13,6 +13,7 @@ alias more="less" alias weather="curl wttr.in" alias ls="exa -lhg --group-directories-first" alias ll="exa -lhga --group-directories-first" +alias vim="nvim" # path export PATH=/home/clint/.scripts/:$PATH @@ -35,6 +36,7 @@ setopt HIST_IGNORE_DUPS bindkey '^R' history-incremental-search-backward # setopt share_history + # auto complete autoload -Uz compinit compinit @@ -51,3 +53,6 @@ source /usr/share/zsh-theme-powerlevel10k/powerlevel10k.zsh-theme setopt auto_cd pfetch + + +