From c535089fa0e52f2e54c7a156ad0baa3c9d1a9e08 Mon Sep 17 00:00:00 2001
From: CramMK <ma_tho@web.de>
Date: Wed, 27 May 2020 10:11:19 +0200
Subject: [PATCH] Some fixes

---
 config.yaml                       |  4 ++--
 dotfiles/i3/{i3 => config}        |  9 +++++----
 dotfiles/polybar/config           | 10 +++++-----
 dotfiles/polybar/start.sh         |  4 ++--
 dotfiles/tmux/{tmux => tmux.conf} |  0
 dotfiles/vim/vimrc                |  5 +++++
 dotfiles/zsh/zshrc                | 11 ++++-------
 7 files changed, 23 insertions(+), 20 deletions(-)
 rename dotfiles/i3/{i3 => config} (98%)
 rename dotfiles/tmux/{tmux => tmux.conf} (100%)

diff --git a/config.yaml b/config.yaml
index b981af5..d199af4 100644
--- a/config.yaml
+++ b/config.yaml
@@ -38,7 +38,7 @@ dotfiles:
     src: X11/xinitrc
     dst: ~/.xinitrc
   f_i3:
-    src: i3/i3
+    src: i3/config
     dst: ~/.config/i3/config
   f_i3status:
     src: i3/i3status
@@ -52,7 +52,7 @@ dotfiles:
     src: compton/compton.conf
     dst: ~/.config/compton.conf
   f_tmux:
-    src: tmux/tmux
+    src: tmux/tmux.conf
     dst: ~/.tmux.conf
   d_tmux_themes:
     src: tmux/themes
diff --git a/dotfiles/i3/i3 b/dotfiles/i3/config
similarity index 98%
rename from dotfiles/i3/i3
rename to dotfiles/i3/config
index 7f1baee..1978e68 100644
--- a/dotfiles/i3/i3
+++ b/dotfiles/i3/config
@@ -47,6 +47,7 @@ floating_modifier $mod
 
 # start a terminal
 bindsym $mod+Return exec xterm
+set $terminal xterm
 # for_window [class="XTerm"] floating enable move right 450px,move down 350px
 
 # kill focused window
@@ -153,7 +154,7 @@ for_window [class="^.*"] border pixel 0
 
 # Colors from https://www.nordtheme.com/
 # class                 border  backgr. text    indicator child_border
-client.focused          #4C566A #4C566A #ECEFF4 #BF616A   #E5E9F0
+client.focused          #4C566A #4C566A #ECEFF4 #A3BE8C   #A3BE8C
 client.focused_inactive #3B4252 #3B4252 #ECEFF4 #BF616A   #5f676a
 client.unfocused        #333333 #222222 #D8DEE9 #BF616A   #222222
 client.urgent           #2f343a #BF616A #ECEFF4 #BF616A   #900000
@@ -164,7 +165,7 @@ exec --no-startup-id setxkbmap za
 bindsym Ctrl+Shift+1 exec --no-startup-id setxkbmap za
 
 # Background
-exec --no-startup-id picom
+exec --no-startup-id compton
 exec --no-startup-id feh --bg-scale ~/wallpaper/wallpaper.png
 
 # Remove title bar
@@ -256,8 +257,8 @@ bindsym $mod+Ctrl+2 move workspace to output $monitor2
 #smart_gaps on
 gaps inner 8
 
-# ranger
-bindsym $mod+e exec xterm ranger
+# Ranger
+bindsym $mod+e exec $terminal ranger
 
 exec_always --no-startup-id ~/.config/polybar/start.sh &amp;
 exec_always --no-startup-id dunst
diff --git a/dotfiles/polybar/config b/dotfiles/polybar/config
index 711c8bf..172cc9e 100644
--- a/dotfiles/polybar/config
+++ b/dotfiles/polybar/config
@@ -50,19 +50,19 @@ width = 100%
 height = 27
 
 #padding-left = 0.5
