From a4267df2339c0850c714bba66cf5a7c33d4381e9 Mon Sep 17 00:00:00 2001 From: "Alexandre Cavalheiro S. Tiago da Silva" Date: Sun, 14 Sep 2025 00:06:34 -0300 Subject: [PATCH] chore: flake update & necessary changes - Updated Hyprland to master (0.51 came out) - Re-enabled zenergy kernel module - Move rofi-wayland to rofi as the packages are merged --- flake.lock | 85 +++++++++---------- flake.nix | 2 +- modules/hyprland/home-manager.nix | 1 - shared/home-manager/dotfiles/rofi/default.nix | 2 +- shared/nixos/desktop.nix | 20 ++--- shared/nixos/system.nix | 5 +- 6 files changed, 56 insertions(+), 59 deletions(-) diff --git a/flake.lock b/flake.lock index e6b3835..5fb607c 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1752936381, - "narHash": "sha256-b191B12GRfvOT3odGpx5IFyGRPZbBrvCLADZfFHoJFg=", + "lastModified": 1755946532, + "narHash": "sha256-POePremlUY5GyA1zfbtic6XLxDaQcqHN6l+bIxdT5gc=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "141a991678b34e768f09b3a670c61a4c1d5d7110", + "rev": "81584dae2df6ac79f6b6dae0ecb7705e95129ada", "type": "github" }, "original": { @@ -98,11 +98,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -158,11 +158,11 @@ ] }, "locked": { - "lastModified": 1757256385, - "narHash": "sha256-WK7tOhWwr15mipcckhDg2no/eSpM1nIh4C9le8HgHhk=", + "lastModified": 1757809531, + "narHash": "sha256-Rf8D3/7unR2my3ZTS340agC0qbbym9Z64q85YxEJMKg=", "owner": "nix-community", "repo": "home-manager", - "rev": "f35703b412c67b48e97beb6e27a6ab96a084cd37", + "rev": "768a7042a69998382d123aa73a627658973bed8d", "type": "github" }, "original": { @@ -207,11 +207,11 @@ ] }, "locked": { - "lastModified": 1749155331, - "narHash": "sha256-XR9fsI0zwLiFWfqi/pdS/VD+YNorKb3XIykgTg4l1nA=", + "lastModified": 1753964049, + "narHash": "sha256-lIqabfBY7z/OANxHoPeIrDJrFyYy9jAM4GQLzZ2feCM=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "45fcc10b4c282746d93ec406a740c43b48b4ef80", + "rev": "44e91d467bdad8dcf8bbd2ac7cf49972540980a5", "type": "github" }, "original": { @@ -236,11 +236,11 @@ ] }, "locked": { - "lastModified": 1752149140, - "narHash": "sha256-gbh1HL98Fdqu0jJIWN4OJQN7Kkth7+rbkFpSZLm/62A=", + "lastModified": 1757542864, + "narHash": "sha256-8i9tsVoOmLQDHJkNgzJWnmxYFGkJNsSndimYpCoqmoA=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "340494a38b5ec453dfc542c6226481f736cc8a9a", + "rev": "aa9d14963b94186934fd0715d9a7f0f2719e64bb", "type": "github" }, "original": { @@ -265,16 +265,15 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1752961026, - "narHash": "sha256-n5lzYUr1iQqzMmEF9oLL9BXMpOO9eVnY0AUCDrM93Yk=", + "lastModified": 1757811161, + "narHash": "sha256-laCB71qgn9Eht7bH1nobIzEiR5r7WRHAB7XHHxLTiLQ=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "4e242d086e20b32951fdc0ebcbfb4d41b5be8dcc", + "rev": "559024c3314e4b1180b10b80fce4e9f20bad14c8", "type": "github" }, "original": { "owner": "hyprwm", - "ref": "v0.50.1", "repo": "Hyprland", "type": "github" } @@ -359,11 +358,11 @@ ] }, "locked": { - "lastModified": 1750371812, - "narHash": "sha256-D868K1dVEACw17elVxRgXC6hOxY+54wIEjURztDWLk8=", + "lastModified": 1757508108, + "narHash": "sha256-bTYedtQFqqVBAh42scgX7+S3O6XKLnT6FTC6rpmyCCc=", "owner": "hyprwm", "repo": "hyprland-qtutils", - "rev": "b13c7481e37856f322177010bdf75fccacd1adc8", + "rev": "119bcb9aa742658107b326c50dcd24ab59b309b7", "type": "github" }, "original": { @@ -388,11 +387,11 @@ ] }, "locked": { - "lastModified": 1750371198, - "narHash": "sha256-/iuJ1paQOBoSLqHflRNNGyroqfF/yvPNurxzcCT0cAE=", + "lastModified": 1756810301, + "narHash": "sha256-wgZ3VW4VVtjK5dr0EiK9zKdJ/SOqGIBXVG85C3LVxQA=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "cee01452bca58d6cadb3224e21e370de8bc20f0b", + "rev": "3d63fb4a42c819f198deabd18c0c2c1ded1de931", "type": "github" }, "original": { @@ -413,11 +412,11 @@ ] }, "locked": { - "lastModified": 1752252310, - "narHash": "sha256-06i1pIh6wb+sDeDmWlzuPwIdaFMxLlj1J9I5B9XqSeo=", + "lastModified": 1756117388, + "narHash": "sha256-oRDel6pNl/T2tI+nc/USU9ZP9w08dxtl7hiZxa0C/Wc=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "bcabcbada90ed2aacb435dc09b91001819a6dc82", + "rev": "b2ae3204845f5f2f79b4703b441252d8ad2ecfd0", "type": "github" }, "original": { @@ -438,11 +437,11 @@ ] }, "locked": { - "lastModified": 1751897909, - "narHash": "sha256-FnhBENxihITZldThvbO7883PdXC/2dzW4eiNvtoV5Ao=", + "lastModified": 1755184602, + "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "fcca0c61f988a9d092cbb33e906775014c61579d", + "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d", "type": "github" }, "original": { @@ -528,11 +527,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1752687322, - "narHash": "sha256-RKwfXA4OZROjBTQAl9WOZQFm7L8Bo93FQwSJpAiSRvo=", + "lastModified": 1757487488, + "narHash": "sha256-zwE/e7CuPJUWKdvvTCB7iunV4E/+G0lKfv4kk/5Izdg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6e987485eb2c77e5dcc5af4e3c70843711ef9251", + "rev": "ab0f3607a6c7486ea22229b92ed2d355f1482ee0", "type": "github" }, "original": { @@ -544,11 +543,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1757068644, - "narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=", + "lastModified": 1757745802, + "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9", + "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", "type": "github" }, "original": { @@ -568,11 +567,11 @@ ] }, "locked": { - "lastModified": 1750779888, - "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", + "lastModified": 1757588530, + "narHash": "sha256-tJ7A8mID3ct69n9WCvZ3PzIIl3rXTdptn/lZmqSS95U=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", + "rev": "b084b2c2b6bc23e83bbfe583b03664eb0b18c411", "type": "github" }, "original": { @@ -721,11 +720,11 @@ ] }, "locked": { - "lastModified": 1751300244, - "narHash": "sha256-PFuv1TZVYvQhha0ac53E3YgdtmLShrN0t4T6xqHl0jE=", + "lastModified": 1755354946, + "narHash": "sha256-zdov5f/GcoLQc9qYIS1dUTqtJMeDqmBmo59PAxze6e4=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "6115f3fdcb2c1a57b4a80a69f3c797e47607b90a", + "rev": "a10726d6a8d0ef1a0c645378f983b6278c42eaa0", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ddd0461..90e5815 100644 --- a/flake.nix +++ b/flake.nix @@ -18,7 +18,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - hyprland.url = "github:hyprwm/Hyprland/v0.50.1"; + hyprland.url = "github:hyprwm/Hyprland"; hydractify-bot.url = "github:hydractify/hydractify-bot"; diff --git a/modules/hyprland/home-manager.nix b/modules/hyprland/home-manager.nix index 7a2439e..822dee5 100644 --- a/modules/hyprland/home-manager.nix +++ b/modules/hyprland/home-manager.nix @@ -175,7 +175,6 @@ in gestures { # See https://wiki.hyprland.org/Configuring/Variables/ for more - workspace_swipe = off } # Example windowrule v1 diff --git a/shared/home-manager/dotfiles/rofi/default.nix b/shared/home-manager/dotfiles/rofi/default.nix index ea802ae..ff6c2e3 100644 --- a/shared/home-manager/dotfiles/rofi/default.nix +++ b/shared/home-manager/dotfiles/rofi/default.nix @@ -3,7 +3,7 @@ { programs.rofi = { enable = true; - package = pkgs.rofi-wayland; + package = pkgs.rofi; font = "IBM Plex Sans"; diff --git a/shared/nixos/desktop.nix b/shared/nixos/desktop.nix index 95a0ab3..01ac37e 100644 --- a/shared/nixos/desktop.nix +++ b/shared/nixos/desktop.nix @@ -92,16 +92,16 @@ wl-clipboard xclip zoxide - # FIXME: Waiting on https://github.com/NixOS/nixpkgs/pull/441255 to hit unstable - # (catppuccin-sddm.override # So SDDM finds the theme files. - # { - # flavor = "frappe"; - # font = "IBM Plex Sans"; - # fontSize = "11"; - # background = "${../../assets/sddm/Background.jpg}"; - # loginBackground = true; - # } - # ) + (catppuccin-sddm.override # So SDDM finds the theme files. + { + flavor = "frappe"; + font = "IBM Plex Sans"; + fontSize = "11"; + # FIXME: Cannot set custom background anymore, tracking in https://github.com/NixOS/nixpkgs/issues/442758 + # background = "${../../assets/sddm/Background.jpg}"; + loginBackground = true; + } + ) ## Libraries libsForQt5.qt5.qtgraphicaleffects diff --git a/shared/nixos/system.nix b/shared/nixos/system.nix index f5d8205..8f22fe5 100644 --- a/shared/nixos/system.nix +++ b/shared/nixos/system.nix @@ -6,13 +6,12 @@ boot.initrd.kernelModules = [ "v4l2loopback" - # "zenergy" FIXME: Broken in Linux 6.16 since June - https://github.com/BoukeHaarsma23/zenergy/issues/15 + "zenergy" ]; boot.extraModulePackages = [ config.boot.kernelPackages.v4l2loopback - # config.boot.kernelPackages.zenergy # Allows fetching power draw information on AMD CPUs - # FIXME: Look at the FIXME before this. + config.boot.kernelPackages.zenergy # Allows fetching power draw information on AMD CPUs ]; # Configure v4l2loopback