diff --git a/home/shell/default.nix b/home/shell/default.nix index b31feb6..182dc44 100644 --- a/home/shell/default.nix +++ b/home/shell/default.nix @@ -66,7 +66,6 @@ in bindkey "$terminfo[kcud1]" history-substring-search-down bindkey -M vicmd 'k' history-substring-search-up bindkey -M vicmd 'j' history-substring-search-down - ''; inherit shellAliases; }; diff --git a/home/shell/kitty-gruvbox-dark.conf b/home/shell/kitty-gruvbox-dark.conf deleted file mode 100644 index 369da8d..0000000 --- a/home/shell/kitty-gruvbox-dark.conf +++ /dev/null @@ -1,49 +0,0 @@ -# gruvbox dark by morhetz, https://github.com/morhetz/gruvbox -# This work is licensed under the terms of the MIT license. -# For a copy, see https://opensource.org/licenses/MIT. - -background #282828 -foreground #ebdbb2 - -cursor #928374 - -selection_foreground #928374 -selection_background #3c3836 - -color0 #282828 -color8 #928374 - -# red -color1 #cc241d -# light red -color9 #fb4934 - -# green -color2 #98971a -# light green -color10 #b8bb26 - -# yellow -color3 #d79921 -# light yellow -color11 #fabd2d - -# blue -color4 #458588 -# light blue -color12 #83a598 - -# magenta -color5 #b16286 -# light magenta -color13 #d3869b - -# cyan -color6 #689d6a -# lighy cyan -color14 #8ec07c - -# light gray -color7 #a89984 -# dark gray -color15 #928374 diff --git a/home/shell/terminal.nix b/home/shell/terminal.nix index 74bc8c1..6745d02 100644 --- a/home/shell/terminal.nix +++ b/home/shell/terminal.nix @@ -7,18 +7,20 @@ let ''; in { - # doesn't support font ligatures & undercurls - # start with tabbed (need to override alacritty package) + # doesn't yet support font ligatures & undercurls programs.alacritty = { enable = true; + package = runCommand "alacritty" { + buildInputs = [ makeWrapper ]; + } '' + mkdir $out + ln -s ${alacritty}/* $out + rm $out/bin + makeWrapper ${tabbed}/bin/tabbed $out/bin/alacritty \ + --add-flags "-c -n Alacritty" \ + --add-flags "${alacritty}/bin/alacritty --embed" + ''; settings = recursiveUpdate { } (trivial.importJSON (yamlToJSON ./alacritty-gruvbox-dark.yml)); }; - - programs.kitty = { - enable = true; - extraConfig = '' - ${with builtins; readFile ./kitty-gruvbox-dark.conf} - ''; - }; }