Compare commits
No commits in common. "a69d13f9c0dbb8ffd08ea65540ec3410f970353f" and "354614345cecebb0fb38b96372b2cebed815f514" have entirely different histories.
a69d13f9c0
...
354614345c
6 changed files with 29 additions and 45 deletions
1
.aliases
1
.aliases
|
@ -3,7 +3,6 @@ alias cassa="mosh vsbugge@cassarossa.samfundet.no"
|
||||||
alias cirkus="mosh vsbugge@cirkus.samfundet.no"
|
alias cirkus="mosh vsbugge@cirkus.samfundet.no"
|
||||||
alias alter="mosh vsbugge@altersex.samfundet.no"
|
alias alter="mosh vsbugge@altersex.samfundet.no"
|
||||||
alias navi="mosh vsbugge@navi.samfundet.no"
|
alias navi="mosh vsbugge@navi.samfundet.no"
|
||||||
alias cassini="mosh cassini"
|
|
||||||
alias kint="kinit vsbugge@AD.SAMFUNDET.NO"
|
alias kint="kinit vsbugge@AD.SAMFUNDET.NO"
|
||||||
export GPG_TTY=$(tty)
|
export GPG_TTY=$(tty)
|
||||||
|
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
[init]
|
[init]
|
||||||
defaultBranch = main
|
defaultBranch = main
|
||||||
[user]
|
[user]
|
||||||
|
email = vkbugge@hotmail.com
|
||||||
name = Sebastian Bugge
|
name = Sebastian Bugge
|
||||||
useConfigOnly = true
|
|
||||||
[pull]
|
[pull]
|
||||||
ff = false
|
ff = false
|
||||||
rebase = true
|
rebase = true
|
||||||
|
@ -15,11 +15,5 @@
|
||||||
autoSetupRemote = true
|
autoSetupRemote = true
|
||||||
[rerere]
|
[rerere]
|
||||||
enabled = true
|
enabled = true
|
||||||
[advice]
|
|
||||||
skippedCherryPicks = false
|
|
||||||
[help]
|
[help]
|
||||||
autocorrect = 10
|
autocorrect = 10
|
||||||
[include]
|
|
||||||
path = ~/.gitconfig_local
|
|
||||||
[includeIf "gitdir:~/code/"]
|
|
||||||
path = ~/code/.gitconfig
|
|
||||||
|
|
|
@ -1,8 +1,3 @@
|
||||||
export HISTFILESIZE=1000000000
|
|
||||||
export HISTSIZE=1000000000
|
|
||||||
|
|
||||||
export EDITOR='nvim'
|
|
||||||
|
|
||||||
# set PATH so it includes user's private bin if it exists
|
# set PATH so it includes user's private bin if it exists
|
||||||
if [ -d "$HOME/bin" ]; then
|
if [ -d "$HOME/bin" ]; then
|
||||||
PATH="$HOME/bin:$PATH"
|
PATH="$HOME/bin:$PATH"
|
||||||
|
@ -19,21 +14,25 @@ fi
|
||||||
|
|
||||||
if [ -d "$HOME/go" ]; then
|
if [ -d "$HOME/go" ]; then
|
||||||
GOPATH="$HOME/go"
|
GOPATH="$HOME/go"
|
||||||
GOBIN="$HOME/go/bin"
|
|
||||||
PATH="$GOBIN:$PATH"
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
ASDF_TMP=$(mktemp)
|
export NVM_DIR="$HOME/.nvm"
|
||||||
if asdf current golang >"$ASDF_TMP" 2>/dev/null; then
|
if [ -s "$NVM_DIR/nvm.sh" ]; then
|
||||||
ASDF_GO="$HOME/.asdf/installs/golang/$(awk -F' ' '{print $2}' <"$ASDF_TMP")"
|
\. "$NVM_DIR/nvm.sh" # This loads nvm
|
||||||
|
\. "$NVM_DIR/bash_completion" # nvm bash completions
|
||||||
fi
|
fi
|
||||||
if [ -d "$ASDF_GO" ]; then
|
|
||||||
ASDF_GOBIN="$ASDF_GO/packages/bin/"
|
if [ -s "$HOME/.local_profile" ]; then
|
||||||
PATH="$ASDF_GOBIN:$PATH"
|
\. "$HOME/.local_profile"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
[ -f "/home/kaholaz/.ghcup/env" ] && source "/home/kaholaz/.ghcup/env" # ghcup-env
|
[ -f "/home/kaholaz/.ghcup/env" ] && source "/home/kaholaz/.ghcup/env" # ghcup-env
|
||||||
|
|
||||||
|
if [ -d "$HOME/.asdf" ]; then
|
||||||
|
\. "$HOME/.asdf/asdf.sh"
|
||||||
|
\. "$HOME/.asdf/completions/asdf.bash"
|
||||||
|
fi
|
||||||
|
|
||||||
if [ -f "$HOME/.local/share/pnpm" ]; then
|
if [ -f "$HOME/.local/share/pnpm" ]; then
|
||||||
export PNPM_HOME="$HOME/.local/share/pnpm"
|
export PNPM_HOME="$HOME/.local/share/pnpm"
|
||||||
case ":$PATH:" in
|
case ":$PATH:" in
|
||||||
|
@ -42,8 +41,6 @@ if [ -f "$HOME/.local/share/pnpm" ]; then
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
|
|
||||||
export PATH="$PATH:/home/kaholaz/.cache/scalacli/local-repo/bin/scala-cli"
|
if [ -n "$ZSH_VERSION" ] && type "hugo" >/dev/null; then
|
||||||
|
. <(hugo completion zsh)
|
||||||
# >>> coursier install directory >>>
|
fi
|
||||||
export PATH="$PATH:/home/kaholaz/.local/share/coursier/bin"
|
|
||||||
# <<< coursier install directory <<<
|
|
|
@ -45,6 +45,7 @@ set-option -g allow-rename off
|
||||||
### DESIGN CHANGES ###
|
### DESIGN CHANGES ###
|
||||||
######################
|
######################
|
||||||
|
|
||||||
|
set -g default-terminal "screen-256color"
|
||||||
set -g @plugin 'tinted-theming/base16-tmux'
|
set -g @plugin 'tinted-theming/base16-tmux'
|
||||||
set -g @plugin 'thewtex/tmux-mem-cpu-load'
|
set -g @plugin 'thewtex/tmux-mem-cpu-load'
|
||||||
set -g @colors-base16 'dracula'
|
set -g @colors-base16 'dracula'
|
||||||
|
@ -65,7 +66,7 @@ set -g status-position bottom
|
||||||
set -g status-justify left
|
set -g status-justify left
|
||||||
set -g status-style 'dim'
|
set -g status-style 'dim'
|
||||||
set -g status-left ' #S | '
|
set -g status-left ' #S | '
|
||||||
set -g status-right '#[bg=color237] %a %b %d #[fg=color7]%H:%M #[fg=color82,bg=color236,bold] #H '
|
set -g status-right '#(curl -s wttr.in/Trondheim\?format\="%%l:+%%c%%t") #[bg=color237] %a %b %d #[fg=color7]%H:%M #[fg=color82,bg=color236,bold] #H '
|
||||||
set -g status-right-length 80
|
set -g status-right-length 80
|
||||||
set -g status-left-length 20
|
set -g status-left-length 20
|
||||||
|
|
||||||
|
|
13
.zprofile
13
.zprofile
|
@ -1,13 +0,0 @@
|
||||||
ASDF_TMP=$(mktemp)
|
|
||||||
if asdf current golang >"$ASDF_TMP" 2>/dev/null; then
|
|
||||||
ASDF_GO="$HOME/.asdf/installs/golang/$(awk -F' ' '{print $2}' <"$ASDF_TMP")"
|
|
||||||
fi
|
|
||||||
if [ -d "$ASDF_GO" ]; then
|
|
||||||
ASDF_GOBIN="$ASDF_GO/packages/bin/"
|
|
||||||
PATH="$ASDF_GOBIN:$PATH"
|
|
||||||
fi
|
|
||||||
|
|
||||||
export NVM_DIR="$HOME/.nvm"
|
|
||||||
if [ -s "$NVM_DIR/nvm.sh" ]; then
|
|
||||||
\. "$NVM_DIR/nvm.sh" # This loads nvm
|
|
||||||
fi
|
|
16
.zshrc
16
.zshrc
|
@ -1,3 +1,5 @@
|
||||||
|
source ~/.profile
|
||||||
|
|
||||||
export ZSH="$HOME/.oh-my-zsh"
|
export ZSH="$HOME/.oh-my-zsh"
|
||||||
ZSH_THEME="afowler"
|
ZSH_THEME="afowler"
|
||||||
|
|
||||||
|
@ -37,6 +39,13 @@ else
|
||||||
HAS_NETWORK=0
|
HAS_NETWORK=0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Preferred editor for local and remote sessions
|
||||||
|
if [[ -n $SSH_CONNECTION ]]; then
|
||||||
|
export EDITOR='nvim'
|
||||||
|
else
|
||||||
|
export EDITOR='nvim'
|
||||||
|
fi
|
||||||
|
|
||||||
# Attach to a tmux session on startup
|
# Attach to a tmux session on startup
|
||||||
if [ -z "$TMUX" ] && [ -n "$SSH_CONNECTION" ]; then
|
if [ -z "$TMUX" ] && [ -n "$SSH_CONNECTION" ]; then
|
||||||
tmux attach -t Default || tmux new -s Default
|
tmux attach -t Default || tmux new -s Default
|
||||||
|
@ -50,10 +59,7 @@ if [ -z "$TMUX" ] && [[ "$HAS_NETWORK" == 1 ]]; then
|
||||||
fortune -s
|
fortune -s
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -d "$HOME/.asdf" ]; then
|
export HISTFILESIZE=1000000000
|
||||||
\. "$HOME/.asdf/asdf.sh"
|
export HISTSIZE=1000000000
|
||||||
fi
|
|
||||||
|
|
||||||
source ~/.aliases
|
source ~/.aliases
|
||||||
fpath+=~/.zfunc
|
|
||||||
autoload -U compinit; compinit
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue