From 3604c536d5bb1fadb3ea18ba3bc0ea55f62a8f5f Mon Sep 17 00:00:00 2001
From: Urbain Vaes <urbain@vaes.uk>
Date: Sat, 17 Nov 2018 15:12:42 +0100
Subject: Improve colors

---
 i3/.config/i3/config            |  21 +++++++++++----------
 vim/.vim/spell/en.utf-8.add     |   3 +++
 vim/.vim/spell/en.utf-8.add.spl | Bin 627 -> 666 bytes
 vim/.vimrc                      |   6 ++++--
 xinit/.xinitrc                  |   2 +-
 5 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/i3/.config/i3/config b/i3/.config/i3/config
index 1013398..6529f0a 100644
--- a/i3/.config/i3/config
+++ b/i3/.config/i3/config
@@ -119,13 +119,14 @@ bindsym $mod+r mode "resize"
 
 for_window [class="^.*"] border pixel 2
 
-set $background #3a3a3a
+set $background #2c2c2c
 set $foreground #d0d0d0
 set $focused_bg #4a4a4a
 set $focused_bg #875f5f
 set $focused_fg #ffd787
 set $focused_fg #ffffff
-set $active_fg  #87afd7
+set $active_bg  #5f875f
+set $active_fg  #dddddd
 set $inactive_fg #aaaaaa
 set $inactive_bg #3a3a3a
 set $urgent_bg #d7afaf
@@ -150,7 +151,7 @@ bar {
 
         # class            border       backgr.      text
         focused_workspace  $focused_bg  $focused_bg  $focused_fg
-        active_workspace   $background  $background  $active_fg
+        active_workspace   $active_bg   $active_bg   $active_fg
         inactive_workspace $inactive_bg $inactive_bg $inactive_fg
         urgent_workspace   $urgent_bg   $urgent_bg   #303030
     }
@@ -160,18 +161,18 @@ bindsym $mod+m bar mode toggle
 
 # Move focus
 bindsym $mod+x                 focus output left
-bindsym $mod+n                 exec $HOME/bin/workspace gw
+bindsym $mod+n                 exec $HOME/.local/bin/workspace gw
 bindsym $mod+comma             workspace prev
 bindsym $mod+period            workspace next
 bindsym $mod+Tab               workspace back_and_forth
 
 # Move workspace
-bindsym $mod+Shift+comma       exec $HOME/bin/workspace mw p
-bindsym $mod+Shift+period      exec $HOME/bin/workspace mw n
+bindsym $mod+Shift+comma       exec $HOME/.local/bin/workspace mw p
+bindsym $mod+Shift+period      exec $HOME/.local/bin/workspace mw n
 bindsym $mod+Control+x         move workspace to output left; focus output left
 
 # Move container
-bindsym $mod+Shift+n           exec $HOME/bin/workspace mc
+bindsym $mod+Shift+n           exec $HOME/.local/bin/workspace mc
 bindsym $mod+Shift+x           move to output left; focus output left
 
 # Programs and commands
@@ -196,9 +197,9 @@ bindsym $mod+Shift+m exec --no-startup-id "urxvt -e tmuxinator start email"
 bindsym $mod+y       exec --no-startup-id "urxvt -e tmuxinator start notes"
 
 # Launch scripts
-bindsym $mod+semicolon exec --no-startup-id $HOME/bin/run
-bindsym $mod+e         exec --no-startup-id $HOME/bin/tmux_attach
-bindsym $mod+o         exec --no-startup-id $HOME/bin/references
+bindsym $mod+semicolon exec --no-startup-id $HOME/.local/bin/run
+bindsym $mod+e         exec --no-startup-id $HOME/.local/bin/tmux_attach
+bindsym $mod+o         exec --no-startup-id $HOME/.local/bin/references
 # bindsym $mod+z
 # bindsym $mod+'
 
diff --git a/vim/.vim/spell/en.utf-8.add b/vim/.vim/spell/en.utf-8.add
index 7b3855b..85c3d81 100644
--- a/vim/.vim/spell/en.utf-8.add
+++ b/vim/.vim/spell/en.utf-8.add
@@ -32,3 +32,6 @@ SDEs
 coercivity
 invertibility
 hypocoercive
+underdamped
+Langevin
+overdamped
diff --git a/vim/.vim/spell/en.utf-8.add.spl b/vim/.vim/spell/en.utf-8.add.spl
index cf96aee..5107416 100644
Binary files a/vim/.vim/spell/en.utf-8.add.spl and b/vim/.vim/spell/en.utf-8.add.spl differ
diff --git a/vim/.vimrc b/vim/.vimrc
index 750f4c0..555906b 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -99,7 +99,7 @@ nnoremap cpr :IronRepl<cr>
 nnoremap cpn :NERDTreeToggle<cr>
 nnoremap cpt :TagbarToggle<cr>
 nnoremap cpu :GundoToggle<cr>
-nnoremap <buffer> <nowait> <expr> cp Remembrall('cp')
+nnoremap <nowait> <expr> cp Remembrall('cp')
 
 " Easy motion
 map gs <Plug>(easymotion-prefix)
@@ -517,7 +517,9 @@ augroup myflags
     autocmd User Flags call Hoist("buffer", "%{b:mixed?'[mixed]':''}")
     autocmd User Flags call Hoist("buffer", "%{&paste?'[paste]':''}")
     autocmd User Flags call Hoist("window", "%{WinCwd() != '' ? '['.WinCwd().']' : ''}")
-    autocmd User Flags call Hoist("global", {"hl": "Statusline"}, "[%{pathshorten(GlobalCwd())}, %{g:my_searchprgs[g:my_searchprg]}, %{g:my_findprgs[g:my_findprg]}]")
+
+    highlight MyGlobals ctermfg=255 ctermbg=65
+    autocmd User Flags call Hoist("global", {"hl": "MyGlobals"}, "[%{pathshorten(GlobalCwd())}, %{g:my_searchprgs[g:my_searchprg]}, %{g:my_findprgs[g:my_findprg]}]")
 augroup END
 
 "" Neovim {{{1
diff --git a/xinit/.xinitrc b/xinit/.xinitrc
index 276d21d..9219af4 100755
--- a/xinit/.xinitrc
+++ b/xinit/.xinitrc
@@ -4,7 +4,7 @@
 /usr/bin/start-pulseaudio-x11
 
 # Load key bindings
-$HOME/bin/keyboard
+$HOME/.local/bin/keyboard
 
 # Load Xresources to light colorscheme
 source $HOME/.local/colors.zsh
-- 
cgit v1.2.3