Merge pull request 'NVF' (#9) from NVF into main

Reviewed-on: #9

flake.lock

@@ -94,6 +94,22 @@
         "type": "github"
       }
     },
+    "flake-compat_3": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1751685974,
+        "narHash": "sha256-NKw96t+BgHIYzHUjkTK95FqYRVKB8DHpVhefWSz/kTw=",
+        "ref": "refs/heads/main",
+        "rev": "549f2762aebeff29a2e5ece7a7dc0f955281a1d1",
+        "revCount": 92,
+        "type": "git",
+        "url": "https://git.lix.systems/lix-project/flake-compat.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.lix.systems/lix-project/flake-compat.git"
+      }
+    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": [
@@ -118,16 +134,16 @@
     "flake-parts_2": {
       "inputs": {
         "nixpkgs-lib": [
-          "nixvim",
+          "nvf",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1754091436,
+        "lastModified": 1753121425,
-        "narHash": "sha256-XKqDMN1/Qj1DKivQvscI4vmHfDfvYR2pfuFOJiCeewM=",
+        "narHash": "sha256-TVcTNvOeWWk1DXljFxVRp+E0tzG1LhrVjOGGoMHuXio=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "67df8c627c2c39c41dbec76a1f201929929ab0bd",
+        "rev": "644e0fc48951a860279da645ba77fe4a6e814c5e",
         "type": "github"
       },
       "original": {
@@ -187,24 +203,6 @@
         "type": "github"
       }
     },
-    "flake-utils_4": {
-      "inputs": {
-        "systems": "systems_3"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "git-hooks-nix": {
       "inputs": {
         "flake-compat": [
@@ -256,31 +254,18 @@
         "type": "github"
       }
     },
-    "ixx": {
+    "mnw": {
-      "inputs": {
-        "flake-utils": [
-          "nixvim",
-          "nuschtosSearch",
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "nixvim",
-          "nuschtosSearch",
-          "nixpkgs"
-        ]
-      },
       "locked": {
-        "lastModified": 1748294338,
+        "lastModified": 1748710831,
-        "narHash": "sha256-FVO01jdmUNArzBS7NmaktLdGA5qA3lUMJ4B7a05Iynw=",
+        "narHash": "sha256-eZu2yH3Y2eA9DD3naKWy/sTxYS5rPK2hO7vj8tvUCSU=",
-        "owner": "NuschtOS",
+        "owner": "Gerg-L",
-        "repo": "ixx",
+        "repo": "mnw",
-        "rev": "cc5f390f7caf265461d4aab37e98d2292ebbdb85",
+        "rev": "cff958a4e050f8d917a6ff3a5624bc4681c6187d",
         "type": "github"
       },
       "original": {
-        "owner": "NuschtOS",
+        "owner": "Gerg-L",
-        "ref": "v0.0.8",
+        "repo": "mnw",
-        "repo": "ixx",
         "type": "github"
       }
     },
@@ -506,49 +491,27 @@
         "type": "github"
       }
     },
-    "nixvim": {
+    "nvf": {
       "inputs": {
+        "flake-compat": "flake-compat_3",
         "flake-parts": "flake-parts_2",
+        "mnw": "mnw",
         "nixpkgs": [
           "nixpkgs"
         ],
-        "nuschtosSearch": "nuschtosSearch",
+        "systems": "systems_3"
-        "systems": "systems_4"
       },
       "locked": {
-        "lastModified": 1754397955,
+        "lastModified": 1754552918,
-        "narHash": "sha256-4hQT8mDSRNgPKiPdpYwr2QVJdA4FaUhOjT2lKkW8QHQ=",
+        "narHash": "sha256-vbT+nGdMLNAeYZ1S5WBBLJTVWosGne2VRt46rqPfB2A=",
-        "owner": "nix-community",
+        "owner": "notashelf",
-        "repo": "nixvim",
+        "repo": "nvf",
-        "rev": "8d47a07563120b36af149edf2273034563339a91",
+        "rev": "d61de135ce174f4e04b4e509de02e1afe040a834",
         "type": "github"
       },
       "original": {
-        "owner": "nix-community",
+        "owner": "notashelf",
-        "repo": "nixvim",
+        "repo": "nvf",
-        "type": "github"
-      }
-    },
-    "nuschtosSearch": {
-      "inputs": {
-        "flake-utils": "flake-utils_4",
-        "ixx": "ixx",
-        "nixpkgs": [
-          "nixvim",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1754301638,
-        "narHash": "sha256-aRgzcPDd2axHFOuMlPLuzmDptUM2JU8mUL3jfgbBeyc=",
-        "owner": "NuschtOS",
-        "repo": "search",
-        "rev": "a60091045273484c040a91f5c229ba298f8ecc27",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NuschtOS",
-        "repo": "search",
         "type": "github"
       }
     },
@@ -563,7 +526,7 @@
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs_6",
         "nixpkgs-stable": "nixpkgs-stable",
-        "nixvim": "nixvim"
+        "nvf": "nvf"
       }
     },
     "rust-overlay": {
@@ -644,21 +607,6 @@
         "repo": "default",
         "type": "github"
       }
-    },
-    "systems_4": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
     }
   },
   "root": "root",

