nixvim -> nvf

home/common/default.nix

@@ -12,10 +12,10 @@
     ./liquidprompt.nix
     ./listadmin.nix
     ./mail.nix
-    # ./mopidy.nix
     ./naviterm.nix
     ./newsboat.nix
-    ./nixvim.nix
+    ./nvf.nix
+    # ./nixvim.nix
     ./ssh.nix
     ./taskwarrior.nix
     ./topgrade.nix

home/common/nvf.nix

@@ -0,0 +1,138 @@
+{ config, pkgs, nixvim, ... }: {
+  programs.nvf = {
+    enable = true;
+    settings = {
+      vim = {
+        autocomplete.nvim-cmp.enable = true;
+        dashboard.alpha = {
+          enable = true;
+          theme = "dashboard";
+        };
+        filetree.neo-tree = { enable = true; };
+        comments.comment-nvim.enable = true;
+        autopairs.nvim-autopairs.enable = true;
+        snippets.luasnip.enable = true;
+        terminal = {
+          toggleterm = {
+            enable = true;
+            lazygit = {
+              enable = true;
+            };
+          };
+        };
+        treesitter = {
+          enable = true;
+          context.enable = true;
+          fold = true;
+          autotagHtml.enable = true;
+        };
+        syntaxHighlighting = true;
+        keymaps = [
+          {
+            key = "<Tab>";
+            action = ":bnext<CR>";
+            mode = ["n"];
+          }
+          {
+            key = "<leader>t";
+            action = ":Telescope buffers<CR>";
+            mode = ["n"];
+          }
+          {
+            key = "<leader>T";
+            action = ":terminal<CR>";
+            mode = ["n"];
+          }
+          {
+            key = "<leader>e";
+            action = ":Neotree toggle<CR>";
+            mode = ["n"];
+          }
+          {
+            key = "<leader>o";
+            action = ":Obsidian<CR>";
+            mode = ["n"];
+          }
+          {
+            key = "<leader>gg";
+            action = ":LazyGit<CR>";
+            mode = ["n"];
+          }
+          {
+            key = "<leader>gl";
+            action = ":LazyGitLog<CR>";
+            mode = ["n"];
+          }
+        ];
+        git = {
+          enable = true;
+          gitsigns.enable = true;
+          gitsigns.codeActions.enable = false;
+          neogit.enable = true;
+        };
+        languages = {
+          enableTreesitter = true;
+          enableFormat = true;
+          enableExtraDiagnostics = true;
+          bash.enable = true;
+          lua.enable = true;
+          go.enable = true;
+          python.enable = true;
+          markdown = {
+            enable = true;
+            extensions.render-markdown-nvim.enable = true;
+          };
+          nix.enable = true;
+          html.enable = true;
+        };
+        lsp = {
+          enable = true; 
+          formatOnSave = true;
+          lspkind.enable = false;
+          lightbulb.enable = true;
+          lspsaga.enable = false;
+          trouble.enable = true;
+        };
+        options = { conceallevel = 1; };
+        statusline.lualine.enable = true;
+        telescope.enable = true;
+        theme = {
+          enable = true;
+          name = "catppuccin";
+          style = "mocha";
+        };
+        viAlias = true;
+        vimAlias = true;
+        notes = {
+          obsidian = {
+            enable = true;
+            setupOpts = {
+              legacy_commands = true;
+              completion.nvim-cmp = true;
+              templates = { subdir = "Templates"; };
+              daily_notes = {
+                date_format = "%Y-%m-%d";
+                folder = "Daily";
+              };
+              workspaces = [
+                {
+                  name = "main";
+                  path = "~/.obsidian/main";
+                }
+                {
+                  name = "journal";
+                  path = "~/.obsidian/journal";
+                }
+                {
+                  name = "food";
+                  path = "~/.obsidian/Food";
+                }
+              ];
+            };
+          };
+        };
+      };
+    };
+  };
+}
+

home/default.nix

@@ -12,7 +12,8 @@
       don = {
         imports = [
           inputs.catppuccin.homeModules.catppuccin
-          inputs.nixvim.homeModules.nixvim
+          inputs.nvf.homeManagerModules.default
+          # inputs.nixvim.homeModules.nixvim
           ./common
         ];
         home = {