Skip to content

Commit

Permalink
Update for new machine
Browse files Browse the repository at this point in the history
  • Loading branch information
Jan Wirth committed Dec 2, 2021
1 parent 1f42c72 commit 2506060
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 15 deletions.
12 changes: 6 additions & 6 deletions alacritty.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@
font:
# The normal (roman) font face to use.
# Style can be specified to pick a specific face.
normal:
family: "JetBrains Mono"
# normal:
# family: "JetBrains Mono"
# family: "Fira Code"
# family: "Source Code Pro"
# style: Retina

# The bold font face
bold:
family: "JetBrains Mono"
# bold:
# family: "JetBrains Mono"
# family: "Fira Code"
# family: "Source Code Pro"

# The italic font face
italic:
family: "JetBrains Mono"
# italic:
# family: "JetBrains Mono"
# family: "Fira Code"
# family: "Source Code Pro"
# style: "Medium Italic"
Expand Down
2 changes: 1 addition & 1 deletion gitconfig
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[core]
excludesfile = /home/jan/.gitignore
excludesfile = /Users/janwirth/.gitignore
ignorecase = false
pager = diff-so-fancy | less --tabs=4 -RFX
[user]
Expand Down
3 changes: 3 additions & 0 deletions skhdrc
Original file line number Diff line number Diff line change
Expand Up @@ -160,3 +160,6 @@ fn + ctrl - d : chunkc tiling::desktop --layout float
fn + ctrl - w : chunkc tiling::desktop --deserialize ~/.chunkwm_layouts/dev_1

fn + ctrl - s : cd owvs-ui && npm start

ctrl - 1 : yabai -m window --toggle zoom-fullscreen
0x0A : alacritty
20 changes: 12 additions & 8 deletions zshrc
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# If you come from bash you might have to change your $PATH.
export PATH=$HOME/.npm/bin:$PATH
export PATH=$HOME/.local/bin:$PATH
export FPATH=$FPATH:/usr/local/share/zsh-navigation-tools
export LC_ALL=en_US.UTF-8
stty intr \^k
# stty intr \^k

# Path to your oh-my-zsh installation.
export ZSH=~/.oh-my-zsh
Expand Down Expand Up @@ -80,7 +81,7 @@ source $ZSH/oh-my-zsh.sh
if [[ -n $SSH_CONNECTION ]]; then
export EDITOR='vim'
else
export EDITOR='kak'
export EDITOR='hx'
fi

# Compilation flags
Expand Down Expand Up @@ -113,6 +114,7 @@ zstyle ':completion::complete:n-kill::bits' matcher 'r:|=** l:|=*'
### END ###

### MY STUFF
alias kak=hx
alias ga="git add"
alias amend="git commit --amend --no-edit"

Expand Down Expand Up @@ -204,13 +206,15 @@ alias gitrefine="git rebase -i HEAD~10"
# uninstall by removing these lines or running `tabtab uninstall sls`
[[ -f /home/jan/tuna-backend/node_modules/tabtab/.completions/sls.zsh ]] && . /home/jan/tuna-backend/node_modules/tabtab/.completions/sls.zsh

# The next line updates PATH for the Google Cloud SDK.
if [ -f '/Users/wirthjan/google-cloud-sdk/path.zsh.inc' ]; then . '/Users/wirthjan/google-cloud-sdk/path.zsh.inc'; fi

# The next line enables shell command completion for gcloud.
if [ -f '/Users/wirthjan/google-cloud-sdk/completion.zsh.inc' ]; then . '/Users/wirthjan/google-cloud-sdk/completion.zsh.inc'; fi

alias int="sh ~/.xinitrc"


git config --global core.pager "diff-so-fancy | less --tabs=4 -RFX"

# The next line updates PATH for the Google Cloud SDK.
if [ -f '/Users/janwirth/google-cloud-sdk/path.zsh.inc' ]; then . '/Users/janwirth/google-cloud-sdk/path.zsh.inc'; fi

# The next line enables shell command completion for gcloud.
if [ -f '/Users/janwirth/google-cloud-sdk/completion.zsh.inc' ]; then . '/Users/janwirth/google-cloud-sdk/completion.zsh.inc'; fi

/usr/local/share/zsh-navigation-tools/zsh-navigation-tools.plugin.zsh

0 comments on commit 2506060

Please sign in to comment.