From 5767763227edbc7112070755e8d0592d953516bb Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Sun, 6 Apr 2025 22:45:09 +0200 Subject: [PATCH] the great `with` purge --- modules/packages/hardware.nix | 5 ---- modules/packages/module.nix | 25 ++++++++++--------- modules/packages/wayland.nix | 16 ++++++------ modules/programs/gui/foot.nix | 38 ++++++++++++++--------------- modules/programs/gui/minecraft.nix | 5 ++-- modules/services/locate.nix | 2 +- modules/services/pipewire.nix | 4 +-- modules/style/quickshell/module.nix | 2 +- 8 files changed, 49 insertions(+), 48 deletions(-) diff --git a/modules/packages/hardware.nix b/modules/packages/hardware.nix index a14cdb1..1a85c49 100644 --- a/modules/packages/hardware.nix +++ b/modules/packages/hardware.nix @@ -5,9 +5,4 @@ ... }: let in { - # environment.systemPackages = with pkgs; lib.mkMerge [ - # (mkIf cfg.bluetooth.enable [ - - # ]) - # ]; } diff --git a/modules/packages/module.nix b/modules/packages/module.nix index b48bc35..23b52ec 100644 --- a/modules/packages/module.nix +++ b/modules/packages/module.nix @@ -5,15 +5,18 @@ # ./media.nix ]; # These are some standard packages I want to have installed on every system, regardless of type or use case. - environment.systemPackages = with pkgs; [ - calc # Calculator device - coreutils-full # All of the GNU coreutils - curl # I sometimes need to curl stuff - git # take a guess - inetutils # internet stuff I need/want on every system. - wget - unzip # zipping and unzipping stuff - zip - util-linux - ]; + environment.systemPackages = builtins.attrValues { + inherit + (pkgs) + calc # Calculator device + coreutils-full # All of the GNU coreutils + curl # I sometimes need to curl stuff + git # take a guess + inetutils # internet stuff I need/want on every system. + wget + unzip # zipping and unzipping stuff + zip + util-linux + ; + }; } diff --git a/modules/packages/wayland.nix b/modules/packages/wayland.nix index 74908e0..eb0e2c3 100644 --- a/modules/packages/wayland.nix +++ b/modules/packages/wayland.nix @@ -1,13 +1,15 @@ { config, - lig, + lib, pkgs, ... -}: let -in { +}: { # These are packages I only need in wayland environments, nowhere else. - environment.systemPackages = with pkgs; [ - wl-clipboard - grimblast - ]; + environment.systemPackages = builtins.attrValues { + inherit + (pkgs) + wl-clipboard + grimblast + ; + }; } diff --git a/modules/programs/gui/foot.nix b/modules/programs/gui/foot.nix index 7458b6e..32c5a71 100644 --- a/modules/programs/gui/foot.nix +++ b/modules/programs/gui/foot.nix @@ -95,27 +95,27 @@ select-word = "BTN_LEFT-2"; select-word-whitespace = "Control+BTN_LEFT-2"; }; - colors = with colours; { - background = base00; # base color - foreground = base05; # text color + colors = { + background = colours.base00; # base color + foreground = colours.base05; # text color - regular0 = base03; # black - regular1 = base08; # red - regular2 = base0B; # green - regular3 = base0A; # yellow - regular4 = base0D; # blue - regular5 = base0F; #magenta - regular6 = base0C; #cyan - regular7 = base06; #white + regular0 = colours.base03; # black + regular1 = colours.base08; # red + regular2 = colours.base0B; # green + regular3 = colours.base0A; # yellow + regular4 = colours.base0D; # blue + regular5 = colours.base0F; #magenta + regular6 = colours.base0C; #cyan + regular7 = colours.base06; #white - bright0 = base04; # Surface 2 - bright1 = base08; # red - bright2 = base0B; # green - bright3 = base0A; # yellow - bright4 = base0D; # blue - bright5 = base0F; # pink - bright6 = base0C; # teal - bright7 = base07; # Subtext 0 + bright0 = colours.base04; # Surface 2 + bright1 = colours.base08; # red + bright2 = colours.base0B; # green + bright3 = colours.base0A; # yellow + bright4 = colours.base0D; # blue + bright5 = colours.base0F; # pink + bright6 = colours.base0C; # teal + bright7 = colours.base07; # Subtext 0 alpha = 1.0; }; diff --git a/modules/programs/gui/minecraft.nix b/modules/programs/gui/minecraft.nix index bbe0d4e..aa82068 100644 --- a/modules/programs/gui/minecraft.nix +++ b/modules/programs/gui/minecraft.nix @@ -3,9 +3,10 @@ lib, pkgs, ... -}: -with lib; let +}: let cfg = config.modules.programs.minecraft; + inherit (lib.options) mkEnableOption; + inherit (lib.modules) mkIf; in { options.modules.programs.minecraft = { enable = mkEnableOption "minecraft"; diff --git a/modules/services/locate.nix b/modules/services/locate.nix index 001db4b..d945e6b 100644 --- a/modules/services/locate.nix +++ b/modules/services/locate.nix @@ -10,7 +10,7 @@ in { options.modules.services.locate.enable = mkEnableOption "Locate service"; config = mkIf cfg.enable { - environment.systemPackages = with pkgs; [plocate]; + environment.systemPackages = [pkgs.plocate]; services.locate = { enable = true; interval = "hourly"; diff --git a/modules/services/pipewire.nix b/modules/services/pipewire.nix index e9c7f16..bb375c3 100644 --- a/modules/services/pipewire.nix +++ b/modules/services/pipewire.nix @@ -2,9 +2,9 @@ config, lib, ... -}: -with lib; let +}: let cfg = config.modules.system.sound; + inherit (lib.modules) mkIf; in { config = mkIf cfg.enable { services.pulseaudio.enable = false; diff --git a/modules/style/quickshell/module.nix b/modules/style/quickshell/module.nix index 84165bd..be5fc94 100644 --- a/modules/style/quickshell/module.nix +++ b/modules/style/quickshell/module.nix @@ -8,7 +8,7 @@ # inherit (inputs) quickshell; # inherit (lib.generators) toKeyValue; in { - # environment.systemPackages = with pkgs; [ + # environment.systemPackages = [ # qt6.qtimageformats # amog # qt6.qt5compat # shader fx # (quickshell.packages.x86_64-linux.default.override {