From 691faaaec31e68459f14e7ec4e8da99d75376d9d Mon Sep 17 00:00:00 2001 From: matt1432 Date: Tue, 7 May 2024 22:50:49 -0400 Subject: [PATCH] chore: update flake.lock --- .../arion/freshrss/images/rss-bridge.nix | 4 +- .../arion/homepage/images/homepage.nix | 4 +- .../arion/media/bazarr/images/bazarr.nix | 4 +- .../media/calibre/images/calibre-web.nix | 4 +- .../arion/media/radarr/images/radarr.nix | 4 +- .../modules/arion/nextcloud/images/nginx.nix | 4 +- flake.lock | 249 +++++++++--------- flake.nix | 30 ++- .../addons/generated-firefox-addons.nix | 14 +- modules/hyprland/Hyprspace.nix | 19 ++ modules/hyprland/default.nix | 4 +- modules/hyprland/security.nix | 6 +- 12 files changed, 184 insertions(+), 162 deletions(-) create mode 100644 modules/hyprland/Hyprspace.nix diff --git a/devices/nos/modules/arion/freshrss/images/rss-bridge.nix b/devices/nos/modules/arion/freshrss/images/rss-bridge.nix index 3a53b73..b31910c 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:fd198aab959659481fc750d7f8b1467230cf689c573949a1ae328715e7d2e7db"; - sha256 = "0jh0qy6r01xqw7dyqyqhby62m1qz0w679gmvbp6a22cn3akdhjyn"; + imageDigest = "sha256:d8dd829020077349eb96403677e21a9eb5930595aa5c419720f6c8148528bdcf"; + sha256 = "1h8jxhsbs0m5jfnznb2jd3zy14g3vjy5iy026r6g6ggxkiw0hrpp"; 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 ffeef21..6a2ccc2 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:ad5a8edea1c25b50c6d180d35f72c1623986335113457c4ba38e1ddf16816a4b"; - sha256 = "1j3l7ap7d9a49p421i1h08bp1p772dnddijk2c8s66v3527szyp9"; + imageDigest = "sha256:43a3ee88abe3b37c64bc52ea93da01c3dcb4a332a953bcd7f438c8d7328d3947"; + sha256 = "0gg2yn5yhd8l0misq8avnr765rxci0hy2ml3lw7jq7fkwsc4pw6s"; 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 9ad4414..72eaf7b 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:2c9269dd25c62d46e679a035849f32e963152ec44000e30f008d211a2f70e80c"; - sha256 = "14ljv9jcczhdd5pzdyvmf6zs57bikhrbqi6vwpgjdg5dyka3ikc5"; + imageDigest = "sha256:081575bb4b4936b3dd9fce9bd5bcb7a9140e9b072bada4115b45b0db11daa913"; + sha256 = "0b80g9g0hlhxz1dv5jm71rik5c95xqm5bnpvbagjv68q0ryi04xz"; finalImageName = "ghcr.io/linuxserver/bazarr"; 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 6128526..4e8cb8a 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:33ddda92b3f02bbd38a452b44f7343da25ada4c374fbac50c656bc04b995d93f"; - sha256 = "1qylqqbngqxsl87jr7ks9pnkjnchy7jinkdc3y5ch7vxrml1919r"; + imageDigest = "sha256:96a7940ff83386017ab42942220312e2c1ddc88245f320d3696f2683e58ebb0e"; + sha256 = "0nzy0y6s8s8jcfidni8b49464jayfn9k781ipbzspk6xcrnibksf"; 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 cbd7637..bb80fb0 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:e6bccb9bd69f3dba111716c6789152d5577217adc27f8f96642e511defaefbb6"; - sha256 = "1j5svym7s6b83w6pf12bm0fa3vx10hx47hhfk9ywvji1nz4zj429"; + imageDigest = "sha256:1c2f2abbabd19c47549a4e7c3315402a3a4c37f141ba56cef3395ec6b292a015"; + sha256 = "0hw44rn2b7kxnd56h3h12ynvbi849pb8hr7i69fmj6skrgpm5gw3"; finalImageName = "ghcr.io/linuxserver/radarr"; finalImageTag = "latest"; } diff --git a/devices/nos/modules/arion/nextcloud/images/nginx.nix b/devices/nos/modules/arion/nextcloud/images/nginx.nix index b336c0a..476549a 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:ed6d2c43c8fbcd3eaa44c9dab6d94cb346234476230dc1681227aa72d07181ee"; - sha256 = "1rigpillcwf3jy3isidva008r0ix2cl14fwz2pi2nm6hm8wjqaw6"; + imageDigest = "sha256:32e76d4f34f80e479964a0fbd4c5b4f6967b5322c8d004e9cf0cb81c93510766"; + sha256 = "0chbi30iwgsb5ahnhwcmk40wckpyiskmk6xdmf3i7bmx876b7mnk"; finalImageName = "nginx"; finalImageTag = "latest"; } diff --git a/flake.lock b/flake.lock index 53e5b26..859bae7 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,25 @@ { "nodes": { + "Hyprspace": { + "inputs": { + "hyprland": [ + "hyprland" + ] + }, + "locked": { + "lastModified": 1714860465, + "narHash": "sha256-yFR9gBqvuvN5eYjeV3/luZcWGQL/bDU04XWgW+H8RY4=", + "owner": "KZDKM", + "repo": "Hyprspace", + "rev": "1b3e07c7ac9ecb4e3486467a2bfb3267ee5043a2", + "type": "github" + }, + "original": { + "owner": "KZDKM", + "repo": "Hyprspace", + "type": "github" + } + }, "ags": { "inputs": { "nixpkgs": [ @@ -7,11 +27,11 @@ ] }, "locked": { - "lastModified": 1714402202, - "narHash": "sha256-Ga7MdGc1CA+WwLB7xAEbuzXzGtEM2346kUDvq8ymgJc=", + "lastModified": 1714991158, + "narHash": "sha256-QRtQD3YqbambczxavUUkRv7iGxoJ1J6e6mD20mZv3a4=", "owner": "Aylur", "repo": "ags", - "rev": "bb91f7c8fdd2f51c79d3af3f2881cacbdff19f60", + "rev": "05e0f23534fa30c1db2a142664ee8f71e38db260", "type": "github" }, "original": { @@ -30,11 +50,11 @@ ] }, "locked": { - "lastModified": 1714329018, - "narHash": "sha256-q0vsfqjYB0Phx4HoykT2HwRZDuxFwaRI9SQeEDbqZkU=", + "lastModified": 1714877287, + "narHash": "sha256-mf1/RfkyhzwLLeqU8AdosbBfRQuQzuVMX7XL7GejoRI=", "owner": "hercules-ci", "repo": "arion", - "rev": "efa008e12f590eea1a3e7f2088877dc9bdcc54b7", + "rev": "e9945eb6cdaf5c946bacd5a330e7b5ac7b3b2fdd", "type": "github" }, "original": { @@ -86,11 +106,11 @@ ] }, "locked": { - "lastModified": 1714719959, - "narHash": "sha256-gTAgC3cIg4ZQsdrYQTwo7c63qcy+YZNLWWO+KFl//BU=", + "lastModified": 1714979186, + "narHash": "sha256-QXy4VM9MQ3KfOKXFmPIgi/OWhIMaY5wtQilp0XEeUYg=", "owner": "matt1432", "repo": "nixos-caddy-cloudflare", - "rev": "3b27039bb3e27ca3e7835a2d4648493fa21a457f", + "rev": "7bb18a2e12228b1c16f28cf50d0eea002a993e47", "type": "github" }, "original": { @@ -192,11 +212,11 @@ ] }, "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "lastModified": 1714641030, + "narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e", "type": "github" }, "original": { @@ -214,11 +234,11 @@ ] }, "locked": { - "lastModified": 1709336216, - "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", "type": "github" }, "original": { @@ -270,11 +290,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "lastModified": 1714641030, + "narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e", "type": "github" }, "original": { @@ -411,11 +431,11 @@ "gpu-screen-recorder-src": { "flake": false, "locked": { - "lastModified": 1714173938, - "narHash": "sha256-1PULc1djvATCoXn6jZRJqbE8RtEYEUHFhNMj738Hsd4=", + "lastModified": 1715118614, + "narHash": "sha256-GkirI8bF9Tn18h5HnYHv9O2ic4nNliTaIGP+8djk1lM=", "ref": "refs/heads/master", - "rev": "3143358c3bfc882fb94c1ea906630fc0aa7fd061", - "revCount": 575, + "rev": "447b5d0f0ba9ea34b90acd8d6e23005f15f1c242", + "revCount": 578, "type": "git", "url": "https://repo.dec05eba.com/gpu-screen-recorder" }, @@ -527,11 +547,11 @@ ] }, "locked": { - "lastModified": 1710478346, - "narHash": "sha256-Xjf8BdnQG0tLhPMlqQdwCIjOp7Teox0DP3N/jjyiGM4=", + "lastModified": 1713898448, + "narHash": "sha256-6q6ojsp/Z9P2goqnxyfCSzFOD92T3Uobmj8oVAicUOs=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "64e7763d72c1e4c1e5e6472640615b6ae2d40fbf", + "rev": "c0302ec12d569532a6b6bd218f698bc402e93adc", "type": "github" }, "original": { @@ -547,11 +567,11 @@ ] }, "locked": { - "lastModified": 1714865296, - "narHash": "sha256-02r2Qzh4fGYBPB/3Lj8vwPMtE6H/UchZnN7A/dQMHIA=", + "lastModified": 1715077503, + "narHash": "sha256-AfHQshzLQfUqk/efMtdebHaQHqVntCMjhymQzVFLes0=", "owner": "nix-community", "repo": "home-manager", - "rev": "e0825ea2112d09d9f0680833cd716f6aee3b973f", + "rev": "6e277d9566de9976f47228dd8c580b97488734d4", "type": "github" }, "original": { @@ -572,11 +592,11 @@ ] }, "locked": { - "lastModified": 1714862850, - "narHash": "sha256-j1DPSl7FMy3JeWpmzXxcmZhxXbIOfteTozSfqtZ7KBQ=", + "lastModified": 1714916173, + "narHash": "sha256-XP9v42PdSBkP/JlllfZR/0FDD1PMAVqw+LhOi79g0MA=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "fd133914bf1921db2a26627698f914478f6a9471", + "rev": "d716d1221348b5bef9d13161876caa91a3e33705", "type": "github" }, "original": { @@ -639,47 +659,49 @@ "hyprland": { "inputs": { "hyprcursor": "hyprcursor", - "hyprland-protocols": "hyprland-protocols", "hyprlang": "hyprlang_2", "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": [ "nixpkgs" ], "systems": "systems_5", - "wlroots": "wlroots", "xdph": "xdph" }, "locked": { - "lastModified": 1714867666, - "narHash": "sha256-Xe7DtgMrb2onuoEDZ+/z/jb6HNof9ZfV203TQk5c/cI=", - "owner": "hyprwm", - "repo": "Hyprland", - "rev": "09ed6910552c7e898d629191e63c8997443eb202", - "type": "github" + "lastModified": 1715128282, + "narHash": "sha256-SUYCEWNeNb7nm1od5Xtcu0dXaG3NlFnpXyuX3hh3MsY=", + "ref": "refs/heads/main", + "rev": "5e7925eaeba474cfc283e26b7aa3426ec97424f7", + "revCount": 4633, + "submodules": true, + "type": "git", + "url": "https://github.com/hyprwm/Hyprland" }, "original": { - "owner": "hyprwm", - "repo": "Hyprland", - "type": "github" + "submodules": true, + "type": "git", + "url": "https://github.com/hyprwm/Hyprland" } }, "hyprland-protocols": { "inputs": { "nixpkgs": [ "hyprland", + "xdph", "nixpkgs" ], "systems": [ "hyprland", + "xdph", "systems" ] }, "locked": { - "lastModified": 1691753796, - "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=", + "lastModified": 1714869498, + "narHash": "sha256-vbLVOWvQqo4n1yvkg/Q70VTlPbMmTiCQfNTgcWDCfJM=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03", + "rev": "e06482e0e611130cd1929f75e8c1cf679e57d161", "type": "github" }, "original": { @@ -747,11 +769,11 @@ ] }, "locked": { - "lastModified": 1714755542, - "narHash": "sha256-D0pg+ZRwrt4lavZ97Ca8clsgbPA3duLj8iEM7riaIFY=", + "lastModified": 1715090986, + "narHash": "sha256-FXpQvmS9R7alwZ47XK5UIcAbC9YKSxc0+GOVYqwa0jM=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "1270ebaa539e56d61b708c24b072b09cbbd3a828", + "rev": "94e32ec37e7215b16d5c1b41b1773ff6742e704b", "type": "github" }, "original": { @@ -802,11 +824,11 @@ "nixpkgs-lib": "nixpkgs-lib_4" }, "locked": { - "lastModified": 1714306226, - "narHash": "sha256-CA7bfnDt9TcFc7I8eKHf72DodYUEETDPgmBFXBRP9/E=", + "lastModified": 1714910950, + "narHash": "sha256-gaq5bphSsY+htEXFDkImOrH3MVCkxFTvCiwdCJj096E=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "49d9b510614b9bd137e067eb31445a8feca83313", + "rev": "26fabca301e1133abd3d9192b1bcb6fb45b30f1d", "type": "github" }, "original": { @@ -852,11 +874,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1714557650, - "narHash": "sha256-N1qTL5wIlbbX7DorBaKOMYfz+gYoyf8LREMWVlOXNYc=", + "lastModified": 1714905986, + "narHash": "sha256-Vj7iFkLrd7MDeeMVVol5uHTcaLwDq4a3vNx+6Sy1FLU=", "owner": "viperML", "repo": "nh", - "rev": "e4eb011975bee4c3f47199cc01d2d986e24851bd", + "rev": "127a23c82aa41091e97466092d2547c08c2a9a9d", "type": "github" }, "original": { @@ -960,11 +982,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1714303849, - "narHash": "sha256-o/IgiwA0ZS/nMh5YB0bt+ae3Lt+tlbQouY/xL7tB5h0=", + "lastModified": 1714872073, + "narHash": "sha256-Gybo6MqJ2tva9vMaSxOgie8uVObiP0LxD2FMokiR0X4=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "dbb96ae98e723128cf5a612480ba6187113f5e49", + "rev": "b85b9c3afa1bfee0150580eb76c52e572a85a6a9", "type": "github" }, "original": { @@ -1023,11 +1045,11 @@ ] }, "locked": { - "lastModified": 1714273701, - "narHash": "sha256-bmoeZ5zMSSO/e8P51yjrzaxA9uzA3SZAEFvih6S3LFo=", + "lastModified": 1714878592, + "narHash": "sha256-E68C03sYRsYFsK7wiGHUIJm8IsyPRALOrFoTL0glXnI=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "941c4973c824509e0356be455d89613611f76c8a", + "rev": "a362555e9dbd4ecff3bb98969bbdb8f79fe87f10", "type": "github" }, "original": { @@ -1163,20 +1185,14 @@ }, "nixpkgs-lib_2": { "locked": { - "dir": "lib", - "lastModified": 1711703276, - "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", - "type": "github" + "lastModified": 1714640452, + "narHash": "sha256-QBx10+k6JWz6u7VsohfSw8g8hjdBZEf8CFzXH1/1Z94=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz" }, "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz" } }, "nixpkgs-lib_3": { @@ -1199,11 +1215,11 @@ }, "nixpkgs-lib_4": { "locked": { - "lastModified": 1714265296, - "narHash": "sha256-jVnKiCOoFulPT1zDdA4jfG/lnEnngdth5CT6rVDXEJ4=", + "lastModified": 1714870069, + "narHash": "sha256-CNCqCGOHdxuiVnVkhTpp2WcqSSmSfeQjubhDOcgwGjU=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "ade4fb7bbf04cd52bc1705734d5dc67755d77ec9", + "rev": "4b620020fd73bdd5104e32c702e65b60b6869426", "type": "github" }, "original": { @@ -1230,11 +1246,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1713638189, - "narHash": "sha256-q7APLfB6FmmSMI1Su5ihW9IwntBsk2hWNXh8XtSdSIk=", + "lastModified": 1714858427, + "narHash": "sha256-tCxeDP4C1pWe2rYY3IIhdA40Ujz32Ufd4tcrHPSKx2M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "74574c38577914733b4f7a775dd77d24245081dd", + "rev": "b980b91038fc4b09067ef97bbe5ad07eecca1e76", "type": "github" }, "original": { @@ -1252,11 +1268,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1714864555, - "narHash": "sha256-aJZN9gkqoIynucUGdX7eNADAdYl32LLcuJ6cummZhiI=", + "lastModified": 1715102082, + "narHash": "sha256-aw6C78KrGQA38DD5RGTO+hWGTH0Mjr+RP+k+Nbenqys=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "0ae270975bd07b4dda3ae219098a97621f7dfc69", + "rev": "e191400a7427dbde2ef3168d35ec9c5e98ef30d9", "type": "github" }, "original": { @@ -1267,11 +1283,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1714213793, - "narHash": "sha256-Yg5D5LhyAZvd3DZrQQfJAVK8K3TkUYKooFtH1ulM0mw=", + "lastModified": 1714809261, + "narHash": "sha256-hfBmnYFyz9I1mdrC3tX1A+dF9cOUcds5PIMPxrT+cRk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d6f6eb2a984f2ba9a366c31e4d36d65465683450", + "rev": "d32560238207b8e26d88b265207b216ee46b8450", "type": "github" }, "original": { @@ -1315,11 +1331,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1714635257, - "narHash": "sha256-4cPymbty65RvF1DWQfc+Bc8B233A1BWxJnNULJKQ1EY=", + "lastModified": 1714906307, + "narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "63c3a29ca82437c87573e4c6919b09a24ea61b0f", + "rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588", "type": "github" }, "original": { @@ -1347,11 +1363,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1714635257, - "narHash": "sha256-4cPymbty65RvF1DWQfc+Bc8B233A1BWxJnNULJKQ1EY=", + "lastModified": 1714906307, + "narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "63c3a29ca82437c87573e4c6919b09a24ea61b0f", + "rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588", "type": "github" }, "original": { @@ -1379,11 +1395,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1713895582, - "narHash": "sha256-cfh1hi+6muQMbi9acOlju3V1gl8BEaZBXBR9jQfQi4U=", + "lastModified": 1714906307, + "narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "572af610f6151fd41c212f897c71f7056e3fb518", + "rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588", "type": "github" }, "original": { @@ -1469,11 +1485,11 @@ }, "nur": { "locked": { - "lastModified": 1714866376, - "narHash": "sha256-TNHj9ARs7ny3l7pubZO4/9r4wPpZZiKIUrBobLB35is=", + "lastModified": 1715131722, + "narHash": "sha256-7istppM5PlG5HxR90q9juyEQA7i1N4n0wmS7MnvicTA=", "owner": "nix-community", "repo": "NUR", - "rev": "059f6c2bf1f8b8ee1789f2692c2be200514d29b8", + "rev": "0d8ac10a6c0da55fddc5c32806254453ed3b7b03", "type": "github" }, "original": { @@ -1535,11 +1551,11 @@ "pcs-src": { "flake": false, "locked": { - "lastModified": 1713971772, - "narHash": "sha256-fWNDQ6sSkIgikEPrdtkCeFCY4yOaQSWgjcvhldHynM4=", + "lastModified": 1714737780, + "narHash": "sha256-SJjFZeDTAVQRci699ZQBE5nJ5RVP93iomLu5pcTYg24=", "owner": "ClusterLabs", "repo": "pcs", - "rev": "6b7a9c42427fde36366e1fc13b46e4348592d468", + "rev": "17a4573d628f4d8beffa059b368fb194b400e5a3", "type": "github" }, "original": { @@ -1573,11 +1589,11 @@ "pyagentx-src": "pyagentx-src" }, "locked": { - "lastModified": 1714057416, - "narHash": "sha256-UDo/dhC4KTksUBnnafQwwIY6lQJNifprdY0XT4+8I10=", + "lastModified": 1715017485, + "narHash": "sha256-CPAXbwWv6DnKZaZ7MRa37VEGZCkIGRIhAaUoX0mghvY=", "owner": "matt1432", "repo": "nixos-pcsd", - "rev": "63d6139bfdd58f080bcd8f48663574b3dcc11184", + "rev": "a32172b2348acf5a5e8425477dd7f845e572ffde", "type": "github" }, "original": { @@ -1702,6 +1718,7 @@ }, "root": { "inputs": { + "Hyprspace": "Hyprspace", "ags": "ags", "arion": "arion", "astal": "astal", @@ -1803,11 +1820,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1713892811, - "narHash": "sha256-uIGmA2xq41vVFETCF1WW4fFWFT2tqBln+aXnWrvjGRE=", + "lastModified": 1715035358, + "narHash": "sha256-RY6kqhpCPa/q3vbqt3iYRyjO3hJz9KZnshMjbpPon8o=", "owner": "Mic92", "repo": "sops-nix", - "rev": "f1b0adc27265274e3b0c9b872a8f476a098679bd", + "rev": "893e3df091f6838f4f9d71c61ab079d5c5dedbd1", "type": "github" }, "original": { @@ -2073,23 +2090,6 @@ "type": "github" } }, - "wlroots": { - "flake": false, - "locked": { - "lastModified": 1713731601, - "narHash": "sha256-bdcKdtLkusvv85DNuJsajZLFeq7bXp+x5AGP1Sd4wD8=", - "owner": "hyprwm", - "repo": "wlroots-hyprland", - "rev": "5c1d51c5a2793480f5b6c4341ad0797052aec2ea", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "wlroots-hyprland", - "rev": "5c1d51c5a2793480f5b6c4341ad0797052aec2ea", - "type": "github" - } - }, "wpaperd": { "inputs": { "nixpkgs": [ @@ -2113,10 +2113,7 @@ }, "xdph": { "inputs": { - "hyprland-protocols": [ - "hyprland", - "hyprland-protocols" - ], + "hyprland-protocols": "hyprland-protocols", "hyprlang": [ "hyprland", "hyprlang" diff --git a/flake.nix b/flake.nix index 7ea9899..3176c6c 100644 --- a/flake.nix +++ b/flake.nix @@ -256,17 +256,9 @@ # Desktop inputs ## Hyprland hyprland = { - type = "github"; - owner = "hyprwm"; - repo = "Hyprland"; - - inputs.nixpkgs.follows = "nixpkgs"; - }; - - hypridle = { - type = "github"; - owner = "hyprwm"; - repo = "hypridle"; + type = "git"; + url = "https://github.com/hyprwm/Hyprland"; + submodules = true; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -279,6 +271,22 @@ inputs.hyprland.follows = "hyprland"; }; + Hyprspace = { + type = "github"; + owner = "KZDKM"; + repo = "Hyprspace"; + + inputs.hyprland.follows = "hyprland"; + }; + + hypridle = { + type = "github"; + owner = "hyprwm"; + repo = "hypridle"; + + inputs.nixpkgs.follows = "nixpkgs"; + }; + grim-hyprland = { type = "github"; owner = "eriedaberrie"; diff --git a/home/firefox/addons/generated-firefox-addons.nix b/home/firefox/addons/generated-firefox-addons.nix index 12038b0..400023a 100644 --- a/home/firefox/addons/generated-firefox-addons.nix +++ b/home/firefox/addons/generated-firefox-addons.nix @@ -50,13 +50,13 @@ }; "floccus" = buildFirefoxXpiAddon { pname = "floccus"; - version = "5.0.10"; + version = "5.1.0"; addonId = "floccus@handmadeideas.org"; - url = "https://addons.mozilla.org/firefox/downloads/file/4247541/floccus-5.0.10.xpi"; - sha256 = "8e8ef6e0737df84405c98bf902b1d4b4ffaff743aa880e9205759c8c16dac236"; + url = "https://addons.mozilla.org/firefox/downloads/file/4282487/floccus-5.1.0.xpi"; + sha256 = "21ed631b1597f05087b13bb171ccd38091171fdc9e5fc9ed16d4d37f700f03b5"; meta = with lib; { homepage = "https://floccus.org"; - description = "Sync your bookmarks across browsers via Nextcloud, WebDAV or Google Drive"; + description = "Sync your bookmarks and tabs across browsers via Nextcloud, any WebDAV service, any Git service, via a local file, via Google Drive."; license = licenses.mpl20; mozPermissions = [ "*://*/*" @@ -108,10 +108,10 @@ }; "ttv-lol-pro" = buildFirefoxXpiAddon { pname = "ttv-lol-pro"; - version = "2.3.6"; + version = "2.3.7"; addonId = "{76ef94a4-e3d0-4c6f-961a-d38a429a332b}"; - url = "https://addons.mozilla.org/firefox/downloads/file/4252535/ttv_lol_pro-2.3.6.xpi"; - sha256 = "5d9a5f4b4b4d46a39e9d6c9df28fc1d342a1af6d6389196c9c1bd0006036a647"; + url = "https://addons.mozilla.org/firefox/downloads/file/4280177/ttv_lol_pro-2.3.7.xpi"; + sha256 = "2e71c1fa3f5108cf77b1ca8b5a32955584be893ae151a27cd32d10073ae56820"; meta = with lib; { homepage = "https://github.com/younesaassila/ttv-lol-pro"; description = "TTV LOL PRO removes most livestream ads from Twitch."; diff --git a/modules/hyprland/Hyprspace.nix b/modules/hyprland/Hyprspace.nix new file mode 100644 index 0000000..ae71fb1 --- /dev/null +++ b/modules/hyprland/Hyprspace.nix @@ -0,0 +1,19 @@ +{ + Hyprspace, + pkgs, + ... +}: { + wayland.windowManager.hyprland = { + plugins = [ + (Hyprspace.packages.${pkgs.system}.Hyprspace.overrideAttrs { + dontUseCmakeConfigure = true; + }) + ]; + + settings = { + bind = [ + "ALT, tab, overview:toggle" + ]; + }; + }; +} diff --git a/modules/hyprland/default.nix b/modules/hyprland/default.nix index 7bd8c8e..05e899e 100644 --- a/modules/hyprland/default.nix +++ b/modules/hyprland/default.nix @@ -61,7 +61,9 @@ in { # HOME-MANAGER CONFIG home-manager.users.${mainUser} = { imports = [ - ./hyprexpo.nix + # FIXME: plugins broken https://github.com/hyprwm/hyprland-plugins/issues/164 + # ./hyprexpo.nix + # ./Hyprspace.nix ./inputs.nix ./style.nix ]; diff --git a/modules/hyprland/security.nix b/modules/hyprland/security.nix index 6ec81db..a9b0479 100644 --- a/modules/hyprland/security.nix +++ b/modules/hyprland/security.nix @@ -29,10 +29,6 @@ in { ''; }; in { - imports = [ - hypridle.homeManagerModules.default - ]; - home.packages = [ pkgs.gnome.seahorse lockPkg @@ -40,7 +36,7 @@ in { services.hypridle = mkIf isLaptop { enable = true; - lockCmd = "${lockPkg}/bin/lock"; + settings.lockCmd = "${lockPkg}/bin/lock"; }; wayland.windowManager.hyprland = {