chore: fix update script and update flake.lock

common/default.nix

@@ -2,9 +2,9 @@
   config,
   home-manager,
   lib,
+  mozilla-addons-to-nix,
   nh,
   nix-melt,
-  nur,
   nurl,
   pkgs,
   ...
@@ -14,7 +14,6 @@
 
     ./modules
 
-    nur.nixosModules.nur
     home-manager.nixosModules.home-manager
 
     ../modules/arion
@@ -96,23 +95,18 @@
           };
         }
 
-        nur.hmModules.nur
-
         ./home
         ./home/trash-d
       ];
 
-      home.packages =
+      home.packages = [
-        [
+        nix-melt.packages.${pkgs.system}.default
-          nix-melt.packages.${pkgs.system}.default
 
-          (nurl.packages.${pkgs.system}.default.override {
+        (nurl.packages.${pkgs.system}.default.override {
-            nix = config.nix.package;
+          nix = config.nix.package;
-          })
+        })
-        ]
+        mozilla-addons-to-nix.packages.${pkgs.system}.default
-        ++ (with config.nur.repos.rycee; [
+      ];
-          mozilla-addons-to-nix
-        ]);
     };
   in {
     users = {

common/nix-on-droid.nix

@@ -1,13 +1,11 @@
 {
   config,
   lib,
-  nur,
   ...
 }: {
   imports = [
     ./vars
     ./modules/global.nix
-    nur.nixosModules.nur
   ];
 
   nix = {
@@ -41,8 +39,6 @@
         };
       }
 
-      nur.hmModules.nur
-
       ./home
 
       {

devices/binto/modules/gpu-replay.nix

@@ -1,53 +1,16 @@
 {
-  pkgs,
   config,
   lib,
-  gpu-screen-recorder-src,
+  pkgs,
+  self,
   ...
 }: let
-  inherit (config.vars) mainUser mainMonitor;
   inherit (lib) concatStringsSep removePrefix;
+
+  inherit (config.vars) mainUser mainMonitor;
+
+  gsr = self.packages.${pkgs.system}.gpu-screen-recorder;
   hyprPkgs = config.home-manager.users.${mainUser}.wayland.windowManager.hyprland.finalPackage;
-
-  gsr = pkgs.stdenv.mkDerivation {
-    name = "gpu-screen-recorder";
-    version = gpu-screen-recorder-src.shortRev;
-
-    src = gpu-screen-recorder-src;
-
-    nativeBuildInputs = with pkgs; [
-      pkg-config
-      makeWrapper
-    ];
-
-    buildInputs = with pkgs; [
-      libpulseaudio
-      ffmpeg
-      wayland
-      libdrm
-      libva
-      xorg.libXcomposite
-      xorg.libXrandr
-    ];
-
-    buildPhase = ''
-      ./build.sh
-    '';
-
-    installPhase = ''
-      strip gsr-kms-server
-      strip gpu-screen-recorder
-
-      install -Dm755 "gsr-kms-server" "$out/bin/gsr-kms-server"
-      install -Dm755 "gpu-screen-recorder" "$out/bin/gpu-screen-recorder"
-      #install -Dm644 "extra/gpu-screen-recorder.service" "$out/lib/systemd/user/gpu-screen-recorder.service"
-
-      wrapProgram $out/bin/gpu-screen-recorder --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [
-        pkgs.addOpenGLRunpath.driverLink
-        pkgs.libglvnd
-      ]}"
-    '';
-  };
 in {
   security.wrappers = {
     gpu-screen-recorder = {

devices/nos/modules/arion/freshrss/images/rss-bridge.nix

@@ -1,8 +1,8 @@
 pkgs:
 pkgs.dockerTools.pullImage {
   imageName = "rssbridge/rss-bridge";
-  imageDigest = "sha256:6509181cfc551464580ced84d7bbe87e88435d49dfe2259169080130c889bca8";
+  imageDigest = "sha256:f4beaf19862378b16bea1555bee0faf87b93d1d1da433527c2e70acf618c1ffc";
-  sha256 = "0i5gwgzd2pbfckxnvzcgyn2s7jw24s23fd20a4h30z7kqx06nw68";
+  sha256 = "1addixf0wwh7fl012c278qr16sbhfzcd6zk7pn20735bpibpf4b5";
   finalImageName = "rssbridge/rss-bridge";
   finalImageTag = "latest";
 }

devices/nos/modules/arion/immich/images/machine-learning.nix

@@ -1,8 +1,8 @@
 pkgs:
 pkgs.dockerTools.pullImage {
   imageName = "ghcr.io/immich-app/immich-machine-learning";
-  imageDigest = "sha256:9577a58ef2c1b61f6f7d7e8c2d86d2e94facc04d901fb27710cbf92fc5e47bfc";
+  imageDigest = "sha256:3aecde307deb0c881a1b4cbaf51db965e5ba1c085b8b4abb1a88c0225812cb05";
-  sha256 = "04wa6gsazy0qdfalgp0v9danap9pbj8b0mlgz1j9scyh60azql33";
+  sha256 = "1zwmzl5cd73zja039q9g3f57dmpdzsavl6im9s3m0g46pwnk44nz";
   finalImageName = "ghcr.io/immich-app/immich-machine-learning";
-  finalImageTag = "v1.106.1";
+  finalImageTag = "v1.106.2";
 }

devices/nos/modules/arion/immich/images/server.nix

@@ -1,8 +1,8 @@
 pkgs:
 pkgs.dockerTools.pullImage {
   imageName = "ghcr.io/immich-app/immich-server";
-  imageDigest = "sha256:b29d17de30931f22719f0ee39dd7bd24e2f6be08e61c13bd881e41ed426087f2";
+  imageDigest = "sha256:7c853eee0f9a6f742dafe71db64486a34067f24d253cba3ddc7b7eaa7420f00c";
-  sha256 = "05yl9js445cdz31p5rp2clvvwpks7rpabpk9n4sg5d7ijqrnbi3p";
+  sha256 = "0h8zzdqap3rciibgv2cg6nfcc3493vflwl6vrl936dgvi6ldjq9b";
   finalImageName = "ghcr.io/immich-app/immich-server";
-  finalImageTag = "v1.106.1";
+  finalImageTag = "v1.106.2";
 }

devices/nos/modules/arion/media/seerr/images/jellyseerr.nix

@@ -1,8 +1,8 @@
 pkgs:
 pkgs.dockerTools.pullImage {
   imageName = "ghcr.io/fallenbagel/jellyseerr";
-  imageDigest = "sha256:155cec4b7b6726dec1c5721fa1a7e76888768dc464c6f05f9257ae709267377e";
+  imageDigest = "sha256:0bb9f0c6e110ed2d621972054ae221b8a46364ea69922781ccf0821722c6831a";
-  sha256 = "1fk46v2vg1qz5sz30c9h2j44c4hk2bljl9z8wl121v4gs28lcvah";
+  sha256 = "132i3dy8r97yamdgfnj8hbrjp121r9pxgs71khsjs2jd2l4kh0yi";
   finalImageName = "ghcr.io/fallenbagel/jellyseerr";
   finalImageTag = "develop";
 }

inputs.nix

@@ -28,6 +28,12 @@ let
       owner = "nix-community";
       repo = "nix-melt";
     };
+
+    mozilla-addons-to-nix = mkDep {
+      type = "sourcehut";
+      owner = "~rycee";
+      repo = "mozilla-addons-to-nix";
+    };
   };
 
   overlays = {
@@ -36,11 +42,6 @@ let
       repo = "nixpkgs-wayland";
     };
 
-    nur = mkInput {
-      owner = "nix-community";
-      repo = "NUR";
-    };
-
     nix-gaming = mkDep {
       owner = "fufexan";
       repo = "nix-gaming";

pkgs/default.nix

@@ -1,6 +1,7 @@
 {
   pkgs,
   curseforge-server-downloader-src,
+  gpu-screen-recorder-src,
   pam-fprint-grosshack-src,
   pokemon-colorscripts-src,
   ...
@@ -11,6 +12,10 @@
     inherit curseforge-server-downloader-src;
   };
 
+  gpu-screen-recorder = pkgs.callPackage ./gpu-screen-recorder {
+    inherit gpu-screen-recorder-src;
+  };
+
   pam-fprint-grosshack = pkgs.callPackage ./pam-fprint-grosshack {
     inherit pam-fprint-grosshack-src;
   };

pkgs/gpu-screen-recorder/default.nix

@@ -0,0 +1,66 @@
+{
+  addOpenGLRunpath,
+  stdenv,
+  ffmpeg,
+  gpu-screen-recorder-src,
+  lib,
+  libdrm,
+  libglvnd,
+  libpulseaudio,
+  libva,
+  makeWrapper,
+  meson,
+  ninja,
+  pkg-config,
+  wayland,
+  xorg,
+  ...
+}: let
+  inherit (lib) makeLibraryPath;
+  inherit (builtins) fromTOML readFile;
+
+  tag =
+    (fromTOML (readFile "${gpu-screen-recorder-src}/project.conf"))
+    .package
+    .version;
+in
+  stdenv.mkDerivation {
+    name = "gpu-screen-recorder";
+    version = "${tag}+${gpu-screen-recorder-src.shortRev}";
+
+    src = gpu-screen-recorder-src;
+
+    nativeBuildInputs = [
+      pkg-config
+      makeWrapper
+      meson
+      ninja
+    ];
+
+    buildInputs = [
+      libpulseaudio
+      ffmpeg
+      wayland
+      libdrm
+      libva
+      xorg.libXcomposite
+      xorg.libXrandr
+    ];
+
+    postPatch = ''
+      # don't try to setcap/suid in a nix builder
+      substituteInPlace ./meson.build --replace \
+        "meson.add_install_script('extra/meson_post_install.sh')" \
+        "# meson.add_install_script('extra/meson_post_install.sh')"
+    '';
+
+    fixupPhase = ''
+      wrapProgram $out/bin/gpu-screen-recorder \
+        --prefix LD_LIBRARY_PATH : "${
+        makeLibraryPath [
+          addOpenGLRunpath.driverLink
+          libglvnd
+        ]
+      }"
+    '';
+  }

updateSha.sh

@@ -23,7 +23,7 @@ parseFetchurl() {
 updateDocker() {
     find "$FLAKE/devices/nos/modules/arion" \
         -name "*compose.nix" \
-        -exec sh -c 'updateImages $(dirname "{}")' \;
+        -exec sh -c 'i="$1"; updateImages $(dirname "$i")' shell {} \;
 }
 
 updateFFZ() {
@@ -45,7 +45,11 @@ updateFirefoxAddons() {
                 awk '{ gsub(/"/, ""); gsub(/;/, ""); print $3 }' |
                 awk 'NR%2{printf $0" version ";next;}1' | paste -sd'\n' -)"
 
-            readarray -t NEW_VERS <<< "$(sed 's/Fetched //' <(mozilla-addons-to-nix addons.json generated-firefox-addons.nix) |
+            readarray -t NEW_VERS <<< "$(sed 's/Fetched //' \
+                <(mozilla-addons-to-nix addons.json generated-firefox-addons.nix) |
+                sed 's/bitwarden-password-manager/bitwarden/' |
+                sed 's/600-sound-volume/sound-volume/' |
+                sed 's/styl-us/stylus/' |
                 sort)"
 
             for (( i=0; i<${#OLD_VERS[@]}; i++ )); do