feat: gets spaceport working

flake.lock

@@ -153,7 +153,25 @@
         "homeManager": "homeManager",
         "homeManager-23-11": "homeManager-23-11",
         "nixpkgs": "nixpkgs",
-        "nixpkgs-23-11": "nixpkgs-23-11"
+        "nixpkgs-23-11": "nixpkgs-23-11",
+        "spaceport-nvim": "spaceport-nvim"
+      }
+    },
+    "spaceport-nvim": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1712518037,
+        "narHash": "sha256-kCPRJBLzQpXYUAte2dK1WL7zhWs8X7V1npNpI8THw44=",
+        "owner": "CWood-sdf",
+        "repo": "spaceport.nvim",
+        "rev": "d91a0ae673b4f0f82420e0e1a9b0c0f3f21aa061",
+        "type": "github"
+      },
+      "original": {
+        "owner": "CWood-sdf",
+        "ref": "main",
+        "repo": "spaceport.nvim",
+        "type": "github"
       }
     },
     "systems": {

flake.nix

@@ -33,10 +33,7 @@
 
 	outputs = { self, nixpkgs, homeManager, NixOS-WSL, nixpkgs-23-11, homeManager-23-11, cmp-vimtex, spaceport-nvim, ...}@inputs:
 	let
-		customPackageOverlays = [
-			(import ./overlays/cmp-vimtex.nix { inherit cmp-vimtex; }).overlay
-			(import ./overlays/spaceport.nix { inherit spaceport-nvim; }).overlay
-		];
+		customPackageOverlay = (import ./overlays/default.nix { inherit cmp-vimtex; inherit spaceport-nvim; }).overlay;
 	in
 	{
 		nixosConfigurations = (
@@ -49,7 +46,7 @@
 				inherit nixpkgs-23-11;
 				inherit homeManager-23-11;
 				inherit cmp-vimtex;
-				inherit customPackageOverlays;
+				inherit customPackageOverlay;
 			}
 		);
 

home/deepak/home.nix

@@ -88,6 +88,7 @@
       friendly-snippets
       luasnip
       pkgs.customVimPlugins.cmp-vimtex
+      pkgs.customVimPlugins.spaceport-nvim
 
       # syntax highlighting
       vim-just
@@ -105,6 +106,11 @@
       vim.opt.listchars = { eol = "¬", tab = "▸┈" , trail = '·', multispace = '·' }
 
       vim.keymap.set("n", "<leader>n", "R<Enter><Esc>")
+
+      require('spaceport').setup({})
+      require('telescope').load_extension('spaceport')
+      vim.api.nvim_create_autocmd("User", { pattern = "SpaceportEnter", callback = function(ev) vim.opt.list = false end})
+      vim.api.nvim_create_autocmd("User", { pattern = "SpaceportDone", callback = function(ev) vim.opt.list = true end})
       require('gitsigns').setup()
 
       require('flash').setup()

hosts/hosts.nix

@@ -1,9 +1,9 @@
-{ lib, inputs, nixpkgs-23-11, homeManager, homeManager-23-11, NixOS-WSL, customPackageOverlays, ... }:
+{ lib, inputs, nixpkgs-23-11, homeManager, homeManager-23-11, NixOS-WSL, customPackageOverlay, ... }:
 {
 	"maxos" = lib.nixosSystem {
 		system = "x86_64-linux";
 		specialArgs = {
-			inherit customPackageOverlays;
+			inherit customPackageOverlay;
 		};
 		modules = [
 			./maxos/configuration.nix
@@ -23,7 +23,7 @@
 	"nixosWSL" = nixpkgs-23-11.lib.nixosSystem {
 		system = "x86_64-linux";
 		specialArgs = {
-			inherit customPackageOverlays;
+			inherit customPackageOverlay;
 		};
 		modules = [
 			./nixosWSL/configuration.nix

hosts/maxos/configuration.nix

@@ -2,7 +2,7 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ pkgs, customPackageOverlays, ... }:
+{ pkgs, customPackageOverlay, ... }:
 
 let
   custom-fonts = import ../../fonts { inherit pkgs; };
@@ -109,7 +109,9 @@ in
   programs.zsh.enable = true;
 
   nixpkgs.config.allowUnfree = true;
-  nixpkgs.overlays = customPackageOverlays;
+  nixpkgs.overlays = [
+    customPackageOverlay
+  ];
 
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.

hosts/nixosWSL/configuration.nix

@@ -1,4 +1,4 @@
-{ pkgs, customPackageOverlays, modulesPath, ... }:
+{ pkgs, customPackageOverlay, modulesPath, ... }:
 
 let
   custom-fonts = import ../../fonts { inherit pkgs; };
@@ -35,7 +35,9 @@ in
   '';
 
 
-  nixpkgs.overlays = customPackageOverlays;
+  nixpkgs.overlays = [
+    customPackageOverlay
+  ];
 
   system.stateVersion = "22.05";
 

overlays/cmp-vimtex.nix

@@ -1,15 +0,0 @@
-{ cmp-vimtex }:
-{
-  overlay = final: prev:
-     let
-       cmpVimtexPlugin = prev.vimUtils.buildVimPlugin {
-         src = cmp-vimtex;
-         name = "cmp-vimtex";
-       };
-     in
-     {
-       customVimPlugins = { 
-         cmp-vimtex = cmpVimtexPlugin;
-       };
-     };
-}

overlays/default.nix

@@ -1,7 +1,11 @@
-{ spaceport-nvim }:
+{ cmp-vimtex, spaceport-nvim }:
 {
   overlay = final: prev:
      let
+       cmpVimtexPlugin = prev.vimUtils.buildVimPlugin {
+         src = cmp-vimtex;
+         name = "cmp-vimtex";
+       };
        spaceportNvimPlugin = prev.vimUtils.buildVimPlugin {
          src = spaceport-nvim;
          name = "spaceport-nvim";
@@ -9,6 +13,7 @@
      in
      {
        customVimPlugins = { 
+         cmp-vimtex = cmpVimtexPlugin;
          spaceport-nvim = spaceportNvimPlugin;
        };
      };