Merge from PC.

dotfiles/.bash_aliases

@@ -17,8 +17,8 @@ alias mlt="okular ~/Downloads/Textbook.pdf"
 	alias lab="cd ~/258/258-labs-self"
 
 # config
-alias vb="gvim ~/.bash_aliases"
+alias vb="vi ~/.bash_aliases"
-alias vv="gvim ~/.vimrc"
+alias vv="vi ~/.vimrc"
 alias rba=". ~/.bashrc"
 
 # git
@@ -41,5 +41,5 @@ g(){
 }
 
 rs(){
-    redshift -O $1
+	redshift -O $(($1 * 1000))
 }

dotfiles/.vimrc

@@ -8,6 +8,8 @@ set autoindent
 set mouse=c
 set clipboard=unnamedplus
 
+autocmd VimResized * wincmd =
+
 " 'h/u3/c7/05/mokkar/.vim/plugged'
 " '~/.vim/plugged'
 call plug#begin('~/.vim/plugged')
@@ -16,13 +18,16 @@ Plug 'vim-scripts/L9'
 Plug 'vim-scripts/FuzzyFinder'
 Plug 'whatyouhide/vim-gotham'
 Plug 'nathanaelkane/vim-indent-guides'
-# Plug 'felixhummel/setcolors.vim'
+" Plug 'felixhummel/setcolors.vim'
+Plug 'flazz/vim-colorschemes'
 
 call plug#end()
 
-colorscheme gotham
+colorscheme gotham256
 
-map <Enter> o<ESC>
+map <F3> :wa<CR>
-map <S-Enter> O<ESC>
-map <F10> :PlugInstall<CR>
 map <F4> :wqa<CR>
+map <F5> :qa<CR>
+map <F10> :PlugInstall<CR>
+" map <Enter> o<ESC>
+" map <S-Enter> O<ESC>

dotfiles/termConfig

@@ -2,7 +2,7 @@
   title_font = Noto Sans 10
   title_transmit_bg_color = "#3d3d3d"
 [keybindings]
-  close_term = <Primary>w
+  close_term = <Primary><Shift>w
 [layouts]
   [[default]]
     [[[child1]]]
@@ -18,6 +18,6 @@
     copy_on_selection = True
     cursor_color = "#b9b9b9"
     font = Noto Mono 11
-    foreground_color = "#174af0"
+    foreground_color = "#0077ff"
-    palette = "#1f1f1f:#f81118:#2dc55e:#ecba0f:#2a84d2:#4e5ab7:#1081d6:#d6dbe5:#d6dbe5:#de352e:#1dd361:#f3bd09:#1081d6:#5350b9:#0f7ddb:#ffffff"
+    palette = "#000000:#aa0000:#00aa00:#aa5500:#0000aa:#aa00aa:#00aaaa:#aaaaaa:#555555:#ff5555:#55ff55:#ffff55:#5555ff:#ff55ff:#55ffff:#ffffff"
     use_system_font = False