chore: dotfiles cleanup and portability fixes

README.md

@@ -1,9 +1,35 @@
 # Dotfiles
 
-The dotfiles are managed using dotdrop:
-https://github.com/deadc0de6/dotdrop
+Managed using [dotdrop](https://github.com/deadc0de6/dotdrop).
+
+## Setup on a new machine
 
 ```shell
-# To setup on clean system:
-bash ./install/mac-bootstrap.h
-```
+bash ./install/mac-bootstrap.sh
+```
+
+## Install dotfiles on current machine
+
+```shell
+# Dry-run (preview changes without applying)
+./dotdrop/dotdrop.sh -c "$PWD/config.yaml" install -p $(hostname) --dry
+
+# Apply
+./dotdrop/dotdrop.sh -c "$PWD/config.yaml" install -p $(hostname)
+```
+
+> Note: `-c "$PWD/config.yaml"` is required — the dotdrop submodule changes its working
+> directory at runtime, so a relative path won't resolve to the repo's config.
+
+## Add a new machine
+
+Add a profile to `config.yaml` using `include` to inherit the base dotfile set:
+
+```yaml
+profiles:
+  Your-Hostname.local:
+    include:
+    - Simonass-MacBook-Pro.local
+```
+
+Then run the install command above with your hostname.

config.yaml

@@ -9,6 +9,8 @@ config:
   showdiff: true
   workdir: ~/.config/dotdrop
   link_on_import: nolink
+  instignore:
+  - '**/.DS_Store'
 dotfiles:
   f_fzf.zsh:
     dst: ~/.fzf.zsh
@@ -40,9 +42,6 @@ dotfiles:
   d_hammerspoon:
     src: hammerspoon
     dst: ~/.hammerspoon
-  f_hammerspoon_init.lua:
-    src: hammerspoon/init.lua
-    dst: ~/.hammerspoon/init.lua
 profiles:
   Simonass-Air.lan:
     dotfiles:
@@ -77,5 +76,3 @@ profiles:
   RGQQLHCQ5P:
     include:
     - Simonass-MacBook-Pro.local
-    dotfiles:
-    - f_hammerspoon_init.lua

dotfiles/gitconfig

@@ -5,6 +5,9 @@
 [user]
 	email = simonas.rupsys@vinted.com
 	name = Simonas Rupsys
+	signingkey = 95DD97499B24AC51
+[commit]
+	gpgSign = true
 [filter "lfs"]
 	process = git-lfs filter-process
 	required = true
@@ -13,4 +16,5 @@
 [url "git@github.com:"]
 	insteadOf = git://github.com/
 [safe]
-	directory = /Users/sirup/.goenv
+	directory = ~/.goenv
+	directory = /terraform-vault

dotfiles/gitignore

@@ -4,3 +4,4 @@
 *.swp
 *.swo
 Gemfile.lock
+.cursor

dotfiles/hammerspoon/init.lua

@@ -30,8 +30,10 @@ local applicationHotkeys = {
   o = 'Opera GX',
   s = 'Slack',
   t = 'Telegram',
-  v = 'Cursor',
-  y = 'Signal'
+  v = 'Visual Studio Code',
+  r = 'Cursor',
+  y = 'Signal',
+  l = 'kitten quick-access-terminal'
 }
 for key, app in pairs(applicationHotkeys) do
   hs.hotkey.bind(hyper, key, function()

dotfiles/zshrc

@@ -1,7 +1,5 @@
 # zmodload zsh/zprof
 
-DEFAULT_USER=whoami``
-
 # system detection
 function detect_system() {
     local _uname_a=$(uname -a)
@@ -22,6 +20,11 @@ function detect_system() {
 }
 detect_system
 
+# Ensure TMPDIR is always set correctly on macOS (fixes kitty terminal inheritance)
+if [[ "$SYSTEM" == "Darwin" ]]; then
+    export TMPDIR=$(getconf DARWIN_USER_TEMP_DIR)
+fi
+
 #
 # https://gist.github.com/ctechols/ca1035271ad134841284
 # https://carlosbecker.com/posts/speeding-up-zsh
@@ -50,7 +53,7 @@ PROMPT=" $PROMPT "
 PROMPT='%(?.%F{magenta}.%F{red}❯%F{magenta})❯%f '
 
 # fzf-tab
-source ~/git/fzf-tab/fzf-tab.plugin.zsh
+[ -f ~/git/fzf-tab/fzf-tab.plugin.zsh ] && source ~/git/fzf-tab/fzf-tab.plugin.zsh
 
 HISTSIZE=10000
 SAVEHIST=10000
@@ -83,10 +86,9 @@ bindkey "^[[1;9D" beginning-of-line
 bindkey "^[[1;9C" end-of-line
 
 # Load stuff
-source ~/.zsh_env_vars
-# source ~/.zsh_terragrunt_vars
+[ -f ~/.zsh_env_vars ] && source ~/.zsh_env_vars
 source ~/.zsh_git_aliases
-source ~/.zsh_vinted_aliases
+[ -f ~/.zsh_vinted_aliases ] && source ~/.zsh_vinted_aliases
 
 # zstyle
 # zstyle :prompt:pure:path color default
@@ -95,10 +97,12 @@ source ~/.zsh_vinted_aliases
 [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
 
 # Alias
-alias vi="/opt/homebrew/bin/nvim"
-alias sr="ssh -A -o StrictHostKeyChecking=no -l srupsys $@"
-alias p2="ping -i0.2 $@"
-alias ll="ls -la $@"
+alias vi=nvim
+function sr() { ssh -A -o StrictHostKeyChecking=no -l srupsys "$@"; }
+function sj() { ssh -A -o StrictHostKeyChecking=no -J srupsys@janitor1.ams1.int.vinted.com -l srupsys "$@"; }
+alias p2="ping -i0.2"
+alias ll="ls -la"
+alias make=gmake
 alias knife="~/bin/knife"
 alias truck='bundle exec foodtruck'
 function knaws(){
@@ -134,23 +138,20 @@ export PATH="$PYENV_ROOT/shims:$PATH"
 alias pyinit='eval "$(pyenv init -)"'
 
 # rbenv
-export PATH="/Users/simonas.rupsys/.rbenv/bin:$PATH"
+export PATH="$HOME/.rbenv/shims:$HOME/.rbenv/bin:$PATH"
 alias rbinit='eval "$(rbenv init -)"'
-# eval "$(rbenv init -)"
 
 # goenv
 export GOENV_ROOT="$HOME/.goenv"
-export PATH="$GOENV_ROOT/bin:$PATH"
+export PATH="$GOENV_ROOT/shims:$GOENV_ROOT/bin:$PATH"
 alias goinit='eval "$(goenv init -)"'
 
-# TODO: remove this. 1.1.1q openssl is broken. this is workaround
-export PATH="/opt/homebrew/opt/openssl@1.1/bin:$PATH"
-
 # init all envs
-alias init='pyinit;rbinit;goinit'
+alias initenvs='pyinit;rbinit;goinit'
+# uncomment to enable full shell integration (rbenv shell, completions):
 # pyinit
-rbinit
-goinit
+# rbinit
+# goinit
 
 # You may need to manually set your language environment
 # export LANG=en_US.UTF-8
@@ -162,35 +163,19 @@ else
   export EDITOR='nvim'
 fi
 
-# Overcommit
-check_overcommit() {
-  if [ -d ".git" ]; then
-    template="$HOME/.overcommit.yml"
-    if [ ! -L ".overcommit.yml" ]; then
-      echo 'Installing .overcommit.yml'
-      ln -sf "$template" "$(pwd)/.overcommit.yml"
-      overcommit --install
-      overcommit --sign
-    fi
-  fi
-}
-
-# Install .overcommit.yml to git repos
-precmd() {  # run before each prompt
-  # check_overcommit
-}
-
-#zprof
-source "${DEVTOOLS_PATH:-$HOME/vinted/dev-tools}/bin/shell_function.sh"
-
-# tfenv path
-# export PATH="$HOME/.tfenv/bin:$PATH"
+[ -f "${DEVTOOLS_PATH:-$HOME/vinted/dev-tools}/bin/shell_function.sh" ] && \
+  source "${DEVTOOLS_PATH:-$HOME/vinted/dev-tools}/bin/shell_function.sh"
 
 export PATH="$HOME/bin:$PATH"
 
 # export TERM=xterm-kitty
 
-eval $(thefuck --alias)
+command -v thefuck &>/dev/null && eval "$(thefuck --alias)"
 
 autoload -U +X bashcompinit && bashcompinit
-complete -o nospace -C /opt/homebrew/bin/nomad nomad
+complete -o nospace -C "$(command -v nomad)" nomad
+
+export PATH="$HOME/.local/bin:$PATH"
+
+# opencode
+export PATH="$HOME/.opencode/bin:$PATH"

install/brew-install.sh

@@ -1,7 +1,5 @@
 #!/bin/sh
-
-# brew taps
-brew tap d12frosted/emacs-plus
+set -e
 
 # brew installations
 brew install awk
@@ -20,8 +18,8 @@ brew install shellcheck
 brew install imagemagick
 brew install openssl
 brew install --cask  kitty
-brew install hammerspoon
-brew install karabiner-elements
+brew install --cask hammerspoon
+brew install --cask karabiner-elements
 brew install tree
 brew install pyenv
 
@@ -30,12 +28,11 @@ $(brew --prefix)/opt/fzf/install --key-bindings --completion --update-rc --no-fi
 
 # nvim
 brew install neovim
-pip3 install neovim
+pip3 install pynvim
 curl -fLo ~/.local/share/nvim/site/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
 
 # Firacode fonts
-brew tap homebrew/cask-fonts
-brew install --cask  font-fira-code
+brew install --cask font-fira-code
 
 # MacLaunch
 brew install hazcod/homebrew-hazcod/maclaunch

install/git-clone-installs.sh

@@ -1,7 +1,8 @@
 #!/bin/bash
+set -e
 
-sudo chown -R simonas.rupsys ~/.config/
-sudo chown -R simonas.rupsys ~/.local/share
+sudo chown -R "$USER" ~/.config/
+sudo chown -R "$USER" ~/.local/share
 
 # Kitty themes
 # git clone --depth 1 git@github.com:dexpota/kitty-themes.git ~/.config/kitty/kitty-themes

install/mac-bootstrap.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 # Pasiskolinta is https://github.com/japorized/dotfiles/tree/master/install
 
 # Ensure user has edited config.yaml and the dotfiles for proper installation
@@ -25,7 +26,7 @@ echo 'Installing xcode cli tools'
 
 echo 'Installing Homebrew'
 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
-echo 'eval "$(/opt/homebrew/bin/brew shellenv)"' >> /Users/simonas.rupsys/.zprofile
+echo 'eval "$(/opt/homebrew/bin/brew shellenv)"' >> "$HOME/.zprofile"
 eval "$(/opt/homebrew/bin/brew shellenv)"
 
 echo 'Installing Homebrew packages'