diff --git a/home/dot_config/alacritty/alacritty.toml b/home/dot_config/alacritty/alacritty.toml
index 054c9f7..15cb657 100644
--- a/home/dot_config/alacritty/alacritty.toml
+++ b/home/dot_config/alacritty/alacritty.toml
@@ -1,4 +1,3 @@
-live_config_reload = true
 
 [colors.bright]
 black = "#6272a4"
@@ -83,3 +82,6 @@ opacity = 0.85
 [window.padding]
 x = 5
 y = 5
+
+[general]
+live_config_reload = true
diff --git a/home/dot_config/nvim/lua/basic/mapping.lua b/home/dot_config/nvim/lua/basic/mapping.lua
index 95b064d..eaf41d3 100644
--- a/home/dot_config/nvim/lua/basic/mapping.lua
+++ b/home/dot_config/nvim/lua/basic/mapping.lua
@@ -19,3 +19,9 @@ keymap.set('n', '<leader>dd', 'gt')
 keymap.set('n', '<F9>', ':%!jq .<CR>')
 
 keymap.set('n', '<leader>sg', ':lua vim.diagnostic.open_float(0, {scope="line"})<CR>')
+
+if vim.api.nvim_win_get_option(0, "diff") then
+  keymap.set('n', '<leader>1', ':diffget LOCAL<CR>')
+  keymap.set('n', '<leader>2', ':diffget REMOTE<CR>')
+  keymap.set('n', '<leader>3', ':%diffget LOCAL<CR>')
+end
diff --git a/home/dot_config/nvim/lua/plugins/list.lua b/home/dot_config/nvim/lua/plugins/list.lua
index 4ad3d6b..08b5098 100644
--- a/home/dot_config/nvim/lua/plugins/list.lua
+++ b/home/dot_config/nvim/lua/plugins/list.lua
@@ -74,7 +74,7 @@ return {
   require('plugins.lualine'),
   require('plugins.bufferline'),
 
-  require('plugins.indent_blankline'),
+  --require('plugins.indent_blankline'),
   "nvim-treesitter/nvim-treesitter",
 
   {
@@ -124,6 +124,7 @@ return {
   "elkowar/yuck.vim",
 
   "evanleck/vim-svelte",
+  "AndrewRadev/linediff.vim",
 
   -- themes
   "tomasr/molokai",
diff --git a/home/dot_config/nvim/lua/plugins/lsp.lua b/home/dot_config/nvim/lua/plugins/lsp.lua
index 9d7be36..5d3db68 100644
--- a/home/dot_config/nvim/lua/plugins/lsp.lua
+++ b/home/dot_config/nvim/lua/plugins/lsp.lua
@@ -48,7 +48,7 @@ return {
       capabilities = capabilities,
       on_attach = on_attach,
     }
-    nvlsp['tsserver'].setup{
+    nvlsp['ts_ls'].setup{
       capabilities = capabilities,
       on_attach = on_attach,
     }
diff --git a/home/dot_config/pgcli/config b/home/dot_config/pgcli/config
index 15dd042..e2d775e 100644
--- a/home/dot_config/pgcli/config
+++ b/home/dot_config/pgcli/config
@@ -205,6 +205,7 @@ ln-prod = postgresql://postgres:CyMrS127VIx@10.140.0.90
 ln-lab = postgresql://postgres:eKZJFdG9L5vaREXN@192.168.88.15:32014
 professorx-dev = postgresql://postgres:e8b960296e22@192.168.88.6
 k8s-gcp-dev = postgresql://postgres:eKZJFdG9L5vaREXN@10.140.0.51:32008
+k8s-log-collector = postgresql://postgres:j88ArUndbrAe@192.168.88.23:5432
 
 # Format for number representation
 # for decimal "d" - 12345678, ",d" - 12,345,678
diff --git a/home/dot_config/sway/config b/home/dot_config/sway/config
index a1c9a51..7d66c8d 100644
--- a/home/dot_config/sway/config
+++ b/home/dot_config/sway/config
@@ -25,6 +25,7 @@ set $term alacritty
 # on the original workspace that the command was run on.
 # set $menu dmenu_path | dmenu | xargs swaymsg exec --
 set $menu wofi --show drun
+set $window_switcher ~/.config/wofi/wofi-window-switch.sh
 
 ### Output configuration
 #
@@ -99,6 +100,7 @@ input type:touchpad {
 
     # Start your launcher
     bindsym $mod+d exec $menu
+    bindsym $mod+w exec $window_switcher
 
     # Drag floating windows by holding down $mod and left mouse button.
     # Resize them with right mouse button + $mod.
diff --git a/home/dot_config/wofi/executable_wofi-window-switch.sh b/home/dot_config/wofi/executable_wofi-window-switch.sh
new file mode 100644
index 0000000..4a539a8
--- /dev/null
+++ b/home/dot_config/wofi/executable_wofi-window-switch.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+entries=$(swaymsg -t get_tree | jq -r -c '
+  recurse(.nodes[]?) |
+  recurse(.floating_nodes[]?) |
+  select(.type=="con"), select(.type=="floating_con") |
+  (.id | tostring) + " " + .app_id + ": " + .name')
+
+echo "$entries"
+
+selected=$(echo -e "$entries" | wofi --width 450 --height 350 --dmenu --cache-file /dev/null | awk '{print $1}')
+
+if [ -n "$selected" ]; then
+  swaymsg "[con_id=$selected]" focus
+fi
diff --git a/home/dot_gitconfig.tmpl b/home/dot_gitconfig.tmpl
index e06663c..3727298 100644
--- a/home/dot_gitconfig.tmpl
+++ b/home/dot_gitconfig.tmpl
@@ -22,9 +22,15 @@
   wtl = worktree list
 [mergetool]
 	keepBackup = false
+  prompt = true
 [mergetool "vimdiff"]
   cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
 [core]
   editor = nvim
 
+[filter "lfs"]
+	clean = git-lfs clean -- %f
+	smudge = git-lfs smudge -- %f
+	process = git-lfs filter-process
+	required = true
 # vim: ft=gitconfig
diff --git a/home/dot_pam_environment b/home/dot_pam_environment
index 13e2c3e..6ee0580 100644
--- a/home/dot_pam_environment
+++ b/home/dot_pam_environment
@@ -1,3 +1,4 @@
+XIM=fcitx
 GTK_IM_MODULE=fcitx
 QT_IM_MODULE=fcitx
 XMODIFIERS=@im=fcitx