diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json
index 2d25fd1..285aff6 100644
--- a/nvim/.config/nvim/lazy-lock.json
+++ b/nvim/.config/nvim/lazy-lock.json
@@ -1,19 +1,20 @@
 {
   "blink.cmp": { "branch": "main", "commit": "b6f11a0aa33e601c469a126e3ed6e35208fe3ea3" },
+  "catppuccin": { "branch": "main", "commit": "5b5e3aef9ad7af84f463d17b5479f06b87d5c429" },
   "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
-  "gruvbox.nvim": { "branch": "main", "commit": "089b60e92aa0a1c6fa76ff527837cd35b6f5ac81" },
-  "lazy.nvim": { "branch": "main", "commit": "f15a93907ddad3d9139aea465ae18336d87f5ce6" },
+  "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
   "lazydev.nvim": { "branch": "main", "commit": "a1b78b2ac6f978c72e76ea90ae92a94edf380cfc" },
   "lua-utils.nvim": { "branch": "main", "commit": "e565749421f4bbb5d2e85e37c3cef9d56553d8bd" },
   "mini.nvim": { "branch": "main", "commit": "0420076298c4457f200c2de468f65d080597a347" },
   "mini.pairs": { "branch": "main", "commit": "7e834c5937d95364cc1740e20d673afe2d034cdb" },
   "neorg": { "branch": "main", "commit": "ed43ed58116caa0a17bbbc7aa663e32bf94bc531" },
-  "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" },
+  "nui.nvim": { "branch": "main", "commit": "8d5b0b568517935d3c84f257f272ef004d9f5a59" },
   "nvim-lspconfig": { "branch": "master", "commit": "d37812c49063eda10ad1f7c7695509365ac7bd47" },
-  "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
+  "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
   "nvim-treesitter": { "branch": "master", "commit": "a840137349fcc35b5ad2c718a9b034b93012fa43" },
   "pathlib.nvim": { "branch": "main", "commit": "57e5598af6fe253761c1b48e0b59b7cd6699e2c1" },
   "plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "dae2eac9d91464448b584c7949a31df8faefec56" },
-  "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }
+  "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
+  "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }
 }
diff --git a/nvim/.config/nvim/lua/plugins/gruvbox.lua b/nvim/.config/nvim/lua/plugins/gruvbox.lua
deleted file mode 100644
index 39a7c8c..0000000
--- a/nvim/.config/nvim/lua/plugins/gruvbox.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-return {
-    { "ellisonleao/gruvbox.nvim", config = function() vim.cmd.colorscheme "gruvbox" end}
-}
diff --git a/nvim/.config/nvim/lua/plugins/lsp.lua b/nvim/.config/nvim/lua/plugins/lsp.lua
index 0e651b5..8e545a6 100644
--- a/nvim/.config/nvim/lua/plugins/lsp.lua
+++ b/nvim/.config/nvim/lua/plugins/lsp.lua
@@ -18,12 +18,12 @@ return {
         config = function()
             local capabilities = require('blink.cmp').get_lsp_capabilities()
             require("lspconfig").lua_ls.setup({ capabilities = capabilities })
-            require("lspconfig").pylsp.setup({ capabilities = capabilities })
+            require("lspconfig").basedpyright.setup({ capabilities = capabilities })
             require("lspconfig").gopls.setup({ capabilities = capabilities })
 
-            vim.keymap.set("n", "<leader>g", function() vim.lsp.buf.format() end)
-            vim.keymap.set("n", "gd", require('telescope.builtin').lsp_definitions)
-
+            vim.keymap.set("n", "<leader>g", function() vim.lsp.buf.format() end, { desc = "LSP: format buffer" })
+            vim.keymap.set("n", "gd", require('telescope.builtin').lsp_definitions, { desc = "LSP: go to definition" })
+            vim.keymap.set("n", "<leader>e", function() vim.diagnostic.open_float() end, { desc = "LSP: show diagnostic info" })
         end
     }
 }
