Add changes in .zshrc and lsp.lua

2024-08-05 09:02:02 +00:00
57 changed files with 464 additions and 950 deletions
--- a/README.md
+++ b/README.md
@@ -3,6 +3,6 @@
 ## Usage

 ```bash
-$ stow -S clang-format kitty nvim sway tmux waybar wofi zsh kanshi papis flashfocus zathura
+$ stow -S clang-format kitty nvim sway tmux waybar wofi zsh
 ```

--- a/clang-format/.clang-format
+++ b/clang-format/.clang-format
@@ -9,7 +9,6 @@ PointerAlignment: Left
 AccessModifierOffset: -4
 AlwaysBreakTemplateDeclarations: true
 LambdaBodyIndentation: Signature
-AllowShortLambdasOnASingleLine: None

 MaxEmptyLinesToKeep: 3
 #ColumnLimit: 128
--- a/flashfocus/.config/flashfocus/flashfocus.yml
+++ b/flashfocus/.config/flashfocus/flashfocus.yml
@@ -1,99 +0,0 @@
-## @@@@@@@@@@@@@@@@@@@@@@
-## Flashfocus config file
-## @@@@@@@@@@@@@@@@@@@@@@
-
-# Opacity of window during flash.
-flash-opacity: 0.8
-
-# Windows are restored to this opacity value at the end of a flash.
-default-opacity: 1
-
-# Length of flash in milliseconds.
-time: 500
-
-# If true, flashes are not faded out. This will improve performance but flashes
-# won't be smooth.
-simple: false
-
-# Number of animation frames in a flash.
-ntimepoints: 10
-
-# Set this to false if you don't want windows to flash on focus.
-flash-on-focus: true
-
-# Set this to false if you don't want fullscreen windows to flash.
-flash-fullscreen: true
-
-# Whether or not to flash windows if they are the only window on the desktop.
-# Possible values:
-#   'always':
-#      Always flash lone windows
-#   'never':
-#      Never flash lone windows
-#   'on_open_close':
-#      Lone windows will be flashed only if a) if they were just opened and b)
-#      if another window was just closed.
-#   'on_switch':
-#      Lone windows will be flashed only upon switching desktops.
-flash-lone-windows: 'always'
-
-
-# Defining window-specific flash rules
-#
-# X11-based window managers (e.g i3, bspwm)
-# -----------------------------------------
-# Flash rules are defined by matching the WM_CLASS property of a window. To get
-# the WM_CLASS property use 'xprop WM_CLASS' and click on a window. The
-# property is a tuple of the form (window-id, window-class). The window-class
-# is usually the name of the application, but not always.
-#
-#
-# Say I'd like to set all 'termite' windows to 80% opacity but leave other
-# windows at full opacity:
-#
-# rules:
-#   - window-class: Termite
-#     default-opacity: 0.8
-#
-#
-# I also would prefer that firefox windows are not flashed on focus:
-#
-# rules:
-#   - window-class: firefox
-#     flash-on-focus: False
-#   - window-class: Termite
-#     default-opacity: 0.8
-#
-#
-# For more complicated rules, you can use (python-style) regexes:
-#
-# rules:
-#   - window-id: ^(?!termite)$
-#     default-opacity: 0.8
-#
-#
-# Sway
-# ----
-# Native wayland apps can be matched using the app_id and window name. These
-# can be found using `swaymsg -t get_tree`. XWayland apps are matched with
-# using WM_CLASS as above (this can also be found with `swaymsg`)
-#
-# Given that termite is wayland native and firefox is not, the rules above
-# could instead be written:
-#
-# rules:
-#   - window-class: firefox
-#     flash-on-focus: False
-#   - app-id: termite
-#     default-opacity: 0.8
-#
-# rules:
-#   - window-name: ^(?!termite)$
-#     default-opacity: 0.8
-rules:
-  - app-id: kitty
-    flash-opacity: 0.85
-    default-opacity: 0.94
-  - app-id: org.pwmt.zathura
-    flash-opacity: 0.85
-    default-opacity: 0.94
--- a/kanshi/.config/kanshi/config
+++ b/kanshi/.config/kanshi/config
@@ -1,9 +0,0 @@
-profile Home {
-    output "eDP-1" mode  2256x1504@59.999Hz position 1920,875 transform normal scale 1.399999976158142
-    output "DP-11" mode  1920x1200@59.95Hz position 0,0 transform normal scale 1.0
-}
-
-profile Bell {
-    output "eDP-1" mode  2256x1504@59.999Hz position 2137,425 transform normal scale 1.399999976158142
-    output "DP-3" mode  1920x1080@59.951Hz position 0,0 transform normal scale 0.9
-}
--- a/kitty/.config/kitty/kitty.conf
+++ b/kitty/.config/kitty/kitty.conf
@@ -3,13 +3,6 @@
 include current-theme.conf
 # END_KITTY_THEME
 #
+background_opacity 0.87
 enable_audio_bell no
 touch_scroll_multiplier 8.0
-
-
-# BEGIN_KITTY_FONTS
-font_family      family="Liberation Mono"
-bold_font        auto
-italic_font      auto
-bold_italic_font auto
-# END_KITTY_FONTS
--- a/nvim/.config/nvim/init.lua
+++ b/nvim/.config/nvim/init.lua
@@ -1,8 +1,5 @@
 require("set")
 require("remap")
-require("lsp")
-
-- Set up lazy

 local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
 if not vim.loop.fs_stat(lazypath) then
--- a/nvim/.config/nvim/lazy-lock.json
+++ b/nvim/.config/nvim/lazy-lock.json
@@ -1,48 +1,50 @@
 {
-  "LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" },
-  "alpha-nvim": { "branch": "main", "commit": "2b3cbcdd980cae1e022409289245053f62fb50f6" },
-  "auto-session": { "branch": "main", "commit": "f0eb3d69848389869572b82b336d7a6887e88e43" },
-  "cellular-automaton.nvim": { "branch": "main", "commit": "1606e9d5d04ff254023c3f3c62842d065708d6d3" },
-  "copilot.lua": { "branch": "master", "commit": "93adf9844dcbe09a37e7a72eaa286d33d38bf628" },
-  "csvview.nvim": { "branch": "main", "commit": "bbab4c2f808fd8e11ec8dfdd128251aadba566a1" },
-  "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" },
-  "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
-  "gruvbox.nvim": { "branch": "main", "commit": "5e0a460d8e0f7f669c158dedd5f9ae2bcac31437" },
-  "harpoon": { "branch": "master", "commit": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3" },
-  "image.nvim": { "branch": "master", "commit": "446a8a5cc7a3eae3185ee0c697732c32a5547a0b" },
-  "jupytext.nvim": { "branch": "main", "commit": "c8baf3ad344c59b3abd461ecc17fc16ec44d0f7b" },
-  "lazy.nvim": { "branch": "main", "commit": "db067881fff0fd4be8c00e5bde7492e0e1c77a2f" },
+  "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" },
+  "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" },
+  "auto-session": { "branch": "main", "commit": "af2219b9fa99c1d7ac409bd9eac094c459d3f52d" },
+  "cellular-automaton.nvim": { "branch": "main", "commit": "b7d056dab963b5d3f2c560d92937cb51db61cb5b" },
+  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
+  "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
+  "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "031e6ba70b0ad5eee49fd2120ff7a2e325b17fa7" },
+  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
+  "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
+  "copilot.vim": { "branch": "release", "commit": "1dcaf72099b436b5832d6117d9cd7a4a098a8d77" },
+  "dressing.nvim": { "branch": "master", "commit": "e3714c8049b2243e792492c4149e4cc395c68eb9" },
+  "friendly-snippets": { "branch": "main", "commit": "700c4a25caacbb4648c9a27972c2fe203948e0c2" },
+  "gruvbox.nvim": { "branch": "main", "commit": "d4cde3853a172485961b515c36d51d757728d6e6" },
+  "harpoon": { "branch": "master", "commit": "ccae1b9bec717ae284906b0bf83d720e59d12b91" },
+  "lazy.nvim": { "branch": "main", "commit": "fafe1f7c640aed75e70a10e6649612cd96f39149" },
  "lsp-colors.nvim": { "branch": "main", "commit": "2bbe7541747fd339bdd8923fc45631a09bb4f1e5" },
-  "lualine.nvim": { "branch": "master", "commit": "3946f0122255bc377d14a59b27b609fb3ab25768" },
+  "lsp-zero.nvim": { "branch": "v3.x", "commit": "16de3b18c5f7b6230d89b8e64ce9a4801b6f8d08" },
+  "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
  "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
