From 67f8024c58eeb75cf4203371010021000440af06 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Sun, 9 Nov 2025 04:52:01 -0700 Subject: home-manager cannot support simultaneous adding and importing themes --- flake.lock | 17 ----------------- flake.nix | 8 ++++---- modules/home-manager/helix.nix | 18 +++++++++--------- 3 files changed, 13 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index 19cceb2..6b7e0db 100644 --- a/flake.lock +++ b/flake.lock @@ -97,22 +97,6 @@ "type": "github" } }, - "catppuccin-helix": { - "flake": false, - "locked": { - "lastModified": 1753613333, - "narHash": "sha256-l9R3wMBLf2jofboGIaH39VnpjxP0lbWvhlexdNXq2co=", - "owner": "catppuccin", - "repo": "helix", - "rev": "1f13d5e7c72b064699e2c8761f603e4ddd48db8a", - "type": "github" - }, - "original": { - "owner": "catppuccin", - "repo": "helix", - "type": "github" - } - }, "catppuccin-hyprland": { "flake": false, "locked": { @@ -904,7 +888,6 @@ "catppuccin-alacritty": "catppuccin-alacritty", "catppuccin-bat": "catppuccin-bat", "catppuccin-btop": "catppuccin-btop", - "catppuccin-helix": "catppuccin-helix", "catppuccin-hyprland": "catppuccin-hyprland", "catppuccin-starship": "catppuccin-starship", "catppuccin-waybar": "catppuccin-waybar", diff --git a/flake.nix b/flake.nix index 2d5ce83..7d120ae 100644 --- a/flake.nix +++ b/flake.nix @@ -125,10 +125,10 @@ url = "github:catppuccin/alacritty"; flake = false; }; - catppuccin-helix = { - url = "github:catppuccin/helix"; - flake = false; - }; + # catppuccin-helix = { + # url = "github:catppuccin/helix"; + # flake = false; + # }; catppuccin-starship = { url = "github:catppuccin/starship"; flake = false; diff --git a/modules/home-manager/helix.nix b/modules/home-manager/helix.nix index cbcd6c0..604a44e 100644 --- a/modules/home-manager/helix.nix +++ b/modules/home-manager/helix.nix @@ -1,20 +1,20 @@ { pkgs, inputs, ... }: { # https://github.com/catppuccin/helix - xdg.configFile."helix/themes".source = "${inputs.catppuccin-helix}/themes/default"; + # xdg.configFile."helix/themes".source = "${inputs.catppuccin-helix}/themes/default"; programs.helix = { enable = true; package = pkgs.helix; # defaultEditor = true; - # themes = { - # custom = { - # "inherits" = "catpuccin_mocha"; - # "ui.background" = {}; - # }; - # }; + themes = { + catppuccin_mocha_transparent = { + "inherits" = "catppuccin_mocha"; + "ui.background" = {}; + }; + }; settings = { - # theme = "catppuccin_mocha"; - theme = "base16_transparent"; + theme = "catppuccin_mocha_transparent"; + # theme = "base16_transparent"; editor = { line-number = "relative"; cursorline = true; -- cgit v1.2.3