push updates xD

Author: FinalAngel

README.md

@@ -54,7 +54,6 @@ The following package flavours are installed:
 - [FiraCode](https://github.com/tonsky/FiraCode) with nice custom font management
 - [Git with GPG signing](https://gnupg.org/) enabled
 - [Homebrew](https://brew.sh/) with cask and mas
-- [Mackup](https://github.com/lra/mackup) to backup application settings
 - [Neovim](https://neovim.io/)
 - [Node with NVM](https://github.com/nvm-sh/nvm) manager
 - [Oh My Zsh](https://github.com/ohmyzsh/ohmyzsh)

git/gitconfig.symlink

@@ -114,7 +114,7 @@
 	gpgsign = true
 
 [gpg]
-	program = /opt/homebrew/bin/gpg
+	program = gpg
 
 [diff]
     # [i]ndex, [w]ork tree, [c]ommit, [o]bject instead of a/b
@@ -165,3 +165,22 @@
 	cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
 [mergetool]
 	prompt = false
+[filter "lfs"]
+	clean = git-lfs clean -- %f
+	smudge = git-lfs smudge -- %f
+	process = git-lfs filter-process
+	required = true
+[user]
+	name = Angelo Dini
+	email = angelo.dini@divio.ch
+[safe]
+	directory = /Users/finalangel/Sites/actions-runner/_work/devguard/devguard
+	directory = /Users/finalangel/Sites/actions-runner/_work/devguard/devguard
+	directory = /Users/finalangel/Sites/actions-runner/_work/devguard/devguard
+	directory = /Users/finalangel/Sites/actions-runner/_work/devguard/devguard
+	directory = /Users/finalangel/Sites/actions-runner/_work/devguard/devguard
+	directory = /Users/finalangel/Sites/actions-runner/_work/devguard/devguard
+	directory = /Users/finalangel/Sites/actions-runner/_work/devguard/devguard
+	directory = /Users/finalangel/Sites/actions-runner/_work/devguard/devguard
+	directory = /Users/finalangel/Sites/actions-runner/_work/devguard/devguard
+	directory = /Users/finalangel/Sites/actions-runner/_work/devguard/devguard

homebrew/Brewfile

@@ -10,9 +10,8 @@ brew "ffmpeg"
 brew "findutils"
 brew "gh"
 brew "git"
-brew "gnupg2"
+brew "gnupg"
 brew "hub"
-brew "mackup"
 brew "mas" # Mac App Store manager
 brew "pinentry-mac"
 brew "ruby"
@@ -32,6 +31,7 @@ brew "tmux"
 brew "zsh"
 brew "zsh-syntax-highlighting"
 brew "zsh-autosuggestions"
+brew "fzf"
 
 # development
 brew "direnv"
@@ -40,6 +40,7 @@ brew "glab"
 brew "maven"
 brew "node"
 brew "nginx"
+brew "postgresql"
 brew "python"
 brew "pyenv"
 brew "pyenv-virtualenv"

macos/.mackup/my-dotfiles.cfg

@@ -6,7 +6,7 @@ info "Setup \033[0;37m[macOS]\033[0m"
 source "$DIR/macos/defaults"
 source "$DIR/macos/dock"
 
-# create general code directory
+# create general code directory
 if [ ! -d $CODE_DIR ]; then
   mkdir -p $CODE_DIR
   success "Code directory created"
@@ -19,15 +19,6 @@ require_sudo
 sudo fdesetup enable
 success "FileVault successfully enabled"
 
-# restore app preferences
-if [ ! -d "$HOME/.mackup" ]; then
-  # copy custom apps as symlinks
-  ln -Fs "$DIR/macos/.mackup" "$HOME/.mackup"
-  # restore files
-  mackup restore -f
-  success "App preferences restored"
-fi
-
 # symlink hosts file
 require_sudo
 sudo ln -Fs "$DIR/macos/hosts" "/etc/hosts"

macos/install

@@ -12,9 +12,3 @@ success "Updated software, this might need a reboot"
 require_sudo
 sudo gem update --system > /dev/null 2>&1
 success "Updated gems"
-
-# backup app preferences
-if [ -d "$HOME/.mackup" ]; then
-  mackup backup -f > /dev/null 2>&1
-  success "App preferences backed-up"
-fi

macos/mackup.cfg.symlink

@@ -1,4 +1,4 @@
 #!/bin/zsh
-alias nukedb="docker-compose run --rm web dropdb -h postgres -U postgres db && docker-compose run --rm web createdb -h postgres -U postgres db"
+alias nukedb="docker compose run --rm web dropdb -h postgres -U postgres db && docker compose run --rm web createdb -h postgres -U postgres db"
 # alias lancet="$HOME/.virtualenvs/lancet/bin/lancet" # enable for development
 alias cover="coverage erase && coverage run setup.py test && coverage html"

macos/update

@@ -35,7 +35,8 @@ alias lib="cd $HOME/Library"
 alias ws="cd $HOME/Sites"
 
 # development
-alias dc="docker-compose"
+alias dc="docker compose"
+alias dcr="docker compose run --rm web"
 alias dcrun="dc run --rm"
 alias dclog="dc logs -f"
 alias dclint="docker run --env-file=.lint -it -v $(pwd):/app divio/lint /bin/lint"

python/aliases.zsh

@@ -1,5 +1,5 @@
 #!/bin/zsh
-export ARCHFLAGS="-arch x86_64"
+export ARCHFLAGS="-arch $(uname -m)"
 
 # required helpers
 prepend_path() { [ -d $1 ] && PATH="$1:$PATH"; }