From c39de560ae0bddcd4b22d19645a24bb71dbeb81d Mon Sep 17 00:00:00 2001
From: Andrew Opalach <andrew@akon.city>
Date: Wed, 2 Apr 2025 05:07:26 -0400
Subject: Use `with pkg` when it's there

---
 hosts/sofue/configuration.nix     |  4 ++--
 hosts/sofue/programs.nix          | 32 ++++++++++++++++----------------
 hosts/yashinoki/configuration.nix |  1 +
 hosts/yashinoki/programs.nix      | 16 +++++++---------
 4 files changed, 26 insertions(+), 27 deletions(-)

(limited to 'hosts')

diff --git a/hosts/sofue/configuration.nix b/hosts/sofue/configuration.nix
index cc12ee4..9c61f4e 100644
--- a/hosts/sofue/configuration.nix
+++ b/hosts/sofue/configuration.nix
@@ -130,14 +130,14 @@ in rec {
   environment.systemPackages = with pkgs; [
     linuxPackages_latest.perf
     linuxPackages_latest.cpupower
-    (pkgs.writeShellScriptBin "run-sway" ''
+    (writeShellScriptBin "run-sway" ''
       export TTY=/dev/tty3
       export XDG_VTNR=3
       export WLR_RENDERER=vulkan
       export PULSE_SERVER=unix:/home/andrew/.pulsewire-native-socket
       export PIPEWIRE_REMOTE=/tmp/pipewire-0-manager
       cd $HOME
-      exec ${pkgs.kbd}/bin/openvt --switch --login --console 3 -f -- ${pkgs.sway}/bin/sway
+      exec ${kbd}/bin/openvt --switch --login --console 3 -f -- ${sway}/bin/sway
     '')
     pipewire # Using server from host.
     pavucontrol
diff --git a/hosts/sofue/programs.nix b/hosts/sofue/programs.nix
index 89ff565..66852a2 100644
--- a/hosts/sofue/programs.nix
+++ b/hosts/sofue/programs.nix
@@ -1,26 +1,26 @@
 { lib, pkgs, ... }: {
   environment.systemPackages = with pkgs; lib.lists.flatten [
     #dia
-    (pkgs.asNeeded "gftp" ["gftp"])
-    (pkgs.asNeeded "cdrtools" ["btcflash" "cdda2mp3" "cdda2ogg" "cdda2wav" "cdrecord" "devdump" "isodebug" "isodump" "isoinfo" "isovfy" "mkhybrid" "mkisofs" "readcd" "rscsi" "scgcheck" "scgskeleton"])
-    (pkgs.asNeeded "audacity" ["audacity"])
-    (pkgs.asNeeded "krita" ["krita"])
-    (pkgs.asNeeded "olive-editor" ["olive-editor"])
+    (asNeeded "gftp" ["gftp"])
+    (asNeeded "cdrtools" ["btcflash" "cdda2mp3" "cdda2ogg" "cdda2wav" "cdrecord" "devdump" "isodebug" "isodump" "isoinfo" "isovfy" "mkhybrid" "mkisofs" "readcd" "rscsi" "scgcheck" "scgskeleton"])
+    (asNeeded "audacity" ["audacity"])
+    (asNeeded "krita" ["krita"])
+    (asNeeded "olive-editor" ["olive-editor"])
     yt-dlp
-    (pkgs.asNeeded "[chatterino2 streamlink]" ["chatterino2"])
-    (pkgs.asNeeded "megatools" ["megacopy" "megadf" "megadl" "megaexport" "megaget" "megals" "megamkdir" "megaput" "megareg" "megarm" "megatest" "megatools"])
-    (pkgs.asNeeded "gdown" ["gdown"])
+    (asNeeded "[chatterino2 streamlink]" ["chatterino2"])
+    (asNeeded "megatools" ["megacopy" "megadf" "megadl" "megaexport" "megaget" "megals" "megamkdir" "megaput" "megareg" "megarm" "megatest" "megatools"])
+    (asNeeded "gdown" ["gdown"])
     wineWowPackages.staging
     winetricks
     cabextract
-    (pkgs.asNeeded "looking-glass-client" ["looking-glass-client"])
-    (pkgs.asNeeded "qbittorrent" ["qbittorrent"])
-    (pkgs.asNeeded "ungoogled-chromium" ["chromium"])
-    (pkgs.asNeeded "brave" ["brave"])
-    (pkgs.discord.override { withOpenASAR = true; })
-    (pkgs.asNeeded "imv" ["imv"])
-    (pkgs.asNeeded "mpv" ["mpv"])
-    (pkgs.asNeeded "vlc" ["vlc"])
+    (asNeeded "looking-glass-client" ["looking-glass-client"])
+    (asNeeded "qbittorrent" ["qbittorrent"])
+    (asNeeded "ungoogled-chromium" ["chromium"])
+    (asNeeded "brave" ["brave"])
+    (discord.override { withOpenASAR = true; })
+    (asNeeded "imv" ["imv"])
+    (asNeeded "mpv" ["mpv"])
+    (asNeeded "vlc" ["vlc"])
     camu
     camu-devshell
     mauri
diff --git a/hosts/yashinoki/configuration.nix b/hosts/yashinoki/configuration.nix
index 88a3674..44a462b 100644
--- a/hosts/yashinoki/configuration.nix
+++ b/hosts/yashinoki/configuration.nix
@@ -1,6 +1,7 @@
 { config, lib, pkgs, ... }:
 let
   loc = config.local;
+  colo = loc.scheme;
   inherit (import ../../nix/settings.nix) disks;
 in {
   imports = [
diff --git a/hosts/yashinoki/programs.nix b/hosts/yashinoki/programs.nix
index b481d9d..6811372 100644
--- a/hosts/yashinoki/programs.nix
+++ b/hosts/yashinoki/programs.nix
@@ -1,13 +1,11 @@
-{ pkgs, ... }: let
-  inherit (import ../../nix/utils.nix) asNeeded;
-in {
-  environment.systemPackages = with pkgs; [
-    (asNeeded lib pkgs "krita" ["krita"])
+{ lib, pkgs, ... }: {
+  environment.systemPackages = with pkgs; lib.lists.flatten [
+    (asNeeded "krita" ["krita"])
     yt-dlp
-    (pkgs.asNeeded "[wineWowPackages.staging winetricks cabextract]" ["function_grep.pl" "msidb" "msiexec" "notepad" "regedit" "regsvr32" "widl" "wine" "wine-preloader" "wine64" "wine64-preloader" "wineboot" "winebuild" "winecfg" "wineconsole" "winecpp" "winedbg" "winedump" "winefile" "wineg++" "winegcc" "winemaker" "winemine" "winepath" "wineserver" "wmc" "wrc"])
-    (pkgs.discord.override { withOpenASAR = true; })
-    (pkgs.asNeeded "imv" ["imv"])
-    (pkgs.asNeeded "mpv" ["mpv"])
+    (asNeeded "[wineWowPackages.staging winetricks cabextract]" ["function_grep.pl" "msidb" "msiexec" "notepad" "regedit" "regsvr32" "widl" "wine" "wine-preloader" "wine64" "wine64-preloader" "wineboot" "winebuild" "winecfg" "wineconsole" "winecpp" "winedbg" "winedump" "winefile" "wineg++" "winegcc" "winemaker" "winemine" "winepath" "wineserver" "wmc" "wrc"])
+    (discord.override { withOpenASAR = true; })
+    (asNeeded "imv" ["imv"])
+    (asNeeded "mpv" ["mpv"])
     camu
     camu-devshell
   ];
-- 
cgit v1.2.3-101-g0448