From 74e772582dca22589dd52987a75a1c79d80ad872 Mon Sep 17 00:00:00 2001 From: mjallen18 Date: Tue, 23 Dec 2025 10:41:19 -0600 Subject: [PATCH] stuff and thangs --- modules/home/home/default.nix | 2 +- modules/nixos/nix/default.nix | 25 +++++++++++++++++++- overlays/redis/default.nix | 2 ++ systems/aarch64-linux/pi5/default.nix | 12 +++++++++- systems/x86_64-linux/jallen-nas/default.nix | 6 +++++ systems/x86_64-linux/jallen-nas/services.nix | 8 +++++++ 6 files changed, 52 insertions(+), 3 deletions(-) diff --git a/modules/home/home/default.nix b/modules/home/home/default.nix index 76a937d..816b5d9 100644 --- a/modules/home/home/default.nix +++ b/modules/home/home/default.nix @@ -39,7 +39,7 @@ in ++ ( if hasDestopEnvironment then [ - chromium + stable.chromium firefox gamescope gamescope-wsi diff --git a/modules/nixos/nix/default.nix b/modules/nixos/nix/default.nix index 4a733b3..5a35c06 100644 --- a/modules/nixos/nix/default.nix +++ b/modules/nixos/nix/default.nix @@ -17,11 +17,14 @@ "cachyos-server-lto-znver4" "cachyos-rc-lto" "cachyos-rc-lto-znver4" - "chromium" + # "chromium" "electron" "ffmpeg" + "ffmpeg_7" + "ffmpeg_6" "ffmpeg-full" "ffmpeg-headless-rpi" + "gamescope" "gjs" "gst-plugins-bad" "gtk4" @@ -30,14 +33,21 @@ "libraspberrypi" "libsecret" "linux" + "linux_rpi" "onnxruntime" "opencv" "pipewire" "qemu" + "qemu_kvm" + "qemu_full" + "qt3d" + "qtdeclarative" + "qtmultimedia" "qtwebengine" "raspberrypi-utils" "sdl" "sdl2" + "sdl3" "torch" "uv" "webkitgtk" @@ -56,6 +66,19 @@ (self: super: { "ffmpeg-headless-rpi" = super."ffmpeg-headless-rpi".override { ffmpeg_7-full = super.ffmpeg_7-headless.override { stdenv = super.ccacheStdenv; }; }; }) + + # todo: make these work + # (self: super: { + # kdePackages = super.kdePackages // { + # qt3d = super.kdePackages.qt3d.override { qtbase = super.kdePackages.qtbase.override { stdenv = super.ccacheStdenv; }; }; + # qtbase = super.kdePackages.qtbase.override { stdenv = super.ccacheStdenv; }; + # }; + # }) + (self: super: { + linuxAndFirmware = super.linuxAndFirmware // { + latest = super.linuxAndFirmware.latest.override { stdenv = super.ccacheStdenv; }; + }; + }) ]; nix = { diff --git a/overlays/redis/default.nix b/overlays/redis/default.nix index 981d3ba..0176034 100644 --- a/overlays/redis/default.nix +++ b/overlays/redis/default.nix @@ -9,4 +9,6 @@ final: _prev: { kdeconnect-kde = final.stable.kdeconnect-kde; webkit-gtk = final.stable.webkit-gtk; qtwebengine = final.stable.qtwebengine; + electron = final.stable.electron; + heroic = final.stable.heroic; } diff --git a/systems/aarch64-linux/pi5/default.nix b/systems/aarch64-linux/pi5/default.nix index 316f9b7..d8906d0 100644 --- a/systems/aarch64-linux/pi5/default.nix +++ b/systems/aarch64-linux/pi5/default.nix @@ -21,7 +21,17 @@ # ################################################### # # Impermanence # # # ################################################### - impermanence.enable = true; + impermanence = { + enable = true; + extraDirectories = [ + { + directory = "/var/cache/ccache"; + user = "nobody"; + group = "nobody"; + mode = "u=rwx,g=rwx,o=rx"; + } + ]; + }; # ################################################### # # Hardware # # diff --git a/systems/x86_64-linux/jallen-nas/default.nix b/systems/x86_64-linux/jallen-nas/default.nix index 40297ef..6f2a6b9 100755 --- a/systems/x86_64-linux/jallen-nas/default.nix +++ b/systems/x86_64-linux/jallen-nas/default.nix @@ -304,6 +304,12 @@ in group = "nobody"; mode = "u=rwx,g=rwx,o=rx"; } + { + directory = "/var/lib/redis-ccache"; + user = "redis-ccache"; + group = "redis-ccache"; + mode = "u=rwx,g=,o="; + } ]; }; }; diff --git a/systems/x86_64-linux/jallen-nas/services.nix b/systems/x86_64-linux/jallen-nas/services.nix index 109b408..d63f67f 100755 --- a/systems/x86_64-linux/jallen-nas/services.nix +++ b/systems/x86_64-linux/jallen-nas/services.nix @@ -76,6 +76,14 @@ port = 6379; }; + ccache = { + enable = true; + port = 6363; + bind = "0.0.0.0"; + openFirewall = true; + extraParams = [ "--protected-mode no" ]; + }; + manyfold = { enable = true; port = 6380;