Make Wezterm default terminal; and use starship prompt

This commit is contained in:
mitchell 2024-06-30 19:33:35 -04:00
parent 503fb8bff6
commit 39ec755186
17 changed files with 330 additions and 65 deletions

View File

@ -11,6 +11,7 @@ function configure_fish
import_sources $uname import_sources $uname
define_aliases $uname define_aliases $uname
ssh_agent_startup ssh_agent_startup
starship init fish | source
end end
configure_fish configure_fish

View File

@ -1,43 +0,0 @@
# vim:fileencoding=utf-8:foldmethod=marker
font_family JetBrainsMono Nerd Font
bold_font JetBrains Mono Bold
italic_font JetBrains Mono Italic
bold_italic_font JetBrains Mono Bold Italic
map ctrl+shift+j next_window
map ctrl+shift+k previous_window
# Theme (Gruvbox Dark)
background_opacity 0.85
selection_foreground #ebdbb2
selection_background #d65d0e
background #282828
foreground #ebdbb2
color0 #3c3836
color1 #cc241d
color2 #98971a
color3 #d79921
color4 #458588
color5 #b16286
color6 #689d6a
color7 #a89984
color8 #928374
color9 #fb4934
color10 #b8bb26
color11 #fabd2f
color12 #83a598
color13 #d3869b
color14 #8ec07c
color15 #fbf1c7
cursor #bdae93
cursor_text_color #665c54
url_color #458588
Footer

194
.config/starship.toml Normal file
View File

@ -0,0 +1,194 @@
add_newline = false
palette = 'gruvbox_dark'
[palettes.gruvbox_dark]
fg = '#ebdbb2'
bg = '#282828'
gray = '#a89984'
blue = '#458588'
aqua = '#689d6a'
green = '#98971a'
orange = '#d65d0e'
purple = '#b16286'
red = '#cc241d'
yellow = '#d79921'
[jobs]
symbol = ""
[aws]
disabled = true
symbol = " "
[ruby]
disabled = true
symbol = " "
[nodejs]
disabled = false
symbol = " "
[buf]
symbol = "Buf "
[bun]
symbol = " "
[c]
symbol = " "
[conda]
symbol = " "
[crystal]
symbol = " "
[dart]
symbol = " "
[directory]
read_only = " 󰌾"
style = "bold blue"
[docker_context]
symbol = " "
[elixir]
symbol = " "
[elm]
symbol = " "
[fennel]
symbol = " "
[fossil_branch]
symbol = " "
[git_branch]
symbol = " "
[git_status]
ahead = '^'
behind = 'v'
deleted = "x"
[golang]
symbol = " "
[guix_shell]
symbol = " "
[haskell]
symbol = " "
[haxe]
symbol = " "
[hg_branch]
symbol = " "
[hostname]
ssh_symbol = " "
[java]
symbol = " "
[julia]
symbol = " "
[kotlin]
symbol = " "
[lua]
symbol = " "
[memory_usage]
symbol = "󰍛 "
[meson]
symbol = "󰔷 "
[nim]
symbol = "󰆥 "
[nix_shell]
symbol = " "
[ocaml]
symbol = " "
[os.symbols]
Alpaquita = " "
Alpine = " "
AlmaLinux = " "
Amazon = " "
Android = " "
Arch = " "
Artix = " "
CentOS = " "
Debian = " "
DragonFly = " "
Emscripten = " "
EndeavourOS = " "
Fedora = " "
FreeBSD = " "
Garuda = "󰛓 "
Gentoo = " "
HardenedBSD = "󰞌 "
Illumos = "󰈸 "
Kali = " "
Linux = " "
Mabox = " "
Macos = " "
Manjaro = " "
Mariner = " "
MidnightBSD = " "
Mint = " "
NetBSD = " "
NixOS = " "
OpenBSD = "󰈺 "
openSUSE = " "
OracleLinux = "󰌷 "
Pop = " "
Raspbian = " "
Redhat = " "
RedHatEnterprise = " "
RockyLinux = " "
Redox = "󰀘 "
Solus = "󰠳 "
SUSE = " "
Ubuntu = " "
Unknown = " "
Void = " "
Windows = "󰍲 "
[package]
symbol = "󰏗 "
[perl]
symbol = " "
[php]
symbol = " "
[pijul_channel]
symbol = " "
[python]
symbol = " "
[rlang]
symbol = "󰟔 "
[rust]
symbol = " "
[scala]
symbol = " "
[swift]
symbol = " "
[zig]
symbol = " "

