From 90bdf53de887178663defbe11d6deae638f0b106 Mon Sep 17 00:00:00 2001 From: Sebastian Bugge Date: Wed, 29 May 2024 19:39:52 +0200 Subject: [PATCH 01/10] Add place to put custom gitconfig. --- .gitconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitconfig b/.gitconfig index 94fccd4..bea94b9 100644 --- a/.gitconfig +++ b/.gitconfig @@ -17,3 +17,5 @@ enabled = true [help] autocorrect = 10 +[includeIf "gitdir:~/code/"] + path = ~/code/.gitconfig From adfcb7fedd0eba446dff4fa2815d6aa925221e6a Mon Sep 17 00:00:00 2001 From: Sebastian Bugge Date: Tue, 13 Aug 2024 02:06:11 +0200 Subject: [PATCH 02/10] asdf shenanigans --- .profile | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.profile b/.profile index bc3fee2..9e8e7f3 100644 --- a/.profile +++ b/.profile @@ -14,6 +14,17 @@ fi if [ -d "$HOME/go" ]; then GOPATH="$HOME/go" + GOBIN="$HOME/go/bin" + PATH="$GOBIN:$PATH" +fi + +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" From 32ee5951a8957d9e745e301f4b5f81bee56a5bdb Mon Sep 17 00:00:00 2001 From: Sebastian Bugge Date: Tue, 13 Aug 2024 02:06:33 +0200 Subject: [PATCH 03/10] idk what this is doing --- .tmux.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/.tmux.conf b/.tmux.conf index b661bde..31203d6 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -45,7 +45,6 @@ set-option -g allow-rename off ### DESIGN CHANGES ### ###################### -set -g default-terminal "screen-256color" set -g @plugin 'tinted-theming/base16-tmux' set -g @plugin 'thewtex/tmux-mem-cpu-load' set -g @colors-base16 'dracula' From 2524cd5494bc7e9b20608f4b3a8a40312ee10ca6 Mon Sep 17 00:00:00 2001 From: Sebastian Bugge Date: Tue, 13 Aug 2024 13:00:54 +0200 Subject: [PATCH 04/10] Actually, the weather is not that big of a deal (i can look outside). --- .tmux.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.tmux.conf b/.tmux.conf index 31203d6..380c9dd 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -65,7 +65,7 @@ set -g status-position bottom set -g status-justify left set -g status-style 'dim' set -g status-left ' #S | ' -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 '#[bg=color237] %a %b %d #[fg=color7]%H:%M #[fg=color82,bg=color236,bold] #H ' set -g status-right-length 80 set -g status-left-length 20 From 2cb3b103a900a92f920db78fe24b469782a899e7 Mon Sep 17 00:00:00 2001 From: Sebastian Bugge Date: Fri, 23 Aug 2024 15:54:50 +0200 Subject: [PATCH 05/10] Move env and completions to correct places. --- .zprofile | 19 +++++++++++++++++++ .profile => .zshenv | 24 +++++------------------- .zshrc | 14 ++------------ 3 files changed, 26 insertions(+), 31 deletions(-) create mode 100644 .zprofile rename .profile => .zshenv (68%) diff --git a/.zprofile b/.zprofile new file mode 100644 index 0000000..f0934e1 --- /dev/null +++ b/.zprofile @@ -0,0 +1,19 @@ +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 + +[ -f "/home/kaholaz/.ghcup/env" ] && source "/home/kaholaz/.ghcup/env" # ghcup-env + +if [ -d "$HOME/.asdf" ]; then + \. "$HOME/.asdf/asdf.sh" +fi diff --git a/.profile b/.zshenv similarity index 68% rename from .profile rename to .zshenv index 9e8e7f3..9733f9b 100644 --- a/.profile +++ b/.zshenv @@ -1,3 +1,8 @@ +export HISTFILESIZE=1000000000 +export HISTSIZE=1000000000 + +export EDITOR='nvim' + # set PATH so it includes user's private bin if it exists if [ -d "$HOME/bin" ]; then PATH="$HOME/bin:$PATH" @@ -27,23 +32,8 @@ if [ -d "$ASDF_GO" ]; then PATH="$ASDF_GOBIN:$PATH" fi -export NVM_DIR="$HOME/.nvm" -if [ -s "$NVM_DIR/nvm.sh" ]; then - \. "$NVM_DIR/nvm.sh" # This loads nvm - \. "$NVM_DIR/bash_completion" # nvm bash completions -fi - -if [ -s "$HOME/.local_profile" ]; then - \. "$HOME/.local_profile" -fi - [ -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 export PNPM_HOME="$HOME/.local/share/pnpm" case ":$PATH:" in @@ -51,7 +41,3 @@ if [ -f "$HOME/.local/share/pnpm" ]; then *) export PATH="$PNPM_HOME:$PATH" ;; esac fi - -if [ -n "$ZSH_VERSION" ] && type "hugo" >/dev/null; then - . <(hugo completion zsh) -fi diff --git a/.zshrc b/.zshrc index b90372a..bbd67ed 100644 --- a/.zshrc +++ b/.zshrc @@ -1,5 +1,3 @@ -source ~/.profile - export ZSH="$HOME/.oh-my-zsh" ZSH_THEME="afowler" @@ -39,13 +37,6 @@ else HAS_NETWORK=0 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 if [ -z "$TMUX" ] && [ -n "$SSH_CONNECTION" ]; then tmux attach -t Default || tmux new -s Default @@ -59,7 +50,6 @@ if [ -z "$TMUX" ] && [[ "$HAS_NETWORK" == 1 ]]; then fortune -s fi -export HISTFILESIZE=1000000000 -export HISTSIZE=1000000000 - source ~/.aliases +fpath+=~/.zfunc +autoload -U compinit; compinit From 4a9621cc86ef5f5b7603336775b314b25f713835 Mon Sep 17 00:00:00 2001 From: Sebastian Bugge Date: Fri, 30 Aug 2024 01:58:01 +0200 Subject: [PATCH 06/10] Remove email from base config. --- .gitconfig | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitconfig b/.gitconfig index bea94b9..4917eea 100644 --- a/.gitconfig +++ b/.gitconfig @@ -1,7 +1,6 @@ [init] defaultBranch = main [user] - email = vkbugge@hotmail.com name = Sebastian Bugge [pull] ff = false @@ -18,4 +17,6 @@ [help] autocorrect = 10 [includeIf "gitdir:~/code/"] - path = ~/code/.gitconfig + path = ~/code/.gitconfig +[include] + path = ~/.gitconfig_local From d68fe1464ecab371e528f80990d319e84990d3e5 Mon Sep 17 00:00:00 2001 From: Sebastian Bugge Date: Fri, 30 Aug 2024 02:00:24 +0200 Subject: [PATCH 07/10] Tabs > spaces. --- .gitconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitconfig b/.gitconfig index 4917eea..ba3fd0a 100644 --- a/.gitconfig +++ b/.gitconfig @@ -17,6 +17,6 @@ [help] autocorrect = 10 [includeIf "gitdir:~/code/"] - path = ~/code/.gitconfig + path = ~/code/.gitconfig [include] path = ~/.gitconfig_local From 62aae6ebdd5ddd47dd569fb026057a647421463d Mon Sep 17 00:00:00 2001 From: Sebastian Bugge Date: Sat, 19 Oct 2024 16:13:45 +0200 Subject: [PATCH 08/10] add some things --- .aliases | 1 + .zprofile | 6 ------ .zshenv | 6 ++++++ .zshrc | 4 ++++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.aliases b/.aliases index 7d9ae4c..99d13ce 100644 --- a/.aliases +++ b/.aliases @@ -3,6 +3,7 @@ alias cassa="mosh vsbugge@cassarossa.samfundet.no" alias cirkus="mosh vsbugge@cirkus.samfundet.no" alias alter="mosh vsbugge@altersex.samfundet.no" alias navi="mosh vsbugge@navi.samfundet.no" +alias cassini="mosh cassini" alias kint="kinit vsbugge@AD.SAMFUNDET.NO" export GPG_TTY=$(tty) diff --git a/.zprofile b/.zprofile index f0934e1..b706f2a 100644 --- a/.zprofile +++ b/.zprofile @@ -11,9 +11,3 @@ export NVM_DIR="$HOME/.nvm" if [ -s "$NVM_DIR/nvm.sh" ]; then \. "$NVM_DIR/nvm.sh" # This loads nvm fi - -[ -f "/home/kaholaz/.ghcup/env" ] && source "/home/kaholaz/.ghcup/env" # ghcup-env - -if [ -d "$HOME/.asdf" ]; then - \. "$HOME/.asdf/asdf.sh" -fi diff --git a/.zshenv b/.zshenv index 9733f9b..37f6898 100644 --- a/.zshenv +++ b/.zshenv @@ -41,3 +41,9 @@ if [ -f "$HOME/.local/share/pnpm" ]; then *) export PATH="$PNPM_HOME:$PATH" ;; esac fi + +export PATH="$PATH:/home/kaholaz/.cache/scalacli/local-repo/bin/scala-cli" + +# >>> coursier install directory >>> +export PATH="$PATH:/home/kaholaz/.local/share/coursier/bin" +# <<< coursier install directory <<< diff --git a/.zshrc b/.zshrc index bbd67ed..4c2c864 100644 --- a/.zshrc +++ b/.zshrc @@ -50,6 +50,10 @@ if [ -z "$TMUX" ] && [[ "$HAS_NETWORK" == 1 ]]; then fortune -s fi +if [ -d "$HOME/.asdf" ]; then + \. "$HOME/.asdf/asdf.sh" +fi + source ~/.aliases fpath+=~/.zfunc autoload -U compinit; compinit From b50191cb1229ad547b392ccbad30028dbf2442a3 Mon Sep 17 00:00:00 2001 From: Sebastian Bugge Date: Thu, 7 Nov 2024 20:14:18 +0100 Subject: [PATCH 09/10] Swap include order. --- .gitconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitconfig b/.gitconfig index ba3fd0a..b342efb 100644 --- a/.gitconfig +++ b/.gitconfig @@ -16,7 +16,7 @@ enabled = true [help] autocorrect = 10 -[includeIf "gitdir:~/code/"] - path = ~/code/.gitconfig [include] path = ~/.gitconfig_local +[includeIf "gitdir:~/code/"] + path = ~/code/.gitconfig From a69d13f9c0dbb8ffd08ea65540ec3410f970353f Mon Sep 17 00:00:00 2001 From: Sebastian Bugge Date: Thu, 7 Nov 2024 20:55:01 +0100 Subject: [PATCH 10/10] Add some new new gitconfig options. --- .gitconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitconfig b/.gitconfig index b342efb..4166a4b 100644 --- a/.gitconfig +++ b/.gitconfig @@ -2,6 +2,7 @@ defaultBranch = main [user] name = Sebastian Bugge + useConfigOnly = true [pull] ff = false rebase = true @@ -14,6 +15,8 @@ autoSetupRemote = true [rerere] enabled = true +[advice] + skippedCherryPicks = false [help] autocorrect = 10 [include]