diff --git a/nvim/.config/nvim/lua/plugins/neorg.lua b/nvim/.config/nvim/lua/plugins/neorg.lua
index dd0bb79..4df118a 100644
--- a/nvim/.config/nvim/lua/plugins/neorg.lua
+++ b/nvim/.config/nvim/lua/plugins/neorg.lua
@@ -19,7 +19,7 @@ return {
                     ["core.dirman"] = {
                         config = {
                             workspaces = {
-                                notes = "~/Documents/notes/neorg/",
+                                notes = "~/notes/neorg/",
                             },
                             default_workspace = "notes",
                         },
diff --git a/nvim/.config/nvim/lua/plugins/telescope.lua b/nvim/.config/nvim/lua/plugins/telescope.lua
index d37d00b..3647c7c 100644
--- a/nvim/.config/nvim/lua/plugins/telescope.lua
+++ b/nvim/.config/nvim/lua/plugins/telescope.lua
@@ -12,8 +12,9 @@ return {
             }
         }
         require("telescope").load_extension("fzf")
-        vim.keymap.set("n", "<space>ff", require("telescope.builtin").find_files)
-        vim.keymap.set("n", "<space>fh", require("telescope.builtin").help_tags)
-        vim.keymap.set("n", "<space>fg", require("telescope.builtin").live_grep)
+        vim.keymap.set("n", "<space>ff", require("telescope.builtin").find_files, {desc="Telescope: find files"})
+        vim.keymap.set("n", "<space>fh", require("telescope.builtin").help_tags, {desc="Telescope: help tags"})
+        vim.keymap.set("n", "<space>fg", require("telescope.builtin").live_grep, {desc="Telescope: live grep"})
+        vim.keymap.set("n", "<space>fb", require("telescope.builtin").buffers, {desc="Telescope: buffers"})
     end
 }
