feat(hyprland): Catppuccin -> Rose Pine
This commit is contained in:
parent
57afe4a40e
commit
d4c3806c8f
2 changed files with 23 additions and 21 deletions
|
@ -196,13 +196,13 @@
|
||||||
"type": "Git",
|
"type": "Git",
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "GitHub",
|
"type": "GitHub",
|
||||||
"owner": "catppuccin",
|
"owner": "rose-pine",
|
||||||
"repo": "hyprland"
|
"repo": "hyprland"
|
||||||
},
|
},
|
||||||
"branch": "main",
|
"branch": "main",
|
||||||
"revision": "c388ac55563ddeea0afe9df79d4bfff0096b146b",
|
"revision": "6898fe967c59f9bec614a9a58993e0cb8090d052",
|
||||||
"url": "https://github.com/catppuccin/hyprland/archive/c388ac55563ddeea0afe9df79d4bfff0096b146b.tar.gz",
|
"url": "https://github.com/rose-pine/hyprland/archive/6898fe967c59f9bec614a9a58993e0cb8090d052.tar.gz",
|
||||||
"hash": "0cxzxfgbqnkdnvn8nch4z4s7izzlm2jgciq1s8cjmypf8g7vy9n5"
|
"hash": "1l9xrrympg8ikvmq8mazb9x2byci4l230hqgyagvl3id8xkiicm1"
|
||||||
},
|
},
|
||||||
"imv": {
|
"imv": {
|
||||||
"type": "Git",
|
"type": "Git",
|
||||||
|
|
|
@ -1,29 +1,31 @@
|
||||||
{ config, lib, ... }:
|
|
||||||
let
|
|
||||||
inherit (config.catppuccin) sources pointerCursor;
|
|
||||||
cfg = config.wayland.windowManager.hyprland.catppuccin;
|
|
||||||
enable = cfg.enable && config.wayland.windowManager.hyprland.enable;
|
|
||||||
in
|
|
||||||
{
|
{
|
||||||
options.wayland.windowManager.hyprland.catppuccin =
|
config,
|
||||||
lib.ctp.mkCatppuccinOpt { name = "hyprland"; }
|
lib,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
inherit (config.rose-pine) sources;
|
||||||
|
|
||||||
|
cfg = config.wayland.windowManager.hyprland.rose-pine;
|
||||||
|
enable = cfg.enable && config.wayland.windowManager.hyprland.enable;
|
||||||
|
|
||||||
|
themeName =
|
||||||
|
if (cfg.flavor == "main")
|
||||||
|
then "rose-pine"
|
||||||
|
else "rose-pine-${cfg.flavor}";
|
||||||
|
in {
|
||||||
|
options.wayland.windowManager.hyprland.rose-pine =
|
||||||
|
lib.rp.mkRosePineOpt {name = "hyprland";}
|
||||||
// {
|
// {
|
||||||
accent = lib.ctp.mkAccentOpt "hyprland";
|
accent = lib.rp.mkAccentOpt "hyprland";
|
||||||
};
|
};
|
||||||
|
|
||||||
config = lib.mkIf enable {
|
config = lib.mkIf enable {
|
||||||
home.sessionVariables = lib.mkIf pointerCursor.enable {
|
|
||||||
HYPRCURSOR_SIZE = config.home.pointerCursor.size;
|
|
||||||
HYPRCURSOR_THEME = "catppuccin-${pointerCursor.flavor}-${pointerCursor.accent}-cursors";
|
|
||||||
};
|
|
||||||
|
|
||||||
wayland.windowManager.hyprland.settings = {
|
wayland.windowManager.hyprland.settings = {
|
||||||
source = [
|
source = [
|
||||||
"${sources.hyprland}/themes/${cfg.flavor}.conf"
|
"${sources.hyprland}/${themeName}.conf"
|
||||||
# Define accents in file to ensure they appear before user vars
|
# Define accent in file to ensure it appears before user vars
|
||||||
(builtins.toFile "hyprland-${cfg.accent}-accent.conf" ''
|
(builtins.toFile "hyprland-${cfg.accent}-accent.conf" ''
|
||||||
$accent = ''$${cfg.accent}
|
$accent = ''$${cfg.accent}
|
||||||
$accentAlpha = ''$${cfg.accent}Alpha
|
|
||||||
'')
|
'')
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue