diff options
| author | Simen A. W. Olsen <cobraz@Simens-MacBook-Pro-4.local> | 2026-03-21 13:49:10 +0100 |
|---|---|---|
| committer | Simen A. W. Olsen <cobraz@Simens-MacBook-Pro-4.local> | 2026-03-21 13:49:10 +0100 |
| commit | 1fd92fcaf3aadea1e9509f859340f57100218c41 (patch) | |
| tree | db88f38eef0b04000cfd7affbbd5ab9175027f08 /zsh | |
| parent | 95083ca2ac000adeaaaa9a14c8e64b015979d0b1 (diff) | |
| download | dotfiles-1fd92fcaf3aadea1e9509f859340f57100218c41.tar.gz dotfiles-1fd92fcaf3aadea1e9509f859340f57100218c41.zip | |
refactor: consolidate dotfiles into declarative Nix modules
- Remove nvim git submodule, use flake input instead
- Inline all shell configurations into Nix modules
- Remove legacy bootstrap.sh and macos/macos script
- Add NixOS system configuration support
- Update documentation with platform-specific setup
- Add claude-code to macOS Homebrew
- Remove stow-based dotfile management approach
Diffstat (limited to 'zsh')
| -rwxr-xr-x | zsh/.config/zsh/.zshrc | 28 | ||||
| -rwxr-xr-x | zsh/.config/zsh/aliases | 32 | ||||
| -rwxr-xr-x | zsh/.config/zsh/extras | 37 | ||||
| -rwxr-xr-x | zsh/.config/zsh/path | 18 | ||||
| -rw-r--r-- | zsh/.hushlogin | 0 | ||||
| -rwxr-xr-x | zsh/.zshenv | 24 |
6 files changed, 0 insertions, 139 deletions
diff --git a/zsh/.config/zsh/.zshrc b/zsh/.config/zsh/.zshrc deleted file mode 100755 index ead1f79..0000000 --- a/zsh/.config/zsh/.zshrc +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash -# ^----- get shellcheck hints based on bash -# https://github.com/koalaman/shellcheck/issues/809 -# shellcheck disable=SC1090 # sourced filenames with variables - -# Download Znap, if it's not there yet. -[[ -r ~/.zsh_repos/znap/znap.zsh ]] || - git clone --depth 1 -- \ - https://github.com/marlonrichert/zsh-snap.git ~/.zsh_repos/znap -source ~/.zsh_repos/znap/znap.zsh # Start Znap - -znap eval starship 'starship init zsh --print-full-init' -znap prompt - -znap source marlonrichert/zsh-autocomplete -znap source zsh-users/zsh-autosuggestions -znap source jeffreytse/zsh-vi-mode - -for file in ~/.config/zsh/{aliases,path,extras}; do - if [[ -r "$file" ]] && [[ -f "$file" ]]; then - # shellcheck source=/dev/null - source "$file" - fi -done - -eval "$(twm --print-zsh-completion)" - -bindkey '^I^I' autosuggest-accept diff --git a/zsh/.config/zsh/aliases b/zsh/.config/zsh/aliases deleted file mode 100755 index 6be98da..0000000 --- a/zsh/.config/zsh/aliases +++ /dev/null @@ -1,32 +0,0 @@ -# Git aliases -alias git-unpushed='git log --branches --not --remotes --no-walk --decorate --oneline' -alias gb='git checkout -b' -alias gfr='git fetch upstream && git rebase upstream/main' -alias git-undo='git reset --soft HEAD~1' -alias git-clean-branches="git for-each-ref --format '%(refname:short)' refs/heads | grep -v 'master\|main' | xargs git branch -D" -alias :q='exit' -alias ls='ls --color' -alias tailscale='/Applications/Tailscale.app/Contents/MacOS/Tailscale' - -# Generic / Random / Utility -alias rg="rg --hidden --glob '!.git' --glob '!node_modules'" -alias r='cd $REPOS/github.com/' -alias c='clear' -alias afk='pmset displaysleepnow' -alias dl="cd ~/Downloads" -alias l='ls -l' -alias todo='nt' -alias tasks="open 'obsidian://open?file=-%20Oppgaver'" -alias todos="mt ~/ghq/github.com/simenandre/notes/" -# alias docker-compose=podman-compose -alias today="open 'obsidian://advanced-uri?daily=true'" -alias tre="tree -I '.git|node_modules'" -alias timeliste="open 'https://tripletex.no/execute/updateHourlist?contextId=11208568'" -alias t="open 'https://tripletex.no/execute/updateHourlist?contextId=11208568'" -alias fork-cleaner="fork-cleaner --token $(cat ~/.secrets/github-token)" -alias vi="nvim" -alias vim="nvim" -alias v="nvim" - -alias dump-issues="getBjerkIssues > ~/Downloads/issues-$(date -I).json" - diff --git a/zsh/.config/zsh/extras b/zsh/.config/zsh/extras deleted file mode 100755 index e3f9ef4..0000000 --- a/zsh/.config/zsh/extras +++ /dev/null @@ -1,37 +0,0 @@ -NOTES_DIR=$HOME/ghq/github.com/simenandre/notes/ -function note() { - if [ $1 ]; then - FILE=$NOTES_DIR/$(date +%Y-%m-%d).md - - if [ $2 ]; then - FILE=$2 - fi - - echo $1 >> $FILE - fi -} - -function nt() { - if [ $1 ]; then - CONTENT="- [ ] $1" - note $CONTENT $2 - fi -} - -function getBjerkIssues() { - gh issue list --repo bjerkio/internal \ - --search "-label:backlog -label:kind/system" \ - --json title,body,url,createdAt,assignees,number,labels,comments \ - --jq 'map({url, createdAt, title, labels: [.labels[].name], assignees: [.assignees[].login], body, number: "#\(.number)", comments: .comments | map({ body: .body, createdAt: .createdAt })})' -} - -function g() { - # export GEMINI_API_KEY="$(op read op://Employee/Google_Gemini_API/api_key)" - export GOOGLE_CLOUD_PROJECT="sokkel-sandbox" - export GOOGLE_CLOUD_LOCATION="europe-north1" - export GOOGLE_GENAI_USE_VERTEXAI=true - - gemini -} - - diff --git a/zsh/.config/zsh/path b/zsh/.config/zsh/path deleted file mode 100755 index ad2009f..0000000 --- a/zsh/.config/zsh/path +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -# Add directories to the PATH and prevent to add the same directory multiple times upon shell reload. -add_to_path() { - if [[ -d "$1" ]] && [[ ":$PATH:" != *":$1:"* ]]; then - export PATH="$1:$PATH" - fi -} - -GOPATH="$HOME/go" - -# Add ghq to PATH -add_to_path "$HOME/.volta/bin" -add_to_path "$GOPATH/bin" -add_to_path "/Library/Frameworks/Firebird.framework/Resources/bin" -add_to_path "/opt/homebrew/opt/libpq/bin" -add_to_path "$HOME/ghq/github.com/simenandre/dotfiles/scripts" - diff --git a/zsh/.hushlogin b/zsh/.hushlogin deleted file mode 100644 index e69de29..0000000 --- a/zsh/.hushlogin +++ /dev/null diff --git a/zsh/.zshenv b/zsh/.zshenv deleted file mode 100755 index 563696f..0000000 --- a/zsh/.zshenv +++ /dev/null @@ -1,24 +0,0 @@ -##!/bin/zsh -# -# .zshenv - Zsh environment file, loaded always. -# - -# Set ZDOTDIR if you want to re-home Zsh. -export XDG_CONFIG_HOME=${XDG_CONFIG_HOME:-$HOME/.config} -export XDG_DATA_HOME=${XDG_DATA_HOME:-$HOME/.local/share} -export XDG_CACHE_HOME=${XDG_CACHE_HOME:-$HOME/.cache} -export ZDOTDIR=${ZDOTDIR:-$XDG_CONFIG_HOME/zsh} - -# Ensure path arrays do not contain duplicates. -typeset -gU path fpath - -# Set the list of directories that zsh searches for commands. -path=( - $HOME/{,s}bin(N) - $HOME/.local/{,s}bin(N) - /opt/{homebrew,local}/{,s}bin(N) - /usr/local/{,s}bin(N) - $path -) -eval "$(/opt/homebrew/bin/brew shellenv)" -. "$HOME/.cargo/env" |
