diff --git a/common/flake.nix b/common/flake.nix
index 62cd992..e131d57 100644
--- a/common/flake.nix
+++ b/common/flake.nix
@@ -19,25 +19,13 @@
             lib,
             ...
           }:
-          let
-            ccfg = import ./config.nix;
-            cfg_path = "${ccfg.custom_config_key}";
-            cfg = config.${cfg_path};
-          in
           {
             imports = [
+              ./options.nix
               ./boot
               ./users
               ./general
             ];
-            options.${cfg_path} = {
-              systemName = lib.mkOption {
-                type = lib.types.str;
-                description = "The name of the system.";
-              };
-            };
-            config = {
-            };
           };
       };
     };
diff --git a/common/options.nix b/common/options.nix
new file mode 100644
index 0000000..7bcb038
--- /dev/null
+++ b/common/options.nix
@@ -0,0 +1,18 @@
+{
+  config,
+  lib,
+  ...
+}:
+let
+  ccfg = import ./config.nix;
+  cfg_path = "${ccfg.custom_config_key}";
+  cfg = config.${cfg_path};
+in
+{
+  options.${cfg_path} = {
+    systemName = lib.mkOption {
+      type = lib.types.str;
+      description = "The name of the system.";
+    };
+  };
+}
diff --git a/hosts/oren/flake.lock b/hosts/oren/flake.lock
index 076014a..2d01317 100644
--- a/hosts/oren/flake.lock
+++ b/hosts/oren/flake.lock
@@ -92,13 +92,11 @@
         "cosmic": "cosmic",
         "home-manager": "home-manager",
         "hyprland": "hyprland",
-        "ragenix": "ragenix",
-        "ringofstorms-stormd": "ringofstorms-stormd",
-        "ros_neovim": "ros_neovim"
+        "ragenix": "ragenix"
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-xpDOOJlNx2099ulDW5qxKZ5OjAqTTNOmRlojqTr9CeA=",
+        "narHash": "sha256-+VmwC3iBifKFM2Lll+N7Y33JueHFWPWk574t9CmaDIo=",
         "path": "../../common",
         "type": "path"
       },
@@ -699,7 +697,7 @@
     "mod_home-manager": {
       "inputs": {
         "home-manager": "home-manager_3",
-        "nixpkgs": "nixpkgs_7"
+        "nixpkgs": "nixpkgs_5"
       },
       "locked": {
         "lastModified": 1736544172,
@@ -735,21 +733,6 @@
         "url": "https://git.joshuabell.xyz/dotfiles"
       }
     },
-    "nix-filter": {
-      "locked": {
-        "lastModified": 1710156097,
-        "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=",
-        "owner": "numtide",
-        "repo": "nix-filter",
-        "rev": "3342559a24e85fc164b295c3444e8a139924675b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "nix-filter",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1742069588,
@@ -782,21 +765,6 @@
         "type": "github"
       }
     },
-    "nixpkgs_10": {
-      "locked": {
-        "lastModified": 1740685317,
-        "narHash": "sha256-McnorkGWNGrS/e6U9i7mMP4L/usaDh3zfssxDUigLzQ=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "e90d001cbb341188ba57776b108102aba760d8ba",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs_2": {
       "locked": {
         "lastModified": 1731755305,
@@ -846,37 +814,6 @@
       }
     },
     "nixpkgs_5": {
-      "locked": {
-        "lastModified": 1728888510,
-        "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_6": {
-      "locked": {
-        "lastModified": 1741704334,
-        "narHash": "sha256-QqX3y+biQ7Q334y3FxYRGUtHl213D03z8EXQj6I8GWI=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "192acafc64c5ff2ee75e372f1cf8fa1c7097f36c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_7": {
       "locked": {
         "lastModified": 1736344531,
         "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=",
@@ -892,7 +829,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_8": {
+    "nixpkgs_6": {
       "locked": {
         "lastModified": 1725634671,
         "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=",
@@ -908,13 +845,13 @@
         "type": "github"
       }
     },
-    "nixpkgs_9": {
+    "nixpkgs_7": {
       "locked": {
-        "lastModified": 1741445498,
-        "narHash": "sha256-F5Em0iv/CxkN5mZ9hRn3vPknpoWdcdCyR0e4WklHwiE=",
+        "lastModified": 1742136038,
+        "narHash": "sha256-DDe16FJk18sadknQKKG/9FbwEro7A57tg9vB5kxZ8kY=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "52e3095f6d812b91b22fb7ad0bfc1ab416453634",
+        "rev": "a1185f4064c18a5db37c5c84e5638c78b46e3341",
         "type": "github"
       },
       "original": {
@@ -924,23 +861,22 @@
         "type": "github"
       }
     },
-    "nvim_plugin-Almo7aya/openingh.nvim": {
-      "flake": false,
+    "nixpkgs_8": {
       "locked": {
-        "lastModified": 1733158448,
-        "narHash": "sha256-JP3+goMgs3SiMHS9IVE7NAV/iKxyXi0fZgJb8hojtNQ=",
-        "owner": "Almo7aya",
-        "repo": "openingh.nvim",
-        "rev": "9131016c1167e23522a8e874b62217829fd327b8",
+        "lastModified": 1741704334,
+        "narHash": "sha256-QqX3y+biQ7Q334y3FxYRGUtHl213D03z8EXQj6I8GWI=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "192acafc64c5ff2ee75e372f1cf8fa1c7097f36c",
         "type": "github"
       },
       "original": {
-        "owner": "Almo7aya",
-        "repo": "openingh.nvim",
+        "owner": "nixos",
+        "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nvim_plugin-Almo7aya/openingh.nvim_2": {
+    "nvim_plugin-Almo7aya/openingh.nvim": {
       "flake": false,
       "locked": {
         "lastModified": 1733158448,
@@ -972,22 +908,6 @@
         "type": "github"
       }
     },
-    "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1740683792,
-        "narHash": "sha256-eJQeT0oIGvE/QMjLJwdQBIvd4871bwuuBgieNuzB3L0=",
-        "owner": "CopilotC-Nvim",
-        "repo": "CopilotChat.nvim",
-        "rev": "d661d7ee0042df088a3cd45798301b4c2d19ce1b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "CopilotC-Nvim",
-        "repo": "CopilotChat.nvim",
-        "type": "github"
-      }
-    },
     "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring": {
       "flake": false,
       "locked": {
@@ -1004,22 +924,6 @@
         "type": "github"
       }
     },
-    "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1733574156,
-        "narHash": "sha256-AjDM3+n4+lNBQi8P2Yrh0Ab06uYCndBQT9TX36rDbOM=",
-        "owner": "JoosepAlviste",
-        "repo": "nvim-ts-context-commentstring",
-        "rev": "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "JoosepAlviste",
-        "repo": "nvim-ts-context-commentstring",
-        "type": "github"
-      }
-    },
     "nvim_plugin-L3MON4D3/LuaSnip": {
       "flake": false,
       "locked": {
@@ -1036,22 +940,6 @@
         "type": "github"
       }
     },
-    "nvim_plugin-L3MON4D3/LuaSnip_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1736009707,
-        "narHash": "sha256-3ecm5SDTcSOh256xSQPHhddQfMpepiEIpv58fHXrVg0=",
-        "owner": "L3MON4D3",
-        "repo": "LuaSnip",
-        "rev": "c9b9a22904c97d0eb69ccb9bab76037838326817",
-        "type": "github"
-      },
-      "original": {
-        "owner": "L3MON4D3",
-        "repo": "LuaSnip",
-        "type": "github"
-      }
-    },
     "nvim_plugin-MeanderingProgrammer/render-markdown.nvim": {
       "flake": false,
       "locked": {
@@ -1068,22 +956,6 @@
         "type": "github"
       }
     },
-    "nvim_plugin-MeanderingProgrammer/render-markdown.nvim_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1740525830,
-        "narHash": "sha256-zPXQYfbHxAA/x/tucpF7SnRPeTRi20nJZ+AJa9FaIuk=",
-        "owner": "MeanderingProgrammer",
-        "repo": "render-markdown.nvim",
-        "rev": "1cd546e96cb8520a148610ca86596ed238eeb936",
-        "type": "github"
-      },
-      "original": {
-        "owner": "MeanderingProgrammer",
-        "repo": "render-markdown.nvim",
-        "type": "github"
-      }
-    },
     "nvim_plugin-MunifTanjim/nui.nvim": {
       "flake": false,
       "locked": {
@@ -1100,22 +972,6 @@
         "type": "github"
       }
     },
-    "nvim_plugin-MunifTanjim/nui.nvim_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1733856815,
-        "narHash": "sha256-6U7E/i5FuNXQy+sF4C5DVxuTPqNKD5wxUgFohpOjm9Q=",
-        "owner": "MunifTanjim",
-        "repo": "nui.nvim",
-        "rev": "53e907ffe5eedebdca1cd503b00aa8692068ca46",
-        "type": "github"
-      },
-      "original": {
-        "owner": "MunifTanjim",
-        "repo": "nui.nvim",
-        "type": "github"
-      }
-    },
     "nvim_plugin-RRethy/vim-illuminate": {
       "flake": false,
       "locked": {
@@ -1132,22 +988,6 @@
         "type": "github"
       }
     },
-    "nvim_plugin-RRethy/vim-illuminate_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1740540215,
-        "narHash": "sha256-jSny+5RHgxcsoxWwIaFUZ022dk3mDRKZ7dibvE6I2fE=",
-        "owner": "RRethy",
-        "repo": "vim-illuminate",
-        "rev": "19cb21f513fc2b02f0c66be70107741e837516a1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "RRethy",
-        "repo": "vim-illuminate",
-        "type": "github"
-      }
-    },
     "nvim_plugin-Saecki/crates.nvim": {
       "flake": false,
       "locked": {
@@ -1164,22 +1004,6 @@
         "type": "github"
       }
     },
