~idmyn/dotfiles

99790941ded831a74f33cca8dae329de5e7de05d — David Mynors a month ago 19d47fd
Replace simple bashrc with simple zshrc

not sure if I'll end up wanting asdf vm in my backup shell but if I do,
it adds way less startup time in zsh

also, using zsh means I don't need to chsh from macOS default and hide
the warning - I'll see how I go
7 files changed, 19 insertions(+), 48 deletions(-)

M install.conf.yaml
M macOS/Brewfile
M phoenix/phoenix.js
D shell/.bashrc
A shell/.zshrc
M shell/elvish/rc.elv
D thunderbird/userChrome.css
M install.conf.yaml => install.conf.yaml +1 -1
@@ 18,7 18,7 @@
    ~/.elvish/lib/nix.elv: shell/elvish/lib/nix.elv
    ~/.elvish/lib/direnv.elv: shell/elvish/lib/direnv.elv
    ~/.elvish/lib/secrets.elv: shell/elvish/lib/secrets.elv
    ~/.bashrc: shell/.bashrc
    ~/.zshrc: shell/.zshrc
    ~/.config/kitty/kitty.conf: kitty/kitty.conf
    ~/.hyper.js: hyper/.hyper.js
    ~/.bin: shell/bin

M macOS/Brewfile => macOS/Brewfile +3 -0
@@ 1,5 1,7 @@
tap "homebrew/cask-fonts"
cask "font-input"
cask "font-iosevka-ss09"
cask "font-iosevka-aile"
cask "font-jetbrains-mono"

cask "karabiner-elements"


@@ 23,6 25,7 @@ cask "qlmarkdown"
cask "sensiblesidebuttons"

brew "fd"
brew "exa"
brew "git"
brew "asdf"
brew "grip"

M phoenix/phoenix.js => phoenix/phoenix.js +3 -9
@@ 66,17 66,11 @@ const showOrOpenEmacs = new Key('e', ['alt', 'ctrl'], () => {
})

const showOrOpenBrowser = new Key('w', ['alt', 'ctrl'], () => {
  if (App.get('Safari')) {
    App.get('Safari').focus()
  } else if (App.get('Firefox Developer Edition')) {
    App.get('Firefox Developer Edition').focus()
  } else if (App.get('Firefox')) {
  if (App.get('Firefox')) {
    App.get('Firefox').focus()
  } else if (App.get('Brave Browser')) {
    App.get('Brave Browser').focus()
  } else {
    App.launch('Safari')
    setTimeout(() => App.get('Safari').focus(), 500)
    // App.launch('Firefox') causes prompt for safe mode
    Task.run('/bin/sh', ['-c', 'open -a firefox'])
  }
})


D shell/.bashrc => shell/.bashrc +0 -27
@@ 1,27 0,0 @@
source ~/.secret-aliases

export BASH_SILENCE_DEPRECATION_WARNING=1
export EDITOR="emacsclient -q -c -a ''"

PS1="\n\w\\n $ "

alias q="exit"
alias ls="echo; ls"

# https://metaredux.com/posts/2020/07/07/supercharge-your-bash-history.html

# don't put duplicate lines or lines starting with space in the history.
# See bash(1) for more options
HISTCONTROL=ignoreboth

# append to the history file, don't overwrite it
shopt -s histappend
# append and reload the history after each command
PROMPT_COMMAND="history -a; history -n"

# ignore certain commands from the history
HISTIGNORE="ls:ll:cd:pwd:bg:fg:history"

# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
HISTSIZE=100000
HISTFILESIZE=10000000

A shell/.zshrc => shell/.zshrc +10 -0
@@ 0,0 1,10 @@
source ~/.secret-aliases

export EDITOR="emacsclient -q -c -a ''"

PROMPT="
%~
 $ "

alias q="exit"
alias ls="echo; ls"

M shell/elvish/rc.elv => shell/elvish/rc.elv +2 -2
@@ 54,10 54,10 @@ fn q { exit }
fn k { kubectl }
fn b [@a]{ buku --suggest --colors aaeca --db $E:HOME"/Tresors/System Config/bookmarks.db" $@a }
fn gs [@a]{ git status $@a }
fn ls [@a]{ e:ls -GF $@a }
fn ls [@a]{ echo; exa -F -I 'Desktop|Documents|Downloads|Library|Movies|Music|Pictures|Public|Tresors' $@a }
fn la [@a]{ ls -a $@a }
fn ll [@a]{ ls -alh $@a }
fn cd [@a]{ cd $@a; echo; la }
fn cd [@a]{ cd $@a; la }
fn otp [@a]{ pass otp -c $@a }
fn ssh [@a]{ kitty +kitten ssh $@a }
fn glow [@a]{ e:glow -s light $@a }

D thunderbird/userChrome.css => thunderbird/userChrome.css +0 -9
@@ 1,9 0,0 @@
/* ~/Library/Thunderbird/Profiles/XXXXX.default-release/chrome/userChrome.css */

#threadTree > treechildren {
  font-size: 14px;
}

#threadTree > treechildren::-moz-tree-row {
  height: 35px !important;
}