diff --git a/nvim/.config/nvim/lua/plugins/theme-catpuccin.lua b/nvim/.config/nvim/lua/plugins/theme-catpuccin.lua
new file mode 100644
index 0000000..4e3fc61
--- /dev/null
+++ b/nvim/.config/nvim/lua/plugins/theme-catpuccin.lua
@@ -0,0 +1,11 @@
+return { 
+    "catppuccin/nvim",
+    name = "catppuccin",
+    priority = 1000,
+    config = function()
+    require("catppuccin").setup({
+      flavour = "frappe", -- Options: latte, frappe, macchiato, mocha
+    })
+    vim.cmd.colorscheme "catppuccin"
+  end,
+}
diff --git a/nvim/.config/nvim/lua/plugins/which-key.lua b/nvim/.config/nvim/lua/plugins/which-key.lua
new file mode 100644
index 0000000..9fadb97
--- /dev/null
+++ b/nvim/.config/nvim/lua/plugins/which-key.lua
@@ -0,0 +1,18 @@
+return {
+  "folke/which-key.nvim",
+  event = "VeryLazy",
+  opts = {
+    -- your configuration comes here
+    -- or leave it empty to use the default settings
+    -- refer to the configuration section below
+  },
+  keys = {
+    {
+      "<leader>?",
+      function()
+        require("which-key").show({ global = false })
+      end,
+      desc = "Buffer Local Keymaps (which-key)",
+    },
+  },
+}
diff --git a/tmux/.config/tmuxinator/algo.yml b/tmux/.config/tmuxinator/algo.yml
deleted file mode 100644
index ca06552..0000000
--- a/tmux/.config/tmuxinator/algo.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-# /home/ipu/.config/tmuxinator/algo.yml
-
-name: algo
-root: ~/Code/my/algo/
-
-windows:
-  - editor:
-    - nvimp .
-  - shell:
-    - 
diff --git a/tmux/.config/tmuxinator/bootdev-cpp.yml b/tmux/.config/tmuxinator/bootdev-cpp.yml
deleted file mode 100644
index 7e258e0..0000000
--- a/tmux/.config/tmuxinator/bootdev-cpp.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-# /home/ipu/.config/tmuxinator/bootdev-cpp.yml
-
-name: bootdev-cpp
-root: ~/Code/my/bootdev/cpp/
-
-windows:
-  - editor:
-    - nvim .
-  - shell:
-    - 
diff --git a/tmux/.config/tmuxinator/bootdev-static-site-gen.yml b/tmux/.config/tmuxinator/bootdev-static-site-gen.yml
deleted file mode 100644
index 5140dfd..0000000
--- a/tmux/.config/tmuxinator/bootdev-static-site-gen.yml
+++ /dev/null
@@ -1,53 +0,0 @@
-# /home/ipu/.config/tmuxinator/bootdev-static-site-gen.yml
-
-name: bootdev-static-site-gen
-root: ~/Code/my/bootdev/static-site-gen/
-
-# Optional tmux socket
-# socket_name: foo
-
-# Note that the pre and post options have been deprecated and will be replaced by
-# project hooks.
-
-# Project hooks
-
-# Runs on project start, always
-# on_project_start: command
-
-# Run on project start, the first time
-# on_project_first_start: command
-
-# Run on project start, after the first time
-# on_project_restart: command
-
-# Run on project exit ( detaching from tmux session )
-# on_project_exit: command
-
-# Run on project stop
-# on_project_stop: command
-
-# Runs in each window and pane before window/pane specific commands. Useful for setting up interpreter versions.
-# pre_window: poetry shell
-
-# Pass command line options to tmux. Useful for specifying a different tmux.conf.
-# tmux_options: -f ~/.tmux.mac.conf
-
-# Change the command to call tmux. This can be used by derivatives/wrappers like byobu.
-# tmux_command: byobu
-
-# Specifies (by name or index) which window will be selected on project startup. If not set, the first window is used.
-# startup_window: editor
-
-# Specifies (by index) which pane of the specified window will be selected on project startup. If not set, the first pane is used.
-# startup_pane: 1
-
-# Controls whether the tmux session should be attached to automatically. Defaults to true.
-# attach: false
-
-windows:
-  - editor:
-    - poetry run nvim .
-  - zsh:
-    - poetry shell
-  - git:
-    - lazygit
diff --git a/tmux/.config/tmuxinator/learn-go.yml b/tmux/.config/tmuxinator/learn-go.yml
deleted file mode 100644
index 17d183a..0000000
--- a/tmux/.config/tmuxinator/learn-go.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-# /home/ipu/.config/tmuxinator/learn-go.yml
-
-name: learn-go
-root: ~/Code/my/bootdev/go-learn/go-file-storage/
-
-windows:
-  - editor:
-    - nvim main.go
-  - shell:
-    - 
-
diff --git a/tmux/.config/tmuxinator/learn-web.yml b/tmux/.config/tmuxinator/learn-web.yml
deleted file mode 100644
index 4115ad9..0000000
--- a/tmux/.config/tmuxinator/learn-web.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-# /home/ipu/.config/tmuxinator/learn-web.yml
-
-name: learn-web
-root: ~/Code/my/freecodecamp/
-
-windows:
-  - editor:
-    - nvim .
-  - shell:
-    - 
-
diff --git a/tmux/.config/tmuxinator/mediaserv.yml b/tmux/.config/tmuxinator/mediaserv.yml
deleted file mode 100644
index ee7ef45..0000000
--- a/tmux/.config/tmuxinator/mediaserv.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# /home/ipu/.config/tmuxinator/mediaserv.yml
-
-name: mediaserv
-root: ~/Code/my/mediaserv/
-
-windows:
-  - editor:
-    - nvimp .
-  - shell:
-    - 
-  - git:
-    - lazygit
diff --git a/tmux/.config/tmuxinator/notes.yml b/tmux/.config/tmuxinator/notes.yml
index 9fcc5be..d58de06 100644
--- a/tmux/.config/tmuxinator/notes.yml
+++ b/tmux/.config/tmuxinator/notes.yml
@@ -1,10 +1,10 @@
 # /home/ipu/.config/tmuxinator/notes.yml
 
 name: notes