-    "nvim_plugin-Saecki/crates.nvim_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1740064212,
-        "narHash": "sha256-xuRth8gfX6ZTV3AUBaTM9VJr7ulsNFxtKEsFDZduDC8=",
-        "owner": "Saecki",
-        "repo": "crates.nvim",
-        "rev": "1803c8b5516610ba7cdb759a4472a78414ee6cd4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Saecki",
-        "repo": "crates.nvim",
-        "type": "github"
-      }
-    },
     "nvim_plugin-aznhe21/actions-preview.nvim": {
       "flake": false,
       "locked": {
@@ -1196,22 +1020,6 @@
         "type": "github"
       }
     },
-    "nvim_plugin-aznhe21/actions-preview.nvim_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1740589350,
-        "narHash": "sha256-MP1hohDL2JFembwW+cb2S+v2Y7j0iZw1jPPKTZiNCWI=",
-        "owner": "aznhe21",
-        "repo": "actions-preview.nvim",
-        "rev": "4ab7842eb6a5b6d2b004f8234dcf33382a0fdde2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "aznhe21",
-        "repo": "actions-preview.nvim",
-        "type": "github"
-      }
-    },
     "nvim_plugin-b0o/schemastore.nvim": {
       "flake": false,
       "locked": {
@@ -1228,22 +1036,6 @@
         "type": "github"
       }
     },
-    "nvim_plugin-b0o/schemastore.nvim_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1740628849,
-        "narHash": "sha256-I7Q2H4PR6R2BOR7wFFgisj5e+2DkbsLlG89d+S/yavg=",
-        "owner": "b0o",
-        "repo": "schemastore.nvim",
-        "rev": "9f548557c1ef2ea24a4e24940cf0011c448112ae",
-        "type": "github"
-      },
-      "original": {
-        "owner": "b0o",
-        "repo": "schemastore.nvim",
-        "type": "github"
-      }
-    },
     "nvim_plugin-catppuccin/nvim": {
       "flake": false,
       "locked": {
@@ -1260,22 +1052,6 @@
         "type": "github"
       }
     },
-    "nvim_plugin-catppuccin/nvim_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1740591419,
-        "narHash": "sha256-gz9mq2YVJ1KT6hQBpw4ww7VVpKuXBgWV3IZzuuQXNxw=",
-        "owner": "catppuccin",
-        "repo": "nvim",
-        "rev": "7ab1a6ec70a664ecb95d84669efc20aaf4f4ed1b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "catppuccin",
-        "repo": "nvim",
-        "type": "github"
-      }
-    },
     "nvim_plugin-chrisgrieser/nvim-early-retirement": {
       "flake": false,
       "locked": {
@@ -1292,22 +1068,6 @@
         "type": "github"
       }
     },
-    "nvim_plugin-chrisgrieser/nvim-early-retirement_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1735588187,
-        "narHash": "sha256-ZjXG+POJFRsc79i1BuAJB9K6UBUfHT05oYvZaUr+RqA=",
-        "owner": "chrisgrieser",
-        "repo": "nvim-early-retirement",
-        "rev": "9ae6fcc933fc865ddf2728460194b67985e06e27",
-        "type": "github"
-      },
-      "original": {
-        "owner": "chrisgrieser",
-        "repo": "nvim-early-retirement",
-        "type": "github"
-      }
-    },
     "nvim_plugin-declancm/cinnamon.nvim": {
       "flake": false,
       "locked": {
@@ -1324,22 +1084,6 @@
         "type": "github"
       }
     },
-    "nvim_plugin-declancm/cinnamon.nvim_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1722992123,
-        "narHash": "sha256-kccQ4iFMSQ8kvE7hYz90hBrsDLo7VohFj/6lEZZiAO8=",
-        "owner": "declancm",
-        "repo": "cinnamon.nvim",
-        "rev": "450cb3247765fed7871b41ef4ce5fa492d834215",
-        "type": "github"
-      },
-      "original": {
-        "owner": "declancm",
-        "repo": "cinnamon.nvim",
-        "type": "github"
-      }
-    },
     "nvim_plugin-folke/lazy.nvim": {
       "flake": false,
       "locked": {
@@ -1356,22 +1100,6 @@
         "type": "github"
       }
     },
-    "nvim_plugin-folke/lazy.nvim_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1740511197,
-        "narHash": "sha256-nQ8PR9DTdzg6Z2rViuVD6Pswc2VvDQwS3uMNgyDh5ls=",
-        "owner": "folke",
-        "repo": "lazy.nvim",
-        "rev": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "folke",
-        "repo": "lazy.nvim",
-        "type": "github"
-      }
-    },
     "nvim_plugin-folke/neodev.nvim": {
       "flake": false,
       "locked": {
@@ -1388,22 +1116,6 @@
         "type": "github"
       }
     },
