From 0d6378db9e8cda3463a4150236d8b3db5c7c091e Mon Sep 17 00:00:00 2001 From: punkfairie Date: Thu, 27 Feb 2025 18:25:20 -0800 Subject: [PATCH] feat: Switch main nixpkgs to stable --- flake.lock | 15 ++++++++------- flake.nix | 4 ++-- modules/home/wayland/hyprland/default.nix | 7 ++++++- modules/nixos/base/drivers/default.nix | 4 ++-- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index f73a79f..45f63c1 100644 --- a/flake.lock +++ b/flake.lock @@ -468,15 +468,16 @@ ] }, "locked": { - "lastModified": 1736508663, - "narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=", + "lastModified": 1739757849, + "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=", "owner": "nix-community", "repo": "home-manager", - "rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc", + "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe", "type": "github" }, "original": { "owner": "nix-community", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -769,16 +770,16 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1736523798, - "narHash": "sha256-Xb8mke6UCYjge9kPR9o4P1nVrhk7QBbKv3xQ9cj7h2s=", + "lastModified": 1740603184, + "narHash": "sha256-t+VaahjQAWyA+Ctn2idyo1yxRIYpaDxMgHkgCNiMJa4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "130595eba61081acde9001f43de3248d8888ac4a", + "rev": "f44bd8ca21e026135061a0a57dcf3d0775b67a49", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index b343dfc..4593907 100644 --- a/flake.nix +++ b/flake.nix @@ -43,7 +43,7 @@ }; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nur = { @@ -67,7 +67,7 @@ }; home-manager = { - url = "github:nix-community/home-manager"; + url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/modules/home/wayland/hyprland/default.nix b/modules/home/wayland/hyprland/default.nix index 281e64d..d9887b4 100644 --- a/modules/home/wayland/hyprland/default.nix +++ b/modules/home/wayland/hyprland/default.nix @@ -47,7 +47,12 @@ in { }; }; - home.pointerCursor.hyprcursor.enable = true; + home.sessionVariables = let + cfg = config.home.pointerCursor; + in { + HYPRCURSOR_THEME = cfg.name; + HYPRCURSOR_SIZE = 24; + }; home.packages = lib.optional diff --git a/modules/nixos/base/drivers/default.nix b/modules/nixos/base/drivers/default.nix index e8a6cf4..5445bae 100644 --- a/modules/nixos/base/drivers/default.nix +++ b/modules/nixos/base/drivers/default.nix @@ -7,9 +7,9 @@ config = lib.mkIf (!config.marleyos.isServer) { security.rtkit.enable = true; # Used for pulseaudio. - services = { - pulseaudio.enable = false; + hardware.pulseaudio.enable = false; + services = { pipewire = { enable = true; alsa.enable = true;