diff --git a/.config/awesome/autorun.sh b/.config/awesome/autorun.sh
index 7d97fe4..0d0bc56 100755
--- a/.config/awesome/autorun.sh
+++ b/.config/awesome/autorun.sh
@@ -7,12 +7,15 @@ function run {
   fi
 }
 
-. ~/.config/compton/launch.sh
+run ~/.config/compton/launch.sh
 #run ~/.config/awesome/autohidewibox.py ~/.config/awesome/autohidewibox.conf
 run ~/setbg.sh 
 run dunst
 run pulseeffects --gapplication-service
+<<<<<<< HEAD
 xsetwacom set "Wacom HID 50DB Finger touch" Gesture off
 run touchegg
 run nm-applet
 #run music_wake.sh
+=======
+>>>>>>> 0d908b167965b06afc60f528d598a6abea56a879
diff --git a/.config/awesome/config_desktop.lua b/.config/awesome/config_desktop.lua
index a922b02..501b2d8 100644
--- a/.config/awesome/config_desktop.lua
+++ b/.config/awesome/config_desktop.lua
@@ -1,16 +1,29 @@
 return {
     widgets = {
-        left = {
+        top = {
+            left = {
 
+            },
+            mid = {
+
+            },
+            right = {
+                "volume",
+                "clock"
+            }
         },
-        mid = {
-            "mpd"
-        },
-        right = {
-            "memory",
-            "cpu",
-            "volume",
-            "clock"
+        bottom = {
+            left = {
+
+            },
+            mid = {
+                "mpd"
+            },
+            right = {
+                "memory",
+                "cpu",
+                "thermal",
+            }
         }
     },
     volume = {
diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index b2ea143..45de82c 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -16,7 +16,7 @@ local menubar = require("menubar")
 local hotkeys_popup = require("awful.hotkeys_popup")
 local vicious = require("vicious")
 local timer = require("gears.timer")
-local config = require("config_laptop")
+local config = require("config_desktop")
 local quake = require("quake")
 
 -- Enable hotkeys help widget for VIM and other apps
diff --git a/.config/i3/config b/.config/i3/config
index a235d32..d859f0e 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -239,9 +239,9 @@ mode "resize" {
 bindsym $mod+r mode "resize"
 
 # Pulse Audio controls
-bindsym XF86AudioRaiseVolume exec --no-startup-id sh -c "pactl set-sink-mute 0 false && pactl set-sink-volume 0 +5%"
-bindsym XF86AudioLowerVolume exec --no-startup-id sh -c "pactl set-sink-mute 0 false && pactl set-sink-volume 0 -5%"
-bindsym XF86AudioMute exec --no-startup-id sh -c "pactl set-sink-mute 0 toggle"
+bindsym XF86AudioRaiseVolume exec --no-startup-id sh -c "pactl set-sink-mute 1 false && pactl set-sink-volume 1 +5%"
+bindsym XF86AudioLowerVolume exec --no-startup-id sh -c "pactl set-sink-mute 1 false && pactl set-sink-volume 1 -5%"
+bindsym XF86AudioMute exec --no-startup-id sh -c "pactl set-sink-mute 1 toggle"
 
 
 # Workspace assignment
diff --git a/.config/polybar/config b/.config/polybar/config
index cc6f9c0..322f890 100644
--- a/.config/polybar/config
+++ b/.config/polybar/config
@@ -53,9 +53,7 @@ font-5 = "Font Awesome 5 Brands:pixelsize=12;1"
 modules-left = i3 workspaces-xmonad
 modules-center = xwindow
 ;weather update installed
-modules-right = temperature xbacklight volume wlan battery date
-
-tray-postion = right
+modules-right = temperature xbacklight memory volume wlan battery date
 
 override-redirect = false
 
diff --git a/.config/polybar/launch.sh b/.config/polybar/launch.sh
index 48c8054..22fb743 100755
--- a/.config/polybar/launch.sh
+++ b/.config/polybar/launch.sh
@@ -5,11 +5,11 @@ killall polybar
 if type "xrandr"; then
   for m in $(xrandr --query | grep " connected" | cut -d" " -f1); do
     MONITOR=$m polybar --reload bar1 &
-    MONITOR=$m polybar --reload touchbar &
+    #MONITOR=$m polybar --reload touchbar &
   done
 else
   polybar --reload bar1 &
-  polybar --reload touchbar &
+  #polybar --reload touchbar &
 fi
 
 sleep 1
diff --git a/.vimrc b/.vimrc
index 034eb4a..f585d18 100644
--- a/.vimrc
+++ b/.vimrc
@@ -29,27 +29,39 @@ call plug#end()            " required
 
 filetype plugin indent on    " required
 
-let g:LanguageClient_serverCommands = {
-    \ 'r': ['R', '--slave', '-e', 'languageserver::run()'],
-    \ }
-
 let g:deoplete#enable_at_startup = 1
 let g:deoplete#sources#clang#libclang_path = "/usr/lib/libclang.so"
 let g:deoplete#sources#clang#clang_header = "/usr/lib/clang"
 let g:deoplete#sources#rust#racer_binary='/usr/bin/racer'
 let g:deoplete#sources#rust#rust_source_path='/usr/src/rust/src'
 
+let g:LanguageClient_serverCommands = {
+	\ 'lua': ['lua-lsp'],
+	\ }
+let g:LanguageClient_autoStart = 1
  
 set tags+=./.tags
 
-
 " Session management
 
 set switchbuf=useopen,usetab
 
+let g:session = 0
+
+fu! AutoSaveSess()
+    if g:session == 1
+        call SaveSess()
+    endif
+endfunction
 
 fu! SaveSess()
+    execute 'NERDTreeTabsClose'
     execute 'mksession! ' . getcwd() . '/.session.vim'
+    let g:session = 1
+endfunction
+
+fu! RemoveSess()
+    shell "rm " . getcwd() . "/.session.vim"
 endfunction
 
 fu! RestoreSess()
@@ -63,15 +75,19 @@ if filereadable(getcwd() . '/.session.vim')
             execute 'sb ' . file
         endif
     endfor
+    let g:session = 1
 endif
 endfunction
 
+:command Savesess call SaveSess()
+:command Restoresess call RestoreSess()
+:command Removesess call RemoveSess()
+
 " Save session on quitting Vim
-autocmd VimLeave * NERDTreeTabsClose
-autocmd VimLeave * call SaveSess()
+autocmd VimLeave * call AutoSaveSess()
 
 " Restore session on starting Vim
-autocmd VimEnter * nested call RestoreSess()
+"autocmd VimEnter * nested call RestoreSess()
 
 "----------------------
  
diff --git a/.zshrc b/.zshrc
index 2bd3e2e..db73e1a 100644
--- a/.zshrc
+++ b/.zshrc
@@ -1,5 +1,6 @@
 # If you come from bash you might have to change your $PATH.
 export PATH=$HOME/bin:/usr/local/bin:$PATH
+export PATH="$PATH:$HOME/go/bin:$HOME/.cargo/bin"
 
 export ZSH=/usr/share/oh-my-zsh
 
@@ -50,6 +51,11 @@ export ZSH=/usr/share/oh-my-zsh
 #POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=(${P9K__RIGHT})
 
 #POWERLEVEL9K_SHOW_CHANGESET=true
+#
+if [[ $TERM == xterm-termite ]]; then
+  . /etc/profile.d/vte.sh
+  __vte_osc7
+fi
 
 HYPHEN_INSENSITIVE="true"
 COMPLETION_WAITING_DOTS="true"
@@ -176,12 +182,12 @@ c() {
 
 alias ga="git add ."
 alias gc="git commit -m"
+alias gac="git commit -a -m"
 alias gpsh="git push"
 alias gpll="git pull"
 
 gacp() {
-    ga &&
-    gc $1 &&
+    gac $1 &&
     gpsh
 }
 
@@ -221,3 +227,4 @@ export PATH=$HOME/bin:/usr/local/bin:$PATH
 eval $(thefuck --alias)
 alias config='/usr/bin/git --git-dir=/home/daan/.cfg/ --work-tree=/home/daan'
 alias config='/usr/bin/git --git-dir=/home/daan/.cfg/ --work-tree=/home/daan'
+source /home/daan/.local/bin/tp