-    "nvim_plugin-folke/neodev.nvim_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1720260306,
-        "narHash": "sha256-hOjzlo/IqmV8tYjGwfmcCPEmHYsWnEIwtHZdhpwA1kM=",
-        "owner": "folke",
-        "repo": "neodev.nvim",
-        "rev": "46aa467dca16cf3dfe27098042402066d2ae242d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "folke",
-        "repo": "neodev.nvim",
-        "type": "github"
-      }
-    },
     "nvim_plugin-folke/which-key.nvim": {
       "flake": false,
       "locked": {
@@ -1420,22 +1132,6 @@
         "type": "github"
       }
     },
-    "nvim_plugin-folke/which-key.nvim_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1740233407,
-        "narHash": "sha256-uvMcSduMr7Kd2oUmIOYzvWF4FIl6bZxIYm9FSw/3pCo=",
-        "owner": "folke",
-        "repo": "which-key.nvim",
-        "rev": "370ec46f710e058c9c1646273e6b225acf47cbed",
-        "type": "github"
-      },
-      "original": {
-        "owner": "folke",
-        "repo": "which-key.nvim",
-        "type": "github"
-      }
-    },
     "nvim_plugin-hrsh7th/cmp-buffer": {
       "flake": false,
       "locked": {
@@ -1452,22 +1148,6 @@
         "type": "github"
       }
     },
-    "nvim_plugin-hrsh7th/cmp-buffer_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1660101488,
-        "narHash": "sha256-dG4U7MtnXThoa/PD+qFtCt76MQ14V1wX8GMYcvxEnbM=",
-        "owner": "hrsh7th",
-        "repo": "cmp-buffer",
-        "rev": "3022dbc9166796b644a841a02de8dd1cc1d311fa",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hrsh7th",
-        "repo": "cmp-buffer",
-        "type": "github"
-      }
-    },
     "nvim_plugin-hrsh7th/cmp-nvim-lsp": {
       "flake": false,
       "locked": {
@@ -1484,22 +1164,6 @@
         "type": "github"
       }
     },
-    "nvim_plugin-hrsh7th/cmp-nvim-lsp_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1733823748,
-        "narHash": "sha256-iaihXNCF5bB5MdeoosD/kc3QtpA/QaIDZVLiLIurBSM=",
-        "owner": "hrsh7th",
-        "repo": "cmp-nvim-lsp",
-        "rev": "99290b3ec1322070bcfb9e846450a46f6efa50f0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hrsh7th",
-        "repo": "cmp-nvim-lsp",
-        "type": "github"
-      }
-    },
     "nvim_plugin-hrsh7th/cmp-path": {
       "flake": false,
       "locked": {
@@ -1516,22 +1180,6 @@
         "type": "github"
       }
     },
-    "nvim_plugin-hrsh7th/cmp-path_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1664784283,
-        "narHash": "sha256-thppiiV3wjIaZnAXmsh7j3DUc6ceSCvGzviwFUnoPaI=",
-        "owner": "hrsh7th",
-        "repo": "cmp-path",
-        "rev": "91ff86cd9c29299a64f968ebb45846c485725f23",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hrsh7th",
-        "repo": "cmp-path",
-        "type": "github"
-      }
-    },
     "nvim_plugin-hrsh7th/nvim-cmp": {
       "flake": false,
       "locked": {
@@ -1548,22 +1196,6 @@
         "type": "github"
       }
     },
-    "nvim_plugin-hrsh7th/nvim-cmp_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1740323789,
-        "narHash": "sha256-dBAYadxdnl0j5e8VnnyGxx2AE6GgCDyIBxEgmrNawxo=",
-        "owner": "hrsh7th",
-        "repo": "nvim-cmp",
-        "rev": "5a11682453ac6b13dbf32cd403da4ee9c07ef1c3",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hrsh7th",
-        "repo": "nvim-cmp",
-        "type": "github"
-      }
-    },
     "nvim_plugin-j-hui/fidget.nvim": {
       "flake": false,
       "locked": {
@@ -1580,22 +1212,6 @@
         "type": "github"
       }
     },
-    "nvim_plugin-j-hui/fidget.nvim_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1738817426,
-        "narHash": "sha256-AFUx/ZQVWV7s5Wlppjk6N9QXoJKNKqxtf990FFlTEhw=",
-        "owner": "j-hui",
-        "repo": "fidget.nvim",
-        "rev": "d9ba6b7bfe29b3119a610892af67602641da778e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "j-hui",
-        "repo": "fidget.nvim",
-        "type": "github"
-      }
-    },
     "nvim_plugin-johmsalas/text-case.nvim": {
       "flake": false,
       "locked": {
@@ -1612,22 +1228,6 @@
         "type": "github"
       }
     },
-    "nvim_plugin-johmsalas/text-case.nvim_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1722628320,
-        "narHash": "sha256-2IMufSMy9JW50VzZ3SgOtp8kYs81ANwV0eP0ZH3rTFo=",
-        "owner": "johmsalas",
-        "repo": "text-case.nvim",
-        "rev": "e898cfd46fa6cde0e83abb624a16e67d2ffc6457",
-        "type": "github"
-      },
-      "original": {
-        "owner": "johmsalas",
-        "repo": "text-case.nvim",
-        "type": "github"
-      }
-    },
     "nvim_plugin-lewis6991/gitsigns.nvim": {
       "flake": false,
       "locked": {
@@ -1644,22 +1244,6 @@
         "type": "github"
       }
     },
-    "nvim_plugin-lewis6991/gitsigns.nvim_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1740070082,
-        "narHash": "sha256-PIwKEPNAkTiZAr8tncjFakvOWX1D5TOdSiurVZ5AcbQ=",
-        "owner": "lewis6991",
-        "repo": "gitsigns.nvim",
-        "rev": "4c40357994f386e72be92a46f41fc1664c84c87d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "lewis6991",
-        "repo": "gitsigns.nvim",
-        "type": "github"
-      }
-    },
     "nvim_plugin-lnc3l0t/glow.nvim": {
       "flake": false,
       "locked": {
@@ -1676,22 +1260,6 @@
         "type": "github"
       }
     },
-    "nvim_plugin-lnc3l0t/glow.nvim_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1693233815,
-        "narHash": "sha256-vdlwkIK2EkFviJmSiOqPWvc15xqJ9F2gHCC4ObJ5Qjk=",
-        "owner": "lnc3l0t",
-        "repo": "glow.nvim",
-        "rev": "5b38fb7b6e806cac62707a4aba8c10c5f14d5bb5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "lnc3l0t",
-        "repo": "glow.nvim",
-        "type": "github"
-      }
-    },
     "nvim_plugin-lukas-reineke/indent-blankline.nvim": {
       "flake": false,
       "locked": {
@@ -1708,22 +1276,6 @@
         "type": "github"
       }
     },
-    "nvim_plugin-lukas-reineke/indent-blankline.nvim_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1737369467,
-        "narHash": "sha256-0+boInVEzS2myYil/l+frs8PAa/2eJcVTyXnEk6TGvI=",
-        "owner": "lukas-reineke",
-        "repo": "indent-blankline.nvim",
-        "rev": "e10626f7fcd51ccd56d7ffc00883ba7e0aa28f78",
-        "type": "github"
-      },
-      "original": {
-        "owner": "lukas-reineke",
-        "repo": "indent-blankline.nvim",
-        "type": "github"
-      }
-    },
     "nvim_plugin-lvimuser/lsp-inlayhints.nvim": {
       "flake": false,
       "locked": {
@@ -1740,22 +1292,6 @@
         "type": "github"
       }
     },
