with lib -> inherit (lib) ...

ahbk · Jun 10, 2024 · 357f3c8 · 357f3c8
1 parent bf6f9cf
commit 357f3c8
Show file tree

Hide file tree

Showing 29 changed files with 271 additions and 142 deletions.
diff --git a/configurations/glesys.nix b/configurations/glesys.nix
@@ -1,7 +1,3 @@
-{ lib, ... }:
-
-with lib;
-
 let
   users = import ../users.nix;
   sites = import ../sites.nix;

diff --git a/configurations/stationary.nix b/configurations/stationary.nix
@@ -1,7 +1,3 @@
-{ lib, ... }:
-
-with lib;
-
 let
   users = import ../users.nix;
   sites = import ../sites.nix;

diff --git a/flake.nix b/flake.nix
@@ -26,8 +26,10 @@
   outputs =
     { self, ... }@inputs:
 
-    with inputs.nixpkgs.lib;
-    with inputs.home-manager.lib;
+    let
+      inherit (inputs.nixpkgs.lib) nixosSystem mapAttrs;
+      inherit (inputs.home-manager.lib) homeManagerConfiguration;
+    in
 
     {
       homeConfigurations = mapAttrs (

diff --git a/hm-modules/all.nix b/hm-modules/all.nix
@@ -1,4 +1,5 @@
-{ inputs, ... }: {
+{ inputs, ... }:
+{
   imports = [
     inputs.nixvim.homeManagerModules.nixvim
     ./desktop-env.nix

diff --git a/hm-modules/desktop-env.nix b/hm-modules/desktop-env.nix
@@ -5,26 +5,25 @@
   ...
 }:
 
-with lib;
-
 let
+  inherit (lib) mkIf getExe mkEnableOption;
+  inherit (builtins) substring;
+  inherit (theme) colors fonts;
   theme = import ../theme.nix;
-  unhashedHexes = lib.mapAttrs (n: c: builtins.substring 1 6 c) theme.colors;
+  unhashedHexes = lib.mapAttrs (n: c: substring 1 6 c) theme.colors;
   cfg = config.my-nixos-hm.desktop-env;
 in
-with theme.colors;
-with theme.fonts;
 
 {
-  options.my-nixos-hm.desktop-env = with types; {
+  options.my-nixos-hm.desktop-env = {
     enable = mkEnableOption "Desktop Environment for this user";
   };
 
-  config = lib.mkIf cfg.enable {
+  config = mkIf cfg.enable {
     programs.foot = {
       enable = true;
       settings = {
-        main.font = "${monospace}:size=11";
+        main.font = "${fonts.monospace}:size=11";
         main.dpi-aware = "no";
         mouse.hide-when-typing = "yes";
         colors = with unhashedHexes; {
@@ -65,7 +64,7 @@ with theme.fonts;
         config.bind('<Ctrl-O>', 'back')
         config.bind('<Ctrl-I>', 'forward')
       '';
-      settings = {
+      settings = with colors; {
         input = {
           links_included_in_focus_chain = false;
         };
@@ -84,7 +83,7 @@ with theme.fonts;
           };
         };
         fonts = {
-          default_family = [ monospace ];
+          default_family = [ fonts.monospace ];
           default_size = "11pt";
           hints = "default_size default_family";
         };
@@ -244,7 +243,7 @@ with theme.fonts;
               mode = "year";
               mode-mon-col = 3;
               weeks-pos = "left";
-              format = {
+              format = with colors; {
                 months = "<span color='${green-400}'><b>{}</b></span>";
                 days = "<span color='${white-400}'><b>{}</b></span>";
                 weeks = "<span color='${purple-400}'><b>{}</b></span>";
@@ -255,9 +254,9 @@ with theme.fonts;
           };
         };
       };
-      style = ''
+      style = with colors; ''
         * {
-          font-family: ${monospace};
+          font-family: ${fonts.monospace};
           background-color: ${bg-400};
         }
         #battery {
@@ -278,8 +277,8 @@ with theme.fonts;
       settings = {
         monitor = ",preferred,auto,1";
         exec-once = [
-          "${lib.getExe pkgs.swaybg} -i ${config.home.file.wallpaper.target}"
-          "${lib.getExe pkgs.waybar}"
+          "${getExe pkgs.swaybg} -i ${config.home.file.wallpaper.target}"
+          "${getExe pkgs.waybar}"
         ];
 
         general = {

diff --git a/hm-modules/ide.nix b/hm-modules/ide.nix
@@ -5,14 +5,17 @@
   ...
 }:
 
-with lib;
-
 let
-  cfg = config.my-nixos-hm.ide;
   theme = import ../theme.nix;
+  inherit (lib)
+    types
+    mkIf
+    mkEnableOption
+    mkOption
+    ;
+  inherit (theme) colors;
+  cfg = config.my-nixos-hm.ide;
 in
-with theme.colors;
-with theme.fonts;
 
 {
 
@@ -59,7 +62,7 @@ with theme.fonts;
           enable = true;
           settings = {
             transparent = false;
-            colors.palette = {
+            colors.palette = with colors; {
               katanaGray = black-100; # deprecated
               fujiGray = black-200; # syn.comment term:bright black
               sumiInk6 = black-300; # nontext whitespace

diff --git a/hm-modules/shell.nix b/hm-modules/shell.nix
@@ -5,18 +5,16 @@
   ...
 }:
 
-with lib;
-
 let
+  inherit (lib) types mkIf mkEnableOption;
+  inherit (theme) colors;
   cfg = config.my-nixos-hm.shell;
   theme = import ../theme.nix;
 in
-with theme.colors;
-with theme.fonts;
 
 {
-  options.my-nixos-hm.shell = with types; {
-    enable = mkEnableOption (mkDoc "Enable shell for this user");
+  options.my-nixos-hm.shell = {
+    enable = mkEnableOption "Enable shell for this user";
   };
 
   config = mkIf cfg.enable {
@@ -91,7 +89,7 @@ with theme.fonts;
       keyMode = "vi";
       escapeTime = 10;
       baseIndex = 1;
-      extraConfig = ''
+      extraConfig = with colors; ''
         set-option -ga terminal-features ',foot:RGB'
         set-option -g status-right "#{user}@#{host}"
         set -ga terminal-overrides ",256col:Tc"

diff --git a/hm-modules/user.nix b/hm-modules/user.nix
@@ -1,8 +1,12 @@
 { config, lib, ... }:
 
-with lib;
-
 let
+  inherit (lib)
+    types
+    mkIf
+    mkEnableOption
+    mkOption
+    ;
   cfg = config.my-nixos-hm.user;
 in
 {

diff --git a/hm-modules/vd.nix b/hm-modules/vd.nix
@@ -5,17 +5,16 @@
   ...
 }:
 
-with lib;
-
 let
+  inherit (lib) mkIf mkEnableOption;
   cfg = config.my-nixos-hm.vd;
 in
 {
   options.my-nixos-hm.vd = {
-    enable = mkEnableOption (mkDoc "Enable visual design tools for this user");
+    enable = mkEnableOption "Enable visual design tools for this user";
   };
 
-  config = lib.mkIf cfg.enable {
+  config = mkIf cfg.enable {
     home.packages = with pkgs; [
       inkscape
       figma-linux

diff --git a/modules/backup.nix b/modules/backup.nix
@@ -1,8 +1,14 @@
 { config, lib, ... }:
 
-with lib;
-
 let
+  inherit (lib)
+    filterAttrs
+    types
+    mkOption
+    mkIf
+    mapAttrs
+    mkEnableOption
+    ;
   cfg = config.my-nixos.backup;
   eachTarget = filterAttrs (user: cfg: cfg.enable) cfg;
   targetOpts = {

diff --git a/modules/desktop-env.nix b/modules/desktop-env.nix
@@ -5,14 +5,22 @@
   ...
 }:
 
-with lib;
-
 let
+  inherit (lib)
+    filterAttrs
+    types
+    mkOption
+    mkIf
+    mapAttrs
+    mkEnableOption
+    flatten
+    mapAttrsToList
+    ;
   cfg = config.my-nixos.desktop-env;
   eachUser = filterAttrs (user: cfg: cfg.enable) cfg;
   eachHMUser = filterAttrs (user: cfg: config.my-nixos.hm.${user}.enable) eachUser;
 
-  userOpts = with types; {
+  userOpts = {
     options.enable = mkEnableOption "desktop environment for this user";
   };
 in

diff --git a/modules/django-svelte.nix b/modules/django-svelte.nix
@@ -1,9 +1,15 @@
 { config, lib, ... }:
 
-with lib;
-with builtins;
-
 let
+  inherit (lib)
+    types
+    mkEnableOption
+    mkOption
+    mapAttrs
+    filterAttrs
+    mkIf
+    ;
+  inherit (builtins) elemAt;
   cfg = config.my-nixos.django-svelte;
   eachSite = filterAttrs (hostname: cfg: cfg.enable) cfg.sites;
 

diff --git a/modules/django.nix b/modules/django.nix
@@ -7,9 +7,19 @@
   ...
 }:
 
-with lib;
-
 let
+  inherit (lib)
+    types
+    mkEnableOption
+    mkOption
+    mkIf
+    filterAttrs
+    mapAttrsToList
+    mapAttrs
+    mapAttrs'
+    flatten
+    nameValuePair
+    ;
   lib' = (import ../lib.nix) { inherit lib pkgs; };
   cfg = config.my-nixos.django;
 

diff --git a/modules/fastapi-svelte.nix b/modules/fastapi-svelte.nix
@@ -1,9 +1,15 @@
 { config, lib, ... }:
 
-with lib;
-with builtins;
-
 let
+  inherit (lib)
+    filterAttrs
+    types
+    mkOption
+    mkEnableOption
+    mkIf
+    mapAttrs
+    ;
+  inherit (builtins) elemAt;
   cfg = config.my-nixos.fastapi-svelte;
   eachSite = filterAttrs (hostname: cfg: cfg.enable) cfg.sites;
   siteOpts = {

diff --git a/modules/fastapi.nix b/modules/fastapi.nix
@@ -7,9 +7,20 @@
   ...
 }:
 
-with lib;
-
 let
+  inherit (lib)
+    filterAttrs
+    types
+    mkEnableOption
+    mkOption
+    mapAttrs
+    mapAttrsToList
+    flatten
+    getExe
+    mapAttrs'
+    mkIf
+    nameValuePair
+    ;
   lib' = (import ../lib.nix) { inherit lib pkgs; };
   cfg = config.my-nixos.fastapi;
 

diff --git a/modules/glesys-updaterecord.nix b/modules/glesys-updaterecord.nix
@@ -5,9 +5,14 @@
   ...
 }:
 
-with lib;
-
 let
+  inherit (lib)
+    types
+    mkEnableOption
+    mkOption
+    mkIf
+    getExe
+    ;
   cfg = config.my-nixos.glesys.updaterecord;
 in
 {

diff --git a/modules/hm.nix b/modules/hm.nix
@@ -6,13 +6,19 @@
   ...
 }:
 
-with lib;
-
 let
+  inherit (lib)
+    filterAttrs
+    types
+    mkEnableOption
+    mkOption
+    mkIf
+    mapAttrs
+    ;
   cfg = config.my-nixos.hm;
   eachUser = filterAttrs (user: cfg: cfg.enable) cfg;
 
-  userOpts = with types; {
+  userOpts = {
     options.enable = mkEnableOption "home-manager for this user";
   };
 in