waybar: update config to be similar to polybar

add waybar and sway
nvim: luasnip
2025-01-31 10:57:51 +02:00 · 2025-01-17 20:54:59 +02:00 · 2024-12-06 14:01:53 +02:00 · 2024-11-19 20:19:50 +02:00 · 2024-11-19 20:19:18 +02:00 · 2024-11-19 20:19:01 +02:00
36 changed files with 522 additions and 1017 deletions
--- a/.config/fish/conf.d/xdg.fish
+++ b/.config/fish/conf.d/xdg.fish
@ -1,31 +0,0 @@
-# cleanup
-set -Ux ANDROID_HOME "$XDG_DATA_HOME"/android
-set -Ux CARGO_HOME "$XDG_DATA_HOME"/cargo
-set -Ux CUDA_CACHE_PATH "$XDG_CACHE_HOME"/nv
-set -Ux GDBHISTFILE "$XDG_DATA_HOME"/gdb/history
-set -Ux GNUPGHOME "$XDG_DATA_HOME"/gnupg
-set -Ux GOPATH "$XDG_DATA_HOME"/go
-set -Ux ICEAUTHORITY "$XDG_CACHE_HOME"/ICEauthority
-set -Ux IPYTHONDIR "$XDG_CONFIG_HOME"/ipython
-set -Ux LESSHISTFILE -
-set -Ux MYPY_CACHE_DIR "$XDG_CACHE_HOME"/mypy
-set -Ux NPM_CONFIG_USERCONFIG "$XDG_CONFIG_HOME"/npm/npmrc
-set -Ux PASSWORD_STORE_DIR "$XDG_DATA_HOME"/pass
-set -Ux RUSTUP_HOME "$XDG_DATA_HOME"/rustup
-set -Ux SQLITE_HISTORY "$XDG_CACHE_HOME"/sqlite_history
-set -Ux UNCRUSTIFY_CONFIG "$XDG_CONFIG_HOME"/uncrustify/uncrustify.cfg
-set -Ux XAUTHORITY "$XDG_RUNTIME_DIR"/Xauthority
-set -Ux _JAVA_OPTIONS -Djava.util.prefs.userRoot="$XDG_CONFIG_HOME"/java
-set -Ux ERRFILE "$XDG_CACHE_HOME/X11/xsession-errors"
-set -Ux XAUTHORITY "$XDG_RUNTIME_DIR"/Xauthority
-set -Ux RUSTUP_HOME "$XDG_DATA_HOME"/rustup
-set -Ux CARGO_HOME "$XDG_DATA_HOME"/cargo
-set -Ux XINITRC "$XDG_CONFIG_HOME"/X11/xinitrc
-set -Ux ANDROID_USER_HOME "$XDG_DATA_HOME"/android
-set -Ux DOCKER_CONFIG "$XDG_CONFIG_HOME"/docker
-set -Ux GNUPGHOME "$XDG_DATA_HOME"/gnupg
-set -Ux GTK2_RC_FILES "$XDG_CONFIG_HOME"/gtk-2.0/gtkrc
-set -Ux MINIKUBE_HOME "$XDG_DATA_HOME"/minikube
-set -Ux _JAVA_OPTIONS '-Djava.util.prefs.userRoot="$XDG_CONFIG_HOME"/java'
-set -Ux PYENV_ROOT "$XDG_DATA_HOME"/pyenv
-set -Ux PYTHONSTARTUP "$XDG_CONFIG_HOME"/python/pythonrc
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@ -16,11 +16,34 @@ set -Ux XDG_CONFIG_HOME "$HOME/.config"
 set -Ux XDG_DATA_HOME "$HOME/.local/share"
 set -Ux XDG_CACHE_HOME "$HOME/.cache"

+# cleanup
+set -Ux ANDROID_HOME "$XDG_DATA_HOME"/android
+set -Ux CARGO_HOME "$XDG_DATA_HOME"/cargo
+set -Ux CUDA_CACHE_PATH "$XDG_CACHE_HOME"/nv
+set -Ux GDBHISTFILE "$XDG_DATA_HOME"/gdb/history
+set -Ux GNUPGHOME "$XDG_DATA_HOME"/gnupg
+set -Ux GOPATH "$XDG_DATA_HOME"/go
+set -Ux ICEAUTHORITY "$XDG_CACHE_HOME"/ICEauthority
+set -Ux IPYTHONDIR "$XDG_CONFIG_HOME"/ipython
+set -Ux LESSHISTFILE -
+set -Ux MYPY_CACHE_DIR "$XDG_CACHE_HOME"/mypy
+set -Ux NPM_CONFIG_USERCONFIG "$XDG_CONFIG_HOME"/npm/npmrc
+set -Ux PASSWORD_STORE_DIR "$XDG_DATA_HOME"/pass
+set -Ux RUSTUP_HOME "$XDG_DATA_HOME"/rustup
+set -Ux SQLITE_HISTORY "$XDG_CACHE_HOME"/sqlite_history
+set -Ux UNCRUSTIFY_CONFIG "$XDG_CONFIG_HOME"/uncrustify/uncrustify.cfg
+set -Ux XAUTHORITY "$XDG_RUNTIME_DIR"/Xauthority
+set -Ux _JAVA_OPTIONS -Djava.util.prefs.userRoot="$XDG_CONFIG_HOME"/java
+set -Ux ERRFILE "$XDG_CACHE_HOME/X11/xsession-errors"
+set -Ux XAUTHORITY "$XDG_RUNTIME_DIR"/Xauthority
+set -Ux RUSTUP_HOME "$XDG_DATA_HOME"/rustup
+set -Ux CARGO_HOME "$XDG_DATA_HOME"/cargo
+
 # wine prefix
-# set -Ux WINEPREFIX "$XDG_DATA_HOME/wine/"
+set -Ux WINEPREFIX "$XDG_DATA_HOME/wine/"

 # kvantum
-set -Ux QT_QPA_PLATFORMTHEME qt5ct
+set -Ux QT_STYLE_OVERRIDE kvantum

 # use nvim for stuff
 set -Ux EDITOR nvim
@ -29,7 +52,4 @@ set -Ux MANPAGER nvimpager
 # zoxide
 set -Ux _ZO_MAXAGE 100000

-# kubectl
-set -Ux KUBECONFIG ~/.kube/config
-
 starship init fish | source
--- a/.config/fish/fish_variables
+++ b/.config/fish/fish_variables
@ -1,42 +1,37 @@
 # This file contains fish universal variable definitions.
 # VERSION: 3.0
-SETUVAR --export ANDROID_HOME:/home/trt/\x2elocal/share/android
-SETUVAR --export ANDROID_USER_HOME:/home/trt/\x2elocal/share/android
-SETUVAR --export CARGO_HOME:/home/trt/\x2elocal/share/cargo
-SETUVAR --export --path CUDA_CACHE_PATH:/home/trt/\x2ecache/nv
-SETUVAR --export DOCKER_CONFIG:/home/trt/\x2econfig/docker
+SETUVAR --export ANDROID_HOME:/home/meq/\x2elocal/share/android
+SETUVAR --export B2_ACCOUNT_ID:0000a61cce56211000000000f
+SETUVAR --export B2_ACCOUNT_KEY:K000UFoJ5fqDCk5WTnkvZVdJZ0Z3hxA
+SETUVAR --export CARGO_HOME:/home/meq/\x2elocal/share/cargo
+SETUVAR --export --path CUDA_CACHE_PATH:/home/meq/\x2ecache/nv
 SETUVAR --export EDITOR:nvim
-SETUVAR --export ERRFILE:/home/trt/\x2ecache/X11/xsession\x2derrors
-SETUVAR --export GDBHISTFILE:/home/trt/\x2elocal/share/gdb/history
-SETUVAR --export GNUPGHOME:/home/trt/\x2elocal/share/gnupg
-SETUVAR --export --path GOPATH:/home/trt/\x2elocal/share/go
-SETUVAR --export GTK2_RC_FILES:/home/trt/\x2econfig/gtk\x2d2\x2e0/gtkrc
-SETUVAR --export ICEAUTHORITY:/home/trt/\x2ecache/ICEauthority
-SETUVAR --export IPYTHONDIR:/home/trt/\x2econfig/ipython
-SETUVAR --export KUBECONFIG:/home/trt/\x2ekube/config
+SETUVAR --export ERRFILE:/home/meq/\x2ecache/X11/xsession\x2derrors
+SETUVAR --export GDBHISTFILE:/home/meq/\x2elocal/share/gdb/history
+SETUVAR --export GNUPGHOME:/home/meq/\x2elocal/share/gnupg
+SETUVAR --export --path GOPATH:/home/meq/\x2elocal/share/go
+SETUVAR --export ICEAUTHORITY:/home/meq/\x2ecache/ICEauthority
+SETUVAR --export IPYTHONDIR:/home/meq/\x2econfig/ipython
 SETUVAR --export LESSHISTFILE:\x2d
 SETUVAR --export MANPAGER:nvimpager
-SETUVAR --export MINIKUBE_HOME:/home/trt/\x2elocal/share/minikube
-SETUVAR --export MYPY_CACHE_DIR:/home/trt/\x2ecache/mypy
-SETUVAR --export NPM_CONFIG_USERCONFIG:/home/trt/\x2econfig/npm/npmrc
-SETUVAR --export PASSWORD_STORE_DIR:/home/trt/\x2elocal/share/pass
-SETUVAR --export PYENV_ROOT:/home/trt/\x2elocal/share/pyenv
-SETUVAR --export PYTHONSTARTUP:/home/trt/\x2econfig/python/pythonrc
-SETUVAR --export QT_QPA_PLATFORMTHEME:qt5ct
-SETUVAR --export RUSTUP_HOME:/home/trt/\x2elocal/share/rustup
-SETUVAR --export SQLITE_HISTORY:/home/trt/\x2ecache/sqlite_history
-SETUVAR --export UNCRUSTIFY_CONFIG:/home/trt/\x2econfig/uncrustify/uncrustify\x2ecfg
+SETUVAR --export MYPY_CACHE_DIR:/home/meq/\x2ecache/mypy
+SETUVAR --export NPM_CONFIG_USERCONFIG:/home/meq/\x2econfig/npm/npmrc
+SETUVAR --export PASSWORD_STORE_DIR:/home/meq/\x2elocal/share/pass
+SETUVAR --export QT_STYLE_OVERRIDE:kvantum
+SETUVAR --export RUSTUP_HOME:/home/meq/\x2elocal/share/rustup
+SETUVAR --export SQLITE_HISTORY:/home/meq/\x2ecache/sqlite_history
+SETUVAR --export UNCRUSTIFY_CONFIG:/home/meq/\x2econfig/uncrustify/uncrustify\x2ecfg
+SETUVAR --export WINEPREFIX:/home/meq/\x2elocal/share/wine/
 SETUVAR --export XAUTHORITY:/run/user/1000/Xauthority