-    "nvim_plugin-lvimuser/lsp-inlayhints.nvim_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1686236485,
-        "narHash": "sha256-06CiJ+xeMO4+OJkckcslqwloJyt2gwg514JuxV6KOfQ=",
-        "owner": "lvimuser",
-        "repo": "lsp-inlayhints.nvim",
-        "rev": "d981f65c9ae0b6062176f0accb9c151daeda6f16",
-        "type": "github"
-      },
-      "original": {
-        "owner": "lvimuser",
-        "repo": "lsp-inlayhints.nvim",
-        "type": "github"
-      }
-    },
     "nvim_plugin-m4xshen/hardtime.nvim": {
       "flake": false,
       "locked": {
@@ -1772,22 +1308,6 @@
         "type": "github"
       }
     },
-    "nvim_plugin-m4xshen/hardtime.nvim_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1740373275,
-        "narHash": "sha256-IppXjTZ0MnhJJsjHpkEMzLE9E27c9BS+TmyaMUo77S0=",
-        "owner": "m4xshen",
-        "repo": "hardtime.nvim",
-        "rev": "48689c55f1204427206afc4ea1b9461a587d4558",
-        "type": "github"
-      },
-      "original": {
-        "owner": "m4xshen",
-        "repo": "hardtime.nvim",
-        "type": "github"
-      }
-    },
     "nvim_plugin-mbbill/undotree": {
       "flake": false,
       "locked": {
@@ -1804,22 +1324,6 @@
         "type": "github"
       }
     },
-    "nvim_plugin-mbbill/undotree_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1735763701,
-        "narHash": "sha256-0DnRarEuDPdYo+zkwH47jG4B4fGjvL1LxqEoFQ7vpjE=",
-        "owner": "mbbill",
-        "repo": "undotree",
-        "rev": "2556c6800b210b2096b55b66e74b4cc1d9ebbe4f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "mbbill",
-        "repo": "undotree",
-        "type": "github"
-      }
-    },
     "nvim_plugin-mfussenegger/nvim-lint": {
       "flake": false,
       "locked": {
@@ -1836,22 +1340,6 @@
         "type": "github"
       }
     },
-    "nvim_plugin-mfussenegger/nvim-lint_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1738838825,
-        "narHash": "sha256-E/KcQr4RM4gz+ItENI9e7hMicyBKyzoIaDO5D1VDYSw=",
-        "owner": "mfussenegger",
-        "repo": "nvim-lint",
-        "rev": "6e9dd545a1af204c4022a8fcd99727ea41ffdcc8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "mfussenegger",
-        "repo": "nvim-lint",
-        "type": "github"
-      }
-    },
     "nvim_plugin-mrcjkb/rustaceanvim": {
       "flake": false,
       "locked": {
@@ -1868,22 +1356,6 @@
         "type": "github"
       }
     },
-    "nvim_plugin-mrcjkb/rustaceanvim_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1740493091,
-        "narHash": "sha256-kb25N7Iv/NZKfbnJs6l8xj4CKqz48jIX17jPueMrX2Q=",
-        "owner": "mrcjkb",
-        "repo": "rustaceanvim",
-        "rev": "2b0f0b7e03751cf8ed123322f9b02d8f73fa9df7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "mrcjkb",
-        "repo": "rustaceanvim",
-        "type": "github"
-      }
-    },
     "nvim_plugin-neovim/nvim-lspconfig": {
       "flake": false,
       "locked": {
@@ -1900,22 +1372,6 @@
         "type": "github"
       }
     },
-    "nvim_plugin-neovim/nvim-lspconfig_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1740659501,
-        "narHash": "sha256-0z3Ot5Q0W871eSCk6nY7ucR9c2DCXKSISZgr3L7knWc=",
-        "owner": "neovim",
-        "repo": "nvim-lspconfig",
-        "rev": "9dc8ecb488413d879d5d259b1ec66cf0fa7ffbe9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "neovim",
-        "repo": "nvim-lspconfig",
-        "type": "github"
-      }
-    },
     "nvim_plugin-nosduco/remote-sshfs.nvim": {
       "flake": false,
       "locked": {
@@ -1932,22 +1388,6 @@
         "type": "github"
       }
     },
-    "nvim_plugin-nosduco/remote-sshfs.nvim_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1724901856,
-        "narHash": "sha256-vFEIISxhTIGSl9LzDYHuEIkjLGkU0y5XhfWI/i5DgN4=",
-        "owner": "nosduco",
-        "repo": "remote-sshfs.nvim",
-        "rev": "03f6c40c4032eeb1ab91368e06db9c3f3a97a75d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nosduco",
-        "repo": "remote-sshfs.nvim",
-        "type": "github"
-      }
-    },
     "nvim_plugin-numToStr/Comment.nvim": {
       "flake": false,
       "locked": {
@@ -1964,22 +1404,6 @@
         "type": "github"
       }
     },
-    "nvim_plugin-numToStr/Comment.nvim_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1717957420,
-        "narHash": "sha256-h0kPue5Eqd5aeu4VoLH45pF0DmWWo1d8SnLICSQ63zc=",
-        "owner": "numToStr",
-        "repo": "Comment.nvim",
-        "rev": "e30b7f2008e52442154b66f7c519bfd2f1e32acb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numToStr",
-        "repo": "Comment.nvim",
-        "type": "github"
-      }
-    },
     "nvim_plugin-nvim-lua/plenary.nvim": {
       "flake": false,
       "locked": {
@@ -1996,22 +1420,6 @@
         "type": "github"
       }
     },
-    "nvim_plugin-nvim-lua/plenary.nvim_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1739311008,
-        "narHash": "sha256-8FV5RjF7QbDmQOQynpK7uRKONKbPRYbOPugf9ZxNvUs=",
-        "owner": "nvim-lua",
-        "repo": "plenary.nvim",
-        "rev": "857c5ac632080dba10aae49dba902ce3abf91b35",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nvim-lua",
-        "repo": "plenary.nvim",
-        "type": "github"
-      }
-    },
     "nvim_plugin-nvim-lualine/lualine.nvim": {
       "flake": false,
       "locked": {
@@ -2028,22 +1436,6 @@
         "type": "github"
       }
     },
-    "nvim_plugin-nvim-lualine/lualine.nvim_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1738997087,
-        "narHash": "sha256-uAxe3UdNUVfdpQcKvGvQ/E2blGksvMPlTBfEOtgeVYo=",
-        "owner": "nvim-lualine",
-        "repo": "lualine.nvim",
-        "rev": "f4f791f67e70d378a754d02da068231d2352e5bc",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nvim-lualine",
-        "repo": "lualine.nvim",
-        "type": "github"
-      }
-    },
     "nvim_plugin-nvim-telescope/telescope-file-browser.nvim": {
       "flake": false,
       "locked": {
@@ -2060,22 +1452,6 @@
         "type": "github"
       }
     },
