diff --git a/home/modules/devtools/neovim/pluginsbak/barbar.nix b/home/modules/devtools/neovim/pluginsbak/barbar.nix
deleted file mode 100644
index aa95f803..00000000
--- a/home/modules/devtools/neovim/pluginsbak/barbar.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  programs.nixvim.plugins.barbar = {
-    enable = true;
-    keymaps = {
-      next.key = "<TAB>";
-      previous.key = "<S-TAB>";
-      close.key = "<C-w>";
-    };
-  };
-}
diff --git a/home/modules/devtools/neovim/pluginsbak/chatgpt.nix b/home/modules/devtools/neovim/pluginsbak/chatgpt.nix
deleted file mode 100644
index aeba72e9..00000000
--- a/home/modules/devtools/neovim/pluginsbak/chatgpt.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{config, ...}: {
-  programs.nixvim.plugins.chatgpt = {
-    enable = true;
-    settings = {
-      api_key_cmd = "cat ${config.sops.secrets.openai_api_key.path}";
-    };
-  };
-}
diff --git a/home/modules/devtools/neovim/pluginsbak/comment.nix b/home/modules/devtools/neovim/pluginsbak/comment.nix
deleted file mode 100644
index edf65367..00000000
--- a/home/modules/devtools/neovim/pluginsbak/comment.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  programs.nixvim.plugins.comment = {
-    enable = true;
-
-    settings = {
-      opleader.line = "<C-b>";
-      toggler.line = "<C-b>";
-    };
-  };
-}
diff --git a/home/modules/devtools/neovim/pluginsbak/conform.nix b/home/modules/devtools/neovim/pluginsbak/conform.nix
deleted file mode 100644
index 98e1e6b4..00000000
--- a/home/modules/devtools/neovim/pluginsbak/conform.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  programs.nixvim.plugins.conform-nvim = {
-    enable = true;
-    formatOnSave = {
-      lspFallback = true;
-      timeoutMs = 500;
-    };
-    notifyOnError = true;
-    formattersByFt = {
-      liquidsoap = [ "liquidsoap-prettier" ];
-      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 = [ "yamllint" "yamlfmt" ];
-    };
-  };
-}
diff --git a/home/modules/devtools/neovim/pluginsbak/default.nix b/home/modules/devtools/neovim/pluginsbak/default.nix
deleted file mode 100644
index db6120ef..00000000
--- a/home/modules/devtools/neovim/pluginsbak/default.nix
+++ /dev/null
@@ -1,93 +0,0 @@
-{
-  pkgs,
-  config,
-  lib,
-  concatLists,
-  ...
-}: let
-  inherit (lib) mkIf;
-  cfg = config.modules.devtools.neovim;
-in {
-  imports = concatLists [
-    mkIf
-    (cfg.barbar.enable or true)
-    [./barbar.nix]
-    mkIf
-    (cfg.chatgpt.enable or true)
-    [./chatgpt.nix]
-    mkIf
-    (cfg.comment.enable or true)
-    [./comment.nix]
-    mkIf
-    (cfg.conform.enable or true)
-    [./conform.nix]
-    mkIf
-    (cfg.efm.enable or true)
-    [./efm.nix]
-    mkIf
-    (cfg.lsp.enable or true)
-    [./lsp.nix]
-    mkIf
-    (cfg.lualine.enable or true)
-    [./lualine.nix]
-    mkIf
-    (cfg.markdown-preview.enable or true)
-    [./markdown-preview.nix]
-    mkIf
-    (cfg.neo-tree.enable or true)
-    [./neo-tree.nix]
-    mkIf
-    (cfg.nonels.enable or true)
-    [./nonels.nix]
-    mkIf
-    (cfg.startify.enable or true)
-    [./startify.nix]
-    mkIf
-    (cfg.tagbar.enable or true)
-    [./tagbar.nix]
-    mkIf
-    (cfg.telescope.enable or true)
-    [./telescope.nix]
-    mkIf
-    (cfg.treesitter.enable or true)
-    [./treesitter.nix]
-  ];
-
-  programs.nixvim = {
-    extraPlugins = [pkgs.vimPlugins.gruvbox-material];
-    colorscheme = "gruvbox-material";
-
-    plugins = {
-      gitsigns = {
-        enable = true;
-        settings.signs = {
-          add.text = "+";
-          change.text = "~";
-        };
-      };
-
-      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/home/modules/devtools/neovim/pluginsbak/efm.nix b/home/modules/devtools/neovim/pluginsbak/efm.nix
deleted file mode 100644
index f2da424a..00000000
--- a/home/modules/devtools/neovim/pluginsbak/efm.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  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;
-  };
-}
diff --git a/home/modules/devtools/neovim/pluginsbak/floaterm.nix b/home/modules/devtools/neovim/pluginsbak/floaterm.nix
deleted file mode 100644
index 6ef22e65..00000000
--- a/home/modules/devtools/neovim/pluginsbak/floaterm.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  programs.nixvim.plugins.floaterm = {
-    enable = true;
-
-    width = 0.8;
-    height = 0.8;
-
-    title = "";
-
-    keymaps.toggle = "<leader>,";
-  };
-}
diff --git a/home/modules/devtools/neovim/pluginsbak/harpoon.nix b/home/modules/devtools/neovim/pluginsbak/harpoon.nix
deleted file mode 100644
index c7ad0f3b..00000000
--- a/home/modules/devtools/neovim/pluginsbak/harpoon.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  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/home/modules/devtools/neovim/pluginsbak/lsp.nix b/home/modules/devtools/neovim/pluginsbak/lsp.nix
deleted file mode 100644
index ab54cd52..00000000
--- a/home/modules/devtools/neovim/pluginsbak/lsp.nix
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}: let
-  inherit (lib) mkEnableOption mkIf;
-  cfg = config.modules.devtools.neovim.plugins.lsp;
-in {
-  options = {
-    modules.devtools.neovim.plugins.lsp.enable = mkEnableOption "Enables LSP support for Neovim";
-
-    modules.devtools.neovim.plugins.lsp.servers = {
-      cssls.enable = mkEnableOption "Enable CSS LSP";
-      tailwindcss.enable = mkEnableOption "Enable TailwindCSS LSP";
-      html.enable = mkEnableOption "Enable HTML LSP";
-      astro.enable = mkEnableOption "Enable AstroJS LSP";
-      phpactor.enable = mkEnableOption "Enable PHP LSP";
-      svelte.enable = mkEnableOption "Enable Svelte LSP";
-      vuels.enable = mkEnableOption "Enable Vue LSP";
-      pyright.enable = mkEnableOption "Enable Python LSP";
-      marksman.enable = mkEnableOption "Enable Markdown LSP";
-      nixd.enable = mkEnableOption "Enable Nix LSP";
-      dockerls.enable = mkEnableOption "Enable Docker LSP";
-      bashls.enable = mkEnableOption "Enable Bash LSP";
-      clangd.enable = mkEnableOption "Enable C/C++ LSP";
-      csharp-ls.enable = mkEnableOption "Enable C# LSP";
-      yamlls.enable = mkEnableOption "Enable YAML LSP";
-      lua-ls.enable = mkEnableOption "Enable Lua LSP";
-      tsserver.enable = mkEnableOption "Enable TypeScript/JavaScript LSP";
-      rust-analyzer.enable = mkEnableOption "Enable Rust LSP";
-    };
-  };
-
-  config = mkIf cfg.enable {
-    programs.nixvim = {
-      plugins = {
-        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 = {
-            cssls = mkIf cfg.servers.cssls.enable {};
-            tailwindcss = mkIf cfg.servers.tailwindcss.enable {};
-            html = mkIf cfg.servers.html.enable {};
-            astro = mkIf cfg.servers.astro.enable {};
-            phpactor = mkIf cfg.servers.phpactor.enable {};
-            svelte = mkIf cfg.servers.svelte.enable {};
-            vuels = mkIf cfg.servers.vuels.enable {};
-            pyright = mkIf cfg.servers.pyright.enable {};
-            marksman = mkIf cfg.servers.marksman.enable {};
-            nixd = mkIf cfg.servers.nixd.enable {};
-            dockerls = mkIf cfg.servers.dockerls.enable {};
-            bashls = mkIf cfg.servers.bashls.enable {};
-            clangd = mkIf cfg.servers.clangd.enable {};
-            csharp-ls = mkIf cfg.servers.csharp-ls.enable {};
-            yamlls = mkIf cfg.servers.yamlls.enable {};
-            lua-ls = mkIf cfg.servers.lua-ls.enable {
-              settings.telemetry.enable = false;
-              settings.diagnostics.globals = ["vim"];
-            };
-            tsserver = mkIf cfg.servers.tsserver.enable {};
-            rust-analyzer = mkIf cfg.servers.rust-analyzer.enable {
-              installRustc = true;
-              installCargo = true;
-              settings = {
-                checkOnSave = true;
-                check.command = "clippy";
-              };
-            };
-          };
-        };
-      };
-    };
-  };
-}
diff --git a/home/modules/devtools/neovim/pluginsbak/lualine.nix b/home/modules/devtools/neovim/pluginsbak/lualine.nix
deleted file mode 100644
index efed05cd..00000000
--- a/home/modules/devtools/neovim/pluginsbak/lualine.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  programs.nixvim.plugins.lualine = {
-    enable = true;
-    theme = "gruvbox-material";
-
-    globalstatus = true;
-
-    # +-------------------------------------------------+
-    # | A | B | C                             X | Y | Z |
-    # +-------------------------------------------------+
-    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()
-                if next(clients) == nil then
-                    return msg
-                end
-                for _, client in ipairs(clients) do
-                    local filetypes = client.config.filetypes
-                    if filetypes and vim.fn.index(filetypes, buf_ft) ~= -1 then
-                        return client.name
-                    end
-                end
-                return msg
-            end
-          '';
-          icon = "";
-          color.fg = "#ffffff";
-        }
-        "encoding"
-        "fileformat"
-        "filetype"
-      ];
-    };
-  };
-}
diff --git a/home/modules/devtools/neovim/pluginsbak/markdown-preview.nix b/home/modules/devtools/neovim/pluginsbak/markdown-preview.nix
deleted file mode 100644
index 17b8f970..00000000
--- a/home/modules/devtools/neovim/pluginsbak/markdown-preview.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  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/home/modules/devtools/neovim/pluginsbak/neo-tree.nix b/home/modules/devtools/neovim/pluginsbak/neo-tree.nix
deleted file mode 100644
index 560e7f81..00000000
--- a/home/modules/devtools/neovim/pluginsbak/neo-tree.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  programs.nixvim = {
-    keymaps = [
-      {
-        mode = "n";
-        key = "<leader>n";
-        action = ":Neotree action=focus reveal toggle<CR>";
-        options.silent = true;
-      }
-    ];
-
-    plugins.neo-tree = {
-      enable = true;
-
-      closeIfLastWindow = true;
-      window = {
-        width = 30;
-        autoExpandWidth = true;
-      };
-    };
-  };
-}
diff --git a/home/modules/devtools/neovim/pluginsbak/nonels.nix b/home/modules/devtools/neovim/pluginsbak/nonels.nix
deleted file mode 100644
index f042bdbb..00000000
--- a/home/modules/devtools/neovim/pluginsbak/nonels.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  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;
-        nixpkgs_fmt.enable = true;
-        google_java_format.enable = false;
-        prettier = {
-          enable = true;
-          disableTsServerFormatter = true;
-        };
-        black = {
-          enable = true;
-          settings = ''
-            {
-              extra_args = { "--fast" },
-            }
-          '';
-        };
-      };
-      completion = {
-        luasnip.enable = true;
-        spell.enable = true;
-      };
-    };
-  };
-}
diff --git a/home/modules/devtools/neovim/pluginsbak/startify.nix b/home/modules/devtools/neovim/pluginsbak/startify.nix
deleted file mode 100644
index 28352a14..00000000
--- a/home/modules/devtools/neovim/pluginsbak/startify.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  programs.nixvim.plugins.startify = {
-    enable = true;
-
-    settings = {
-      custom_header = [
-        ""
-        "     ███╗   ██╗██╗██╗  ██╗██╗   ██╗██╗███╗   ███╗"
-        "     ████╗  ██║██║╚██╗██╔╝██║   ██║██║████╗ ████║"
-        "     ██╔██╗ ██║██║ ╚███╔╝ ██║   ██║██║██╔████╔██║"
-        "     ██║╚██╗██║██║ ██╔██╗ ╚██╗ ██╔╝██║██║╚██╔╝██║"
-        "     ██║ ╚████║██║██╔╝ ██╗ ╚████╔╝ ██║██║ ╚═╝ ██║"
-        "     ╚═╝  ╚═══╝╚═╝╚═╝  ╚═╝  ╚═══╝  ╚═╝╚═╝     ╚═╝"
-      ];
-
-      # When opening a file or bookmark, change to its directory.
-      change_to_dir = false;
-
-      # By default, the fortune header uses ASCII characters, because they work for everyone.
-      # If you set this option to 1 and your 'encoding' is "utf-8", Unicode box-drawing characters will
-      # be used instead.
-      use_unicode = true;
-
-      lists = [{type = "dir";}];
-      files_number = 30;
-
-      skiplist = [
-        "flake.lock"
-      ];
-    };
-  };
-}
diff --git a/home/modules/devtools/neovim/pluginsbak/tagbar.nix b/home/modules/devtools/neovim/pluginsbak/tagbar.nix
deleted file mode 100644
index 1478e9a7..00000000
--- a/home/modules/devtools/neovim/pluginsbak/tagbar.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  programs.nixvim = {
-    plugins.tagbar = {
-      enable = true;
-      settings.width = 50;
-    };
-
-    keymaps = [
-      {
-        mode = "n";
-        key = "<C-g>";
-        action = ":TagbarToggle<cr>";
-        options.silent = true;
-      }
-    ];
-  };
-}
diff --git a/home/modules/devtools/neovim/pluginsbak/telescope.nix b/home/modules/devtools/neovim/pluginsbak/telescope.nix
deleted file mode 100644
index 70d05762..00000000
--- a/home/modules/devtools/neovim/pluginsbak/telescope.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  programs.nixvim = {
-    plugins.telescope = {
-      enable = true;
-
-      keymaps = {
-        # Find files using Telescope command-line sugar.
-        "<leader>ff" = "find_files";
-        "<leader>fg" = "live_grep";
-        "<leader>b" = "buffers";
-        "<leader>fh" = "help_tags";
-        "<leader>fd" = "diagnostics";
-
-        # FZF like bindings
-        "<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/home/modules/devtools/neovim/pluginsbak/treesitter.nix b/home/modules/devtools/neovim/pluginsbak/treesitter.nix
deleted file mode 100644
index c5e8d7ab..00000000
--- a/home/modules/devtools/neovim/pluginsbak/treesitter.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  programs.nixvim.plugins = {
-    treesitter = {
-      enable = true;
-
-      nixvimInjections = true;
-
-      settings = {
-        highlight.enable = true;
-        indent.enable = true;
-      };
-      folding = true;
-    };
-
-    treesitter-refactor = {
-      enable = true;
-      highlightDefinitions = {
-        enable = true;
-        # Set to false if you have an `updatetime` of ~100.
-        clearOnCursorMove = false;
-      };
-    };
-
-    hmts.enable = true;
-  };
-}
diff --git a/home/modules/devtools/neovim/pluginsbak/vimtex.nix b/home/modules/devtools/neovim/pluginsbak/vimtex.nix
deleted file mode 100644
index 2cfbc803..00000000
--- a/home/modules/devtools/neovim/pluginsbak/vimtex.nix
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-  programs.nixvim = {
-    plugins.vimtex = {
-      enable = true;
-
-      settings = {
-        view_method = "zathura";
-
-        quickfix_enabled = true;
-        quickfix_open_on_warning = false;
-
-        # Ignore undesired errors and warnings
-        quickfix_ignore_filters = [
-          "Underfull"
-          "Overfull"
-          "specifier changed to"
-          "Token not allowed in a PDF string"
-        ];
-
-        # TOC settings
-        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";
-      }
-
-      # Folding
-      {
-        event = "FileType";
-        pattern = ["tex" "latex"];
-        callback.__raw = ''
-          function ()
-            vim.o.foldmethod = 'expr'
-            vim.o.foldexpr = 'vimtex#fold#level(v:lnum)'
-            vim.o.foldtext = 'vimtex#fold#text()'
-          end
-        '';
-      }
-
-      # Compile on initialization
-      {
-        event = "User";
-        pattern = "VimtexEventInitPost";
-        callback = "vimtex#compiler#compile";
-      }
-
-      # Cleanup on exit
-      {
-        event = "User";
-        pattern = "VimtexEventQuit";
-        command = "call vimtex#compiler#clean(0)";
-      }
-    ];
-  };
-}
diff --git a/home/modules/devtools/neovim/pluginsbak/yanky.nix b/home/modules/devtools/neovim/pluginsbak/yanky.nix
deleted file mode 100644
index 31437cf2..00000000
--- a/home/modules/devtools/neovim/pluginsbak/yanky.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  programs.nixvim.plugins.yanky = {
-    enable = true;
-  };
-}