-SETUVAR --export XDG_CACHE_HOME:/home/trt/\x2ecache
-SETUVAR --export XDG_CONFIG_HOME:/home/trt/\x2econfig
-SETUVAR --export XDG_DATA_HOME:/home/trt/\x2elocal/share
-SETUVAR --export XINITRC:/home/trt/\x2econfig/X11/xinitrc
-SETUVAR --export _JAVA_OPTIONS:\x2dDjava\x2eutil\x2eprefs\x2euserRoot\x3d\x22\x24XDG_CONFIG_HOME\x22/java
+SETUVAR --export XDG_CACHE_HOME:/home/meq/\x2ecache
+SETUVAR --export XDG_CONFIG_HOME:/home/meq/\x2econfig
+SETUVAR --export XDG_DATA_HOME:/home/meq/\x2elocal/share
+SETUVAR --export _JAVA_OPTIONS:\x2dDjava\x2eutil\x2eprefs\x2euserRoot\x3d/home/meq/\x2econfig/java
 SETUVAR --export _ZO_MAXAGE:100000
-SETUVAR __fish_initialized:3800
-SETUVAR fish_color_autosuggestion:brblack
+SETUVAR __fish_initialized:3400
+SETUVAR fish_color_autosuggestion:555\x1ebrblack
 SETUVAR fish_color_cancel:\x2dr
-SETUVAR fish_color_command:normal
+SETUVAR fish_color_command:blue
 SETUVAR fish_color_comment:red
 SETUVAR fish_color_cwd:green
 SETUVAR fish_color_cwd_root:red
@ -51,15 +46,15 @@ SETUVAR fish_color_operator:brcyan
 SETUVAR fish_color_param:cyan
 SETUVAR fish_color_quote:yellow
 SETUVAR fish_color_redirection:cyan\x1e\x2d\x2dbold
-SETUVAR fish_color_search_match:white\x1e\x2d\x2dbackground\x3dbrblack
+SETUVAR fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack
 SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack
 SETUVAR fish_color_status:red
 SETUVAR fish_color_user:brgreen
 SETUVAR fish_color_valid_path:\x2d\x2dunderline
 SETUVAR fish_key_bindings:fish_vi_key_bindings
 SETUVAR fish_pager_color_completion:normal
-SETUVAR fish_pager_color_description:yellow\x1e\x2di
+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/trt/\x2econfig/scripts/util\x1e/home/trt/\x2econfig/scripts/applications\x1e/home/trt/\x2elocal/share/go/bin\x1e/home/trt/\x2elocal/bin
+SETUVAR fish_user_paths:/home/meq/\x2elocal/share/gem/ruby/3\x2e0\x2e0/bin\x1e/home/meq/\x2econfig/scripts/util\x1e/home/meq/\x2econfig/scripts/applications\x1e/home/meq/\x2elocal/share/npm/bin\x1e/home/meq/\x2elocal/share/go/bin\x1e/home/meq/\x2elocal/share/cargo/bin\x1e/home/meq/\x2elocal/bin
--- a/.config/fish/functions/pm.fish
+++ b/.config/fish/functions/pm.fish
@ -0,0 +1,4 @@
+function pm --wraps=pulsemixer --description 'alias pm=pulsemixer'
+  pulsemixer $argv
+        
+end
--- a/.config/fish/functions/py.fish
+++ b/.config/fish/functions/py.fish
@ -0,0 +1,4 @@
+function py --wraps=python --description 'alias py=python'
+  python $argv
+        
+end
--- a/.config/fish/functions/xdg.fish
+++ b/.config/fish/functions/xdg.fish
@ -1,3 +0,0 @@
-function adb
-    env HOME="$XDG_DATA_HOME/android" adb $argv
-end
--- a/.config/gtk-3.0/settings.ini
+++ b/.config/gtk-3.0/settings.ini
@ -1,17 +1,18 @@
 [Settings]
-gtk-theme-name=Catppuccin-Dark-Macchiato
-gtk-icon-theme-name=Papirus-Dark
-gtk-font-name=Sans 9
+gtk-button-images=0
 gtk-cursor-theme-name=Adwaita
 gtk-cursor-theme-size=24
-gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ
-gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
-gtk-button-images=0
-gtk-menu-images=0
-gtk-enable-event-sounds=0
+gtk-enable-event-sounds=1
 gtk-enable-input-feedback-sounds=0
+gtk-icon-theme-name=Papirus-Dark
+gtk-menu-images=0
+gtk-theme-name=Everforest-Dark
+gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
+gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ
 gtk-xft-antialias=1
 gtk-xft-hinting=1
-gtk-xft-hintstyle=hintslight
-gtk-xft-rgba=rgb
-gtk-application-prefer-dark-theme=1
+gtk-xft-hintstyle=hintmedium
+gtk-font-name=Cantarell 11
+gtk-xft-rgba=none
+gtk-modules=canberra-gtk-module
+gtk-application-prefer-dark-theme=0
--- a/.config/i3/autostart.sh
+++ b/.config/i3/autostart.sh
@ -1,9 +1,8 @@
 #!/bin/bash

-# pidof mpd || mpd &
-# pidof flameshot || flameshot &
-# pidof lxpolkit || lxpolkit &
-# pidof picom || picom &
+pidof mpd || mpd &
+pidof flameshot || flameshot &
+pidof lxpolkit || lxpolkit &
+pidof picom || picom &
 wal -R
 ~/.fehbg
-systemctl --user enable --now awatcher
--- a/.config/i3/config
+++ b/.config/i3/config
@ -6,7 +6,7 @@ set $calculator "rofi -show calc"
 set $calendar "$terminal -e nvim +Agenda"
 set $feed_reader "$terminal -e newsboat"
 set $file_manager thunar
-set $music_player "kitty -e rmpc"
+set $music_player "kitty -e ncmpcpp"
 set $screen_locker "i3lock -c 000000"


--- a/.config/mequidots/musicpackagelist
+++ b/.config/mequidots/musicpackagelist
@ -0,0 +1,28 @@
+alsa-plugins
+ams-lv2
+ardour
+aubio
+bshapr
+calf
+carla
+distrho-ports
+dragonfly-reverb
+ebumeter
+eq10q
+fluidsynth
+geonkick
+guitarix
+jack_mixer
+lsp-plugins
+ninjas2
+noise-repellent
+qjackctl
+samplv1
+sfizz
+surge
+tap-plugins
+vamp-plugin-sdk
+wolf-shaper
+x42-plugins
+zam-plugins
+zyn-fusion
--- a/.config/mequidots/notes.md
+++ b/.config/mequidots/notes.md
@ -0,0 +1,7 @@
+some notes for when reinstalling this setup:
+
+# Xorg client limit
+Xorg has a weird limit on the amount of clients, and every yabridge plugin is a new X client. The limit is 256, which can be easily be achieved. To change the limit to the maximum:
+```bash
+printf 'Section "ServerFlags"\n\tOption "MaxClients" "2048"\nEndSection\n'         > /etc/X11/xorg.conf.d/99-maxclients.conf
+```
--- a/.config/mequidots/packagelist
+++ b/.config/mequidots/packagelist
@ -0,0 +1,49 @@
+colorpicker
+dunst
+dzen2
+engrampa
+feh
+firefox
+flameshot
+fzf
+gvfs
+herbstluftwm
+htop
+i3lock-color
+kitty
+libqalculate
+lxappearance-gtk3
+lxqt-policykit
+lxsession-gtk3
+mpd
+ncmpcpp
+neovim-qt
+nerd-fonts-mononoki
+newsboat
+nvimpager-git
+openssh
+pamixer
+papirus-icon-theme
+picom-git
+pipewire
+pipewire-alsa
+pipewire-jack
+python-pywal
+qpwgraph
+qtile
+ripgrep
+rofi
+rofi-calc
+themix-theme-oomox-git
+thunar
+thunar-archive-plugin
+thunar-volman
+ttf-dejavu
+ttf-mononoki
+vimiv
+wireplumber
+xclip
+xorg
+xorg-server
+xorg-xinit
+xournalpp
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@ -1,59 +1,56 @@
 {
  "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
  "FixCursorHold.nvim": { "branch": "master", "commit": "1900f89dc17c603eec29960f57c00bd9ae696495" },
-  "LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" },
-  "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
+  "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" },
+  "bufferline.nvim": { "branch": "main", "commit": "261a72b90d6db4ed8014f7bda976bcdc9dd7ce76" },
  "bufresize.nvim": { "branch": "master", "commit": "3b19527ab936d6910484dcc20fb59bdb12322d8b" },
-  "catppuccin": { "branch": "main", "commit": "234fc048de931a0e42ebcad675bf6559d75e23df" },
-  "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "bd5a7d6db125d4654b50eeae9f5217f24bb22fd3" },
+  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
  "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "031e6ba70b0ad5eee49fd2120ff7a2e325b17fa7" },
-  "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" },
+  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
  "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
  "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
-  "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" },
-  "formatter.nvim": { "branch": "master", "commit": "b9d7f853da1197b83b8edb4cc4952f7ad3a42e41" },
-  "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
-  "gitlab.nvim": { "branch": "main", "commit": "e29909cd1064a7b53c3150bff49449a548dadf8d" },
-  "gitsigns.nvim": { "branch": "main", "commit": "20ad4419564d6e22b189f6738116b38871082332" },
-  "gruvbox.nvim": { "branch": "main", "commit": "5e0a460d8e0f7f669c158dedd5f9ae2bcac31437" },
-  "image.nvim": { "branch": "master", "commit": "446a8a5cc7a3eae3185ee0c697732c32a5547a0b" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
-  "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
-  "lspkind.nvim": { "branch": "master", "commit": "3ddd1b4edefa425fda5a9f95a4f25578727c0bb3" },
-  "lualine.nvim": { "branch": "master", "commit": "3946f0122255bc377d14a59b27b609fb3ab25768" },
-  "mason.nvim": { "branch": "main", "commit": "ad7146aa61dcaeb54fa900144d768f040090bff0" },
+  "dressing.nvim": { "branch": "master", "commit": "fc78a3ca96f4db9f8893bb7e2fd9823e0780451b" },
+  "formatter.nvim": { "branch": "master", "commit": "eb89a1f3e079f1b9680bc7293b75fffccb5e1598" },
+  "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
+  "gitlab.nvim": { "branch": "main", "commit": "be027331e15a17a7fa05e827f6fbdf9549ac0780" },
+  "gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "259357fa4097e232730341fa60988087d189193a" },
+  "lazy.nvim": { "branch": "main", "commit": "3388a26417c48b15d5266d954f62a4d47fe99490" },
+  "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" },
+  "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" },
+  "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
  "maximize.nvim": { "branch": "master", "commit": "d688b66344b03ee6e5a32a0a40af85d174490af8" },
  "mbc-colorscheme.nvim": { "branch": "main", "commit": "02c404d2a58acf527a0de600678c612335cc8416" },
