treewide: fix evaluation thanks to lib changes

thiagokokada · Dec 14, 2023 · 8e3d2e4 · 8e3d2e4
1 parent a0c0455
commit 8e3d2e4
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 25 deletions.
diff --git a/home-manager/cli/default.nix b/home-manager/cli/default.nix
@@ -16,7 +16,7 @@ in
   ];
 
   options.home-manager.cli = {
-    enable = lib.mkDefaultOption "CLI config";
+    enable = lib.mkEnableOption "CLI config" // { default = true; };
     enableGnu = lib.mkEnableOption "GNU utils config" // {
       default = !pkgs.stdenv.isDarwin;
     };

diff --git a/home-manager/desktop/i3/i3status-rust.nix b/home-manager/desktop/i3/i3status-rust.nix
@@ -95,7 +95,7 @@ in
               block = "disk_space";
               path = m;
               info_type = "available";
-              format = " $icon ${lib.shortPath m} $available ";
+              format = " $icon ${pkgs.lib.shortPath m} $available ";
             })
             cfg.mountPoints;
 

diff --git a/home-manager/desktop/i3/picom.nix b/home-manager/desktop/i3/picom.nix
@@ -1,4 +1,4 @@
-{ config, lib, osConfig, ... }:
+{ config, pkgs, lib, osConfig, ... }:
 
 {
   options.home-manager.desktop.i3.picom.enable = lib.mkEnableOption "picom config" // {
@@ -8,7 +8,7 @@
   config = lib.mkIf config.home-manager.desktop.i3.picom.enable {
     services.picom = {
       enable = true;
-      backend = if (lib.isNvidia osConfig) then "glx" else "egl";
+      backend = if (pkgs.lib.isNvidia osConfig) then "glx" else "egl";
       fade = true;
       fadeDelta = 2;
       vSync = true;

diff --git a/home-manager/desktop/sway/default.nix b/home-manager/desktop/sway/default.nix
@@ -124,7 +124,7 @@ in
         gtk = true;
       };
 
-      extraOptions = lib.optionals (lib.isNvidia osConfig) [
+      extraOptions = lib.optionals (pkgs.lib.isNvidia osConfig) [
         "--unsupported-gpu"
       ];
     };

diff --git a/home-manager/desktop/sway/waybar.nix b/home-manager/desktop/sway/waybar.nix
@@ -2,7 +2,7 @@
 
 let
   cfg = config.home-manager.desktop.sway.waybar;
-  shortPathName = path: "disk#${lib.shortPathWithSep "_" path}";
+  shortPathName = path: "disk#${pkgs.lib.shortPathWithSep "_" path}";
 in
 {
   options.home-manager.desktop.sway.waybar = {
@@ -96,12 +96,12 @@ in
               format-icons = [ "󰤯" "󰤟" "󰤢" "󰤥" "󰤨" ];
             };
         } //
-        (lib.recursiveMergeAttrs
+        (pkgs.lib.recursiveMergeAttrs
           (map
             (m: {
               "${shortPathName m}" = {
                 inherit (cfg) interval;
-                format = " ${lib.shortPath m}: {free}";
+                format = " ${pkgs.lib.shortPath m}: {free}";
                 path = m;
                 states = {
                   warning = 75;

diff --git a/home-manager/editor/default.nix b/home-manager/editor/default.nix
@@ -9,5 +9,7 @@
     ./vscode
   ];
 
-  options.home-manager.editor.enable = lib.mkDefaultOption "editor config";
+  options.home-manager.editor.enable = lib.mkEnableOption "editor config" // {
+    default = true;
+  };
 }
diff --git a/home-manager/editor/jetbrains.nix b/home-manager/editor/jetbrains.nix
@@ -3,7 +3,7 @@
 {
   # TODO: add declarative IDE setup
   # https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/jetbrains/readme.md
-  options.home-manager.editor.jetbrains.enable = lib.mkDefaultOption "Jetbrains IDEs config";
+  options.home-manager.editor.jetbrains.enable = lib.mkEnableOption "Jetbrains IDEs config";
 
   config = lib.mkIf config.home-manager.editor.jetbrains.enable {
     home.file = {

diff --git a/home-manager/meta/default.nix b/home-manager/meta/default.nix
@@ -6,7 +6,9 @@
     ./diff.nix
   ];
 
-  options.home-manager.meta.enable = lib.mkDefaultOption "Home-Manager config";
+  options.home-manager.meta.enable = lib.mkEnableOption "Home-Manager config" // {
+    default = true;
+  };
 
   config = lib.mkIf config.home-manager.meta.enable {
     # Add some Nix related packages

diff --git a/lib/default.nix b/lib/default.nix
@@ -1,5 +1,4 @@
 { lib, ... }:
 
 import ./attrsets.nix { inherit lib; } //
-import ./modules.nix { inherit lib; } //
 import ./utils.nix { inherit lib; }
diff --git a/lib/modules.nix b/lib/modules.nix
diff --git a/nixos/home.nix b/nixos/home.nix
@@ -7,7 +7,7 @@ in
   imports = [ flake.inputs.home-manager.nixosModules.home-manager ];
 
   options.nixos.home = {
-    enable = lib.mkDefaultOption "home config";
+    enable = lib.mkEnableOption "home config" // { default = true; };
     imports = lib.mkOption {
       description = "Modules to import";
       type = lib.types.listOf lib.types.path;

diff --git a/nixos/nix/default.nix b/nixos/nix/default.nix
@@ -10,9 +10,9 @@ in
   ];
 
   options.nixos.nix = {
-    enable = lib.mkDefaultOption "nix/nixpkgs config";
-    tmpOnDisk = lib.mkDefaultOption "set nix's TMPDIR to /var/tmp (disk instead tmpfs)" // {
-      enable = config.boot.tmp.useTmpfs;
+    enable = lib.mkEnableOption "nix/nixpkgs config" // { default = true; };
+    tmpOnDisk = lib.mkEnableOption "set nix's TMPDIR to /var/tmp (disk instead tmpfs)" // {
+      default = config.boot.tmp.useTmpfs;
     };
   };
 

diff --git a/nixos/server/rtorrent.nix b/nixos/server/rtorrent.nix
@@ -9,7 +9,7 @@ in
   options.nixos.server.rtorrent = {
     enable = lib.mkEnableOption "rTorrent config";
     flood = {
-      enable = lib.mkDefaultOption "Flood UI";
+      enable = lib.mkEnableOption "Flood UI" // { default = true; };
       port = lib.mkOption {
         type = lib.types.int;
         description = "Port to bind webserver";

diff --git a/nixos/system/default.nix b/nixos/system/default.nix
@@ -11,8 +11,8 @@ in
   ];
 
   options.nixos.system = {
-    enable = lib.mkDefaultOption "system config";
-    showMotd = lib.mkDefaultOption "show message of the day";
+    enable = lib.mkEnableOption "system config" // { default = true; };
+    showMotd = lib.mkEnableOption "show message of the day" // { default = true; };
   };
 
   config = lib.mkIf cfg.enable {