diff --git a/flake.lock b/flake.lock index 83f4976..d9abef9 100644 --- a/flake.lock +++ b/flake.lock @@ -25,17 +25,16 @@ }, "catppuccin": { "locked": { - "lastModified": 1713895615, - "narHash": "sha256-SVkxhcL0/IN5fNI2dqr702wXOnzktsm0LCEVGRAJQcY=", + "lastModified": 1717565621, + "narHash": "sha256-uU6GeSbzopVcPga+Fy5n3tKfzUhuw4FVMv7h61/13XY=", "owner": "catppuccin", "repo": "nix", - "rev": "a48e70a31616cb63e4794fd3465bff1835cc4246", + "rev": "0cdfa29b902976fc2941468d326325d24e148437", "type": "github" }, "original": { "owner": "catppuccin", "repo": "nix", - "rev": "a48e70a31616cb63e4794fd3465bff1835cc4246", "type": "github" } }, diff --git a/flake.nix b/flake.nix index b323ae0..60128b1 100644 --- a/flake.nix +++ b/flake.nix @@ -67,7 +67,7 @@ nur.url = "github:nix-community/NUR"; - catppuccin.url = "github:catppuccin/nix/a48e70a31616cb63e4794fd3465bff1835cc4246"; + catppuccin.url = "github:catppuccin/nix"; }; outputs = {...} @ inputs: diff --git a/roles/common/configuration.nix b/roles/common/configuration.nix index f599cd2..7092f16 100755 --- a/roles/common/configuration.nix +++ b/roles/common/configuration.nix @@ -95,7 +95,10 @@ ) ]; - catppuccin.flavour = "mocha"; + catppuccin = { + flavor = "mocha"; + accent = "mauve"; + }; home-manager = { backupFileExtension = "hm-backup"; @@ -103,7 +106,8 @@ verbose = true; sharedModules = [flakeSelf.inputs.catppuccin.homeManagerModules.catppuccin]; users.toast = {osConfig, ...}: { - catppuccin.flavour = osConfig.catppuccin.flavour; + catppuccin.flavor = osConfig.catppuccin.flavor; + catppuccin.accent = osConfig.catppuccin.accent; home.stateVersion = "24.05"; xdg = { enable = true; diff --git a/roles/common/programs/fish.nix b/roles/common/programs/fish.nix index 79a6648..25c43cd 100644 --- a/roles/common/programs/fish.nix +++ b/roles/common/programs/fish.nix @@ -6,6 +6,7 @@ home-manager.users.toast = { programs.fish = { enable = true; + catppuccin.enable = true; }; }; }