-    "nvim_plugin-nvim-telescope/telescope-file-browser.nvim_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1729728595,
-        "narHash": "sha256-VJbRi91TTOwUkQYyTM6Njl7MtX8/mOjINiqWYWEtyxg=",
-        "owner": "nvim-telescope",
-        "repo": "telescope-file-browser.nvim",
-        "rev": "626998e5c1b71c130d8bc6cf7abb6709b98287bb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nvim-telescope",
-        "repo": "telescope-file-browser.nvim",
-        "type": "github"
-      }
-    },
     "nvim_plugin-nvim-telescope/telescope-fzf-native.nvim": {
       "flake": false,
       "locked": {
@@ -2092,22 +1468,6 @@
         "type": "github"
       }
     },
-    "nvim_plugin-nvim-telescope/telescope-fzf-native.nvim_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1739308171,
-        "narHash": "sha256-0dGvpN8Vn+aU6j8N0tTD8AOzOAHGemlPAcLKyqlWvlg=",
-        "owner": "nvim-telescope",
-        "repo": "telescope-fzf-native.nvim",
-        "rev": "2a5ceff981501cff8f46871d5402cd3378a8ab6a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nvim-telescope",
-        "repo": "telescope-fzf-native.nvim",
-        "type": "github"
-      }
-    },
     "nvim_plugin-nvim-telescope/telescope-ui-select.nvim": {
       "flake": false,
       "locked": {
@@ -2124,22 +1484,6 @@
         "type": "github"
       }
     },
-    "nvim_plugin-nvim-telescope/telescope-ui-select.nvim_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1701723223,
-        "narHash": "sha256-YRhNmmG4gx9Ht8JwjQfbTjJyTHEuZmtP6lqnhOsk8bE=",
-        "owner": "nvim-telescope",
-        "repo": "telescope-ui-select.nvim",
-        "rev": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nvim-telescope",
-        "repo": "telescope-ui-select.nvim",
-        "type": "github"
-      }
-    },
     "nvim_plugin-nvim-telescope/telescope.nvim": {
       "flake": false,
       "locked": {
@@ -2156,22 +1500,6 @@
         "type": "github"
       }
     },
-    "nvim_plugin-nvim-telescope/telescope.nvim_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1740415224,
-        "narHash": "sha256-Di0UIBXcnReT+6BaCdzTTg2j7oGzzXw6KfS4VbrBelE=",
-        "owner": "nvim-telescope",
-        "repo": "telescope.nvim",
-        "rev": "814f102cd1da3dc78c7d2f20f2ef3ed3cdf0e6e4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nvim-telescope",
-        "repo": "telescope.nvim",
-        "type": "github"
-      }
-    },
     "nvim_plugin-nvim-tree/nvim-tree.lua": {
       "flake": false,
       "locked": {
@@ -2188,22 +1516,6 @@
         "type": "github"
       }
     },
-    "nvim_plugin-nvim-tree/nvim-tree.lua_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1740187879,
-        "narHash": "sha256-JjuCokexVKz3kf9YxFPpxiKTvkXfbhsbp50Sqfd2RtQ=",
-        "owner": "nvim-tree",
-        "repo": "nvim-tree.lua",
-        "rev": "6709463b2d18e77f7a946027917aa00d4aaed6f4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nvim-tree",
-        "repo": "nvim-tree.lua",
-        "type": "github"
-      }
-    },
     "nvim_plugin-nvim-tree/nvim-web-devicons": {
       "flake": false,
       "locked": {
@@ -2220,22 +1532,6 @@
         "type": "github"
       }
     },
-    "nvim_plugin-nvim-tree/nvim-web-devicons_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1739285356,
-        "narHash": "sha256-WOFtHvNlPP1JRLdCfFRXEOUx+1z5d5ncm+pS0wpDjAg=",
-        "owner": "nvim-tree",
-        "repo": "nvim-web-devicons",
-        "rev": "1020869742ecb191f260818234517f4a1515cfe8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nvim-tree",
-        "repo": "nvim-web-devicons",
-        "type": "github"
-      }
-    },
     "nvim_plugin-nvim-treesitter/nvim-treesitter-context": {
       "flake": false,
       "locked": {
@@ -2252,22 +1548,6 @@
         "type": "github"
       }
     },
-    "nvim_plugin-nvim-treesitter/nvim-treesitter-context_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1739807466,
-        "narHash": "sha256-MSfSbepp+sA0GHz2StzgcQgWMhd04fmW9swmUGLiuo4=",
-        "owner": "nvim-treesitter",
-        "repo": "nvim-treesitter-context",
-        "rev": "198720b4016af04c9590f375d714d5bf8afecc1a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nvim-treesitter",
-        "repo": "nvim-treesitter-context",
-        "type": "github"
-      }
-    },
     "nvim_plugin-rafamadriz/friendly-snippets": {
       "flake": false,
       "locked": {
@@ -2284,22 +1564,6 @@
         "type": "github"
       }
     },
-    "nvim_plugin-rafamadriz/friendly-snippets_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1733106470,
-        "narHash": "sha256-I8SRZxnoNC6SOWW+scoA77Jwyxcb4eUczppLdyOiZe0=",
-        "owner": "rafamadriz",
-        "repo": "friendly-snippets",
-        "rev": "efff286dd74c22f731cdec26a70b46e5b203c619",
-        "type": "github"
-      },
-      "original": {
-        "owner": "rafamadriz",
-        "repo": "friendly-snippets",
-        "type": "github"
-      }
-    },
     "nvim_plugin-rcarriga/nvim-notify": {
       "flake": false,
       "locked": {
@@ -2316,22 +1580,6 @@
         "type": "github"
       }
     },
-    "nvim_plugin-rcarriga/nvim-notify_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1737405174,
-        "narHash": "sha256-6vNfc7E9DMXF0IBXJCLA8Rp+uOgbDch/Q7beW0ys3Vo=",
-        "owner": "rcarriga",
-        "repo": "nvim-notify",
-        "rev": "22f29093eae7785773ee9d543f8750348b1a195c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "rcarriga",
-        "repo": "nvim-notify",
-        "type": "github"
-      }
-    },
     "nvim_plugin-rmagatti/auto-session": {
       "flake": false,
       "locked": {
@@ -2348,22 +1596,6 @@
         "type": "github"
       }
     },
-    "nvim_plugin-rmagatti/auto-session_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1739298965,
-        "narHash": "sha256-RlWERZuBmF4kOqgyQT6L9LgqgG1VPtBapYYHZpWOg0o=",
-        "owner": "rmagatti",
-        "repo": "auto-session",
-        "rev": "9c3f977aafb56bd73ba0d082c4dcbdba5666faf3",
-        "type": "github"
-      },
-      "original": {
-        "owner": "rmagatti",
-        "repo": "auto-session",
-        "type": "github"
-      }
-    },
     "nvim_plugin-ron/ron.vim": {
       "flake": false,
       "locked": {
@@ -2380,22 +1612,6 @@
         "type": "github"
       }
     },
-    "nvim_plugin-ron/ron.vim_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1660904719,
-        "narHash": "sha256-8/xJmymtVGVz2avzlamgK1cNflZ3NRL+B3c7xxbI964=",
-        "owner": "ron-rs",
-        "repo": "ron.vim",
-        "rev": "f749e543975a82e8dd9a6e7df9600a1c098ae800",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ron-rs",
-        "repo": "ron.vim",
-        "type": "github"
-      }
-    },
     "nvim_plugin-saadparwaiz1/cmp_luasnip": {
       "flake": false,
       "locked": {
@@ -2412,22 +1628,6 @@
         "type": "github"
       }
     },