-  "markdown-toc.nvim": { "branch": "main", "commit": "869af35bce0c27e2006f410fa3f706808db4843d" },
-  "mason.nvim": { "branch": "main", "commit": "ad7146aa61dcaeb54fa900144d768f040090bff0" },
-  "molten-nvim": { "branch": "main", "commit": "a286aa914d9a154bc359131aab788b5a077a5a99" },
-  "noice.nvim": { "branch": "main", "commit": "d14d02cb709e3bb2da88363c32f8b4250bced52d" },
-  "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
-  "nvim-dap": { "branch": "master", "commit": "6782b097af2417a4c3e33849b0a26ae2188bd7ea" },
-  "nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" },
-  "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
-  "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
-  "nvim-web-devicons": { "branch": "master", "commit": "8dcb311b0c92d460fac00eac706abd43d94d68af" },
-  "oil.nvim": { "branch": "master", "commit": "7e1cd7703ff2924d7038476dcbc04b950203b902" },
-  "otter.nvim": { "branch": "main", "commit": "fc0aa35b1985077d11a20ddf4006bf40f2cd7397" },
-  "overseer.nvim": { "branch": "master", "commit": "c77c78b35d0b4d244e1cd77c25ec93a16fbbfc94" },
-  "pastify.nvim": { "branch": "main", "commit": "4a1d1e03c3ae725ee4af796deca8c7c169ef626e" },
-  "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
-  "quarto-nvim": { "branch": "main", "commit": "0e9491509b38efbd83d3f41dbfacc7fc4bd40191" },
-  "session-lens": { "branch": "main", "commit": "eae46b472b3150f5ec0f977556e8085683d49eb0" },
-  "sqlite.nvim": { "branch": "master", "commit": "a8466c830a89794c2eafa41b41dd11fdf4a0d7ca" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "8db12610bcb7ce67013cfdfaba4dd47a23c6e851" },
+  "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" },
+  "molten-nvim": { "branch": "main", "commit": "8346bba69e0de96278dad2038e9be74605908b7d" },
+  "neoformat": { "branch": "master", "commit": "82864d6c7926c4f3b535a2fd7eab919b116fc969" },
+  "noice.nvim": { "branch": "main", "commit": "e5cb20c6e14305d24025ecb77d7d4dd9d61f1a64" },
+  "nui.nvim": { "branch": "main", "commit": "322978c734866996274467de084a95e4f9b5e0b1" },
+  "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" },
+  "nvim-dap": { "branch": "master", "commit": "6f79b822997f2e8a789c6034e147d42bc6706770" },
+  "nvim-dap-ui": { "branch": "master", "commit": "b7267003ba4dd860350be86f75b9d9ea287cedca" },
+  "nvim-lspconfig": { "branch": "master", "commit": "4d38bece98300e3e5cd24a9aa0d0ebfea4951c16" },
+  "nvim-nio": { "branch": "master", "commit": "7969e0a8ffabdf210edd7978ec954a47a737bbcc" },
+  "nvim-tree.lua": { "branch": "master", "commit": "2086e564c4d23fea714e8a6d63b881e551af2f41" },
+  "nvim-treesitter": { "branch": "master", "commit": "eb59a3df509322924631c1ed85b0d2ec696bb78d" },
+  "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" },
+  "overseer.nvim": { "branch": "master", "commit": "6271cab7ccc4ca840faa93f54440ffae3a3918bd" },
+  "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
+  "session-lens": { "branch": "main", "commit": "1b65d8e1bcd1836c5135cce118ba18d662a9dabd" },
  "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" },
-  "time-tracker.nvim": { "branch": "master", "commit": "4127c4b5fecaf5f5cb3aa840707e58bb88eb9bf0" },
-  "todo-comments.nvim": { "branch": "main", "commit": "19d461ddd543e938eb22505fb03fa878800270b6" },
-  "toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" },
-  "trouble.nvim": { "branch": "main", "commit": "3609bb9a82bbab1ef95cf2c27ce7e52267a7d40d" },
-  "undotree": { "branch": "master", "commit": "0f1c9816975b5d7f87d5003a19c53c6fd2ff6f7f" },
-  "vim-doge": { "branch": "master", "commit": "03a84072ef21b205237c77986c78914395d646c3" },
-  "vim-flog": { "branch": "master", "commit": "665b16ac8915f746bc43c9572b4581a5e9047216" },
-  "vim-fugitive": { "branch": "master", "commit": "61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4" },
+  "todo-comments.nvim": { "branch": "main", "commit": "9c104cf7868f1c739b43a07e5593666cc9de2d67" },
+  "toggleterm.nvim": { "branch": "main", "commit": "066cccf48a43553a80a210eb3be89a15d789d6e6" },
+  "trouble.nvim": { "branch": "main", "commit": "38915023a777b7f2422e503dc603f6a64b465bf5" },
+  "undotree": { "branch": "master", "commit": "56c684a805fe948936cda0d1b19505b84ad7e065" },
+  "vim-doge": { "branch": "master", "commit": "188351964c8b2540a69c1d2648b3c6e7877a016f" },
+  "vim-flog": { "branch": "master", "commit": "2f0836128cac9368176a564b237382d1766723f0" },
+  "vim-fugitive": { "branch": "master", "commit": "4f59455d2388e113bd510e85b310d15b9228ca0d" },
  "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
-  "vimtex": { "branch": "master", "commit": "be9deac3a23eeb145ccf11dd09080795838496ce" },
-  "which-key.nvim": { "branch": "main", "commit": "b4177e3eaf15fe5eb8357ebac2286d488be1ed00" }
+  "vimtex": { "branch": "master", "commit": "0587a064f675fd85cdfb8a76d6a3ff698af3944b" },
+  "which-key.nvim": { "branch": "main", "commit": "0099511294f16b81c696004fa6a403b0ae61f7a0" }
 }
