chore!: shorten configuration option names

squirmy · Apr 13, 2024 · 7979262 · 7979262
1 parent eaa0341
commit 7979262
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 21 deletions.
diff --git a/configuration/default.nix b/configuration/default.nix
@@ -1,7 +1,7 @@
 {...}: {
   nix-machine.configurations.nix-machine = {
     options = ./options.nix;
-    nixDarwin = ./nix-darwin;
-    homeManager = ./home-manager;
+    darwin = ./nix-darwin;
+    home = ./home-manager;
   };
 }
diff --git a/dev/tests/provided-darwin/expr.nix b/dev/tests/provided-darwin/expr.nix
@@ -5,8 +5,8 @@
   config = flakeLib.config.merge {
     squirmy = {
       options = ../_fixture/provided-config/options.nix;
-      nixDarwin = ../_fixture/provided-config/nix-darwin.nix;
-      homeManager = ../_fixture/provided-config/home-manager.nix;
+      darwin = ../_fixture/provided-config/nix-darwin.nix;
+      home = ../_fixture/provided-config/home-manager.nix;
       path = null;
     };
   };

diff --git a/dev/tests/provided-hm/expr.nix b/dev/tests/provided-hm/expr.nix
@@ -5,8 +5,8 @@
   config = flakeLib.config.merge {
     squirmy = {
       options = ../_fixture/provided-config/options.nix;
-      nixDarwin = ../_fixture/provided-config/nix-darwin.nix;
-      homeManager = ../_fixture/provided-config/home-manager.nix;
+      darwin = ../_fixture/provided-config/nix-darwin.nix;
+      home = ../_fixture/provided-config/home-manager.nix;
       path = null;
     };
   };

diff --git a/flake-module.nix b/flake-module.nix
@@ -13,11 +13,11 @@
       type = lib.types.deferredModule;
       default = {};
     };
-    nixDarwin = lib.mkOption {
+    darwin = lib.mkOption {
       type = lib.types.deferredModule;
       default = {};
     };
-    homeManager = lib.mkOption {
+    home = lib.mkOption {
       type = lib.types.deferredModule;
       default = {};
     };

diff --git a/lib/config/resolve.nix b/lib/config/resolve.nix
@@ -1,11 +1,5 @@
 {lib, ...}: c: let
-  # todo; break backwards compatibility and just return c
-  resolveProvided = c: {
-    options = c.options;
-    darwin = c.nixDarwin;
-    home = c.homeManager;
-  };
-
+  resolveProvided = c: c;
   resolveFlat = c: import ./resolve-flat.nix {inherit lib;} c.path;
 
   resolver =

diff --git a/templates/expose-configuration/configuration/default.nix b/templates/expose-configuration/configuration/default.nix
@@ -1,7 +1,7 @@
 {...}: {
   nix-machine.configurations.private = {
     options = ./options.nix;
-    nixDarwin = ./nix-darwin;
-    homeManager = ./home-manager;
+    darwin = ./nix-darwin;
+    home = ./home-manager;
   };
 }
diff --git a/templates/minimal/flake.nix b/templates/minimal/flake.nix
@@ -26,13 +26,13 @@
       nix-machine.configurations.private = {
         # configuration to apply to nix-darwin
         # https://daiderd.com/nix-darwin/manual/index.html
-        nixDarwin = {...}: {
+        darwin = {...}: {
           security.pam.enableSudoTouchIdAuth = true;
         };
 
         # configuration to apply to home-manager
         # https://mipmip.github.io/home-manager-option-search/
-        homeManager = {pkgs, ...}: {
+        home = {pkgs, ...}: {
           home.packages = [
             pkgs.fortune
           ];

diff --git a/templates/simple-macos/configuration/default.nix b/templates/simple-macos/configuration/default.nix
@@ -1,6 +1,6 @@
 {...}: {
   nix-machine.configurations.private = {
-    nixDarwin = ./nix-darwin;
-    homeManager = ./home-manager;
+    darwin = ./nix-darwin;
+    home = ./home-manager;
   };
 }