Update flake.lock, apply fixes

Update flake.lock

fix Hyprland finalPackage option removal

home: fix catpuccin cursor rename
This commit is contained in:
NullBite 2024-06-04 00:44:22 -04:00
parent 9c07917f8b
commit 6666fbfbdf
Signed by: nullbite
GPG Key ID: 6C4D545385D4925A
4 changed files with 22 additions and 22 deletions

38
flake.lock generated
View File

@ -277,11 +277,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1716930911, "lastModified": 1717316182,
"narHash": "sha256-t4HT5j3Jy7skRB5PINnxcEBCkgE89rGBpwTI7YS4Ffo=", "narHash": "sha256-Xi0EpZcu39N0eW7apLjFfUOR9y80toyjYizez7J1wMI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "a9b36cbe9292a649222b89fdb9ae9907e9c74086", "rev": "9b53a10f4c91892f5af87cf55d08fba59ca086af",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -351,11 +351,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1716932244, "lastModified": 1717447622,
"narHash": "sha256-hyacwt+mqkIQ+stx1RyIMmq8UYE/JkMqpxVbZOLzEyI=", "narHash": "sha256-yT+e+NxXDes75AXaoxr41uStjXQgwK1SR5ZQEl27XlU=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "ebf258788e46cd0320fb17138ba413f719180418", "rev": "d0a224a4915b5a90555818ed3f9e49e1a61b7cdb",
"revCount": 4749, "revCount": 4761,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland" "url": "https://github.com/hyprwm/Hyprland"
@ -507,11 +507,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1716772633, "lastModified": 1717297675,
"narHash": "sha256-Idcye44UW+EgjbjCoklf2IDF+XrehV6CVYvxR1omst4=", "narHash": "sha256-43UmlS1Ifx17y93/Vc258U7bOlAAIZbu8dsGDHOIIr0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "ff80cb4a11bb87f3ce8459be6f16a25ac86eb2ac", "rev": "972a52bee3991ae1f1899e6452e0d7c01ee566d9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -606,11 +606,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1716715802, "lastModified": 1717399147,
"narHash": "sha256-usk0vE7VlxPX8jOavrtpOqphdfqEQpf9lgedlY/r66c=", "narHash": "sha256-eCWaE/q1VItpFAxxLVt171MdtDcjEnwi6QB/yuF73JU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e2dd4e18cc1c7314e24154331bae07df76eb582f", "rev": "4a4ecb0ab415c9fccfb005567a215e6a9564cdf5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -638,11 +638,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1716633019, "lastModified": 1717159533,
"narHash": "sha256-xim1b5/HZYbWaZKyI7cn9TJCM6ewNVZnesRr00mXeS4=", "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9d29cd266cebf80234c98dd0b87256b6be0af44e", "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -697,11 +697,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1716862669, "lastModified": 1717467480,
"narHash": "sha256-7oTPM9lcdwiI1cpRC313B+lHawocgpY5F07N+Rbm5Uk=", "narHash": "sha256-9Fbar+ycxdfZ6HbwOCgD+jWG3du/12TFisKRQm4Zhfc=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "47b2d15658b37716393b2463a019000dbd6ce4bc", "rev": "260ff391290a2b23958d04db0d3e7015c8417401",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -8,7 +8,7 @@ let
mkCtp = flavor: accent: with pkgs; { mkCtp = flavor: accent: with pkgs; {
names = { names = {
cursors = "Catppuccin-${toCaps flavor}-${toCaps accent}-Cursors"; cursors = "catppuccin-${toLower flavor}-${toLower accent}-cursors";
icons = "Papirus-Dark"; icons = "Papirus-Dark";
gtk = let gtk = let
base = "Catppuccin-${toCaps flavor}-Standard-${toCaps accent}-Dark"; base = "Catppuccin-${toCaps flavor}-Standard-${toCaps accent}-Dark";

View File

@ -128,7 +128,7 @@ in
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
enable = true; enable = true;
package = lib.mkIf (osConfig ? programs) (lib.mkDefault osConfig.programs.hyprland.finalPackage); package = lib.mkIf (osConfig ? programs) (lib.mkDefault osConfig.programs.hyprland.package);
settings = { settings = {
# enable debug logging # enable debug logging

View File

@ -35,7 +35,7 @@ in
nixfiles.programs.greetd = { nixfiles.programs.greetd = {
enable = true; enable = true;
settings = { settings = {
command = [ "${config.programs.hyprland.finalPackage}/bin/Hyprland" ]; command = [ "${config.programs.hyprland.package}/bin/Hyprland" ];
}; };
}; };