diff options
| author |   Andrew Opalach <andrew@akon.city>
| 2025-04-02 05:07:26 -0400 |
|---|---|---|
| committer | Andrew Opalach <andrew@akon.city>
| 2025-04-02 05:07:26 -0400 |
| commit | c39de560ae0bddcd4b22d19645a24bb71dbeb81d (patch) | |
| tree | 97188aefc855a7c85c4caa9ec5b3c342675d6604 /hosts/yashinoki | |
| parent | a788dd9a0273fc4aac68197934eb8f25f4b367f2 (diff) | |
| download | dotfiles-c39de560ae0bddcd4b22d19645a24bb71dbeb81d.tar.gz dotfiles-c39de560ae0bddcd4b22d19645a24bb71dbeb81d.tar.bz2 dotfiles-c39de560ae0bddcd4b22d19645a24bb71dbeb81d.zip | |
Use `with pkg` when it's there
Diffstat (limited to 'hosts/yashinoki')
| -rw-r--r-- | hosts/yashinoki/configuration.nix | 1 | ||||
| -rw-r--r-- | hosts/yashinoki/programs.nix | 16 |
2 files changed, 8 insertions, 9 deletions
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 ]; |