diff --git a/fish/dot-config/fish/fish_variables b/fish/dot-config/fish/fish_variables
index cce5597..7500f1f 100644
--- a/fish/dot-config/fish/fish_variables
+++ b/fish/dot-config/fish/fish_variables
@@ -31,4 +31,4 @@ SETUVAR fish_pager_color_description:B3A06D\x1eyellow\x1e\x2di
 SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
 SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
 SETUVAR fish_pager_color_selected_background:\x2dr
-SETUVAR fish_user_paths:/home/mans/go/bin\x1e/home/mans/\x2ebun/bin\x1e/home/mans/.bin/
+SETUVAR fish_user_paths:/home/mans/.cargo/bin\x1e/home/mans/go/bin\x1e/home/mans/\x2ebun/bin\x1e/home/mans/.bin/
diff --git a/git/.gitconfig b/git/.gitconfig
index 89fafc5..d3829fd 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -7,3 +7,9 @@
 	insteadOf = https://git.mzsl.nl/
 [gpg]
 	format = ssh
+[init]
+	defaultBranch = main
+[push]
+	default = current
+[color]
+	ui = auto
diff --git a/i3/dot-config/i3/config b/i3/dot-config/i3/config
index 2a2ebed..d615d74 100644
--- a/i3/dot-config/i3/config
+++ b/i3/dot-config/i3/config
@@ -200,7 +200,7 @@ bindsym $mod+Shift+e exec ~/.config/i3/scripts/powermenu
 
 # Lock the system
 # lock with a picture:
-bindsym $mod+x exec i3lock -i  ~/.config/i3/i3-lock-screen.png -p default|win -t
+bindsym $mod+x exec i3lock --color=000000 -p win -t
 # lock by blurring the screen:
 # bindsym $mod+l exec ~/.config/i3/scripts/blur-lock
 
@@ -415,13 +415,15 @@ exec --no-startup-id ~/.screenlayout/monitor.sh
 # set wallpaper
 # exec --no-startup-id sleep 2 && nitrogen --restore
 # exec --no-startup-id sleep 1 && feh --bg-fill /usr/share/endeavouros/backgrounds/endeavouros-wallpaper.png
-exec --no-startup-id sleep 1 && xsetroot -solid '#101010'
+exec --no-startup-id sleep 1 && feh --bg-fill ~/ocis/Personal/wallpapers/tim-foster-o4mP43oPGHk-unsplash.jpg
+#exec --no-startup-id sleep 1 && xsetroot -solid '#101010'
 
 # set powersavings for display:
-exec --no-startup-id xset s 1600 dpms 600 600 600
+# exec --no-startup-id xset s 1600 dpms 600 600 600
 
 # disable power saving (for example if using xscreensaver)
-#exec --no-startup-id xset -dpms
+exec --no-startup-id xset -dpms
+exec --no-startup-id xset s off
 
 # use xautolock to use autosuspend rules for mobile devices
 # https://wiki.archlinux.org/title/Session_lock#xautolock
@@ -455,7 +457,7 @@ exec --no-startup-id sleep 3 && spotify
 exec --no-startup-id sleep 3 && birdtray
 # exec --no-startup-id sleep 3 && discord
 exec --no-startup-id sleep 3 && opensnitch-ui
-exec --no-startup-id sleep 3 && obsidian
+# exec --no-startup-id sleep 3 && obsidian
 
 ###############
 # system tray #
diff --git a/i3/dot-config/i3/i3-lock-screen.png b/i3/dot-config/i3/i3-lock-screen.png
new file mode 100644
index 0000000..605dc87
Binary files /dev/null and b/i3/dot-config/i3/i3-lock-screen.png differ
diff --git a/nvim/dot-config/nvim b/nvim/dot-config/nvim
index 08a1521..2c8bee2 160000
--- a/nvim/dot-config/nvim
+++ b/nvim/dot-config/nvim
@@ -1 +1 @@
-Subproject commit 08a1521eac9639ec9cde52b5aead2e49187f7d25
+Subproject commit 2c8bee2a42ca13d4b732c885e4f5a2f83ce4fc31
diff --git a/setup.sh b/setup.sh
index 7248b57..e738e20 100755
--- a/setup.sh
+++ b/setup.sh
@@ -10,12 +10,13 @@ base=(
 
 # folders that should, or only need to be installed for a local user
 useronly=(
-    bin
-    git
-    i3
-    kitty
-    nvim
-	fish
+		bin
+		git
+		i3
+		kitty
+		nvim
+		fish
+		tmux
 )
 
 # run the stow command for the passed in directory ($2) in location $1
diff --git a/tmux/dot-tmux.conf b/tmux/dot-tmux.conf
new file mode 100644
index 0000000..3ed9370
--- /dev/null
+++ b/tmux/dot-tmux.conf
@@ -0,0 +1,2 @@
+set -s escape-time 0
+set -g mouse on