From 87bf9997b62d2a87276962d32f685e4043b9cb85 Mon Sep 17 00:00:00 2001
From: asnev <notasnev@proton.me>
Date: Sun, 12 Jul 2026 00:18:19 +0700
Subject: [PATCH] nvf and such

---
 .gitignore                       |  1 +
 flake.lock                       | 62 +++++++++++++++++++++++++++++---
 flake.nix                        | 13 +++----
 users/coyote/programs/neovim.nix |  9 -----
 users/coyote/programs/nvf.nix    |  8 +++++
 5 files changed, 74 insertions(+), 19 deletions(-)
 delete mode 100644 users/coyote/programs/neovim.nix
 create mode 100644 users/coyote/programs/nvf.nix

diff --git a/.gitignore b/.gitignore
index dfb93ed..16ad602 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 .directory
 *.swp
+result/
diff --git a/flake.lock b/flake.lock
index 93fccc5..3e67160 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,21 @@
 {
   "nodes": {
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1777699697,
+        "narHash": "sha256-Eg9b/rq/ECYwNwEXs5i9wHyhxNI0JrYx2srdI2uZMaQ=",
+        "ref": "refs/heads/main",
+        "rev": "382052b74656a369c5408822af3f2501e9b1af81",
+        "revCount": 94,
+        "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"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -21,13 +37,28 @@
         "type": "github"
       }
     },
+    "mnw": {
+      "locked": {
+        "lastModified": 1780772958,
+        "narHash": "sha256-VKKe8r4pwCGWZ3Yr9CPN129R4S3CKLSrlYqdYz3vKpM=",
+        "owner": "Gerg-L",
+        "repo": "mnw",
+        "rev": "0871dbf63a53610c95db04439ed8ea4d6ec9c160",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Gerg-L",
+        "repo": "mnw",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1783549019,
-        "narHash": "sha256-0XnckG4ZhBmAsYa9mLuEIFowBG0fDGPLHduQGsbMS4A=",
+        "lastModified": 1783703440,
+        "narHash": "sha256-O3/YajjWo001VUIgD8BwaRdSNLUFe7nZ1qV5TwhRBcw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "74cc63f702f7d60a557e152a57b40fb1fd0f72ac",
+        "rev": "8f0500b9660505dc3cb647775fe9a978a74b5283",
         "type": "github"
       },
       "original": {
@@ -53,11 +84,34 @@
         "type": "github"
       }
     },
+    "nvf": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "mnw": "mnw",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1783767627,
+        "narHash": "sha256-UgQuKee2d5VhXaqectc23i2rarIufUpAVSTA6R8XloY=",
+        "owner": "notashelf",
+        "repo": "nvf",
+        "rev": "c55a3a783e6e1ecbbaad607b15a9b7b23d42236f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "notashelf",
+        "repo": "nvf",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs",
-        "nixpkgs-unstable": "nixpkgs-unstable"
+        "nixpkgs-unstable": "nixpkgs-unstable",
+        "nvf": "nvf"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index 144afd7..57850ba 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,8 +6,8 @@
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
     home-manager.url = "github:nix-community/home-manager/release-26.05";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
-    nix-index-database.url = "github:nix-community/nix-index-database";
-    nix-index-database.inputs.nixpkgs.follows = "nixpkgs-unstable";
+    nvf.url = "github:notashelf/nvf";
+    nvf.inputs.nixpkgs.follows = "nixpkgs";
   };
 
   outputs = inputs @ {
@@ -15,7 +15,7 @@
     nixpkgs,
     nixpkgs-unstable,
     home-manager,
-    nix-index-database,
+    nvf,
     ...
   }: {
     nixosConfigurations.phostron = nixpkgs.lib.nixosSystem {
@@ -30,10 +30,11 @@
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
           home-manager.extraSpecialArgs = {inherit inputs;};
-          home-manager.users.coyote = import ./users/coyote/home.nix;
+          home-manager.users.coyote.imports = [
+            ./users/coyote/home.nix
+            nvf.homeManagerModules.default
+          ];
         }
-        nix-index-database.nixosModules.default
-        { programs.nix-index-database.comma.enable = true; }
       ];
     };
   };
diff --git a/users/coyote/programs/neovim.nix b/users/coyote/programs/neovim.nix
deleted file mode 100644
index dc499a6..0000000
--- a/users/coyote/programs/neovim.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  pkgs,
-  lib,
-  ...
-}: {
-  programs.neovim = {
-    enable = true;
-  };
-}
diff --git a/users/coyote/programs/nvf.nix b/users/coyote/programs/nvf.nix
new file mode 100644
index 0000000..7b612d8
--- /dev/null
+++ b/users/coyote/programs/nvf.nix
@@ -0,0 +1,8 @@
+{ ... }: {
+  programs.nvf.enable = true;
+  programs.nvf.settings.vim = {
+    viAlias = false;
+    vimAlias = false;
+    lsp.enable = true;
+  };
+}