--- a/nvim/.config/nvim/lsp/clangd.lua
+++ b/nvim/.config/nvim/lsp/clangd.lua
@@ -1,13 +0,0 @@
-return {
-    cmd = {
-        'clangd'
-    },
-    root_markers = {
-        '.clangd',
-        'compile_commands.json'
-    },
-    filetypes = {
-        'c',
-        'cpp'
-    }
-}
--- a/nvim/.config/nvim/lsp/dockerls.lua
+++ b/nvim/.config/nvim/lsp/dockerls.lua
@@ -1,9 +0,0 @@
-return {
-    cmd = { 'docker-langserver', '--stdio' },
-    filetypes = {
-        'dockerfile'
-    },
-    root_markers = {
-        'Dockerfile',
-    },
-}
--- a/nvim/.config/nvim/lsp/luals.lua
+++ b/nvim/.config/nvim/lsp/luals.lua
@@ -1,20 +0,0 @@
-return {
-    cmd = {
-        'lua-language-server'
-    },
-    filetypes = {
-        'lua'
-    },
-    root_markers = {
-        '.luarc.json',
-        '.luarc.jsonc',
-        '.git'
-    },
-    settings = {
-        Lua = {
-            runtime = {
-                version = 'LuaJIT'
-            }
-        }
-    }
-}
--- a/nvim/.config/nvim/lsp/mdformat-myst.lua
+++ b/nvim/.config/nvim/lsp/mdformat-myst.lua
--- a/nvim/.config/nvim/lsp/neocmakelsp.lua
+++ b/nvim/.config/nvim/lsp/neocmakelsp.lua
@@ -1,5 +0,0 @@
-return {
-    cmd = { "neocmakelsp", "--stdio" },
-    filetypes = { "cmake" },
-    root_markers = { ".git", "README.md" }
-}
--- a/nvim/.config/nvim/lsp/pyright.lua
+++ b/nvim/.config/nvim/lsp/pyright.lua
@@ -1,20 +0,0 @@
-return {
-    cmd = {
-        'pyright-langserver', '--stdio'
-    },
-    settings = {
-        python = {
-            analysis = {
-                typeCheckingMode = "basic", -- or "strict", "off"
-                autoSearchPaths = true,
-                useLibraryCodeForTypes = true,
-            },
-        },
-    },
-    root_markers = {
-        'pyproject.toml', 'setup.py', 'setup.cfg', 'requirements.txt', '.git'
-    },
-    filetypes = {
-        'python'
-    },
-}
--- a/nvim/.config/nvim/lsp/ruff.lua
+++ b/nvim/.config/nvim/lsp/ruff.lua
@@ -1,11 +0,0 @@
-return {
-    cmd = {
-        'ruff', 'server'
-    },
-    filetypes = {
-        'python'
-    },
-    root_markers = {
-        'setup.py', 'setup.cfg', 'requirements.txt', '.git', 'ruff.toml'
-    }
-}
--- a/nvim/.config/nvim/lsp/rust-analyzer.lua
+++ b/nvim/.config/nvim/lsp/rust-analyzer.lua
@@ -1,19 +0,0 @@
-return {
-    cmd = { 'rust-analyzer' },
-    filetypes = { 'rust' },
-    root_markers = { "Cargo.toml", ".git" },
-    -- single_file_support = true,
-    -- settings = {
-    --     ['rust-analyzer'] = {
-    --         diagnostics = {
-    --             enable = false,
-    --         }
-    --     }
-    -- },
-    before_init = function(init_params, config)
-        -- See https://github.com/rust-lang/rust-analyzer/blob/eb5da56d839ae0a9e9f50774fa3eb78eb0964550/docs/dev/lsp-extensions.md?plain=1#L26
-        if config.settings and config.settings['rust-analyzer'] then
-            init_params.initializationOptions = config.settings['rust-analyzer']
-        end
-    end,
-}
--- a/nvim/.config/nvim/lsp/texlab.lua
+++ b/nvim/.config/nvim/lsp/texlab.lua
@@ -1,27 +0,0 @@
-return {
-    cmd = { 'texlab' },
-    filetypes = { 'tex' },
-    root_markers = { '.git', '.latexmkrc' },
-    settings = {
-        texlab = {
-            rootDirectory = nil,
-            build = {
-                executable = 'latexmk',
-                args = { '-pdf', '-interaction=nonstopmode', '-synctex=1', '%f' },
-                onSave = false,
-                forwardSearchAfter = false,
-            },
-            forwardSearch = {
-                executable = nil,
-                args = {},
-            },
-            chktex = {
-                onOpenAndSave = false,
-                onEdit = false,
-            },
-            diagnosticsDelay = 300,
-            latexFormatter = 'tex-fmt',
-            bibtexFormatter = 'tex-fmt',
-        },
-    },
-}
--- a/nvim/.config/nvim/lua/disabled_plugins/avante.lua
+++ b/nvim/.config/nvim/lua/disabled_plugins/avante.lua
@@ -1,19 +0,0 @@
-return {
-    "yetone/avante.nvim",
-    event = "VeryLazy",
-    lazy = false,
-    version = false, -- set this if you want to always pull the latest change
-    opts = {
-        provider = "copilot"
-    },
-    build = "make",
-    dependencies = {
-        "stevearc/dressing.nvim",
-        "nvim-lua/plenary.nvim",
-        "MunifTanjim/nui.nvim",
-        --- The below dependencies are optional,
-        "hrsh7th/nvim-cmp", -- autocompletion for avante commands and mentions
-        "nvim-tree/nvim-web-devicons", -- or echasnovski/mini.icons
-        "zbirenbaum/copilot.lua" -- for providers='copilot'
-    }
-}
--- a/nvim/.config/nvim/lua/disabled_plugins/barbecue.lua
+++ b/nvim/.config/nvim/lua/disabled_plugins/barbecue.lua
@@ -0,0 +1,11 @@
+return {
+    {
+        "utilyre/barbecue.nvim",
+        name = "barbecue",
+        version = "*",
+        dependencies = {"SmiteshP/nvim-navic", "nvim-tree/nvim-web-devicons"},
+        config = function()
+            require("barbecue").setup()
+        end,
+    }
+}
--- a/nvim/.config/nvim/lua/disabled_plugins/jupytext.lua
+++ b/nvim/.config/nvim/lua/disabled_plugins/jupytext.lua
@@ -0,0 +1,6 @@
+return {
+    {
+        "GCBallesteros/jupytext.nvim",
+        config = true
+    }
+}
--- a/nvim/.config/nvim/lua/disabled_plugins/killersheep.lua
+++ b/nvim/.config/nvim/lua/disabled_plugins/killersheep.lua
@@ -0,0 +1,15 @@
+return {
+    {
+        "seandewar/killersheep.nvim",
+        config = function()
+            require("killersheep").setup {
+                gore = true, -- Enables/disables blood and gore.
+                keymaps = {
+                    move_left = "h", -- Keymap to move cannon to the left.
+                    move_right = "l", -- Keymap to move cannon to the right.
+                    shoot = "<Space>" -- Keymap to shoot the cannon.
+                }
+            }
+        end
+    }
+}
--- a/nvim/.config/nvim/lua/lsp.lua
+++ b/nvim/.config/nvim/lua/lsp.lua
@@ -1,90 +0,0 @@
-- Set up LSP
-
-local lsp_configs = {}
-
-for _, f in pairs(vim.api.nvim_get_runtime_file('lsp/*.lua', true)) do
-    local server_name = vim.fn.fnamemodify(f, ':t:r')
-    table.insert(lsp_configs, server_name)
-end
-
-vim.lsp.enable(lsp_configs)
-
-
-vim.o.completeopt = "menu,menuone,noinsert"
-vim.api.nvim_set_keymap("i", "<C-Space>", "<C-x><C-o>", { noremap = true })
-
-
-- TODO: Put this somewhere sensible
-vim.api.nvim_create_autocmd('LspAttach', {
-    group = vim.api.nvim_create_augroup('my.lsp', {}),
-    callback = function(args)
-        local client = assert(vim.lsp.get_client_by_id(args.data.client_id))
-
-        -- Make Tab accept the selected completion
-        vim.keymap.set('i', '<Tab>', function()
-            if vim.fn.pumvisible() == 1 then
-                return '<C-y>'
-            else
-                return '<Tab>'
-            end
-        end, { expr = true })
-
-        -- Make Enter just insert a newline (don't accept completion)
-        vim.keymap.set('i', '<CR>', function()
-            if vim.fn.pumvisible() == 1 then
-                return '<C-e><CR>'
-            else
-                return '<CR>'
-            end
-        end, { expr = true })
-
-        -- Enable auto-completion. Note: Use CTRL-Y to select an item. |complete_CTRL-Y|
-        if client:supports_method('textDocument/completion') then
-            -- Trigger autocompletion on EVERY keypress. May be slow!
-            local chars = {}; for i = 32, 126 do table.insert(chars, string.char(i)) end
-            client.server_capabilities.completionProvider.triggerCharacters = chars
-
-            vim.lsp.completion.enable(true, client.id, args.buf, { autotrigger = true })
-        end
-
-        vim.keymap.set('n', '<M-L>',
-            function() vim.lsp.buf.format() end,
-            {
-                desc = "Format",
-                noremap = true,
-                silent = true
-            })
-        vim.keymap.set('i', '<M-L>',
-            function() vim.lsp.buf.format() end,
-            {
-                desc = "Format",
-                noremap = true,
-                silent = true
-            })
-
-        vim.keymap.set("n", "gd", function() vim.lsp.buf.definition() end, {
-            desc = "Go to definition"
-        })
-
-        vim.keymap.set("n", "grr", ":Trouble lsp_references<CR>", {
-            desc = "Show references"
-        })
-
-        -- if client:supports_method('textDocument/implementation') then
-        --     -- Create a keymap for vim.lsp.buf.implementation ...
-        -- end
-
-        -- -- Auto-format ("lint") on save.
-        -- -- Usually not needed if server supports "textDocument/willSaveWaitUntil".
-        -- if not client:supports_method('textDocument/willSaveWaitUntil')
-        --     and client:supports_method('textDocument/formatting') then
-        --     vim.api.nvim_create_autocmd('BufWritePre', {
-        --         group = vim.api.nvim_create_augroup('my.lsp', { clear = false }),
-        --         buffer = args.buf,
-        --         callback = function()
-        --             vim.lsp.buf.format({ bufnr = args.buf, id = client.id, timeout_ms = 1000 })
-        --         end,
-        --     })
-        -- end
-    end,
-})
--- a/nvim/.config/nvim/lua/overseer/template/user/cargo_test.lua
+++ b/nvim/.config/nvim/lua/overseer/template/user/cargo_test.lua
@@ -1,5 +1,5 @@
 return {
-    name = "Cargo Test",
+    name = "Cargog Test",
    builder = function()
        return {
            cmd = {
--- a/nvim/.config/nvim/lua/overseer/template/user/cmake_generate.lua
+++ b/nvim/.config/nvim/lua/overseer/template/user/cmake_generate.lua
@@ -9,7 +9,7 @@ return {
                "RelWithDebInfo",
                "MinSizeRel"
            },
-            default = "Release"
+            default = "Debug"
        },
        generator = {
            type = "enum",
--- a/nvim/.config/nvim/lua/plugins/auto_session.lua
+++ b/nvim/.config/nvim/lua/plugins/auto_session.lua
@@ -1,7 +1,6 @@
 return {
    {
        "rmagatti/auto-session",
-        lazy = false,
        dependencies = {
            "nvim-lualine/lualine.nvim"
        },
--- a/nvim/.config/nvim/lua/plugins/copilot.lua
+++ b/nvim/.config/nvim/lua/plugins/copilot.lua
@@ -0,0 +1,20 @@
+return {
+    {
+        "github/copilot.vim",
+        event = {
+            "BufReadPost",
+            "BufNewFile"
+        },
+        cmd = {
+            "Copilot"
+        },
+        init = function()
+            vim.g.copilot_no_tab_map = true
+            vim.g.copilot_assume_mapped = true
+            vim.api.nvim_set_keymap("i", "<C-y>", 'copilot#Accept("<CR>")', {
+                silent = true,
+                expr = true
+            })
+        end
+    }
+}
--- a/nvim/.config/nvim/lua/plugins/csvview.lua
+++ b/nvim/.config/nvim/lua/plugins/csvview.lua
@@ -1,26 +0,0 @@
-return {
-    "hat0uma/csvview.nvim",
-    ---@module "csvview"
-    ---@type CsvView.Options
-    opts = {
-        parser = { comments = { "#", "//" } },
-        keymaps = {
-            -- Text objects for selecting fields
-            textobject_field_inner = { "if", mode = { "o", "x" } },
-            textobject_field_outer = { "af", mode = { "o", "x" } },
-            -- Excel-like navigation:
-            -- Use <Tab> and <S-Tab> to move horizontally between fields.
-            -- Use <Enter> and <S-Enter> to move vertically between rows and place the cursor at the end of the field.
-            -- Note: In terminals, you may need to enable CSI-u mode to use <S-Tab> and <S-Enter>.
-            jump_next_field_end = { "<Tab>", mode = { "n", "v" } },
-            jump_prev_field_end = { "<S-Tab>", mode = { "n", "v" } },
-            jump_next_row = { "<Enter>", mode = { "n", "v" } },
-            jump_prev_row = { "<S-Enter>", mode = { "n", "v" } },
-        },
-    },
-    cmd = { "CsvViewEnable", "CsvViewDisable", "CsvViewToggle" },
-    init = function()
-        vim.keymap.set("n", "<leader>ce", ":CsvViewEnable display_mode=border header_lnum=1<CR>")
-        vim.keymap.set("n", "<leader>cd", ":CsvViewDisable<CR>")
-    end
-}
--- a/nvim/.config/nvim/lua/plugins/lsp.lua
+++ b/nvim/.config/nvim/lua/plugins/lsp.lua
@@ -0,0 +1,189 @@
+return {
+    {
+        {
+            'VonHeikemen/lsp-zero.nvim',
+            branch = 'v3.x',
+            lazy = true,
+            config = false,
+            init = function()
+                -- Disable automatic setup, we are doing it manually
+                vim.g.lsp_zero_extend_cmp = 0
+                vim.g.lsp_zero_extend_lspconfig = 0
+            end
+        },
+        {
+            'williamboman/mason.nvim',
+            lazy = false,
+            config = true
+        },
+
+        -- Autocompletion
+        {
+            'hrsh7th/nvim-cmp',
+            event = 'InsertEnter',
+            dependencies = {
+                'L3MON4D3/LuaSnip',
+                'hrsh7th/cmp-buffer',
+                'hrsh7th/cmp-path',
+                'hrsh7th/cmp-cmdline',
+                'hrsh7th/cmp-nvim-lsp-signature-help',
+                'saadparwaiz1/cmp_luasnip'
+            },
+            config = function()
+                local lsp_zero = require('lsp-zero')
+                lsp_zero.extend_cmp()
+
+                local cmp = require('cmp')
+
+                cmp.setup({
+                    sources = {
+                        -- LuaFormatter off
+                        { name = 'path' },
+                        { name = 'nvim_lsp' },
+                        { name = 'nvim_lua' },
+                        { name = 'luasnip', keyword_length = 2 },
+                        { name = 'buffer', keyword_length = 3 },
+                        { name = 'nvim_lsp_signature_help' }
+                        -- LuaFormatter on
+                    },
+                    formatting = lsp_zero.cmp_format(),
+                    mapping = cmp.mapping.preset.insert({
+                        ['<C-p>'] = cmp.mapping.select_prev_item(cmp_select),
+                        ['<C-n>'] = cmp.mapping.select_next_item(cmp_select),
+                        ['<Tab>'] = cmp.mapping.confirm({
+                            select = true
+                        }),
+                        ['<C-Space>'] = cmp.mapping.complete()
+                    }),
+                    snippet = {
+                        expand = function(args) require('luasnip').lsp_expand(args.body) end
+                    }
+                })
+
+                cmp.setup.filetype('gitcommit', {
+                    -- LuaFormatter off
+                    sources = cmp.config.sources(
+                        { { name = 'git' } },
+                        { { name = 'buffer' } }
+                    )
+                    -- LuaFormatter on
+                })
+
+                cmp.setup.cmdline({
+                    '/',
+                    '?'
+                }, {
+                    mapping = cmp.mapping.preset.cmdline(),
+                    sources = {
+                        {
+                            name = 'buffer'
+                        }
+                    }
+                })
+
+                cmp.setup.cmdline(':', {
+                    mapping = cmp.mapping.preset.cmdline(),
+                    sources = cmp.config.sources({
+                        {
+                            name = 'path'
+                        }
+                    }, {
+                        {
+                            name = 'cmdline'
+                        }
+                    })
+                })
+            end
+        },
+
+        -- LSP
+        {
+            'neovim/nvim-lspconfig',
+            cmd = {
+                'LspInfo',
+                'LspInstall',
+                'LspStart'
+            },
+            event = {
+                'BufReadPre',
+                'BufNewFile'
+            },
+            dependencies = {
+                'hrsh7th/cmp-nvim-lsp',
+                'williamboman/mason-lspconfig.nvim',
+                "folke/trouble.nvim"
+            },
+            config = function()
+                local lsp_zero = require('lsp-zero')
+                lsp_zero.extend_lspconfig()
+
+                lsp_zero.on_attach(function(client, bufnr)
+                    vim.keymap.set("n", "<leader>ld", function() vim.lsp.buf.definition() end, {
+                        desc = "Go to definition"
+                    })
+                    vim.keymap.set("n", "<leader>lh", function() vim.lsp.buf.hover() end, {
+                        desc = "Hover"
+                    })
+                    vim.keymap.set("n", "<leader>lr", ":Trouble lsp_references<CR>", {
+                        desc = "Show references"
+                    })
+                    vim.keymap.set("n", "<leader>ln", function() vim.lsp.buf.rename() end, {
+                        desc = "Rename"
+                    })
+                    vim.keymap.set("n", "<leader>ls", function() vim.lsp.buf.signature_help() end, {
+                        desc = "Signature help"
+                    })
+                    vim.keymap.set("n", "<leader>la", function() vim.lsp.buf.code_action() end, {
+                        desc = "Code actions"
+                    })
+                    vim.keymap.set("n", "<leader>la", function() vim.lsp.buf.code_action() end, {
+                        desc = "Code actions"
+                    })
+                end)
+
+                require('mason-lspconfig').setup({
+                    ensure_installed = {
+                        -- 'clangd',
+                        'pyright',
+                        'cmake',
+                        'texlab'
+                    },
+                    handlers = {
+                        lsp_zero.default_setup,
+                        lua_ls = function()
+                            local lua_opts = lsp_zero.nvim_lua_ls()
+                            require('lspconfig').lua_ls.setup(lua_opts)
+                        end
+                    }
+                })
+
+                require('lspconfig')['clangd'].setup {
+                    cmd = {
+                        "clangd",
+                        "--background-index",
+                        "--clang-tidy",
+                        "--completion-style=bundled",
+                        "--cross-file-rename",
+                        "--header-insertion=iwyu",
+                        -- Required for embedded system compilers
+                        "--query-driver=/**/*g++",
+                        "--offset-encoding=utf-16"
+                        -- "-j=8",
+                        -- "--malloc-trim",
+                        -- "--pch-storage=memory"
+                    }
+                }
+
+                require('lspconfig').matlab_ls.setup({
+                    settings = {
+                        filetypes = {"matlab"},
+                        matlab = {
+                            installPath = "/opt/matlab/R2023a/"
+                        },
+                    },
+                    single_file_support = true
+                })
+            end
+        }
+    }
+}
--- a/nvim/.config/nvim/lua/plugins/lua_copilot.lua
+++ b/nvim/.config/nvim/lua/plugins/lua_copilot.lua
@@ -1,19 +0,0 @@
-return {
-    "zbirenbaum/copilot.lua",
-    cmd = "Copilot",
-    -- event = "InsertEnter",
-    opts = {
-        suggestion = {
-            enabled = true,
-            auto_trigger = true,
-            keymap = {
-                accept = "<C-l>"
-                -- accept_word = false,
-                -- accept_line = false,
-                -- next = "<M-]>",
-                -- prev = "<M-[>",
-                -- dismiss = "<C-]>"
-            }
-        }
-    }
-}
--- a/nvim/.config/nvim/lua/plugins/lualine.lua
+++ b/nvim/.config/nvim/lua/plugins/lualine.lua
@@ -15,17 +15,6 @@ return {
                'mason',
                'lazy',
                'toggleterm'
-            },
-            sections = {
-                lualine_x = {
-                    {
-                        require("noice").api.statusline.mode.get,
-                        cond = require("noice").api.statusline.mode.has,
-                        color = {
-                            fg = "#ff9e64"
-                        }
-                    }
-                }
            }
        }
    }
--- a/nvim/.config/nvim/lua/plugins/markdown_preview.lua
+++ b/nvim/.config/nvim/lua/plugins/markdown_preview.lua
@@ -1,5 +1,5 @@
 return {
-    -- Install markdown preview, use npx if available.
+    {
        "iamcco/markdown-preview.nvim",
        cmd = {
            "MarkdownPreviewToggle",
@@ -9,19 +9,7 @@ return {
        ft = {
            "markdown"
        },
-    build = function(plugin)
-        if vim.fn.executable "npx" then
-            vim.cmd("!cd " .. plugin.dir .. " && cd app && npx --yes yarn install")
-        else
-            vim.cmd [[Lazy load markdown-preview.nvim]]
-            vim.fn["mkdp#util#install"]()
-        end
-    end,
-    init = function()
-        if vim.fn.executable "npx" then
-            vim.g.mkdp_filetypes = {
-                "markdown"
+        build = function() vim.fn["mkdp#util#install"]() end
    }
-        end
-    end
+
 }
--- a/nvim/.config/nvim/lua/plugins/markdown_toc.lua
+++ b/nvim/.config/nvim/lua/plugins/markdown_toc.lua
@@ -1,7 +0,0 @@
-return {
-    "hedyhli/markdown-toc.nvim",
-    cmd = {
-        "Mtoc"
-    }, -- Or, lazy load on "Mtoc" command
-    opts = {}
-}
--- a/nvim/.config/nvim/lua/plugins/mason.lua
+++ b/nvim/.config/nvim/lua/plugins/mason.lua
@@ -1,10 +0,0 @@
-return {
-    'williamboman/mason.nvim',
-    lazy = false,
-    opts = {
-        registries = {
-            "github:antsouchlos/mason-registry",
-            "github:mason-org/mason-registry"
-        }
-    }
-}
--- a/nvim/.config/nvim/lua/plugins/molten.lua
+++ b/nvim/.config/nvim/lua/plugins/molten.lua
@@ -1,86 +1,29 @@
 return {
-    { -- Ability to show images in the output
-        "3rd/image.nvim",
-        opts = {}
-    }, { -- Use LSP in markdown files
-        "quarto-dev/quarto-nvim",
-        dependencies = {"jmbuhr/otter.nvim", "nvim-treesitter/nvim-treesitter"},
-        ft = {"quarto", "markdown"},
-        init = function()
-            vim.api.nvim_create_autocmd('FileType', {
-                pattern = 'markdown',
-                callback = function()
-                    require("quarto").activate()
-                end
-            })
-
-            -- local runner = require("quarto.runner")
-            -- vim.keymap.set("n", "<localleader>rc", runner.run_cell, {
-            --     desc = "run cell",
-            --     silent = true
-            -- })
-            -- vim.keymap.set("n", "<localleader>ra", runner.run_above, {
-            --     desc = "run cell and above",
-            --     silent = true
-            -- })
-            -- vim.keymap.set("n", "<localleader>rA", runner.run_all, {
-            --     desc = "run all cells",
-            --     silent = true
-            -- })
-            -- vim.keymap.set("n", "<localleader>rl", runner.run_line, {
-            --     desc = "run line",
-            --     silent = true
-            -- })
-            -- vim.keymap.set("v", "<localleader>r", runner.run_range, {
-            --     desc = "run visual range",
-            --     silent = true
-            -- })
-            -- vim.keymap.set("n", "<localleader>RA", function() runner.run_all(true) end, {
-            --     desc = "run all cells of all languages",
-            --     silent = true
-            -- })
-        end,
-        opts = {
-            lspFeatures = {
-                languages = {"r", "python", "rust", "julia"},
-                chunks = "all",
-                diagnostics = {enabled = true, triggers = {"BufWritePost"}},
-                completion = {enabled = true}
-            },
-            keymap = {
-                hover = "H",
-                definition = "gd",
-                rename = "<leader>rn",
-                references = "gr",
-                format = "<leader>gf"
-            },
-            codeRunner = {enabled = true, default_method = "molten"}
-        }
-    }, { -- Convert ipynb to markdown and back
-        "GCBallesteros/jupytext.nvim",
-        opts = {
-            style = "markdown",
-            output_extension = "md",
-            force_ft = "markdown"
-        }
-    }, { -- Interactive code evaluation
+    {
        "benlubas/molten-nvim",
-        version = "^1.0.0", -- use version <2.0.0 to avoid breaking changes
        build = ":UpdateRemotePlugins",
+        version = "v1.7.0",
        init = function()
-            vim.keymap.set("n", "<localleader>mi", ":MoltenInit<CR>",
-                           {silent = true, desc = "Initialize the plugin"})
-            vim.keymap.set("n", "<localleader>e", ":MoltenEvaluateOperator<CR>",
-                           {silent = true, desc = "run operator selection"})
-            vim.keymap.set("n", "<localleader>rl", ":MoltenEvaluateLine<CR>",
-                           {silent = true, desc = "evaluate line"})
-            vim.keymap.set("n", "<localleader>rr", ":MoltenReevaluateCell<CR>",
-                           {silent = true, desc = "re-evaluate cell"})
-            vim.keymap.set("v", "<localleader>r",
-                           ":<C-u>MoltenEvaluateVisual<CR>gv",
-                           {silent = true, desc = "evaluate visual selection"})
-
-            vim.g.molten_image_provider = "image.nvim"
+            vim.keymap.set("n", "<localleader>mi", ":MoltenInit<CR>", {
+                silent = true,
+                desc = "Initialize the plugin"
+            })
+            vim.keymap.set("n", "<localleader>e", ":MoltenEvaluateOperator<CR>", {
+                silent = true,
+                desc = "run operator selection"
+            })
+            vim.keymap.set("n", "<localleader>rl", ":MoltenEvaluateLine<CR>", {
+                silent = true,
+                desc = "evaluate line"
+            })
+            vim.keymap.set("n", "<localleader>rr", ":MoltenReevaluateCell<CR>", {
+                silent = true,
+                desc = "re-evaluate cell"
+            })
+            vim.keymap.set("v", "<localleader>r", ":<C-u>MoltenEvaluateVisual<CR>gv", {
+                silent = true,
+                desc = "evaluate visual selection"
+            })

            vim.g.molten_auto_open_output = false
            vim.g.molten_virt_text_output = true
--- a/nvim/.config/nvim/lua/plugins/neoformat.lua
+++ b/nvim/.config/nvim/lua/plugins/neoformat.lua
@@ -0,0 +1,37 @@
+return {
+    {
+        'sbdchd/neoformat',
+        event = {
+            "BufReadPost",
+            "BufNewFile"
+        },
+        init = function()
+            vim.cmd([[
+                let g:neoformat_enabled_python = ['autopep8']
+                let g:neoformat_enabled_cpp = ['clangformat']
+                let g:neoformat_enabled_c = ['clangformat']
+                let g:neoformat_enable_lua = ['luaformatter']
+                let g:neoformat_enabled_cmake = ['cmakeformat']
+
+                let g:neoformat_markdown_mdformat = {
+                    \ 'exe': 'mdformat',
+                    \ 'args': ['--wrap=79'],
+                    \ 'replace': 1,
+                    \ }
+                let g:neoformat_enabled_markdown = ['mdformat']
+
+                let g:neoformat_enabled_latex = ['latexindent']
+                let g:latexindent_opt="-m -l -g=/dev/null"
+            ]])
+
+            vim.api.nvim_set_keymap('n', '<M-L>', '<cmd>Neoformat<cr>', {
+                noremap = true,
+                silent = true
+            })
+            vim.api.nvim_set_keymap('i', '<M-L>', '<cmd>Neoformat<cr>', {
+                noremap = true,
+                silent = true
+            })
+        end
+    }
+}
--- a/nvim/.config/nvim/lua/disabled_plugins/nvim_tree.lua
+++ b/nvim/.config/nvim/lua/disabled_plugins/nvim_tree.lua
--- a/nvim/.config/nvim/lua/plugins/oil.lua
+++ b/nvim/.config/nvim/lua/plugins/oil.lua
@@ -1,13 +0,0 @@
-return {
-    'stevearc/oil.nvim',
-    opts = {},
-    dependencies = {
-        "nvim-tree/nvim-web-devicons"
-    },
-    init = function()
-        vim.keymap.set("n", "-", "<CMD>Oil<CR>", {
-            desc = "Open parent directory"
-        })
-    end,
-    lazy = false
-}
--- a/nvim/.config/nvim/lua/plugins/pastify.lua
+++ b/nvim/.config/nvim/lua/plugins/pastify.lua
@@ -1,41 +0,0 @@
-return {
-    'TobinPalmer/pastify.nvim',
-    cmd = {
-        'Pastify',
-        'PastifyAfter'
-    },
-    -- event = {
-    --     'BufReadPost'
-    -- }, -- Load after the buffer is read, I like to be able to paste right away
-    keys = {
-        {
-            noremap = true,
-            mode = "x",
-            '<leader>v',
-            "<cmd>PastifyAfter<CR>"
-        },
-        {
-            noremap = true,
-            mode = "n",
-            '<leader>v',
-            "<cmd>PastifyAfter<CR>"
-        },
-        {
-            noremap = true,
-            mode = "n",
-            '<leader>V',
-            "<cmd>Pastify<CR>"
-        }
-    },
-    config = function()
-        require('pastify').setup {
-            opts = {
-                local_path = '/res/'
-            },
-            ft = {
-                markdown = "![image]($IMG$)"
-            }
-        }
-    end
-}
-
--- a/nvim/.config/nvim/lua/plugins/telescope.lua
+++ b/nvim/.config/nvim/lua/plugins/telescope.lua
@@ -30,38 +30,21 @@ return {
        version = '0.1.5',
        dependencies = {
            {
-                'nvim-lua/plenary.nvim',
-                'folke/trouble.nvim',
+                'nvim-lua/plenary.nvim'
            }
        },
        cmd = "Telescope",
        init = function()
-            -- Set up keymaps
-
-            vim.keymap.set('n', '<leader>ff', function() require("telescope.builtin").find_files() end,
-                { desc = "Files" })
-            vim.keymap.set('n', '<leader>fg', function() require("telescope.builtin").live_grep() end, { desc = "grep" })
+            -- LuaFormatter off
+            vim.keymap.set('n', '<leader>ff', function() require("telescope.builtin").find_files() end,{desc = "Files"})
+            vim.keymap.set('n', '<leader>fg', function() require("telescope.builtin").live_grep() end,{desc = "grep"})
            vim.keymap.set('n', '<leader>fa', function()
-                require("telescope.builtin").find_files({ hidden = true })
-            end, { desc = "All files" })
+                require("telescope.builtin").find_files({hidden = true})
+            end, {desc = "All files"})

-            vim.keymap.set('n', '<leader>fb', function() require("telescope.builtin").buffers() end, { desc = "Buffers" })
-            vim.keymap.set('n', '<leader>fh', function() require("telescope.builtin").help_tags() end,
-                { desc = "Help tags" })
-
-            -- Set up trouble
-
-            local open_with_trouble = require("trouble.sources.telescope").open
-            local telescope = require("telescope")
-
-            telescope.setup({
-                defaults = {
-                    mappings = {
-                        i = { ["<c-t>"] = open_with_trouble },
-                        n = { ["<c-t>"] = open_with_trouble },
-                    },
-                },
-            })
+            vim.keymap.set('n', '<leader>fb', function() require("telescope.builtin").buffers() end, {desc = "Buffers"})
+            vim.keymap.set('n', '<leader>fh', function() require("telescope.builtin").help_tags() end, {desc = "Help tags"})
+            -- LuaFormatter on
        end
    }
 }
--- a/nvim/.config/nvim/lua/plugins/time_tracker.lua
+++ b/nvim/.config/nvim/lua/plugins/time_tracker.lua
@@ -1,10 +0,0 @@
-return {
-    "3rd/time-tracker.nvim",
-    dependencies = {
-        "3rd/sqlite.nvim"
-    },
-    event = "VeryLazy",
-    opts = {
-        data_file = vim.fn.stdpath("data") .. "/time-tracker.db"
-    }
-}
--- a/nvim/.config/nvim/lua/plugins/trouble.lua
+++ b/nvim/.config/nvim/lua/plugins/trouble.lua
@@ -13,15 +13,7 @@ return {
                'nvim-telescope/telescope.nvim'
            }
        },
-        opts = {
-            modes = {
-                symbols = {
-                    win = {
-                        size = 50,
-                    }
-                }
-            }
-        },
+        opts = {},
        cmd = "Trouble",
        keys = {
          {
@@ -39,11 +31,6 @@ return {
            "<cmd>Trouble symbols toggle focus=false<cr>",
            desc = "Symbols (Trouble)",
          },
-          {
-            "<leader>xt",
-            "<cmd>Trouble todo toggle focus=true<cr>",
-            desc = "Symbols (Trouble)",
-          },
          -- {
          --   "<leader>cl",
          --   "<cmd>Trouble lsp toggle focus=false win.position=right<cr>",
--- a/nvim/.config/nvim/lua/plugins/vimtex.lua
+++ b/nvim/.config/nvim/lua/plugins/vimtex.lua
@@ -21,7 +21,7 @@ return {
                }
            }

-            vim.g.vimtex_view_method = 'zathura'
+            vim.g.vimtex_view_general_viewer = 'sioyek'
            vim.g.vimtex_quickfix_mode = 0

            -- Concealment
--- a/nvim/.config/nvim/lua/plugins/whichkey.lua
+++ b/nvim/.config/nvim/lua/plugins/whichkey.lua
@@ -15,30 +15,26 @@ return {
        },
        config = function()
            local wk = require("which-key")
-            wk.add({
-                {
-                    "<leader>d",
-                    group = "Debug"
+            wk.register({
+                ["<leader>"] = {
+                    l = {
+                        name = "+LSP"
                    },
-                {
-                    "<leader>f",
-                    group = "Find"
+                    x = {
+                        name = "+Trouble"
                    },
-                {
-                    "<leader>l",
-                    group = "LSP"
+                    o = {
+                        name = "+Overseer"
                    },
-                {
-                    "<leader>o",
-                    group = "Overseer"
+                    d = {
+                        name = "+Debug"
                    },
-                {
-                    "<leader>s",
-                    group = "Session"
+                    f = {
+                        name = "+Find"
+                    },
+                    s = {
+                        name = "+Session"
                    },
-                {
-                    "<leader>x",
-                    group = "Trouble"
                }
            })
        end
--- a/nvim/.config/nvim/lua/remap.lua
+++ b/nvim/.config/nvim/lua/remap.lua
@@ -9,6 +9,7 @@ vim.keymap.set("n", "n", "nzzzv")
 vim.keymap.set("n", "N", "Nzzzv")

 vim.keymap.set("x", "<leader>p", "\"_dP")
+vim.keymap.set("n", "<leader>d", "\"_d")
 vim.keymap.set("v", "<leader>d", "\"_d")

 vim.keymap.set("n", "<leader>y", "\"+y")
@@ -19,6 +20,4 @@ vim.keymap.set("n", "Q", "<nop>")
 vim.keymap.set("n", "q:", "<nop>")
 vim.cmd [[call nvim_create_user_command('W', 'w', {'nargs': 0})]]

-vim.keymap.set("n", "QQ", ":q!<CR>")
-
 -- vim.keymap.set("n", "<leader>cb", [[:up | %bd | e#<CR>]])
--- a/nvim/.config/nvim/lua/set.lua
+++ b/nvim/.config/nvim/lua/set.lua
@@ -27,15 +27,10 @@ vim.opt.signcolumn = "yes"

 vim.opt.updatetime = 50

-vim.api.nvim_create_autocmd('FileType', {
-    pattern = 'cpp',
-    callback = function() vim.bo.commentstring = '// %s' end
-})
-
 vim.api.nvim_create_autocmd('FileType', {
 	pattern = 'rust',
-    callback = function()
-        vim.cmd [[
+	callback = function ()
+        vim.cmd[[
 let &efm = ''
 " Random non issue stuff
 let &efm .= '%-G%.%#aborting due to previous error%.%#,'
@@ -58,7 +53,5 @@ let &efm .= '%Eerror%m,'
 let &efm .= '%Wwarning: %m,'
 let &efm .= '%-Z%*\s--> %f:%l:%c,'
        ]]
-    end
+	end,
 })
-
-vim.opt.exrc = true
--- a/nvim/.config/nvim/snippets/tex/general.lua
+++ b/nvim/.config/nvim/snippets/tex/general.lua
@@ -13,7 +13,7 @@ local d = ls.dynamic_node
 local fmt = require("luasnip.extras.fmt").fmt
 local fmta = require("luasnip.extras.fmt").fmta
 local rep = require("luasnip.extras").rep
-local conds = require("luasnip.extras.expand_conditions")
+local line_begin = require("luasnip.extras.expand_conditions").line_begin

 ---------------
 -- Environments
@@ -90,7 +90,7 @@ s({trig="notes"},
    )
 ),

-s({trig="beg", wordTrig=true, snippetType="autosnippet", condition=conds.line_begin},
+s({trig="beg"},
  fmta(
    [[
      \begin{<>}
@@ -105,46 +105,6 @@ s({trig="beg", wordTrig=true, snippetType="autosnippet", condition=conds.line_be
  )
 ),

-s({trig="item", wordTrig=true, snippetType="autosnippet",
-condition = function(line_to_cursor, matched_trigger, captures)
-    return tex_utils.in_env("itemize") and conds.line_begin(line_to_cursor, matched_trigger, captures)
-end},
-  fmta(
-    [[
-      \item <>
-    ]],
-    {
-        i(0),
-    }
-  )
-),
-
-s({trig="item", wordTrig=true, snippetType="autosnippet", condition=conds.line_begin},
-  fmta(
-    [[
-      \begin{itemize}
-          \item <>
-      \end{itemize}
-    ]],
-    {
-        i(0),
-    }
-  )
-),
-
-s({trig="frame", wordTrig=true, snippetType="autosnippet", condition=conds.line_begin},
-  fmta(
-    [[
-      \begin{frame}
-          \frametitle{<>}
-      \end{frame}
-    ]],
-    {
-        i(0),
-    }
-  )
-),
-
 s({trig="sec"},
  fmta(
    [[
--- a/nvim/.config/nvim/snippets/tex/math.lua
+++ b/nvim/.config/nvim/snippets/tex/math.lua
@@ -13,7 +13,6 @@ local d = ls.dynamic_node
 local fmt = require("luasnip.extras.fmt").fmt
 local fmta = require("luasnip.extras.fmt").fmta
 local rep = require("luasnip.extras").rep
-local conds = require("luasnip.extras.expand_conditions")


 ---------------
@@ -57,7 +56,7 @@ end
 return {


-s({trig="ali", wordTrig=true, snippetType="autosnippet", condition=conds.line_begin},
+s({trig="ali", snippetType="autosnippet"},
  fmta(
    [[
      \begin{align*}
@@ -114,21 +113,6 @@ s({trig="matp"},
  {condition = tex_utils.in_mathzone}
 ),

-s({trig="([^%a])array", regTrig=true, wordTrig=false, snippetType="autosnippet"},
-  fmta(
-    [[
-      <>\begin{array}{c}
-          <>
-      \end{array}
-    ]],
-    {
-        f( function(_, snip) return snip.captures[1] end ),
-        i(0),
-    }
-  ),
-  {condition = tex_utils.in_mathzone}
-),
-
 s({trig='([^%a])int', regTrig=true, wordTrig=false, snippetType="autosnippet"},
  fmta(
    [[<>\int_{<>}^{<>} <> d<> ]],
@@ -244,13 +228,13 @@ s({trig="([^%a])tt", regTrig=true, wordTrig=false, snippetType="autosnippet"},
  {condition = tex_utils.in_mathzone}
 ),

-- s({trig=".", snippetType="autosnippet"},
--   fmta(
--     [[\cdot ]],
--     {}
--   ),
--   {condition = tex_utils.in_mathzone}
-- ),
+s({trig=".", snippetType="autosnippet"},
+  fmta(
+    [[\cdot ]],
+    {}
+  ),
+  {condition = tex_utils.in_mathzone}
+),

 s({trig="$$", snippetType="autosnippet"},
  fmta(
--- a/papis/.config/papis/config
+++ b/papis/.config/papis/config
@@ -1,9 +0,0 @@
-[books]
-dir = ~/Documents/literature/books
-
-[keyboard]
-dir = ~/Documents/literature/keyboard
-
-[settings]
-default-library = keyboard
-
--- a/sway/.config/sway/config
+++ b/sway/.config/sway/config
@@ -18,7 +18,8 @@ bindsym Control+Mod1+l exec $lock

 bindsym Print exec grim -g "$(slurp -d)" - | wl-copy

-bindsym $mod+p exec kitty -e /usr/bin/expect -c "spawn python; expect \\"*>>> \\"; send \\"import numpy as np\n\\"; send \\"import sympy as sp\n\\"; send \\"import torch\n\\"; interact"
+bindsym $mod+p exec kitty -e python
+
 bindsym $mod+Return exec $term
 bindsym $mod+Shift+q kill
 bindsym $mod+d exec $menu
@@ -26,7 +27,7 @@ bindsym $mod+d exec $menu
 floating_modifier $mod normal

 bindsym $mod+Shift+c reload
-bindsym $mod+Shift+e exec swaymsg exit
+bindsym $mod+Shift+e exec i3-msg exit

 bar {
    swaybar_command waybar
@@ -44,34 +45,24 @@ bindsym XF86AudioPause exec playerctl play-pause
 bindsym XF86AudioNext exec playerctl next
 bindsym XF86AudioPrev exec playerctl previous

-bindsym XF86MonBrightnessUp exec /bin/sh -c ~/.config/sway/scripts/increase_brightness
-bindsym XF86MonBrightnessDown exec /bin/sh -c ~/.config/sway/scripts/decrease_brightness
+bindsym XF86MonBrightnessUp exec brightnessctl set +5%
+bindsym XF86MonBrightnessDown exec brightnessctl set 5%-


 bindsym $mod+c exec kitty -e python

 for_window [title="blueman-manager"] floating enable

-for_window [class="^.*"] border pixel 0
+for_window [class="^.*"] border pixel 3
 default_floating_border none
 default_floating_border normal 0
 hide_edge_borders smart

-for_window [app_id="org.pwmt.zathura"] opacity 0.94
-for_window [app_id="kitty"] opacity 0.94
-
-exec_always --no-startup-id bash -c "killall flashfocus; flashfocus --flash-opacity 0.92 -l never"
-
-
 gaps inner 15
 smart_gaps on
-bindsym $mod+g exec swaymsg gaps inner current toggle 15
-
-# blur enable
-# blur_radius 1
-# blur_passes 4
-# blur_noise 0.1

+blur enable
+blur_radius 8

 exec dbus-update-activation-environment DISPLAY

--- a/sway/.config/sway/config.d/autostart.conf
+++ b/sway/.config/sway/config.d/autostart.conf
@@ -1,2 +1,2 @@
 exec_always nm-applet &
-#exec_always blueman-applet &
+exec_always blueman-applet &
--- a/sway/.config/sway/config.d/input.conf
+++ b/sway/.config/sway/config.d/input.conf
@@ -2,15 +2,13 @@ input "type:touchpad" {
    tap enabled
    natural_scroll enabled
    scroll_factor 0.4
-    dwt enable
+    dwt disable
    accel_profile "adaptive"
    pointer_accel 0
-    drag enabled
-    drag_lock disabled
 }

 input type:keyboard {
-    xkb_layout de(nodeadkeys),us,gr
+    xkb_layout de(nodeadkeys),gr,de(neo)
    xkb_options grp:ctrls_toggle,caps:escape
 }

--- a/sway/.config/sway/config.d/workspaces.conf
+++ b/sway/.config/sway/config.d/workspaces.conf
@@ -1,9 +1,9 @@
 set $ws1 "1: Dev"
 set $ws2 "2: Firefox"
 set $ws3 "3: Management"
-set $ws4 "4: Mehscellaneous"
+set $ws4 "4"
 set $ws5 "5: Doc"
-set $ws6 "6: 3D-Printing"
+set $ws6 "6"
 set $ws7 "7: Music"
 set $ws8 "8"
 set $ws9 "9"
@@ -33,27 +33,19 @@ bindsym $mod+Shift+0 move container to workspace number $ws10

 assign [class="Spotify"] $ws7

-exec swaymsg 'workspace $ws1; exec kitty; $ws1'
-exec swaymsg 'workspace $ws2; exec firefox'
+exec i3-msg 'workspace $ws1; exec kitty; $ws1'
+exec i3-msg 'workspace $ws2; exec firefox'

 #
 ## Multiple monitors
 #

-set $this_disp "eDP-1"
-set $other_disp "DP-3"
-# set $this_disp "eDP-1"
-# set $other_disp "DP-3"
-
-# output edP-1 mode 1920x1080@120Hz
-# output edP-1
-
-workspace $ws1 output $other_disp $this_disp
-workspace $ws2 output $this_disp
-workspace $ws3 output $this_disp
-workspace $ws4 output $other_disp $this_disp
-workspace $ws5 output $this_disp
-workspace $ws6 output $this_disp
-workspace $ws7 output $this_disp
-workspace $ws8 output $this_disp
+workspace $ws1 output DP-11 eDP-1
+workspace $ws2 output eDP-1 DP-11
+workspace $ws3 output eDP-1 DP-11
+workspace $ws4 output DP-11 eDP-1
+workspace $ws5 output eDP-1
+workspace $ws6 output eDP-1
+workspace $ws7 output eDP-1
+workspace $ws8 output eDP-1

--- a/sway/.config/sway/scripts/decrease_brightness
+++ b/sway/.config/sway/scripts/decrease_brightness
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-export BRIGHTNESS=`brightnessctl g`
-if [ $BRIGHTNESS -gt 0 ]; then
-    brightnessctl set 5%-
-else
-    killall gammastep &> /dev/null
-
-    export BRIGHTNESS=`cat /tmp/brightness 2> /dev/null || echo 1` 
-    if [ `echo "$BRIGHTNESS > 0.1" | bc -l` == 1 ]; then
-        export BRIGHTNESS=`echo "$BRIGHTNESS - 0.1" | bc`
-        echo $BRIGHTNESS > /tmp/brightness
-        gammastep -O 6500 -b $BRIGHTNESS:0.1 &
-    else
-        gammastep -O 6500 -b 0.1:0.1 &
-    fi
-fi
-
--- a/sway/.config/sway/scripts/increase_brightness
+++ b/sway/.config/sway/scripts/increase_brightness
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-export BRIGHTNESS=`brightnessctl g`
-if [ $BRIGHTNESS == 0 ]; then
-    killall gammastep &> /dev/null
-
-    export BRIGHTNESS=`cat /tmp/brightness 2> /dev/null || echo 1` 
-    if [ `echo "$BRIGHTNESS < 1.0" | bc -l` == 1 ]; then
-        export BRIGHTNESS=`echo "$BRIGHTNESS + 0.1" | bc`
-        echo $BRIGHTNESS > /tmp/brightness
-        gammastep -O 6500 -b $BRIGHTNESS:0.1 &
-    else
-        brightnessctl set 5%
-    fi
-else
-    brightnessctl set +5%
-fi
-
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -11,8 +11,6 @@ set -g status-right-length 90
 set -g status-justify centre
 set -s escape-time 0

-set -g allow-passthrough on
-
 ## COLORSCHEME: gruvbox dark (medium)
 set-option -g status "on"

--- a/waybar/.config/waybar/config
+++ b/waybar/.config/waybar/config
@@ -8,7 +8,7 @@
 	"modules-center": [
 		"clock#1",
 		"clock#2",
-		"custom/clock",
+		"clock#3",
 	],
 	"modules-right": [
 		"pulseaudio",
@@ -37,9 +37,8 @@
 		"format": "{:%d-%m-%Y}",
 		"tooltip": false
 	},
-	"custom/clock": {
-        "exec": "date +\"%H:%M\"",
-        "interval": 10,
+	"clock#3": {
+		"format": "{:%H:%M}",
 		"tooltip": false
 	},

--- a/zathura/.config/zathura/zathurarc
+++ b/zathura/.config/zathura/zathurarc
@@ -1,40 +0,0 @@
-set notification-error-bg       "rgba(29,32,33,1)"     # bg
-set notification-error-fg       "rgba(251,73,52,1)"    # bright:red
-set notification-warning-bg     "rgba(29,32,33,1)"     # bg
-set notification-warning-fg     "rgba(250,189,47,1)"   # bright:yellow
-set notification-bg             "rgba(29,32,33,1)"     # bg
-set notification-fg             "rgba(184,187,38,1)"   # bright:green
-
-set completion-bg               "rgba(80,73,69,1)"     # bg2
-set completion-fg               "rgba(235,219,178,1)"  # fg
-set completion-group-bg         "rgba(60,56,54,1)"     # bg1
-set completion-group-fg         "rgba(146,131,116,1)"  # gray
-set completion-highlight-bg     "rgba(131,165,152,1)"  # bright:blue
-set completion-highlight-fg     "rgba(80,73,69,1)"     # bg2
-
-# Define the color in index mode
-set index-bg                    "rgba(80,73,69,1)"     # bg2
-set index-fg                    "rgba(235,219,178,1)"  # fg
-set index-active-bg             "rgba(131,165,152,1)"  # bright:blue
-set index-active-fg             "rgba(80,73,69,1)"     # bg2
-
-set inputbar-bg                 "rgba(29,32,33,1)"     # bg
-set inputbar-fg                 "rgba(235,219,178,1)"  # fg
-
-set statusbar-bg                "rgba(80,73,69,1)"     # bg2
-set statusbar-fg                "rgba(235,219,178,1)"  # fg
-
-set highlight-color             "rgba(250,189,47,0.5)" # bright:yellow
-set highlight-active-color      "rgba(254,128,25,0.5)" # bright:orange
-
-set default-bg                  "rgba(29,32,33,1)"     # bg
-set default-fg                  "rgba(235,219,178,1)"  # fg
-set render-loading              true
-set render-loading-bg           "rgba(29,32,33,1)"     # bg
-set render-loading-fg           "rgba(235,219,178,1)"  # fg
-
-# Recolor book content's color
-set recolor-lightcolor          "rgba(29,32,33,1)"     # bg
-set recolor-darkcolor           "rgba(235,219,178,1)"  # fg
-set recolor                     "true"
-set recolor-keephue             "true"                 # keep original color
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -5,7 +5,6 @@ SAVEHIST=5000
 setopt hist_ignore_all_dups
 setopt extendedglob
 unsetopt beep
-setopt interactivecomments
 bindkey -v
 # End of lines configured by zsh-newuser-install
 # The following lines were added by compinstall
@@ -23,8 +22,7 @@ zstyle ':vcs_info:git:*' formats '%b '
 setopt PROMPT_SUBST
 PROMPT='%F{magenta}[%m] %F{blue}%~%f %F{red}${vcs_info_msg_0_}%f$ '

-source /usr/share/fzf/key-bindings.zsh
-source /usr/share/fzf/completion.zsh
+source /usr/share/doc/fzf/examples/key-bindings.zsh

 alias ssh='kitty +kitten ssh'

@@ -39,23 +37,23 @@ alias ....="cd ../../.."
 export PATH=$PATH:/home/andreas/.local/bin
 export EDITOR=nvim

-alias get-idf='. $HOME/ext-sw/esp-idf/export.sh'
+alias get-idf='. $HOME/ext_sw/esp-idf/export.sh'

-alias c='cd ~/.dotfiles'
-alias sc='cd ~/.config/sway && nvim'
-alias nc='cd ~/.config/nvim && nvim'
-alias flog='nvim -c "Flog -all"'
-alias bin='cd ~/.local/bin && nvim'
+alias c='z ~/.dotfiles'
+alias sc='z ~/.config/sway'
+alias nc='z ~/.config/nvim'
+alias ezc='nvim ~/.zshrc'

-export PATH=$PATH:"$HOME/.cargo/bin"
+alias ait='z ~/Documents/kit/AIT && clear'
+alias kit='z ~/Documents/kit && clear'
+alias eml='z ~/Documents/kit/EMLLAB/emllab-challenge && . venv/bin/activate && clear'

-eval "$(zoxide init zsh)"
-eval "$(thefuck --alias)"
+alias hyp='z ~/git/HyperLink_SW && clear'

-. "/usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh"
-
-bindkey '^l' autosuggest-accept
 # . "$HOME/.cargo/env"
-# export PYENV_ROOT="$HOME/.pyenv"
-# [[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH"
-# eval "$(pyenv init - zsh)"
+#
+# eval "$(zoxide init zsh)"
+# eval "$(thefuck --alias)"
+
+. "$HOME/.zsh/zsh-autosuggestions/zsh-autosuggestions.zsh"
+bindkey '^y' autosuggest-accept