From a6764061501efe6421c8e2ad6a18c427f360313c Mon Sep 17 00:00:00 2001 From: matt1432 Date: Thu, 18 Apr 2024 14:37:46 -0400 Subject: [PATCH] chore: update flake.lock --- common/default.nix | 7 +- common/modules/cachix.nix | 2 +- .../arion/forgejo/images/act_runner.nix | 4 +- .../arion/freshrss/images/rss-bridge.nix | 4 +- .../arion/homepage/images/homepage.nix | 4 +- .../arion/media/bazarr/images/bazarr.nix | 4 +- .../arion/media/calibre/images/calibre.nix | 4 +- .../arion/media/prowlarr/images/prowlarr.nix | 4 +- .../arion/media/sabnzbd/images/sabnzbd.nix | 4 +- .../arion/media/seerr/images/jellyseerr.nix | 4 +- .../modules/arion/nextcloud/images/nginx.nix | 4 +- flake.lock | 98 +++++++++---------- 12 files changed, 72 insertions(+), 71 deletions(-) diff --git a/common/default.nix b/common/default.nix index 1b778371..e25fd31a 100644 --- a/common/default.nix +++ b/common/default.nix @@ -16,7 +16,6 @@ ./pkgs nur.nixosModules.nur - nh.nixosModules.default home-manager.nixosModules.home-manager ../modules/arion @@ -28,7 +27,7 @@ config.allowUnfree = true; overlays = import ./overlays inputs; }; - boot.tmp.cleanOnBoot = true; + boot.tmp.useTmpfs = true; nix = { # Allow deleting store files with '.' in the name @@ -57,8 +56,10 @@ }; }; - nh = { + programs.nh = { enable = true; + package = nh.packages.${pkgs.system}.default; + # weekly cleanup clean = { enable = true; diff --git a/common/modules/cachix.nix b/common/modules/cachix.nix index 682c2912..4f1e0efc 100644 --- a/common/modules/cachix.nix +++ b/common/modules/cachix.nix @@ -6,7 +6,7 @@ environment.systemPackages = with pkgs; [ (writeShellApplication { name = "rebuild-no-cache"; - runtimeInputs = [config.nh.package]; + runtimeInputs = [config.programs.nh.package]; text = '' nh os switch -- --option binary-caches "https://cache.nixos.org" "$@" ''; diff --git a/devices/nos/modules/arion/forgejo/images/act_runner.nix b/devices/nos/modules/arion/forgejo/images/act_runner.nix index 6f36f04a..a501b822 100644 --- a/devices/nos/modules/arion/forgejo/images/act_runner.nix +++ b/devices/nos/modules/arion/forgejo/images/act_runner.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "vegardit/gitea-act-runner"; - imageDigest = "sha256:e1b1f2503f382fa98951596e3b9ac856efcd993bc9b888d6780ef25c0995b002"; - sha256 = "1vss6784rvg6vrwk1mdb7zqmwf0l6ng6gpz9h6z7xyp7m9979w2b"; + imageDigest = "sha256:6174ff04dac97969189e205b3dc687d42d798f634b4c204e8763bcd7c8e72cff"; + sha256 = "0r1qwmrmiim9s1dygz3vrb87y3jb2awvwgngckxa2xpa9l5h8pjx"; finalImageName = "vegardit/gitea-act-runner"; finalImageTag = "dind-latest"; } diff --git a/devices/nos/modules/arion/freshrss/images/rss-bridge.nix b/devices/nos/modules/arion/freshrss/images/rss-bridge.nix index 8365b3c1..3c227010 100644 --- a/devices/nos/modules/arion/freshrss/images/rss-bridge.nix +++ b/devices/nos/modules/arion/freshrss/images/rss-bridge.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "rssbridge/rss-bridge"; - imageDigest = "sha256:f3954569a1d276f910cbfa54f7cfbe80e32b291c243f1ca06d176c678f9468e7"; - sha256 = "1d66h8m5z9n83fqmiymqjqxgkvh2ch8w6zmnrj2way1l9lvh8z3g"; + imageDigest = "sha256:5fca58c11283324744aacd4dc07b1f4e8751a92f23768d8eed1fdf471065409e"; + sha256 = "0w9pf6ahsld6siq5p8cfx6wbjr64h2vahp8s52an4lvmczxmq13p"; finalImageName = "rssbridge/rss-bridge"; finalImageTag = "latest"; } diff --git a/devices/nos/modules/arion/homepage/images/homepage.nix b/devices/nos/modules/arion/homepage/images/homepage.nix index 831125f0..ffeef21c 100644 --- a/devices/nos/modules/arion/homepage/images/homepage.nix +++ b/devices/nos/modules/arion/homepage/images/homepage.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "ghcr.io/gethomepage/homepage"; - imageDigest = "sha256:13d1bf9c5cf7d2b0f3af90ddfe59302f32374b8f48a56c6f6afc2a475bf919df"; - sha256 = "12kzw2dvlfv78nh6y0iqygjndbizxra39kpsrif5026p2hjm4gyp"; + imageDigest = "sha256:ad5a8edea1c25b50c6d180d35f72c1623986335113457c4ba38e1ddf16816a4b"; + sha256 = "1j3l7ap7d9a49p421i1h08bp1p772dnddijk2c8s66v3527szyp9"; finalImageName = "ghcr.io/gethomepage/homepage"; finalImageTag = "latest"; } diff --git a/devices/nos/modules/arion/media/bazarr/images/bazarr.nix b/devices/nos/modules/arion/media/bazarr/images/bazarr.nix index d15d4f6b..9bcaeee7 100644 --- a/devices/nos/modules/arion/media/bazarr/images/bazarr.nix +++ b/devices/nos/modules/arion/media/bazarr/images/bazarr.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "ghcr.io/linuxserver/bazarr"; - imageDigest = "sha256:563a496ca85130962001b1a40bca1d8f8b37fc646d8d4da771c31d8dd20320d2"; - sha256 = "1yi3dc82jvmmy5xhkzyvvzjygmva9lkiz3r139z9dsrkkdicnf5v"; + imageDigest = "sha256:a17e094ccdf0b252415c7307167e08fac4ee01809eda3b02a3a9e719f395e664"; + sha256 = "182lhs2cqcikizzjd6x23k55mdgvbccwb5yahzclkh5cvd31y4l0"; finalImageName = "ghcr.io/linuxserver/bazarr"; finalImageTag = "latest"; } diff --git a/devices/nos/modules/arion/media/calibre/images/calibre.nix b/devices/nos/modules/arion/media/calibre/images/calibre.nix index d7e66e74..9541366a 100644 --- a/devices/nos/modules/arion/media/calibre/images/calibre.nix +++ b/devices/nos/modules/arion/media/calibre/images/calibre.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "ghcr.io/linuxserver/calibre"; - imageDigest = "sha256:e790e8ba8c41b10e9a98a3f035cf5ee41d717db5bb1b4cd2f02c2de45670470c"; - sha256 = "0nyrdcvhpqldl8fgvsfzhmj1xygw8fdj6aqypv3q0l5yiw358jrm"; + imageDigest = "sha256:fa53a6b85d34abb46593b3959223b5b4eb9d97c067ce4ad0bdb9c552e1906d17"; + sha256 = "14yrk7k03vminxmc3va7xpnzy5y9vy3845pppq20z8yggpd6yvxr"; finalImageName = "ghcr.io/linuxserver/calibre"; finalImageTag = "latest"; } diff --git a/devices/nos/modules/arion/media/prowlarr/images/prowlarr.nix b/devices/nos/modules/arion/media/prowlarr/images/prowlarr.nix index 604429af..e47ced7d 100644 --- a/devices/nos/modules/arion/media/prowlarr/images/prowlarr.nix +++ b/devices/nos/modules/arion/media/prowlarr/images/prowlarr.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "ghcr.io/linuxserver/prowlarr"; - imageDigest = "sha256:335388a2b30603bcd69d7411f3bfb37c54a8799eb1f76bae1f42ec6b2f9a5a79"; - sha256 = "0k423bbvq39jl2r68kj9za0dccr48d8zh40jqpwj3ssnffzb64nj"; + imageDigest = "sha256:5713489fbb1daf3eff5e2e78071f7ac0ba55d56ca59f04fb579f02434b43c142"; + sha256 = "0020fhcx7lr97gvx4chxs5xp5rm41m5aig9fm6zcrk032kfs42pa"; finalImageName = "ghcr.io/linuxserver/prowlarr"; finalImageTag = "latest"; } diff --git a/devices/nos/modules/arion/media/sabnzbd/images/sabnzbd.nix b/devices/nos/modules/arion/media/sabnzbd/images/sabnzbd.nix index a924447b..79284eea 100644 --- a/devices/nos/modules/arion/media/sabnzbd/images/sabnzbd.nix +++ b/devices/nos/modules/arion/media/sabnzbd/images/sabnzbd.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "ghcr.io/linuxserver/sabnzbd"; - imageDigest = "sha256:a051c4be8db68e7555aea3f3871f8f54f1f4c10692b381003a604c032310753a"; - sha256 = "03h0yvp9w56y44b6vs36899irj5f49ffabwygxcxj96kdnbg2s7y"; + imageDigest = "sha256:9d7c22bb7936fbf96a164f8d4ad50c165d1cbb83adba84f4971ab5f21dd79a93"; + sha256 = "0nm7rgjvzxh71zrk7az0f3cab0n0mncwnka9g2asjm8j00666ycq"; finalImageName = "ghcr.io/linuxserver/sabnzbd"; 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 23d2c596..a78bd44b 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 = "fallenbagel/jellyseerr"; - imageDigest = "sha256:f59bee4e90a020a3544265cd1b7a35a5dd6ec55df76b370048afd292e93be0e7"; - sha256 = "13vninzz7kva1paqy7p71cwr9naygyj9qgrb896w38fjl1vavpbj"; + imageDigest = "sha256:2f39c1872fad422d16df1c3a81b6cc42dd4ec6f8bfbca7f8ab5b07580d1f7817"; + sha256 = "1vj6p2g3jav9a84fxcfnykp8afrklchlqix3n4pgshqh3gi28cn0"; finalImageName = "fallenbagel/jellyseerr"; finalImageTag = "latest"; } diff --git a/devices/nos/modules/arion/nextcloud/images/nginx.nix b/devices/nos/modules/arion/nextcloud/images/nginx.nix index bce9c0ac..dfcc9c0a 100644 --- a/devices/nos/modules/arion/nextcloud/images/nginx.nix +++ b/devices/nos/modules/arion/nextcloud/images/nginx.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "nginx"; - imageDigest = "sha256:9ff236ed47fe39cf1f0acf349d0e5137f8b8a6fd0b46e5117a401010e56222e1"; - sha256 = "1rhan1bq56xkgkfbf41lwsyb99zr0p8l92vrcapnadsaxymhllf3"; + imageDigest = "sha256:d2cb0992f098fb075674730da5e1c6cccdd4890516e448a1db96e0245c1b7fca"; + sha256 = "07jq312vccjpiw5x4h7ahsgdfigxj41acp218n8qfba26a5mcisd"; finalImageName = "nginx"; finalImageTag = "latest"; } diff --git a/flake.lock b/flake.lock index 9010d3f4..ced71c5f 100644 --- a/flake.lock +++ b/flake.lock @@ -33,11 +33,11 @@ ] }, "locked": { - "lastModified": 1712834339, - "narHash": "sha256-gRYAbyxx4Z2s4hMoXHSu3wv2+VSiiR2Nk+AZmCZ6kc4=", + "lastModified": 1713301451, + "narHash": "sha256-LzYVqEukjOJjm4HGFe6rtHBiuJxAyPqd2MY1k5ci9QU=", "owner": "Aylur", "repo": "ags", - "rev": "c13bcba224f9ecaaa2f22b1d2895bb62e8face19", + "rev": "33bcaf34d5277031ecb97047fb8ddd44abd8d80e", "type": "github" }, "original": { @@ -112,11 +112,11 @@ ] }, "locked": { - "lastModified": 1713164737, - "narHash": "sha256-+MQHcM7RE2Jycw1FwaZYJgKbVE5TmxT5JmDfldxb+CA=", + "lastModified": 1713337568, + "narHash": "sha256-S8jxBGv/4v8XyqsQoEXuCmSdwTdtMOqui7G4bYUVpAs=", "owner": "matt1432", "repo": "nixos-caddy-cloudflare", - "rev": "9c92f03d121a1a42833101e2ea72c531fee4f484", + "rev": "3f6319c7ed97b0666144400d4663676218caf667", "type": "github" }, "original": { @@ -365,11 +365,11 @@ "gpu-screen-recorder-src": { "flake": false, "locked": { - "lastModified": 1713205841, - "narHash": "sha256-TcIfD7yMvbIqC/uBy5xhdFS1DZhjQPA24qw7Y2L41rk=", + "lastModified": 1713372257, + "narHash": "sha256-70gcnqTze2/ztbbaI/qFJKS1igUcqFMN1uxHiNUpdes=", "ref": "refs/heads/master", - "rev": "7e239c8aa289bbe71bcbb0bcc5908ca02cee4861", - "revCount": 563, + "rev": "b1cc1ee09afb8612b67f939ec7c40ac59522ead2", + "revCount": 571, "type": "git", "url": "https://repo.dec05eba.com/gpu-screen-recorder" }, @@ -381,11 +381,11 @@ "gtk-theme-src": { "flake": false, "locked": { - "lastModified": 1712613812, - "narHash": "sha256-uhcRV7E7GDjWjetUHcz/E/g36m/yYTg3c9WJo6gYTJA=", + "lastModified": 1713304138, + "narHash": "sha256-il9zpzJeszGJ1gLkG73mtaMD8nBUFCfCXjcJV1fizxg=", "owner": "dracula", "repo": "gtk", - "rev": "18350cafd8e9c775737f97fb5acf0890e29bc47a", + "rev": "557e276b41b00bbdc981c32f22ce6adc062d7c1e", "type": "github" }, "original": { @@ -418,11 +418,11 @@ ] }, "locked": { - "lastModified": 1713177113, - "narHash": "sha256-ZZDdE+Ql+uSfbBJxlkFOoV/jNLxRYl/qz872JPBHwto=", + "lastModified": 1713444959, + "narHash": "sha256-kfK2/FQHlxEI/Z3/yiBY3SmGGAIQ4FyUtycLuHlqjxQ=", "owner": "juanfont", "repo": "headscale", - "rev": "60f0cf908ca630a98e087002e3c5e5a10e95d126", + "rev": "e2afd30b1c73e930b8cd52855a65e40da4ba07f9", "type": "github" }, "original": { @@ -460,11 +460,11 @@ ] }, "locked": { - "lastModified": 1713166971, - "narHash": "sha256-t0P/rKlsE5l1O3O2LYtAelLzp7PeoPCSzsIietQ1hSM=", + "lastModified": 1713453913, + "narHash": "sha256-vbXq52VRlL1defMHrwhsoeHm95O3mFefsSSJyNEghbA=", "owner": "nix-community", "repo": "home-manager", - "rev": "1c43dcfac48a2d622797f7ab741670fdbcf8f609", + "rev": "178e26895b3aef028a00a32fb7e7ed0fc660645c", "type": "github" }, "original": { @@ -511,11 +511,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1713214520, - "narHash": "sha256-fKNu5IbfifwGEfVmw8CsNsZRPpDBIy2/B4Dg8k+z3bk=", + "lastModified": 1713335726, + "narHash": "sha256-znkNLAy3qRC4BNaA5AlcWNLyVsTBogN9pVqpkNqskSU=", "owner": "hyprwm", "repo": "hypridle", - "rev": "01772b32afc316b85bf5ab2979bd35283ab1ce5b", + "rev": "eb916db19cffd20fc184fc3110a0a8f1860abf5c", "type": "github" }, "original": { @@ -537,11 +537,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1713214647, - "narHash": "sha256-YWFPKrId5zGSQykdkRMyvCS7H8KwgRS6m5nwR8qkiko=", + "lastModified": 1713376910, + "narHash": "sha256-6cvw+CxacXe+l8/mZ1+ih21vLHvhIC+Erc7LQF0dyrQ=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "79a139c9495568f69dd995bce1ca579247a98a17", + "rev": "82222342f10a7eff0ec9be972153e740d0f95213", "type": "github" }, "original": { @@ -769,11 +769,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1712645404, - "narHash": "sha256-uEVd15WsX+Wti9PXW724puFcsFO72VTiJyBwW2WXT9M=", + "lastModified": 1713422373, + "narHash": "sha256-PuGzau2Wj0T8MC3V8a41rc/sXT0DrNz1Ow/ApR6a87s=", "owner": "viperML", "repo": "nh", - "rev": "fe4a96a0b0b0662dba7c186b4a1746c70bbcad03", + "rev": "c9cb03418dc782701ada556a49a9e8de0b415fbc", "type": "github" }, "original": { @@ -1053,11 +1053,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1713215755, - "narHash": "sha256-wyxW6AKIcEbSnO2XBV/3GMI+vhAdqCa5LEByVlyauJY=", + "lastModified": 1713453403, + "narHash": "sha256-zm+Wt1sYMahY8FtRDBIoUray7wa/PPU4Skz+db8PFeg=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "1a49f6ecef33d7a7712941553df733ff6f02262a", + "rev": "09c641ee784a14334e003e958defd7e88fb836be", "type": "github" }, "original": { @@ -1100,11 +1100,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1712963716, - "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", + "lastModified": 1713248628, + "narHash": "sha256-NLznXB5AOnniUtZsyy/aPWOk8ussTuePp2acb9U+ISA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", + "rev": "5672bc9dbf9d88246ddab5ac454e82318d094bb8", "type": "github" }, "original": { @@ -1132,11 +1132,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1712963716, - "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", + "lastModified": 1713248628, + "narHash": "sha256-NLznXB5AOnniUtZsyy/aPWOk8ussTuePp2acb9U+ISA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", + "rev": "5672bc9dbf9d88246ddab5ac454e82318d094bb8", "type": "github" }, "original": { @@ -1180,11 +1180,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1713128889, - "narHash": "sha256-aB90ZqzosyRDpBh+rILIcyP5lao8SKz8Sr2PSWvZrzk=", + "lastModified": 1713349283, + "narHash": "sha256-2bjFu3+1zPWZPPGqF+7rumTvEwmdBHBhjPva/AMSruQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2748d22b45a99fb2deafa5f11c7531c212b2cefa", + "rev": "2e359fb3162c85095409071d131e08252d91a14f", "type": "github" }, "original": { @@ -1270,11 +1270,11 @@ }, "nur": { "locked": { - "lastModified": 1713217470, - "narHash": "sha256-fsDAxXSacvYwtvT55tT7MVZzudsBcf/mtSVBfbl6Zjc=", + "lastModified": 1713464088, + "narHash": "sha256-rQtwwd4vCUWw87e75IxFg5ecC7CbN1xZYosPjHPZKSw=", "owner": "nix-community", "repo": "NUR", - "rev": "d74371d2183243d37aa711a6cbdb33375398b9ad", + "rev": "0a00b61ab902d74ce5d9876e49870f6e6e50bea3", "type": "github" }, "original": { @@ -1593,11 +1593,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1713174909, - "narHash": "sha256-APoDs2GtzVrsE+Z9w72qpHzEtEDfuinWcNTN7zhwLxg=", + "lastModified": 1713457024, + "narHash": "sha256-31MpStyXedDL1fvuOvn6iz3JURSVShDtDVMyP1PTjtc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "cc535d07cbcdd562bcca418e475c7b1959cefa4b", + "rev": "b94c6edbb8355756c53efc8ca3874c63622f287a", "type": "github" }, "original": { @@ -1823,11 +1823,11 @@ "vimplugin-riscv-src": { "flake": false, "locked": { - "lastModified": 1713065939, - "narHash": "sha256-ie5O5oe5fP0ThrBBDot7A4KbUVf14yXIeYgukD/Ok34=", + "lastModified": 1713286691, + "narHash": "sha256-LGEjiJnqSUYFWGw5Elplfw4X6hQpNrkLMnaZpRzKmpg=", "owner": "henry-hsieh", "repo": "riscv-asm-vim", - "rev": "98f800da78fd3d393d7c6ee09875b245cc1d72fb", + "rev": "8f8271338a7dec472c11cceac2195dc812e21255", "type": "github" }, "original": {