From ab2685579a918bb48c998ed57009436e7c9fd4e2 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sat, 4 May 2024 13:27:50 +0300
Subject: [PATCH] flake/modules: alias `programs.nvf` to
 `programs.neovim-flake`

I will deprecate it in a future date, but for now it is fine.
---
 flake/modules/home-manager.nix | 22 +++++++++++++---------
 flake/modules/nixos.nix        | 22 +++++++++++++---------
 2 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/flake/modules/home-manager.nix b/flake/modules/home-manager.nix
index bcefcf1..585f3ce 100644
--- a/flake/modules/home-manager.nix
+++ b/flake/modules/home-manager.nix
@@ -6,12 +6,12 @@ packages: inputs: {
   ...
 }: let
   inherit (lib) maintainers;
-  inherit (lib.modules) mkIf;
+  inherit (lib.modules) mkIf mkAliasOptionModule;
   inherit (lib.lists) optional;
   inherit (lib.options) mkOption mkEnableOption literalExpression;
   inherit (lib.types) attrsOf anything bool;
 
-  cfg = config.programs.neovim-flake;
+  cfg = config.programs.nvf;
   inherit (import ../../configuration.nix inputs) neovimConfiguration;
 
   neovimConfigured = neovimConfiguration {
@@ -19,22 +19,26 @@ packages: inputs: {
     modules = [cfg.settings];
   };
 in {
+  imports = [
+    (mkAliasOptionModule ["programs" "neovim-flake"] ["programs" "nvf"])
+  ];
+
   meta.maintainers = with maintainers; [NotAShelf];
 
-  options.programs.neovim-flake = {
-    enable = mkEnableOption "neovim-flake, the extensible neovim configuration wrapper";
+  options.programs.nvf = {
+    enable = mkEnableOption "nvf, the extensible neovim configuration wrapper";
 
     enableManpages = mkOption {
       type = bool;
       default = false;
-      description = "Whether to enable manpages for neovim-flake.";
+      description = "Whether to enable manpages for nvf.";
     };
 
     defaultEditor = mkOption {
       type = bool;
       default = false;
       description = ''
-        Whether to set `neovim-flake` as the default editor.
+        Whether to set `nvf` as the default editor.
 
         This will set the `EDITOR` environment variable as `nvim`
         if set to true.
@@ -46,14 +50,14 @@ in {
       visible = false;
       readOnly = true;
       description = ''
-        The built neovim-flake package, wrapped with the user's configuration.
+        The built nvf package, wrapped with the user's configuration.
       '';
     };
 
     settings = mkOption {
       type = attrsOf anything;
       default = {};
-      description = "Attribute set of neovim-flake preferences.";
+      description = "Attribute set of nvf preferences.";
       example = literalExpression ''
         {
           vim.viAlias = false;
@@ -75,7 +79,7 @@ in {
   };
 
   config = mkIf cfg.enable {
-    programs.neovim-flake.finalPackage = neovimConfigured.neovim;
+    programs.nvf.finalPackage = neovimConfigured.neovim;
 
     home = {
       sessionVariables = mkIf cfg.defaultEditor {EDITOR = "nvim";};
diff --git a/flake/modules/nixos.nix b/flake/modules/nixos.nix
index de234c7..3a1bf76 100644
--- a/flake/modules/nixos.nix
+++ b/flake/modules/nixos.nix
@@ -6,12 +6,12 @@ packages: inputs: {
   ...
 }: let
   inherit (lib) maintainers;
-  inherit (lib.modules) mkIf mkOverride;
+  inherit (lib.modules) mkIf mkOverride mkAliasOptionModule;
   inherit (lib.lists) optional;
   inherit (lib.options) mkOption mkEnableOption literalExpression;
   inherit (lib.types) attrsOf anything bool;
 
-  cfg = config.programs.neovim-flake;
+  cfg = config.programs.nvf;
   inherit (import ../../configuration.nix inputs) neovimConfiguration;
 
   neovimConfigured = neovimConfiguration {
@@ -19,22 +19,26 @@ packages: inputs: {
     modules = [cfg.settings];
   };
 in {
+  imports = [
+    (mkAliasOptionModule ["programs" "neovim-flake"] ["programs" "nvf"])
+  ];
+
   meta.maintainers = with maintainers; [NotAShelf];
 
-  options.programs.neovim-flake = {
-    enable = mkEnableOption "neovim-flake, the extensible neovim configuration wrapper";
+  options.programs.nvf = {
+    enable = mkEnableOption "nvf, the extensible neovim configuration wrapper";
 
     enableManpages = mkOption {
       type = bool;
       default = false;
-      description = "Whether to enable manpages for neovim-flake.";
+      description = "Whether to enable manpages for nvf.";
     };
 
     defaultEditor = mkOption {
       type = bool;
       default = false;
       description = ''
-        Whether to set `neovim-flake` as the default editor.
+        Whether to set `nvf` as the default editor.
 
         This will set the `EDITOR` environment variable as `nvim`
         if set to true.
@@ -46,14 +50,14 @@ in {
       visible = false;
       readOnly = true;
       description = ''
-        The built neovim-flake package, wrapped with the user's configuration.
+        The built nvf package, wrapped with the user's configuration.
       '';
     };
 
     settings = mkOption {
       type = attrsOf anything;
       default = {};
-      description = "Attribute set of neovim-flake preferences.";
+      description = "Attribute set of nvf preferences.";
       example = literalExpression ''
         {
           vim.viAlias = false;
@@ -75,7 +79,7 @@ in {
   };
 
   config = mkIf cfg.enable {
-    programs.neovim-flake.finalPackage = neovimConfigured.neovim;
+    programs.nvf.finalPackage = neovimConfigured.neovim;
 
     environment = {
       variables.EDITOR = mkIf cfg.defaultEditor (mkOverride 900 "nvim");