diff --git a/.bashrc b/.bashrc
index ab490cc..f2a6d6f 100644
--- a/.bashrc
+++ b/.bashrc
@@ -157,6 +157,7 @@ alias speedtest="speedtest-cli"
 alias "cd.."="cd .."
 alias df='df -h'                          # human-readable sizes
 alias free='free -m'                      # show sizes in MB
+alias ls='exa'
 
 ## gpg encryption
 # verify signature for isos
@@ -220,5 +221,6 @@ export PATH="$PATH:$HOME/.local/share/flatpak/exports/bin"
  	exec startx
  fi
 
- export $(dbus-launch)
+export $(dbus-launch)
 
+neofetch
diff --git a/.config/nvim/lua/completion.lua b/.config/nvim/lua/completion.lua
index 0a15eed..80ce0e7 100644
--- a/.config/nvim/lua/completion.lua
+++ b/.config/nvim/lua/completion.lua
@@ -64,7 +64,7 @@ local cmp_status_ok, cmp = pcall(require, "cmp")
 			},
 			-- Accept currently selected item. If none selected, `select` first item.
 			-- Set `select` to `false` to only confirm explicitly selected items.
-			["<CR>"] = cmp.mapping.confirm { select = true },
+			["<CR>"] = cmp.mapping.confirm { select = false },
 			["<Tab>"] = cmp.mapping(function(fallback)
 				if cmp.visible() then
 					cmp.select_next_item()
diff --git a/.config/nvim/lua/config.lua b/.config/nvim/lua/config.lua
index f74d2b3..5aba0e4 100644
--- a/.config/nvim/lua/config.lua
+++ b/.config/nvim/lua/config.lua
@@ -24,9 +24,24 @@ set.listchars = 'tab:→ ,eol:↲,nbsp:␣,trail:•,extends:⟩,precedes:⟨'
 
 set.tabstop = 4
 set.shiftwidth = 4
---set.expandtab = true
 vim.o.expandtab = false
 vim.o.smartindent = true
 
 set.swapfile = false
 
+-- spellcheck (enable with `set spell`)
+vim.o.spelllang = 'cs,en_gb'
+vim.cmd [[ hi SpellBad cterm=bold ctermbg=red ctermfg=white ]]
+
+-- cursor padding from top and bottom
+vim.o.scrolloff = 5
+
+-- better navigation in split windows
+vim.keymap.set('n', '<C-h>', '<C-w>h')
+vim.keymap.set('n', '<C-j>', '<C-w>j')
+vim.keymap.set('n', '<C-k>', '<C-w>k')
+vim.keymap.set('n', '<C-h>', '<C-w>l')
+
+-- colorscheme
+vim.cmd [[ color base16-default-dark ]]
+
diff --git a/.xinitrc b/.xinitrc
index e60f7e4..3492703 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -1,19 +1,15 @@
 #!/bin/bash
 
-[[ "$(xrandr --listmonitors)" == *"HDMI2"* ]] && $HOME/.screenlayout/home.sh
+[[ -f ~/.Xresources ]] && xrdb -merge -I$HOME ~/.Xresources
 
 feh --bg-center "$HOME/Pictures/bg.png" &
 
 xautolock -locker slock -detectsleep -secure -time 10 &
 
-pipewire &
-pipewire-pulse &
+#pipewire &
+#pipewire-pulse &
 dwmblocks &
 
-while true; do
-	$HOME/.scripts/batterycheck
-	sleep 30
-done &
 
 while true; do
 	dwm