From be7d468efc86bd3cdd8001298ddec43b59ddba2d Mon Sep 17 00:00:00 2001 From: matt1432 Date: Sun, 31 Mar 2024 22:56:49 -0400 Subject: [PATCH] chore: update flake.lock --- .../arion/freshrss/images/rss-bridge.nix | 4 +- .../arion/immich/images/machine-learning.nix | 6 +- .../modules/arion/immich/images/server.nix | 6 +- .../media/calibre/images/calibre-web.nix | 4 +- .../arion/media/calibre/images/calibre.nix | 4 +- .../arion/media/radarr/images/radarr.nix | 4 +- .../arion/media/sonarr/images/sonarr.nix | 4 +- .../arion/nextcloud/images/nextcloud.nix | 4 +- flake.lock | 105 +++++++----------- flake.nix | 8 -- modules/hyprland/default.nix | 7 -- modules/hyprland/hycov.nix | 28 ----- 12 files changed, 60 insertions(+), 124 deletions(-) delete mode 100644 modules/hyprland/hycov.nix diff --git a/devices/nos/modules/arion/freshrss/images/rss-bridge.nix b/devices/nos/modules/arion/freshrss/images/rss-bridge.nix index 205bcc8..8868ba2 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:aa8607f7674b53c89cfd6cb0d8939c464ce96e554bb26982345aeea5fbd7ffcf"; - sha256 = "018p26ni5db87mq0mcm5bg7q8zphaskfqiz6zrg5yb2ir3zplr9b"; + imageDigest = "sha256:43589900367183b47443b1a8a5c5e03132cc1b59d16d80e8399354e768108790"; + sha256 = "18307nbsssn3gs21gmx9m94awdhmgj0d92az79nwnmy2y4mrkmi6"; finalImageName = "rssbridge/rss-bridge"; finalImageTag = "latest"; } diff --git a/devices/nos/modules/arion/immich/images/machine-learning.nix b/devices/nos/modules/arion/immich/images/machine-learning.nix index 7ebb971..2205533 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:9a9d289a5fc894dad1aae6e49c09f39735846cda351e9f74879fcb0601437262"; - sha256 = "1q6kk0ldb9fgycx92hnz5yvz4qilhl9g1xsgn9xxhpxhgsqw9d2i"; + imageDigest = "sha256:612e8856ad92f5915ececd5a67b76b7218f0fe4e41c72fcf1675bee76802294b"; + sha256 = "112c1ab5872xrz9kshyvifx078kb0g5rsq21kzsvk5zkavk1gddz"; finalImageName = "ghcr.io/immich-app/immich-machine-learning"; - finalImageTag = "v1.99.0"; + finalImageTag = "v1.100.0"; } diff --git a/devices/nos/modules/arion/immich/images/server.nix b/devices/nos/modules/arion/immich/images/server.nix index 6400c54..06b2cbf 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:ad7a9828eb25e4f42ad17631bc81408b3fe464c4eec2300742af2e37acb4e8d6"; - sha256 = "0yiyfh70idbyzzy8qdlxqg3vn1wiyn0wx5c8v5vgx3ys65wk2ayd"; + imageDigest = "sha256:d603fd34d587cbf0c99442bb44da395450157d5eb7dec40d2d1d16f2cfdb988b"; + sha256 = "16cn2qms315cka4jqrxyj23qnbl2rrkdilnmfwgqzqfz5mdah44l"; finalImageName = "ghcr.io/immich-app/immich-server"; - finalImageTag = "v1.99.0"; + finalImageTag = "v1.100.0"; } 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 1dece46..5e1a1d0 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 = "lscr.io/linuxserver/calibre-web"; - imageDigest = "sha256:7648a8ad6dff32c7f4feed1db016b2309ba25d1b3edf6da968a1975527c0dd58"; - sha256 = "0hdqr56asmxlywp4psdh5lzcf12nv5400q3jq8iv0vhv6ja4cs49"; + imageDigest = "sha256:167ae839ce5068f83617f698f7565b174c57643372de4dcce69e2d030e19684d"; + sha256 = "1c194bfllpvaknjkym0vcckppz9kim6p5fr1z9ja7wv4w606yhyk"; finalImageName = "lscr.io/linuxserver/calibre-web"; 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 af5e384..be6d98d 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 = "lscr.io/linuxserver/calibre"; - imageDigest = "sha256:c97ee9212dbf30f3ced25eae5fea63d92890134695c5da977b7f19b377b64043"; - sha256 = "0i4lhimxmf23fcvgxml8kdkavg5zxy8b5cabc8xg8a38pn3pz1ax"; + imageDigest = "sha256:64d565ae4792cf366e1a9dc420ecb7aa2408e97f25c6e72f6eacf430daf0f8e6"; + sha256 = "0mib88gjvgjz706bk4hvi5b0qq3avmzllq6b81kmphp8x3alr1zi"; finalImageName = "lscr.io/linuxserver/calibre"; 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 2a58893..67282cc 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:6c10e1133bc42649de220fa9e04e4c7bbe5ba4161a275ac1494f2bfd45417507"; - sha256 = "050fmdkdpg5ixmj62yzgmhipqqdfizpdlqawfx32550622cs9j3a"; + imageDigest = "sha256:122cb0e9104f5b29b48a2578e0ad02ad82c8b8568b8bc5154eb6e360f4e72799"; + sha256 = "0a0qi31l8wff86srs7v46ljfrsslkqdzarnvn20gy6av54ga4yid"; finalImageName = "ghcr.io/linuxserver/radarr"; finalImageTag = "latest"; } diff --git a/devices/nos/modules/arion/media/sonarr/images/sonarr.nix b/devices/nos/modules/arion/media/sonarr/images/sonarr.nix index e7118d4..40184a2 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 = "lscr.io/linuxserver/sonarr"; - imageDigest = "sha256:29fc87e914b8e288651271e2ba304bbdf2b2e7d2b3cbe700345c997d0e90a821"; - sha256 = "1rhw9ymbw8mdrfs5w8pdnd7wnlnw79ajb5wrzbxsrq57wvqk1ns6"; + imageDigest = "sha256:24b7f3f1c9ed065adc3ca7c5440944560b010a38e9bfcb7c1d8e9c965cbc8ea8"; + sha256 = "176561m2l1i7hkzibprm2d6l0l9ckw36zm7r49r099xxnp3fhx9f"; finalImageName = "lscr.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 1cb710f..d4d540e 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:eb73e7f8296e432736ea424c0af899132c6d3dbe090313ba5e3b30f8030cb7ee"; - sha256 = "1r33hv577qh7p11q7l3s6ia1r0ka64d2hg5llcxgx10c6d935ccx"; + imageDigest = "sha256:b08377deee6dbecf2d885c278ff711fb6e63d855d8fad4717056246b928cc9da"; + sha256 = "027w6m8mrf1a92mmp68pgf93fmwgjgh5q007f6ff9nblacqdn4zz"; finalImageName = "nextcloud"; finalImageTag = "fpm"; } diff --git a/flake.lock b/flake.lock index 7f2cb14..fe7aff8 100644 --- a/flake.lock +++ b/flake.lock @@ -86,11 +86,11 @@ ] }, "locked": { - "lastModified": 1711609557, - "narHash": "sha256-178vl76g2UjhS3h6jSsZsIaVueLs5cb8mcP2qehtZrc=", + "lastModified": 1711782383, + "narHash": "sha256-GKPDAZz6OVplc+yxSIsDp++82VQAX2TQCo0+FATwJA4=", "owner": "matt1432", "repo": "nixos-caddy-cloudflare", - "rev": "8cd9a30036f327a20fd97453b8ee63e3666c2536", + "rev": "4f666281dfe4093c4ac39fbf433306063bcf6028", "type": "github" }, "original": { @@ -355,11 +355,11 @@ "gtk-theme-src": { "flake": false, "locked": { - "lastModified": 1711318861, - "narHash": "sha256-ko06fXAMtW2hhV4XaKwsdgBgjs9NynoHZYphhWiHVFQ=", + "lastModified": 1711917158, + "narHash": "sha256-UbipHarnLkCDpUhQOP/uJlXSJ5zHptpNpLPgYwDz+1A=", "owner": "dracula", "repo": "gtk", - "rev": "c54204aa332520ea7054790c7c0717e386ffadd8", + "rev": "c21f12be904fe55336397fc80feb1a8c8216dca2", "type": "github" }, "original": { @@ -435,11 +435,11 @@ ] }, "locked": { - "lastModified": 1711625603, - "narHash": "sha256-W+9dfqA9bqUIBV5u7jaIARAzMe3kTq/Hp2SpSVXKRQw=", + "lastModified": 1711915616, + "narHash": "sha256-co6LoFA+j6BZEeJNSR8nZ4oOort5qYPskjrDHBaJgmo=", "owner": "nix-community", "repo": "home-manager", - "rev": "c0ef0dab55611c676ad7539bf4e41b3ec6fa87d2", + "rev": "820be197ccf3adaad9a8856ef255c13b6cc561a6", "type": "github" }, "original": { @@ -448,26 +448,6 @@ "type": "github" } }, - "hycov": { - "inputs": { - "hyprland": [ - "hyprland" - ] - }, - "locked": { - "lastModified": 1709466277, - "narHash": "sha256-fSujEAViKqQusHyYe7Qg8QnLlyUNOf0/Jk1P70BmiyE=", - "owner": "Ayuei", - "repo": "hycov", - "rev": "db6ea8a24f0a58fa69f86db49d7c853754b1b8e1", - "type": "github" - }, - "original": { - "owner": "Ayuei", - "repo": "hycov", - "type": "github" - } - }, "hyprcursor": { "inputs": { "hyprlang": "hyprlang_2", @@ -549,11 +529,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1711644240, - "narHash": "sha256-QhaQ/wcCk6D5YyG85Bg6hON076mpcVKIfKrL/5iwdAE=", + "lastModified": 1711936967, + "narHash": "sha256-kfP4CujEVYyVLICXk39Ca2PVn/CAdF30jHq8F9DPZ1g=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "d8429eebc66e7091381502edc0fc7335790f62e4", + "rev": "ef7ac53e99c9c443241fd50a38e6edf528df3d7b", "type": "github" }, "original": { @@ -687,11 +667,11 @@ "systems": "systems_7" }, "locked": { - "lastModified": 1711622429, - "narHash": "sha256-JwHbbmAzX1Kfq1XAs06lKbk2TZL7mH/yLczG4BaiuTs=", + "lastModified": 1711884603, + "narHash": "sha256-y1Om75muuJcEoLd/FOYGIZ5/ja/Mc4iBX/9S7vWF0C8=", "owner": "hyprwm", "repo": "hyprlock", - "rev": "7f8c9b6addce5174af78acaf1eb1d726fc4133b5", + "rev": "071ebcefb9070e4397d75103f5f535b58dacf250", "type": "github" }, "original": { @@ -742,11 +722,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1711282133, - "narHash": "sha256-s6z371miAZonduv53LQzjthvNCs4R+oTbv9cRu+iyL8=", + "lastModified": 1711886936, + "narHash": "sha256-D2WENp9GuaCostvNcQ7vElekk0V5cuMdnFZ7NfRhVrQ=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "120535dff702c551ec76a125a181d90131407264", + "rev": "9c06929b83e57c18d125f1105ba6a423f24083d2", "type": "github" }, "original": { @@ -839,11 +819,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1711501815, - "narHash": "sha256-mHtxlnqdIZAPAAXT0em6O5n9yW/6ri937i0NWAvEErU=", + "lastModified": 1711847810, + "narHash": "sha256-gLeUuU3hQ2ErboVIyzDNes2bywdTYDidvi6wG5+tnQ8=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "63ded1ffc0846c259f9cd0f62aa2ea9f7f804f56", + "rev": "4ec1bf4262e913af85e3f699f564769ec2f23cff", "type": "github" }, "original": { @@ -881,11 +861,11 @@ ] }, "locked": { - "lastModified": 1711249705, - "narHash": "sha256-h/NQECj6mIzF4XR6AQoSpkCnwqAM+ol4+qOdYi2ykmQ=", + "lastModified": 1711854532, + "narHash": "sha256-JPStavwlT7TfxxiXHk6Q7sbNxtnXAIjXQJMLO0KB6M0=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "34519f3bb678a5abbddf7b200ac5347263ee781b", + "rev": "2844b5f3ad3b478468151bd101370b9d8ef8a3a7", "type": "github" }, "original": { @@ -1007,11 +987,11 @@ }, "nixpkgs-lib_2": { "locked": { - "lastModified": 1711241261, - "narHash": "sha256-knrTvpl81yGFHIpm1SsLDApe0thFkw1cl3ISAMPmP/0=", + "lastModified": 1711846064, + "narHash": "sha256-cqfX0QJNEnge3a77VnytM0Q6QZZ0DziFXt6tSCV8ZSc=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "b2a1eeef8c185f6bd27432b053ff09d773244cbc", + "rev": "90b1a963ff84dc532db92f678296ff2499a60a87", "type": "github" }, "original": { @@ -1060,11 +1040,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1711638964, - "narHash": "sha256-Hq+bwMi6CoxY3EjdofPofaNUyCudGX1skHhd5i8WWwE=", + "lastModified": 1711889114, + "narHash": "sha256-e3gegueJAWQVrE4SXYh13Uu6tOCjpnagqHiKOQ7B31c=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "cbc0374fda9a08bb9386cc2791a5dd39ed990818", + "rev": "8c4df2153c615554b516ba698f5f7bd64f7bf520", "type": "github" }, "original": { @@ -1075,11 +1055,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1711200738, - "narHash": "sha256-dkJmk/ET/tRV4007O6kU101UEg1svUwiyk/zEEX9Tdg=", + "lastModified": 1711715736, + "narHash": "sha256-9slQ609YqT9bT/MNX9+5k5jltL9zgpn36DpFB7TkttM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "20bc93ca7b2158ebc99b8cef987a2173a81cde35", + "rev": "807c549feabce7eddbf259dbdcec9e0600a0660d", "type": "github" }, "original": { @@ -1107,11 +1087,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1711523803, - "narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=", + "lastModified": 1711703276, + "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2726f127c15a4cc9810843b96cad73c7eb39e443", + "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", "type": "github" }, "original": { @@ -1139,11 +1119,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1711523803, - "narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=", + "lastModified": 1711703276, + "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2726f127c15a4cc9810843b96cad73c7eb39e443", + "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", "type": "github" }, "original": { @@ -1261,11 +1241,11 @@ }, "nur": { "locked": { - "lastModified": 1711644301, - "narHash": "sha256-D/jn9ZbiAdOdQtUXkYRRQ1IebzwPajMBw3UVFeFi+l4=", + "lastModified": 1711936474, + "narHash": "sha256-YlaNwbY/J9NuOEXIP0q79UwXUHa0NLaCh2dQlU32IvE=", "owner": "nix-community", "repo": "NUR", - "rev": "b042f04b3c95e96b2125f3f691657d6469237c47", + "rev": "e8898635343424f8c9de3142ec9b22e3b586af6c", "type": "github" }, "original": { @@ -1491,7 +1471,6 @@ "gtk-theme-src": "gtk-theme-src", "headscale": "headscale", "home-manager": "home-manager", - "hycov": "hycov", "hyprgrass": "hyprgrass", "hypridle": "hypridle", "hyprland": "hyprland", diff --git a/flake.nix b/flake.nix index da2226d..098e2cc 100644 --- a/flake.nix +++ b/flake.nix @@ -242,14 +242,6 @@ inputs.hyprland.follows = "hyprland"; }; - hycov = { - type = "github"; - owner = "Ayuei"; - repo = "hycov"; - - inputs.hyprland.follows = "hyprland"; - }; - ags = { type = "github"; owner = "Aylur"; diff --git a/modules/hyprland/default.nix b/modules/hyprland/default.nix index f9c7633..acff7f7 100644 --- a/modules/hyprland/default.nix +++ b/modules/hyprland/default.nix @@ -26,12 +26,6 @@ in { NIXOS_OZONE_WL = "1"; }; - environment.systemPackages = with pkgs; [ - # Needed for hycov fork - gcc - pciutils - ]; - services = { dbus.enable = true; gvfs.enable = true; @@ -60,7 +54,6 @@ in { # HOME-MANAGER CONFIG home-manager.users.${mainUser} = { imports = [ - ./hycov.nix ./hyprgrass.nix ./inputs.nix ./style.nix diff --git a/modules/hyprland/hycov.nix b/modules/hyprland/hycov.nix deleted file mode 100644 index eea9751..0000000 --- a/modules/hyprland/hycov.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - hycov, - pkgs, - ... -}: { - wayland.windowManager.hyprland = { - plugins = [hycov.packages.${pkgs.system}.hycov]; - - settings = { - plugin = { - hycov = { - enable_alt_release_exit = 1; - overview_gappo = 60; #gaps width from screen - overview_gappi = 24; #gaps width from clients - enable_hotarea = 0; - }; - }; - - bind = [ - "ALT, tab, hycov:toggleoverview" - "ALT, left, hycov:movefocus, l" - "ALT, right, hycov:movefocus, r" - "ALT, up, hycov:movefocus, u" - "ALT, down, hycov:movefocus, d" - ]; - }; - }; -}