-  "mini.bracketed": { "branch": "main", "commit": "e50e3abcf6a3a5d234f58e4a247dfb3035f30a65" },
-  "mini.icons": { "branch": "main", "commit": "ff2e4f1d29f659cc2bad0f9256f2f6195c6b2428" },
-  "neogen": { "branch": "main", "commit": "d7f9461727751fb07f82011051338a9aba07581d" },
-  "neogit": { "branch": "master", "commit": "d2a2ae4415872fbddb2441920ab109ee52fd4916" },
-  "neotest": { "branch": "master", "commit": "deadfb1af5ce458742671ad3a013acb9a6b41178" },
-  "neotest-python": { "branch": "master", "commit": "b0d3a861bd85689d8ed73f0590c47963a7eb1bf9" },
-  "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
-  "nvim-autopairs": { "branch": "master", "commit": "7a2c97cccd60abc559344042fefb1d5a85b3e33b" },
-  "nvim-bqf": { "branch": "main", "commit": "a77b17e39b1b707b6feee86a36c83703c1534c08" },
-  "nvim-cmp": { "branch": "main", "commit": "106c4bcc053a5da783bf4a9d907b6f22485c2ea0" },
+  "mini.bracketed": { "branch": "main", "commit": "daf2bff8172bc84bfb934f765275618f5e7844a8" },
+  "mini.icons": { "branch": "main", "commit": "54686be7d58807906cb2c8c2216e0bf9c044f19a" },
+  "neogen": { "branch": "main", "commit": "37dd095892e3f846418c465852f7b21f81d0f46c" },
+  "neogit": { "branch": "master", "commit": "11e14b67eb19bada54c9eb8bc70a581f358cd175" },
+  "neotest": { "branch": "master", "commit": "6d3d22cdad49999ef774ebe1bc250a4994038964" },
+  "neotest-python": { "branch": "master", "commit": "a2861ab3c9a0bf75a56b11835c2bfc8270f5be7e" },
+  "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" },
+  "nvim-autopairs": { "branch": "master", "commit": "b464658e9b880f463b9f7e6ccddd93fb0013f559" },
+  "nvim-bqf": { "branch": "main", "commit": "1b24dc6050c34e8cd377b6b4cd6abe40509e0187" },
+  "nvim-cmp": { "branch": "main", "commit": "ca4d3330d386e76967e53b85953c170658255ecb" },
  "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
-  "nvim-dap": { "branch": "master", "commit": "e97dc47e134ffb33da008658fecfae8f8547c528" },
-  "nvim-dap-go": { "branch": "main", "commit": "b4421153ead5d726603b02743ea40cf26a51ed5f" },
-  "nvim-dap-python": { "branch": "master", "commit": "64652d1ae1db80870d9aac7132d76e37acd86a26" },
-  "nvim-lint": { "branch": "master", "commit": "8b349e822a36e9480aed96c6dd2f757f80524a35" },
-  "nvim-lspconfig": { "branch": "master", "commit": "2010fc6ec03e2da552b4886fceb2f7bc0fc2e9c0" },
-  "nvim-surround": { "branch": "main", "commit": "fcfa7e02323d57bfacc3a141f8a74498e1522064" },
-  "nvim-tree.lua": { "branch": "master", "commit": "321bc61580fd066b76861c32de3319c3a6d089e7" },
-  "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
-  "nvim-treesitter-context": { "branch": "master", "commit": "ec308c7827b5f8cb2dd0ad303a059c945dd21969" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "5ca4aaa6efdcc59be46b95a3e876300cfead05ef" },
-  "nvim-web-devicons": { "branch": "master", "commit": "8dcb311b0c92d460fac00eac706abd43d94d68af" },
+  "nvim-dap": { "branch": "master", "commit": "6fd05c6ee98b08a2c6ee7d81e1927a152990df05" },
+  "nvim-dap-go": { "branch": "main", "commit": "6aa88167ea1224bcef578e8c7160fe8afbb44848" },
+  "nvim-dap-python": { "branch": "master", "commit": "34282820bb713b9a5fdb120ae8dd85c2b3f49b51" },
+  "nvim-lint": { "branch": "master", "commit": "6b46370d02cd001509a765591a3ffc481b538794" },
+  "nvim-lspconfig": { "branch": "master", "commit": "64073cbed0ce23e988160bfd1a148a75b6af94cc" },
+  "nvim-surround": { "branch": "main", "commit": "9f0cb495f25bff32c936062d85046fbda0c43517" },
+  "nvim-tree.lua": { "branch": "master", "commit": "c7639482a1598f4756798df1b2d72f79fe5bb34f" },
+  "nvim-treesitter": { "branch": "master", "commit": "c56507f6a16d6a9bd73ab8827a49fa5533aa8fc3" },
+  "nvim-treesitter-context": { "branch": "master", "commit": "9ff7a5e23f8fa9e19c9570e1696849fdff8805ea" },
+  "nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" },
+  "nvim-web-devicons": { "branch": "master", "commit": "203da76ecfbb4b192cf830665b03eb651b635c94" },
  "obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" },
-  "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
-  "refactoring.nvim": { "branch": "master", "commit": "6784b54587e6d8a6b9ea199318512170ffb9e418" },
+  "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
+  "refactoring.nvim": { "branch": "master", "commit": "2db6d378e873de31d18ade549c2edba64ff1c2e3" },
  "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
  "term-edit.nvim": { "branch": "master", "commit": "29c4584c2cef44a3fdcc55860957d081b892a569" },
-  "toggleterm.nvim": { "branch": "main", "commit": "9a88eae817ef395952e08650b3283726786fb5fb" },
-  "trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" },
+  "toggleterm.nvim": { "branch": "main", "commit": "87b2d6a3cab8e2bd9a0255427074285f0365398d" },
+  "trouble.nvim": { "branch": "main", "commit": "46cf952fc115f4c2b98d4e208ed1e2dce08c9bf6" },
  "wal-colors.nvim": { "branch": "main", "commit": "f0f052ae2dd5054200b98ff308c864579c2983ea" },
-  "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" }
+  "which-key.nvim": { "branch": "main", "commit": "9b365a6428a9633e3eeb34dbef1b791511c54f70" }
 }
