From 7540add6ee12df5f5fe0b110a167026cbe7e7549 Mon Sep 17 00:00:00 2001 From: matt1432 Date: Thu, 28 Mar 2024 13:10:05 -0400 Subject: [PATCH] chore: update flake.lock --- common/overlays/default.nix | 1 - common/overlays/fprintd/default.nix | 9 -- .../arion/forgejo/images/act_runner.nix | 4 +- .../arion/media/bazarr/images/bazarr.nix | 4 +- .../arion/media/prowlarr/images/prowlarr.nix | 4 +- devices/servivi/default.nix | 3 + flake.lock | 100 ++++++++++-------- 7 files changed, 67 insertions(+), 58 deletions(-) delete mode 100644 common/overlays/fprintd/default.nix diff --git a/common/overlays/default.nix b/common/overlays/default.nix index e761cbb..9f37a1c 100644 --- a/common/overlays/default.nix +++ b/common/overlays/default.nix @@ -1,6 +1,5 @@ {nixpkgs-wayland, ...} @ inputs: [ (import ./dracula-theme inputs) - (import ./fprintd) (import ./squeekboard) nixpkgs-wayland.overlay diff --git a/common/overlays/fprintd/default.nix b/common/overlays/fprintd/default.nix deleted file mode 100644 index bf45302..0000000 --- a/common/overlays/fprintd/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -final: prev: { - # FIXME: https://github.com/NixOS/nixpkgs/issues/298150 - fprintd = prev.fprintd.overrideAttrs (_: { - mesonCheckFlags = [ - "--no-suite" - "fprintd:TestPamFprintd" - ]; - }); -} diff --git a/devices/nos/modules/arion/forgejo/images/act_runner.nix b/devices/nos/modules/arion/forgejo/images/act_runner.nix index 1b14df6..f095a13 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:45cc665c3c48d1bad171482e2e2f37085ad9a66371550efea434633cb1d906b2"; - sha256 = "097npi42i1bkr7ipp1gyip0z8q3dypw6wmc14whzqp81kicmvxfl"; + imageDigest = "sha256:ee2cc83a2966ddce47e9aa147122e05dfecc5e390c8738ce33a0cc8f9f7987fc"; + sha256 = "15jgc7fc13ka91bqglnzq6rgxiny723hpv312b8v5vl5cy687gan"; finalImageName = "vegardit/gitea-act-runner"; finalImageTag = "dind-latest"; } diff --git a/devices/nos/modules/arion/media/bazarr/images/bazarr.nix b/devices/nos/modules/arion/media/bazarr/images/bazarr.nix index f2cfa43..de76f7e 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:a0e29beef27c757205aa89193c691637bfb4edabe26ff56bff2a7a4d61af3641"; - sha256 = "1fa147kixx6qz38z3m0gf4dhk6ja0bf9slhdr78l2mln41qxbks4"; + imageDigest = "sha256:3a66e9805d74b9b2cd67c9bac37c7b5345ce85639922a550194bba4572d403cb"; + sha256 = "0jywmkf3amcz1n2ff3051kyhnnbkl2mxr6a5fq03y6sqah411gsb"; finalImageName = "ghcr.io/linuxserver/bazarr"; 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 e2f4048..1038091 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:68c1cd92049e290e37688b8d9b50d0a2c76fb3c5c3b96c0b1300312caa0e6265"; - sha256 = "1mjlyjqqkcv26xlv9y6ysimgcnb2mpvd142870qnia7x7xj5pbsg"; + imageDigest = "sha256:10e2fca38877b6795a41401aecd816ba3d03bd7cfe3e4d2fb4894a81d45e5aa4"; + sha256 = "1nvz3f3nb8kf4vri9af0zlxdr3z0jasznjrlwarkxzrdr25gp6p9"; finalImageName = "ghcr.io/linuxserver/prowlarr"; finalImageTag = "latest"; } diff --git a/devices/servivi/default.nix b/devices/servivi/default.nix index acf430c..0bb496f 100644 --- a/devices/servivi/default.nix +++ b/devices/servivi/default.nix @@ -4,6 +4,7 @@ in { imports = [ ./hardware-configuration.nix + ../../modules/arion ../../modules/kmscon.nix ../../modules/sshd.nix ../../modules/tailscale.nix @@ -48,6 +49,8 @@ in { home.stateVersion = "24.05"; }; + arion.enable = true; + networking = { inherit hostName; resolvconf.enable = true; diff --git a/flake.lock b/flake.lock index 94a4a8d..7f2cb14 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1710947530, - "narHash": "sha256-tbUlS7ixL0JCNY7f9ilMwemVMabbveCXb3aIdWWE1Zs=", + "lastModified": 1711629152, + "narHash": "sha256-GxhduJ3mRzdtdOiJTn2fD6Z5rvM51aT9X7YrZCmoKbs=", "owner": "Aylur", "repo": "ags", - "rev": "915c3dfcd403e5d3155a410bcda5b93e15a44161", + "rev": "eedd643db42bb9a5f837904062efb01b6d59fa5b", "type": "github" }, "original": { @@ -86,11 +86,11 @@ ] }, "locked": { - "lastModified": 1711263961, - "narHash": "sha256-nNcELjjhXFDo8FstIFNG/RtBpVujpNwFyvUIeJnoruk=", + "lastModified": 1711609557, + "narHash": "sha256-178vl76g2UjhS3h6jSsZsIaVueLs5cb8mcP2qehtZrc=", "owner": "matt1432", "repo": "nixos-caddy-cloudflare", - "rev": "502943b1e79e9d503014cf0518961fb5a89982a4", + "rev": "8cd9a30036f327a20fd97453b8ee63e3666c2536", "type": "github" }, "original": { @@ -304,7 +304,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_7" + "systems": "systems_8" }, "locked": { "lastModified": 1710146030, @@ -435,11 +435,11 @@ ] }, "locked": { - "lastModified": 1711133180, - "narHash": "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=", + "lastModified": 1711625603, + "narHash": "sha256-W+9dfqA9bqUIBV5u7jaIARAzMe3kTq/Hp2SpSVXKRQw=", "owner": "nix-community", "repo": "home-manager", - "rev": "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb", + "rev": "c0ef0dab55611c676ad7539bf4e41b3ec6fa87d2", "type": "github" }, "original": { @@ -481,11 +481,11 @@ ] }, "locked": { - "lastModified": 1711035742, - "narHash": "sha256-5vvhCSUGG9TA2G1eIRgokuYizhRnZu0ZbcU1MXfHsUE=", + "lastModified": 1711466786, + "narHash": "sha256-sArxGyUBiCA1in+q6t0QqT+ZJiZ1PyBp7cNPKLmREM0=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "6a92473237f430399a417e1c2da9d7fcd4970086", + "rev": "d3876f34779cc03ee51e4aafc0d00a4f187c7544", "type": "github" }, "original": { @@ -549,11 +549,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1711419979, - "narHash": "sha256-3MHxCysSDf+2anImp6UQInHJnQUp+3Ble2Y7tllwHkA=", + "lastModified": 1711644240, + "narHash": "sha256-QhaQ/wcCk6D5YyG85Bg6hON076mpcVKIfKrL/5iwdAE=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "a9d7526aae38dcdceb391fe9f00919c6c400abe3", + "rev": "d8429eebc66e7091381502edc0fc7335790f62e4", "type": "github" }, "original": { @@ -643,11 +643,11 @@ ] }, "locked": { - "lastModified": 1710960526, - "narHash": "sha256-tt0UgVKWeLQ+tFzvqrm4uAZbzONwdGshpfiLHAQ1P2c=", + "lastModified": 1711250455, + "narHash": "sha256-LSq1ZsTpeD7xsqvlsepDEelWRDtAhqwetp6PusHXJRo=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "a2f39421144d42541c057be235154ce21b76c0f6", + "rev": "b3e430f81f3364c5dd1a3cc9995706a4799eb3fa", "type": "github" }, "original": { @@ -661,14 +661,15 @@ "nixpkgs": [ "hyprlock", "nixpkgs" - ] + ], + "systems": "systems_6" }, "locked": { - "lastModified": 1708212860, - "narHash": "sha256-nW3Zrhh9RJcMTvOcXAaKADnJM/g6tDf3121lJtTHnYo=", + "lastModified": 1711250455, + "narHash": "sha256-LSq1ZsTpeD7xsqvlsepDEelWRDtAhqwetp6PusHXJRo=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "11d5ccda071c153dfdc18ef65338956a51cef96a", + "rev": "b3e430f81f3364c5dd1a3cc9995706a4799eb3fa", "type": "github" }, "original": { @@ -683,14 +684,14 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_6" + "systems": "systems_7" }, "locked": { - "lastModified": 1711413456, - "narHash": "sha256-LHwn4m1s38ipvtYxZ+Il8jhrYhpWKTnp68OSXKwSTto=", + "lastModified": 1711622429, + "narHash": "sha256-JwHbbmAzX1Kfq1XAs06lKbk2TZL7mH/yLczG4BaiuTs=", "owner": "hyprwm", "repo": "hyprlock", - "rev": "6acb7552a3b67fe27fea679b36a8f4af45048dad", + "rev": "7f8c9b6addce5174af78acaf1eb1d726fc4133b5", "type": "github" }, "original": { @@ -838,11 +839,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1711242788, - "narHash": "sha256-6m6hw6uoIIvoAMR5RLhw7kGfNu3Govof9vnPAzveUgI=", + "lastModified": 1711501815, + "narHash": "sha256-mHtxlnqdIZAPAAXT0em6O5n9yW/6ri937i0NWAvEErU=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "04028200841ec3b4ce163de4d136296d03123001", + "rev": "63ded1ffc0846c259f9cd0f62aa2ea9f7f804f56", "type": "github" }, "original": { @@ -1059,11 +1060,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1711390813, - "narHash": "sha256-HU/X5KpquAh5xLWICdUe/D2t1dVv32WEXwJtCXVKWKg=", + "lastModified": 1711638964, + "narHash": "sha256-Hq+bwMi6CoxY3EjdofPofaNUyCudGX1skHhd5i8WWwE=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "7274c73cf5708ed3a814edc9605463ec4a116619", + "rev": "cbc0374fda9a08bb9386cc2791a5dd39ed990818", "type": "github" }, "original": { @@ -1106,11 +1107,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1711163522, - "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=", + "lastModified": 1711523803, + "narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4", + "rev": "2726f127c15a4cc9810843b96cad73c7eb39e443", "type": "github" }, "original": { @@ -1138,11 +1139,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1711163522, - "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=", + "lastModified": 1711523803, + "narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4", + "rev": "2726f127c15a4cc9810843b96cad73c7eb39e443", "type": "github" }, "original": { @@ -1260,11 +1261,11 @@ }, "nur": { "locked": { - "lastModified": 1711416992, - "narHash": "sha256-N1D7mT7DX5CEndSsM3Q608glUsrqtovafiJdbVKva00=", + "lastModified": 1711644301, + "narHash": "sha256-D/jn9ZbiAdOdQtUXkYRRQ1IebzwPajMBw3UVFeFi+l4=", "owner": "nix-community", "repo": "NUR", - "rev": "ea5441d71ded45d67d6766ea591960f94fab37f6", + "rev": "b042f04b3c95e96b2125f3f691657d6469237c47", "type": "github" }, "original": { @@ -1690,6 +1691,21 @@ } }, "systems_7": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_8": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",