diff --git a/modules/programs/nvim/new_plugins/comment.nix b/modules/programs/nvim/new_plugins/comment.nix
index e69de29..7dd0ae1 100644
--- a/modules/programs/nvim/new_plugins/comment.nix
+++ b/modules/programs/nvim/new_plugins/comment.nix
@@ -0,0 +1,10 @@
+{ config, lib, pkgs, inputs, ... }:
+
+let
+  inherit (lib) mkEnableOption mkIf readFile;
+in
+{
+  home-manager.users.moritz.programs.nixvim = {
+    plugins.comment.enable = true;
+  };
+}
diff --git a/modules/programs/nvim/new_plugins/crates-nvim.nix b/modules/programs/nvim/new_plugins/crates-nvim.nix
index e69de29..dd50bfd 100644
--- a/modules/programs/nvim/new_plugins/crates-nvim.nix
+++ b/modules/programs/nvim/new_plugins/crates-nvim.nix
@@ -0,0 +1,10 @@
+{ config, lib, pkgs, inputs, ... }:
+
+let
+  inherit (lib) mkEnableOption mkIf readFile;
+in
+{
+  home-manager.users.moritz.programs.nixvim = {
+    plugins.crates-nvim.enable = true;
+  };
+}
diff --git a/modules/programs/nvim/new_plugins/direnv.nix b/modules/programs/nvim/new_plugins/direnv.nix
index e69de29..3f6922a 100644
--- a/modules/programs/nvim/new_plugins/direnv.nix
+++ b/modules/programs/nvim/new_plugins/direnv.nix
@@ -0,0 +1,10 @@
+{ config, lib, pkgs, inputs, ... }:
+
+let
+  inherit (lib) mkEnableOption mkIf readFile;
+in
+{
+  home-manager.users.moritz.programs.nixvim = {
+    plugins.direnv.enable = true;
+  };
+}
diff --git a/modules/programs/nvim/new_plugins/friendly-snippets.nix b/modules/programs/nvim/new_plugins/friendly-snippets.nix
index e69de29..9c64552 100644
--- a/modules/programs/nvim/new_plugins/friendly-snippets.nix
+++ b/modules/programs/nvim/new_plugins/friendly-snippets.nix
@@ -0,0 +1,10 @@
+{ config, lib, pkgs, inputs, ... }:
+
+let
+  inherit (lib) mkEnableOption mkIf readFile;
+in
+{
+  home-manager.users.moritz.programs.nixvim = {
+    plugins.friendly-snippets.enable = true;
+  };
+}
diff --git a/modules/programs/nvim/new_plugins/fugitive.nix b/modules/programs/nvim/new_plugins/fugitive.nix
index e69de29..97d5d11 100644
--- a/modules/programs/nvim/new_plugins/fugitive.nix
+++ b/modules/programs/nvim/new_plugins/fugitive.nix
@@ -0,0 +1,10 @@
+{ config, lib, pkgs, inputs, ... }:
+
+let
+  inherit (lib) mkEnableOption mkIf readFile;
+in
+{
+  home-manager.users.moritz.programs.nixvim = {
+    plugins.fugitive.enable = true;
+  };
+}
diff --git a/modules/programs/nvim/new_plugins/gitsigns.nix b/modules/programs/nvim/new_plugins/gitsigns.nix
index e69de29..2e1db6e 100644
--- a/modules/programs/nvim/new_plugins/gitsigns.nix
+++ b/modules/programs/nvim/new_plugins/gitsigns.nix
@@ -0,0 +1,10 @@
+{ config, lib, pkgs, inputs, ... }:
+
+let
+  inherit (lib) mkEnableOption mkIf readFile;
+in
+{
+  home-manager.users.moritz.programs.nixvim = {
+    plugins.gitsigns.enable = true;
+  };
+}
diff --git a/modules/programs/nvim/new_plugins/helpview.nix b/modules/programs/nvim/new_plugins/helpview.nix
index e69de29..6b00df4 100644
--- a/modules/programs/nvim/new_plugins/helpview.nix
+++ b/modules/programs/nvim/new_plugins/helpview.nix
@@ -0,0 +1,11 @@
+{ config, lib, pkgs, inputs, ... }:
+
+let
+  inherit (lib) mkEnableOption mkIf readFile;
+in
+{
+  home-manager.users.moritz.programs.nixvim = {
+    plugins.helpview.enable = true;
+    performance.combinePlugins.standalonePlugins = [ "helpview.nvim" ];
+  };
+}
diff --git a/modules/programs/nvim/new_plugins/hmts.nix b/modules/programs/nvim/new_plugins/hmts.nix
index e69de29..041793f 100644
--- a/modules/programs/nvim/new_plugins/hmts.nix
+++ b/modules/programs/nvim/new_plugins/hmts.nix
@@ -0,0 +1,11 @@
+{ config, lib, pkgs, inputs, ... }:
+
+let
+  inherit (lib) mkEnableOption mkIf readFile;
+in
+{
+  home-manager.users.moritz.programs.nixvim = {
+    plugins.hmts.enable = true;
+    performance.combinePlugins.standalonePlugins = [ "hmts.nvim" ];
+  };
+}
diff --git a/modules/programs/nvim/new_plugins/keymaps.nix b/modules/programs/nvim/new_plugins/keymaps.nix
index e69de29..7c14693 100644
--- a/modules/programs/nvim/new_plugins/keymaps.nix
+++ b/modules/programs/nvim/new_plugins/keymaps.nix
@@ -0,0 +1,15 @@
+{ config, lib, pkgs, inputs, ... }:
+
+let
+  inherit (lib) mkEnableOption mkIf readFile;
+in
+{
+  home-manager.users.moritz.programs.nixvim = {
+    keymaps = [
+      { key = "<esc>"; action = "<cmd>noh<cr><esc>"; options.desc = "Escape and clear hlsearch"; mode = [ "i" "n" ]; }
+      { key = "<"; action = "<gv"; options.desc = "Shift left"; mode = [ "v" ]; }
+      { key = ">"; action = ">gv"; options.desc = "Shift right"; mode = [ "v" ]; }
+      { key = "y"; action = "ygv<esc>"; options.desc = "Yank"; mode = [ "v" ]; }
+    ];
+  };
+}
diff --git a/modules/programs/nvim/new_plugins/lastplace.nix b/modules/programs/nvim/new_plugins/lastplace.nix
index e69de29..763666f 100644
--- a/modules/programs/nvim/new_plugins/lastplace.nix
+++ b/modules/programs/nvim/new_plugins/lastplace.nix
@@ -0,0 +1,10 @@
+{ config, lib, pkgs, inputs, ... }:
+
+let
+  inherit (lib) mkEnableOption mkIf readFile;
+in
+{
+  home-manager.users.moritz.programs.nixvim = {
+    plugins.lastplace.enable = true;
+  };
+}
diff --git a/modules/programs/nvim/new_plugins/markdown-preview.nix b/modules/programs/nvim/new_plugins/markdown-preview.nix
index e69de29..19bc8f8 100644
--- a/modules/programs/nvim/new_plugins/markdown-preview.nix
+++ b/modules/programs/nvim/new_plugins/markdown-preview.nix
@@ -0,0 +1,10 @@
+{ config, lib, pkgs, inputs, ... }:
+
+let
+  inherit (lib) mkEnableOption mkIf readFile;
+in
+{
+  home-manager.users.moritz.programs.nixvim = {
+    plugins.markdown-preview.enable = true;
+  };
+}
diff --git a/modules/programs/nvim/new_plugins/marks.nix b/modules/programs/nvim/new_plugins/marks.nix
index e69de29..dff698c 100644
--- a/modules/programs/nvim/new_plugins/marks.nix
+++ b/modules/programs/nvim/new_plugins/marks.nix
@@ -0,0 +1,13 @@
+{ config, lib, pkgs, inputs, ... }:
+
+let
+  inherit (lib) mkEnableOption mkIf readFile;
+in
+{
+  home-manager.users.moritz.programs.nixvim = {
+    plugins.marks = {
+      enable = true;
+      defaultMappings = false;
+    };
+  };
+}
diff --git a/modules/programs/nvim/new_plugins/mini.nix b/modules/programs/nvim/new_plugins/mini.nix
index e69de29..92b7fa2 100644
--- a/modules/programs/nvim/new_plugins/mini.nix
+++ b/modules/programs/nvim/new_plugins/mini.nix
@@ -0,0 +1,16 @@
+{ config, lib, pkgs, inputs, ... }:
+
+let
+  inherit (lib) mkEnableOption mkIf readFile;
+in
+{
+  home-manager.users.moritz.programs.nixvim = {
+    plugins.mini = {
+      enable = true;
+      modules = {
+        align = { };
+      };
+    };
+    performance.combinePlugins.standalonePlugins = [ "mini.nvim" ];
+  };
+}
diff --git a/modules/programs/nvim/new_plugins/nvim-autopairs.nix b/modules/programs/nvim/new_plugins/nvim-autopairs.nix
index e69de29..9e82552 100644
--- a/modules/programs/nvim/new_plugins/nvim-autopairs.nix
+++ b/modules/programs/nvim/new_plugins/nvim-autopairs.nix
@@ -0,0 +1,10 @@
+{ config, lib, pkgs, inputs, ... }:
+
+let
+  inherit (lib) mkEnableOption mkIf readFile;
+in
+{
+  home-manager.users.moritz.programs.nixvim = {
+    plugins.nvim-autopairs.enable = true;
+  };
+}
diff --git a/modules/programs/nvim/new_plugins/obsidian.nix b/modules/programs/nvim/new_plugins/obsidian.nix
index e69de29..70d9f8b 100644
--- a/modules/programs/nvim/new_plugins/obsidian.nix
+++ b/modules/programs/nvim/new_plugins/obsidian.nix
@@ -0,0 +1,29 @@
+{ config, lib, pkgs, inputs, ... }:
+
+let
+  inherit (lib) mkEnableOption mkIf readFile;
+in
+{
+  home-manager.users.moritz.programs.nixvim = {
+    plugins.obsidian = {
+      enable = true;
+      settings = {
+        ui.enable = false;
+        dir = "~/Documents/Nextcloud/Notes/zettelkasten/";
+        note_id_func.__raw = ''
+          function(title)
+            if title ~= nil then
+              return title
+            else
+              suffix = ""
+              for _ = 1, 4 do
+                suffix = suffix .. string.char(math.random(65, 90))
+              end
+              return tostring(os.date("%Y-%m-%d")) .. "-" .. suffix
+            end
+          end
+        '';
+      };
+    };
+  };
+}
diff --git a/modules/programs/nvim/new_plugins/oil.nix b/modules/programs/nvim/new_plugins/oil.nix
index e69de29..bf01b58 100644
--- a/modules/programs/nvim/new_plugins/oil.nix
+++ b/modules/programs/nvim/new_plugins/oil.nix
@@ -0,0 +1,10 @@
+{ config, lib, pkgs, inputs, ... }:
+
+let
+  inherit (lib) mkEnableOption mkIf readFile;
+in
+{
+  home-manager.users.moritz.programs.nixvim = {
+    plugins.oil.enable = true;
+  };
+}
diff --git a/modules/programs/nvim/new_plugins/other.nix b/modules/programs/nvim/new_plugins/other.nix
deleted file mode 100644
index 26433f6..0000000
--- a/modules/programs/nvim/new_plugins/other.nix
+++ /dev/null
@@ -1,99 +0,0 @@
-{ config, lib, pkgs, inputs, ... }:
-
-let
-  inherit (lib) mkEnableOption mkIf readFile;
-in
-{
-  home-manager.users.moritz = {
-    programs.nixvim = lib.mkMerge [
-      { plugins.which-key.enable = true; }
-      { plugins.lastplace.enable = true; }
-      { plugins.comment.enable = true; }
-      { plugins.ts-context-commentstring.enable = true; }
-      {
-        plugins.vimtex = {
-          enable = true;
-          settings.view_method = "zathura";
-        };
-      }
-      {
-        plugins.todo-comments = {
-          enable = true;
-          keymaps.todoTelescope.key = "<leader>ft";
-        };
-      }
-
-      {
-        keymaps = [
-          { key = "<esc>"; action = "<cmd>noh<cr><esc>"; options.desc = "Escape and clear hlsearch"; mode = [ "i" "n" ]; }
-          { key = "<"; action = "<gv"; options.desc = "Shift left"; mode = [ "v" ]; }
-          { key = ">"; action = ">gv"; options.desc = "Shift right"; mode = [ "v" ]; }
-          { key = "y"; action = "ygv<esc>"; options.desc = "Yank"; mode = [ "v" ]; }
-        ];
-      }
-      { plugins.oil.enable = true; }
-      { plugins.nvim-autopairs.enable = true; }
-      { plugins.vim-surround.enable = true; }
-
-      # TODO: add linters
-      # {
-      #   plugins.lint.enable = true;
-      #   plugins.lint.lintersByFt = { };
-      # }
-
-      {
-        plugins.marks.enable = true;
-        plugins.marks.defaultMappings = false;
-      }
-      {
-        plugins.hmts.enable = true;
-        performance.combinePlugins.standalonePlugins = [ "hmts.nvim" ];
-      }
-      { plugins.gitsigns.enable = true; }
-      { plugins.fugitive.enable = true; }
-      { plugins.friendly-snippets.enable = true; }
-      { plugins.direnv.enable = true; }
-      { plugins.crates-nvim.enable = true; }
-      {
-        plugins.helpview.enable = true;
-        performance.combinePlugins.standalonePlugins = [ "helpview.nvim" ];
-      }
-      {
-        plugins.obsidian.enable = true;
-        plugins.obsidian.settings = {
-          ui.enable = false;
-          dir = "~/Documents/Nextcloud/Notes/zettelkasten/";
-          note_id_func.__raw = ''
-            function(title)
-              if title ~= nil then
-                return title
-              else
-                suffix = ""
-                for _ = 1, 4 do
-                  suffix = suffix .. string.char(math.random(65, 90))
-                end
-                return tostring(os.date("%Y-%m-%d")) .. "-" .. suffix
-              end
-            end
-          '';
-        };
-      }
-      {
-        plugins.mini = {
-          enable = true;
-          modules = {
-            align = { };
-          };
-        };
-        performance.combinePlugins.standalonePlugins = [ "mini.nvim" ];
-      }
-      { plugins.markdown-preview.enable = true; }
-      {
-        plugins.render-markdown = {
-          enable = true;
-          settings.latex.enable = false;
-        };
-      }
-    ];
-  };
-}
diff --git a/modules/programs/nvim/new_plugins/render-markdown.nix b/modules/programs/nvim/new_plugins/render-markdown.nix
index e69de29..8f318b7 100644
--- a/modules/programs/nvim/new_plugins/render-markdown.nix
+++ b/modules/programs/nvim/new_plugins/render-markdown.nix
@@ -0,0 +1,13 @@
+{ config, lib, pkgs, inputs, ... }:
+
+let
+  inherit (lib) mkEnableOption mkIf readFile;
+in
+{
+  home-manager.users.moritz.programs.nixvim = {
+    plugins.render-markdown = {
+      enable = true;
+      settings.latex.enable = false;
+    };
+  };
+}
diff --git a/modules/programs/nvim/new_plugins/todo-comments.nix b/modules/programs/nvim/new_plugins/todo-comments.nix
index e69de29..288c4e4 100644
--- a/modules/programs/nvim/new_plugins/todo-comments.nix
+++ b/modules/programs/nvim/new_plugins/todo-comments.nix
@@ -0,0 +1,13 @@
+{ config, lib, pkgs, inputs, ... }:
+
+let
+  inherit (lib) mkEnableOption mkIf readFile;
+in
+{
+  home-manager.users.moritz.programs.nixvim = {
+    plugins.todo-comments = {
+      enable = true;
+      keymaps.todoTelescope.key = "<leader>ft";
+    };
+  };
+}
diff --git a/modules/programs/nvim/new_plugins/ts-context-commentstring.nix b/modules/programs/nvim/new_plugins/ts-context-commentstring.nix
index e69de29..14dd92a 100644
--- a/modules/programs/nvim/new_plugins/ts-context-commentstring.nix
+++ b/modules/programs/nvim/new_plugins/ts-context-commentstring.nix
@@ -0,0 +1,10 @@
+{ config, lib, pkgs, inputs, ... }:
+
+let
+  inherit (lib) mkEnableOption mkIf readFile;
+in
+{
+  home-manager.users.moritz.programs.nixvim = {
+    plugins.ts-context-commentstring.enable = true;
+  };
+}
diff --git a/modules/programs/nvim/new_plugins/vim-surround.nix b/modules/programs/nvim/new_plugins/vim-surround.nix
index e69de29..08f8c0d 100644
--- a/modules/programs/nvim/new_plugins/vim-surround.nix
+++ b/modules/programs/nvim/new_plugins/vim-surround.nix
@@ -0,0 +1,10 @@
+{ config, lib, pkgs, inputs, ... }:
+
+let
+  inherit (lib) mkEnableOption mkIf readFile;
+in
+{
+  home-manager.users.moritz.programs.nixvim = {
+    plugins.vim-surround.enable = true;
+  };
+}
diff --git a/modules/programs/nvim/new_plugins/vimtex.nix b/modules/programs/nvim/new_plugins/vimtex.nix
index e69de29..1cf842c 100644
--- a/modules/programs/nvim/new_plugins/vimtex.nix
+++ b/modules/programs/nvim/new_plugins/vimtex.nix
@@ -0,0 +1,13 @@
+{ config, lib, pkgs, inputs, ... }:
+
+let
+  inherit (lib) mkEnableOption mkIf readFile;
+in
+{
+  home-manager.users.moritz.programs.nixvim = {
+    plugins.vimtex = {
+      enable = true;
+      settings.view_method = "zathura";
+    };
+  };
+}
diff --git a/modules/programs/nvim/new_plugins/which-key.nix b/modules/programs/nvim/new_plugins/which-key.nix
index e69de29..e4e4eec 100644
--- a/modules/programs/nvim/new_plugins/which-key.nix
+++ b/modules/programs/nvim/new_plugins/which-key.nix
@@ -0,0 +1,10 @@
+{ config, lib, pkgs, inputs, ... }:
+
+let
+  inherit (lib) mkEnableOption mkIf readFile;
+in
+{
+  home-manager.users.moritz.programs.nixvim = {
+    plugins.which-key.enable = true;
+  };
+}