From 4405ad4bf98657b392db92e969841d4d618ec771 Mon Sep 17 00:00:00 2001 From: matt1432 Date: Tue, 2 Jul 2024 12:21:47 -0400 Subject: [PATCH] fix: update flake.lock for latest openssh --- .../modules/arion/forgejo/images/postgres.nix | 4 +- .../arion/freshrss/images/postgres.nix | 4 +- .../arion/immich/images/machine-learning.nix | 6 +- .../modules/arion/immich/images/server.nix | 6 +- .../arion/media/sonarr/images/sonarr.nix | 4 +- .../arion/nextcloud/images/nextcloud.nix | 4 +- .../modules/arion/nextcloud/images/nginx.nix | 4 +- flake.lock | 56 +++++++++---------- modules/kmscon.nix | 8 +-- 9 files changed, 47 insertions(+), 49 deletions(-) diff --git a/devices/nos/modules/arion/forgejo/images/postgres.nix b/devices/nos/modules/arion/forgejo/images/postgres.nix index 5fcc587..c7487cf 100644 --- a/devices/nos/modules/arion/forgejo/images/postgres.nix +++ b/devices/nos/modules/arion/forgejo/images/postgres.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "postgres"; - imageDigest = "sha256:5880b73b30d8e47b11e94e35aed002219e8e301f581e33feb9f062e332046079"; - sha256 = "10ld7pda7svs35939lmch0shc1rjdmrsksiv247656m67yyp1g3j"; + imageDigest = "sha256:21a1b037ebe0d3b7edefe4bc4352634883d4ba4fa7b7641bf86afa3219a47547"; + sha256 = "07v1r0ijag2kyr9nk5l7kphgvrb6lk71zyab4i31rkl1k27vfhwg"; finalImageName = "postgres"; finalImageTag = "14"; } diff --git a/devices/nos/modules/arion/freshrss/images/postgres.nix b/devices/nos/modules/arion/freshrss/images/postgres.nix index 5fcc587..c7487cf 100644 --- a/devices/nos/modules/arion/freshrss/images/postgres.nix +++ b/devices/nos/modules/arion/freshrss/images/postgres.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "postgres"; - imageDigest = "sha256:5880b73b30d8e47b11e94e35aed002219e8e301f581e33feb9f062e332046079"; - sha256 = "10ld7pda7svs35939lmch0shc1rjdmrsksiv247656m67yyp1g3j"; + imageDigest = "sha256:21a1b037ebe0d3b7edefe4bc4352634883d4ba4fa7b7641bf86afa3219a47547"; + sha256 = "07v1r0ijag2kyr9nk5l7kphgvrb6lk71zyab4i31rkl1k27vfhwg"; finalImageName = "postgres"; finalImageTag = "14"; } diff --git a/devices/nos/modules/arion/immich/images/machine-learning.nix b/devices/nos/modules/arion/immich/images/machine-learning.nix index 11a10b2..34103f1 100644 --- a/devices/nos/modules/arion/immich/images/machine-learning.nix +++ b/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:9db20e5c2033bef01fa2be50fa0a2c3d62e43f069aedde4d49a65e65a436d40b"; - sha256 = "01cchdlp322nbw0rs6akcx569wbqf1lydwvq6zw9lpwkhrsyrrvx"; + imageDigest = "sha256:28401be15060af7f51cf8ee43002dd827899e9f4abd38e44dd59d7a7ae04dca6"; + sha256 = "1gp7yyy7rv80jcnlp5kbn55ijmbrbhcymrg5gsqnv1r70fa1pbab"; finalImageName = "ghcr.io/immich-app/immich-machine-learning"; - finalImageTag = "v1.106.4"; + finalImageTag = "v1.107.0"; } diff --git a/devices/nos/modules/arion/immich/images/server.nix b/devices/nos/modules/arion/immich/images/server.nix index 3f8b094..0de4239 100644 --- a/devices/nos/modules/arion/immich/images/server.nix +++ b/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:d39cb7ecbcc9924f2c51a3e0deb8a469075996c6ba9e1384eb2ddb550984848e"; - sha256 = "0ynfw50bga8av98mbnnznm9ih3lar9xim7njby8vwbs455iiz6g4"; + imageDigest = "sha256:2b9c87617e55e3471a1239b0fa00041361517dd8f65c7db46abc7392c0fb561a"; + sha256 = "1w87knckw19hr32g7ck6zc2nq7m1bpfisihw66bzixp67f2qw0gm"; finalImageName = "ghcr.io/immich-app/immich-server"; - finalImageTag = "v1.106.4"; + finalImageTag = "v1.107.0"; } diff --git a/devices/nos/modules/arion/media/sonarr/images/sonarr.nix b/devices/nos/modules/arion/media/sonarr/images/sonarr.nix index d0e3ed2..ff15e78 100644 --- a/devices/nos/modules/arion/media/sonarr/images/sonarr.nix +++ b/devices/nos/modules/arion/media/sonarr/images/sonarr.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "ghcr.io/linuxserver/sonarr"; - imageDigest = "sha256:782a911f0f3e9ad3a9cf39292e1d43b8a184cb989d7edc4abc8d8480b221b5aa"; - sha256 = "0sdb3sj5pv7lc655n825z11hz8dp2hv5sx1049yn0l8wlljczwf5"; + imageDigest = "sha256:3f193d343c1225676c1ea0547c5022fd83c4459a493870179dff9e87c54dbbc9"; + sha256 = "1qksj4njjl8axa2zy1iazwq0kg2cjdzzy055ylwgvq1zv1by45a2"; finalImageName = "ghcr.io/linuxserver/sonarr"; finalImageTag = "latest"; } diff --git a/devices/nos/modules/arion/nextcloud/images/nextcloud.nix b/devices/nos/modules/arion/nextcloud/images/nextcloud.nix index c9ee436..fa1cf4d 100644 --- a/devices/nos/modules/arion/nextcloud/images/nextcloud.nix +++ b/devices/nos/modules/arion/nextcloud/images/nextcloud.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "nextcloud"; - imageDigest = "sha256:7df7de6e9b7438839f1f7519ae345015bda742754b65d90659d0214bfe07c00b"; - sha256 = "1kg54w12ja78cm33hvj0c21wlmx7mdg7rcwb7r75ig46w175p9v2"; + imageDigest = "sha256:43c6307906f65f17d6b22d01d25f7024700f2affa774ae7128c882f0276bf772"; + sha256 = "0lmhq6bw730jcz1gv1wn5zcfqi3vr3zlvnfpqqwv5zl6fg9kppl4"; finalImageName = "nextcloud"; finalImageTag = "29.0.3-fpm"; } diff --git a/devices/nos/modules/arion/nextcloud/images/nginx.nix b/devices/nos/modules/arion/nextcloud/images/nginx.nix index 9a2f4b1..949e55e 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:9c367186df9a6b18c6735357b8eb7f407347e84aea09beb184961cb83543d46e"; - sha256 = "1rrq5dc62skmnc85hqfp5rk18iz20f8vkcr2zhrslrp8rmyy5gg5"; + imageDigest = "sha256:1aaa8180df68200fd41f9066cf62155e3b71183c04b2895a7388d5fd84ef3c8b"; + sha256 = "17l0zpn8f8s25dwqkbm9ak9xbkz5czpfsnwvhdm7ykq52kxpxs5x"; finalImageName = "nginx"; finalImageTag = "latest"; } diff --git a/flake.lock b/flake.lock index f1ea040..ec937b5 100644 --- a/flake.lock +++ b/flake.lock @@ -126,11 +126,11 @@ ] }, "locked": { - "lastModified": 1718811416, - "narHash": "sha256-IuCFMxMiES2o2Zhkg4jFN6GPimF1ufGZmdj2FwH/lY4=", + "lastModified": 1719903981, + "narHash": "sha256-gTQTju8TECJzaDQ82JrnWESffZgLhYntw4uMJamfHuI=", "owner": "matt1432", "repo": "nixos-caddy-cloudflare", - "rev": "e64888083f1136765fbbd05a90403f9caa5b5305", + "rev": "ed3b81f95fa44af25ed864b5271f223eaeb528c8", "type": "github" }, "original": { @@ -376,11 +376,11 @@ ] }, "locked": { - "lastModified": 1719745305, - "narHash": "sha256-xwgjVUpqSviudEkpQnioeez1Uo2wzrsMaJKJClh+Bls=", + "lastModified": 1719877454, + "narHash": "sha256-g5N1yyOSsPNiOlFfkuI/wcUjmtah+nxdImJqrSATjOU=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c3c5ecc05edc7dafba779c6c1a61cd08ac6583e9", + "rev": "4e3583423212f9303aa1a6337f8dffb415920e4f", "type": "github" }, "original": { @@ -993,11 +993,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1719786368, - "narHash": "sha256-fpVk3CajFQ4hcTuoU9njw/btPrAV92f8+WawVy8XvcE=", + "lastModified": 1719915468, + "narHash": "sha256-vSutSKzLH63dCwvyrLg1wJmbgjH351/++9RQY3S3TYo=", "ref": "refs/heads/main", - "rev": "d7ea1b7785f31e9fd6477490309721a19a835592", - "revCount": 4900, + "rev": "2fa57f2dc4909be697d003a22ce6870039e4db9b", + "revCount": 4902, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -1334,11 +1334,11 @@ ] }, "locked": { - "lastModified": 1719858211, - "narHash": "sha256-pBGMc6ZkGL4NiJAF+w/PmGeSE3Zohf4vxPcfwYT5qf0=", + "lastModified": 1719913883, + "narHash": "sha256-GHB5lizmXGlglKYAKIvY9bkPcXvbrmEzh4d264omYYo=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "5d66451b2345a22a9c5ab3a424d2f15a5ba4f42b", + "rev": "0289cf03e294270c84f20bc09cd527fd7f3d4b72", "type": "github" }, "original": { @@ -1350,11 +1350,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1719700831, - "narHash": "sha256-d89hDFBBtuQ7rwS/Q3lKYyfE0ekVCwubMN9q1qCZ3m0=", + "lastModified": 1719827289, + "narHash": "sha256-0IcxmkzmNY4el9yx7wGjZ+VDLGV+3XlI6AW9WfCbzAM=", "owner": "neovim", "repo": "neovim", - "rev": "e7020306a19a5211c834966ec067fff3b981bdb9", + "rev": "8f5e90811025bcc652146168d5116f8d73fe8f81", "type": "github" }, "original": { @@ -1647,11 +1647,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1719690277, - "narHash": "sha256-0xSej1g7eP2kaUF+JQp8jdyNmpmCJKRpO12mKl/36Kc=", + "lastModified": 1719848872, + "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2741b4b489b55df32afac57bc4bfd220e8bf617e", + "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8", "type": "github" }, "original": { @@ -1824,11 +1824,11 @@ ] }, "locked": { - "lastModified": 1719861366, - "narHash": "sha256-0AoX95NkDRQeCL+m1BDW+FdKVldsb6NF94vlE63q7No=", + "lastModified": 1719918908, + "narHash": "sha256-GJHzx9LUG2P6hnNvQ+nqWXrQMZDttYaH7RA66ad3mhU=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "4cb5b074e41c963724d187c08c58be677154a9b8", + "rev": "64553807b64c630f57d6a3a09afc1e9fbc33995e", "type": "github" }, "original": { @@ -1986,11 +1986,11 @@ ] }, "locked": { - "lastModified": 1719558285, - "narHash": "sha256-WOdgZ+9VhfVdapAjZrt1zpXlo9Pjxr/04Olt81ygbn8=", + "lastModified": 1719903879, + "narHash": "sha256-4b/t2hSDU89dzivLOnjaU48SBGRh0Q3TkOZLpbxukhM=", "owner": "matt1432", "repo": "nixos-pcsd", - "rev": "5a4c4e94b9dbd6c7137ac799cd6e3bc80fe5d7f5", + "rev": "08cc72e4699da7f1f2580d9c75d61835f6367ee7", "type": "github" }, "original": { @@ -2310,11 +2310,11 @@ "treefmt-nix": "treefmt-nix_4" }, "locked": { - "lastModified": 1719887710, - "narHash": "sha256-IGOxuUxtpVC9P4Lup+j3Y8Y/rRsaXpGB1AFP2DYj/DA=", + "lastModified": 1719882360, + "narHash": "sha256-vmMqin2swEIYWZ0+WYQ+HYKglsafl+YOB6MfMCHxBDQ=", "owner": "matt1432", "repo": "nix-steam-servers", - "rev": "20bb1e10bcc50e4a4a6a4aee89e4f3a18106e737", + "rev": "2791caa3a0504bb4a822ea64598f8f156d8f4257", "type": "github" }, "original": { diff --git a/modules/kmscon.nix b/modules/kmscon.nix index b1fd138..c909d5f 100644 --- a/modules/kmscon.nix +++ b/modules/kmscon.nix @@ -1,15 +1,13 @@ -{config, ...}: let - inherit (config.services.xserver) xkb; -in { +{...}: { services.kmscon = { enable = true; + useXkbConfig = true; hwRender = false; + # FIXME: https://github.com/Aetf/kmscon/issues/18 // Icons not rendering properly extraOptions = builtins.concatStringsSep " " [ "--font-size 12.5" "--font-dpi 170" - "--xkb-layout ${xkb.layout}" - "--xkb-variant ${xkb.variant}" "--font-name 'JetBrainsMono Nerd Font'" ]; };