From ab2d0f89bf00d148b11f9e42e737b8d99f988639 Mon Sep 17 00:00:00 2001 From: Andrew Coleman Date: Wed, 5 Feb 2025 20:46:40 -0500 Subject: [PATCH] switch to dark again --- .zshrc | 35 ++++-------- install-cli-tools.sh | 2 +- setup-shell-configs.sh | 126 +++++++++++++++++++++++++++++++++++++++-- 3 files changed, 133 insertions(+), 30 deletions(-) diff --git a/.zshrc b/.zshrc index a009b69..40a7d3f 100644 --- a/.zshrc +++ b/.zshrc @@ -1,12 +1,17 @@ -source /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh -source /nix/var/nix/profiles/default/etc/profile.d/nix.sh +if [ -d "/nix/var/nix/profiles/default/etc/profile.d" ]; then + source /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh + source /nix/var/nix/profiles/default/etc/profile.d/nix.sh +fi -export BAT_THEME="OneHalfLight" -export MANPAGER="sh -c 'col -bx | bat -l man -p'" +if command -v bat > /dev/null 2>&1; then + # export BAT_THEME="OneHalfLight" + export BAT_THEME="OneHalfDark" + export MANPAGER="sh -c 'col -bx | bat -l man -p'" +fi -LESS="-R"; export LESS +LESS="-RF"; export LESS PAGER=less; export PAGER -DELTA_PAGER=less; export DELTA_PAGER +DELTA_PAGER="less -RF"; export DELTA_PAGER # disable ^S and ^Q control flow stty -ixon @@ -68,7 +73,7 @@ export LS_COLORS="su=0:ca=0:*~=0;38;2;102;102;102:mh=0:do=0;38;2;0;0;0;48;2;255; if command -v eza > /dev/null ; then alias ls="eza --icons -F -g" else - if [ "$(uname -m)" = "Linux" ] ; then + if [ "$(uname -s)" =~ "linux" ]; then alias ls="ls --color=auto" else alias ls="ls -G" @@ -78,22 +83,6 @@ alias grep='grep --colour=auto' alias egrep='egrep --colour=auto' alias fgrep='fgrep --colour=auto' alias publicip='dig +short txt ch whoami.cloudflare @1.0.0.1' - -# llama keybindings -# | Key binding | Description | -# |------------------|--------------------| -# | `Arrows`, `hjkl` | Move cursor | -# | `Enter` | Enter directory | -# | `Backspace` | Exit directory | -# | `Space` | Toggle preview | -# | `Esc` | Exit with cd | -# | `Ctrl+C` | Exit without cd | -# | `/` | Fuzzy search | -# | `dd` | Delete file or dir | -function ll { - cd "$(llama "$@")" -} - alias http_server="python3 -m http.server" [ -d "$HOME/Library/Python/3.9/bin" ] && export PATH="$PATH:$HOME/Library/Python/3.9/bin" diff --git a/install-cli-tools.sh b/install-cli-tools.sh index 48a57c3..deab411 100755 --- a/install-cli-tools.sh +++ b/install-cli-tools.sh @@ -80,7 +80,7 @@ has_bin "just" || nix profile install nixpkgs#just has_bin "kibi" || nix profile install nixpkgs#kibi has_bin "kondo" || nix profile install nixpkgs#kondo has_bin "kubie" || nix profile install nixpkgs#kubie -has_bin "lls" || nix profile install nixpkgs#lls +# has_bin "lls" || nix profile install nixpkgs#lls has_bin "mdbook" || nix profile install nixpkgs#mdbook has_bin "mosh" || nix profile install nixpkgs#mosh has_bin "bisect-env" || nix profile install nixpkgs#nix-bisect diff --git a/setup-shell-configs.sh b/setup-shell-configs.sh index 7193c6c..8c7e460 100755 --- a/setup-shell-configs.sh +++ b/setup-shell-configs.sh @@ -20,11 +20,6 @@ config.font = wezterm.font_with_fallback({ }) config.font_size = 22.0 -- config.color_scheme = 'One Light (base16)' --- config.color_scheme = 'Material Darker (base16)' --- config.color_scheme = 'Belge (terminal.sexy)' --- config.color_scheme = 'GJM (terminal.sexy)' --- config.color_scheme = 'Helios (base16)' --- config.color_scheme = 'Synth Midnight Terminal Dark (base16)' config.color_scheme = 'Windows 10 (base16)' config.window_background_opacity = 0.9 config.initial_rows = 30 @@ -63,7 +58,8 @@ inherits = "onelight" EOF cat <"$HOME/.config/helix/config.toml" -theme = "mylight" +# theme = "mylight" +theme = "molokai" [editor] true-color = true @@ -88,6 +84,124 @@ tab = "all" enable = true EOF +mkdir -p "$HOME/.config/kitty" +cat <"$HOME/.config/kitty/kitty.conf" +font_family Operator Mono Book +bold_font Operator Mono Bold +italic_font Operator Mono Italic +bold_italic_font Operator Mono Bold Italic +font_size 20.0 +cursor_shape block +shell_integration no-cursor +tab_bar_edge top +remember_window_size yes +initial_window_width 130c +initial_window_height 35c +copy_on_select yes + +symbol_map U+23FB-U+23FE,U+2665,U+26A1,U+2B58,U+E000-U+E00A,U+E0A0-U+E0A3,U+E0B0-U+E0D4,U+E200-U+E2A9,U+E300-U+E3E3,U+E5FA-U+E6AA,U+E700-U+E7C5,U+EA60-U+EBEB,U+F000-U+F2E0,U+F300-U+F32F,U+F400-U+F4A9,U+F500-U+F8FF,U+F0001-U+F1AF0 Symbols Nerd Font + +# BEGIN_KITTY_THEME +include dark-theme.conf +# END_KITTY_THEME +EOF + +cat <"$HOME/.config/kitty/light-theme.conf" +# vim:ft=kitty +## name: One Half Light +## author: Son A. Pham +## license: MIT +## upstream: https://raw.githubusercontent.com/sonph/onehalf/master/kitty/onehalf-light.conf +## blurb: Clean, vibrant and pleasing color scheme + +foreground #383A42 +background #FAFAFA +selection_foreground #383A42 +selection_background #BFCEFF +url_color #F0F0F0 + +# black +color0 #383A42 +color8 #383A42 + +# red +color1 #E45649 +color9 #E45649 + +# green +color2 #40A14F +color10 #40A14F + +# yellow +color3 #C18401 +color11 #C18401 + +# blue +color4 #0184BC +color12 #0184BC + +# magenta +color5 #A626A4 +color13 #A626A4 + +# cyan +color6 #0997B3 +color14 #0997B3 + +# white +color7 #FAFAFA +color15 #FAFAFA +EOF + +cat <"$HOME/.config/kitty/dark-theme.conf" +# vim:ft=kitty + +## name: Campbell +## author: Microsoft +## blurb: The default theme of Microsoft's terminals, including Windows Terminal and cmd. + +# The basic colors +foreground #cccccc +background #0c0c0c +selection_background #ffffff + +# Cursor colors +cursor #ffffff + +# The basic 16 colors +# black +color0 #0c0c0c +color8 #767676 + +# red +color1 #c50f1f +color9 #e74856 + +# green +color2 #13a10e +color10 #16c60c + +# yellow +color3 #f19c00 +color11 #f9f1a5 + +# blue +color4 #0037da +color12 #3b78ff + +# magenta +color5 #881798 +color13 #b4009e + +# cyan +color6 #3a96dd +color14 #61d6d6 + +# white +color7 #cccccc +color15 #f2f2f2 +EOF + curl -sLo "$HOME/.config/themes.gitconfig" "https://raw.githubusercontent.com/dandavison/delta/main/themes.gitconfig" cat <"$HOME/.gitconfig" [include]