punkfairie/marleyos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: Switch main nixpkgs to stable

Browse source
This commit is contained in:
punkfairie 2025-02-27 18:25:20 -08:00
parent e0240e64ee
commit 0d6378db9e
Signed by: punkfairie
GPG key ID: B3C5488E9A1A7CA6
4 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
flake.lock
View file

@ -468,15 +468,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736508663, "lastModified": 1739757849,
"narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=", "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc", "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-24.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -769,16 +770,16 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1736523798, "lastModified": 1740603184,
"narHash": "sha256-Xb8mke6UCYjge9kPR9o4P1nVrhk7QBbKv3xQ9cj7h2s=", "narHash": "sha256-t+VaahjQAWyA+Ctn2idyo1yxRIYpaDxMgHkgCNiMJa4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "130595eba61081acde9001f43de3248d8888ac4a", "rev": "f44bd8ca21e026135061a0a57dcf3d0775b67a49",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-unstable", "ref": "nixos-24.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

4
flake.nix
View file

@ -43,7 +43,7 @@
}; };
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
unstable.url = "github:nixos/nixpkgs/nixos-unstable"; unstable.url = "github:nixos/nixpkgs/nixos-unstable";
nur = { nur = {
@ -67,7 +67,7 @@
}; };
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager/release-24.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };

7
modules/home/wayland/hyprland/default.nix
View file

@ -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 = home.packages =
lib.optional lib.optional

4
modules/nixos/base/drivers/default.nix
View file

@ -7,9 +7,9 @@
config = lib.mkIf (!config.marleyos.isServer) { config = lib.mkIf (!config.marleyos.isServer) {
security.rtkit.enable = true; # Used for pulseaudio. security.rtkit.enable = true; # Used for pulseaudio.
services = { hardware.pulseaudio.enable = false;
pulseaudio.enable = false;
services = {
pipewire = { pipewire = {
enable = true; enable = true;
alsa.enable = true; alsa.enable = true;