From 60de780156ca68355cfe72663f324d5365f1624b Mon Sep 17 00:00:00 2001 From: matt1432 Date: Tue, 28 May 2024 12:03:20 -0400 Subject: [PATCH] chore: update flake.lock --- .../arion/freshrss/images/rss-bridge.nix | 4 +- .../media/calibre/images/calibre-web.nix | 4 +- .../arion/media/radarr/images/radarr.nix | 4 +- .../arion/music/jbots/images/jmusicbot.nix | 4 +- .../modules/arion/wg-easy/images/wg-easy.nix | 4 +- flake.lock | 218 +++++++----------- modules/hyprland/default.nix | 8 +- 7 files changed, 96 insertions(+), 150 deletions(-) diff --git a/devices/nos/modules/arion/freshrss/images/rss-bridge.nix b/devices/nos/modules/arion/freshrss/images/rss-bridge.nix index 78c6854..ee87c9c 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:57946d41a67bfadf8cdffcd0a188ea67aada5e87492d15a4fba80c21ca1a05e3"; - sha256 = "166vjpj3npmy65lgp8gchspkrm9k346mz1qgvmcn1p5gsblar57n"; + imageDigest = "sha256:82f85e977af60b5e241d8e63346d02c14dd325d932624dac7e5b6d2266f0214d"; + sha256 = "1qkhm7qqs4kjy4n1v1cv53s2jwac43b4c14ddwxpd7cydfbsvd8a"; finalImageName = "rssbridge/rss-bridge"; finalImageTag = "latest"; } diff --git a/devices/nos/modules/arion/media/calibre/images/calibre-web.nix b/devices/nos/modules/arion/media/calibre/images/calibre-web.nix index 4e2f62e..4b3c16a 100644 --- a/devices/nos/modules/arion/media/calibre/images/calibre-web.nix +++ b/devices/nos/modules/arion/media/calibre/images/calibre-web.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "ghcr.io/linuxserver/calibre-web"; - imageDigest = "sha256:f9e7956e41ccc32c40427f3231bbccb72b4ea6e37023509104c4e50bbf3da8a5"; - sha256 = "03xa64ln9mr1g8zk9jadmk855ivhg7y9d7ayzh2f8jg40ggq8bkm"; + imageDigest = "sha256:fab0fda498a1354fad88ece34119f35118faf292678e0b2c18956dfa690cd2ab"; + sha256 = "0dn99lqyafq4va3acb9cqf8j93z5lgzbbcs298v5hm4lqgi8s6mm"; finalImageName = "ghcr.io/linuxserver/calibre-web"; finalImageTag = "latest"; } diff --git a/devices/nos/modules/arion/media/radarr/images/radarr.nix b/devices/nos/modules/arion/media/radarr/images/radarr.nix index ca41039..24f4ebd 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:b84ed4a003c459df9675198e64053a2e9c0a3d5dd76587415b16c6902b8543f2"; - sha256 = "1sjgv1xf3b0zs0nmvk1srhw361kz3c7a85swr9d0zky7pm16igpz"; + imageDigest = "sha256:7c409b0b64358ac1b0df27b1ce27e0c5ea3aa22f1cbf2362914b846bffa8efdf"; + sha256 = "18lrmxfz7b222n8lrx9pmahrz7vss46fkfk62rxdk9y7nnk45f60"; finalImageName = "ghcr.io/linuxserver/radarr"; finalImageTag = "latest"; } diff --git a/devices/nos/modules/arion/music/jbots/images/jmusicbot.nix b/devices/nos/modules/arion/music/jbots/images/jmusicbot.nix index 0c68285..5f26e5e 100644 --- a/devices/nos/modules/arion/music/jbots/images/jmusicbot.nix +++ b/devices/nos/modules/arion/music/jbots/images/jmusicbot.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "craumix/jmusicbot"; - imageDigest = "sha256:0c526273be298a82e823b7b6b3930d3a4158d8f3dfa5e8dbaef65dc64618e59e"; - sha256 = "0a5s4i4qv22x47cm7zhgljjkfh0d2llrpgdwr0fx8jq2sys6rvl9"; + imageDigest = "sha256:3d93112ea5318eb527b9dd599e7fd5540fee8e6f481769a86f225e6d715d91b2"; + sha256 = "0b2p9zy51k9yknh3dc4vpvjq6f8a40avpkcfaiii6wipnq40g0s7"; finalImageName = "craumix/jmusicbot"; finalImageTag = "0.4.1"; } diff --git a/devices/nos/modules/arion/wg-easy/images/wg-easy.nix b/devices/nos/modules/arion/wg-easy/images/wg-easy.nix index 52eb3a9..52ee821 100644 --- a/devices/nos/modules/arion/wg-easy/images/wg-easy.nix +++ b/devices/nos/modules/arion/wg-easy/images/wg-easy.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "ghcr.io/wg-easy/wg-easy"; - imageDigest = "sha256:f810dc71ef86192c2c43350d21505ca9c855ec1d62de8f52439e4dc2095181d6"; - sha256 = "0rni7ha0fpyd3dp4gykrk68lf6b1nvlfwdgbp0n8r9myl9fw9r7b"; + imageDigest = "sha256:24eddefd4e5ae2cff930d4f9254f018d5f4cdd48daf559e7a73a14da6a9fbbb4"; + sha256 = "02j61zn3fqkxj5pjllf9dk8209x1wm8m8ng38b5g7x7bl7h53gc4"; finalImageName = "ghcr.io/wg-easy/wg-easy"; finalImageTag = "latest"; } diff --git a/flake.lock b/flake.lock index b2b6b7f..213215b 100644 --- a/flake.lock +++ b/flake.lock @@ -126,11 +126,11 @@ ] }, "locked": { - "lastModified": 1716447978, - "narHash": "sha256-JllB6ET7XWkYQ8T+3h3gu8AG4T4+tmBA+nOr9kKp2ps=", + "lastModified": 1716707221, + "narHash": "sha256-qFvK3rilNlFXrihStE30Z/UgWpg+xqBI8NGYW17ErCs=", "owner": "matt1432", "repo": "nixos-caddy-cloudflare", - "rev": "f59d161d20aa8557cd1fb6e1ec2d3c9e373b8d6f", + "rev": "7b95ef531ce75b51b393315a2a84a8380c5f823a", "type": "github" }, "original": { @@ -501,6 +501,33 @@ "type": "github" } }, + "git-hooks": { + "inputs": { + "flake-compat": "flake-compat_2", + "gitignore": "gitignore", + "nixpkgs": [ + "neovim-nightly", + "nixpkgs" + ], + "nixpkgs-stable": [ + "neovim-nightly", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1716213921, + "narHash": "sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "git-theme-src": { "flake": false, "locked": { @@ -521,7 +548,7 @@ "inputs": { "nixpkgs": [ "neovim-nightly", - "pre-commit-hooks", + "git-hooks", "nixpkgs" ] }, @@ -636,11 +663,11 @@ ] }, "locked": { - "lastModified": 1716543011, - "narHash": "sha256-CmmR39fsEJU8K5mq+1GSa4Eiup0TLx/BO9zVzUQAWrc=", + "lastModified": 1716807217, + "narHash": "sha256-ZxI4IzcZGbj2SUx6AdIc/0q3KJpDQK8yRy1xv/8N0hY=", "owner": "juanfont", "repo": "headscale", - "rev": "51b56ba447b7b2b3a38ee4e80ce9bc6f179f4144", + "rev": "5a4e52b727d402d78a5f3c5ef6b74dcb3b448fe2", "type": "github" }, "original": { @@ -700,11 +727,11 @@ ] }, "locked": { - "lastModified": 1716679503, - "narHash": "sha256-aX8AEWHLwuiYX8OCpTnHGrQeei1Gb+AGbk1hq+RIClg=", + "lastModified": 1716908526, + "narHash": "sha256-Zl6e/sEVDh07K47XxDGPsXTYT4nI6llUDbQ4xMIwp7k=", "owner": "nix-community", "repo": "home-manager", - "rev": "e4611630c3cc8ed618b48d92f6291f65be9f7913", + "rev": "373ead20606efa9181cd15ba19a5deac7ead1492", "type": "github" }, "original": { @@ -822,11 +849,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1716669967, - "narHash": "sha256-wq91XpwR0tv7e7KwSp0qzvu31EMssznl8DzbNy4M4Hk=", + "lastModified": 1716842732, + "narHash": "sha256-b80p4J7OSp9LslyJimj2a4wCCNLdjJL3bIgGt+f9Gz4=", "ref": "refs/heads/main", - "rev": "553232a3e4c112c8511309e6b685cb614895e714", - "revCount": 4743, + "rev": "722d537a91a9beacf9c12fc1317ff1fbe10ffac5", + "revCount": 4747, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -936,38 +963,18 @@ "type": "github" } }, - "jellyfin-ffmpeg-src": { - "flake": false, - "locked": { - "lastModified": 1716642934, - "narHash": "sha256-6cYIPUsAmDlsEG53/BExoh5gjstsRhkx+aHTgxJ7JMA=", - "owner": "jellyfin", - "repo": "jellyfin-ffmpeg", - "rev": "df454b6f2809ad53f80f2c88543fb3922b5dd503", - "type": "github" - }, - "original": { - "owner": "jellyfin", - "ref": "v6.0.1-7", - "repo": "jellyfin-ffmpeg", - "type": "github" - } - }, "jellyfin-flake": { "inputs": { - "jellyfin-ffmpeg-src": "jellyfin-ffmpeg-src", - "jellyfin-src": "jellyfin-src", - "jellyfin-web-src": "jellyfin-web-src", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1716774714, - "narHash": "sha256-HeUKgLFk6KltkHdpCmP+kqQm3Ol2H/5bCfpBh7GUaw0=", + "lastModified": 1716852057, + "narHash": "sha256-yuF4PRv4pavpxqcDa6DTth6eHuekTfvXZ2xaCNaQgTU=", "owner": "matt1432", "repo": "nixos-jellyfin", - "rev": "689a766bf178fa9129a9d335d56dcf4fd22b5ba3", + "rev": "64e8dac6318d34f82c21b6f6e73cec3bcb7c4166", "type": "github" }, "original": { @@ -976,31 +983,14 @@ "type": "github" } }, - "jellyfin-src": { - "flake": false, - "locked": { - "lastModified": 1716768029, - "narHash": "sha256-gJMz2LfxC0JXqGYNKNz1zRbWZOH1UxbcoGtmdymZ/Oo=", - "owner": "jellyfin", - "repo": "jellyfin", - "rev": "730b01fb1413219ad3587530739b3e496fe735e2", - "type": "github" - }, - "original": { - "owner": "jellyfin", - "ref": "v10.9.3", - "repo": "jellyfin", - "type": "github" - } - }, "jellyfin-ultrachromic-src": { "flake": false, "locked": { - "lastModified": 1716569042, - "narHash": "sha256-F9lunfs+rMVl0rVqCBApImuNtPA/wAWgqd18Rqw9PzM=", + "lastModified": 1716820228, + "narHash": "sha256-d+RJDThiJMuUjJtaYeD2T4XJPGpTHnoZYCv9629yzMo=", "owner": "CTalvio", "repo": "Ultrachromic", - "rev": "41ec342223ce22ddcb358176be474a25cb30d2c5", + "rev": "5fedfcd3fe386d37b56514e2d0abad34ae14e35c", "type": "github" }, "original": { @@ -1009,34 +999,17 @@ "type": "github" } }, - "jellyfin-web-src": { - "flake": false, - "locked": { - "lastModified": 1716768031, - "narHash": "sha256-duq2tilUDEzj7o3Nq3Ku5qVJm4XDqVmqkQQIK/dlTpE=", - "owner": "jellyfin", - "repo": "jellyfin-web", - "rev": "ea1cadf4b6f331b4f7c4fda80eccfb4212536184", - "type": "github" - }, - "original": { - "owner": "jellyfin", - "ref": "v10.9.3", - "repo": "jellyfin-web", - "type": "github" - } - }, "lib-aggregate": { "inputs": { "flake-utils": "flake-utils_2", "nixpkgs-lib": "nixpkgs-lib_4" }, "locked": { - "lastModified": 1716120557, - "narHash": "sha256-rvNq9YolMY1DRMgwdAti8qwNDjkhTsotSWa15/Ch7+A=", + "lastModified": 1716725378, + "narHash": "sha256-bNTVDAVBLFSSTU+q54cJnntmFKBi+F/D8sSqlZwBGiM=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "5fa64b174daa22fe0d20ebbcc0ec2c7905b503f1", + "rev": "dbc9130fe1455e0f6ee4d8f5f799f9be551f866b", "type": "github" }, "original": { @@ -1129,19 +1102,19 @@ "inputs": { "flake-compat": "flake-compat", "flake-parts": "flake-parts_3", + "git-hooks": "git-hooks", "hercules-ci-effects": "hercules-ci-effects_2", "neovim-src": "neovim-src", "nixpkgs": [ "nixpkgs" - ], - "pre-commit-hooks": "pre-commit-hooks" + ] }, "locked": { - "lastModified": 1716672993, - "narHash": "sha256-KISj1WGeeEb6d2rYFRGYHYiDvNJN1JtRKU2+jE32LMQ=", + "lastModified": 1716827514, + "narHash": "sha256-5qS9Jn3FaEFMGGhS/1mLOUifMFDLPcLczjcdaN7xgyE=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "0f91f34a626baade98dfa091cc7a023266644d91", + "rev": "7849e018a09688cd71bde887113954b3ce08739c", "type": "github" }, "original": { @@ -1284,11 +1257,11 @@ ] }, "locked": { - "lastModified": 1716513383, - "narHash": "sha256-WKO8A3PvMRTXB5wNhFyTNXnYQThSazIyVqY5Yh4YIiI=", + "lastModified": 1716686274, + "narHash": "sha256-4JiRUWtoEMrfq38jG4O+NP6rcQIhKxEclnSkHvywnf0=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "a1b37351bf0fe01192eeb93f643749f2e0f944eb", + "rev": "83a47c12d3493f7eb876250d0298d1566a965ce4", "type": "github" }, "original": { @@ -1347,11 +1320,11 @@ ] }, "locked": { - "lastModified": 1716170277, - "narHash": "sha256-fCAiox/TuzWGVaAz16PxrR4Jtf9lN5dwWL2W74DS0yI=", + "lastModified": 1716772633, + "narHash": "sha256-Idcye44UW+EgjbjCoklf2IDF+XrehV6CVYvxR1omst4=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "e0638db3db43b582512a7de8c0f8363a162842b9", + "rev": "ff80cb4a11bb87f3ce8459be6f16a25ac86eb2ac", "type": "github" }, "original": { @@ -1414,11 +1387,11 @@ ] }, "locked": { - "lastModified": 1716476603, - "narHash": "sha256-lrUPjM0dO0APoO/5Pz8XHWlUcD54dZnBAsi2v69d/3I=", + "lastModified": 1716896735, + "narHash": "sha256-id351iMgA7aOla2BD6C/BTXMJTGigRQA64kCt8vM+cs=", "owner": "nix-community", "repo": "nixd", - "rev": "b05abf36de17cf3c12f48f40ede67b9112833483", + "rev": "fe202307eaf7e89c4366ed927af761482a6065c8", "type": "github" }, "original": { @@ -1429,11 +1402,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1716660083, - "narHash": "sha256-QO7cdjtDhx72KEw6m0NOtuE5FS4asaRExZ65uFR/q8g=", + "lastModified": 1716880688, + "narHash": "sha256-UHGnmQRnbykGt17ycgPddaQxbbs/XZfy9L3vW2RMZ0I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6de51d98ec2ae46730f11845e221aab9d2470a8a", + "rev": "74ea49c5e3c97f2717139e878685dbc41a171203", "type": "github" }, "original": { @@ -1519,11 +1492,11 @@ }, "nixpkgs-lib_4": { "locked": { - "lastModified": 1716079763, - "narHash": "sha256-DGRfb7fO7c3XDS3twmuaV5NAGPPdU3W7Q35fjIZc8iY=", + "lastModified": 1716684580, + "narHash": "sha256-sIbMJWJr4hl2PWd9/iWlh89QfVzBn1NJ3u5RjeZADuM=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "0df131b5ee4d928a4b664b6d0cd99cf134d6ab6b", + "rev": "d0d27192931680482081aa1c38389da2af84a651", "type": "github" }, "original": { @@ -1550,11 +1523,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1716061101, - "narHash": "sha256-H0eCta7ahEgloGIwE/ihkyGstOGu+kQwAiHvwVoXaA0=", + "lastModified": 1716655032, + "narHash": "sha256-kQ25DAiCGigsNR/Quxm3v+JGXAEXZ8I7RAF4U94bGzE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e7cc61784ddf51c81487637b3031a6dd2d6673a2", + "rev": "59a450646ec8ee0397f5fa54a08573e8240eb91f", "type": "github" }, "original": { @@ -1574,11 +1547,11 @@ ] }, "locked": { - "lastModified": 1716646613, - "narHash": "sha256-dW1G+sPIlzryhwHDMu8Gg5hpj3aDrLNxfHxidR1rVs8=", + "lastModified": 1716909439, + "narHash": "sha256-vNcGko3FJ2fgEyrhgKk415e18skKRyaGHWa4Gp5Q+9g=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "e344f9ccf69ae4b7ca74291bc789fecfb2b0406c", + "rev": "3476d0fe74eb4e7540370a5697c27b7b8f004891", "type": "github" }, "original": { @@ -1695,11 +1668,11 @@ }, "nur": { "locked": { - "lastModified": 1716682147, - "narHash": "sha256-SuKHm4gY4fQZvCPqt6WdCHrShvUPlQrblYG6TGhKOrs=", + "lastModified": 1716909828, + "narHash": "sha256-5+u1gmdj+1z5BlbrTeQ3pwJcMOnTnMMtMyjgeiugDJs=", "owner": "nix-community", "repo": "NUR", - "rev": "5a9cefff93fe9a7e8d864d48ea0fba144afef2a6", + "rev": "a569fb54cfba9894b0ecb6ffbe2141b18c37d773", "type": "github" }, "original": { @@ -1880,33 +1853,6 @@ "type": "gitlab" } }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat_2", - "gitignore": "gitignore", - "nixpkgs": [ - "neovim-nightly", - "nixpkgs" - ], - "nixpkgs-stable": [ - "neovim-nightly", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1716213921, - "narHash": "sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, "pyagentx-src": { "flake": false, "locked": { @@ -2052,11 +1998,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1716400300, - "narHash": "sha256-0lMkIk9h3AzOHs1dCL9RXvvN4PM8VBKb+cyGsqOKa4c=", + "lastModified": 1716692524, + "narHash": "sha256-sALodaA7Zkp/JD6ehgwc0UCBrSBfB4cX66uFGTsqeFU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "b549832718b8946e875c016a4785d204fcfc2e53", + "rev": "962797a8d7f15ed7033031731d0bb77244839960", "type": "github" }, "original": { diff --git a/modules/hyprland/default.nix b/modules/hyprland/default.nix index 892d1a6..f8f2fb0 100644 --- a/modules/hyprland/default.nix +++ b/modules/hyprland/default.nix @@ -8,7 +8,7 @@ inherit (lib) concatStringsSep optionals; inherit (config.vars) mainUser; - cfg = config.programs.hyprland; + cfg = config.home-manager.users.${mainUser}.wayland.windowManager.hyprland; isTouchscreen = config.hardware.sensor.iio.enable; in { # SYSTEM CONFIG @@ -32,10 +32,10 @@ in { }; programs.hyprland = let - inherit (hyprland.packages.${pkgs.system}) default xdg-desktop-portal-hyprland; + inherit (hyprland.packages.${pkgs.system}) xdg-desktop-portal-hyprland; in { enable = true; - package = default; + package = cfg.finalPackage; portalPackage = xdg-desktop-portal-hyprland; }; @@ -66,7 +66,7 @@ in { wayland.windowManager.hyprland = { enable = true; - package = cfg.finalPackage; + package = hyprland.packages.${pkgs.system}.default; systemd.variables = ["-all"];