rebuilding minimised nix files
This commit is contained in:
@@ -1,12 +1,6 @@
|
||||
{ config, pkgs, lib, flakeRoot, ... }:
|
||||
let
|
||||
repoAlacrittyConf = flakeRoot.outPath + "/assets/conf/dev/alacritty.toml";
|
||||
in
|
||||
{
|
||||
xdg.enable = true;
|
||||
programs.alacritty.enable = true;
|
||||
# Override the config generated by programs.alacritty
|
||||
xdg.configFile."alacritty/alacritty.toml".source = lib.mkForce repoAlacrittyConf;
|
||||
catppuccin.alacritty.enable = true;
|
||||
catppuccin.alacritty.flavor = "mocha";
|
||||
}
|
||||
|
||||
@@ -1,27 +1,12 @@
|
||||
{ config, pkgs, lib, flakeRoot, ... }:
|
||||
let
|
||||
catppuccinMochaConf =
|
||||
builtins.readFile (flakeRoot.outPath + "/assets/conf/dev/terminal/Catppuccin-Mocha.conf");
|
||||
# Your own keymaps / other settings (but we will NOT rely on it for opacity)
|
||||
repoKittyConfText =
|
||||
builtins.readFile (flakeRoot.outPath + "/assets/conf/dev/terminal/kitty.conf");
|
||||
in
|
||||
{
|
||||
xdg.enable = true;
|
||||
# Stable theme file so kitty.conf can include it without /nix/store paths
|
||||
xdg.configFile."kitty/themes/Catppuccin-Mocha.conf".text = lib.mkForce catppuccinMochaConf;
|
||||
programs.kitty = {
|
||||
enable = true;
|
||||
# Home Manager generates ~/.config/kitty/kitty.conf; we append in-order:
|
||||
# 1) include theme
|
||||
# 2) your repo config (keymaps etc.)
|
||||
# 3) force opacity LAST so it always wins
|
||||
extraConfig = ''
|
||||
# 1) Theme first (stable path)
|
||||
include themes/Catppuccin-Mocha.conf
|
||||
# 2) Your repo config (may also include theme; harmless if duplicated)
|
||||
${repoKittyConfText}
|
||||
# 3) Force transparency last (wins)
|
||||
# 2) Force transparency last (wins)
|
||||
#background_opacity 0.60
|
||||
#dynamic_background_opacity yes
|
||||
'';
|
||||
|
||||
@@ -21,7 +21,7 @@ let
|
||||
trim = lib.strings.trim;
|
||||
# ---------- minimal INI-ish parser (sections + raw lines) ----------
|
||||
readMaybe = p: if builtins.pathExists p then builtins.readFile p else "";
|
||||
normalizeLine = l: trim (lib.replaceStrings [ "\r" ] [ "" ] l);
|
||||
normalizeLine = l: trim (l`ib.replaceStrings [ "\r" ] [ "" ] l);
|
||||
parseSections = text:
|
||||
let
|
||||
lines = map normalizeLine (lib.splitString "\n" text);
|
||||
|
||||
@@ -1,9 +1,4 @@
|
||||
{ config, pkgs, lib, flakeRoot, ... }:
|
||||
let
|
||||
repoStarshipToml = flakeRoot.outPath + "/assets/conf/dev/terminal/starship.toml";
|
||||
# The exact key that appears in the error:
|
||||
targetKey = "${config.home.homeDirectory}/.config/starship.toml";
|
||||
in
|
||||
{
|
||||
xdg.enable = true;
|
||||
programs.starship = {
|
||||
@@ -12,6 +7,4 @@ in
|
||||
enableBashIntegration = true;
|
||||
enableFishIntegration = true;
|
||||
};
|
||||
# Force the *actual conflicting option* (home.file."<abs path>".source)
|
||||
home.file."${targetKey}".source = lib.mkForce repoStarshipToml;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user