-    "nvim_plugin-saadparwaiz1/cmp_luasnip_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1730707109,
-        "narHash": "sha256-86lKQPPyqFz8jzuLajjHMKHrYnwW6+QOcPyQEx6B+gw=",
-        "owner": "saadparwaiz1",
-        "repo": "cmp_luasnip",
-        "rev": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90",
-        "type": "github"
-      },
-      "original": {
-        "owner": "saadparwaiz1",
-        "repo": "cmp_luasnip",
-        "type": "github"
-      }
-    },
     "nvim_plugin-sindrets/diffview.nvim": {
       "flake": false,
       "locked": {
@@ -2444,22 +1644,6 @@
         "type": "github"
       }
     },
-    "nvim_plugin-sindrets/diffview.nvim_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1718279802,
-        "narHash": "sha256-SX+ybIzL/w6uyCy4iZKnWnzTFwqB1oXSgyYVAdpdKi8=",
-        "owner": "sindrets",
-        "repo": "diffview.nvim",
-        "rev": "4516612fe98ff56ae0415a259ff6361a89419b0a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "sindrets",
-        "repo": "diffview.nvim",
-        "type": "github"
-      }
-    },
     "nvim_plugin-stevearc/conform.nvim": {
       "flake": false,
       "locked": {
@@ -2476,22 +1660,6 @@
         "type": "github"
       }
     },
-    "nvim_plugin-stevearc/conform.nvim_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1739657764,
-        "narHash": "sha256-H9JLiRtixDKDN50SH6gkqgjlhLzHMAaOT1pc69ZFdco=",
-        "owner": "stevearc",
-        "repo": "conform.nvim",
-        "rev": "a6f5bdb78caa305496357d17e962bbc4c0b392e2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "stevearc",
-        "repo": "conform.nvim",
-        "type": "github"
-      }
-    },
     "nvim_plugin-stevearc/dressing.nvim": {
       "flake": false,
       "locked": {
@@ -2508,22 +1676,6 @@
         "type": "github"
       }
     },
-    "nvim_plugin-stevearc/dressing.nvim_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1739381641,
-        "narHash": "sha256-dBz+/gZA6O6fJy/GSgM6ZHGAR3MTGt/W1olzzTYRlgM=",
-        "owner": "stevearc",
-        "repo": "dressing.nvim",
-        "rev": "2d7c2db2507fa3c4956142ee607431ddb2828639",
-        "type": "github"
-      },
-      "original": {
-        "owner": "stevearc",
-        "repo": "dressing.nvim",
-        "type": "github"
-      }
-    },
     "nvim_plugin-tpope/vim-sleuth": {
       "flake": false,
       "locked": {
@@ -2540,22 +1692,6 @@
         "type": "github"
       }
     },
-    "nvim_plugin-tpope/vim-sleuth_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1726718493,
-        "narHash": "sha256-2Cr3h3uJvUL3CSoJs3aBFrkBeOBURSQItgQ4ep9sHXM=",
-        "owner": "tpope",
-        "repo": "vim-sleuth",
-        "rev": "be69bff86754b1aa5adcbb527d7fcd1635a84080",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tpope",
-        "repo": "vim-sleuth",
-        "type": "github"
-      }
-    },
     "nvim_plugin-tpope/vim-surround": {
       "flake": false,
       "locked": {
@@ -2572,22 +1708,6 @@
         "type": "github"
       }
     },
-    "nvim_plugin-tpope/vim-surround_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1666730476,
-        "narHash": "sha256-DZE5tkmnT+lAvx/RQHaDEgEJXRKsy56KJY919xiH1lE=",
-        "owner": "tpope",
-        "repo": "vim-surround",
-        "rev": "3d188ed2113431cf8dac77be61b842acb64433d9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tpope",
-        "repo": "vim-surround",
-        "type": "github"
-      }
-    },
     "nvim_plugin-uga-rosa/ccc.nvim": {
       "flake": false,
       "locked": {
@@ -2604,22 +1724,6 @@
         "type": "github"
       }
     },
-    "nvim_plugin-uga-rosa/ccc.nvim_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1735970087,
-        "narHash": "sha256-53WsxOfWULlO4VbSXA4DW6wjkbCzpQjkzv4O8pReuEc=",
-        "owner": "uga-rosa",
-        "repo": "ccc.nvim",
-        "rev": "b57cbaf8db3ac43c56c9e2c7f3812944638260ed",
-        "type": "github"
-      },
-      "original": {
-        "owner": "uga-rosa",
-        "repo": "ccc.nvim",
-        "type": "github"
-      }
-    },
     "nvim_plugin-windwp/nvim-ts-autotag": {
       "flake": false,
       "locked": {
@@ -2636,22 +1740,6 @@
         "type": "github"
       }
     },
-    "nvim_plugin-windwp/nvim-ts-autotag_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1739910276,
-        "narHash": "sha256-a3Bcql68mp3y5bH9XMiDTQB0e75T+qFB593objIGg/I=",
-        "owner": "windwp",
-        "repo": "nvim-ts-autotag",
-        "rev": "a1d526af391f6aebb25a8795cbc05351ed3620b5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "windwp",
-        "repo": "nvim-ts-autotag",
-        "type": "github"
-      }
-    },
     "nvim_plugin-yetone/avante.nvim": {
       "flake": false,
       "locked": {
@@ -2668,22 +1756,6 @@
         "type": "github"
       }
     },
-    "nvim_plugin-yetone/avante.nvim_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1740640860,
-        "narHash": "sha256-2364E+SDx3zBoStYy+6FtkFS7vvsrjITeUYrBGofWhc=",
-        "owner": "yetone",
-        "repo": "avante.nvim",
-        "rev": "ebadba7420a5f9b85829273b8c9cd2be56d9b074",
-        "type": "github"
-      },
-      "original": {
-        "owner": "yetone",
-        "repo": "avante.nvim",
-        "type": "github"
-      }
-    },
     "nvim_plugin-zbirenbaum/copilot-cmp": {
       "flake": false,
       "locked": {
@@ -2700,22 +1772,6 @@
         "type": "github"
       }
     },
-    "nvim_plugin-zbirenbaum/copilot-cmp_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1733947099,
-        "narHash": "sha256-erRL8bY/zuwuCZfttw+avTrFV7pjv2H6v73NzY2bymM=",
-        "owner": "zbirenbaum",
-        "repo": "copilot-cmp",
-        "rev": "15fc12af3d0109fa76b60b5cffa1373697e261d1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "zbirenbaum",
-        "repo": "copilot-cmp",
-        "type": "github"
-      }
-    },
     "nvim_plugin-zbirenbaum/copilot.lua": {
       "flake": false,
       "locked": {
@@ -2732,22 +1788,6 @@
         "type": "github"
       }
     },
