diff --git a/apps/default.nix b/apps/default.nix index 4b328897..62b603e5 100644 --- a/apps/default.nix +++ b/apps/default.nix @@ -3,8 +3,10 @@ pkgs, ... }: let + inherit (pkgs.lib) getExe; + mkApp = file: { - program = pkgs.callPackage file ({} // inputs); + program = getExe (pkgs.callPackage file ({} // inputs)); type = "app"; }; in { diff --git a/apps/update/src/firefox.ts b/apps/update/src/firefox.ts index 29a2f283..b99ea946 100644 --- a/apps/update/src/firefox.ts +++ b/apps/update/src/firefox.ts @@ -8,7 +8,7 @@ const FLAKE = process.env.FLAKE; const updateFFZ = () => { - const FILE = `${FLAKE}/pkgs/firefox-addons/default.nix`; + const FILE = `${FLAKE}/legacyPackages/firefox-addons/default.nix`; const URL = 'https://cdn.frankerfacez.com/script/frankerfacez-4.0-an+fx.xpi'; const HASH = parseFetchurl(URL); @@ -23,7 +23,7 @@ export const updateFirefoxAddons = () => { console.log('Updating firefox addons using mozilla-addons-to-nix'); - const DIR = `${FLAKE}/pkgs/firefox-addons`; + const DIR = `${FLAKE}/legacyPackages/firefox-addons`; const GENERATED_FILE = `${DIR}/generated-firefox-addons.nix`; const SLUGS = `${DIR}/addons.json`; diff --git a/apps/update/src/misc.ts b/apps/update/src/misc.ts index 3fba2153..b3be5e70 100644 --- a/apps/update/src/misc.ts +++ b/apps/update/src/misc.ts @@ -69,5 +69,5 @@ export const updateVuetorrent = () => { writeFileSync(FILE, fileText); - return OLD_VERSION !== VERSION ? `Vuetorrent: ${OLD_VERSION} -> ${VERSION}}` : ''; + return OLD_VERSION !== VERSION ? `Vuetorrent: ${OLD_VERSION} -> ${VERSION}` : ''; }; diff --git a/devices/nos/modules/arion/media/radarr/images/radarr.nix b/devices/nos/modules/arion/media/radarr/images/radarr.nix index bdb639a0..e2e6b092 100644 --- a/devices/nos/modules/arion/media/radarr/images/radarr.nix +++ b/devices/nos/modules/arion/media/radarr/images/radarr.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "ghcr.io/linuxserver/radarr"; - imageDigest = "sha256:1eaf9e83fca2b9170d4f49f6c0e55ba38693718e7815743a9ec297d199ab1e73"; - sha256 = "1k6fadva9aa9gdhqrvrb9q28ih0ifdbd3hbp39j1k7ncvy27q473"; + imageDigest = "sha256:2a02b311cefb344cd0caf74a443b9d6318daf15bda5280a3bc732381db983dc3"; + sha256 = "11mvmh9nxs03pvrk2zrb9nibsa6vnd7x95qdcaxgiqhvb3ipqhd8"; finalImageName = "ghcr.io/linuxserver/radarr"; finalImageTag = "latest"; } diff --git a/devices/nos/modules/arion/media/seerr/images/jellyseerr.nix b/devices/nos/modules/arion/media/seerr/images/jellyseerr.nix index 07efa8c0..f9eb122c 100644 --- a/devices/nos/modules/arion/media/seerr/images/jellyseerr.nix +++ b/devices/nos/modules/arion/media/seerr/images/jellyseerr.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "ghcr.io/fallenbagel/jellyseerr"; - imageDigest = "sha256:743fa4f6d66d2e558abc35239c4edeeaed74493728b0717111dea7f003bf262f"; - sha256 = "1x21y0yjlcplk6is87ba0d3caxmvris2qyzclxpj1lq36pkn0imx"; + imageDigest = "sha256:15e7464dd1a2997d9398b1f2161c7e8fff8518cf71c1b20b8fb1b5e354b31ece"; + sha256 = "126b5965hcsjxa8y9qy0zgvdfma6yrhlb4yws6sil1h05n67g2s9"; finalImageName = "ghcr.io/fallenbagel/jellyseerr"; finalImageTag = "develop"; } diff --git a/devices/nos/modules/qbittorrent/vuetorrent.nix b/devices/nos/modules/qbittorrent/vuetorrent.nix index 34fab103..144fe941 100644 --- a/devices/nos/modules/qbittorrent/vuetorrent.nix +++ b/devices/nos/modules/qbittorrent/vuetorrent.nix @@ -1,6 +1,6 @@ # This file was autogenerated. DO NOT EDIT! { - version = "2.10.2"; - url = "https://github.com/VueTorrent/VueTorrent/releases/download/v2.10.2/vuetorrent.zip"; - hash = "sha256-pJzj3jHXmpKca1zyOTlzUQvp7/LtjjMGNt9SMDo89yo="; + version = "2.11.0"; + url = "https://github.com/VueTorrent/VueTorrent/releases/download/v2.11.0/vuetorrent.zip"; + hash = "sha256-Tl2Bgvcli5UoKp+odzfTaFz+w2NvSaBoSB/IeGbjyIk="; } diff --git a/flake.lock b/flake.lock index 7d30487d..059bf588 100644 --- a/flake.lock +++ b/flake.lock @@ -57,6 +57,39 @@ "type": "github" } }, + "aquamarine": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "hyprwayland-scanner": [ + "hyprland", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1721571743, + "narHash": "sha256-hat7wggtDISBJD8kTo5MTrT+IsY/Ha2MwgjmqqijoCA=", + "owner": "hyprwm", + "repo": "aquamarine", + "rev": "601f6cf95cbe4fef02dc7faf34bba58566c914e9", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "aquamarine", + "type": "github" + } + }, "arion": { "inputs": { "flake-parts": "flake-parts", @@ -683,11 +716,11 @@ "gpu-screen-recorder-src": { "flake": false, "locked": { - "lastModified": 1721520752, - "narHash": "sha256-BIUYdFQPRSxnl+QlJWcyTj4F5Vc8GNJcEI6UAwFWl8k=", + "lastModified": 1721692206, + "narHash": "sha256-DSbvCvlHC69ir0MGzmvbyrcDpYtkWuPQ4AeZTUI5wMo=", "ref": "refs/heads/master", - "rev": "9ca5847f6fcbd7eb093cf9cc7ed16408e0607e99", - "revCount": 679, + "rev": "da73b3ac6346105ad8404874b8bb54c846d4f54e", + "revCount": 689, "type": "git", "url": "https://repo.dec05eba.com/gpu-screen-recorder" }, @@ -740,11 +773,11 @@ "gtk-theme-src": { "flake": false, "locked": { - "lastModified": 1720995823, - "narHash": "sha256-G4ILXKVe7H+4cNjJGVdtSih/5oaZhVgRTs2KPCuS62w=", + "lastModified": 1721602370, + "narHash": "sha256-zNLHPQ3VAq455kmncNdsZaC+ypagfBm9+h4n0ZisCCk=", "owner": "dracula", "repo": "gtk", - "rev": "25dc51066f0674be02d8e402cc2717465aa472f1", + "rev": "c9896cbf39a4ef15fe8bc0a5dcbb68dcb4da570a", "type": "github" }, "original": { @@ -777,11 +810,11 @@ ] }, "locked": { - "lastModified": 1721373674, - "narHash": "sha256-onryHYI/jaTQpRfs8SXo6jhRUAvfWMEbW0KSRrFJDxs=", + "lastModified": 1721661117, + "narHash": "sha256-8fn/c6jdo3sQ7C+YItvlrmTgTqTFwR61eqhhTG+hKHs=", "owner": "juanfont", "repo": "headscale", - "rev": "ca47d6f353701b9a475abac497f3ed0bdb8ffb49", + "rev": "4ad3f3c484c060b4bfb5d8762fa12a4e4529a672", "type": "github" }, "original": { @@ -841,11 +874,11 @@ ] }, "locked": { - "lastModified": 1721135958, - "narHash": "sha256-H548rpPMsn25LDKn1PCFmPxmWlClJJGnvdzImHkqjuY=", + "lastModified": 1721534365, + "narHash": "sha256-XpZOkaSJKdOsz1wU6JfO59Rx2fqtcarQ0y6ndIOKNpI=", "owner": "nix-community", "repo": "home-manager", - "rev": "afd2021bedff2de92dfce0e257a3d03ae65c603d", + "rev": "635563f245309ef5320f80c7ebcb89b2398d2949", "type": "github" }, "original": { @@ -891,11 +924,11 @@ ] }, "locked": { - "lastModified": 1720108799, - "narHash": "sha256-AxRkTJlbB8r7aG6gvc7IaLhc2T9TO4/8uqanKRxukBQ=", + "lastModified": 1721330371, + "narHash": "sha256-aYlHTWylczLt6ERJyg6E66Y/XSCbVL7leVcRuJmVbpI=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "a5c0d57325c5f0814c39110a70ca19c070ae9486", + "rev": "4493a972b48f9c3014befbbf381ed5fff91a65dc", "type": "github" }, "original": { @@ -926,6 +959,7 @@ }, "hyprland": { "inputs": { + "aquamarine": "aquamarine", "hyprcursor": "hyprcursor", "hyprlang": "hyprlang", "hyprutils": "hyprutils", @@ -937,11 +971,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1721463092, - "narHash": "sha256-P86aiF7iFAc5sAWL3nXf0XRfhXDAudHpmCh0sW7wrr4=", + "lastModified": 1721684218, + "narHash": "sha256-FbFz+F5LJs92s6/DEkhh2h+k8NRqqrs8MGF+GRZWZGo=", "ref": "refs/heads/main", - "rev": "f642fb97df5c69267a03452533de383ff8023570", - "revCount": 4934, + "rev": "3c758db95c129ed6ca7ce0c1b5b82ad6e189488d", + "revCount": 4963, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -969,11 +1003,11 @@ ] }, "locked": { - "lastModified": 1721415237, - "narHash": "sha256-wL8dHknJsDLzm0Dg8484kvdXQk2T74X13m69VsR1mZE=", + "lastModified": 1721668405, + "narHash": "sha256-ZnIXa+jeMXoerhRz/ZJwVoYHaROjcLyQsr1b6JZ2AjQ=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "f23d3ebd92fdbaac107b71893fab94701c39eeb8", + "rev": "4c2cef8326711fbd91b7a313f095545eb50d2a57", "type": "github" }, "original": { @@ -1025,11 +1059,11 @@ ] }, "locked": { - "lastModified": 1720381373, - "narHash": "sha256-lyC/EZdHULsaAKVryK11lgHY9u6pXr7qR4irnxNWC7k=", + "lastModified": 1721324361, + "narHash": "sha256-BiJKO0IIdnSwHQBSrEJlKlFr753urkLE48wtt0UhNG4=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "5df0174fd09de4ac5475233d65ffc703e89b82eb", + "rev": "adbefbf49664a6c2c8bf36b6487fd31e3eb68086", "type": "github" }, "original": { @@ -1050,11 +1084,11 @@ ] }, "locked": { - "lastModified": 1721071737, - "narHash": "sha256-qmC9jGfbE4+EIBbbSAkrfR/p49wShjpv4/KztgE/P54=", + "lastModified": 1721324102, + "narHash": "sha256-WAZ0X6yJW1hFG6otkHBfyJDKRpNP5stsRqdEuHrFRpk=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "eb1ceff2b87f6820789249f63faa8e9dcb54d05f", + "rev": "962582a090bc233c4de9d9897f46794280288989", "type": "github" }, "original": { @@ -1075,11 +1109,11 @@ ] }, "locked": { - "lastModified": 1720215857, - "narHash": "sha256-JPdL+Qul+jEueAn8CARfcWP83eJgwkhMejQYfDvrgvU=", + "lastModified": 1721324119, + "narHash": "sha256-SOOqIT27/X792+vsLSeFdrNTF+OSRp5qXv6Te+fb2Qg=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "d5fa094ca27e0039be5e94c0a80ae433145af8bb", + "rev": "a048a6cb015340bd82f97c1f40a4b595ca85cc30", "type": "github" }, "original": { @@ -1151,11 +1185,11 @@ "nixpkgs-lib": "nixpkgs-lib_4" }, "locked": { - "lastModified": 1720958877, - "narHash": "sha256-ggCV3etL7W1X9kxhLPZP35+BBh1LgQybene+L/aeQaQ=", + "lastModified": 1721563874, + "narHash": "sha256-xsiynNj2qUbssiD5m+8ftWrGQflyOo5C4lPbqragiMc=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "6e56a6fd1d993eb02c991d449819f01340888e02", + "rev": "e0ea775feda9f162a153ee1ca8d93367dd0ee028", "type": "github" }, "original": { @@ -1299,11 +1333,11 @@ ] }, "locked": { - "lastModified": 1721368131, - "narHash": "sha256-dvDYa+Z2qZHTibmeUbKKIpR2jONO4UPbyHiDgYhgoMQ=", + "lastModified": 1721628736, + "narHash": "sha256-dIm/veBiLpclmij7FFXo6+23Swxxdj2nDPTMM3RzuYc=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "d9fcc47baa026c7df9a9789d5e825b4f13a9239a", + "rev": "464172e98eecf9a8079a9a381ffb75789d8c0e5e", "type": "github" }, "original": { @@ -1315,11 +1349,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1721316387, - "narHash": "sha256-qPgppLqmnd0OnHLMo4cGPZSUyLbcw9nThWO4sJC8bWI=", + "lastModified": 1721572156, + "narHash": "sha256-DyPWvLGftJ0kyrAtlInrztgJHZeB1kK317Icd9iRJKs=", "owner": "neovim", "repo": "neovim", - "rev": "f61efe3fe77c9a517dccb9fd5ff7f16c0660ced4", + "rev": "7381f0a1d517474dcf8d8d019cbda430ce4bff23", "type": "github" }, "original": { @@ -1579,11 +1613,11 @@ "nmd": "nmd" }, "locked": { - "lastModified": 1720964831, - "narHash": "sha256-UwVKfjrQ6FWTuqks6lF4+VlzPFDC/GR1Ti/iBKTEQco=", + "lastModified": 1721670745, + "narHash": "sha256-rjTQ14dqQ90EaHQy4g/mGylrJ1aZJYc3wCXc4A3GHJg=", "owner": "nix-community", "repo": "nix-on-droid", - "rev": "c00333ee42aa2b4d4825e0388a1049fdeeded6c6", + "rev": "248cc0806120fac9214f503dee0eaf0f47740dd0", "type": "github" }, "original": { @@ -1601,11 +1635,11 @@ ] }, "locked": { - "lastModified": 1721140729, - "narHash": "sha256-f+RjBJ4BZ8Uv6QuQ/TEaA8crKP+Uw6DZXdtRY2EvwlQ=", + "lastModified": 1721581528, + "narHash": "sha256-3esP3cMdqotokFJYxcu680r2VaSA78T03A2VwCZuWEw=", "owner": "nix-community", "repo": "nixd", - "rev": "334da32238a641c24ca7bff59d7a7d38c48fea06", + "rev": "87135e0dfb3d56262e39de123d5741d2d892dd5e", "type": "github" }, "original": { @@ -1616,11 +1650,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1721379653, - "narHash": "sha256-8MUgifkJ7lkZs3u99UDZMB4kbOxvMEXQZ31FO3SopZ0=", + "lastModified": 1721562059, + "narHash": "sha256-Tybxt65eyOARf285hMHIJ2uul8SULjFZbT9ZaEeUnP8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1d9c2c9b3e71b9ee663d11c5d298727dace8d374", + "rev": "68c9ed8bbed9dfce253cc91560bf9043297ef2fe", "type": "github" }, "original": { @@ -1706,11 +1740,11 @@ }, "nixpkgs-lib_4": { "locked": { - "lastModified": 1720918433, - "narHash": "sha256-z3Lp++7k4l/3K4A+7v3cuHBNcm/vntGXgxElLH+INa4=", + "lastModified": 1721523216, + "narHash": "sha256-/NjnIKkBoqKdvOS8unooDg0HqMaRUwYLbyn0ntjEckQ=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "3b0b1763c0f0931deaa2980b7b146f8ae7a6a952", + "rev": "31a99025ce3784c20dd11dafa5260e80e314f59e", "type": "github" }, "original": { @@ -1777,11 +1811,11 @@ ] }, "locked": { - "lastModified": 1721507810, - "narHash": "sha256-60Ii3X0ijpHJEV69oc5RP1d9AGtmIg8JhKqt750Zy3k=", + "lastModified": 1721691437, + "narHash": "sha256-z3h4XqAdE1sqCdZxI9+gxLDEEbgGOVHIWZRMIjQheDo=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "ae7066aa9f8080578753991dc8b33b1c8cd747b8", + "rev": "79e1f9e956c60af6520c5f9d9e451e555a82da6f", "type": "github" }, "original": { @@ -2138,11 +2172,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1721531171, - "narHash": "sha256-AsvPw7T0tBLb53xZGcUC3YPqlIpdxoSx56u8vPCr6gU=", + "lastModified": 1721688883, + "narHash": "sha256-9jsjsRKtJRqNSTXKj9zuDFRf2PGix30nMx9VKyPgD2U=", "owner": "Mic92", "repo": "sops-nix", - "rev": "909e8cfb60d83321d85c8d17209d733658a21c95", + "rev": "aff2f88277dabe695de4773682842c34a0b7fd54", "type": "github" }, "original": { @@ -2379,11 +2413,11 @@ "ts-for-gir-src": { "flake": false, "locked": { - "lastModified": 1721406908, - "narHash": "sha256-nAvCIi0Hl35vwv+CCkH/ZyXr2KVdUb8eUOJmglEHbLQ=", + "lastModified": 1721647288, + "narHash": "sha256-GRzIT03aRVW78ZlYQ9yy64zJQ0K50/P7eEKLI/FGndI=", "owner": "gjsify", "repo": "ts-for-gir", - "rev": "199bb13eb92db887e2cab5a9c3157d9c73063f02", + "rev": "8b3ec80bfea10a8e7e831e6013c431aa5b0a1a1d", "type": "github" }, "original": { @@ -2466,11 +2500,11 @@ ] }, "locked": { - "lastModified": 1720194466, - "narHash": "sha256-Rizg9efi6ue95zOp0MeIV2ZedNo+5U9G2l6yirgBUnA=", + "lastModified": 1721648131, + "narHash": "sha256-cyyxu/oj4QEFp3CVx2WeXa9T4OAUyynuBJHGkBZSxJI=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "b9b97e5ba23fe7bd5fa4df54696102e8aa863cf6", + "rev": "663be9cad424b170b28b9fa8a61042d721007f3b", "type": "github" }, "original": {