Merge branch 'master' of yigitsever.bike:/home/yigit/dots

2 files changed, 40 insertions, 5 deletions

diff --git a/.config/i3/config##desktop.Linux.Maus b/.config/i3/config##desktop.Linux.Maus
index fa68ba0..3451ae4 100644
--- a/.config/i3/config##desktop.Linux.Maus
+++ b/.config/i3/config##desktop.Linux.Maus
@@ -21,7 +21,10 @@ exec --no-startup-id nm-applet &
 exec --no-startup-id xrandr --output DVI-D-0 --off --output HDMI-0 --mode 1920x1080 --pos 0x0 --rotate left --output DVI-I-1 --primary --mode 1920x1080 --pos 1132x608 --rotate normal --output DVI-I-0 --off --output DP-1 --off --output DP-0 --off &
 
 # swap caps lock and escape, set keyboard layout
-exec --no-startup-id setxkbmap -model pc105 -layout us,us,tr -variant ,colemak, -option grp:alt_shift_toggle,caps:swapescape
+exec --no-startup-id setxkbmap -model pc105 -layout us,us,tr -variant ,colemak, -option grp:alt_shift_toggle,caps:backspace
+
+# and ctrl to escape
+exec --no-startup-id xcape -e 'Control_L=Escape'
 
 #launch conky windows
 exec --no-startup-id conky --daemonize -c ~/.config/conky/conky.conf
diff --git a/.config/zathura/zathurarc b/.config/zathura/zathurarc
index d021df1..5b33e67 100644
--- a/.config/zathura/zathurarc
+++ b/.config/zathura/zathurarc
@@ -1,6 +1,38 @@
 set selection-clipboard  clipboard
 set incremental-search   "true"
-set recolor-lightcolor   "#080808"  #00
-set recolor-darkcolor    "#E0E0E0"  #06
-set recolor              "true"
-set recolor-keephue      "true"
+
+# Base16 Solarized Dark
+# Author: Ethan Schoonover (modified by aramisgithub)
+
+set default-bg                  "#002b36"
+set default-fg                  "#073642"
+
+set statusbar-fg                "#839496"
+set statusbar-bg                "#586e75"
+
+set inputbar-bg                 "#002b36"
+set inputbar-fg                 "#fdf6e3"
+
+set notification-bg             "#002b36"
+set notification-fg             "#fdf6e3"
+
+set notification-error-bg       "#002b36"
+set notification-error-fg       "#dc322f"
+
+set notification-warning-bg     "#002b36"
+set notification-warning-fg     "#dc322f"
+
+set highlight-color             "#b58900"
+set highlight-active-color      "#268bd2"
+
+set completion-bg               "#073642"
+set completion-fg               "#268bd2"
+
+set completion-highlight-fg     "#fdf6e3"
+set completion-highlight-bg     "#268bd2"
+
+set recolor-lightcolor          "#002b36"
+set recolor-darkcolor           "#eee8d5"
+
+set recolor                     "true"
+set recolor-keephue             "false"