--- a/.config/nvim/lua/config/mappings.lua
+++ b/.config/nvim/lua/config/mappings.lua
@ -63,8 +63,7 @@ vim.keymap.set("n", "<leader>gr", "<cmd>Telescope lsp_references<CR>", { desc =
 vim.keymap.set("n", "<leader>gq", "<cmd>Telescope diagnostics<CR>", { desc = "Show Diagnostics" })
 vim.keymap.set("n", "<leader>gs", "<cmd>LspRestart<CR>", { desc = "Restart LSP" })
 vim.keymap.set("n", "<leader>gf", "<cmd>Format<CR>", { desc = "Format" })
-vim.keymap.set("n", "<leader>ge", function() vim.diagnostic.open_float() end , { desc = "Show Diagnostic" })
-vim.keymap.set("n", "<leader>gE", "<cmd>Trouble diagnostics<CR>", { desc = "Toggle Trouble" })
+vim.keymap.set("n", "<leader>ge", "<cmd>Trouble diagnostics<CR>", { desc = "Toggle Trouble" })
 vim.keymap.set("n", "<leader>ga", function()
 	vim.lsp.buf.code_action()
 end, { desc = "Code Actions" })
--- a/.config/nvim/lua/config/options.lua
+++ b/.config/nvim/lua/config/options.lua
@ -30,15 +30,6 @@ vim.api.nvim_create_autocmd({ "FocusGained", "BufEnter", "CursorHold", "CursorHo
 vim.api.nvim_create_autocmd("TextYankPost", {
 	pattern = "*",
 	callback = function()
-		vim.highlight.on_yank({ "IncSearch", 1000 })
-	end,
-})
-
-vim.api.nvim_create_autocmd("FileType", {
-	pattern = "gleam",
-	callback = function()
-		vim.bo.shiftwidth = 2
-		vim.bo.tabstop = 2
-		vim.bo.expandtab = true
+		require("vim.highlight").on_yank({ "IncSearch", 1000 })
 	end,
 })
--- a/.config/nvim/lua/plugins/catpuccin.lua
+++ b/.config/nvim/lua/plugins/catpuccin.lua
@ -1,8 +0,0 @@
-return {
-	"catppuccin/nvim",
-	name = "catppuccin",
-	config = function()
-		pcall(vim.cmd, "colorscheme catppuccin-mocha")
-	end,
-	priority = 1000,
-}
--- a/.config/nvim/lua/plugins/formatter.lua
+++ b/.config/nvim/lua/plugins/formatter.lua
@ -11,7 +11,7 @@ return {
 				},
 				go = {
 					require("formatter.filetypes.go").gofumpt,
-					-- require("formatter.filetypes.go").goimports_reviser,
+					require("formatter.filetypes.go").goimports_reviser,
 				},
 				json = {
 					require("formatter.filetypes.json").jq,
@ -40,21 +40,6 @@ return {
 				yaml = {
 					require("formatter.filetypes.yaml").yamlfmt,
 				},
-				elixir = {
-					require("formatter.filetypes.elixir").mixformat,
-				},
-				gleam = {
-					function()
-						return {
-							exe = "gleam",
-							args = {
-								"format",
-								"--stdin",
-							},
-							stdin = true,
-						}
-					end,
-				},
 			},
 		})
 	end,
--- a/.config/nvim/lua/plugins/gruvbox.lua
+++ b/.config/nvim/lua/plugins/gruvbox.lua
@ -1,7 +0,0 @@
-return {
-	"ellisonleao/gruvbox.nvim",
-	-- config = function()
-	-- 	pcall(vim.cmd, "colorscheme gruvbox")
-	-- end,
-	priority = 1000,
-}
--- a/.config/nvim/lua/plugins/image.lua
+++ b/.config/nvim/lua/plugins/image.lua
@ -1,7 +0,0 @@
-return {
-    "3rd/image.nvim",
-    build = false, -- so that it doesn't build the rock https://github.com/3rd/image.nvim/issues/91#issuecomment-2453430239
-    opts = {
-        processor = "magick_cli",
-    }
-}
--- a/.config/nvim/lua/plugins/lsp.lua
+++ b/.config/nvim/lua/plugins/lsp.lua
@ -3,33 +3,31 @@ return {
 		"neovim/nvim-lspconfig",
 		config = function()
 			local lsp = require("lspconfig")
-			-- lsp.pylsp.setup({})
-			vim.lsp.enable("pyright")
-			vim.lsp.enable("gopls")
-			vim.lsp.enable("rust_analyzer")
-			vim.lsp.enable("clangd")
-			vim.lsp.enable("ts_ls")
-			vim.lsp.enable("gleam")
-			-- lsp.lua_ls.setup({
-			-- 	settings = {
-			-- 		Lua = {
-			-- 			runtime = {
-			-- 				version = "LuaJIT",
-			-- 			},
-			-- 			diagnostics = {
-			-- 				globals = { "vim" },
-			-- 			},
-			-- 			workspace = {
-			-- 				library = vim.api.nvim_get_runtime_file("", true),
-			-- 			},
-			-- 			telemetry = {
-			-- 				enable = false,
-			-- 			},
-			-- 		},
-			-- 	},
-			-- })
-			vim.lsp.config("helm_ls", {
-				filetypes = { "helm", "yaml" },
+			lsp.pyright.setup({})
+			lsp.gopls.setup({})
+			lsp.rust_analyzer.setup({})
+			lsp.clangd.setup({})
+			lsp.ts_ls.setup({})
+			lsp.lua_ls.setup({
+				settings = {
+					Lua = {
+						runtime = {
+							version = "LuaJIT",
+						},
+						diagnostics = {
+							globals = { "vim" },
+						},
+						workspace = {
+							library = vim.api.nvim_get_runtime_file("", true),
+						},
+						telemetry = {
+							enable = false,
+						},
+					},
+				},
+			})
+			lsp.helm_ls.setup({
+				filetypes= { "helm", "yaml" },
 			})
 		end,
 	},
--- a/.config/nvim/lua/plugins/pywal.lua
+++ b/.config/nvim/lua/plugins/pywal.lua
@ -3,8 +3,8 @@ return {
 	dependencies = {
 		{ "mbrea-c/wal-colors.nvim" },
 	},
-	-- config = function()
-	-- 	pcall(vim.cmd, "colorscheme mbc")
-	-- end,
+	config = function()
+		pcall(vim.cmd, "colorscheme mbc")
+	end,
 	priority = 1000,
 }
--- a/.config/nvim/spell/en.utf-8.add
+++ b/.config/nvim/spell/en.utf-8.add
@ -1 +0,0 @@
-HexDocs
--- a/.config/nvim/spell/en.utf-8.add.spl
+++ b/.config/nvim/spell/en.utf-8.add.spl
--- a/.config/polybar/config.ini
+++ b/.config/polybar/config.ini
@ -28,11 +28,11 @@ module-margin = 1
 separator = |
 separator-foreground = ${colors.disabled}

-font-0 = MononokiNerdFontMono-Regular-12;1
+font-0 = mononoki-12;1

 modules-left = ewmh
 modules-center = date
-modules-right = mpd filesystem pipewire_buffer_size pulseaudio xkeyboard memory cpu
+modules-right = mpd filesystem pipewire_buffer_size pulseaudio xkeyboard memory cpu wlan eth

 cursor-click = pointer
 cursor-scroll = ns-resize
--- a/.config/sway/autostart.sh
+++ b/.config/sway/autostart.sh
@ -5,6 +5,4 @@
 # pidof lxpolkit || lxpolkit &
 # pidof picom || picom &
 # wal -R
-# pkill swaybg; swaybg -i ~/docs/bg/catpuccin/cat-bg-black3-fg-rosewater.png -m fill
-pkill swaybg; swaybg -i ~/docs/bg/catpuccin/cat-bg-black3-fg-rosewater.png -m fill
-systemctl --user enable --now awatcher
+pkill swaybg; swaybg -i ~/docs/bg/gruvbox-wallpapers/wallpapers/minimalistic/clouds.png -m fill
--- a/.config/sway/config
+++ b/.config/sway/config
@ -1,5 +1,4 @@
 include "$HOME/.cache/wal/colors-sway"
-include ~/.config/sway/outputs

 set $mod Mod4

@ -9,7 +8,7 @@ set $calculator "rofi -show calc"
 set $calendar "$terminal -e nvim +Agenda"
 set $feed_reader "$terminal -e newsboat"
 set $file_manager nemo
-set $music_player "kitty -e rmpc"
+set $music_player "kitty -e ncmpcpp"
 set $screen_locker "swaylock -c 000000"

 font pango:mononoki 12
@ -27,10 +26,11 @@ exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
 exec --no-startup-id nm-applet

 # Use pactl to adjust volume in PulseAudio.
-bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +10%
-bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -10%
-bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle
-bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle
+set $refresh_i3status killall -SIGUSR1 i3status
+bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +10% && $refresh_i3status
+bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -10% && $refresh_i3status
+bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status
+bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status

 # Use Mouse+$mod to drag floating windows to their wanted position
 floating_modifier $mod
@ -81,7 +81,7 @@ bindsym $mod+Control+q floating toggle
 bindsym $mod+Return exec $terminal
 bindsym $mod+space exec --no-startup-id "rofi -show drun"

-bindsym $mod+grave exec grim -g "$(slurp)" - | swappy -f -
+bindsym $mod+grave exec flameshot gui
 bindsym $mod+1 exec $file_manager
 bindsym $mod+2 exec $browser
 bindsym $mod+3 exec $calculator
@ -167,7 +167,6 @@ client.background       $color0

 exec_always --no-startup-id $HOME/.config/sway/autostart.sh
 exec_always --no-startup-id $HOME/.config/sway/panel.sh
-exec dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway

 input "type:keyboard" {
 repeat_rate 45
--- a/.config/sway/outputs
+++ b/.config/sway/outputs
@ -1,20 +0,0 @@
-# Generated by nwg-displays on 2025-01-25 at 11:05:15. Do not edit manually.
-
-output "HDMI-A-1" {
-    mode  2560x1080@74.991Hz
-    pos 1920 0
-    transform normal
-    scale 1.0
-    scale_filter nearest
-    adaptive_sync off
-    dpms on
-}
-output "DP-1" {
-    mode  1920x1080@60.0Hz
-    pos 0 0
-    transform normal
-    scale 1.0
-    scale_filter nearest
-    adaptive_sync off
-    dpms on
-}
--- a/.config/sway/workspaces
+++ b/.config/sway/workspaces
--- a/.config/wal/colorschemes/dark/catppuccin.json
+++ b/.config/wal/colorschemes/dark/catppuccin.json
@ -1,25 +0,0 @@
-{
-  "special": {
-    "background": "#1e2030",
-    "foreground": "#cad3f5",
-    "cursor": "#f4dbd6"
-  },
-  "colors": {
-    "color0": "#24273a",
-    "color1": "#ed8796",
-    "color2": "#f5a97f",
-    "color3": "#eed49f",
-    "color4": "#a6da95",
-    "color5": "#8bd5ca",
-    "color6": "#8aadf4",
-    "color7": "#c6a0f6",
-    "color8": "#363a4f",
-    "color9": "#ed8796",
-    "color10": "#f5a97f",
-    "color11": "#eed49f",
-    "color12": "#a6da95",
-    "color13": "#8bd5ca",
-    "color14": "#8aadf4",
-    "color15": "#c6a0f6"
-  }
-}
--- a/.config/waybar/config.jsonc
+++ b/.config/waybar/config.jsonc
@ -27,9 +27,9 @@
    "custom/separator",
    "memory",
    "custom/separator",
-    "cpu"
-    // "custom/separator",
-    // "network"
+    "cpu",
+    "custom/separator",
+    "network"
  ],
  "custom/separator": {
    "format": "|",
@ -59,7 +59,7 @@
  "mpd": {
    "format": "{artist} - {title}",
    "format-disconnected": "Disconnected ",
-    "format-paused": "MPD paused",
+    "format-stopped": "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ",
    "unknown-tag": "N/A",
    "interval": 5,
    "tooltip-format": "MPD (connected)",
@ -123,12 +123,10 @@
  },
  "pulseaudio": {
    // "scroll-step": 1, // %, can be a float
-    "format": "VOL {volume}% {format_source}",
+    "format": "VOL {volume}%",
    "format-bluetooth": "{volume}% {icon} {format_source}",
-    "format-bluetooth-muted": "MUTED {icon} {format_source}",
-    "format-muted": "MUTED {format_source}",
-	"format-source": "MIC",
-	"format-source-muted": "MUTED",
+    "format-bluetooth-muted": " {icon} {format_source}",
+    "format-muted": " {format_source}",
    "on-click": "pavucontrol"
  },
  "custom/pipewire-buffer": {
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@ -1,7 +1,7 @@
@import url("../../.cache/wal/colors-waybar.css");

 * {
-  font-family: "mononoki Nerd Font";
+  font-family: "mononoki";
  font-size: 16;
 }

@ -37,19 +37,3 @@
 #network {
  color: @color1;
 }
-
-#workspaces button {
-  color: @foreground;
-}
-
-#workspaces button.active {
-  color: @color4;
-}
-
-#workspaces button.visible {
-  color: @color4;
-}
-
-#workspaces button.urgent {
-  background-color: @color6;
-}
--- a/.config/zellij/config.kdl
+++ b/.config/zellij/config.kdl
@ -1,236 +1,219 @@
-//
-// THIS FILE WAS AUTOGENERATED BY ZELLIJ, THE PREVIOUS FILE AT THIS LOCATION WAS COPIED TO: /home/trt/.config/zellij/config.kdl.bak
-//
-
+// If you'd like to override the default keybindings completely, be sure to change "keybinds" to "keybinds clear-defaults=true"
 keybinds clear-defaults=true {
+    normal {
+        // uncomment this and adjust key if using copy_on_select=false
+        // bind "Alt c" { Copy; }
+    }
    locked {
-        bind "Alt g" { SwitchToMode "normal"; }
-    }
-    pane {
-        bind "left" { MoveFocus "left"; }
-        bind "down" { MoveFocus "down"; }
-        bind "up" { MoveFocus "up"; }
-        bind "right" { MoveFocus "right"; }
-        bind "c" { SwitchToMode "renamepane"; PaneNameInput 0; }
-        bind "d" { NewPane "down"; SwitchToMode "normal"; }
-        bind "e" { TogglePaneEmbedOrFloating; SwitchToMode "normal"; }
-        bind "f" { ToggleFocusFullscreen; SwitchToMode "normal"; }
-        bind "h" { MoveFocus "left"; }
-        bind "j" { MoveFocus "down"; }
-        bind "k" { MoveFocus "up"; }
-        bind "l" { MoveFocus "right"; }
-        bind "n" { NewPane; SwitchToMode "normal"; }
-        bind "p" { SwitchFocus; }
-        bind "Alt p" { SwitchToMode "normal"; }
-        bind "r" { NewPane "right"; SwitchToMode "normal"; }
-        bind "w" { ToggleFloatingPanes; SwitchToMode "normal"; }
-        bind "x" { CloseFocus; SwitchToMode "normal"; }
-        bind "z" { TogglePaneFrames; SwitchToMode "normal"; }
-    }
-    tab {
-        bind "left" { GoToPreviousTab; }
-        bind "down" { GoToNextTab; }
-        bind "up" { GoToPreviousTab; }
-        bind "right" { GoToNextTab; }
-        bind "1" { GoToTab 1; SwitchToMode "normal"; }
-        bind "2" { GoToTab 2; SwitchToMode "normal"; }
-        bind "3" { GoToTab 3; SwitchToMode "normal"; }
-        bind "4" { GoToTab 4; SwitchToMode "normal"; }
-        bind "5" { GoToTab 5; SwitchToMode "normal"; }
-        bind "6" { GoToTab 6; SwitchToMode "normal"; }
-        bind "7" { GoToTab 7; SwitchToMode "normal"; }
-        bind "8" { GoToTab 8; SwitchToMode "normal"; }
-        bind "9" { GoToTab 9; SwitchToMode "normal"; }
-        bind "[" { BreakPaneLeft; SwitchToMode "normal"; }
-        bind "]" { BreakPaneRight; SwitchToMode "normal"; }
-        bind "b" { BreakPane; SwitchToMode "normal"; }
-        bind "h" { GoToPreviousTab; }
-        bind "j" { GoToNextTab; }
-        bind "k" { GoToPreviousTab; }
-        bind "l" { GoToNextTab; }
-        bind "n" { NewTab; SwitchToMode "normal"; }
-        bind "r" { SwitchToMode "renametab"; TabNameInput 0; }
-        bind "s" { ToggleActiveSyncTab; SwitchToMode "normal"; }
-        bind "Alt t" { SwitchToMode "normal"; }
-        bind "x" { CloseTab; SwitchToMode "normal"; }
-        bind "tab" { ToggleTab; }
+        bind "Alt g" { SwitchToMode "Normal"; }
    }
    resize {
-        bind "left" { Resize "Increase left"; }
-        bind "down" { Resize "Increase down"; }
-        bind "up" { Resize "Increase up"; }
-        bind "right" { Resize "Increase right"; }
-        bind "+" { Resize "Increase"; }
+        bind "Alt n" { SwitchToMode "Normal"; }
+        bind "h" "Left" { Resize "Increase Left"; }
+        bind "j" "Down" { Resize "Increase Down"; }
+        bind "k" "Up" { Resize "Increase Up"; }
+        bind "l" "Right" { Resize "Increase Right"; }
+        bind "H" { Resize "Decrease Left"; }
+        bind "J" { Resize "Decrease Down"; }
+        bind "K" { Resize "Decrease Up"; }
+        bind "L" { Resize "Decrease Right"; }
+        bind "=" "+" { Resize "Increase"; }
        bind "-" { Resize "Decrease"; }
-        bind "=" { Resize "Increase"; }
-        bind "H" { Resize "Decrease left"; }
-        bind "J" { Resize "Decrease down"; }
-        bind "K" { Resize "Decrease up"; }
-        bind "L" { Resize "Decrease right"; }
-        bind "h" { Resize "Increase left"; }
-        bind "j" { Resize "Increase down"; }
-        bind "k" { Resize "Increase up"; }
-        bind "l" { Resize "Increase right"; }
-        bind "Alt n" { SwitchToMode "normal"; }
+    }
+    pane {
+        bind "Alt p" { SwitchToMode "Normal"; }
+        bind "h" "Left" { MoveFocus "Left"; }
+        bind "l" "Right" { MoveFocus "Right"; }
+        bind "j" "Down" { MoveFocus "Down"; }
+        bind "k" "Up" { MoveFocus "Up"; }
+        bind "p" { SwitchFocus; }
+        bind "n" { NewPane; SwitchToMode "Normal"; }
+        bind "d" { NewPane "Down"; SwitchToMode "Normal"; }
+        bind "r" { NewPane "Right"; SwitchToMode "Normal"; }
+        bind "x" { CloseFocus; SwitchToMode "Normal"; }
+        bind "f" { ToggleFocusFullscreen; SwitchToMode "Normal"; }
+        bind "z" { TogglePaneFrames; SwitchToMode "Normal"; }
+        bind "w" { ToggleFloatingPanes; SwitchToMode "Normal"; }
+        bind "e" { TogglePaneEmbedOrFloating; SwitchToMode "Normal"; }
+        bind "c" { SwitchToMode "RenamePane"; PaneNameInput 0;}
    }
    move {
-        bind "left" { MovePane "left"; }
-        bind "down" { MovePane "down"; }
-        bind "up" { MovePane "up"; }
-        bind "right" { MovePane "right"; }
-        bind "h" { MovePane "left"; }
-        bind "Alt h" { SwitchToMode "normal"; }
-        bind "j" { MovePane "down"; }
-        bind "k" { MovePane "up"; }
-        bind "l" { MovePane "right"; }
-        bind "n" { MovePane; }
+        bind "Alt h" { SwitchToMode "Normal"; }
+        bind "n" "Tab" { MovePane; }
        bind "p" { MovePaneBackwards; }
-        bind "tab" { MovePane; }
+        bind "h" "Left" { MovePane "Left"; }
+        bind "j" "Down" { MovePane "Down"; }
+        bind "k" "Up" { MovePane "Up"; }
+        bind "l" "Right" { MovePane "Right"; }
+    }
+    tab {
+        bind "Alt t" { SwitchToMode "Normal"; }
+        bind "r" { SwitchToMode "RenameTab"; TabNameInput 0; }
+        bind "h" "Left" "Up" "k" { GoToPreviousTab; }
+        bind "l" "Right" "Down" "j" { GoToNextTab; }
+        bind "n" { NewTab; SwitchToMode "Normal"; }
+        bind "x" { CloseTab; SwitchToMode "Normal"; }
+        bind "s" { ToggleActiveSyncTab; SwitchToMode "Normal"; }
+        bind "b" { BreakPane; SwitchToMode "Normal"; }
+        bind "]" { BreakPaneRight; SwitchToMode "Normal"; }
+        bind "[" { BreakPaneLeft; SwitchToMode "Normal"; }
+        bind "1" { GoToTab 1; SwitchToMode "Normal"; }
+        bind "2" { GoToTab 2; SwitchToMode "Normal"; }
+        bind "3" { GoToTab 3; SwitchToMode "Normal"; }
+        bind "4" { GoToTab 4; SwitchToMode "Normal"; }
+        bind "5" { GoToTab 5; SwitchToMode "Normal"; }
+        bind "6" { GoToTab 6; SwitchToMode "Normal"; }
+        bind "7" { GoToTab 7; SwitchToMode "Normal"; }
+        bind "8" { GoToTab 8; SwitchToMode "Normal"; }
+        bind "9" { GoToTab 9; SwitchToMode "Normal"; }
+        bind "Tab" { ToggleTab; }
    }
    scroll {
-        bind "e" { EditScrollback; SwitchToMode "normal"; }
-        bind "s" { SwitchToMode "entersearch"; SearchInput 0; }
+        bind "Alt s" { SwitchToMode "Normal"; }
+        bind "e" { EditScrollback; SwitchToMode "Normal"; }
+        bind "s" { SwitchToMode "EnterSearch"; SearchInput 0; }
+        bind "Alt c" { ScrollToBottom; SwitchToMode "Normal"; }
+        bind "j" "Down" { ScrollDown; }
+        bind "k" "Up" { ScrollUp; }
+        bind "Alt f" "PageDown" "Right" "l" { PageScrollDown; }
+        bind "Alt b" "PageUp" "Left" "h" { PageScrollUp; }
+        bind "d" { HalfPageScrollDown; }
+        bind "u" { HalfPageScrollUp; }
+        // uncomment this and adjust key if using copy_on_select=false
+        // bind "Alt c" { Copy; }
    }
    search {
-        bind "c" { SearchToggleOption "CaseSensitivity"; }
+        bind "Alt s" { SwitchToMode "Normal"; }
+        bind "Alt c" { ScrollToBottom; SwitchToMode "Normal"; }
+        bind "j" "Down" { ScrollDown; }
+        bind "k" "Up" { ScrollUp; }
+        bind "Alt f" "PageDown" "Right" "l" { PageScrollDown; }
+        bind "Alt b" "PageUp" "Left" "h" { PageScrollUp; }
+        bind "d" { HalfPageScrollDown; }
+        bind "u" { HalfPageScrollUp; }
        bind "n" { Search "down"; }
-        bind "o" { SearchToggleOption "WholeWord"; }
        bind "p" { Search "up"; }
+        bind "c" { SearchToggleOption "CaseSensitivity"; }
        bind "w" { SearchToggleOption "Wrap"; }
+        bind "o" { SearchToggleOption "WholeWord"; }
+    }
+    entersearch {
+        bind "Alt c" "Esc" { SwitchToMode "Scroll"; }
+        bind "Enter" { SwitchToMode "Search"; }
+    }
+    renametab {
+        bind "Alt c" { SwitchToMode "Normal"; }
+        bind "Esc" { UndoRenameTab; SwitchToMode "Tab"; }
+    }
+    renamepane {
+        bind "Alt c" { SwitchToMode "Normal"; }
+        bind "Esc" { UndoRenamePane; SwitchToMode "Pane"; }
    }
    session {
+        bind "Alt o" { SwitchToMode "Normal"; }
+        bind "Alt s" { SwitchToMode "Scroll"; }
        bind "d" { Detach; }
-        bind "Alt o" { SwitchToMode "normal"; }
        bind "w" {
            LaunchOrFocusPlugin "session-manager" {
                floating true
                move_to_focused_tab true
+            };
+            SwitchToMode "Normal"
        }
-            SwitchToMode "normal"
    }
+    tmux {
+        bind "[" { SwitchToMode "Scroll"; }
+        bind "Alt b" { Write 2; SwitchToMode "Normal"; }
+        bind "\"" { NewPane "Down"; SwitchToMode "Normal"; }
+        bind "%" { NewPane "Right"; SwitchToMode "Normal"; }
+        bind "z" { ToggleFocusFullscreen; SwitchToMode "Normal"; }
+        bind "c" { NewTab; SwitchToMode "Normal"; }
+        bind "," { SwitchToMode "RenameTab"; }
+        bind "p" { GoToPreviousTab; SwitchToMode "Normal"; }
+        bind "n" { GoToNextTab; SwitchToMode "Normal"; }
+        bind "Left" { MoveFocus "Left"; SwitchToMode "Normal"; }
+        bind "Right" { MoveFocus "Right"; SwitchToMode "Normal"; }
+        bind "Down" { MoveFocus "Down"; SwitchToMode "Normal"; }
+        bind "Up" { MoveFocus "Up"; SwitchToMode "Normal"; }
+        bind "h" { MoveFocus "Left"; SwitchToMode "Normal"; }
+        bind "l" { MoveFocus "Right"; SwitchToMode "Normal"; }
+        bind "j" { MoveFocus "Down"; SwitchToMode "Normal"; }
+        bind "k" { MoveFocus "Up"; SwitchToMode "Normal"; }
+        bind "o" { FocusNextPane; }
+        bind "d" { Detach; }
+        bind "Space" { NextSwapLayout; }
+        bind "x" { CloseFocus; SwitchToMode "Normal"; }
    }
    shared_except "locked" {
-        bind "Alt left" { MoveFocusOrTab "left"; }
-        bind "Alt down" { MoveFocus "down"; }
-        bind "Alt up" { MoveFocus "up"; }
-        bind "Alt right" { MoveFocusOrTab "right"; }
-        bind "Alt +" { Resize "Increase"; }
+        bind "Alt g" { SwitchToMode "Locked"; }
+        bind "Alt q" { Quit; }
+        bind "Alt n" { NewPane; }
+        bind "Alt i" { MoveTab "Left"; }
+        bind "Alt o" { MoveTab "Right"; }
+        bind "Alt h" "Alt Left" { MoveFocusOrTab "Left"; }
+        bind "Alt l" "Alt Right" { MoveFocusOrTab "Right"; }
+        bind "Alt j" "Alt Down" { MoveFocus "Down"; }
+        bind "Alt k" "Alt Up" { MoveFocus "Up"; }
+        bind "Alt =" "Alt +" { Resize "Increase"; }
        bind "Alt -" { Resize "Decrease"; }
-        bind "Alt =" { Resize "Increase"; }
        bind "Alt [" { PreviousSwapLayout; }
        bind "Alt ]" { NextSwapLayout; }
-        bind "Alt g" { SwitchToMode "locked"; }
-        bind "Alt i" { MoveTab "left"; }
-        bind "Alt j" { MoveFocus "down"; }
-        bind "Alt k" { MoveFocus "up"; }
-        bind "Alt l" { MoveFocusOrTab "right"; }
-        bind "Alt q" { Quit; }
    }
-    shared_except "locked" "move" {
-        bind "Alt h" { MoveFocusOrTab "left"; }
+    shared_except "normal" "locked" {
+        bind "Enter" "Esc" { SwitchToMode "Normal"; }
    }
-    shared_except "locked" "session" {
-        bind "Alt o" { SwitchToMode "session"; }
+    shared_except "pane" "locked" {
+        bind "Alt p" { SwitchToMode "Pane"; }
    }
-    shared_except "locked" "scroll" "search" "tmux" {
-        bind "Alt b" { SwitchToMode "tmux"; }
+    shared_except "resize" "locked" {
+        bind "Alt n" { SwitchToMode "Resize"; }
    }
-    shared_except "locked" "scroll" "search" {
-        bind "Alt f" { ToggleFocusFullscreen; }
-        bind "Alt s" { SwitchToMode "scroll"; }
+    shared_except "scroll" "locked" {
+        bind "Alt s" { SwitchToMode "Scroll"; }
    }
-    shared_except "locked" "tab" {
-        bind "Alt t" { SwitchToMode "tab"; }
+    shared_except "session" "locked" {
+        bind "Alt o" { SwitchToMode "Session"; }
    }
-    shared_except "locked" "pane" {
-        bind "Alt p" { SwitchToMode "pane"; }
+    shared_except "tab" "locked" {
+        bind "Alt t" { SwitchToMode "Tab"; }
    }
-    shared_except "locked" "resize" {
-        bind "Alt n" { SwitchToMode "resize"; }
-    }
-    shared_except "normal" "locked" "entersearch" {
-        bind "enter" { SwitchToMode "normal"; }
-    }
-    shared_except "normal" "locked" "entersearch" "renametab" "renamepane" {
-        bind "esc" { SwitchToMode "normal"; }
-    }
-    shared_among "scroll" "search" {
-        bind "PageDown" { PageScrollDown; }
-        bind "PageUp" { PageScrollUp; }
-        bind "left" { PageScrollUp; }
-        bind "down" { ScrollDown; }
-        bind "up" { ScrollUp; }
-        bind "right" { PageScrollDown; }
-        bind "Alt b" { PageScrollUp; }
-        bind "Alt c" { ScrollToBottom; SwitchToMode "normal"; }
-        bind "d" { HalfPageScrollDown; }
-        bind "Alt f" { PageScrollDown; }
-        bind "h" { PageScrollUp; }
-        bind "j" { ScrollDown; }
-        bind "k" { ScrollUp; }
-        bind "l" { PageScrollDown; }
-        bind "Alt s" { SwitchToMode "normal"; }
-        bind "u" { HalfPageScrollUp; }
-    }
-    entersearch {
-        bind "Alt c" { SwitchToMode "scroll"; }
-        bind "esc" { SwitchToMode "scroll"; }
-        bind "enter" { SwitchToMode "search"; }
-    }
-    renametab {
-        bind "esc" { UndoRenameTab; SwitchToMode "tab"; }
-    }
-    shared_among "renametab" "renamepane" {
-        bind "Alt c" { SwitchToMode "normal"; }
-    }
-    renamepane {
-        bind "esc" { UndoRenamePane; SwitchToMode "pane"; }
+    // shared_except "move" "locked" {
+    //     bind "Alt h" { SwitchToMode "Move"; }
+    // }
+    shared_except "tmux" "locked" {
+        bind "Alt b" { SwitchToMode "Tmux"; }
    }
 }

-// Plugin aliases - can be used to change the implementation of Zellij
-// changing these requires a restart to take effect
 plugins {
-    about location="zellij:about"
-    compact-bar location="zellij:compact-bar"
-    configuration location="zellij:configuration"
-    filepicker location="zellij:strider" {
-        cwd "/"
-    }
-    plugin-manager location="zellij:plugin-manager"
-    session-manager location="zellij:session-manager"
+    tab-bar location="zellij:tab-bar"
    status-bar location="zellij:status-bar"
    strider location="zellij:strider"
-    tab-bar location="zellij:tab-bar"
+    compact-bar location="zellij:compact-bar"
+    session-manager location="zellij:session-manager"
    welcome-screen location="zellij:session-manager" {
        welcome_screen true
    }
+    filepicker location="zellij:strider" {
+        cwd "/"
+    }
 }

-// Plugins to load in the background when a new session starts
-// eg. "file:/path/to/my-plugin.wasm"
-// eg. "https://example.com/my-plugin.wasm"
-load_plugins {
-}
+// Choose what to do when zellij receives SIGTERM, SIGINT, SIGQUIT or SIGHUP
+// eg. when terminal window with an active zellij session is closed
+// Options:
+//   - detach (Default)
+//   - quit
+//
+// on_force_close "quit"

-// Use a simplified UI without special fonts (arrow glyphs)
+//  Send a request for a simplified ui (without arrow fonts) to plugins
 //  Options:
 //    - true
 //    - false (Default)
 //
 // simplified_ui true

-// Choose the theme that is specified in the themes section.
-// Default: default
-// 
-// theme "gruvbox-dark"
-theme "catppuccin-macchiato"
- 
-// Choose the base input mode of zellij.
-// Default: normal
-// 
-// default_mode "locked"
- 
 // Choose the path to the default shell that zellij will use for opening new panes
 // Default: $SHELL
 //
@ -238,22 +221,75 @@ theme "catppuccin-macchiato"

 // Choose the path to override cwd that zellij will use for opening new panes
 //
-// default_cwd "/tmp"
+// default_cwd ""
+
+// Toggle between having pane frames around the panes
+// Options:
+//   - true (default)
+//   - false
+//
+// pane_frames true
+
+// Toggle between having Zellij lay out panes according to a predefined set of layouts whenever possible
+// Options:
+//   - true (default)
+//   - false
+//
+// auto_layout true
+
+// Whether sessions should be serialized to the cache folder (including their tabs/panes, cwds and running commands) so that they can later be resurrected
+// Options:
+//   - true (default)
+//   - false
+//
+// session_serialization false
+
+// Whether pane viewports are serialized along with the session, default is false
+// Options:
+//   - true
+//   - false (default)
+// serialize_pane_viewport true
+
+// Scrollback lines to serialize along with the pane viewport when serializing sessions, 0
+// defaults to the scrollback size. If this number is higher than the scrollback size, it will
+// also default to the scrollback size. This does nothing if `serialize_pane_viewport` is not true.
+//
+// scrollback_lines_to_serialize 10000
+
+// Define color themes for Zellij
+// For more examples, see: https://github.com/zellij-org/zellij/tree/main/example/themes
+// Once these themes are defined, one of them should to be selected in the "theme" section of this file
+//
+// themes {
+//     dracula {
+//         fg 248 248 242
+//         bg 40 42 54
+//         red 255 85 85
+//         green 80 250 123
+//         yellow 241 250 140
+//         blue 98 114 164
+//         magenta 255 121 198
+//         orange 255 184 108
+//         cyan 139 233 253
+//         black 0 0 0
+//         white 255 255 255
+//     }
+// }
+
+// Choose the theme that is specified in the themes section.
+// Default: default
+//
+// theme "default"

 // The name of the default layout to load on startup
 // Default: "default"
 //
 // default_layout "compact"

-// The folder in which Zellij will look for layouts
-// (Requires restart)
+// Choose the mode that zellij uses when starting up.
+// Default: normal
 //
-// layout_dir "/tmp"
- 
-// The folder in which Zellij will look for themes
-// (Requires restart)
-// 
-// theme_dir "/tmp"
+// default_mode "locked"

 // Toggle enabling the mouse mode.
 // On certain configurations, or terminals this could
@ -264,34 +300,9 @@ theme "catppuccin-macchiato"
 //
 // mouse_mode false

-// Toggle having pane frames around the panes
-// Options:
-//   - true (default, enabled)
-//   - false
-// 
-// pane_frames false
- 
-// When attaching to an existing session with other users,
-// should the session be mirrored (true)
-// or should each user have their own cursor (false)
-// (Requires restart)
-// Default: false
-// 
-// mirror_session true
- 
-// Choose what to do when zellij receives SIGTERM, SIGINT, SIGQUIT or SIGHUP
-// eg. when terminal window with an active zellij session is closed
-// (Requires restart)
-// Options:
-//   - detach (Default)
-//   - quit
-// 
-// on_force_close "quit"
- 
 // Configure the scroll back buffer size
 // This is the number of lines zellij stores for each pane in the scroll back
 // buffer. Excess number of lines are discarded in a FIFO fashion.
-// (Requires restart)
 // Valid values: positive integers
 // Default value: 10000
 //
@ -306,8 +317,6 @@ theme "catppuccin-macchiato"
 // copy_command "xclip -selection clipboard" // x11
 // copy_command "wl-copy"                    // wayland
 // copy_command "pbcopy"                     // osx
-// 
-// copy_command "pbcopy"

 // Choose the destination for copied text
 // Allows using the primary selection buffer (on x11/wayland) instead of the system clipboard.
@ -318,90 +327,39 @@ theme "catppuccin-macchiato"
 //
 // copy_clipboard "primary"

-// Enable automatic copying (and clearing) of selection when releasing mouse
+// Enable or disable automatic copy (and clear) of selection when releasing mouse
 // Default: true
 //
-// copy_on_select true
+// copy_on_select false

 // Path to the default editor to use to edit pane scrollbuffer
 // Default: $EDITOR or $VISUAL
+//
 // scrollback_editor "/usr/bin/vim"

-// A fixed name to always give the Zellij session.
-// Consider also setting `attach_to_session true,`
-// otherwise this will error if such a session exists.
-// Default: <RANDOM>
-// 
-// session_name "My singleton session"
- 
-// When `session_name` is provided, attaches to that session
-// if it is already running or creates it otherwise.
+// When attaching to an existing session with other users,
+// should the session be mirrored (true)
+// or should each user have their own cursor (false)
 // Default: false
 //
-// attach_to_session true
+// mirror_session true

-// Toggle between having Zellij lay out panes according to a predefined set of layouts whenever possible
-// Options:
-//   - true (default)
-//   - false
+// The folder in which Zellij will look for layouts
 //
-// auto_layout false
+// layout_dir "/path/to/my/layout_dir"

-// Whether sessions should be serialized to the cache folder (including their tabs/panes, cwds and running commands) so that they can later be resurrected
-// Options:
-//   - true (default)
-//   - false
+// The folder in which Zellij will look for themes
 //
-// session_serialization false
- 
-// Whether pane viewports are serialized along with the session, default is false
-// Options:
-//   - true
-//   - false (default)
-// 
-// serialize_pane_viewport false
- 
-// Scrollback lines to serialize along with the pane viewport when serializing sessions, 0
-// defaults to the scrollback size. If this number is higher than the scrollback size, it will
-// also default to the scrollback size. This does nothing if `serialize_pane_viewport` is not true.
-// 
-// scrollback_lines_to_serialize 10000
+// theme_dir "/path/to/my/theme_dir"

 // Enable or disable the rendering of styled and colored underlines (undercurl).
 // May need to be disabled for certain unsupported terminals
-// (Requires restart)
 // Default: true
 //
 // styled_underlines false

-// How often in seconds sessions are serialized
-// 
-// serialization_interval 10000
- 
 // Enable or disable writing of session metadata to disk (if disabled, other sessions might not know
 // metadata info on this session)
-// (Requires restart)
 // Default: false
 //
-// disable_session_metadata false
- 
-// Enable or disable support for the enhanced Kitty Keyboard Protocol (the host terminal must also support it)
-// (Requires restart)
-// Default: true (if the host terminal supports it)
-// 
-// support_kitty_keyboard_protocol false
- 
-// Whether to stack panes when resizing beyond a certain size
-// Default: true
-// 
-// stacked_resize false
- 
-// Whether to show tips on startup
-// Default: true
-// 
-show_startup_tips false
- 
-// Whether to show release notes on first version run
-// Default: true
-// 
-// show_release_notes false
+// disable_session_metadata true
--- a/.config/zellij/config.kdl.bak
+++ b/.config/zellij/config.kdl.bak
@ -1,344 +0,0 @@
-// If you'd like to override the default keybindings completely, be sure to change "keybinds" to "keybinds clear-defaults=true"
-keybinds clear-defaults=true {
-    normal {
-        // uncomment this and adjust key if using copy_on_select=false
-        // bind "Alt c" { Copy; }
-    }
-    locked {
-        bind "Alt g" { SwitchToMode "Normal"; }
-    }
-    resize {
-        bind "Alt n" { SwitchToMode "Normal"; }
-        bind "h" "Left" { Resize "Increase Left"; }
-        bind "j" "Down" { Resize "Increase Down"; }
-        bind "k" "Up" { Resize "Increase Up"; }
-        bind "l" "Right" { Resize "Increase Right"; }
-        bind "H" { Resize "Decrease Left"; }
-        bind "J" { Resize "Decrease Down"; }
-        bind "K" { Resize "Decrease Up"; }
-        bind "L" { Resize "Decrease Right"; }
-        bind "=" "+" { Resize "Increase"; }
-        bind "-" { Resize "Decrease"; }
-    }
-    pane {
-        bind "Alt p" { SwitchToMode "Normal"; }
-        bind "h" "Left" { MoveFocus "Left"; }
-        bind "l" "Right" { MoveFocus "Right"; }
-        bind "j" "Down" { MoveFocus "Down"; }
-        bind "k" "Up" { MoveFocus "Up"; }
-        bind "p" { SwitchFocus; }
-        bind "n" { NewPane; SwitchToMode "Normal"; }
-        bind "d" { NewPane "Down"; SwitchToMode "Normal"; }
-        bind "r" { NewPane "Right"; SwitchToMode "Normal"; }
-        bind "x" { CloseFocus; SwitchToMode "Normal"; }
-        bind "f" { ToggleFocusFullscreen; SwitchToMode "Normal"; }
-        bind "z" { TogglePaneFrames; SwitchToMode "Normal"; }
-        bind "w" { ToggleFloatingPanes; SwitchToMode "Normal"; }
-        bind "e" { TogglePaneEmbedOrFloating; SwitchToMode "Normal"; }
-        bind "c" { SwitchToMode "RenamePane"; PaneNameInput 0;}
-    }
-    move {
-        bind "Alt h" { SwitchToMode "Normal"; }
-        bind "n" "Tab" { MovePane; }
-        bind "p" { MovePaneBackwards; }
-        bind "h" "Left" { MovePane "Left"; }
-        bind "j" "Down" { MovePane "Down"; }
-        bind "k" "Up" { MovePane "Up"; }
-        bind "l" "Right" { MovePane "Right"; }
-    }
-    tab {
-        bind "Alt t" { SwitchToMode "Normal"; }
-        bind "r" { SwitchToMode "RenameTab"; TabNameInput 0; }
-        bind "h" "Left" "Up" "k" { GoToPreviousTab; }
-        bind "l" "Right" "Down" "j" { GoToNextTab; }
-        bind "n" { NewTab; SwitchToMode "Normal"; }
-        bind "x" { CloseTab; SwitchToMode "Normal"; }
-        bind "s" { ToggleActiveSyncTab; SwitchToMode "Normal"; }
-        bind "b" { BreakPane; SwitchToMode "Normal"; }
-        bind "]" { BreakPaneRight; SwitchToMode "Normal"; }
-        bind "[" { BreakPaneLeft; SwitchToMode "Normal"; }
-        bind "1" { GoToTab 1; SwitchToMode "Normal"; }
-        bind "2" { GoToTab 2; SwitchToMode "Normal"; }
-        bind "3" { GoToTab 3; SwitchToMode "Normal"; }
-        bind "4" { GoToTab 4; SwitchToMode "Normal"; }
-        bind "5" { GoToTab 5; SwitchToMode "Normal"; }
-        bind "6" { GoToTab 6; SwitchToMode "Normal"; }
-        bind "7" { GoToTab 7; SwitchToMode "Normal"; }
-        bind "8" { GoToTab 8; SwitchToMode "Normal"; }
-        bind "9" { GoToTab 9; SwitchToMode "Normal"; }
-        bind "Tab" { ToggleTab; }
-    }
-    scroll {
-        bind "Alt s" { SwitchToMode "Normal"; }
-        bind "e" { EditScrollback; SwitchToMode "Normal"; }
-        bind "s" { SwitchToMode "EnterSearch"; SearchInput 0; }
-        bind "Alt c" { ScrollToBottom; SwitchToMode "Normal"; }
-        bind "j" "Down" { ScrollDown; }
-        bind "k" "Up" { ScrollUp; }
-        bind "Alt f" "PageDown" "Right" "l" { PageScrollDown; }
-        bind "Alt b" "PageUp" "Left" "h" { PageScrollUp; }
-        bind "d" { HalfPageScrollDown; }
-        bind "u" { HalfPageScrollUp; }
-        // uncomment this and adjust key if using copy_on_select=false
-        // bind "Alt c" { Copy; }
-    }
-    search {
-        bind "Alt s" { SwitchToMode "Normal"; }
-        bind "Alt c" { ScrollToBottom; SwitchToMode "Normal"; }
-        bind "j" "Down" { ScrollDown; }
-        bind "k" "Up" { ScrollUp; }
-        bind "Alt f" "PageDown" "Right" "l" { PageScrollDown; }
-        bind "Alt b" "PageUp" "Left" "h" { PageScrollUp; }
-        bind "d" { HalfPageScrollDown; }
-        bind "u" { HalfPageScrollUp; }
-        bind "n" { Search "down"; }
-        bind "p" { Search "up"; }
-        bind "c" { SearchToggleOption "CaseSensitivity"; }
-        bind "w" { SearchToggleOption "Wrap"; }
-        bind "o" { SearchToggleOption "WholeWord"; }
-    }
-    entersearch {
-        bind "Alt c" "Esc" { SwitchToMode "Scroll"; }
-        bind "Enter" { SwitchToMode "Search"; }
-    }
-    renametab {
-        bind "Alt c" { SwitchToMode "Normal"; }
-        bind "Esc" { UndoRenameTab; SwitchToMode "Tab"; }
-    }
-    renamepane {
-        bind "Alt c" { SwitchToMode "Normal"; }
-        bind "Esc" { UndoRenamePane; SwitchToMode "Pane"; }
-    }
-    session {
-        bind "Alt o" { SwitchToMode "Normal"; }
-        bind "Alt s" { SwitchToMode "Scroll"; }
-        bind "d" { Detach; }
-        bind "w" {
-            LaunchOrFocusPlugin "session-manager" {
-                floating true
-                move_to_focused_tab true
-            };
-            SwitchToMode "Normal"
-        }
-    }
-    shared_except "locked" {
-        bind "Alt g" { SwitchToMode "Locked"; }
-        bind "Alt q" { Quit; }
-        bind "Alt n" { NewPane; }
-        bind "Alt i" { MoveTab "Left"; }
-        bind "Alt o" { MoveTab "Right"; }
-        bind "Alt h" "Alt Left" { MoveFocusOrTab "Left"; }
-        bind "Alt l" "Alt Right" { MoveFocusOrTab "Right"; }
-        bind "Alt j" "Alt Down" { MoveFocus "Down"; }
-        bind "Alt k" "Alt Up" { MoveFocus "Up"; }
-        bind "Alt =" "Alt +" { Resize "Increase"; }
-        bind "Alt -" { Resize "Decrease"; }
-        bind "Alt [" { PreviousSwapLayout; }
-        bind "Alt ]" { NextSwapLayout; }
-        bind "Alt f" { ToggleFocusFullscreen; }
-    }
-    shared_except "normal" "locked" {
-        bind "Enter" "Esc" { SwitchToMode "Normal"; }
-    }
-    shared_except "pane" "locked" {
-        bind "Alt p" { SwitchToMode "Pane"; }
-    }
-    shared_except "resize" "locked" {
-        bind "Alt n" { SwitchToMode "Resize"; }
-    }
-    shared_except "scroll" "locked" {
-        bind "Alt s" { SwitchToMode "Scroll"; }
-    }
-    shared_except "session" "locked" {
-        bind "Alt o" { SwitchToMode "Session"; }
-    }
-    shared_except "tab" "locked" {
-        bind "Alt t" { SwitchToMode "Tab"; }
-    }
-    // shared_except "move" "locked" {
-    //     bind "Alt h" { SwitchToMode "Move"; }
-    // }
-    shared_except "tmux" "locked" {
-        bind "Alt b" { SwitchToMode "Tmux"; }
-    }
-}
-
-plugins {
-    tab-bar location="zellij:tab-bar"
-    status-bar location="zellij:status-bar"
-    strider location="zellij:strider"
-    compact-bar location="zellij:compact-bar"
-    session-manager location="zellij:session-manager"
-    welcome-screen location="zellij:session-manager" {
-        welcome_screen true
-    }
-    filepicker location="zellij:strider" {
-        cwd "/"
-    }
-}
-
-// Choose what to do when zellij receives SIGTERM, SIGINT, SIGQUIT or SIGHUP
-// eg. when terminal window with an active zellij session is closed
-// Options:
-//   - detach (Default)
-//   - quit
-//
-// on_force_close "quit"
-
-//  Send a request for a simplified ui (without arrow fonts) to plugins
-//  Options:
-//    - true
-//    - false (Default)
-//
-// simplified_ui true
-
-// Choose the path to the default shell that zellij will use for opening new panes
-// Default: $SHELL
-//
-// default_shell "fish"
-
-// Choose the path to override cwd that zellij will use for opening new panes
-//
-// default_cwd ""
-
-// Toggle between having pane frames around the panes
-// Options:
-//   - true (default)
-//   - false
-//
-// pane_frames true
-
-// Toggle between having Zellij lay out panes according to a predefined set of layouts whenever possible
-// Options:
-//   - true (default)
-//   - false
-//
-// auto_layout true
-
-// Whether sessions should be serialized to the cache folder (including their tabs/panes, cwds and running commands) so that they can later be resurrected
-// Options:
-//   - true (default)
-//   - false
-//
-// session_serialization false
-
-// Whether pane viewports are serialized along with the session, default is false
-// Options:
-//   - true
-//   - false (default)
-// serialize_pane_viewport true
-
-// Scrollback lines to serialize along with the pane viewport when serializing sessions, 0
-// defaults to the scrollback size. If this number is higher than the scrollback size, it will
-// also default to the scrollback size. This does nothing if `serialize_pane_viewport` is not true.
-//
-// scrollback_lines_to_serialize 10000
-
-// Define color themes for Zellij
-// For more examples, see: https://github.com/zellij-org/zellij/tree/main/example/themes
-// Once these themes are defined, one of them should to be selected in the "theme" section of this file
-//
-// themes {
-//     dracula {
-//         fg 248 248 242
-//         bg 40 42 54
-//         red 255 85 85
-//         green 80 250 123
-//         yellow 241 250 140
-//         blue 98 114 164
-//         magenta 255 121 198
-//         orange 255 184 108
-//         cyan 139 233 253
-//         black 0 0 0
-//         white 255 255 255
-//     }
-// }
-
-// Choose the theme that is specified in the themes section.
-// Default: default
-//
-// theme "catppuccin-macchiato"
-theme "gruvbox-dark"
-
-// The name of the default layout to load on startup
-// Default: "default"
-//
-// default_layout "compact"
-
-// Choose the mode that zellij uses when starting up.
-// Default: normal
-//
-// default_mode "locked"
-
-// Toggle enabling the mouse mode.
-// On certain configurations, or terminals this could
-// potentially interfere with copying text.
-// Options:
-//   - true (default)
-//   - false
-//
-// mouse_mode false
-
-// Configure the scroll back buffer size
-// This is the number of lines zellij stores for each pane in the scroll back
-// buffer. Excess number of lines are discarded in a FIFO fashion.
-// Valid values: positive integers
-// Default value: 10000
-//
-// scroll_buffer_size 10000
-
-// Provide a command to execute when copying text. The text will be piped to
-// the stdin of the program to perform the copy. This can be used with
-// terminal emulators which do not support the OSC 52 ANSI control sequence
-// that will be used by default if this option is not set.
-// Examples:
-//
-// copy_command "xclip -selection clipboard" // x11
-// copy_command "wl-copy"                    // wayland
-// copy_command "pbcopy"                     // osx
-
-// Choose the destination for copied text
-// Allows using the primary selection buffer (on x11/wayland) instead of the system clipboard.
-// Does not apply when using copy_command.
-// Options:
-//   - system (default)
-//   - primary
-//
-// copy_clipboard "primary"
-
-// Enable or disable automatic copy (and clear) of selection when releasing mouse
-// Default: true
-//
-// copy_on_select false
-
-// Path to the default editor to use to edit pane scrollbuffer
-// Default: $EDITOR or $VISUAL
-//
-// scrollback_editor "/usr/bin/vim"
-
-// When attaching to an existing session with other users,
-// should the session be mirrored (true)
-// or should each user have their own cursor (false)
-// Default: false
-//
-// mirror_session true
-
-// The folder in which Zellij will look for layouts
-//
-// layout_dir "/path/to/my/layout_dir"
-
-// The folder in which Zellij will look for themes
-//
-// theme_dir "/path/to/my/theme_dir"
-
-// Enable or disable the rendering of styled and colored underlines (undercurl).
-// May need to be disabled for certain unsupported terminals
-// Default: true
-//
-// styled_underlines false
-
-// Enable or disable writing of session metadata to disk (if disabled, other sessions might not know
-// metadata info on this session)
-// Default: false
-//
-// disable_session_metadata true
--- a/.config/zellij/layouts/nvim.kdl
+++ b/.config/zellij/layouts/nvim.kdl
@ -1,6 +0,0 @@
-layout {
-	pane command="nvim" size="80%"
-    pane split_direction="vertical" {
-		pane size="20%"
-    }
-}
--- a/.config/zellij/themes/catppuccin.kdl
+++ b/.config/zellij/themes/catppuccin.kdl
@ -1,57 +0,0 @@
-themes {
-  catppuccin-latte {
-    bg "#acb0be" // Surface2
-    fg "#4c4f69" // Text
-    red "#d20f39"
-    green "#40a02b"
-    blue "#1e66f5"
-    yellow "#df8e1d"
-    magenta "#ea76cb" // Pink
-    orange "#fe640b" // Peach
-    cyan "#04a5e5" // Sky
-    black "#e6e9ef" // Mantle
-    white "#4c4f69" // Text
-  }
-
-  catppuccin-frappe {
-    bg "#626880" // Surface2
-    fg "#c6d0f5" // Text
-    red "#e78284"
-    green "#a6d189"
-    blue "#8caaee"
-    yellow "#e5c890"
-    magenta "#f4b8e4" // Pink
-    orange "#ef9f76" // Peach
-    cyan "#99d1db" // Sky
-    black "#292c3c" // Mantle
-    white "#c6d0f5" // Text
-  }
-
-  catppuccin-macchiato {
-    bg "#5b6078" // Surface2
-    fg "#cad3f5" // Text
-    red "#ed8796"
-    green "#a6da95"
-    blue "#8aadf4"
-    yellow "#eed49f"
-    magenta "#f5bde6" // Pink
-    orange "#f5a97f" // Peach
-    cyan "#91d7e3" // Sky
-    black "#1e2030" // Mantle
-    white "#cad3f5" // Text
-  }
-
-  catppuccin-mocha {
-    bg "#585b70" // Surface2
-    fg "#cdd6f4" // Text
-    red "#f38ba8"
-    green "#a6e3a1"
-    blue "#89b4fa"
-    yellow "#f9e2af"
-    magenta "#f5c2e7" // Pink
-    orange "#fab387" // Peach
-    cyan "#89dceb" // Sky
-    black "#181825" // Mantle
-    white "#cdd6f4" // Text
-  }
-}
--- a/.config/X11/xinitrc
+++ b/.config/X11/xinitrc
Author	SHA1	Message	Date
omri	a1780dec2b	waybar: update config to be similar to polybar	2025-01-31 10:57:51 +02:00
omri	4b4c5c02a7	add waybar and sway	2025-01-17 20:54:59 +02:00
omri	003a92f074	nvim: luasnip	2024-12-06 14:01:53 +02:00
omri	f6fee77954	userdirs: put documents in ~/.local/share	2024-11-19 20:19:50 +02:00
omri	df3bf6fa57	xinitrc: add some random wms. i don't really use this anymore	2024-11-19 20:19:18 +02:00
omri	8b408504e3	sxhkd: use rofi -drun	2024-11-19 20:19:01 +02:00
omri	53628003d7	polybar: add pipewire buffer size module	2024-11-19 20:18:42 +02:00
omri	4e464eac48	fish: xdg cleanup	2024-11-19 20:18:13 +02:00