-    "nvim_plugin-zbirenbaum/copilot.lua_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1739230958,
-        "narHash": "sha256-632UIbG1jwam+tug5+jODkT509+uBfJgUN21C3ppnEo=",
-        "owner": "zbirenbaum",
-        "repo": "copilot.lua",
-        "rev": "30321e33b03cb924fdcd6a806a0dc6fa0b0eafb9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "zbirenbaum",
-        "repo": "copilot.lua",
-        "type": "github"
-      }
-    },
     "pre-commit-hooks": {
       "inputs": {
         "flake-compat": "flake-compat_2",
@@ -2799,8 +1839,8 @@
         "agenix": "agenix_2",
         "crane": "crane_2",
         "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs_8",
-        "rust-overlay": "rust-overlay_4"
+        "nixpkgs": "nixpkgs_6",
+        "rust-overlay": "rust-overlay_2"
       },
       "locked": {
         "lastModified": 1726755133,
@@ -2816,26 +1856,6 @@
         "type": "github"
       }
     },
-    "ringofstorms-stormd": {
-      "inputs": {
-        "nix-filter": "nix-filter",
-        "nixpkgs": "nixpkgs_5",
-        "rust-overlay": "rust-overlay_2"
-      },
-      "locked": {
-        "lastModified": 1735420577,
-        "narHash": "sha256-2HWEALz0PVJCiP/2iZuDMj4qyukXR5IxNKFxT1NAMlQ=",
-        "ref": "refs/heads/master",
-        "rev": "7edf6888a460708889fabea2c762d4dfed4fa64f",
-        "revCount": 51,
-        "type": "git",
-        "url": "ssh://git.joshuabell.xyz:3032/stormd"
-      },
-      "original": {
-        "type": "git",
-        "url": "ssh://git.joshuabell.xyz:3032/stormd"
-      }
-    },
     "root": {
       "inputs": {
         "common": "common",
@@ -2843,13 +1863,13 @@
         "mod_de_gnome": "mod_de_gnome",
         "mod_home-manager": "mod_home-manager",
         "mod_secrets": "mod_secrets",
-        "nixpkgs": "nixpkgs_9",
-        "ros_neovim": "ros_neovim_2"
+        "nixpkgs": "nixpkgs_7",
+        "ros_neovim": "ros_neovim"
       }
     },
     "ros_neovim": {
       "inputs": {
-        "nixpkgs": "nixpkgs_6",
+        "nixpkgs": "nixpkgs_8",
         "nvim_plugin-Almo7aya/openingh.nvim": "nvim_plugin-Almo7aya/openingh.nvim",
         "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim",
         "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring": "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring",
@@ -2910,87 +1930,11 @@
         "rust-overlay": "rust-overlay_3"
       },
       "locked": {
-        "lastModified": 1741996279,
-        "narHash": "sha256-2MUbA6hpa5XNIrpfaoLsYx5fT5yLoiFrlwObcz74xXM=",
+        "lastModified": 1742183843,
+        "narHash": "sha256-rnIuWHui65AOuTYqZqpBbauI70iU08orr2/lPqYK3iQ=",
         "ref": "refs/heads/master",
-        "rev": "a361392517afeb3d54fb1899046b89154dcab1d6",
-        "revCount": 265,
-        "type": "git",
-        "url": "https://git.joshuabell.xyz/nvim"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://git.joshuabell.xyz/nvim"
-      }
-    },
-    "ros_neovim_2": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_10",
-        "nvim_plugin-Almo7aya/openingh.nvim": "nvim_plugin-Almo7aya/openingh.nvim_2",
-        "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim_2",
-        "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring": "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring_2",
-        "nvim_plugin-L3MON4D3/LuaSnip": "nvim_plugin-L3MON4D3/LuaSnip_2",
-        "nvim_plugin-MeanderingProgrammer/render-markdown.nvim": "nvim_plugin-MeanderingProgrammer/render-markdown.nvim_2",
-        "nvim_plugin-MunifTanjim/nui.nvim": "nvim_plugin-MunifTanjim/nui.nvim_2",
-        "nvim_plugin-RRethy/vim-illuminate": "nvim_plugin-RRethy/vim-illuminate_2",
-        "nvim_plugin-Saecki/crates.nvim": "nvim_plugin-Saecki/crates.nvim_2",
-        "nvim_plugin-aznhe21/actions-preview.nvim": "nvim_plugin-aznhe21/actions-preview.nvim_2",
-        "nvim_plugin-b0o/schemastore.nvim": "nvim_plugin-b0o/schemastore.nvim_2",
-        "nvim_plugin-catppuccin/nvim": "nvim_plugin-catppuccin/nvim_2",
-        "nvim_plugin-chrisgrieser/nvim-early-retirement": "nvim_plugin-chrisgrieser/nvim-early-retirement_2",
-        "nvim_plugin-declancm/cinnamon.nvim": "nvim_plugin-declancm/cinnamon.nvim_2",
-        "nvim_plugin-folke/lazy.nvim": "nvim_plugin-folke/lazy.nvim_2",
-        "nvim_plugin-folke/neodev.nvim": "nvim_plugin-folke/neodev.nvim_2",
-        "nvim_plugin-folke/which-key.nvim": "nvim_plugin-folke/which-key.nvim_2",
-        "nvim_plugin-hrsh7th/cmp-buffer": "nvim_plugin-hrsh7th/cmp-buffer_2",
-        "nvim_plugin-hrsh7th/cmp-nvim-lsp": "nvim_plugin-hrsh7th/cmp-nvim-lsp_2",
-        "nvim_plugin-hrsh7th/cmp-path": "nvim_plugin-hrsh7th/cmp-path_2",
-        "nvim_plugin-hrsh7th/nvim-cmp": "nvim_plugin-hrsh7th/nvim-cmp_2",
-        "nvim_plugin-j-hui/fidget.nvim": "nvim_plugin-j-hui/fidget.nvim_2",
-        "nvim_plugin-johmsalas/text-case.nvim": "nvim_plugin-johmsalas/text-case.nvim_2",
-        "nvim_plugin-lewis6991/gitsigns.nvim": "nvim_plugin-lewis6991/gitsigns.nvim_2",
-        "nvim_plugin-lnc3l0t/glow.nvim": "nvim_plugin-lnc3l0t/glow.nvim_2",
-        "nvim_plugin-lukas-reineke/indent-blankline.nvim": "nvim_plugin-lukas-reineke/indent-blankline.nvim_2",
-        "nvim_plugin-lvimuser/lsp-inlayhints.nvim": "nvim_plugin-lvimuser/lsp-inlayhints.nvim_2",
-        "nvim_plugin-m4xshen/hardtime.nvim": "nvim_plugin-m4xshen/hardtime.nvim_2",
-        "nvim_plugin-mbbill/undotree": "nvim_plugin-mbbill/undotree_2",
-        "nvim_plugin-mfussenegger/nvim-lint": "nvim_plugin-mfussenegger/nvim-lint_2",
-        "nvim_plugin-mrcjkb/rustaceanvim": "nvim_plugin-mrcjkb/rustaceanvim_2",
-        "nvim_plugin-neovim/nvim-lspconfig": "nvim_plugin-neovim/nvim-lspconfig_2",
-        "nvim_plugin-nosduco/remote-sshfs.nvim": "nvim_plugin-nosduco/remote-sshfs.nvim_2",
-        "nvim_plugin-numToStr/Comment.nvim": "nvim_plugin-numToStr/Comment.nvim_2",
-        "nvim_plugin-nvim-lua/plenary.nvim": "nvim_plugin-nvim-lua/plenary.nvim_2",
-        "nvim_plugin-nvim-lualine/lualine.nvim": "nvim_plugin-nvim-lualine/lualine.nvim_2",
-        "nvim_plugin-nvim-telescope/telescope-file-browser.nvim": "nvim_plugin-nvim-telescope/telescope-file-browser.nvim_2",
-        "nvim_plugin-nvim-telescope/telescope-fzf-native.nvim": "nvim_plugin-nvim-telescope/telescope-fzf-native.nvim_2",
-        "nvim_plugin-nvim-telescope/telescope-ui-select.nvim": "nvim_plugin-nvim-telescope/telescope-ui-select.nvim_2",
-        "nvim_plugin-nvim-telescope/telescope.nvim": "nvim_plugin-nvim-telescope/telescope.nvim_2",
-        "nvim_plugin-nvim-tree/nvim-tree.lua": "nvim_plugin-nvim-tree/nvim-tree.lua_2",
-        "nvim_plugin-nvim-tree/nvim-web-devicons": "nvim_plugin-nvim-tree/nvim-web-devicons_2",
-        "nvim_plugin-nvim-treesitter/nvim-treesitter-context": "nvim_plugin-nvim-treesitter/nvim-treesitter-context_2",
-        "nvim_plugin-rafamadriz/friendly-snippets": "nvim_plugin-rafamadriz/friendly-snippets_2",
-        "nvim_plugin-rcarriga/nvim-notify": "nvim_plugin-rcarriga/nvim-notify_2",
-        "nvim_plugin-rmagatti/auto-session": "nvim_plugin-rmagatti/auto-session_2",
-        "nvim_plugin-ron/ron.vim": "nvim_plugin-ron/ron.vim_2",
-        "nvim_plugin-saadparwaiz1/cmp_luasnip": "nvim_plugin-saadparwaiz1/cmp_luasnip_2",
-        "nvim_plugin-sindrets/diffview.nvim": "nvim_plugin-sindrets/diffview.nvim_2",
-        "nvim_plugin-stevearc/conform.nvim": "nvim_plugin-stevearc/conform.nvim_2",
-        "nvim_plugin-stevearc/dressing.nvim": "nvim_plugin-stevearc/dressing.nvim_2",
-        "nvim_plugin-tpope/vim-sleuth": "nvim_plugin-tpope/vim-sleuth_2",
-        "nvim_plugin-tpope/vim-surround": "nvim_plugin-tpope/vim-surround_2",
-        "nvim_plugin-uga-rosa/ccc.nvim": "nvim_plugin-uga-rosa/ccc.nvim_2",
-        "nvim_plugin-windwp/nvim-ts-autotag": "nvim_plugin-windwp/nvim-ts-autotag_2",
-        "nvim_plugin-yetone/avante.nvim": "nvim_plugin-yetone/avante.nvim_2",
-        "nvim_plugin-zbirenbaum/copilot-cmp": "nvim_plugin-zbirenbaum/copilot-cmp_2",
-        "nvim_plugin-zbirenbaum/copilot.lua": "nvim_plugin-zbirenbaum/copilot.lua_2",
-        "rust-overlay": "rust-overlay_5"
-      },
-      "locked": {
-        "lastModified": 1740687549,
-        "narHash": "sha256-T5Rn3z0joAccX0IEFXQTgOsgcbIOy74pX/Aa1NsqPs8=",
-        "ref": "refs/heads/master",
-        "rev": "f35ce9412b6dc37c1658dcb47b55a238f95344e9",
-        "revCount": 263,
+        "rev": "d8295af1e90b89f9b2c38058fdb392395b36cf84",
+        "revCount": 267,
         "type": "git",
         "url": "https://git.joshuabell.xyz/nvim"
       },
