diff --git a/Droidnix/README.org b/Droidnix/README.org index 40f31d369..edbd5abf3 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -1104,7 +1104,7 @@ This is top file of this level which contains just an import statement for all r ** =generated/system/applications/terminal_shell/kitty.nix= This file sets up Kitty terminal #+BEGIN_SRC nix :tangle generated/system/applications/terminal_shell/kitty.nix :noweb tangle :mkdirp yes :eval never-html -{ config, pkgs, lib, user, ... }: +{ config, pkgs, lib, user, flakeRoot, ... }: let kittyConfigDir = "${config.home-manager.users.${user.username}.xdg.configHome}/kitty"; in @@ -1112,57 +1112,13 @@ in home-manager.users.${user.username} = { programs.kitty = { enable = true; - settings = { - font_family = "JetBrainsMono Nerd Font"; - font_size = 12.0; - cursor = "Beam"; - cursor_blink_interval = -1; - shell = "${pkgs.zsh}/bin/zsh"; - }; }; - # Catppuccin Mocha theme for Kitty (embedded) - xdg.configFile."kitty/kitty.conf".text = lib.concatStringsSep "\n" [ - "# Catppuccin Mocha theme" - "background #1e1e2e" - "foreground #cdd6f4" - "selection_background #f5e0dc" - "selection_foreground #1e1e2e" - "url_color #f5e0dc" - "cursor #f5e0dc" - "cursor_text_color #1e1e2e" - - "color0 #45475a" - "color8 #585b70" - - "color1 #f38ba8" - "color9 #f38ba8" - - "color2 #a6e3a1" - "color10 #a6e3a1" - - "color3 #f9e2af" - "color11 #f9e2af" - - "color4 #89b4fa" - "color12 #89b4fa" - - "color5 #f5c2e7" - "color13 #f5c2e7" - - "color6 #94e2d5" - "color14 #94e2d5" - - "color7 #bac2de" - "color15 #bac2de" - - "# Window settings" - "background_opacity 0.9" - "font_size 12.0" - "cursor_shape Beam" - ]; + # Use the kitty.conf from your assets + xdg.configFile."kitty/kitty.conf".source = "${flakeRoot}/assets/conf/kitty/kitty.conf"; }; } + #+END_SRC ** =generated/system/applications/terminal_shell/starship.nix= diff --git a/Droidnix/assets/common/conf/kitty/kitty.conf b/Droidnix/assets/common/conf/kitty/kitty.conf new file mode 120000 index 000000000..0eb75308c --- /dev/null +++ b/Droidnix/assets/common/conf/kitty/kitty.conf @@ -0,0 +1 @@ +/nix/store/hqg1qv89c89x5z6hyafbbyc0ncy0jbqs-home-manager-files/.config/kitty/kitty.conf \ No newline at end of file diff --git a/Droidnix/assets/common/conf/kitty/themes/Catppuccin-Mocha.conf b/Droidnix/assets/common/conf/kitty/themes/Catppuccin-Mocha.conf new file mode 120000 index 000000000..9f70e625d --- /dev/null +++ b/Droidnix/assets/common/conf/kitty/themes/Catppuccin-Mocha.conf @@ -0,0 +1 @@ +/nix/store/hqg1qv89c89x5z6hyafbbyc0ncy0jbqs-home-manager-files/.config/kitty/themes/Catppuccin-Mocha.conf \ No newline at end of file