View File

@ -4,7 +4,7 @@
# terminal emulator # terminal emulator
super + Return super + Return
kitty wezterm-gui start
# browser # browser
super + shift + Return super + shift + Return

View File

@ -1,5 +1,5 @@
# open terminal # open terminal
cmd - return : /Applications/kitty.app/Contents/MacOS/kitty --single-instance -d ~ cmd - return : /usr/local/bin/wezterm-gui start
# open web browser # open web browser
shift + cmd - return : /Applications/Firefox.app/Contents/MacOS/firefox shift + cmd - return : /Applications/Firefox.app/Contents/MacOS/firefox

34
.wezterm.lua Normal file
View File

@ -0,0 +1,34 @@
local wezterm = require("wezterm")
local config = wezterm.config_builder()
local act = wezterm.action
local is_darwin = function()
return wezterm.target_triple:find("darwin") ~= nil
end
config.color_scheme = "GruvboxDark"
config.window_background_opacity = is_darwin() and 0.8 or 0.5
config.window_decorations = "RESIZE"
config.font_size = is_darwin() and 13 or 11
config.tab_bar_at_bottom = true
config.hide_tab_bar_if_only_one_tab = true
config.keys = {
{ key = "Enter", mods = "SHIFT|CTRL", action = act.SplitVertical({ domain = "CurrentPaneDomain" }) },
{ key = '"', mods = "SHIFT|CTRL", action = act.SplitHorizontal({ domain = "CurrentPaneDomain" }) },
{ key = "X", mods = "SHIFT|CTRL|ALT", action = act.ActivateCopyMode },
{ key = "Z", mods = "SHIFT|CTRL|ALT", action = act.TogglePaneZoomState },
{ key = "H", mods = "SHIFT|CTRL", action = act.ActivatePaneDirection("Left") },
{ key = "H", mods = "SHIFT|ALT|CTRL", action = act.AdjustPaneSize({ "Left", 1 }) },
{ key = "L", mods = "SHIFT|CTRL", action = act.ActivatePaneDirection("Right") },
{ key = "L", mods = "SHIFT|ALT|CTRL", action = act.AdjustPaneSize({ "Right", 1 }) },
{ key = "K", mods = "SHIFT|CTRL", action = act.ActivatePaneDirection("Up") },
{ key = "K", mods = "SHIFT|ALT|CTRL", action = act.AdjustPaneSize({ "Up", 1 }) },
{ key = "J", mods = "SHIFT|CTRL", action = act.ActivatePaneDirection("Down") },
{ key = "J", mods = "SHIFT|ALT|CTRL", action = act.AdjustPaneSize({ "Down", 1 }) },
{ key = "D", mods = "SHIFT|ALT|CTRL", action = act.ShowDebugOverlay },
}
return config

View File

@ -10,15 +10,13 @@ This repo contains my preferred configurations for:
- neovim - neovim
- tmux - tmux
- git - git
- kitty terminal - Wez's terminal
- Jetbrains vim plugin - Jetbrains vim plugin
- keepassxc - keepassxc
- qutebrowser
- bspwm (Linux) - bspwm (Linux)
- sxhkd (Linux) - sxhkd (Linux)
- yabaiwm (macOS) - yabaiwm (macOS)
- skhd (macOS) - skhd (macOS)
- conky
## Scripts ## Scripts

View File

@ -353,7 +353,7 @@ d-i apt-setup/security_host string security.debian.org
tasksel tasksel/first multiselect standard, ssh-server tasksel tasksel/first multiselect standard, ssh-server
# Individual additional packages to install # Individual additional packages to install
d-i pkgsel/include string git fish curl neovim kitty-terminfo firewalld qemu-guest-agent d-i pkgsel/include string git fish curl neovim firewalld qemu-guest-agent
# Whether to upgrade packages after debootstrap. # Whether to upgrade packages after debootstrap.
# Allowed values: none, safe-upgrade, full-upgrade # Allowed values: none, safe-upgrade, full-upgrade
#d-i pkgsel/upgrade select none #d-i pkgsel/upgrade select none

88
pkglist.txt Normal file
View File

@ -0,0 +1,88 @@
age
android-studio
android-tools
archlinux-contrib
aria2
aws-cli-v2
barrier
bat
bspwm
bun-bin
caddy
cbatticon
curl
discord
dunst
easyeffects
feh
firefox
firewalld
fish
flameshot
fzf
git
git-delta
glances
htop
inxi
jellyfin-mpv-shim
jq
keepassxc
light
mosh
mpv
ncdu
neofetch
neovim
nnn
noto-fonts-emoji
pacman-contrib
parsec-bin
pasystray
pavucontrol
picom
pikaur
pipewire
pipewire-alsa
pipewire-pulse
playerctl
polybar
pyright
python
python-pip
python-pynvim
rclone
reactotron
reflector
ripgrep
rofi
rsync
slack-desktop
slock
speedtest-cli
spotify-launcher
starship
steam
streamlink
streamlink-twitch-gui-bin
stylua
sxhkd
syncthing
terraform
the_silver_searcher
tigervnc
tlp
tmux
traceroute
ttf-font-awesome
ttf-ibm-plex
ttf-jetbrains-mono
ttf-jetbrains-mono-nerd
ttf-liberation
ttf-nerd-fonts-symbols
ttf-nerd-fonts-symbols-mono
vlc
wezterm
wget
wireguard-tools
yt-dlp

View File

@ -49,7 +49,6 @@ function terminal_env -d 'Install base terminal utilities and sync configuration
tmux \ tmux \
rsync \ rsync \
curl \ curl \
kitty-terminfo \
fzf \ fzf \
nnn \ nnn \
mosh mosh
@ -89,7 +88,6 @@ function desktop_env -d 'Install base desktop utilities and configure theme'
picom \ picom \
feh \ feh \
rofi \ rofi \
kitty \
wget \ wget \
unzip \ unzip \
physlock \ physlock \
@ -111,6 +109,7 @@ function desktop_env -d 'Install base desktop utilities and configure theme'
pipewire-alsa \ pipewire-alsa \
polybar \ polybar \
light \ light \
wezterm \
slock slock
set -l debian_pkgs \ set -l debian_pkgs \

View File

@ -1,2 +1,2 @@
#!/bin/sh #!/bin/sh
kitty fish -c glance wezterm start fish -c glance

View File

@ -1,2 +1,2 @@
#!/usr/bin/sh #!/usr/bin/sh
kitty fish -c jmpv wezterm start fish -c jmpv

View File

@ -1,2 +1,2 @@
#!/usr/bin/env fish #!/usr/bin/env fish
kitty fish -c "redisco $argv" wezterm start fish -c "redisco $argv"

View File

@ -1,2 +1,2 @@
#!/usr/bin/env fish #!/usr/bin/env fish
kitty fish -c "sesh $argv" wezterm start fish -c "sesh $argv"

View File

@ -1,2 +1,2 @@
#!/usr/bin/sh #!/usr/bin/sh
kitty fish -c vban wezterm start fish -c vban

View File

@ -1,2 +1,2 @@
#!/usr/bin/sh #!/usr/bin/sh
kitty fish -c ytmpv wezterm start fish -c ytmpv

10
sync
View File

@ -27,7 +27,6 @@ function main
set_color grey set_color grey
sync_desktop_env $uname sync_desktop_env $uname
set_kitty_font_size $uname
end end
if test -n "$_flag_g" if test -n "$_flag_g"
@ -67,10 +66,11 @@ function sync_terminal_env
and rsync -aP ./.vim ~/ and rsync -aP ./.vim ~/
and rsync -aP ./.vimrc ~/ and rsync -aP ./.vimrc ~/
and rsync -aP ./scripts/ ~/code/scripts/ and rsync -aP ./scripts/ ~/code/scripts/
and rsync -aP ./.config/starship.toml ~/.config/
end end
function sync_desktop_env -a uname function sync_desktop_env -a uname
rsync -aP ./.config/kitty ~/.config/ rsync -aP ./.wezterm.lua ~/
and rsync -aP ./.ideavimrc ~/ and rsync -aP ./.ideavimrc ~/
or return 1 or return 1
@ -87,12 +87,6 @@ function sync_desktop_env -a uname
end end
end end
function set_kitty_font_size -a uname
if test "$uname" = Darwin
sed -i '' -e 's/font_size 11\.0/font_size 13\.0/' ~/.config/kitty/kitty.conf
end
end
function install_fisher_packages function install_fisher_packages
eval fisher eval fisher
end end