From 2fcfba18d77c59dd1ffa74ded471a03f3883dd23 Mon Sep 17 00:00:00 2001
From: cnst <adamhilmersson@gmail.com>
Date: Mon, 25 Nov 2024 17:31:20 +0100
Subject: [PATCH] remove nixvim fix vscodium

---
 modules/default.nix                           |   2 +-
 modules/home/programs/nixvim/autocmd.nix      |  31 ----
 modules/home/programs/nixvim/completion.nix   | 150 ----------------
 modules/home/programs/nixvim/default.nix      |  58 -------
 modules/home/programs/nixvim/keymap.nix       |  94 ----------
 modules/home/programs/nixvim/options.nix      |  72 --------
 .../home/programs/nixvim/plugins/barbar.nix   |  23 ---
 modules/home/programs/nixvim/plugins/cmp.nix  | 163 ------------------
 .../home/programs/nixvim/plugins/comment.nix  |  23 ---
 .../home/programs/nixvim/plugins/conform.nix  |  44 -----
 .../home/programs/nixvim/plugins/copilot.nix  |  53 ------
 .../home/programs/nixvim/plugins/default.nix  |  25 ---
 modules/home/programs/nixvim/plugins/efm.nix  | 112 ------------
 .../home/programs/nixvim/plugins/floaterm.nix |  23 ---
 .../home/programs/nixvim/plugins/harpoon.nix  |  31 ----
 .../programs/nixvim/plugins/lightline.nix     |  51 ------
 .../programs/nixvim/plugins/lsp-format.nix    |  32 ----
 modules/home/programs/nixvim/plugins/lsp.nix  |  76 --------
 .../home/programs/nixvim/plugins/lualine.nix  |  69 --------
 .../nixvim/plugins/markdown-preview.nix       |  33 ----
 .../home/programs/nixvim/plugins/neo-tree.nix |  35 ----
 .../home/programs/nixvim/plugins/nonels.nix   |  60 -------
 .../programs/nixvim/plugins/rustaceanvim.nix  |  29 ----
 .../home/programs/nixvim/plugins/startify.nix |  36 ----
 .../home/programs/nixvim/plugins/tagbar.nix   |  30 ----
 .../programs/nixvim/plugins/telescope.nix     |  42 -----
 .../programs/nixvim/plugins/treesitter.nix    |  40 -----
 .../home/programs/nixvim/plugins/vimtex.nix   |  78 ---------
 .../home/programs/nixvim/plugins/yanky.nix    |  18 --
 modules/home/programs/nixvim/todo.nix         |  26 ---
 modules/home/programs/vscode/default.nix      |  17 --
 modules/home/programs/vscodium/default.nix    |  18 ++
 users/cnst/modules.nix                        |   4 +-
 users/toothpick/modules.nix                   |   2 +-
 34 files changed, 22 insertions(+), 1578 deletions(-)
 delete mode 100644 modules/home/programs/nixvim/autocmd.nix
 delete mode 100644 modules/home/programs/nixvim/completion.nix
 delete mode 100644 modules/home/programs/nixvim/default.nix
 delete mode 100644 modules/home/programs/nixvim/keymap.nix
 delete mode 100644 modules/home/programs/nixvim/options.nix
 delete mode 100644 modules/home/programs/nixvim/plugins/barbar.nix
 delete mode 100644 modules/home/programs/nixvim/plugins/cmp.nix
 delete mode 100644 modules/home/programs/nixvim/plugins/comment.nix
 delete mode 100644 modules/home/programs/nixvim/plugins/conform.nix
 delete mode 100644 modules/home/programs/nixvim/plugins/copilot.nix
 delete mode 100644 modules/home/programs/nixvim/plugins/default.nix
 delete mode 100644 modules/home/programs/nixvim/plugins/efm.nix
 delete mode 100644 modules/home/programs/nixvim/plugins/floaterm.nix
 delete mode 100644 modules/home/programs/nixvim/plugins/harpoon.nix
 delete mode 100644 modules/home/programs/nixvim/plugins/lightline.nix
 delete mode 100644 modules/home/programs/nixvim/plugins/lsp-format.nix
 delete mode 100644 modules/home/programs/nixvim/plugins/lsp.nix
 delete mode 100644 modules/home/programs/nixvim/plugins/lualine.nix
 delete mode 100644 modules/home/programs/nixvim/plugins/markdown-preview.nix
 delete mode 100644 modules/home/programs/nixvim/plugins/neo-tree.nix
 delete mode 100644 modules/home/programs/nixvim/plugins/nonels.nix
 delete mode 100644 modules/home/programs/nixvim/plugins/rustaceanvim.nix
 delete mode 100644 modules/home/programs/nixvim/plugins/startify.nix
 delete mode 100644 modules/home/programs/nixvim/plugins/tagbar.nix
 delete mode 100644 modules/home/programs/nixvim/plugins/telescope.nix
 delete mode 100644 modules/home/programs/nixvim/plugins/treesitter.nix
 delete mode 100644 modules/home/programs/nixvim/plugins/vimtex.nix
 delete mode 100644 modules/home/programs/nixvim/plugins/yanky.nix
 delete mode 100644 modules/home/programs/nixvim/todo.nix
 delete mode 100644 modules/home/programs/vscode/default.nix
 create mode 100644 modules/home/programs/vscodium/default.nix

diff --git a/modules/default.nix b/modules/default.nix
index a15dd733..97107103 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -23,7 +23,7 @@
         ./home/programs/rofi
         ./home/programs/ssh
         ./home/programs/tuirun
-        ./home/programs/vscode
+        ./home/programs/vscodium
         ./home/programs/waybar
         ./home/programs/wezterm
         ./home/programs/yazi
