Compare commits

...

2 Commits

2 changed files with 21 additions and 12 deletions

21
.zshrc
View File

@ -11,6 +11,15 @@ DELTA_PAGER=less; export DELTA_PAGER
# disable ^S and ^Q control flow
stty -ixon
case ":${PATH}:" in
*:"$HOME/.cargo/bin":*)
;;
*)
# Prepending path in case a system-installed rustc needs to be overridden
export PATH="$HOME/.cargo/bin:$PATH"
;;
esac
EDITOR=vi
if command -v hx > /dev/null ; then
EDITOR=hx
@ -65,15 +74,6 @@ alias grep='grep --colour=auto'
alias egrep='egrep --colour=auto'
alias fgrep='fgrep --colour=auto'
case ":${PATH}:" in
*:"$HOME/.cargo/bin":*)
;;
*)
# Prepending path in case a system-installed rustc needs to be overridden
export PATH="$HOME/.cargo/bin:$PATH"
;;
esac
# llama keybindings
# | Key binding | Description |
# |------------------|--------------------|
@ -92,7 +92,8 @@ function ll {
alias http_server="python3 -m http.server"
alias z="$(which zoxide)"
[ -d "$HOME/Library/Python/3.9/bin" ] && export PATH="$PATH:/Users/andrew/Library/Python/3.9/bin"
[ -d "$HOME/Library/Python/3.9/bin" ] && export PATH="$PATH:$HOME/Library/Python/3.9/bin"
[ -d "$HOME/.local/bin" ] && export PATH="$PATH:$HOME/.local/bin"
[ -f "$HOME/.zshrc.local" ] && source "$HOME/.zshrc.local"
[ -f "$HOME/.zshrc.auto" ] && source "$HOME/.zshrc.auto"

View File

@ -50,7 +50,6 @@ has_bin "grep" || nix profile install nixpkgs#gnugrep
has_bin "grex" || nix profile install nixpkgs#grex
has_bin "gron" || nix profile install nixpkgs#gron
has_bin "gum" || nix profile install nixpkgs#gum
has_bin "hx" || nix profile install nixpkgs#helix
has_bin "hexyl" || nix profile install nixpkgs#hexyl
has_bin "htop" || nix profile install nixpkgs#htop
has_bin "httpie" || nix profile install nixpkgs#httpie
@ -67,6 +66,9 @@ has_bin "kubie" || nix profile install nixpkgs#kubie
has_bin "llama" || nix profile install nixpkgs#llama
has_bin "mdbook" || nix profile install nixpkgs#mdbook
has_bin "mosh" || nix profile install nixpkgs#mosh
has_bin "nix-init" || nix profile install nixpkgs#nix-init
has_bin "nix-search" || nix profile install github:peterldowns/nix-search-cli --refresh
has_bin "nurl" || nix profile install nixpkgs#nurl
has_bin "nvim" || nix profile install nixpkgs#neovim
has_bin "ouch" || nix profile install nixpkgs#ouch
#nix profile install nixpkgs#prettylist
@ -113,7 +115,7 @@ config.font = wezterm.font_with_fallback({
{ family = 'Operator Mono', weight = 'Book' },
'Symbols Nerd Font'
})
config.font_size = 20.0
config.font_size = 22.0
config.color_scheme = 'One Light (base16)'
config.window_background_opacity = 0.9
config.initial_rows = 30
@ -144,6 +146,8 @@ true-color = true
color-modes = true
idle-timeout = 75
mouse = false
bufferline = "multiple"
auto-pairs = false
[editor.indent-guides]
render = true
@ -153,6 +157,10 @@ insert = "bar"
normal = "block"
select = "underline"
[editor.whitespace.render]
space = "all"
tab = "all"
[keys.normal]
"$" = "goto_line_end"
"^" = "goto_line_start"