From 8f08f247615c7f97128446af71661830db592f0c Mon Sep 17 00:00:00 2001 From: mjallen18 Date: Tue, 23 Dec 2025 18:41:22 -0600 Subject: [PATCH] idk --- flake.nix | 3 +- .../x86_64-linux/matt@matt-nixos/default.nix | 1 - modules/nixos/nix/default.nix | 61 ++++++++++++++----- modules/nixos/services/glance/default.nix | 28 ++++++++- packages/linux-cachyos/prepare.nix | 2 +- .../matt-nixos/services/restic/default.nix | 2 +- 6 files changed, 73 insertions(+), 24 deletions(-) diff --git a/flake.nix b/flake.nix index c9acb97..28ca3b5 100644 --- a/flake.nix +++ b/flake.nix @@ -51,6 +51,7 @@ nixos-raspberrypi = { url = "github:mjallen18/nixos-raspberrypi"; + # url = "git+file:///home/admin/dev/nixos-raspberrypi"; inputs.nixpkgs.follows = "nixpkgs-stable"; }; @@ -210,7 +211,6 @@ # Pi4 # # ###################################################### pi4 = { - channelName = "nixpkgs-stable"; modules = with inputs; [ disko.nixosModules.disko nixos-raspberrypi.nixosModules.raspberry-pi-4.base @@ -226,7 +226,6 @@ # Pi5 # # ###################################################### pi5 = { - channelName = "nixpkgs-stable"; modules = with inputs; [ disko.nixosModules.disko nixos-raspberrypi.nixosModules.raspberry-pi-5.base diff --git a/homes/x86_64-linux/matt@matt-nixos/default.nix b/homes/x86_64-linux/matt@matt-nixos/default.nix index a472e20..aa65446 100755 --- a/homes/x86_64-linux/matt@matt-nixos/default.nix +++ b/homes/x86_64-linux/matt@matt-nixos/default.nix @@ -168,7 +168,6 @@ in pkgs.${namespace}.discord-krisp # pkgs.${namespace}.librepods - bottles compose2nix distrobox heroic diff --git a/modules/nixos/nix/default.nix b/modules/nixos/nix/default.nix index 5a35c06..a318442 100644 --- a/modules/nixos/nix/default.nix +++ b/modules/nixos/nix/default.nix @@ -18,22 +18,30 @@ "cachyos-rc-lto" "cachyos-rc-lto-znver4" # "chromium" + "dolphin-emu" "electron" - "ffmpeg" + # "ffmpeg" "ffmpeg_7" "ffmpeg_6" "ffmpeg-full" - "ffmpeg-headless-rpi" "gamescope" "gjs" "gst-plugins-bad" + "gst-plugins-rs" "gtk4" "jemalloc" + "jupiter-fan-control" "libcamera-rpi" "libraspberrypi" "libsecret" "linux" - "linux_rpi" + "linuxPackages_cachyos" + "linuxPackages_cachyos-lto" + "linuxPackages_rpi4" + "linuxPackages_rpi5" + "mesa" + "mesa-radeonsi-jupiter" + "mgba" "onnxruntime" "opencv" "pipewire" @@ -43,40 +51,61 @@ "qt3d" "qtdeclarative" "qtmultimedia" - "qtwebengine" "raspberrypi-utils" + "ryubing" "sdl" "sdl2" "sdl3" "torch" "uv" "webkitgtk" - # "yubioath-flutter" ]; cacheDir = "/var/cache/ccache"; # default location }; nixpkgs.overlays = [ (self: super: { - "webkitgtk_4_1" = super."webkitgtk_4_1".override { clangStdenv = super.ccacheStdenv; }; + "linux_rpi-bcm2711" = super."linux_rpi-bcm2711".override { stdenv = super.ccacheStdenv; }; + }) + (self: super: { + "mesa" = super."mesa".override { buildPackages.stdenv = super.ccacheStdenv; }; + }) + (self: super: { + "webkitgtk_4_1" = super.stable."webkitgtk_4_1".override { clangStdenv = super.ccacheStdenv; }; + }) + (self: super: { + "webkitgtk_6_0" = super."webkitgtk_6_0".override { clangStdenv = super.ccacheStdenv; }; }) (self: super: { "jellyfin-ffmpeg" = super."jellyfin-ffmpeg".override { ffmpeg_7-full = super.ffmpeg_7-full.override { stdenv = super.ccacheStdenv; }; }; }) - (self: super: { - "ffmpeg-headless-rpi" = super."ffmpeg-headless-rpi".override { ffmpeg_7-full = super.ffmpeg_7-headless.override { stdenv = super.ccacheStdenv; }; }; - }) + # (self: super: { + # "ffmpeg-headless-rpi" = super."ffmpeg-headless-rpi".override { ffmpeg = super.ffmpeg_7.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: { + pcsx2 = super.pcsx2.override { + llvmPackages = super.llvmPackages // { + stdenv = super.ccacheStdenv; + }; + }; + }) + (self: super: { + driversi686Linux = super.driversi686Linux // { + mesa = super.driversi686Linux.mesa.override { stdenv = super.ccacheStdenv; buildPackages.stdenv = super.ccacheStdenv; }; + }; + }) + (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; }; + qtwebengine = super.kdePackages.qtwebengine.override { stdenv = super.ccacheStdenv; }; + }; + }) (self: super: { linuxAndFirmware = super.linuxAndFirmware // { - latest = super.linuxAndFirmware.latest.override { stdenv = super.ccacheStdenv; }; + linuxPackages_rpi4 = super.linuxAndFirmware.linuxPackages_rpi4.override { stdenv = super.ccacheStdenv; }; }; }) ]; diff --git a/modules/nixos/services/glance/default.nix b/modules/nixos/services/glance/default.nix index 9009eea..093064f 100644 --- a/modules/nixos/services/glance/default.nix +++ b/modules/nixos/services/glance/default.nix @@ -47,6 +47,7 @@ let { name = "Startpage"; width = "default"; + tab = "First"; hide-desktop-navigation = true; center-vertically = true; columns = [ @@ -59,7 +60,7 @@ let } { type = "weather"; - units = "metric"; + units = "imperial"; hour-format = "12h"; location = "Saint Paul, Minnesota, United States"; } @@ -85,11 +86,12 @@ let } { size = "full"; + tab = "First"; widgets = [ { type = "search"; autofocus = true; - search-engine = "duckduckgo"; + search-engine = "google"; bangs = [ { title = "YouTube"; @@ -142,7 +144,7 @@ let { title = "Manyfold"; url = "http://10.0.1.3:3214/collections"; - icon = "sh:Manyfold"; + icon = "sh:manyfold"; allow-insecure = true; } { @@ -174,6 +176,7 @@ let } { type = "bookmarks"; + tab = "First"; groups = [ { title = "General"; @@ -236,6 +239,25 @@ let } ]; } + { + name = "test"; + width = "default"; + hide-desktop-navigation = true; + center-vertically = true; + columns = [ + { + size = "small"; + widgets = [ + { + type = "adguard"; + url = "http://pi4.local:3000"; + username = "mjallen"; + password = "BogieDudie1"; + } + ]; + } + ]; + } ]; }; }; diff --git a/packages/linux-cachyos/prepare.nix b/packages/linux-cachyos/prepare.nix index 7590ae8..979a6b2 100644 --- a/packages/linux-cachyos/prepare.nix +++ b/packages/linux-cachyos/prepare.nix @@ -178,7 +178,7 @@ let # _use_llvm_lto, defaults to "none" ltoConfig = - assert (cachyConfig.useLTO == "none" || stdenv.cc.isClang); + # assert (cachyConfig.useLTO == "none" || stdenv.cc.isClang); if cachyConfig.useLTO == "thin" then [ "-e LTO" diff --git a/systems/x86_64-linux/matt-nixos/services/restic/default.nix b/systems/x86_64-linux/matt-nixos/services/restic/default.nix index 48e721e..0df1a06 100644 --- a/systems/x86_64-linux/matt-nixos/services/restic/default.nix +++ b/systems/x86_64-linux/matt-nixos/services/restic/default.nix @@ -2,7 +2,7 @@ { environment.systemPackages = with pkgs; [ restic - restic-browser + # restic-browser restic-integrity ];