flake.nix

@@ -15,13 +15,21 @@
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
     naviterm.url = "gitlab:detoxify92/naviterm";
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
-    nixvim.url = "github:nix-community/nixvim";
+    nvf.url = "github:notashelf/nvf";
-    nixvim.inputs.nixpkgs.follows = "nixpkgs";
+    nvf.inputs.nixpkgs.follows = "nixpkgs";
   };
 
-  outputs = inputs@{ self, nixpkgs, nix, nixpkgs-stable, nixos-hardware
+  outputs = inputs @ {
-    , home-manager, catppuccin, colmena, ... }:
+    self,
-    let
+    nixpkgs,
+    nix,
+    nixpkgs-stable,
+    nixos-hardware,
+    home-manager,
+    catppuccin,
+    colmena,
+    ...
+  }: let
     inherit (self) outputs;
     lib = nixpkgs.lib // home-manager.lib;
   in {

home/common/default.nix

@@ -1,4 +1,11 @@
-{ config, pkgs, inputs, osConfig, outputs, ... }: {
+{
+  config,
+  pkgs,
+  inputs,
+  osConfig,
+  outputs,
+  ...
+}: {
   imports = [
     ./aerc.nix
     ./bash.nix
@@ -12,10 +19,9 @@
     ./liquidprompt.nix
     ./listadmin.nix
     ./mail.nix
-    # ./mopidy.nix
     ./naviterm.nix
     ./newsboat.nix
-    ./nixvim.nix
+    ./nvf.nix
     ./ssh.nix
     ./taskwarrior.nix
     ./topgrade.nix
@@ -115,8 +121,7 @@
   programs.keychain = {
     enable = true;
     enableBashIntegration = true;
-    keys =
+    keys = "id_aur  id_dsa  id_ed25519  git C7E41C9F79C846984163693FCCD8E76F07EA701B";
-      "id_aur  id_dsa  id_ed25519  git C7E41C9F79C846984163693FCCD8E76F07EA701B";
   };
   home.file.".links/links.cfg".source = files/links.cfg;
 }

home/common/nvf.nix

@@ -0,0 +1,152 @@
+{
+  config,
+  pkgs,
+  nixvim,
+  ...
+}: {
+  home.packages = with pkgs; [tree-sitter fd ripgrep];
+  programs.nvf = {
+    enable = true;
+    settings = {
+      vim = {
+        autocomplete.nvim-cmp.enable = true;
+        binds = {
+          cheatsheet.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>ow";
+            action = ":ObsidianWorkspace<CR>";
+            mode = ["n"];
+          }
+          {
+            key = "<leader>od";
+            action = ":ObsidianDailies<CR>";
+            mode = ["n"];
+          }
+          {
+            key = "<leader>on";
+            action = ":ObsidianNew<CR>";
+            mode = ["n"];
+          }
+          {
+            key = "<leader>oN";
+            action = ":ObsidianNewFromTemplate<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;
+              ui.enable = false;
+              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 = {