From a1a579eef4dae93c2f6d6dbfaf37f1131c4d06d5 Mon Sep 17 00:00:00 2001 From: Emmet Date: Tue, 11 Jun 2024 22:52:22 -0500 Subject: [PATCH] Updated system + downgraded hyprland due to unknown super key lock bug --- flake.lock | 64 ++++++++++++++++++++++--------------------- flake.nix | 9 ++++-- user/style/stylix.nix | 1 + 3 files changed, 41 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index 5a8fd63..53cfb8e 100644 --- a/flake.lock +++ b/flake.lock @@ -117,11 +117,11 @@ "blocklist-hosts": { "flake": false, "locked": { - "lastModified": 1717449440, - "narHash": "sha256-QtSCQFBhyQIsKJhOvcIOi+9EN1kEnNeoLo3PeQ5VbIY=", + "lastModified": 1717861551, + "narHash": "sha256-8wolGw60hKNa++YO57FXL8/g5U84VgINoQAZ3ppe0ME=", "owner": "StevenBlack", "repo": "hosts", - "rev": "e1a7b23e9769607009d741066b5789a99aaf9923", + "rev": "846f528dfc591a647a36462ec1f8bf3453fa0c35", "type": "github" }, "original": { @@ -490,11 +490,11 @@ ] }, "locked": { - "lastModified": 1717525419, - "narHash": "sha256-5z2422pzWnPXHgq2ms8lcCfttM0dz+hg+x1pCcNkAws=", + "lastModified": 1718141734, + "narHash": "sha256-cA+6l8ZCZ7MXGijVuY/1f55+wF/RT4PlTR9+g4bx86w=", "owner": "nix-community", "repo": "home-manager", - "rev": "a7117efb3725e6197dd95424136f79147aa35e5b", + "rev": "892f76bd0aa09a0f7f73eb41834b8a904b6d0fad", "type": "github" }, "original": { @@ -589,18 +589,19 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1714862770, - "narHash": "sha256-W6hJa5pWNQ19q9YNGS9s2ZaGkWmBd6yLsT9NqLtI1vg=", - "owner": "hyprwm", - "repo": "Hyprland", - "rev": "0b215c5f246d3fde6c023e78b3e3579f7498c172", - "type": "github" + "lastModified": 1714837352, + "narHash": "sha256-UxpPPS5uiyE4FDO3trfJObOm6sE7jnkVguHH6IdkQqs=", + "rev": "cba1ade848feac44b2eda677503900639581c3f4", + "revCount": 4606, + "submodules": true, + "type": "git", + "url": "https://github.com/hyprwm/Hyprland" }, "original": { - "owner": "hyprwm", - "repo": "Hyprland", - "rev": "0b215c5f246d3fde6c023e78b3e3579f7498c172", - "type": "github" + "rev": "cba1ade848feac44b2eda677503900639581c3f4", + "submodules": true, + "type": "git", + "url": "https://github.com/hyprwm/Hyprland" } }, "hyprland-plugins": { @@ -615,16 +616,17 @@ ] }, "locked": { - "lastModified": 1717171694, - "narHash": "sha256-LN2lrcGdAMpkooleWSOV+/q1+wx1f3pSBs1TWeoMCkA=", + "lastModified": 1714862850, + "narHash": "sha256-j1DPSl7FMy3JeWpmzXxcmZhxXbIOfteTozSfqtZ7KBQ=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "e0cad229c3d799c7f72b1217ab2eb300ceecf3ac", + "rev": "fd133914bf1921db2a26627698f914478f6a9471", "type": "github" }, "original": { "owner": "hyprwm", "repo": "hyprland-plugins", + "rev": "fd133914bf1921db2a26627698f914478f6a9471", "type": "github" } }, @@ -799,11 +801,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1717602782, - "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=", + "lastModified": 1717974879, + "narHash": "sha256-GTO3C88+5DX171F/gVS3Qga/hOs/eRMxPFpiHq2t+D8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e8057b67ebf307f01bdcc8fba94d94f75039d1f6", + "rev": "c7b821ba2e1e635ba5a76d299af62821cbcb09f3", "type": "github" }, "original": { @@ -814,11 +816,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1717530100, - "narHash": "sha256-b4Dn+PnrZoVZ/BoR9JN2fTxXxplJrAsdSUIePf4Cacs=", + "lastModified": 1718060059, + "narHash": "sha256-9XKFni8VMXo81RTq9XygCyaO3I/7UKpwIlM/yn0MdcM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a2e1d0414259a144ebdc048408a807e69e0565af", + "rev": "a3c8d64ba846725f040582b2d3b875466d2115bd", "type": "github" }, "original": { @@ -1151,11 +1153,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1717726729, - "narHash": "sha256-2WDKLjVRKWXbadnJHSOUb46PTq3D5nS89vhHTphRw1M=", + "lastModified": 1718158726, + "narHash": "sha256-nOt0XxRZ9ZwztX4OOKdS4YkPd3TVfz/PoaD8TiT7/vw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "7f52ac9ae95bd60c0780d6e32baea22e542e11e1", + "rev": "d4d933340cd3b35d3dc256d76abc3d510e21dfdc", "type": "github" }, "original": { @@ -1195,11 +1197,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1717593209, - "narHash": "sha256-Hc8yIj1CDuVOpUV13ZWvR+5CPXysBmuUqqB8bJ7/CgQ=", + "lastModified": 1718122552, + "narHash": "sha256-A+dBkSwp8ssHKV/WyXb9uqIYrHBqHvtSedU24Lq9lqw=", "owner": "danth", "repo": "stylix", - "rev": "1d3826ceed91ae67562f28ee2e135813a11e47a6", + "rev": "e59d2c1725b237c362e4a62f5722f5b268d566c7", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ae885ae..de2de6d 100644 --- a/flake.nix +++ b/flake.nix @@ -182,9 +182,14 @@ home-manager-stable.url = "github:nix-community/home-manager/release-23.11"; home-manager-stable.inputs.nixpkgs.follows = "nixpkgs-stable"; - hyprland.url = "github:hyprwm/Hyprland/0b215c5f246d3fde6c023e78b3e3579f7498c172?submodules=1"; + hyprland = { + type = "git"; + url = "https://github.com/hyprwm/Hyprland"; + submodules = true; + rev = "cba1ade848feac44b2eda677503900639581c3f4"; + }; hyprland.inputs.nixpkgs.follows = "nixpkgs"; - hyprland-plugins.url = "github:hyprwm/hyprland-plugins"; + hyprland-plugins.url = "github:hyprwm/hyprland-plugins/fd133914bf1921db2a26627698f914478f6a9471"; hyprland-plugins.inputs.hyprland.follows = "hyprland"; hycov.url = "github:DreamMaoMao/hycov/115cba558d439cc25d62ce38b7c62cde83f50ef5"; hycov.inputs.hyprland.follows = "hyprland"; diff --git a/user/style/stylix.nix b/user/style/stylix.nix index d9ab7a3..726c3ca 100644 --- a/user/style/stylix.nix +++ b/user/style/stylix.nix @@ -72,6 +72,7 @@ in bright.white = "#"+config.lib.stylix.colors.base07; }; font.size = config.stylix.fonts.sizes.terminal; + font.normal.family = userSettings.font; }; stylix.targets.kde.enable = true; stylix.targets.kitty.enable = true;