-root: ~/Documents/notes/neorg/
+root: ~/notes/neorg/
 
 windows:
   - editor:
-    - nvim index.norg
+    - nvim .
   - shell:
     - 
diff --git a/tmux/.config/tmuxinator/podarunok.yml b/tmux/.config/tmuxinator/podarunok.yml
deleted file mode 100644
index 2d7b409..0000000
--- a/tmux/.config/tmuxinator/podarunok.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# /home/ipu/.config/tmuxinator/podarunok.yml
-
-name: podarunok
-root: ~/Code/my/podarunok/
-
-windows:
-  - editor:
-    - nvimp .
-  - shell:
-    - 
-  - git:
-    - lazygit
diff --git a/tmux/.config/tmuxinator/work-ape.yml b/tmux/.config/tmuxinator/work-ape.yml
deleted file mode 100644
index 39cdcdb..0000000
--- a/tmux/.config/tmuxinator/work-ape.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-# /home/ipu/.config/tmuxinator/work-ape.yml
-
-name: work-ape
-root: ~/Code/work/ape/
-
-
-windows:
-  - server:
-    - ssh ape
-  - editor-app:
-    - cd app
-    - nvimp .
-  - git:
-    - cd app
-    - lazygit
diff --git a/tmux/.config/tmuxinator/work-fomo.yml b/tmux/.config/tmuxinator/work-fomo.yml
deleted file mode 100644
index 86a5a64..0000000
--- a/tmux/.config/tmuxinator/work-fomo.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-# /home/ipu/.config/tmuxinator/work-fomo.yml
-
-name: work-fomo
-root: ~/Code/work/fomo/fomo_bot/
-
-
-windows:
-  - nvim:
-    - cd app
-    - nvimp .
-  - shell:
-    - 
-  - git:
-    - cd app
-    - lazygit
diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index 08c4378..df8e0c6 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -2,10 +2,11 @@
 set -g @plugin 'tmux-plugins/tpm'
 set -g @plugin 'tmux-plugins/tmux-sensible'
 set -g @plugin 'tmux-plugins/tmux-resurrect'
-set -g @plugin 'egel/tmux-gruvbox'
-set -g @tmux-gruvbox 'dark'
 set -g @plugin 'omerxx/tmux-sessionx'
 
+set -g @catppuccin_flavor 'frappe'
+run ~/.tmux/plugins/catppuccin/tmux/catppuccin.tmux
+
 run '~/.tmux/plugins/tpm/tpm'
 
 # set window count from 1
@@ -21,3 +22,20 @@ bind-key C-a send-prefix
 # tmux sessionx - turn on tmuxinator mode
 set -g @sessionx-tmuxinator-mode 'on'
 set -g @sessionx-zoxide-mode 'on'
+
+# enable mouse
+set -g mouse on
+
+# set vi copy mode
+setw -g mode-keys vi
+
+# Catppuccin theme
+# Make the status line more pleasant.
+set -g status-left ""
+set -g status-right '#[fg=#{@thm_crust},bg=#{@thm_teal}] session: #S '
+# Ensure that everything on the right side of the status line
+# is included.
+set -g status-right-length 100
+
+set-option -g default-terminal "tmux-256color"
+set-option -a terminal-features "xterm-256color:RGB"
diff --git a/tmux/.tmux/plugins/catppuccin/tmux b/tmux/.tmux/plugins/catppuccin/tmux
new file mode 160000
index 0000000..b2f219c
--- /dev/null
+++ b/tmux/.tmux/plugins/catppuccin/tmux
@@ -0,0 +1 @@
+Subproject commit b2f219c00609ea1772bcfbdae0697807184743e4
diff --git a/tmux/.tmux/plugins/tmux-gruvbox b/tmux/.tmux/plugins/tmux-gruvbox
deleted file mode 160000
index c765322..0000000
--- a/tmux/.tmux/plugins/tmux-gruvbox
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c7653229c7f7e5beb1f9f4ba298b3b1c39ffd8ce