diff --git a/modules/home/programs/nixvim/autocmd.nix b/modules/home/programs/nixvim/autocmd.nix
deleted file mode 100644
index fff4046d..00000000
--- a/modules/home/programs/nixvim/autocmd.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  programs.nixvim.autoCmd = [
-    # Open help in a vertical split
-    {
-      event = "FileType";
-      pattern = "help";
-      command = "wincmd L";
-    }
-
-    # Enable spellcheck for some filetypes
-    {
-      event = "FileType";
-      pattern = [
-        "tex"
-        "latex"
-        "markdown"
-      ];
-      command = "setlocal spell spelllang=en,se";
-    }
-    {
-      event = "TextYankPost";
-      desc = "Highlight when yanking (copying) text";
-      # group = "vim.api.nvim_create_augroup('kickstart-highlight-yank', { clear = true })";
-      callback = {
-        __raw = "function()
-    vim.highlight.on_yank()
-  end";
-      };
-    }
-  ];
-}
diff --git a/modules/home/programs/nixvim/completion.nix b/modules/home/programs/nixvim/completion.nix
deleted file mode 100644
index ea677672..00000000
--- a/modules/home/programs/nixvim/completion.nix
+++ /dev/null
@@ -1,150 +0,0 @@
-{
-  programs.nixvim = {
-    plugins = {
-      luasnip.enable = true;
-      cmp-buffer = {enable = true;};
-      cmp-emoji = {enable = true;};
-      cmp-nvim-lsp = {enable = true;};
-      cmp-path = {enable = true;};
-      cmp_luasnip = {enable = true;};
-
-      cmp = {
-        enable = true;
-        settings = {
-          experimental = {ghost_text = true;};
-          snippet.expand = ''
-            function(args)
-              require('luasnip').lsp_expand(args.body)
-            end
-          '';
-          sources = [
-            {name = "nvim_lsp";}
-            {name = "luasnip";}
-            {
-              name = "buffer";
-              option.get_bufnrs.__raw = "vim.api.nvim_list_bufs";
-            }
-            {name = "nvim_lua";}
-            {name = "path";}
-            {name = "copilot";}
-          ];
-          formatting = {
-            fields = ["abbr" "kind" "menu"];
-            format =
-              # lua
-              ''
-                function(_, item)
-                  local icons = {
-                    Namespace = "󰌗",
-                    Text = "󰉿",
-                    Method = "󰆧",
-                    Function = "󰆧",
-                    Constructor = "",
-                    Field = "󰜢",
-                    Variable = "󰀫",
-                    Class = "󰠱",
-                    Interface = "",
-                    Module = "",
-                    Property = "󰜢",
-                    Unit = "󰑭",
-                    Value = "󰎠",
-                    Enum = "",
-                    Keyword = "󰌋",
-                    Snippet = "",
-                    Color = "󰏘",
-                    File = "󰈚",
-                    Reference = "󰈇",
-                    Folder = "󰉋",
-                    EnumMember = "",
-                    Constant = "󰏿",
-                    Struct = "󰙅",
-                    Event = "",
-                    Operator = "󰆕",
-                    TypeParameter = "󰊄",
-                    Table = "",
-                    Object = "󰅩",
-                    Tag = "",
-                    Array = "[]",
-                    Boolean = "",
-                    Number = "",
-                    Null = "󰟢",
-                    String = "󰉿",
-                    Calendar = "",
-                    Watch = "󰥔",
-                    Package = "",
-                    Copilot = "",
-                    Codeium = "",
-                    TabNine = "",
-                  }
-
-                  local icon = icons[item.kind] or ""
-                  item.kind = string.format("%s %s", icon, item.kind or "")
-                  return item
-                end
-              '';
-          };
-          window = {
-            completion = {
-              winhighlight = "FloatBorder:CmpBorder,Normal:CmpPmenu,CursorLine:CmpSel,Search:PmenuSel";
-              scrollbar = false;
-              sidePadding = 0;
-              border = ["╭" "─" "╮" "│" "╯" "─" "╰" "│"];
-            };
-            settings.documentation = {
-              border = ["╭" "─" "╮" "│" "╯" "─" "╰" "│"];
-              winhighlight = "FloatBorder:CmpBorder,Normal:CmpPmenu,CursorLine:CmpSel,Search:PmenuSel";
-            };
-          };
-          mapping = {
-            "<C-l>" = "cmp.mapping.select_prev_item()";
-            "<C-ä>" = "cmp.mapping.select_next_item()";
-            "<C-d>" = "cmp.mapping.scroll_docs(-4)";
-            "<C-f>" = "cmp.mapping.scroll_docs(4)";
-            "<C-Space>" = "cmp.mapping.complete()";
-            "<S-Tab>" = "cmp.mapping.close()";
-            "<Tab>" =
-              # lua
-              ''
-                function(fallback)
-                  local line = vim.api.nvim_get_current_line()
-                  if line:match("^%s*$") then
-                    fallback()
-                  elseif cmp.visible() then
-                    cmp.confirm({ behavior = cmp.ConfirmBehavior.Insert, select = true })
-                  else
-                    fallback()
-                  end
-                end
-              '';
-            "<Down>" =
-              # lua
-              ''
-                function(fallback)
-                  if cmp.visible() then
-                    cmp.select_next_item()
-                  elseif require("luasnip").expand_or_jumpable() then
-                    vim.fn.feedkeys(vim.api.nvim_replace_termcodes("<Plug>luasnip-expand-or-jump", true, true, true), "")
-                  else
-                    fallback()
-                  end
-                end
-              '';
-            "<Up>" =
-              # lua
-              ''
-                function(fallback)
-                  if cmp.visible() then
-                    cmp.select_prev_item()
-                  elseif require("luasnip").jumpable(-1) then
-                    vim.fn.feedkeys(vim.api.nvim_replace_termcodes("<Plug>luasnip-jump-prev", true, true, true), "")
-                  else
-                    fallback()
-                  end
-                end
-              '';
-          };
-        };
-      };
-    };
-  };
-}
diff --git a/modules/home/programs/nixvim/default.nix b/modules/home/programs/nixvim/default.nix
deleted file mode 100644
index 09415bd9..00000000
--- a/modules/home/programs/nixvim/default.nix
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  config,
-  lib,
-  inputs,
-  pkgs,
-  ...
-}: let
-  inherit (lib) mkIf mkEnableOption;
-  cfg = config.home.programs.nixvim;
-in {
-  imports = [
-    inputs.nixvim.homeManagerModules.nixvim
-    ./plugins
-    ./autocmd.nix
-    ./keymap.nix
-    ./options.nix
-    ./todo.nix
-  ];
-
-  options = {
-    home.programs.nixvim.enable = mkEnableOption "Enable nixvim";
-  };
-
-  config = mkIf cfg.enable {
-    programs.nixvim = {
-      extraPlugins = with pkgs.vimPlugins; [gruvbox-material-nvim nvim-web-devicons];
-      colorscheme = "gruvbox-material";
-      enable = true;
-      defaultEditor = true;
-      viAlias = true;
-      vimAlias = true;
-      luaLoader.enable = true;
-      plugins = {
-        gitsigns.enable = true;
-        statuscol.enable = true;
-        nvim-autopairs.enable = true;
-        nvim-colorizer = {
-          enable = true;
-          userDefaultOptions.names = false;
-        };
-        oil.enable = true;
-        trim = {
-          enable = true;
-          settings = {
-            highlight = false;
-            ft_blocklist = [
-              "checkhealth"
-              "floaterm"
-              "lspinfo"
-              "neo-tree"
-              "TelescopePrompt"
-            ];
-          };
-        };
-      };
-    };
-  };
-}
diff --git a/modules/home/programs/nixvim/keymap.nix b/modules/home/programs/nixvim/keymap.nix
deleted file mode 100644
index b96b321b..00000000
--- a/modules/home/programs/nixvim/keymap.nix
+++ /dev/null
@@ -1,94 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}: {
-  programs.nixvim = {
-    globals = {
-      mapleader = " ";
-      maplocalleader = " ";
-    };
-
-    keymaps = let
-      normal =
-        lib.mapAttrsToList
-        (key: action: {
-          mode = "n";
-          inherit action key;
-        })
-        {
-          # "<C-c>" = "<cmd> %y+ <CR>";
-          "<C-v>" = "p";
-          "<C-a>" = "ggVG";
-          "<Space>" = "<NOP>";
-
-          # Esc to clear search results
-          "<esc>" = ":noh<CR>";
-
-          # fix Y behaviour
-          Y = "y$";
-
-          # back and fourth between the two most recent files
-          "<C-c>" = ":b#<CR>";
-
-          # close by Ctrl+x
-          "<C-x>" = ":close<CR>";
-
-          # save by Space+s or Ctrl+s
-          "<leader>s" = ":w<CR>";
-          "<C-s>" = ":w<CR>";
-
-          # navigate to left/right window
-          "<leader>h" = "<C-w>h";
-          "<leader>l" = "<C-w>l";
-
-          # Press 'H', 'L' to jump to start/end of a line (first/last character)
-          L = "$";
-          H = "^";
-
-          # resize with arrows
-          "<C-Up>" = ":resize -2<CR>";
-          "<C-Down>" = ":resize +2<CR>";
-          "<C-Left>" = ":vertical resize +2<CR>";
-          "<C-Right>" = ":vertical resize -2<CR>";
-
-          # move current line up/down
-          # M = Alt key
-          "<M-k>" = ":move-2<CR>";
-          "<M-j>" = ":move+<CR>";
-
-          "<leader>rp" = ":!remi push<CR>";
-        };
-      visual =
-        lib.mapAttrsToList
-        (key: action: {
-          mode = "v";
-          inherit action key;
-        })
-        {
-          "<C-c>" = "y";
-          # better indenting
-          ">" = ">gv";
-          "<" = "<gv";
-          "<TAB>" = ">gv";
-          "<S-TAB>" = "<gv";
-
-          # move selected line / block of text in visual mode
-          "K" = ":m '<-2<CR>gv=gv";
-          "J" = ":m '>+1<CR>gv=gv";
-        };
-      insert =
-        lib.mapAttrsToList
-        (key: action: {
-          mode = "i";
-          inherit action key;
-        })
-        {
-          "<C-v>" = "<esc>p";
-        };
-    in
-      config.lib.nixvim.keymaps.mkKeymaps
-      {options.silent = true;}
-      (normal ++ visual ++ insert);
-  };
-}
diff --git a/modules/home/programs/nixvim/options.nix b/modules/home/programs/nixvim/options.nix
deleted file mode 100644
index 13065906..00000000
--- a/modules/home/programs/nixvim/options.nix
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-  programs.nixvim = {
-    globals = {
-      # Disable useless providers
-      loaded_ruby_provider = 0; # Ruby
-      loaded_perl_provider = 0; # Perl
-      loaded_python_provider = 0; # Python 2
-    };
-
-    clipboard = {
-      # Use system clipboard
-      register = "unnamedplus";
-
-      providers.wl-copy.enable = true;
-    };
-
-    opts = {
-      updatetime = 100; # Faster completion
-
-      # Line numbers
-      relativenumber = false; # Relative line numbers
-      number = true; # Display the absolute line number of the current line
-      hidden = true; # Keep closed buffer open in the background
-      showmode = false;
-      mouse = "a"; # Enable mouse control
-      mousemodel = "popup"; # Mouse right-click extends the current selection
-      splitbelow = true; # A new window is put below the current one
-      splitright = true; # A new window is put right of the current one
-      list = true;
-      listchars = {
-        tab = "▷ ";
-        trail = "·";
-        nbsp = "○";
-        extends = "◣";
-        precedes = "◢";
-      };
-
-      swapfile = false; # Disable the swap file
-      modeline = true; # Tags such as 'vim:ft=sh'
-      modelines = 100; # Sets the type of modelines
-      undofile = true; # Automatically save and restore undo history
-      incsearch = true; # Incremental search: show match for partly typed search command
-      inccommand = "split"; # Search and replace: preview changes in quickfix list
-      ignorecase = true; # When the search query is lower-case, match both lower and upper-case
-      #   patterns
-      smartcase = true; # Override the 'ignorecase' option if the search pattern contains upper
-      #   case characters
-      scrolloff = 4; # Number of screen lines to show around the cursor
-      cursorline = true; # Highlight the screen line of the cursor
-      cursorcolumn = false; # Highlight the screen column of the cursor
-      signcolumn = "yes"; # Whether to show the signcolumn
-      colorcolumn = ""; # Columns to highlight
-      laststatus = 3; # When to use a status line for the last window
-      fileencoding = "utf-8"; # File-content encoding for the current buffer
-      # termguicolors = true; # Enables 24-bit RGB color in the |TUI|
-      spell = false; # Highlight spelling mistakes (local to window)
-      wrap = false; # Prevent text from wrapping
-
-      # Tab options
-      tabstop = 4; # Number of spaces a <Tab> in the text stands for (local to buffer)
-      shiftwidth = 4; # Number of spaces used for each step of (auto)indent (local to buffer)
-      expandtab = true; # Expand <Tab> to spaces in Insert mode (local to buffer)
-      autoindent = true; # Do clever autoindenting
-
-      textwidth = 0; # Maximum width of text that is being inserted.  A longer line will be
-      #   broken after white space to get this width.
-
-      # Folding
-      foldlevel = 99; # Folds with a level higher than this number will be closed
-    };
-  };
-}
diff --git a/modules/home/programs/nixvim/plugins/barbar.nix b/modules/home/programs/nixvim/plugins/barbar.nix
deleted file mode 100644
index fefdc107..00000000
--- a/modules/home/programs/nixvim/plugins/barbar.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: let
-  inherit (lib) mkEnableOption mkIf;
-  cfg = config.home.devtools.nixvim.plugins.barbar;
-in {
-  options = {
-    home.devtools.nixvim.plugins.barbar.enable = mkEnableOption "Enables Barbar plugin for nixvim";
-  };
-
-  config = mkIf cfg.enable {
-    programs.nixvim.plugins.barbar = {
-      enable = true;
-      keymaps = {
-        next.key = "<TAB>";
-        previous.key = "<S-TAB>";
-        close.key = "<C-w>";
-      };
-    };
-  };
-}
diff --git a/modules/home/programs/nixvim/plugins/cmp.nix b/modules/home/programs/nixvim/plugins/cmp.nix
deleted file mode 100644
index 942b39bc..00000000
--- a/modules/home/programs/nixvim/plugins/cmp.nix
+++ /dev/null
@@ -1,163 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: let
-  inherit (lib) mkEnableOption mkIf;
-  cfg = config.home.devtools.nixvim.plugins.cmp;
-in {
-  options = {
-    home.devtools.nixvim.plugins.cmp.enable = mkEnableOption "Enables completion plugin for nixvim";
-  };
-
-  config = mkIf cfg.enable {
-    programs.nixvim = {
-      plugins = {
-        luasnip.enable = true;
-        cmp-buffer = {enable = true;};
-        cmp-emoji = {enable = true;};
-        cmp-nvim-lsp = {enable = true;};
-        cmp-path = {enable = true;};
-        cmp_luasnip = {enable = true;};
-
-        cmp = {
-          enable = true;
-          settings = {
-            experimental = {ghost_text = true;};
-            snippet.expand = ''
-              function(args)
-                require('luasnip').lsp_expand(args.body)
-              end
-            '';
-            sources = [
-              {name = "nvim_lsp";}
-              {name = "luasnip";}
-              {
-                name = "buffer";
-                option.get_bufnrs.__raw = "vim.api.nvim_list_bufs";
-              }
-              {name = "nvim_lua";}
-              {name = "path";}
-              {name = "copilot";}
-            ];
-            formatting = {
-              fields = ["abbr" "kind" "menu"];
-              format =
-                # lua
-                ''
-                  function(_, item)
-                    local icons = {
-                      Namespace = "󰌗",
-                      Text = "󰉿",
-                      Method = "󰆧",
-                      Function = "󰆧",
-                      Constructor = "",
-                      Field = "󰜢",
-                      Variable = "󰀫",
-                      Class = "󰠱",
-                      Interface = "",
-                      Module = "",
-                      Property = "󰜢",
-                      Unit = "󰑭",
-                      Value = "󰎠",
-                      Enum = "",
-                      Keyword = "󰌋",
-                      Snippet = "",
-                      Color = "󰏘",
-                      File = "󰈚",
-                      Reference = "󰈇",
-                      Folder = "󰉋",
-                      EnumMember = "",
-                      Constant = "󰏿",
-                      Struct = "󰙅",
-                      Event = "",
-                      Operator = "󰆕",
-                      TypeParameter = "󰊄",
-                      Table = "",
-                      Object = "󰅩",
-                      Tag = "",
-                      Array = "[]",
-                      Boolean = "",
-                      Number = "",
-                      Null = "󰟢",
-                      String = "󰉿",
-                      Calendar = "",
-                      Watch = "󰥔",
-                      Package = "",
-                      Copilot = "",
-                      Codeium = "",
-                      TabNine = "",
-                    }
-
-                    local icon = icons[item.kind] or ""
-                    item.kind = string.format("%s %s", icon, item.kind or "")
-                    return item
-                  end
-                '';
-            };
-            window = {
-              completion = {
-                winhighlight = "FloatBorder:CmpBorder,Normal:CmpPmenu,CursorLine:CmpSel,Search:PmenuSel";
-                scrollbar = false;
-                sidePadding = 0;
-                border = ["╭" "─" "╮" "│" "╯" "─" "╰" "│"];
-              };
-              settings.documentation = {
-                border = ["╭" "─" "╮" "│" "╯" "─" "╰" "│"];
-                winhighlight = "FloatBorder:CmpBorder,Normal:CmpPmenu,CursorLine:CmpSel,Search:PmenuSel";
-              };
-            };
-            mapping = {
-              "<C-l>" = "cmp.mapping.select_prev_item()";
-              "<C-ä>" = "cmp.mapping.select_next_item()";
-              "<C-d>" = "cmp.mapping.scroll_docs(-4)";
-              "<C-f>" = "cmp.mapping.scroll_docs(4)";
-              "<C-Space>" = "cmp.mapping.complete()";
-              "<S-Tab>" = "cmp.mapping.close()";
-              "<Tab>" =
-                # lua
-                ''
-                  function(fallback)
-                    local line = vim.api.nvim_get_current_line()
-                    if line:match("^%s*$") then
-                      fallback()
-                    elseif cmp.visible() then
-                      cmp.confirm({ behavior = cmp.ConfirmBehavior.Insert, select = true })
-                    else
-                      fallback()
-                    end
-                  end
-                '';
-              "<Down>" =
-                # lua
-                ''
-                  function(fallback)
-                    if cmp.visible() then
-                      cmp.select_next_item()
-                    elseif require("luasnip").expand_or_jumpable() then
-                      vim.fn.feedkeys(vim.api.nvim_replace_termcodes("<Plug>luasnip-expand-or-jump", true, true, true), "")
-                    else
-                      fallback()
-                    end
-                  end
-                '';
-              "<Up>" =
-                # lua
-                ''
-                  function(fallback)
-                    if cmp.visible() then
-                      cmp.select_prev_item()
-                    elseif require("luasnip").jumpable(-1) then
-                      vim.fn.feedkeys(vim.api.nvim_replace_termcodes("<Plug>luasnip-jump-prev", true, true, true), "")
-                    else
-                      fallback()
-                    end
-                  end
-                '';
-            };
-          };
-        };
-      };
-    };
-  };
-}
diff --git a/modules/home/programs/nixvim/plugins/comment.nix b/modules/home/programs/nixvim/plugins/comment.nix
deleted file mode 100644
index 01d618d9..00000000
--- a/modules/home/programs/nixvim/plugins/comment.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: let
-  inherit (lib) mkEnableOption mkIf;
-  cfg = config.home.devtools.nixvim.plugins.comment;
-in {
-  options = {
-    home.devtools.nixvim.plugins.comment.enable = mkEnableOption "Enables Comment plugin for nixvim";
-  };
-
-  config = mkIf cfg.enable {
-    programs.nixvim.plugins.comment = {
-      enable = true;
-
-      settings = {
-        opleader.line = "<C-b>";
-        toggler.line = "<C-b>";
-      };
-    };
-  };
-}
diff --git a/modules/home/programs/nixvim/plugins/conform.nix b/modules/home/programs/nixvim/plugins/conform.nix
deleted file mode 100644
index 29e5c83c..00000000
--- a/modules/home/programs/nixvim/plugins/conform.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}: let
-  inherit (lib) mkEnableOption mkIf;
-  cfg = config.home.devtools.nixvim.plugins.conform;
-in {
-  options = {
-    home.devtools.nixvim.plugins.conform.enable = mkEnableOption "Enables Conform plugin for nixvim";
-  };
-
-  config = mkIf cfg.enable {
-    programs.nixvim.plugins.conform = {
-      enable = true;
-      settings = {
-        notify_on_error = true;
-        formatters_by_ft = {
-          html = ["prettierd" "prettier"];
-          css = ["prettierd" "prettier"];
-          javascript = ["prettierd" "prettier"];
-          javascriptreact = ["prettierd" "prettier"];
-          typescript = ["prettierd" "prettier"];
-          typescriptreact = ["prettierd" "prettier"];
-          python = ["black"];
-          lua = ["stylua"];
-          nix = ["alejandra"];
-          markdown = ["prettierd" "prettier"];
-          yaml = ["yamlfmt"];
-          rust = ["rustfmt"];
-          xml = ["xmllint"];
-          php = ["php-cs-fixer"];
-        };
-        stop_after_first = true;
-      };
-    };
-    home.packages = with pkgs; [
-      prettierd
-      yamlfmt
-      libxml2Python
-    ];
-  };
-}
diff --git a/modules/home/programs/nixvim/plugins/copilot.nix b/modules/home/programs/nixvim/plugins/copilot.nix
deleted file mode 100644
index caa5ca3a..00000000
--- a/modules/home/programs/nixvim/plugins/copilot.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: let
-  inherit (lib) mkEnableOption mkIf;
-  cfg = config.home.devtools.nixvim.plugins.copilot;
-in {
-  options = {
-    home.devtools.nixvim.plugins.copilot.enable = mkEnableOption "Enables AI tools for nixvim";
-  };
-
-  config = mkIf cfg.enable {
-    programs.nixvim = {
-      plugins = {
-        copilot-chat = {
-          enable = true;
-        };
-        copilot-lua = {
-          enable = true;
-          suggestion = {
-            enabled = false;
-            autoTrigger = true;
-            keymap.accept = "<C-CR>";
-          };
-          panel.enabled = false;
-        };
-      };
-      keymaps = [
-        {
-          action = "<cmd>lua local input = vim.fn.input('Quick Chat: '); if input ~= '' then require('CopilotChat').ask(input, { selection = require('CopilotChat.select').buffer }) end<CR>";
-          key = "<leader>qc";
-          options = {
-            desc = "CopilotChat - Quick chat";
-          };
-          mode = [
-            "n"
-          ];
-        }
-        {
-          action = "<cmd>CopilotChatToggle<CR>";
-          key = "<leader>ac";
-          options = {
-            desc = "Toggle Coilot chat";
-          };
-          mode = [
-            "n"
-          ];
-        }
-      ];
-    };
-  };
-}
diff --git a/modules/home/programs/nixvim/plugins/default.nix b/modules/home/programs/nixvim/plugins/default.nix
deleted file mode 100644
index d33c6026..00000000
--- a/modules/home/programs/nixvim/plugins/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{umodPath, ...}: {
-  imports = [
-    "${umodPath}/devtools/nixvim/plugins/barbar.nix"
-    "${umodPath}/devtools/nixvim/plugins/comment.nix"
-    "${umodPath}/devtools/nixvim/plugins/conform.nix"
-    "${umodPath}/devtools/nixvim/plugins/cmp.nix"
-    "${umodPath}/devtools/nixvim/plugins/copilot.nix"
-    "${umodPath}/devtools/nixvim/plugins/efm.nix"
-    "${umodPath}/devtools/nixvim/plugins/floaterm.nix"
-    "${umodPath}/devtools/nixvim/plugins/harpoon.nix"
-    "${umodPath}/devtools/nixvim/plugins/lsp.nix"
-    "${umodPath}/devtools/nixvim/plugins/lualine.nix"
-    "${umodPath}/devtools/nixvim/plugins/lightline.nix"
-    "${umodPath}/devtools/nixvim/plugins/markdown-preview.nix"
-    "${umodPath}/devtools/nixvim/plugins/neo-tree.nix"
-    "${umodPath}/devtools/nixvim/plugins/nonels.nix"
-    "${umodPath}/devtools/nixvim/plugins/rustaceanvim.nix"
-    "${umodPath}/devtools/nixvim/plugins/startify.nix"
-    "${umodPath}/devtools/nixvim/plugins/tagbar.nix"
-    "${umodPath}/devtools/nixvim/plugins/telescope.nix"
-    "${umodPath}/devtools/nixvim/plugins/treesitter.nix"
-    "${umodPath}/devtools/nixvim/plugins/vimtex.nix"
-    "${umodPath}/devtools/nixvim/plugins/yanky.nix"
-  ];
-}
diff --git a/modules/home/programs/nixvim/plugins/efm.nix b/modules/home/programs/nixvim/plugins/efm.nix
deleted file mode 100644
index a274b27e..00000000
--- a/modules/home/programs/nixvim/plugins/efm.nix
+++ /dev/null
@@ -1,112 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}: let
-  inherit (lib) mkEnableOption mkIf;
-  cfg = config.home.devtools.nixvim.plugins.efm;
-in {
-  options = {
-    home.devtools.nixvim.plugins.efm.enable = mkEnableOption "Enables EFM LSP support for nixvim";
-  };
-
-  config = mkIf cfg.enable {
-    programs.nixvim.plugins = {
-      lsp.servers.efm = {
-        enable = true;
-        extraOptions.init_options = {
-          documentFormatting = true;
-          documentRangeFormatting = true;
-          hover = true;
-          documentSymbol = true;
-          codeAction = true;
-          completion = true;
-        };
-      };
-
-      lsp-format = {
-        enable = true;
-        lspServersToEnable = ["efm"];
-      };
-
-      efmls-configs = {
-        enable = true;
-
-        toolPackages.mdformat = pkgs.mdformat.withPlugins (
-          ps:
-            with ps; [
-              # TODO: broken with update of mdformat
-              # mdformat-gfm
-              mdformat-frontmatter
-              mdformat-footnote
-              mdformat-tables
-              mdit-py-plugins
-            ]
-        );
-
-        setup = {
-          sh = {
-            #linter = "shellcheck";
-            formatter = "shfmt";
-          };
-          bash = {
-            #linter = "shellcheck";
-            formatter = "shfmt";
-          };
-          c = {
-            linter = "cppcheck";
-          };
-          markdown = {
-            formatter = [
-              "cbfmt"
-              "mdformat"
-            ];
-          };
-          python = {
-            formatter = "black";
-          };
-          nix = {
-            formatter = "alejandra";
-            linter = "statix";
-          };
-          lua = {
-            formatter = "stylua";
-          };
-          html = {
-            formatter = [
-              "prettier"
-            ];
-          };
-          htmldjango = {
-            linter = "djlint";
-          };
-          json = {
-            formatter = "prettier";
-          };
-          css = {
-            formatter = "prettier";
-          };
-          scss = {
-            formatter = "prettier";
-          };
-          ts = {
-            formatter = "prettier";
-          };
-          gitcommit = {
-            linter = "gitlint";
-          };
-          php = {
-            formatter = "php_cs_fixer";
-          };
-          rust = {
-            formatter = "rustfmt";
-          };
-          sql = {
-            formatter = "sql-formatter";
-          };
-        };
-      };
-    };
-  };
-}
diff --git a/modules/home/programs/nixvim/plugins/floaterm.nix b/modules/home/programs/nixvim/plugins/floaterm.nix
deleted file mode 100644
index 98d51e11..00000000
--- a/modules/home/programs/nixvim/plugins/floaterm.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: let
-  inherit (lib) mkEnableOption mkIf;
-  cfg = config.home.devtools.nixvim.plugins.floaterm;
-in {
-  options = {
-    home.devtools.nixvim.plugins.floaterm.enable = mkEnableOption "Enables Floaterm plugin for nixvim";
-  };
-
-  config = mkIf cfg.enable {
-    programs.nixvim.plugins.floaterm = {
-      enable = true;
-      width = 0.8;
-      height = 0.8;
-      title = "";
-
-      keymaps.toggle = "<leader>,";
-    };
-  };
-}
diff --git a/modules/home/programs/nixvim/plugins/harpoon.nix b/modules/home/programs/nixvim/plugins/harpoon.nix
deleted file mode 100644
index cc528ab3..00000000
--- a/modules/home/programs/nixvim/plugins/harpoon.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: let
-  inherit (lib) mkEnableOption mkIf;
-  cfg = config.home.devtools.nixvim.plugins.harpoon;
-in {
-  options = {
-    home.devtools.nixvim.plugins.harpoon.enable = mkEnableOption "Enables Harpoon plugin for nixvim";
-  };
-
-  config = mkIf cfg.enable {
-    programs.nixvim.plugins.harpoon = {
-      enable = true;
-
-      keymapsSilent = true;
-
-      keymaps = {
-        addFile = "<leader>a";
-        toggleQuickMenu = "<C-e>";
-        navFile = {
-          "1" = "<C-j>";
-          "2" = "<C-k>";
-          "3" = "<C-l>";
-          "4" = "<C-m>";
-        };
-      };
-    };
-  };
-}
diff --git a/modules/home/programs/nixvim/plugins/lightline.nix b/modules/home/programs/nixvim/plugins/lightline.nix
deleted file mode 100644
index 2420f120..00000000
--- a/modules/home/programs/nixvim/plugins/lightline.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: let
-  inherit (lib) mkEnableOption mkIf;
-  cfg = config.home.devtools.nixvim.plugins.lightline;
-in {
-  options = {
-    home.devtools.nixvim.plugins.lightline.enable = mkEnableOption "Enables lightline plugin for nixvim";
-  };
-
-  config = mkIf cfg.enable {
-    programs.nixvim.plugins.lightline = {
-      enable = true;
-      settings = {
-        colorscheme = "apprentice";
-        active = {
-          right = [
-            [
-              "lineinfo"
-            ]
-            [
-              "percent"
-            ]
-            [
-              "fileformat"
-              "fileencoding"
-              "filetype"
-            ]
-          ];
-        };
-        component = {
-          charvaluehex = "0x%B";
-          lineinfo = "%3l:%-2v%<";
-        };
-        component_function = {
-          gitbranch = "FugitiveHead";
-        };
-        inactive = [];
-        mode_map = {
-          "<C-s>" = "SB";
-          "<C-v>" = "VB";
-          i = "I";
-          n = "N";
-          v = "V";
-        };
-      };
-    };
-  };
-}
diff --git a/modules/home/programs/nixvim/plugins/lsp-format.nix b/modules/home/programs/nixvim/plugins/lsp-format.nix
deleted file mode 100644
index 068d5656..00000000
--- a/modules/home/programs/nixvim/plugins/lsp-format.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: let
-  inherit (lib) mkEnableOption mkIf;
-  cfg = config.home.devtools.nixvim.plugins.lsp-format;
-in {
-  options = {
-    home.devtools.nixvim.plugins.lsp-format = {
-      enable = mkEnableOption "Enables LSP formatting support for nixvim";
-    };
-  };
-
-  config = mkIf cfg.enable {
-    programs.nixvim.plugins.lsp-format = {
-      enable = true;
-
-      lspServersToEnable = [
-        "rustfmt"
-        "prettier"
-        "prettierd"
-        "php-cs-fixer"
-        "alejandra"
-        "xmllint"
-        "black"
-        "yamlfmt"
-        "stylua"
-      ];
-    };
-  };
-}
diff --git a/modules/home/programs/nixvim/plugins/lsp.nix b/modules/home/programs/nixvim/plugins/lsp.nix
deleted file mode 100644
index 1b7b9021..00000000
--- a/modules/home/programs/nixvim/plugins/lsp.nix
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: let
-  inherit (lib) mkEnableOption mkIf;
-  cfg = config.home.devtools.nixvim.plugins.lsp;
-in {
-  options = {
-    home.devtools.nixvim.plugins.lsp = {
-      enable = mkEnableOption "Enables LSP support for nixvim";
-    };
-  };
-
-  config = mkIf cfg.enable {
-    programs.nixvim.plugins = {
-      lsp-format = {
-        enable = true;
-        lspServersToEnable = [
-          "rust-analyzer"
-        ];
-      };
-      lsp = {
-        enable = true;
-
-        keymaps = {
-          silent = true;
-          diagnostic = {
-            "<leader>k" = "goto_prev";
-            "<leader>j" = "goto_next";
-          };
-
-          lspBuf = {
-            gd = "definition";
-            gD = "references";
-            gt = "type_definition";
-            gi = "implementation";
-            K = "hover";
-            "<F2>" = "rename";
-          };
-        };
-
-        servers = {
-          # Average webdev LSPs
-          cssls.enable = true; # CSS
-          tailwindcss.enable = true; # TailwindCSS
-          html.enable = true; # HTML
-          astro.enable = true; # AstroJS
-          phpactor.enable = true; # PHP
-          svelte.enable = false; # Svelte
-          vuels.enable = false; # Vue
-          pyright.enable = true;
-          marksman.enable = true;
-          nixd.enable = true;
-          dockerls.enable = true;
-          bashls.enable = true;
-          clangd.enable = true;
-          csharp-ls.enable = true;
-          yamlls.enable = true;
-          lua-ls = {
-            enable = true;
-            settings = {
-              telemetry.enable = false;
-              diagnostics = {
-                globals = ["vim"];
-              };
-            };
-          };
-          tsserver = {
-            enable = false; # TS/JS
-          };
-        };
-      };
-    };
-  };
-}
diff --git a/modules/home/programs/nixvim/plugins/lualine.nix b/modules/home/programs/nixvim/plugins/lualine.nix
deleted file mode 100644
index e03d9bf8..00000000
--- a/modules/home/programs/nixvim/plugins/lualine.nix
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: let
-  inherit (lib) mkEnableOption mkIf;
-  cfg = config.home.devtools.nixvim.plugins.lualine;
-in {
-  options = {
-    home.devtools.nixvim.plugins.lualine.enable = mkEnableOption "Enables Lualine plugin for nixvim";
-  };
-
-  config = mkIf cfg.enable {
-    programs.nixvim.plugins.lualine = {
-      enable = true;
-      theme = "gruvbox-material";
-      globalstatus = true;
-
-      sections = {
-        lualine_a = ["mode"];
-        lualine_b = ["branch"];
-        lualine_c = ["filename" "diff"];
-
-        lualine_x = [
-          "diagnostics"
-
-          # Show active language server
-          {
-            name.__raw = ''
-              function()
-                  local msg = ""
-                  local buf_ft = vim.api.nvim_buf_get_option(0, 'filetype')
-                  local clients = vim.lsp.get_active_clients()
-                  local non_null_ls_clients = {}
-
-                  for _, client in ipairs(clients) do
-                      if client.name ~= "null-ls" then
-                          table.insert(non_null_ls_clients, client)
-                      end
-                  end
-
-                  if #non_null_ls_clients > 0 then
-                      for _, client in ipairs(non_null_ls_clients) do
-                          local filetypes = client.config.filetypes
-                          if filetypes and vim.fn.index(filetypes, buf_ft) ~= -1 then
-                              return client.name
-                          end
-                      end
-                  else
-                      for _, client in ipairs(clients) do
-                          if client.name == "null-ls" then
-                              return client.name
-                          end
-                      end
-                  end
-
-                  return msg
-              end
-            '';
-            icon = "";
-            color.fg = "#A89984";
-          }
-          "fileformat"
-          "filetype"
-        ];
-      };
-    };
-  };
-}
diff --git a/modules/home/programs/nixvim/plugins/markdown-preview.nix b/modules/home/programs/nixvim/plugins/markdown-preview.nix
deleted file mode 100644
index 8b412c98..00000000
--- a/modules/home/programs/nixvim/plugins/markdown-preview.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: let
-  inherit (lib) mkEnableOption mkIf;
-  cfg = config.home.devtools.nixvim.plugins.markdown-preview;
-in {
-  options = {
-    home.devtools.nixvim.plugins.markdown-preview.enable = mkEnableOption "Enables Markdown Preview plugin for nixvim";
-  };
-
-  config = mkIf cfg.enable {
-    programs.nixvim = {
-      plugins.markdown-preview = {
-        enable = true;
-
-        settings = {
-          auto_close = false;
-          theme = "dark";
-        };
-      };
-
-      files."after/ftplugin/markdown.lua".keymaps = [
-        {
-          mode = "n";
-          key = "<leader>m";
-          action = ":MarkdownPreview<cr>";
-        }
-      ];
-    };
-  };
-}
diff --git a/modules/home/programs/nixvim/plugins/neo-tree.nix b/modules/home/programs/nixvim/plugins/neo-tree.nix
deleted file mode 100644
index 63b3004c..00000000
--- a/modules/home/programs/nixvim/plugins/neo-tree.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: let
-  inherit (lib) mkEnableOption mkIf;
-  cfg = config.home.devtools.nixvim.plugins.neo-tree;
-in {
-  options = {
-    home.devtools.nixvim.plugins.neo-tree.enable = mkEnableOption "Enables neo-tree plugin for nixvim";
-  };
-
-  config = mkIf cfg.enable {
-    programs.nixvim = {
-      plugins.neo-tree = {
-        enable = true;
-
-        closeIfLastWindow = true;
-        window = {
-          width = 30;
-          # autoExpandWidth = true;
-        };
-      };
-
-      keymaps = [
-        {
-          mode = "n";
-          key = "<leader>n";
-          action = ":Neotree focus toggle<CR>";
-          options.silent = true;
-        }
-      ];
-    };
-  };
-}
diff --git a/modules/home/programs/nixvim/plugins/nonels.nix b/modules/home/programs/nixvim/plugins/nonels.nix
deleted file mode 100644
index 33b72dca..00000000
--- a/modules/home/programs/nixvim/plugins/nonels.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: let
-  inherit (lib) mkEnableOption mkIf;
-  cfg = config.home.devtools.nixvim.plugins.none-ls;
-in {
-  options = {
-    home.devtools.nixvim.plugins.none-ls.enable = mkEnableOption "Enables None-LS plugin for nixvim";
-  };
-
-  config = mkIf cfg.enable {
-    programs.nixvim.plugins.none-ls = {
-      enable = true;
-      settings = {
-        cmd = ["bash -c nvim"];
-        debug = true;
-      };
-      sources = {
-        code_actions = {
-          statix.enable = true;
-          gitsigns.enable = true;
-        };
-        diagnostics = {
-          statix.enable = true;
-          deadnix.enable = true;
-          pylint.enable = true;
-          checkstyle.enable = true;
-        };
-        formatting = {
-          alejandra.enable = true;
-          stylua.enable = true;
-          shfmt.enable = true;
-          google_java_format.enable = false;
-          prettier = {
-            enable = true;
-            disableTsServerFormatter = true;
-          };
-          prettierd.enable = true;
-          phpcsfixer.enable = true;
-          xmllint.enable = true;
-          yamlfmt.enable = true;
-          black = {
-            enable = true;
-            settings = ''
-              {
-                extra_args = { "--fast" };
-              }
-            '';
-          };
-        };
-        completion = {
-          luasnip.enable = true;
-          spell.enable = true;
-        };
-      };
-    };
-  };
-}
diff --git a/modules/home/programs/nixvim/plugins/rustaceanvim.nix b/modules/home/programs/nixvim/plugins/rustaceanvim.nix
deleted file mode 100644
index f90ac832..00000000
--- a/modules/home/programs/nixvim/plugins/rustaceanvim.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}:
-with lib; let
-  cfg = config.home.devtools.nixvim.plugins.rustaceanvim;
-in {
-  options.home.devtools.nixvim.plugins.rustaceanvim = {
-    enable = mkEnableOption "Whether to enable rustaceanvim.";
-  };
-
-  config = mkIf cfg.enable {
-    programs.nixvim = {
-      plugins.rustaceanvim = {
-        enable = true;
-
-        settings.server = {
-          default_settings.rust-analyzer = {
-            cargo.features = "all";
-            checkOnSave = true;
-            check.command = "clippy";
-            rustc.source = "discover";
-          };
-        };
-      };
-    };
-  };
-}
diff --git a/modules/home/programs/nixvim/plugins/startify.nix b/modules/home/programs/nixvim/plugins/startify.nix
deleted file mode 100644
index c3dc1723..00000000
--- a/modules/home/programs/nixvim/plugins/startify.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: let
-  inherit (lib) mkEnableOption mkIf;
-  cfg = config.home.devtools.nixvim.plugins.startify;
-in {
-  options = {
-    home.devtools.nixvim.plugins.startify.enable = mkEnableOption "Enables Startify plugin for nixvim";
-  };
-
-  config = mkIf cfg.enable {
-    programs.nixvim.plugins.startify = {
-      enable = true;
-
-      settings = {
-        custom_header = [
-          ""
-          "     ███╗   ██╗██╗██╗  ██╗██╗   ██╗██╗███╗   ███╗"
-          "     ████╗  ██║██║╚██╗██╔╝██║   ██║██║████╗ ████║"
-          "     ██╔██╗ ██║██║ ╚███╔╝ ██║   ██║██║██╔████╔██║"
-          "     ██║╚██╗██║██║ ██╔██╗ ╚██╗ ██╔╝██║██║╚██╔╝██║"
-          "     ██║ ╚████║██║██╔╝ ██╗ ╚████╔╝ ██║██║ ╚═╝ ██║"
-          "     ╚═╝  ╚═══╝╚═╝╚═╝  ╚═╝  ╚═══╝  ╚═╝╚═╝     ╚═╝"
-        ];
-
-        change_to_dir = false;
-        use_unicode = true;
-        lists = [{type = "dir";}];
-        files_number = 30;
-        skiplist = ["flake.lock"];
-      };
-    };
-  };
-}
diff --git a/modules/home/programs/nixvim/plugins/tagbar.nix b/modules/home/programs/nixvim/plugins/tagbar.nix
deleted file mode 100644
index 7b07af26..00000000
--- a/modules/home/programs/nixvim/plugins/tagbar.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: let
-  inherit (lib) mkEnableOption mkIf;
-  cfg = config.home.devtools.nixvim.plugins.tagbar;
-in {
-  options = {
-    home.devtools.nixvim.plugins.tagbar.enable = mkEnableOption "Enables Tagbar plugin for nixvim";
-  };
-
-  config = mkIf cfg.enable {
-    programs.nixvim = {
-      plugins.tagbar = {
-        enable = true;
-        settings.width = 50;
-      };
-
-      keymaps = [
-        {
-          mode = "n";
-          key = "<C-g>";
-          action = ":TagbarToggle<cr>";
-          options.silent = true;
-        }
-      ];
-    };
-  };
-}
diff --git a/modules/home/programs/nixvim/plugins/telescope.nix b/modules/home/programs/nixvim/plugins/telescope.nix
deleted file mode 100644
index d5d7ebb2..00000000
--- a/modules/home/programs/nixvim/plugins/telescope.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: let
-  inherit (lib) mkEnableOption mkIf;
-  cfg = config.home.devtools.nixvim.plugins.telescope;
-in {
-  options = {
-    home.devtools.nixvim.plugins.telescope.enable = mkEnableOption "Enables Telescope plugin for nixvim";
-  };
-
-  config = mkIf cfg.enable {
-    programs.nixvim.plugins.telescope = {
-      enable = true;
-
-      keymaps = {
-        "<leader>ff" = "find_files";
-        "<leader>fg" = "live_grep";
-        "<leader>b" = "buffers";
-        "<leader>fh" = "help_tags";
-        "<leader>fd" = "diagnostics";
-
-        "<C-p>" = "git_files";
-        "<leader>p" = "oldfiles";
-        "<C-f>" = "live_grep";
-      };
-
-      settings.defaults = {
-        file_ignore_patterns = [
-          "^.git/"
-          "^.mypy_cache/"
-          "^__pycache__/"
-          "^output/"
-          "^data/"
-          "%.ipynb"
-        ];
-        set_env.COLORTERM = "truecolor";
-      };
-    };
-  };
-}
diff --git a/modules/home/programs/nixvim/plugins/treesitter.nix b/modules/home/programs/nixvim/plugins/treesitter.nix
deleted file mode 100644
index 6b91de9b..00000000
--- a/modules/home/programs/nixvim/plugins/treesitter.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: let
-  inherit (lib) mkEnableOption mkIf;
-  cfg = config.home.devtools.nixvim.plugins.treesitter;
-in {
-  options = {
-    home.devtools.nixvim.plugins = {
-      treesitter.enable = mkEnableOption "Enables Treesitter plugin for nixvim";
-    };
-  };
-
-  config = mkIf cfg.enable {
-    programs.nixvim.plugins = {
-      treesitter = {
-        enable = true;
-        nixvimInjections = true;
-        settings = {
-          highlight.enable = true;
-          indent.enable = true;
-        };
-        folding = true;
-      };
-
-      treesitter-refactor = mkIf cfg.enable {
-        enable = true;
-        highlightDefinitions = {
-          enable = true;
-          clearOnCursorMove = false;
-        };
-      };
-
-      hmts = mkIf cfg.enable {
-        enable = true;
-      };
-    };
-  };
-}
diff --git a/modules/home/programs/nixvim/plugins/vimtex.nix b/modules/home/programs/nixvim/plugins/vimtex.nix
deleted file mode 100644
index 01e64198..00000000
--- a/modules/home/programs/nixvim/plugins/vimtex.nix
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: let
-  inherit (lib) mkEnableOption mkIf;
-  cfg = config.home.devtools.nixvim.plugins.vimtex;
-in {
-  options = {
-    home.devtools.nixvim.plugins.vimtex.enable = mkEnableOption "Enables VimTeX plugin for nixvim";
-  };
-
-  config = mkIf cfg.enable {
-    programs.nixvim = {
-      plugins.vimtex = {
-        enable = true;
-        settings = {
-          view_method = "zathura";
-          quickfix_enabled = true;
-          quickfix_open_on_warning = false;
-          quickfix_ignore_filters = [
-            "Underfull"
-            "Overfull"
-            "specifier changed to"
-            "Token not allowed in a PDF string"
-          ];
-          toc_config = {
-            name = "TOC";
-            layers = ["content" "todo"];
-            resize = true;
-            split_width = 50;
-            todo_sorted = false;
-            show_help = true;
-            show_numbers = true;
-            mode = 2;
-          };
-        };
-      };
-
-      files."after/ftplugin/tex.lua".keymaps = [
-        {
-          mode = "n";
-          key = "m";
-          action = ":VimtexView<cr>";
-        }
-      ];
-
-      autoCmd = [
-        {
-          event = ["BufEnter" "BufWinEnter"];
-          pattern = "*.tex";
-          command = "set filetype=tex \"| VimtexTocOpen";
-        }
-        {
-          event = "FileType";
-          pattern = ["tex" "latex"];
-          callback = ''
-            function ()
-              vim.o.foldmethod = 'expr'
-              vim.o.foldexpr = 'vimtex#fold#level(v:lnum)'
-              vim.o.foldtext = 'vimtex#fold#text()'
-            end
-          '';
-        }
-        {
-          event = "User";
-          pattern = "VimtexEventInitPost";
-          callback = "vimtex#compiler#compile";
-        }
-        {
-          event = "User";
-          pattern = "VimtexEventQuit";
-          command = "call vimtex#compiler#clean(0)";
-        }
-      ];
-    };
-  };
-}
diff --git a/modules/home/programs/nixvim/plugins/yanky.nix b/modules/home/programs/nixvim/plugins/yanky.nix
deleted file mode 100644
index d8ef6dfd..00000000
--- a/modules/home/programs/nixvim/plugins/yanky.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: let
-  inherit (lib) mkEnableOption mkIf;
-  cfg = config.home.devtools.nixvim.plugins.yanky;
-in {
-  options = {
-    home.devtools.nixvim.plugins.yanky.enable = mkEnableOption "Enables Yanky plugin for nixvim";
-  };
-
-  config = mkIf cfg.enable {
-    programs.nixvim.plugins.yanky = {
-      enable = true;
-    };
-  };
-}
diff --git a/modules/home/programs/nixvim/todo.nix b/modules/home/programs/nixvim/todo.nix
deleted file mode 100644
index 5626682e..00000000
--- a/modules/home/programs/nixvim/todo.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  programs.nixvim = {
-    highlight.Todo = {
-      fg = "Blue";
-      bg = "Yellow";
-    };
-
-    match.TODO = "TODO";
-
-    keymaps = [
-      {
-        mode = "n";
-        key = "<C-t>";
-        action.__raw = ''
-          function()
-            require('telescope.builtin').live_grep({
-              default_text="TODO",
-              initial_mode="normal"
-            })
-          end
-        '';
-        options.silent = true;
-      }
-    ];
-  };
-}
diff --git a/modules/home/programs/vscode/default.nix b/modules/home/programs/vscode/default.nix
deleted file mode 100644
index 321d56ec..00000000
--- a/modules/home/programs/vscode/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}: let
-  inherit (lib) mkIf mkEnableOption;
-  cfg = config.home.programs.vscode;
-in {
-  options = {
-    home.programs.vscode.enable = mkEnableOption "Enables vscode";
-  };
-  config = mkIf cfg.enable {
-    programs.vscode = {
-      enable = true;
-    };
-  };
-}
diff --git a/modules/home/programs/vscodium/default.nix b/modules/home/programs/vscodium/default.nix
new file mode 100644
index 00000000..b24608b2
--- /dev/null
+++ b/modules/home/programs/vscodium/default.nix
@@ -0,0 +1,18 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  cfg = config.home.programs.vscodium;
+in {
+  options = {
+    home.programs.vscodium.enable = mkEnableOption "Enables vscodium";
+  };
+  config = mkIf cfg.enable {
+    home.packages = with pkgs; [
+      vscodium-fhs
+    ];
+  };
+}
diff --git a/users/cnst/modules.nix b/users/cnst/modules.nix
index a4ee137c..266509ce 100644
--- a/users/cnst/modules.nix
+++ b/users/cnst/modules.nix
@@ -83,8 +83,8 @@
       tuirun = {
         enable = true;
       };
-      vscode = {
-        enable = false;
+      vscodium = {
+        enable = true;
       };
       waybar = {
         enable = true;
diff --git a/users/toothpick/modules.nix b/users/toothpick/modules.nix
index cfe80f51..fa5391e3 100644
--- a/users/toothpick/modules.nix
+++ b/users/toothpick/modules.nix
@@ -68,7 +68,7 @@
       tuirun = {
         enable = true;
       };
-      vscode = {
+      vscodium = {
         enable = true;
       };
       waybar = {