diff --git a/homes/aarch64-linux/matt@macbook-pro-nixos/default.nix b/homes/aarch64-linux/matt@macbook-pro-nixos/default.nix index 1243767..49bac93 100755 --- a/homes/aarch64-linux/matt@macbook-pro-nixos/default.nix +++ b/homes/aarch64-linux/matt@macbook-pro-nixos/default.nix @@ -132,7 +132,7 @@ in home.packages = with pkgs; [ pkgs.${namespace}.bolt-launcher - pkgs.${namespace}.librepods + # pkgs.${namespace}.librepods iw iwd diff --git a/modules/home/programs/onlyoffice/default.nix b/modules/home/programs/onlyoffice/default.nix index 64447d8..644c7c4 100644 --- a/modules/home/programs/onlyoffice/default.nix +++ b/modules/home/programs/onlyoffice/default.nix @@ -5,7 +5,7 @@ ... }: let - isArm = builtins.match "aarch64*" system != null; + isArm = "aarch64-linux" == system; in { programs.onlyoffice = { diff --git a/modules/nixos/nix/default.nix b/modules/nixos/nix/default.nix index 949466a..2816323 100644 --- a/modules/nixos/nix/default.nix +++ b/modules/nixos/nix/default.nix @@ -8,28 +8,28 @@ programs.ccache = { enable = true; packageNames = [ - "ffmpeg" - "ffmpeg-full" - "ffmpeg-headless-rpi" - "gjs" - "gst-plugins-bad" - "gtk4" - "jemalloc" - "libcamera-rpi" - "libraspberrypi" - "libsecret" - "linux" - "opencv" - "pipewire" - "qemu" - # qemu.pname - "raspberrypi-utils" - "sdl" - "sdl2" - "torch" - "uv" - "webkitgtk" - # "yubioath-flutter" + # "ffmpeg" + # "ffmpeg-full" + # "ffmpeg-headless-rpi" + # "gjs" + # "gst-plugins-bad" + # "gtk4" + # "jemalloc" + # "libcamera-rpi" + # "libraspberrypi" + # "libsecret" + # "linux" + # "opencv" + # "pipewire" + # "qemu" + # # qemu.pname + # "raspberrypi-utils" + # "sdl" + # "sdl2" + # "torch" + # "uv" + # "webkitgtk" + # # "yubioath-flutter" ]; cacheDir = "/var/cache/ccache"; # default location }; diff --git a/modules/nixos/services/appimage/default.nix b/modules/nixos/services/appimage/default.nix index 185bf43..abc4e4d 100644 --- a/modules/nixos/services/appimage/default.nix +++ b/modules/nixos/services/appimage/default.nix @@ -1,8 +1,11 @@ -{ lib, pkgs, ... }: +{ lib, pkgs, system, ... }: +let + isArm = "aarch64-linux" == system; +in { boot = { # Enable AppImage - binfmt.registrations.appimage = { + binfmt.registrations.appimage = lib.mkIf (!isArm) { wrapInterpreterInShell = lib.mkDefault false; interpreter = "${lib.getExe pkgs.appimage-run}/bin/appimage-run"; recognitionType = "magic"; diff --git a/overlays/linux-cachyos/default.nix b/overlays/linux-cachyos/default.nix index 4c4d3a5..0844c68 100644 --- a/overlays/linux-cachyos/default.nix +++ b/overlays/linux-cachyos/default.nix @@ -1,21 +1,12 @@ -{ - inputs, - nixpkgs ? inputs.nixpkgs, - self ? inputs.self, - selfOverlay ? self.overlays.default, - rust-overlay ? inputs.rust-overlay, - nixpkgsExtraConfig ? { }, - lib, - ... -}: -final: prev: -let + +{ inputs, lib, ... }: + +final: prev: let cachyosPackages = final.callPackage ../../packages/linux-cachyos { - pkgs = final; + pkgs = final; nixpkgs = inputs.nixpkgs; }; -in -{ +in { linuxPackages_cachyos = cachyosPackages.cachyos-gcc; linuxPackages_cachyos-lto = cachyosPackages.cachyos-lto; linuxPackages_cachyos-lto-znver4 = cachyosPackages.cachyos-lto-znver4; @@ -24,4 +15,4 @@ in linuxPackages_cachyos-hardened = cachyosPackages.cachyos-hardened; linuxPackages_cachyos-rc = cachyosPackages.cachyos-rc; linuxPackages_cachyos-lts = cachyosPackages.cachyos-lts; -} +} \ No newline at end of file diff --git a/packages/homeassistant/ha-bambulab/default.nix b/packages/homeassistant/ha-bambulab/default.nix index 22bce8e..4bba2dc 100644 --- a/packages/homeassistant/ha-bambulab/default.nix +++ b/packages/homeassistant/ha-bambulab/default.nix @@ -7,13 +7,13 @@ buildHomeAssistantComponent rec { owner = "greghesp"; domain = "bambu_lab"; - version = "v2.2.16"; + version = "v2.2.17"; src = fetchFromGitHub { owner = owner; repo = "ha-bambulab"; rev = version; - hash = "sha256-fn9Q+AILvZdOmjVTwzGwlFj/AzwPDqNTiiL11CPseD4="; + hash = "sha256-0gAOCs/8U82eOK04mmWs6QqQR1os1eejwvF+pr7U/9c="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/packages/homeassistant/ha-bedjet/default.nix b/packages/homeassistant/ha-bedjet/default.nix index 5e886c7..e148e56 100644 --- a/packages/homeassistant/ha-bedjet/default.nix +++ b/packages/homeassistant/ha-bedjet/default.nix @@ -7,13 +7,13 @@ buildHomeAssistantComponent rec { owner = "natekspencer"; domain = "bedjet"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = owner; repo = "ha-bedjet"; rev = version; - hash = "sha256-rjn9dUM6Tntps2KECdHCdp1FhFg1uEaByXFlrwn4AAU="; + hash = "sha256-7rMAepajLRTIVXz025nYRQLx7Ra7+2LhELg9IvqdnHE="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/packages/homeassistant/ha-gehome/default.nix b/packages/homeassistant/ha-gehome/default.nix index be6a5da..364555d 100644 --- a/packages/homeassistant/ha-gehome/default.nix +++ b/packages/homeassistant/ha-gehome/default.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "simbaja"; domain = "ge_home"; - version = "v2025.11.0"; + version = "v2025.12.0"; src = fetchFromGitHub { owner = owner; repo = "ha_gehome"; rev = version; - hash = "sha256-48z2fP2gKo7gM69RcQMOHeF1H/vqUb0hBDk2+uCqYc8="; + hash = "sha256-hxgQsHb0E/XQEZoVFtKOgdHEVsU5UgqhOjjkgKqlI1I="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/packages/homeassistant/ha-icloud3/default.nix b/packages/homeassistant/ha-icloud3/default.nix index 83897ab..b35b625 100644 --- a/packages/homeassistant/ha-icloud3/default.nix +++ b/packages/homeassistant/ha-icloud3/default.nix @@ -7,12 +7,12 @@ buildHomeAssistantComponent rec { owner = "gcobb321"; domain = "icloud3"; - version = "3.3.4.1"; + version = "v3.3.4.1"; src = fetchFromGitHub { owner = owner; repo = "icloud3"; - rev = "v${version}"; + rev = "${version}"; hash = "sha256-5uw1guGLTpaLPjhXQ6jP7kA0iWdbEgNZ/vnBjJWeCPA="; }; diff --git a/packages/homeassistant/ha-nanokvm/default.nix b/packages/homeassistant/ha-nanokvm/default.nix index bb704cb..72b792d 100644 --- a/packages/homeassistant/ha-nanokvm/default.nix +++ b/packages/homeassistant/ha-nanokvm/default.nix @@ -13,8 +13,8 @@ buildHomeAssistantComponent rec { src = fetchFromGitHub { owner = owner; repo = "homeassistant-nanokvm"; - rev = "d52fac6add2c750e3d824b736e10ebf929329494"; - hash = "sha256-pyGGYFzz7lTTffpnWdjXcFDDQgrwAfMzBL/hAFTwLmQ="; + rev = "0c753de42c6dbec301843162e10038471a236dae"; + hash = "sha256-uBmmzg4iV1gVPTKvYGLUNpQGGJvbhj70FOS6JubXHD0="; }; propagatedBuildInputs = [ diff --git a/packages/nextcloud/nextcloud-app-assistant/default.nix b/packages/nextcloud/nextcloud-app-assistant/default.nix index 72aa41b..f202ad7 100644 --- a/packages/nextcloud/nextcloud-app-assistant/default.nix +++ b/packages/nextcloud/nextcloud-app-assistant/default.nix @@ -4,7 +4,7 @@ }: fetchNextcloudApp { name = "nextcloud-app-assistant"; - sha256 = "sha256-kW2rbgfhCg4RHp/RW+L1vuoyVXOp5r4Mc1VdI0g5cXA="; - url = "https://github.com/nextcloud/assistant/archive/refs/tags/v2.8.0.tar.gz"; + sha256 = "sha256-ayt3FYGxBdIhugkofujdRWrVqgZVdZ2Z+Ieg35O/MpA="; + url = "https://github.com/nextcloud/assistant/archive/refs/tags/v2.11.0.tar.gz"; license = "agpl3Only"; } diff --git a/packages/nextcloud/nextcloud-app-pdfviewer/default.nix b/packages/nextcloud/nextcloud-app-pdfviewer/default.nix index 99bc520..43c9da8 100644 --- a/packages/nextcloud/nextcloud-app-pdfviewer/default.nix +++ b/packages/nextcloud/nextcloud-app-pdfviewer/default.nix @@ -4,7 +4,7 @@ }: fetchNextcloudApp { name = "nextcloud-app-files_pdfviewer"; - sha256 = "sha256-TeNOzRczeXK15DURrZ5al0cvXhRj7+y1VA4axPROvD4="; - url = "https://github.com/nextcloud/files_pdfviewer/archive/refs/tags/v31.0.8.tar.gz"; + sha256 = "sha256-M8ejkWGuxhsy2dMBdqSDwfRA0hI6qPL1VhYoDH5tQR4="; + url = "https://github.com/nextcloud/files_pdfviewer/archive/refs/tags/v32.0.3.tar.gz"; license = "agpl3Only"; } diff --git a/packages/nextcloud/nextcloud-app-photos/default.nix b/packages/nextcloud/nextcloud-app-photos/default.nix index b0eb3ca..ead5a15 100644 --- a/packages/nextcloud/nextcloud-app-photos/default.nix +++ b/packages/nextcloud/nextcloud-app-photos/default.nix @@ -4,7 +4,7 @@ }: fetchNextcloudApp { name = "nextcloud-app-photos"; - sha256 = "sha256-F2hh/0RlLG2zcEatfd4fejRV0i2hMkwONM4P7nhdh18="; - url = "https://github.com/nextcloud/photos/archive/refs/tags/v31.0.8.tar.gz"; + sha256 = "sha256-Hl5ngkW0DRZr4hZdMNcGUY5dV9/3b0QKLenoR9Mzc9c="; + url = "https://github.com/nextcloud/photos/archive/refs/tags/v32.0.3.tar.gz"; license = "agpl3Only"; } diff --git a/packages/python/pipewire-python/default.nix b/packages/python/pipewire-python/default.nix index 7510386..f706537 100644 --- a/packages/python/pipewire-python/default.nix +++ b/packages/python/pipewire-python/default.nix @@ -1,5 +1,5 @@ { python3Packages, fetchFromGitHub, ... }: -python3Packages.buildPythonPackage { +python3Packages.buildPythonPackage rec { pname = "pipewire-python"; version = "0.2.3"; format = "pyproject"; @@ -7,8 +7,8 @@ python3Packages.buildPythonPackage { src = fetchFromGitHub { owner = "pablodz"; repo = "pipewire_python"; - rev = "master"; - sha256 = "sha256-EmwEZeKFFEqLkVnBKmB1HDVPk0xAqG6Ztv7+gpl0B1Y="; + rev = "v${version}"; + sha256 = "sha256-6UIu7vke40q+n91gU8YxwMV/tWjLT6iDmHCMVqnXdMY="; }; buildInputs = with python3Packages; [ flit-core ]; diff --git a/packages/python/python-roborock/default.nix b/packages/python/python-roborock/default.nix index a6b2f22..12cf9fd 100644 --- a/packages/python/python-roborock/default.nix +++ b/packages/python/python-roborock/default.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonPackage rec { pname = "python-roborock"; - version = "3.10.10"; + version = "3.12.2"; pyproject = true; disabled = python3Packages.pythonOlder "3.11"; @@ -17,7 +17,7 @@ python3Packages.buildPythonPackage rec { owner = "humbertogontijo"; repo = "python-roborock"; tag = "v${version}"; - hash = "sha256-FBm/Gt45VRquZ4Y/0upyNjcJ/XJiYnFFCtoIa0Qhz4U="; + hash = "sha256-KpuEveA13e2QUgLF/r2iIpohZ2379qWoPxDS6WcKxpI="; }; pythonRelaxDeps = [ "pycryptodome" ]; diff --git a/packages/steamdeck-bios-manager/default.nix b/packages/steamdeck-bios-manager/default.nix index 1c751df..4c095e7 100644 --- a/packages/steamdeck-bios-manager/default.nix +++ b/packages/steamdeck-bios-manager/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation { pname = "steamdeck-bios-manager"; - version = "871dfd9900d2e130fd0276d1dfc00feab7bf5cac"; + version = "12b0139e3aabb21e559ab0a0c62a432523080bb9"; src = fetchFromGitHub { owner = "ryanrudolfoba"; repo = "SteamDeck-BIOS-Manager"; - rev = "871dfd9900d2e130fd0276d1dfc00feab7bf5cac"; - sha256 = lib.fakeHash; + rev = "12b0139e3aabb21e559ab0a0c62a432523080bb9"; + sha256 = "sha256-Dw1r1UnmSVyrCMNRS79F99x8Vgb6KASN2gBegPbXnpk="; }; # shell scripts — no compilation diff --git a/systems/aarch64-linux/macbook-pro-nixos/default.nix b/systems/aarch64-linux/macbook-pro-nixos/default.nix index 3d27093..197e92b 100755 --- a/systems/aarch64-linux/macbook-pro-nixos/default.nix +++ b/systems/aarch64-linux/macbook-pro-nixos/default.nix @@ -17,7 +17,17 @@ }; ${namespace} = { - impermanence.enable = true; + impermanence = { + enable = true; + extraDirectories = [ + { + directory = "/var/cache/ccache"; + user = "nobody"; + group = "nobody"; + mode = "u=rwx,g=rwx,o=rx"; + } + ]; + }; user = { name = "matt"; extraGroups = [