diff --git a/devices/nos/modules/arion/forgejo/images/postgres.nix b/devices/nos/modules/arion/forgejo/images/postgres.nix index 6cc17c21..2fb8084c 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:2f7365d1f574dba34f6332978169afe60af9de9608fffbbfecb7d04cc5233698"; - sha256 = "07v1r0ijag2kyr9nk5l7kphgvrb6lk71zyab4i31rkl1k27vfhwg"; + imageDigest = "sha256:0c9b69b804edbfd211b8cdfc87ac4c79db52dbcc8fb8c278d07136db2f79fe6c"; + sha256 = "0rsqcxqx77r4z8xw15sqydp1r2mz129r36c7p43vjv6p2cxyl8sg"; 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 6cc17c21..2fb8084c 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:2f7365d1f574dba34f6332978169afe60af9de9608fffbbfecb7d04cc5233698"; - sha256 = "07v1r0ijag2kyr9nk5l7kphgvrb6lk71zyab4i31rkl1k27vfhwg"; + imageDigest = "sha256:0c9b69b804edbfd211b8cdfc87ac4c79db52dbcc8fb8c278d07136db2f79fe6c"; + sha256 = "0rsqcxqx77r4z8xw15sqydp1r2mz129r36c7p43vjv6p2cxyl8sg"; finalImageName = "postgres"; finalImageTag = "14"; } diff --git a/devices/nos/modules/arion/nextcloud/images/nextcloud.nix b/devices/nos/modules/arion/nextcloud/images/nextcloud.nix index f473fc6d..19ee188e 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:d2dc74b2ce5fc6b06e1bf454320bb6388817757b41314a0214af4eac278a3c42"; - sha256 = "0l5325msrbgzi5zhr9yjbvpnfn8i7p4nbiigbviriq1wsl24rkmw"; + imageDigest = "sha256:dd4306e19bb2992246f837e50541b7baf010f47954e3afcf65cafd10657f365d"; + sha256 = "08izk4al6x280bf57k0ybsdxn02w5s12qhv1avqagk4fl03lnask"; finalImageName = "nextcloud"; - finalImageTag = "29.0.3-fpm"; + finalImageTag = "29.0.4-fpm"; } diff --git a/devices/nos/modules/arion/nextcloud/images/nginx.nix b/devices/nos/modules/arion/nextcloud/images/nginx.nix index fc6aff36..750338d8 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:67682bda769fae1ccf5183192b8daf37b64cae99c6c3302650f6f8bf5f0f95df"; - sha256 = "17l0zpn8f8s25dwqkbm9ak9xbkz5czpfsnwvhdm7ykq52kxpxs5x"; + imageDigest = "sha256:05ab1728068284cbd42d54554fa2b69a3d6334adafccf2e70cf20925d7d55e90"; + sha256 = "0i2q2aaa8qn5zgvil9gbyvj6yazprvgi6z23jp0xaskkpm24qvfy"; finalImageName = "nginx"; finalImageTag = "latest"; } diff --git a/devices/nos/modules/arion/resume/images/postgres.nix b/devices/nos/modules/arion/resume/images/postgres.nix index 03e81158..b28ed4cc 100644 --- a/devices/nos/modules/arion/resume/images/postgres.nix +++ b/devices/nos/modules/arion/resume/images/postgres.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "postgres"; - imageDigest = "sha256:ede3a168dae0d2154440c2b1b2c7773201bfa969d85a1859c44b6f4ab2df0ef7"; - sha256 = "0g5qdcg07zcspicrcppi1kj9jxk528hqx7k6hjhlg53vy3g6pjyj"; + imageDigest = "sha256:d98d4ee225766374077e2d689a4a20be9195c0c112dfc36ff9b54701d279e221"; + sha256 = "1pg0rwqyzlhrik4x4bkx416qb034xrd0nmsckqd9w6ncsmppibvm"; finalImageName = "postgres"; finalImageTag = "15-alpine"; } diff --git a/flake.lock b/flake.lock index 66945f55..2796cf69 100644 --- a/flake.lock +++ b/flake.lock @@ -57,6 +57,39 @@ "type": "github" } }, + "aquamarine": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "hyprwayland-scanner": [ + "hyprland", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1721571743, + "narHash": "sha256-hat7wggtDISBJD8kTo5MTrT+IsY/Ha2MwgjmqqijoCA=", + "owner": "hyprwm", + "repo": "aquamarine", + "rev": "601f6cf95cbe4fef02dc7faf34bba58566c914e9", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "aquamarine", + "type": "github" + } + }, "arion": { "inputs": { "flake-parts": "flake-parts", @@ -200,11 +233,11 @@ ] }, "locked": { - "lastModified": 1721459227, - "narHash": "sha256-xSFCMxadYk11pyV44Q4oIkiO6rVG1ASdoHwVjjzYGl0=", + "lastModified": 1721718405, + "narHash": "sha256-aKOSEIXF16nOjiCNNXV448SBdybAcXs5NtxfZxFCOHY=", "owner": "matt1432", "repo": "discord-nightly-overlay", - "rev": "d558ffa852e79ce2c8168aa97da087cea8583fdb", + "rev": "02c87d457a5cd7c6bf4d906654210ebd6cd79e63", "type": "github" }, "original": { @@ -683,11 +716,11 @@ "gpu-screen-recorder-src": { "flake": false, "locked": { - "lastModified": 1721692206, - "narHash": "sha256-DSbvCvlHC69ir0MGzmvbyrcDpYtkWuPQ4AeZTUI5wMo=", + "lastModified": 1721751098, + "narHash": "sha256-8VZz7lekJDlFSpMJjxqOcgkExTo0cqNQdUtd3x4hK+k=", "ref": "refs/heads/master", - "rev": "da73b3ac6346105ad8404874b8bb54c846d4f54e", - "revCount": 689, + "rev": "7d719a44c6ce76ecfc05287d0cbb2b36e84b4ca6", + "revCount": 694, "type": "git", "url": "https://repo.dec05eba.com/gpu-screen-recorder" }, @@ -841,11 +874,11 @@ ] }, "locked": { - "lastModified": 1721534365, - "narHash": "sha256-XpZOkaSJKdOsz1wU6JfO59Rx2fqtcarQ0y6ndIOKNpI=", + "lastModified": 1721714663, + "narHash": "sha256-ZDW5+rlROxaOuoEfIQM7Gqhoa+WALEYdYIiZhyJjAu0=", "owner": "nix-community", "repo": "home-manager", - "rev": "635563f245309ef5320f80c7ebcb89b2398d2949", + "rev": "7560dc942a6fbd37ebd1310b3dbda513de2d4b82", "type": "github" }, "original": { @@ -926,6 +959,7 @@ }, "hyprland": { "inputs": { + "aquamarine": "aquamarine", "hyprcursor": "hyprcursor", "hyprlang": "hyprlang", "hyprutils": "hyprutils", @@ -937,17 +971,16 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1721463092, - "narHash": "sha256-P86aiF7iFAc5sAWL3nXf0XRfhXDAudHpmCh0sW7wrr4=", + "lastModified": 1721770738, + "narHash": "sha256-8w1p5dJsz9ybK1xgfBoWBC1fS5jWcuLHwYClFgP700Y=", "ref": "refs/heads/main", - "rev": "f642fb97df5c69267a03452533de383ff8023570", - "revCount": 4934, + "rev": "8a4548e4302b1cc00fca368a7cc2e3171516420c", + "revCount": 4967, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" }, "original": { - "rev": "f642fb97df5c69267a03452533de383ff8023570", "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -970,17 +1003,16 @@ ] }, "locked": { - "lastModified": 1721415237, - "narHash": "sha256-wL8dHknJsDLzm0Dg8484kvdXQk2T74X13m69VsR1mZE=", + "lastModified": 1721668405, + "narHash": "sha256-ZnIXa+jeMXoerhRz/ZJwVoYHaROjcLyQsr1b6JZ2AjQ=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "f23d3ebd92fdbaac107b71893fab94701c39eeb8", + "rev": "4c2cef8326711fbd91b7a313f095545eb50d2a57", "type": "github" }, "original": { "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "f23d3ebd92fdbaac107b71893fab94701c39eeb8", "type": "github" } }, @@ -1301,11 +1333,11 @@ ] }, "locked": { - "lastModified": 1721628736, - "narHash": "sha256-dIm/veBiLpclmij7FFXo6+23Swxxdj2nDPTMM3RzuYc=", + "lastModified": 1721696446, + "narHash": "sha256-JBYhrtQIbQlMbe+nYDqxMFMR+fzVvVXhQuKe4R2b8G8=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "464172e98eecf9a8079a9a381ffb75789d8c0e5e", + "rev": "0380256dfe668d2a3add4fa063b07724e6cec198", "type": "github" }, "original": { @@ -1317,11 +1349,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1721572156, - "narHash": "sha256-DyPWvLGftJ0kyrAtlInrztgJHZeB1kK317Icd9iRJKs=", + "lastModified": 1721687430, + "narHash": "sha256-v6rM0mqwirJkE5O0ozcdtVR+rjiV8esxlUPHyxGNnr8=", "owner": "neovim", "repo": "neovim", - "rev": "7381f0a1d517474dcf8d8d019cbda430ce4bff23", + "rev": "9322b7e0594de77f8c0f6ef34c197b8a3aac7844", "type": "github" }, "original": { @@ -1603,11 +1635,11 @@ ] }, "locked": { - "lastModified": 1721581528, - "narHash": "sha256-3esP3cMdqotokFJYxcu680r2VaSA78T03A2VwCZuWEw=", + "lastModified": 1721713478, + "narHash": "sha256-4DYCQGmsXaa90+hkNs/vH2XtPXEevCT9VRIM/HCbhiQ=", "owner": "nix-community", "repo": "nixd", - "rev": "87135e0dfb3d56262e39de123d5741d2d892dd5e", + "rev": "86dc0ba9f59e4d87969e5e9bd826c586994a6474", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 06d930b4..2e70bde8 100644 --- a/flake.nix +++ b/flake.nix @@ -124,7 +124,6 @@ }; hyprland = { inputs.nixpkgs.follows = "nixpkgs"; - rev = "f642fb97df5c69267a03452533de383ff8023570"; submodules = true; type = "git"; url = "https://github.com/hyprwm/Hyprland"; @@ -133,7 +132,6 @@ inputs.hyprland.follows = "hyprland"; owner = "hyprwm"; repo = "hyprland-plugins"; - rev = "f23d3ebd92fdbaac107b71893fab94701c39eeb8"; type = "github"; }; jellyfin-flake = { diff --git a/flake/inputs.nix b/flake/inputs.nix index 1bb9c29f..ffc4fbdf 100644 --- a/flake/inputs.nix +++ b/flake/inputs.nix @@ -126,15 +126,11 @@ let type = "git"; url = "https://github.com/hyprwm/Hyprland"; submodules = true; - - # FIXME: cursor doesn't work right after aquamarine merge - rev = "f642fb97df5c69267a03452533de383ff8023570"; }; hyprland-plugins = mkHyprDep { owner = "hyprwm"; repo = "hyprland-plugins"; - rev = "f23d3ebd92fdbaac107b71893fab94701c39eeb8"; # type = "path"; # path = "/home/matt/git/hyprland-plugins"; diff --git a/modules/desktop/desktop-environment/home/hyprgrass.nix b/modules/desktop/desktop-environment/home/hyprgrass.nix index 38a1fb36..41167e81 100644 --- a/modules/desktop/desktop-environment/home/hyprgrass.nix +++ b/modules/desktop/desktop-environment/home/hyprgrass.nix @@ -11,7 +11,11 @@ in mkIf cfg.isTouchscreen { wayland.windowManager.hyprland = { - plugins = [hyprgrass.packages.${pkgs.system}.default]; + plugins = [ + (hyprgrass.packages.${pkgs.system}.default.overrideAttrs (o:{ + nativeBuildInputs = o.nativeBuildInputs ++ [pkgs.meson]; + })) + ]; settings = { plugin = {