Skip to content

Commit

Permalink
Improve dotfiles
Browse files Browse the repository at this point in the history
  • Loading branch information
Jan Wirth committed May 23, 2019
1 parent 7d1283c commit 8f3889a
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 27 deletions.
2 changes: 1 addition & 1 deletion gitconfig
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
ignorecase = false
[user]
name = Jan Wirth
email = jan@scalab.app
email = jan[email protected]
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
Expand Down
22 changes: 12 additions & 10 deletions kakrc
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,12 @@ add-highlighter global/ show-whitespaces -lf ' '
# colorscheme gruvbox

hook global NormalKey y|d|c %{ nop %sh{
printf %s "$kak_main_reg_dquote" | xsel --input --clipboard
# printf %s "$kak_main_reg_dquote" | xsel --input --clipboard
printf %s "$kak_main_reg_dquote" | pbcopy
}}

map global user p '<a-!>xsel <minus><minus>clipboard<ret>'
# map global user p '<a-!>xsel <minus><minus>clipboard<ret>'
map global user p '<a-!>pbpaste<ret>'
map global user n '<esc>:buffer-next<ret>'


Expand Down Expand Up @@ -50,11 +52,11 @@ define-command trim-whitespaces -docstring "Remove trailing whitespace from ever
# colorscheme gruvbox

source ~/dotfiles/find.kak
source "%val{config}/plugins/plug.kak/rc/plug.kak"

plug "ul/kak-lsp" do %{
cargo build --release --locked
cargo install --force
}

eval %sh{kak-lsp --kakoune -s $kak_session}
# source "%val{config}/plugins/plug.kak/rc/plug.kak"

# plug "ul/kak-lsp" do %{
# cargo build --release --locked
# cargo install --force
# }
#
# eval %sh{kak-lsp --kakoune -s $kak_session}
3 changes: 2 additions & 1 deletion skhdrc
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@


# open terminal, blazingly fast compared to iTerm/Hyper
cmd - return : open -na /Applications/Kitty.app
# cmd - return : open -na /Applications/Kitty.app
cmd - return : osascript -e 'tell application "Terminal to activate' -e 'tell application "System Events" to tell process "Terminal" to keystroke "n" using command down'

# close focused window
fn - w : chunkc tiling::window --close
Expand Down
15 changes: 0 additions & 15 deletions toggleGit

This file was deleted.

20 changes: 20 additions & 0 deletions toggleGit.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@

#!/bin/sh
# This shell script is PUBLIC DOMAIN. You may do whatever you want with it.

CURRENTUSEREMAIL=$(git config user.email)

# My mail addresses
EMPLOYED="[email protected]"
ENTERPRISE="[email protected]"
FREELANCE="[email protected]"

if [ "$CURRENTUSEREMAIL" == "$ENTERPRISE" ]; then
git config --global user.email "$FREELANCE"
elif [ "$CURRENTUSEREMAIL" == "$FREELANCE" ]; then
git config --global user.email "$EMPLOYED"
else
git config --global user.email "$ENTERPRISE"
fi

echo "switched to $(git config user.email)"
6 changes: 6 additions & 0 deletions zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -198,3 +198,9 @@ alias gitrefine="git rebase -i HEAD~10"
# tabtab source for sls package
# 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

0 comments on commit 8f3889a

Please sign in to comment.