diff --git a/bash/.bash_helpers.sh b/bash/.bash_helpers.sh index 635cca6..c232612 100644 --- a/bash/.bash_helpers.sh +++ b/bash/.bash_helpers.sh @@ -62,4 +62,13 @@ vimwiki() { cd - } +set_term_colors() { + bash -c "$(wget -qO- https://git.io/vQgMr)" +} + + +print_available_colors() { + for i in {0..255} ; do printf "\x1b[38;5;${i}mcolour${i}\n"; done +} + diff --git a/bash/.profile b/bash/.profile index 393ca5c..d867cec 100644 --- a/bash/.profile +++ b/bash/.profile @@ -61,3 +61,19 @@ then fi export PATH="$HOME/.poetry/bin:$PATH" + +# >>> conda initialize >>> +# !! Contents within this block are managed by 'conda init' !! +__conda_setup="$('/home/nicholas/.conda/bin/conda' 'shell.bash' 'hook' 2> /dev/null)" +if [ $? -eq 0 ]; then + eval "$__conda_setup" +else + if [ -f "/home/nicholas/.conda/etc/profile.d/conda.sh" ]; then + . "/home/nicholas/.conda/etc/profile.d/conda.sh" + else + export PATH="/home/nicholas/.conda/bin:$PATH" + fi +fi +unset __conda_setup +# <<< conda initialize <<< + diff --git a/nvim/.config/nvim/colors.vim b/nvim/.config/nvim/colors.vim index f1b39b5..53d9b30 100644 --- a/nvim/.config/nvim/colors.vim +++ b/nvim/.config/nvim/colors.vim @@ -1,6 +1,8 @@ +let g:airline_theme="papercolor" + set termguicolors -set background=dark +set background=light let g:gruvbox_italic=1 let g:gruvbox_italicize_strings=1 colorscheme gruvbox diff --git a/nvim/.config/nvim/plugs.vim b/nvim/.config/nvim/plugs.vim index 74bdf85..e4a899f 100644 --- a/nvim/.config/nvim/plugs.vim +++ b/nvim/.config/nvim/plugs.vim @@ -10,6 +10,7 @@ Plug 'airblade/vim-gitgutter' " Shows a diff in the gutter " TODO: what is this section called? " TODO: consider switching to powerline Plug 'vim-airline/vim-airline' " Display more contextual information +Plug 'vim-airline/vim-airline-themes' " language support Plug 'fatih/vim-go', { 'do': ':GoUpdateBinaries' } diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf index 378ef09..3a34b30 100644 --- a/tmux/.tmux.conf +++ b/tmux/.tmux.conf @@ -12,17 +12,17 @@ set-window-option -g automatic-rename-format "#{pane_current_command}" set-window-option -g allow-rename off # window status -setw -g window-status-format "#[bg=colour241,fg=colour233] #I #(basename #{pane_current_path})/#W " -setw -g window-status-current-format "#[bg=colour245,fg=colour233] #I #(basename #{pane_current_path})/#W " +setw -g window-status-format "#[bg=colour252,fg=colour240]#I #(basename #{pane_current_path})→ #W" +setw -g window-status-current-format "#[bg=colour255,fg=colour240,bold]#I #(basename #{pane_current_path})→ #W" # The statusbar set -g status-interval 2 set -g status-position bottom -set -g status-bg colour234 -set -g status-fg colour137 +set -g status-bg colour0 +set -g status-fg colour0 set -g status-attr dim -set -g status-left '#[fg=colour245] #(whoami)@#H > #S ' -set -g status-right '#[fg=colour233,bg=colour241,bold] %m/%d #[fg=colour233,bg=colour245,bold] %I:%M ' +set -g status-left '#[fg=colour240] (#S) ' +set -g status-right '#[fg=colour240,bg=colour0,italics] #(whoami)@#H %m/%d %I:%M ' set -g status-right-length 50 set -g status-left-length 40 set -g clock-mode-style 12