feat: Expose neovim config as a package

common/gui.nix

@@ -20,6 +20,7 @@ lib.attrsets.optionalAttrs device.hasGui {
       WantedBy = ["graphical-session.target"];
     };
   };
+  imports = [./kitty.nix];
 
   programs = {
     # Only for checking markdown previews
@@ -34,10 +35,10 @@ lib.attrsets.optionalAttrs device.hasGui {
     # ghostty = {
     #   enable = true;
     #   installBatSyntax = false;
-    #   package =
+    #   settings = {
-    #     if pkgs.stdenv.isLinux
+    #     theme = "catppuccin-mocha";
-    #     then pkgs.ghostty
+    #   };
-    #     else pkgs.hello;
+    #   package = pkgs.ghostty;
     # };
   };
   home.packages = with pkgs;

common/home.nix

@@ -45,7 +45,7 @@ in {
       ./ncmpcpp.nix
       ./sops.nix
       ./tmux.nix
-      ../neovim
+      # ../neovim
     ]
     ++ lib.optionals device.isLinux [../linux]
     # ++ lib.optionals.device.isMac [../macos]
@@ -54,6 +54,7 @@ in {
 
   home.packages = with pkgs;
     [
+      (nixvim.makeNixvim (import ../neovim))
       _1password-cli
       alejandra
       ast-grep

flake.lock

@@ -2263,6 +2263,8 @@
         "tree-sitter-just": "tree-sitter-just",
         "tree-sitter-nu": "tree-sitter-nu",
         "tree-sitter-slint": "tree-sitter-slint",
+        "typr": "typr",
+        "volt": "volt",
         "zjstatus": "zjstatus"
       }
     },
@@ -2730,11 +2732,11 @@
         "rust-overlay": "rust-overlay_8"
       },
       "locked": {
-        "lastModified": 1735044950,
+        "lastModified": 1737007026,
-        "narHash": "sha256-8Au07voKXOa70Cq874FIPLi4Cj+4GdLMketKFwwuaas=",
+        "narHash": "sha256-j1EwjCV2ttZC2Sm7gGHqhtgGPpRAv2Z+C+rQIOtRYnw=",
         "owner": "uttarayan21",
         "repo": "tmux-float",
-        "rev": "11b2cf83ebe8478135483d9a165e828e33fee038",
+        "rev": "f3ae743b473d4767e31d61a209c378d88dfddd7d",
         "type": "github"
       },
       "original": {
@@ -2849,6 +2851,22 @@
         "type": "github"
       }
     },
+    "typr": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1736915269,
+        "narHash": "sha256-iVLxQeQqpqohCPZAE3SxReEo3KmWAo+xGAiJJnRBbUE=",
+        "owner": "nvzone",
+        "repo": "typr",
+        "rev": "a60c7f237be94d4b39228a3bd2ced80fe9fe2781",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nvzone",
+        "repo": "typr",
+        "type": "github"
+      }
+    },
     "utils": {
       "inputs": {
         "systems": "systems_5"
@@ -2867,6 +2885,22 @@
         "type": "github"
       }
     },
+    "volt": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1736777974,
+        "narHash": "sha256-2SO847Un74kNFGxARaebB+WCCgexnaJdjUkQLZ6ROQ8=",
+        "owner": "nvzone",
+        "repo": "volt",
+        "rev": "f02b065caf0327bf4d443ff6d91cb0edd6948ddb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nvzone",
+        "repo": "volt",
+        "type": "github"
+      }
+    },
     "xdph": {
       "inputs": {
         "hyprland-protocols": [

flake.nix

@@ -146,6 +146,14 @@
     ghostty = {
       url = "github:ghostty-org/ghostty";
     };
+    typr = {
+      url = "github:nvzone/typr";
+      flake = false;
+    };
+    volt = {
+      url = "github:nvzone/volt";
+      flake = false;
+    };
   };
 
   outputs = {
@@ -283,8 +291,15 @@
       system: let
         pkgs = import nixpkgs {
           inherit system;
+          overlays = import ./overlays.nix {
+            inherit inputs;
+          };
         };
       in {
+        packages = rec {
+          default = neovim;
+          neovim = pkgs.nixvim.makeNixvim (import ./neovim);
+        };
         devShells = {
           default = pkgs.mkShell {
             packages = with pkgs; [sops just];

neovim/default.nix

@@ -1,6 +1,6 @@
 {
   pkgs,
-  config,
+  # config,
   ...
 }: let
   mkMappings = mappings:
@@ -24,8 +24,7 @@
       ${lua}
     '';
   };
-  neovim = (pkgs.nixvim.makeNixvim nvim-config) // {config = nvim-config;};
+in {
-  nvim-config = {
   plugins = {
     fugitive.enable = true;
     gitsigns.enable = true;
@@ -62,7 +61,7 @@
     chatgpt = {
       enable = true;
       settings = {
-          api_key_cmd = "cat ${config.sops.secrets."openai/api_key".path}";
+        # api_key_cmd = "cat ${config.sops.secrets."openai/api_key".path}";
       };
     };
 
@@ -766,17 +765,16 @@
     octo-nvim
     outline-nvim
     plenary-nvim
+    # typr
     vim-abolish
     vim-speeddating
     webapi-vim
+
     pkgs.tree-sitter-grammars.tree-sitter-just
-      pkgs.tree-sitter-grammars.tree-sitter-nu
     pkgs.tree-sitter-grammars.tree-sitter-norg
     pkgs.tree-sitter-grammars.tree-sitter-norg-meta
+    pkgs.tree-sitter-grammars.tree-sitter-nu
   ];
   extraLuaPackages = luaPkgs: with luaPkgs; [lua-utils-nvim nvim-nio pathlib-nvim];
   extraPackages = [pkgs.lldb pkgs.taplo pkgs.d2 pkgs.sleek pkgs.graphqurl];
-  };
-in {
-  home.packages = [neovim];
 }

neovim/overlays.nix

@@ -8,7 +8,28 @@
           version = "1";
           src = inputs.d2;
         };
+        # typr = final.pkgs.vimUtils.buildVimPlugin {
+        #   name = "typr";
+        #   version = "1";
+        #   src = inputs.typr;
+        #   buildInputs = [final.pkgs.lua52Packages.volt];
+        # };
       };
+    # volt = final.pkgs.neovimUtils.buildNeovimPlugin {
+    #   name = "volt";
+    #   pname = "volt";
+    #   version = "1";
+    #   src = inputs.volt;
+    # };
+    # lua = prev.lua.override {
+    #   packageOverrides = luaself: luaprev: {
+    #     volt = final.stdenv.buildLuaPackage {
+    #       pname = "volt";
+    #       version = "1.0.0";
+    #       src = inputs.volt;
+    #     };
+    #   };
+    # };
   };
   tree-sitter-grammars = final: prev: {
     tree-sitter-grammars =

nixos/mirai/configuration.nix

@@ -1,6 +1,5 @@
 {
   config,
-  lib,
   pkgs,
   ...
 }: {
@@ -8,7 +7,7 @@
     # Include the results of the hardware scan.
     ./services
     ./mirai.nix
-    ./docker.nix
+    # ./docker.nix
   ];
   security.sudo.wheelNeedsPassword = false;
   sops = {

nixos/ryu/configuration.nix

@@ -248,6 +248,7 @@
     systemPackages = with pkgs; [
       #  vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
       #  wget
+      (nixvim.makeNixvim (import ../../neovim))
       qpwgraph
       hyprland
       xorg.xhost