From f26e36bbb23b421f78656e9ad91c76f4b467dd45 Mon Sep 17 00:00:00 2001 From: Sweetbread Date: Sun, 1 Nov 2026 13:19:03 +0300 Subject: [PATCH] Update --- flake.lock | 78 +++++++++++++++--------------- modules/host.nix | 5 +- modules/user/helix.nix | 13 ++++- user/chest/modules/waybar.nix | 6 ++- user/sweetbread/modules/waybar.nix | 6 ++- 5 files changed, 65 insertions(+), 43 deletions(-) diff --git a/flake.lock b/flake.lock index 0afb4d6..851946f 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1789138122, - "narHash": "sha256-mh+ZiGCtHAo0xIi1yaNjHsftfnlWz9JiYwHCyT16yIE=", + "lastModified": 1792853286, + "narHash": "sha256-l/Oh5k1NQqQuwh4gBF3VcmCF0WGiCT/LqfvY5huhOq4=", "owner": "ezKEa", "repo": "aagl-gtk-on-nix", - "rev": "d82d6d6f66caf4b63fb154e62fad83c627874127", + "rev": "e9a3b8fdb50a7d77a90c02c84e298c286310385b", "type": "github" }, "original": { @@ -173,11 +173,11 @@ ] }, "locked": { - "lastModified": 1789770686, - "narHash": "sha256-uZkBR7yHdIKUFB5SZdfgh1qkGfI3XmYmI/lTiquxbck=", + "lastModified": 1792526520, + "narHash": "sha256-3hSJlv8mUVnZPMWK2+CM7a9O+nR6Z4mCh27NfLCmTPc=", "owner": "nix-community", "repo": "disko", - "rev": "725ea35e410ad83be4931d1bff7e090eacaf3563", + "rev": "cedd626e11b635470fa6f9fdb8ad79b0075dd7f9", "type": "github" }, "original": { @@ -332,11 +332,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1790052168, - "narHash": "sha256-cfZ9EL0rRfoB7KnZRgRmk36YJhjfutqDjzew1lJYwEg=", + "lastModified": 1792684031, + "narHash": "sha256-wBjRHntxoxT+fo85i0rct/NWN/OG/Z6nVky/Efb2gjE=", "owner": "mattwparas", "repo": "helix", - "rev": "7915ec19939d8ae3ab4cfff278eaf23ae3784351", + "rev": "424add100eac9ca258d969b985a8ac370469ec05", "type": "github" }, "original": { @@ -353,11 +353,11 @@ ] }, "locked": { - "lastModified": 1790292277, - "narHash": "sha256-z+knvdMItRrMonmG4RIsqKYIa/hwYUzKjotDTfC5DDc=", + "lastModified": 1793193205, + "narHash": "sha256-X6xa6sGA7RnJQuZGbFMC+K+KToWAlBDCCjJXfTwEPsw=", "owner": "nix-community", "repo": "home-manager", - "rev": "4b9add8645d5e2b0f7de18f7a442d08fe2bdcc91", + "rev": "095fef2f265c3c0da4fe315efba8f8a04495ab34", "type": "github" }, "original": { @@ -518,11 +518,11 @@ ] }, "locked": { - "lastModified": 1790062321, - "narHash": "sha256-MKb+sbGuRyd+As1fNoxPNJRC6B+hLahvSPGuwPskOXw=", + "lastModified": 1792508453, + "narHash": "sha256-y+V5RFJcjnV1+ZzImkfiSJ97iDIflanjP2OR9lemvTs=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "b29b8293039490d0361e9f15289d361653d8aabf", + "rev": "d2427d4d15b36df40468f5a58bbd67cdba19835d", "type": "github" }, "original": { @@ -750,11 +750,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1790218706, - "narHash": "sha256-6e4Na3z008XpdVyOXgfasXIn1aN+z8AXFG+jXdQSyuI=", + "lastModified": 1793183032, + "narHash": "sha256-56mFMf8heLNfYhcgbrh4GpN5x+G9JOfTFXZC3n6w0qM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c508844df6c28fa6dabc1b6af70f3ccbd65c5201", + "rev": "08d3a97586f6b6343b3b5e799980773629432610", "type": "github" }, "original": { @@ -766,11 +766,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1790185690, - "narHash": "sha256-xJ+X4hBtOcAFGBOe5nAMyMUeF9foJBmIOu3NjBqBycU=", + "lastModified": 1793110635, + "narHash": "sha256-dhoW6VgFWlaodSY5jrBn+CF2FLmaUvDVgM7+C7T2+NM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4975466d324710c576dc11ad614684e6bd8cad8e", + "rev": "31ecbaca1bdefa45dffc409f0250bd8039ea0010", "type": "github" }, "original": { @@ -896,11 +896,11 @@ ] }, "locked": { - "lastModified": 1789543870, - "narHash": "sha256-45ikFmtfgBZgMePIm4GevJ9VjDSWO3PGQgOuuwHDpes=", + "lastModified": 1791013993, + "narHash": "sha256-BiFPwFsbFnZH5GfWbQFKYuQNg+67aNQCoRSRNTeJFQc=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "35ca0490d13a3d38c4602d0eb9600a30fa63a367", + "rev": "7470661ba2b51156048af08464b82020223dc942", "type": "github" }, "original": { @@ -916,11 +916,11 @@ ] }, "locked": { - "lastModified": 1790247521, - "narHash": "sha256-TNfgoHsqsYYvaJImlWctfRkh4PseTagzegU1Dgdbehw=", + "lastModified": 1793052255, + "narHash": "sha256-Y/JIHTnMlOabDfyaSBubWGLDIVGihLEUuoMhFvQKaDo=", "owner": "Mic92", "repo": "sops-nix", - "rev": "2bd00bd9bb35fe6d114888c8f1c2e946c541dd8f", + "rev": "60182817ee048ac94b4c68ea76d5ef2e8aac730d", "type": "github" }, "original": { @@ -949,11 +949,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1789937675, - "narHash": "sha256-/F9gQpAlPCxheQ9ht/5Fka2JEr/FfuOh9R7ySa9SAGc=", + "lastModified": 1792920263, + "narHash": "sha256-2pkE97wOXAYIn2/Nhs9y+iR0qVT+g/3UtukXdkywxXc=", "owner": "danth", "repo": "stylix", - "rev": "abff36bfab11cbdcd0723f41c1b0921e211be6ac", + "rev": "3e27b6c499e507df6e3bb8eca3614f5c95e28140", "type": "github" }, "original": { @@ -1080,11 +1080,11 @@ ] }, "locked": { - "lastModified": 1790276835, - "narHash": "sha256-Y/bf7OmtwrEhdRDTkh4OVAEZX5ixL+io0W/UPJuto+g=", + "lastModified": 1793198875, + "narHash": "sha256-CZR26099bnlOWgLpMOPwdpmocSAGetbepjkP661qml4=", "owner": "Alexays", "repo": "Waybar", - "rev": "16843896794a9c595139318420f81f40e84f8c78", + "rev": "f6f73c81818b0a6753c1efb68e0fae2149eac028", "type": "github" }, "original": { @@ -1143,11 +1143,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1790032246, - "narHash": "sha256-njp/fLXNAru7mTWbs0p/iHZDMRZE7jLxjsnQei10rNY=", + "lastModified": 1793195788, + "narHash": "sha256-S+4LGf9l8RDFqAJ87HUorHPVasfnnMTE/ysaj3SWIk8=", "owner": "sxyazi", "repo": "yazi", - "rev": "0ea4c5d9ef75d7165c2e3b4eb8d713fc11f26c96", + "rev": "ec4ce8f27d7a34045791606ebe83b0795defe4b6", "type": "github" }, "original": { @@ -1159,11 +1159,11 @@ "yazi-plugins": { "flake": false, "locked": { - "lastModified": 1789736971, - "narHash": "sha256-O1yYAhsf7xMqUrTTSLac06WSxCvUQqedH3DWqGwn/Ok=", + "lastModified": 1793196370, + "narHash": "sha256-0nD3jSkUt7mcsfPnJ3yBwdJYRY6JVSxVAj4eXEgBWus=", "owner": "yazi-rs", "repo": "plugins", - "rev": "f703392df78b5fba5e8f9f1ad0b1cb6d3def9736", + "rev": "896fa5aec1db0163e2f65d07a130d064de53b0b2", "type": "github" }, "original": { diff --git a/modules/host.nix b/modules/host.nix index bab7d60..304399e 100644 --- a/modules/host.nix +++ b/modules/host.nix @@ -1,4 +1,4 @@ -{ pkgs, inputs, ... }: { +{ pkgs, inputs, lib, config, ... }: { imports = [ ./host/bluetooth.nix ./host/bootloader.nix @@ -24,6 +24,9 @@ hyprland.package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; }; + security.wrappers.Hyprland.source = lib.mkForce + "${config.programs.hyprland.package}/bin/.Hyprland-wrapped"; + xdg.portal = { enable = true; xdgOpenUsePortal = true; diff --git a/modules/user/helix.nix b/modules/user/helix.nix index d51d0e6..665a8c6 100644 --- a/modules/user/helix.nix +++ b/modules/user/helix.nix @@ -1,6 +1,17 @@ { inputs, pkgs, lib, config, ... }: let helixSteel = - inputs.helix-steel.packages.${pkgs.system}.default.overrideAttrs (old: { + (inputs.helix-steel.packages.${pkgs.system}.default.override { + grammarOverlays = [ + (_: prev: { + perl = prev.perl.overrideAttrs (old: { + postPatch = (old.postPatch or "") + '' + substituteInPlace src/bsearch.c --replace-fail 'void *bsearch(' 'void *tsp_bsearch(' + substituteInPlace src/tsp_unicode.h --replace-fail 'return bsearch(' 'return tsp_bsearch(' + ''; + }); + }) + ]; + }).overrideAttrs (old: { cargoBuildFlags = (old.cargoBuildFlags or []) ++ [ "--features" "steel,git" diff --git a/user/chest/modules/waybar.nix b/user/chest/modules/waybar.nix index 33ce2c1..ad5e99c 100644 --- a/user/chest/modules/waybar.nix +++ b/user/chest/modules/waybar.nix @@ -17,7 +17,11 @@ programs.waybar = { enable = true; systemd.enable = true; - package = inputs.waybar.packages.${pkgs.stdenv.hostPlatform.system}.default; + package = inputs.waybar.packages.${pkgs.stdenv.hostPlatform.system}.default.overrideAttrs (old: { + postPatch = (old.postPatch or "") + '' + mv subprojects/cava-1.0.0 subprojects/libcava + ''; + }); settings.mainBar = { modules-center = [ diff --git a/user/sweetbread/modules/waybar.nix b/user/sweetbread/modules/waybar.nix index 4cf47ad..ac02d6e 100644 --- a/user/sweetbread/modules/waybar.nix +++ b/user/sweetbread/modules/waybar.nix @@ -22,7 +22,11 @@ in { enable = true; systemd.enable = true; - package = inputs.waybar.packages.${pkgs.stdenv.hostPlatform.system}.default; + package = inputs.waybar.packages.${pkgs.stdenv.hostPlatform.system}.default.overrideAttrs (old: { + postPatch = (old.postPatch or "") + '' + mv subprojects/cava-1.0.0 subprojects/libcava + ''; + }); settings.mainBar = { spacing = 8;