home/modules/neovim.nix

@@ -1,19 +1,24 @@
-{ pkgs, lib, config, inputs, ... }:
+{ pkgs, lib, config, ... }:
 
 let
   cfg = config.snowhawk.neovim;
-
-  nightlyPackage = inputs.neovim-overlay.packages.${pkgs.system}.default;
 in
 {
   options.snowhawk.neovim = {
-    enable = lib.mkEnableOption "neovim home-manager module";
+    enable = lib.mkEnableOption "neovim";
-
-    nightly = lib.mkEnableOption "nightly build of neovim";
 
     package = lib.mkPackageOption pkgs "neovim" {
       default = [ "neovim-unwrapped" ];
     };
+
+    # This should be close to identical to above
+    #
+    # package = lib.mkOption {
+    #   type = lib.types.package;
+    #   default = pkgs.neovim-unwrapped;
+    #   defaultText = lib.literalExpression "pkgs.neovim-unwrapped";
+    #   description = "The package to use for the neovim binary.";
+    # };
   };
   config =
     let
@@ -26,8 +31,6 @@ in
       };
     in
     lib.mkIf cfg.enable {
-      snowhawk.neovim.package = lib.mkIf cfg.nightly (lib.mkDefault nightlyPackage);
-
       # Set nvim as manpager and default editor
       home.sessionVariables = {
         EDITOR = "nvim";

hosts/little-lightning/home.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, ... }:
+{ pkgs, inputs, lib, ... }:
 
 {
   imports = [
@@ -14,7 +14,10 @@
       enable = true;
       homeNetwork = true;
     };
-    neovim.enable = true;
+    neovim = {
+      enable = true;
+      package = inputs.neovim-overlay.packages.${pkgs.system}.default;
+    };
     sops.enable = true;
   };