diff --git a/.gitignore b/.gitignore
index 7dcd526..d6230a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@
 tmp/
 .direnv/
 .pre-commit-config.yaml
+.aider*
+.env
diff --git a/modules/programs/nvim/new_plugins/comment.nix b/modules/programs/nvim/new_plugins/comment.nix
new file mode 100644
index 0000000..7dd0ae1
--- /dev/null
+++ 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/conform.nix b/modules/programs/nvim/new_plugins/conform.nix
index a8b94f3..7e3ca5b 100644
--- a/modules/programs/nvim/new_plugins/conform.nix
+++ b/modules/programs/nvim/new_plugins/conform.nix
@@ -66,7 +66,7 @@ in
       "conform.nvim"
     ];
     keymaps = [
-      { key = "<leader>cf"; action.__raw = ''function() require("conform").format() end''; options.desc = "Format current file"; }
+      { key = "="; action.__raw = ''function() require("conform").format() end''; options.desc = "Format current file"; }
     ];
   };
 
diff --git a/modules/programs/nvim/new_plugins/crates-nvim.nix b/modules/programs/nvim/new_plugins/crates-nvim.nix
new file mode 100644
index 0000000..dd50bfd
--- /dev/null
+++ 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
new file mode 100644
index 0000000..3f6922a
--- /dev/null
+++ 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
new file mode 100644
index 0000000..9c64552
--- /dev/null
+++ 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
new file mode 100644
index 0000000..97d5d11
--- /dev/null
+++ 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
new file mode 100644
index 0000000..2e1db6e
--- /dev/null
+++ 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
new file mode 100644
index 0000000..6b00df4
--- /dev/null
+++ 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
new file mode 100644
index 0000000..041793f
--- /dev/null
+++ 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
new file mode 100644
index 0000000..7c14693
--- /dev/null
+++ 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
new file mode 100644
index 0000000..763666f
--- /dev/null
+++ 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/lspsaga.nix b/modules/programs/nvim/new_plugins/lspsaga.nix
index 6b60349..b47f969 100644
--- a/modules/programs/nvim/new_plugins/lspsaga.nix
+++ b/modules/programs/nvim/new_plugins/lspsaga.nix
@@ -16,9 +16,9 @@ in
     keymapsOnEvents = {
       LspAttach = [
         {
-          key = "<leader>cc";
+          key = "<leader>q";
           action = "<cmd>Lspsaga code_action<cr>";
-          options.desc = "Code Action";
+          options.desc = "Quickfix";
           options.buffer = true;
         }
         {
@@ -28,7 +28,7 @@ in
           options.buffer = true;
         }
         {
-          key = "<leader>cr";
+          key = "<leader>r";
           action = "<cmd>Lspsaga rename<cr>";
           options.desc = "Rename";
           options.buffer = true;
diff --git a/modules/programs/nvim/new_plugins/markdown-preview.nix b/modules/programs/nvim/new_plugins/markdown-preview.nix
new file mode 100644
index 0000000..19bc8f8
--- /dev/null
+++ 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
new file mode 100644
index 0000000..dff698c
--- /dev/null
+++ 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
new file mode 100644
index 0000000..92b7fa2
--- /dev/null
+++ 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
new file mode 100644
index 0000000..9e82552
--- /dev/null
+++ 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
new file mode 100644
index 0000000..cac1f45
--- /dev/null
+++ b/modules/programs/nvim/new_plugins/obsidian.nix
@@ -0,0 +1,36 @@
+_:
+
+{
+  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
+        '';
+        mappings = {
+          "<localleader>n" = { action.__raw = ''function() return vim.cmd("ObsidianNew") end''; opts.desc = "New Note"; opts.buffer = true; };
+          "<localleader>q" = { action.__raw = ''function() return vim.cmd("ObsidianQuickSwitch") end''; opts.desc = "Quick Switch"; opts.buffer = true; };
+          "<localleader>b" = { action.__raw = ''function() return vim.cmd("ObsidianBacklinks") end''; opts.desc = "Backlinks"; opts.buffer = true; };
+          "<localleader>l" = { action.__raw = ''function() return vim.cmd("ObsidianLink") end''; opts.desc = "Link"; opts.buffer = true; };
+          "<localleader>e" = { action.__raw = ''function() return vim.cmd("ObsidianExtractNote") end''; opts.desc = "Extract Note"; opts.buffer = true; };
+          "<localleader>r" = { action.__raw = ''function() return vim.cmd("ObsidianRename") end''; opts.desc = "Rename"; opts.buffer = true; };
+          "<cr>" = { action.__raw = ''function() return require("obsidian").util.smart_action() end''; opts.buffer = true; opts.expr = true; };
+          "gf" = { action.__raw = ''function() return require("obsidian").util.gf_passthrough() end''; opts = { noremap = false; expr = true; buffer = true; }; };
+        };
+      };
+    };
+  };
+}
diff --git a/modules/programs/nvim/new_plugins/oil.nix b/modules/programs/nvim/new_plugins/oil.nix
new file mode 100644
index 0000000..bf01b58
--- /dev/null
+++ 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 3107253..0000000
--- a/modules/programs/nvim/new_plugins/other.nix
+++ /dev/null
@@ -1,91 +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>fc";
-        };
-      }
-
-      {
-        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 = {
-          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" ];
-      }
-    ];
-  };
-}
diff --git a/modules/programs/nvim/new_plugins/render-markdown.nix b/modules/programs/nvim/new_plugins/render-markdown.nix
new file mode 100644
index 0000000..8f318b7
--- /dev/null
+++ 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/telescope.nix b/modules/programs/nvim/new_plugins/telescope.nix
index a0f6b4b..539ce73 100644
--- a/modules/programs/nvim/new_plugins/telescope.nix
+++ b/modules/programs/nvim/new_plugins/telescope.nix
@@ -31,6 +31,10 @@ _:
             action = "oldfiles";
             options.desc = "Recent files";
           };
+          "<leader>fc" = {
+            action = "commands";
+            options.desc = "Commands";
+          };
         };
       };
       web-devicons.enable = true;
diff --git a/modules/programs/nvim/new_plugins/todo-comments.nix b/modules/programs/nvim/new_plugins/todo-comments.nix
new file mode 100644
index 0000000..288c4e4
--- /dev/null
+++ 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
new file mode 100644
index 0000000..14dd92a
--- /dev/null
+++ 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
new file mode 100644
index 0000000..08f8c0d
--- /dev/null
+++ 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
new file mode 100644
index 0000000..1cf842c
--- /dev/null
+++ 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
new file mode 100644
index 0000000..e4e4eec
--- /dev/null
+++ 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;
+  };
+}