diff options
Diffstat (limited to 'nix')
| -rw-r--r-- | nix/gaming.nix | 25 | ||||
| -rw-r--r-- | nix/user.nix | 13 | ||||
| -rw-r--r-- | nix/utils.nix | 7 |
3 files changed, 18 insertions, 27 deletions
diff --git a/nix/gaming.nix b/nix/gaming.nix index a2d866f..821ae5b 100644 --- a/nix/gaming.nix +++ b/nix/gaming.nix @@ -1,25 +1,24 @@ { config, lib, pkgs, ... }: let loc = config.local; colo = loc.scheme; - inherit (import ./utils.nix) asNeeded; in { users.users.andrew = { extraGroups = [ "gamemode" ]; }; environment.systemPackages = with pkgs; lib.lists.flatten [ mangohud - (asNeeded lib pkgs "protontricks" ["protontricks" "protontricks-launch"]) - (asNeeded lib pkgs "[lutris umu-launcher]" ["lutris"]) - (asNeeded lib pkgs "prismlauncher" ["prismlauncher"]) - (asNeeded lib pkgs "retroarch" ["retroarch"]) - (asNeeded lib pkgs "dolphin-emu" ["dolphin-emu"]) - (asNeeded lib pkgs "pcsx2" ["pcsx2-qt"]) - (asNeeded lib pkgs "(ppsspp.override { enableQt = true; })" ["ppsspp"]) - (asNeeded lib pkgs "cemu" ["cemu"]) - (asNeeded lib pkgs "rpcs3" ["rpcs3"]) - (asNeeded lib pkgs "ryujinx" ["ryujinx"]) - (asNeeded lib pkgs "osu-lazer-bin" ["osu!"]) - (asNeeded lib pkgs "parsec-bin" ["parsecd"]) + (pkgs.asNeeded "protontricks" ["protontricks" "protontricks-launch"]) + (pkgs.asNeeded "[lutris umu-launcher]" ["lutris"]) + (pkgs.asNeeded "prismlauncher" ["prismlauncher"]) + (pkgs.asNeeded "retroarch" ["retroarch"]) + (pkgs.asNeeded "dolphin-emu" ["dolphin-emu"]) + (pkgs.asNeeded "pcsx2" ["pcsx2-qt"]) + (pkgs.asNeeded "(ppsspp.override { enableQt = true; })" ["ppsspp"]) + (pkgs.asNeeded "cemu" ["cemu"]) + (pkgs.asNeeded "rpcs3" ["rpcs3"]) + (pkgs.asNeeded "ryujinx" ["ryujinx"]) + (pkgs.asNeeded "osu-lazer-bin" ["osu!"]) + (pkgs.asNeeded "parsec-bin" ["parsecd"]) (pkgs.writeShellScriptBin "run-steam-gamescope" '' export TTY=/dev/tty4 export XDG_VTNR=4 diff --git a/nix/user.nix b/nix/user.nix index 057f95f..fce8bfc 100644 --- a/nix/user.nix +++ b/nix/user.nix @@ -1,7 +1,6 @@ { config, lib, pkgs, ... }: let loc = config.local; colo = loc.scheme; - inherit (import ./utils.nix) asNeeded; in { users.users.andrew = { isNormalUser = true; @@ -65,15 +64,15 @@ in { (python3.withPackages (python-pkgs: [ python-pkgs.requests python-pkgs.beautifulsoup4 ])) htop neofetch - (asNeeded lib pkgs "cmatrix" ["cmatrix"]) + (pkgs.asNeeded "cmatrix" ["cmatrix"]) hdparm usbutils cryptsetup - (asNeeded lib pkgs "nix-index" ["nix-channel-index" "nix-index" "nix-locate"]) + (pkgs.asNeeded "nix-index" ["nix-channel-index" "nix-index" "nix-locate"]) imagemagick - (asNeeded lib pkgs "optipng" ["optipng"]) - (asNeeded lib pkgs "dmtx-utils" ["dmtxquery" "dmtxread" "dmtxwrite"]) - (asNeeded lib pkgs "zbar" ["zbarcam" "zbarcam-gtk" "zbarcam-qt" "zbarimg"]) + (pkgs.asNeeded "optipng" ["optipng"]) + (pkgs.asNeeded "dmtx-utils" ["dmtxquery" "dmtxread" "dmtxwrite"]) + (pkgs.asNeeded "zbar" ["zbarcam" "zbarcam-gtk" "zbarcam-qt" "zbarimg"]) perlPackages.ArchiveZip b3sum libfaketime @@ -81,7 +80,7 @@ in { dos2unix socat curl - (asNeeded lib pkgs "httrack" ["htsserver" "httrack" "proxytrack" "webhttrack"]) + (pkgs.asNeeded "httrack" ["htsserver" "httrack" "proxytrack" "webhttrack"]) libuchardet (unzip.override { enableNLS = true; }) rar diff --git a/nix/utils.nix b/nix/utils.nix deleted file mode 100644 index 9219048..0000000 --- a/nix/utils.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - asNeeded = (lib: pkgs: pkg: commands: - (lib.lists.forEach commands (command: pkgs.writeShellScriptBin "${command}" '' - install-as-needed "${pkg}" ${command} ''$@ - '')) - ); -} |