This commit is contained in:
2026-03-30 11:56:27 -05:00
parent 62736ed77c
commit 6d6618a683
9 changed files with 28 additions and 14 deletions

View File

@@ -4,10 +4,12 @@
pkgs, pkgs,
namespace, namespace,
hasDestopEnvironment ? true, hasDestopEnvironment ? true,
system,
... ...
}: }:
let let
inherit (lib.${namespace}) enabled; inherit (lib.${namespace}) enabled;
isArm = ("aarch64-linux" == system) || ("aarch64-darwin" == system);
# Non-login / system accounts (root, nixos installer, etc.) should not get # Non-login / system accounts (root, nixos installer, etc.) should not get
# desktop packages, tmux, nh, kdeconnect, nextcloud-client, etc. # desktop packages, tmux, nh, kdeconnect, nextcloud-client, etc.
# Detect them by username so individual host home files are not needed. # Detect them by username so individual host home files are not needed.
@@ -40,7 +42,6 @@ in
nix-prefetch-scripts nix-prefetch-scripts
nixfmt nixfmt
pciutils pciutils
proton-pass
proton-pass-cli proton-pass-cli
proton-vpn-cli proton-vpn-cli
protonvpn-gui protonvpn-gui
@@ -67,7 +68,14 @@ in
mission-center mission-center
parted parted
vesktop vesktop
] ] ++ (
if isArm then
[ ]
else
[
proton-pass
]
)
else else
[ ] [ ]
) )

View File

@@ -92,7 +92,7 @@ in
# Hardware configs # Hardware configs
hardware = { hardware = {
# Xbox controllers # Xbox controllers
xpadneo.enable = false; xone.enable = false;
# Steam udev rules for remote play # Steam udev rules for remote play
steam-hardware.enable = true; steam-hardware.enable = true;

View File

@@ -10,7 +10,7 @@
"owner": "jc-kynesim", "owner": "jc-kynesim",
"repo": "rpi-ffmpeg", "repo": "rpi-ffmpeg",
"rev": "efa6cec759d7c692808a8cc43d610fe6b9fadfe1", "rev": "efa6cec759d7c692808a8cc43d610fe6b9fadfe1",
"hash": "sha256-2lOoKvXq5Dk84+d4lK/nVd0bmTP0hHTkHjJUR7x5hu0=" "hash": "sha256-ceRibwtV4Cmx+TiQ6N7VVx18E7YzocnrYbw1cDBC1AA="
} }
} }
} }

View File

@@ -25,12 +25,12 @@
}, },
"unstable": { "unstable": {
"variables": { "variables": {
"modDirVersion": "7.0.0-rc5" "modDirVersion": "7.0.0-rc6"
}, },
"sources": { "sources": {
"unstable": { "unstable": {
"rev": "a7bc0f8cb48699767951c51872b90e0f9b7e643d", "rev": "cab660d9a1cbe0098db32e660fadb051b5c7fc12",
"hash": "sha256-CxoPVxTSAzz1f5/ppfmJAs79T+GLuzLg4K+66rF7fXo=" "hash": "sha256-AAgvct6nGxZcCjkaS8fd/WYR22pj3mJheAj87ivovDE="
} }
} }
} }

View File

@@ -16,8 +16,8 @@
"owner": "RPi-Distro", "owner": "RPi-Distro",
"repo": "firmware-nonfree", "repo": "firmware-nonfree",
"branch": "trixie", "branch": "trixie",
"rev": "40dea60e27078fac57a3fed51010e2c26865d49b", "rev": "9794282eb9f4a2de1f23b41a738926740e975d83",
"hash": "sha256-yXKzrkr7zdw/ba8GEi0r+XjnZEsQ59LPEuXj0HaKwxU=" "hash": "sha256-OtA8yHvfusGP/ucf8Exzi+nSUmNoYp10u+luC2gbNZc="
} }
} }
} }

View File

@@ -5,6 +5,7 @@
stdenv, stdenv,
cmake, cmake,
dtc, dtc,
ncurses,
namespace, namespace,
pkgs, pkgs,
}: }:
@@ -26,7 +27,10 @@ stdenv.mkDerivation (_finalAttrs: {
dtc # dtmerge depends on libfdt dtc # dtmerge depends on libfdt
]; ];
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [
cmake
ncurses
];
meta = with lib; { meta = with lib; {
description = "A collection of scripts and simple applications for Raspberry Pi hardware"; description = "A collection of scripts and simple applications for Raspberry Pi hardware";

View File

@@ -5,8 +5,8 @@
"fetcher": "github", "fetcher": "github",
"owner": "raspberrypi", "owner": "raspberrypi",
"repo": "utils", "repo": "utils",
"rev": "60ea0df9b7a43b4198c0def6355b600eb2cfbfb1", "rev": "0504cf3ba3eb31fd00ae8df4358b48d700ffcd16",
"hash": "sha256-6librul3fq+QASZPGB3uGFMNEM1jn5IQN+yqLieBMJA=" "hash": "sha256-sPt/i2+IAs+a2nkIcbNAUrBMpJuRoBD9kU86RfIarxQ="
} }
} }
} }

View File

@@ -16,8 +16,8 @@
"owner": "raspberrypi", "owner": "raspberrypi",
"repo": "firmware", "repo": "firmware",
"branch": "next", "branch": "next",
"rev": "94a0176136cbb024858cf8debd547f3f233021b7", "rev": "81ecd84bed911f69e8116939ba02e53d5b53e532",
"hash": "sha256-aVuAcRQl45/XjPBmEVaok8dc0sEwesmAv722kKEGCeI=" "hash": "sha256-OiqqGyCJWX2Ys78ptphA4lwFFb0xX2B+crcGZrJOxVY="
} }
} }
} }

View File

@@ -16,6 +16,8 @@
./services.nix ./services.nix
]; ];
hardware.xone.enable = true;
nix.settings.extra-platforms = [ "x86_64-linux" ]; nix.settings.extra-platforms = [ "x86_64-linux" ];
boot.binfmt.emulatedSystems = [ "x86_64-linux" ]; boot.binfmt.emulatedSystems = [ "x86_64-linux" ];