-padding-right = 2
+padding-right = 1
 
 foreground = ${colors.foreground}
 background = ${colors.background}
 
-tray-position = none
+tray-position = right
 
 #border-size = 5
 #border-color = ${colors.background}
 
 module-margin = 1
 
-modules-left = i3tabs
+modules-left = i3tabs title
 modules-center =
 modules-right = backlight volume battery date time powermenu
 separator =
@@ -95,11 +95,11 @@ modules-right =
 [bar/external_top]
 inherit = bar/laptop_top
 
-tray-position = none
+tray-position = right
 
 monitor = ${env:MONITOR:}
 
-modules-left = i3tabs
+modules-left = i3tabs title
 modules-center =
 modules-right = volume battery date time
 separator =
diff --git a/dotfiles/polybar/start.sh b/dotfiles/polybar/start.sh
index eed8dbc..8e35903 100755
--- a/dotfiles/polybar/start.sh
+++ b/dotfiles/polybar/start.sh
@@ -5,10 +5,10 @@ if type "xrandr"; then
   for mon in $(xrandr --query | grep " connected" | cut -d" " -f1); do
     if [[ ${mon} = *eDP-1* ]]; then
         polybar --reload laptop_top &
-        polybar --reload laptop_bottom &
+        #polybar --reload laptop_bottom &
     else
         MONITOR=$mon polybar --reload external_top &
-        MONITOR=$mon polybar --reload external_bottom &
+        #MONITOR=$mon polybar --reload external_bottom &
     fi
   done
 else
diff --git a/dotfiles/tmux/tmux b/dotfiles/tmux/tmux.conf
similarity index 100%
rename from dotfiles/tmux/tmux
rename to dotfiles/tmux/tmux.conf
diff --git a/dotfiles/vim/vimrc b/dotfiles/vim/vimrc
index 9292fa0..4153c0d 100644
--- a/dotfiles/vim/vimrc
+++ b/dotfiles/vim/vimrc
@@ -14,6 +14,8 @@ Plugin 'arcticicestudio/nord-vim'
 Plugin 'vim-airline/vim-airline'
 Plugin 'vim-airline/vim-airline-themes'
 
+Plugin 'vimwiki/vimwiki'
+
 " Required
 call vundle#end()
 filetype plugin indent on
@@ -46,6 +48,9 @@ let g:pear_tree_pairs = {
             \ '<': {'closer': '>'}
             \ }
 
+" Vimwiki
+let g:vimwiki_list = [{'path': '~/vimwiki/'}]
+
 " Other configurations
 " Colors
 syntax on
diff --git a/dotfiles/zsh/zshrc b/dotfiles/zsh/zshrc
index e4dadc7..833a9cb 100644
--- a/dotfiles/zsh/zshrc
+++ b/dotfiles/zsh/zshrc
@@ -25,20 +25,17 @@ export LANG="en_US.UTF-8"
 export PATH=$HOME/.local/bin:$PATH
 
 # Aliases
-alias zshrc="vim ~/.zshrc"
 alias vimrc="vim ~/.vimrc"
 
-alias szsh="source ~/.zshrc"
-
-alias v="vifm"
 alias dotf="cd ~/dotfiles/dotfiles"
-alias fonts="/home/$USER/.local/share/fonts"
-
 alias dotdrop="~/dotfiles/dotdrop.sh" --cfg="~/dotfiles/config.yaml"
-alias screenshot="import ~/Downloads/Screenshot-$(date '+%Y%m%d-%H%M%S').png"
+
+alias fonts="/home/$USER/.local/share/fonts"
 alias listfonts="fc-list :scalable=true:spacing=mono: family"
 alias cachefonts="fc-cache -f -v"
 
+alias wiki="vim ~/vimwiki/index.wiki"
+
 # Allow local aliases
 if [ -f ~/.zshrc_local ]; then
     source ~/.zshrc_local