diff --git a/.chezmoiignore b/.chezmoiignore
index f8fec8d..18c230a 100644
--- a/.chezmoiignore
+++ b/.chezmoiignore
@@ -14,6 +14,8 @@ LICENSE
 .config/nvim/lua/plugins/editor.lua
 .config/nvim/lua/plugins/lsp.lua
 .config/nvim/lua/plugins/treesitter.lua
+.config/nvim/lua/plugins/format.lua
+.config/nvim/lua/plugins/telescope.lua
 {{ else }}
 .config/nvim/lazyvim.json
 .config/nvim/stylua.toml
diff --git a/dot_config/nvim/lua/config/lazy.lua b/dot_config/nvim/lua/config/lazy.lua
index ece9cc5..22dd17c 100644
--- a/dot_config/nvim/lua/config/lazy.lua
+++ b/dot_config/nvim/lua/config/lazy.lua
@@ -19,7 +19,6 @@ require("lazy").setup({
     { import = "lazyvim.plugins.extras.lang.markdown" },
     { import = "lazyvim.plugins.extras.lang.clangd" },
     { import = "lazyvim.plugins.extras.lang.tex" },
-    { import = "lazyvim.plugins.extras.editor.trouble-v3" },
     -- import/override with your plugins
     { import = "plugins" },
   },
diff --git a/dot_ssh/config b/dot_ssh/config.tmpl
similarity index 93%
rename from dot_ssh/config
rename to dot_ssh/config.tmpl
index 7a139c1..7d84b01 100644
--- a/dot_ssh/config
+++ b/dot_ssh/config.tmpl
@@ -5,10 +5,10 @@ ControlPersist 4h
 ControlMaster auto
 ControlPath ~/.ssh/sockets/socket-%r@%h:%p
 VerifyHostKeyDNS yes
-AddKeysToAgent yes
+AddKeysToAgent no
 ForwardAgent no
 ForwardX11 no
-PKCS11Provider /usr/local/lib/pkcs11/opensc-pkcs11.so
+PKCS11Provider {{ .pkcslib }}
 
 Host csnhr
 Hostname csnhr.nhr.fau.de
diff --git a/dot_tmux.conf.tmpl b/dot_tmux.conf.tmpl
index 0ada93a..f16c939 100644
--- a/dot_tmux.conf.tmpl
+++ b/dot_tmux.conf.tmpl
@@ -53,19 +53,13 @@ set -g @catppuccin_window_default_text "#W"
 set -g @catppuccin_window_current_fill "number"
 set -g @catppuccin_window_current_text "#W"
 
-set -g @catppuccin_status_modules_right "user host date_time session"
+set -g @catppuccin_status_modules_right "user host date_time battery session"
 set -g @catppuccin_status_left_separator  " "
 set -g @catppuccin_status_right_separator ""
 set -g @catppuccin_status_right_separator_inverse "no"
 set -g @catppuccin_status_fill "icon"
 set -g @catppuccin_status_connect_separator "no"
 
-# Gruvbox
-# set -g @catppuccin_host_color "#458588"
-# set -g @catppuccin_user_color "#d79921"
-# set -g @catppuccin_date_time_color "#689d6a"
-# set -g @catppuccin_session_color "#d65d0e"
-
 # Nord
 set -g @catppuccin_host_color "#81A1C1"
 set -g @catppuccin_user_color "#81A1C1"
@@ -80,10 +74,12 @@ set -g @catppuccin_host_icon " "
 set -g @catppuccin_user_icon " "
 set -g @catppuccin_date_time_text "%H:%M"
 set -g @catppuccin_date_time_icon " "
+set -g @catppuccin_battery_icon "󰂎"
 set -g @catppuccin_session_icon " "
 
 # List of plugins
 set -g @plugin 'tmux-plugins/tmux-sensible'
+set -g @plugin 'tmux-plugins/tmux-battery'
 set -g @plugin 'tmux-plugins/tmux-yank'
 set -g @plugin 'tmux-plugins/tmux-pain-control'
 set -g @plugin 'tmux-plugins/tmux-logging'