From 1d21254695675a2c62f8c3979eeb7e97da9a6c36 Mon Sep 17 00:00:00 2001 From: SchweGELBin Date: Tue, 11 Jun 2024 17:23:22 +0200 Subject: [PATCH 1/7] feat(home-manager): add support for fuzzel --- .sources/sources.json | 14 +++++++++++++- modules/home-manager/all-modules.nix | 1 + modules/home-manager/fuzzel.nix | 14 ++++++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 modules/home-manager/fuzzel.nix diff --git a/.sources/sources.json b/.sources/sources.json index 7de75ea3..fd52df54 100644 --- a/.sources/sources.json +++ b/.sources/sources.json @@ -120,6 +120,18 @@ "url": "https://github.com/catppuccin/foot/archive/80756a4d63ea4fae4d0fdd793017370f8b8b12ac.tar.gz", "hash": "12a3znfdjpiqrylpv009cvi4w4dgw4i6kxk5gm959y72gybbpbw7" }, + "fuzzel": { + "type": "Git", + "repository": { + "type": "GitHub", + "owner": "catppuccin", + "repo": "fuzzel" + }, + "branch": "main", + "revision": "eeb4c8d159187ef7eb59a4a99baec67c2e797e9f", + "url": "https://github.com/catppuccin/fuzzel/archive/eeb4c8d159187ef7eb59a4a99baec67c2e797e9f.tar.gz", + "hash": "0h0vd1l0hq7bgnga0lbx2564fwlh9riwahx1fr2dr09gi9ry36y8" + }, "gh-dash": { "type": "Git", "repository": { @@ -458,4 +470,4 @@ } }, "version": 3 -} \ No newline at end of file +} diff --git a/modules/home-manager/all-modules.nix b/modules/home-manager/all-modules.nix index d0803c6c..ab92d960 100644 --- a/modules/home-manager/all-modules.nix +++ b/modules/home-manager/all-modules.nix @@ -9,6 +9,7 @@ ./fcitx5.nix ./fish.nix ./foot.nix + ./fuzzel.nix ./fzf.nix ./gh-dash.nix ./gitui.nix diff --git a/modules/home-manager/fuzzel.nix b/modules/home-manager/fuzzel.nix new file mode 100644 index 00000000..f3134ee0 --- /dev/null +++ b/modules/home-manager/fuzzel.nix @@ -0,0 +1,14 @@ +{ config, lib, ... }: +let + inherit (config.catppuccin) sources; + + cfg = config.programs.fuzzel.catppuccin; + enable = cfg.enable && config.programs.fuzzel.enable; +in +{ + options.programs.fuzzel.catppuccin = lib.ctp.mkCatppuccinOpt "fuzzel"; + + config = lib.mkIf enable { + xdg.configFile."fuzzel/fuzzel.ini".source = "${sources.fuzzel}/themes/${cfg.flavor}.ini"; + }; +} From 9730d7093045cb8c1be79df4eeaf6314d160e130 Mon Sep 17 00:00:00 2001 From: SchweGELBin Date: Tue, 11 Jun 2024 17:38:35 +0200 Subject: [PATCH 2/7] fix(test): add support for fuzzel --- test.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/test.nix b/test.nix index f43c8709..e06dac59 100644 --- a/test.nix +++ b/test.nix @@ -84,6 +84,7 @@ testers.runNixOSTest { cava = enable; fish = enable; foot = enable; + fuzzel = enable; fzf = enable; gh-dash = enable; git = enable // { From 5b90f84a2641225cfc93e56518a81a08e287b96d Mon Sep 17 00:00:00 2001 From: SchweGELBin Date: Tue, 11 Jun 2024 18:39:28 +0200 Subject: [PATCH 3/7] feat(home-manager): add accent support to fuzzel --- modules/home-manager/fuzzel.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/modules/home-manager/fuzzel.nix b/modules/home-manager/fuzzel.nix index f3134ee0..2048c5ad 100644 --- a/modules/home-manager/fuzzel.nix +++ b/modules/home-manager/fuzzel.nix @@ -4,11 +4,18 @@ let cfg = config.programs.fuzzel.catppuccin; enable = cfg.enable && config.programs.fuzzel.enable; + palette = (lib.importJSON "${sources.palette}/palette.json").${cfg.flavor}.colors; in { options.programs.fuzzel.catppuccin = lib.ctp.mkCatppuccinOpt "fuzzel"; - config = lib.mkIf enable { - xdg.configFile."fuzzel/fuzzel.ini".source = "${sources.fuzzel}/themes/${cfg.flavor}.ini"; + config.programs.fuzzel.settings.colors = lib.mkIf enable { + background = palette."${cfg.base}".hex + "dd"; + text = palette."${cfg.text}".hex + "ff"; + match = palette."${cfg.red}".hex + "ff"; + selection = palette."${cfg.surface2}".hex + "ff"; + selection-match = match; + selection-text = text; + border = palette."${cfg.accent}".hex + "ff"; }; } From 791fbae1f27f27bac06f46d3b676f90e53483e47 Mon Sep 17 00:00:00 2001 From: SchweGELBin Date: Tue, 11 Jun 2024 18:41:50 +0200 Subject: [PATCH 4/7] fix(home-manager): fuzzel colors syntax error --- modules/home-manager/fuzzel.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/home-manager/fuzzel.nix b/modules/home-manager/fuzzel.nix index 2048c5ad..3a094aec 100644 --- a/modules/home-manager/fuzzel.nix +++ b/modules/home-manager/fuzzel.nix @@ -14,8 +14,8 @@ in text = palette."${cfg.text}".hex + "ff"; match = palette."${cfg.red}".hex + "ff"; selection = palette."${cfg.surface2}".hex + "ff"; - selection-match = match; - selection-text = text; + selection-match = palette."${cfg.red}".hex + "ff"; + selection-text = palette."${cfg.text}".hex + "ff"; border = palette."${cfg.accent}".hex + "ff"; }; } From 97c85886f88a88355f1663542cad1bb41b291f1e Mon Sep 17 00:00:00 2001 From: SchweGELBin Date: Tue, 11 Jun 2024 18:45:03 +0200 Subject: [PATCH 5/7] fix(home-manager): another syntax error --- modules/home-manager/fuzzel.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/home-manager/fuzzel.nix b/modules/home-manager/fuzzel.nix index 3a094aec..000fd505 100644 --- a/modules/home-manager/fuzzel.nix +++ b/modules/home-manager/fuzzel.nix @@ -10,12 +10,12 @@ in options.programs.fuzzel.catppuccin = lib.ctp.mkCatppuccinOpt "fuzzel"; config.programs.fuzzel.settings.colors = lib.mkIf enable { - background = palette."${cfg.base}".hex + "dd"; - text = palette."${cfg.text}".hex + "ff"; - match = palette."${cfg.red}".hex + "ff"; - selection = palette."${cfg.surface2}".hex + "ff"; - selection-match = palette."${cfg.red}".hex + "ff"; - selection-text = palette."${cfg.text}".hex + "ff"; - border = palette."${cfg.accent}".hex + "ff"; + background = palette.base.hex + "dd"; + text = palette.cfg.text.hex + "ff"; + match = palette.red.hex + "ff"; + selection = palette.cfg.surface2.hex + "ff"; + selection-match = palette.red.hex + "ff"; + selection-text = palette.text.hex + "ff"; + border = palette.${cfg.accent}.hex + "ff"; }; } From 60ba7fc52acfb82da50e5abfd8b10ff924a90245 Mon Sep 17 00:00:00 2001 From: SchweGELBin Date: Tue, 11 Jun 2024 18:52:22 +0200 Subject: [PATCH 6/7] fix(home-manager): yet another syntax error --- modules/home-manager/fuzzel.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/home-manager/fuzzel.nix b/modules/home-manager/fuzzel.nix index 000fd505..cd9be66f 100644 --- a/modules/home-manager/fuzzel.nix +++ b/modules/home-manager/fuzzel.nix @@ -11,11 +11,11 @@ in config.programs.fuzzel.settings.colors = lib.mkIf enable { background = palette.base.hex + "dd"; - text = palette.cfg.text.hex + "ff"; + text = palette.text.hex + "ff"; match = palette.red.hex + "ff"; - selection = palette.cfg.surface2.hex + "ff"; + selection = palette.surface2.hex + "ff"; selection-match = palette.red.hex + "ff"; selection-text = palette.text.hex + "ff"; - border = palette.${cfg.accent}.hex + "ff"; + border = palette."${cfg.accent}".hex + "ff"; }; } From e27bb0f5e456a55976d289a8603ec67d1457fe2b Mon Sep 17 00:00:00 2001 From: SchweGELBin Date: Tue, 11 Jun 2024 18:59:27 +0200 Subject: [PATCH 7/7] fix(home-manager): add accent option for fuzzel --- modules/home-manager/fuzzel.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/home-manager/fuzzel.nix b/modules/home-manager/fuzzel.nix index cd9be66f..f61c2dee 100644 --- a/modules/home-manager/fuzzel.nix +++ b/modules/home-manager/fuzzel.nix @@ -7,7 +7,9 @@ let palette = (lib.importJSON "${sources.palette}/palette.json").${cfg.flavor}.colors; in { - options.programs.fuzzel.catppuccin = lib.ctp.mkCatppuccinOpt "fuzzel"; + options.programs.fuzzel.catppuccin = lib.ctp.mkCatppuccinOpt "fuzzel" // { + accent = lib.ctp.mkAccentOpt "fuzzel"; + }; config.programs.fuzzel.settings.colors = lib.mkIf enable { background = palette.base.hex + "dd"; @@ -16,6 +18,6 @@ in selection = palette.surface2.hex + "ff"; selection-match = palette.red.hex + "ff"; selection-text = palette.text.hex + "ff"; - border = palette."${cfg.accent}".hex + "ff"; + border = palette.${cfg.accent}.hex + "ff"; }; }