From 53e628ac27040cf80f131fe984ed9e678e68cd70 Mon Sep 17 00:00:00 2001 From: willemml Date: Mon, 13 Nov 2023 02:30:04 -0800 Subject: [PATCH] Removes iTerm, adds dracula plus theme to kitty --- home/darwin/default.nix | 1 - home/darwin/iterm2.nix | 264 -------------------- home/packages.nix | 1 - home/programs/default.nix | 1 + home/programs/kitty/default.nix | 22 ++ home/programs/kitty/themes/draculaplus.conf | 21 ++ 6 files changed, 44 insertions(+), 266 deletions(-) delete mode 100644 home/darwin/iterm2.nix create mode 100644 home/programs/kitty/default.nix create mode 100644 home/programs/kitty/themes/draculaplus.conf diff --git a/home/darwin/default.nix b/home/darwin/default.nix index e4a2762..c89f493 100644 --- a/home/darwin/default.nix +++ b/home/darwin/default.nix @@ -9,7 +9,6 @@ ../modules/nix/pkgs-config.nix ../default.nix ./finder.nix - ./iterm2.nix ./keybinds.nix ./launchd.nix ]; diff --git a/home/darwin/iterm2.nix b/home/darwin/iterm2.nix deleted file mode 100644 index a03f3cf..0000000 --- a/home/darwin/iterm2.nix +++ /dev/null @@ -1,264 +0,0 @@ -{ - pkgs, - lib, - ... -}: let - dracula_plus = { - "Ansi 0 Color" = { - "Alpha Component" = 1; - "Blue Component" = 0.172549; - "Color Space" = "sRGB"; - "Green Component" = 0.133333; - "Red Component" = 0.129412; - }; - "Ansi 1 Color" = { - "Alpha Component" = 1; - "Blue Component" = 0.333333; - "Color Space" = "sRGB"; - "Green Component" = 0.333333; - "Red Component" = 1; - }; - "Ansi 10 Color" = { - "Alpha Component" = 1; - "Blue Component" = 0.580392; - "Color Space" = "sRGB"; - "Green Component" = 1; - "Red Component" = 0.411765; - }; - "Ansi 11 Color" = { - "Alpha Component" = 1; - "Blue Component" = 0.419608; - "Color Space" = "sRGB"; - "Green Component" = 0.796078; - "Red Component" = 1; - }; - "Ansi 12 Color" = { - "Alpha Component" = 1; - "Blue Component" = 1; - "Color Space" = "sRGB"; - "Green Component" = 0.67451; - "Red Component" = 0.839216; - }; - "Ansi 13 Color" = { - "Alpha Component" = 1; - "Blue Component" = 0.87451; - "Color Space" = "sRGB"; - "Green Component" = 0.572549; - "Red Component" = 1; - }; - "Ansi 14 Color" = { - "Alpha Component" = 1; - "Blue Component" = 1; - "Color Space" = "sRGB"; - "Green Component" = 1; - "Red Component" = 0.643137; - }; - "Ansi 15 Color" = { - "Alpha Component" = 1; - "Blue Component" = 0.94902; - "Color Space" = "sRGB"; - "Green Component" = 0.972549; - "Red Component" = 0.972549; - }; - "Ansi 2 Color" = { - "Alpha Component" = 1; - "Blue Component" = 0.482353; - "Color Space" = "sRGB"; - "Green Component" = 0.980392; - "Red Component" = 0.313726; - }; - "Ansi 3 Color" = { - "Alpha Component" = 1; - "Blue Component" = 0.419608; - "Color Space" = "sRGB"; - "Green Component" = 0.796078; - "Red Component" = 1; - }; - "Ansi 4 Color" = { - "Alpha Component" = 1; - "Blue Component" = 1; - "Color Space" = "sRGB"; - "Green Component" = 0.666667; - "Red Component" = 0.509804; - }; - "Ansi 5 Color" = { - "Alpha Component" = 1; - "Blue Component" = 0.917647; - "Color Space" = "sRGB"; - "Green Component" = 0.572549; - "Red Component" = 0.780392; - }; - "Ansi 6 Color" = { - "Alpha Component" = 1; - "Blue Component" = 0.992157; - "Color Space" = "sRGB"; - "Green Component" = 0.913725; - "Red Component" = 0.545098; - }; - "Ansi 7 Color" = { - "Alpha Component" = 1; - "Blue Component" = 0.94902; - "Color Space" = "sRGB"; - "Green Component" = 0.972549; - "Red Component" = 0.972549; - }; - "Ansi 8 Color" = { - "Alpha Component" = 1; - "Blue Component" = 0.329412; - "Color Space" = "sRGB"; - "Green Component" = 0.329412; - "Red Component" = 0.329412; - }; - "Ansi 9 Color" = { - "Alpha Component" = 1; - "Blue Component" = 0.431373; - "Color Space" = "sRGB"; - "Green Component" = 0.431373; - "Red Component" = 1; - }; - "Background Color" = { - "Alpha Component" = 1; - "Blue Component" = 0.129412; - "Color Space" = "sRGB"; - "Green Component" = 0.129412; - "Red Component" = 0.129412; - }; - "Badge Color" = { - "Alpha Component" = 0.5; - "Blue Component" = 0.321569; - "Color Space" = "sRGB"; - "Green Component" = 0.258824; - "Red Component" = 0.231373; - }; - "Bold Color" = { - "Alpha Component" = 1; - "Blue Component" = 1; - "Color Space" = "sRGB"; - "Green Component" = 1; - "Red Component" = 0.999996; - }; - "Cursor Color" = { - "Alpha Component" = 1; - "Blue Component" = 0.956863; - "Color Space" = "sRGB"; - "Green Component" = 0.937255; - "Red Component" = 0.92549; - }; - "Cursor Guide Color" = { - "Alpha Component" = 1; - "Blue Component" = 0.211765; - "Color Space" = "sRGB"; - "Green Component" = 0.219608; - "Red Component" = 0.235294; - }; - "Cursor Text Color" = { - "Alpha Component" = 1; - "Blue Component" = 0.156863; - "Color Space" = "sRGB"; - "Green Component" = 0.156863; - "Red Component" = 0.156863; - }; - "Foreground Color" = { - "Alpha Component" = 1; - "Blue Component" = 0.94902; - "Color Space" = "sRGB"; - "Green Component" = 0.972549; - "Red Component" = 0.972549; - }; - "Link Color" = { - "Alpha Component" = 1; - "Blue Component" = 1; - "Color Space" = "sRGB"; - "Green Component" = 1; - "Red Component" = 0.996078; - }; - "Selected Text Color" = { - "Alpha Component" = 1; - "Blue Component" = 0.329412; - "Color Space" = "sRGB"; - "Green Component" = 0.329412; - "Red Component" = 0.329412; - }; - "Selection Color" = { - "Alpha Component" = 1; - "Blue Component" = 0.94902; - "Color Space" = "sRGB"; - "Green Component" = 0.972549; - "Red Component" = 0.972549; - }; - "Tab Color" = { - "Alpha Component" = 1; - "Blue Component" = 0.321569; - "Color Space" = "sRGB"; - "Green Component" = 0.258824; - "Red Component" = 0.231373; - }; - }; - profile_defaults = - { - "ASCII Anti Aliased" = true; - "Ambiguous Double Width" = false; - "BM Growl" = true; - "Background Image Location" = ""; - "Blinking Cursor" = false; - "Blur" = false; - "Character Encoding" = 4; - "Close Sessions On End" = true; - "Flashing Bell" = false; - "Horizontal Spacing" = 1; - "Idle Code" = 0; - "Jobs to Ignore" = ["rlogin" "ssh" "slogin" "telnet"]; - "Mouse Reporting" = true; - "Non Ascii Font" = "Monaco 12"; - "Non-ASCII Anti Aliased" = true; - "Normal Font" = "MesloLGS-NF-Regular 12"; - "Option Key Sends" = 2; - "Prompt Before Closing 2" = false; - "Right Option Key Sends" = 0; - "Scrollback Lines" = 0; - "Send Code When Idle" = false; - "Silence Bell" = false; - "Sync Title" = false; - "Terminal Type" = "xterm-256color"; - "Transparency" = 0; - "Unlimited Scrollback" = true; - "Use Bold Font" = true; - "Use Bright Bold" = true; - "Use Italic Font" = true; - "Use Non-ASCII Font" = false; - "Vertical Spacing" = 1; - "Visual Bell" = true; - "Window Type" = 0; - } - // dracula_plus; -in { - targets.darwin.defaults."com.googlecode.iterm2" = { - "AlternateMouseScroll" = true; - "Default Bookmark Guid" = "30FFD0AB-B2EB-4635-9469-D089C1D9E106"; - "HotkeyMigratedFromSingleToMulti" = true; - "LeftCommand" = 7; - "LeftOption" = 2; - "ShowFullScreenTabBar" = false; - "SoundForEsc" = false; - "SUEnableAutomaticChecks" = false; - "SUHasLaunchedBefore" = true; - "VisualIndicatorForEsc" = false; - "New Bookmarks" = [ - ({ - "Columns" = 120; - "Command" = ""; - "Custom Command" = "No"; - "Custom Directory" = "No"; - "Default Bookmark" = "Yes"; - "Description" = "Default"; - "Guid" = "30FFD0AB-B2EB-4635-9469-D089C1D9E106"; - "Name" = "Primary"; - "Rows" = 30; - "Screen" = -1; - "Tags" = []; - "Working Directory" = "/Users/willem"; - } - // profile_defaults) - ]; - }; -} diff --git a/home/packages.nix b/home/packages.nix index 7efc26c..00b3a54 100644 --- a/home/packages.nix +++ b/home/packages.nix @@ -47,7 +47,6 @@ in { graphviz htop jq - kitty mu nix-zsh-completions nixfmt diff --git a/home/programs/default.nix b/home/programs/default.nix index 563c79b..095e4b0 100644 --- a/home/programs/default.nix +++ b/home/programs/default.nix @@ -6,6 +6,7 @@ }: { imports = [ ./emacs + ./kitty ./ssh.nix ./zsh.nix ]; diff --git a/home/programs/kitty/default.nix b/home/programs/kitty/default.nix new file mode 100644 index 0000000..c6ec5d2 --- /dev/null +++ b/home/programs/kitty/default.nix @@ -0,0 +1,22 @@ +{ + lib, + config, + pkgs, + ... +}: { + programs.kitty = { + enable = true; + extraConfig = '' + include themes/draculaplus.conf + ''; + shellIntegration.enableZshIntegration = true; + + font = { + package = pkgs.meslo-lgs-nf; + name = "MesloLGS NF Regular"; + size = 12; + }; + }; + + home.file.".config/kitty/themes".source = ./themes; +} diff --git a/home/programs/kitty/themes/draculaplus.conf b/home/programs/kitty/themes/draculaplus.conf new file mode 100644 index 0000000..8235719 --- /dev/null +++ b/home/programs/kitty/themes/draculaplus.conf @@ -0,0 +1,21 @@ +background #212121 +foreground #f8f8f2 +color0 #21212b +color1 #ff5454 +color2 #50f97b +color3 #ffca6b +color4 #c691e9 +color5 #82aaff +color6 #8ae8fd +color7 #f8f8f2 +color8 #545454 +color9 #ff6e6e +color10 #69ff93 +color11 #ffca6b +color12 #ff91df +color13 #d6acff +color14 #a3ffff +color15 #f8f8f2 +cursor #ebeff4 +selection_background #f8f8f2 +selection_foreground #545454 \ No newline at end of file