diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 27ff815..77d4914 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -16,6 +16,7 @@
     ./services/pipewire.nix
     ./services/ly.nix
     ./stylix/stylix.nix
+    ./easyroam.nix
   ];
 
   boot.loader.systemd-boot = {
diff --git a/nixos/nixvim/nixvim.nix b/nixos/nixvim/nixvim.nix
index c0a008f..4d5ea02 100644
--- a/nixos/nixvim/nixvim.nix
+++ b/nixos/nixvim/nixvim.nix
@@ -7,7 +7,7 @@
 }:
 {
   imports = [
-    ./plugins/plugins.nix
+    ./plugins.nix
     ./keymaps.nix
   ];
   programs.nixvim = {
diff --git a/nixos/nixvim/plugins.nix b/nixos/nixvim/plugins.nix
new file mode 100644
index 0000000..1c9ecc0
--- /dev/null
+++ b/nixos/nixvim/plugins.nix
@@ -0,0 +1,95 @@
+{
+  programs.nixvim = {
+    plugins = {
+      lspconfig.enable = true;
+      web-devicons.enable = true;
+      blink-cmp = {
+        enable = true;
+      };
+      blink-indent = {
+        enable = true;
+      };
+      toggleterm = {
+        enable = true;
+        settings = {
+          size = 30;
+          direction = "horizontal";
+        };
+      };
+      cord = {
+        enable = true;
+        settings = {
+          display = {
+            theme = "atom";
+          };
+          editor = {
+            tooltip = "ur gay :3";
+          };
+        };
+      };
+      barbar = {
+        enable = true;
+        settings = {
+          icons = {
+            buffer_index = true;
+          };
+        };
+      };
+      lualine = {
+        enable = true;
+        settings = {
+          extensions = [ "toggleterm" ];
+          options = {
+            section_separators = {
+              left = "▎";
+              right = "▕";
+            };
+            component_separators = {
+              left = "";
+              right = "";
+            };
+          };
+          inactive_sections = {
+            lualine_a = [
+              "mode"
+            ];
+            lualine_b = [
+              "filename"
+              "filetype"
+            ];
+            lualine_c = [
+              "diagnostics"
+            ];
+            lualine_x = [
+              "lsp_status"
+            ];
+            lualine_y = [ ];
+            lualine_z = [
+              "location"
+            ];
+          };
+          sections = {
+            lualine_a = [
+              "mode"
+            ];
+            lualine_b = [
+              "filename"
+              "filetype"
+            ];
+            lualine_c = [
+              "diagnostics"
+            ];
+            lualine_x = [
+              "lsp_status"
+            ];
+            lualine_y = [ ];
+            lualine_z = [
+              "location"
+            ];
+          };
+        };
+      };
+    };
+  };
+
+}
diff --git a/nixos/nixvim/plugins/barbar.nix b/nixos/nixvim/plugins/barbar.nix
deleted file mode 100644
index f15d275..0000000
--- a/nixos/nixvim/plugins/barbar.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  programs.nixvim.plugins.barbar = {
-    enable = true;
-    settings = {
-      icons = {
-        buffer_index = true;
-      };
-    };
-  };
-}
diff --git a/nixos/nixvim/plugins/cord.nix b/nixos/nixvim/plugins/cord.nix
deleted file mode 100644
index 3fbb654..0000000
--- a/nixos/nixvim/plugins/cord.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  programs.nixvim.plugins.cord = {
-    enable = true;
-    settings = {
-      display = {
-        theme = "atom";
-      };
-      editor = {
-        tooltip = "ur gay :3";
-      };
-    };
-  };
-}
diff --git a/nixos/nixvim/plugins/lualine.nix b/nixos/nixvim/plugins/lualine.nix
deleted file mode 100644
index f0da28c..0000000
--- a/nixos/nixvim/plugins/lualine.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-  programs.nixvim.plugins.lualine = {
-    enable = true;
-    settings = {
-      extensions = [ "toggleterm" ];
-      options = {
-        section_separators = {
-          left = "▎";
-          right = "▕";
-        };
-        component_separators = {
-          left = "";
-          right = "";
-        };
-      };
-      inactive_sections = {
-        lualine_a = [
-          "mode"
-        ];
-        lualine_b = [
-          "filename"
-          "filetype"
-        ];
-        lualine_c = [
-          "diagnostics"
-        ];
-        lualine_x = [
-          "lsp_status"
-        ];
-        lualine_y = [ ];
-        lualine_z = [
-          "location"
-        ];
-      };
-      sections = {
-        lualine_a = [
-          "mode"
-        ];
-        lualine_b = [
-          "filename"
-          "filetype"
-        ];
-        lualine_c = [
-          "diagnostics"
-        ];
-        lualine_x = [
-          "lsp_status"
-        ];
-        lualine_y = [ ];
-        lualine_z = [
-          "location"
-        ];
-      };
-    };
-  };
-
-}
diff --git a/nixos/nixvim/plugins/plugins.nix b/nixos/nixvim/plugins/plugins.nix
deleted file mode 100644
index 5b4acda..0000000
--- a/nixos/nixvim/plugins/plugins.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  imports = [
-    ./barbar.nix
-    ./toggleterm.nix
-    ./cord.nix
-    ./lualine.nix
-    ./telescope.nix
-  ];
-  programs.nixvim = {
-    plugins = {
-      lspconfig.enable = true;
-      web-devicons.enable = true;
-      blink-cmp.enable = true;
-      blink-indent.enable = true;
-    };
-  };
-
-}
diff --git a/nixos/nixvim/plugins/telescope.nix b/nixos/nixvim/plugins/telescope.nix
deleted file mode 100644
index 148022b..0000000
--- a/nixos/nixvim/plugins/telescope.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  programs.nixvim.plugins.telescope = {
-    enable = true;
-    keymaps = {
-      "<leader>ff" = {
-        action = "find_files";
-      };
-      "<leader>lg" = {
-        action = "live_grep";
-      };
-    };
-  };
-}
diff --git a/nixos/nixvim/plugins/toggleterm.nix b/nixos/nixvim/plugins/toggleterm.nix
deleted file mode 100644
index ff61280..0000000
--- a/nixos/nixvim/plugins/toggleterm.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  programs.nixvim.plugins.toggleterm = {
-    enable = true;
-    settings = {
-      size = 30;
-      direction = "horizontal";
-    };
-  };
-}