@@ -3022,50 +1966,6 @@
       }
     },
     "rust-overlay_2": {
-      "inputs": {
-        "nixpkgs": [
-          "common",
-          "ringofstorms-stormd",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1729218602,
-        "narHash": "sha256-KDmYxpkFWa0Go0WnOpkgQOypVaQxbwgpEutET5ey1VQ=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "9051466c82b9b3a6ba9e06be99621ad25423ec94",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
-      }
-    },
-    "rust-overlay_3": {
-      "inputs": {
-        "nixpkgs": [
-          "common",
-          "ros_neovim",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1741660300,
-        "narHash": "sha256-0jldJ58sC5RjqwpwE+ER+RPMeX4Moz5im/evQ3SU/dU=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "ac2f556db0eb5cbba3c4f5f5989c46330f439b0b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
-      }
-    },
-    "rust-overlay_4": {
       "inputs": {
         "nixpkgs": [
           "mod_secrets",
@@ -3087,7 +1987,7 @@
         "type": "github"
       }
     },
-    "rust-overlay_5": {
+    "rust-overlay_3": {
       "inputs": {
         "nixpkgs": [
           "ros_neovim",
@@ -3095,11 +1995,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1740623427,
-        "narHash": "sha256-3SdPQrZoa4odlScFDUHd4CUPQ/R1gtH4Mq9u8CBiK8M=",
+        "lastModified": 1741660300,
+        "narHash": "sha256-0jldJ58sC5RjqwpwE+ER+RPMeX4Moz5im/evQ3SU/dU=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "d342e8b5fd88421ff982f383c853f0fc78a847ab",
+        "rev": "ac2f556db0eb5cbba3c4f5f5989c46330f439b0b",
         "type": "github"
       },
       "original": {
diff --git a/hosts/oren/flake.nix b/hosts/oren/flake.nix
index a6f8464..68f9eb7 100644
--- a/hosts/oren/flake.nix
+++ b/hosts/oren/flake.nix
@@ -46,31 +46,27 @@
                 { pkgs, ... }:
                 {
                   imports = [
-                    ../../components/nix/lua.nix
                     ../../components/nix/rust-dev.nix
                     ../../components/nix/qflipper.nix
-                    ../../components/nix/qdirstat.nix
                     ../../components/nix/tailscale.nix
                   ];
+
+                  environment.systemPackages = with pkgs; [
+                    lua
+                    qdirstat
+                  ];
+
                   ringofstorms_common = {
+                    systemName = configuration_name;
                     boot.systemd.enable = true;
-                  };
-                  mods = {
-                    common = {
-                      systemName = configuration_name;
-                      allowUnfree = true;
-                      primaryUser = "josh";
-                      docker = true;
-                      zsh = true;
+                    users = {
+                      admins = [ "josh" ];
                       users = {
                         josh = {
                           openssh.authorizedKeys.keys = [
                             "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILMzgAe4od9K4EsvH2g7xjNU7hGoJiFJlYcvB0BoDCvn nix2oren"
                           ];
-                          initialPassword = "password1";
-                          isNormalUser = true;
                           extraGroups = [
-                            "wheel"
                             "networkmanager"
                             "video"
                             "input"
@@ -82,10 +78,24 @@
                             discordo
                             discord
                             firefox-esr
+                            spotify
+                            vlc
+                            vaultwarden
+                            bitwarden
                           ];
                         };
                       };
                     };
+                  };
+
+                  mods = {
+                    common = {
+                      systemName = configuration_name;
+                      allowUnfree = true;
+                      primaryUser = "josh";
+                      docker = true;
+                      zsh = true;
+                    };
                     home_manager = {
                       users = {
                         josh = {