diff --git a/henrovnix_ok/README.org b/henrovnix_ok/README.org index b4dd61011..5b0516d4d 100755 --- a/henrovnix_ok/README.org +++ b/henrovnix_ok/README.org @@ -2174,7 +2174,7 @@ All the miscellaneous dev tools on this computer. }; git = { enable = true; - lfs.enable = true; + lfs.enable = true;henro }; }; } @@ -2186,16 +2186,20 @@ Kitty gets installed and configured { config, pkgs, lib, flakeRoot, ... }: let repoKittyConf = flakeRoot + "/assets/conf/dev/terminal/kitty.conf"; + # Use the Catppuccin theme shipped by the catppuccin/kitty repo (mocha flavor). + # (Could also use a file from a package, but keeping it explicit & stable is easiest.) + catppuccinMochaConf = builtins.readFile (flakeRoot + "/assets/conf/dev/terminal/Catppuccin-Mocha.conf"); in { xdg.enable = true; programs.kitty.enable = true; - catppuccin.alacritty.enable = true; - catppuccin.alacritty.flavor = "mocha"; - syntaxHighlighting.enable = true; - autosuggestion.enable = true; - enableCompletion = true; + # Single source of truth: kitty.conf from your repo xdg.configFile."kitty/kitty.conf".source = repoKittyConf; + # Provide a stable include target (no /nix/store paths in kitty.conf) + xdg.configFile."kitty/themes/Catppuccin-Mocha.conf".text = catppuccinMochaConf; + # (Remove these from this module; they don't apply to kitty) + # catppuccin.alacritty.enable = ... + # syntaxHighlighting.enable / autosuggestion.enable / enableCompletion } #+end_src diff --git a/henrovnix_ok/assets/conf/dev/terminal/Catppuccin-Mocha.conf b/henrovnix_ok/assets/conf/dev/terminal/Catppuccin-Mocha.conf new file mode 100644 index 000000000..6eb38becc --- /dev/null +++ b/henrovnix_ok/assets/conf/dev/terminal/Catppuccin-Mocha.conf @@ -0,0 +1,84 @@ +# vim:ft=kitty + +## name: Catppuccin Kitty Mocha +## author: Catppuccin Org +## license: MIT +## upstream: https://github.com/catppuccin/kitty/blob/main/themes/mocha.conf +## blurb: Soothing pastel theme for the high-spirited! + + + +# The basic colors +foreground #cdd6f4 +background #1e1e2e +selection_foreground #1e1e2e +selection_background #f5e0dc + +# Cursor colors +cursor #f5e0dc +cursor_text_color #1e1e2e + +# Scrollbar colors +scrollbar_handle_color #9399b2 +scrollbar_track_color #45475a + +# URL color when hovering with mouse +url_color #f5e0dc + +# Kitty window border colors +active_border_color #b4befe +inactive_border_color #6c7086 +bell_border_color #f9e2af + +# OS Window titlebar colors +wayland_titlebar_color system +macos_titlebar_color system + +# Tab bar colors +active_tab_foreground #11111b +active_tab_background #cba6f7 +inactive_tab_foreground #cdd6f4 +inactive_tab_background #181825 +tab_bar_background #11111b + +# Colors for marks (marked text in the terminal) +mark1_foreground #1e1e2e +mark1_background #b4befe +mark2_foreground #1e1e2e +mark2_background #cba6f7 +mark3_foreground #1e1e2e +mark3_background #74c7ec + +# The 16 terminal colors + +# black +color0 #45475a +color8 #585b70 + +# red +color1 #f38ba8 +color9 #f38ba8 + +# green +color2 #a6e3a1 +color10 #a6e3a1 + +# yellow +color3 #f9e2af +color11 #f9e2af + +# blue +color4 #89b4fa +color12 #89b4fa + +# magenta +color5 #f5c2e7 +color13 #f5c2e7 + +# cyan +color6 #94e2d5 +color14 #94e2d5 + +# white +color7 #bac2de +color15 #a6adc8 diff --git a/henrovnix_ok/assets/conf/dev/terminal/kitty.conf b/henrovnix_ok/assets/conf/dev/terminal/kitty.conf index dea7aa612..3d52b31ca 100644 --- a/henrovnix_ok/assets/conf/dev/terminal/kitty.conf +++ b/henrovnix_ok/assets/conf/dev/terminal/kitty.conf @@ -16,16 +16,13 @@ # Make sure the lines starting with: cd ~/henrovnix # are written as ONE single line. ############################################### -#~/nixos/files/conf/terminal/kitty.conf -# Kitty config (https://sw.kovidgoyal.net/kitty/conf/) -# -# Edit freely; NixOS will inject this file verbatim via programs.kitty.extraConfig. +include Catppuccin-Mocha.conf -# Example baseline settings: +# Force transparency (comes from the conf file, as you want) background_opacity 0.60 dynamic_background_opacity yes -# Suggested: allow ctrl+shift+v paste (many distros default this already) +# the rest… map ctrl+shift+v paste_from_clipboard map ctrl+shift+c copy_to_clipboard