From 37ef2ba1998375095accca37bea2c1ed1eb2e056 Mon Sep 17 00:00:00 2001 From: zuckerberg <5-zuckerberg@users.noreply.git.neet.dev> Date: Thu, 1 Jul 2021 09:47:06 -0400 Subject: [PATCH] applications, fix helios64 kernel --- common/pc/de.nix | 2 +- common/pc/xfce.nix | 4 +++- machines/storage/s0/kernel.nix | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/common/pc/de.nix b/common/pc/de.nix index d85d911..a5a5fd8 100644 --- a/common/pc/de.nix +++ b/common/pc/de.nix @@ -30,7 +30,7 @@ in { # Applications users.users.googlebot.packages = with pkgs; [ chromium keepassxc mumble tigervnc bluez-tools vscodium element-desktop mpv - nextcloud-client signal-desktop minecraft sauerbraten + nextcloud-client signal-desktop minecraft sauerbraten gnome.file-roller ]; # Networking diff --git a/common/pc/xfce.nix b/common/pc/xfce.nix index c8ddf70..3c01151 100644 --- a/common/pc/xfce.nix +++ b/common/pc/xfce.nix @@ -14,7 +14,9 @@ in { }; # xfce apps - users.users.googlebot.packages = with pkgs; [ + # TODO for some reason whiskermenu needs to be global for it to work + environment.systemPackages = with pkgs; [ + xfce.xfce4-whiskermenu-plugin ]; }; } diff --git a/machines/storage/s0/kernel.nix b/machines/storage/s0/kernel.nix index 872911e..eb72164 100644 --- a/machines/storage/s0/kernel.nix +++ b/machines/storage/s0/kernel.nix @@ -6,7 +6,7 @@ let rev = "ebb5f4ae7d6ce881fa18bd3fa598ca4605961dce"; sha256 = "1w1s1i07qpf4wd8df1wkpyvrcw48dvvardifb72l60zkhysabnin"; }; - patchSkipPattern = "general-(add|rockchip)-overlay|wifi-400[34]|board-renegade-dts-cleanup|PBP|nanopi|rockpi|rk3328|board-roc-rk3399-pc-fix-regulators|general-bluetooth-add-new-quirk|general-disable-mtu-validatio|rk3399-pci-rockchip-support-ep-gpio-undefined-case|rkvdec_nv15"; + patchSkipPattern = "general-(add|rockchip)-overlay|wifi-400[34]|board-renegade-dts-cleanup|PBP|nanopi|rockpi|rk3328|board-roc-rk3399-pc-fix-regulators|general-bluetooth-add-new-quirk|general-disable-mtu-validatio|rk3399-pci-rockchip-support-ep-gpio-undefined-case|rkvdec_nv15|spi"; patch = runCommandLocal "rockchip64-current.patch" { src = armbian; } '' runHook unpackPhase cd $sourceRoot