GitLab cli, glab

Brewfile

@@ -7,6 +7,7 @@ tap "github/gh"
 tap "homebrew/autoupdate"
 tap "homebrew/bundle"
 tap "homebrew/cask"
+tap "homebrew/cask-fonts"
 tap "homebrew/core"
 tap "homebrew/services"
 tap "shivammathur/extensions"
@@ -68,6 +69,8 @@ brew "git-extras"
 brew "git-flow-avh"
 # See your latest local git branches, formatted real fancy
 brew "git-recent"
+# Open-source GitLab command-line tool
+brew "glab"
 # GNU implementation of the famous stream editor
 brew "gnu-sed"
 # Validating, recursive, caching DNS resolver
@@ -128,6 +131,8 @@ brew "ruby"
 brew "shellcheck"
 # Autoformat shell script source code
 brew "shfmt"
+# Version control system designed to be a better CVS
+brew "subversion"
 # Send macOS User Notifications from the command-line
 brew "terminal-notifier", link: false
 # Tool to build, change, and version infrastructure
@@ -186,6 +191,18 @@ cask "docker"
 cask "fig"
 # Unofficial overcast.fm podcast app
 cask "fog"
+# Typeface made for developers
+cask "font-jetbrains-mono"
+# Developer targeted fonts with a high number of glyphs
+cask "font-jetbrains-mono-nerd-font"
+cask "font-lato"
+cask "font-open-sans"
+# Font with a mechanical skeleton and the forms are largely geometric
+cask "font-roboto"
+cask "font-source-code-pro"
+cask "font-source-code-pro-for-powerline"
+cask "font-source-sans-pro"
+cask "font-source-serif-pro"
 # Open Source Webfont Converter
 cask "fontplop"
 # GIT client
@@ -200,6 +217,8 @@ cask "jetbrains-toolbox"
 cask "lens"
 # Reverse proxy, secure introspectable tunnels to localhost
 cask "ngrok"
+# Collaboration platform for API development
+cask "postman"
 # Display image info and preview unsupported formats in QuickLook
 cask "qlimagesize"
 # QuickLook generator for Markdown files

README.md

@@ -4,36 +4,22 @@ The folder structure follows [XDG Base Directory Specification][xdg] where possi
 
 ## Setup
 
-## rcrc
+### First time setup
 
-Update install script
+1. Clone this repository to `$HOME/.dotfiles`
+2. `bash $HOME/.dotfiles/scripts/settler.sh`
+3. ???
+4. Profit
 
-```bash
+Note: there's a bit chicken/egg situation, because settler assumes you don't have git, and you need git to clone the repo.
-rcup -B 0 -g > ~/.dotfiles/install.sh | shfmt -w -l ~/.dotfiles/install.sh
-```
 
-## brew
+### dfm - the dotfiles manager
 
-Install everything described in `Brewfile`
+`dfm` is a shellscript that has some tools that help with dotfiles management.
 
-```bash
+## Configuration
-brew bundle install --force --file=~/.dotfiles/Brewfile
-```
 
-
+### XDG Variables
-Update `Brewfile`
-
-```bash
-brew bundle dump --force --file=~/.dotfiles/Brewfile --describe
-```
-
-Enable automatic brew updates and upgrades.
-
-```bash
-brew autoupdate start 43200 --upgrade --cleanup --immediate
-```
-
-## XDG Variables
 
 | Var                | Default              |
 |--------------------|----------------------|
@@ -42,8 +28,7 @@ brew autoupdate start 43200 --upgrade --cleanup --immediate
 | `$XDG_STATE_HOME`  | `$HOME/.local/state` |
 | `$XDG_CONFIG_HOME` | `$HOME/.config`      |
 
-
+- `$XDG_DATA_HOME` defines the base directory relative to which user-specific data files should be stored. If `$XDG_DATA_HOME` is either not set or empty, a default equal to `$HOME/.local/share` should be used.
-- `$XDG_DATA_HOME` defines the base directory relative to which user-specific data files should be stored. If `$XDG_DATA_HOME` is either not set or empty, a default equal to ` $HOME/.local/share` should be used.
 - `$XDG_CONFIG_HOME` defines the base directory relative to which user-specific configuration files should be stored. If `$XDG_CONFIG_HOME` is either not set or empty, a default equal to `$HOME/.config` should be used.
 - `$XDG_STATE_HOME` defines the base directory relative to which user-specific state files should be stored. If `$XDG_STATE_HOME` is either not set or empty, a default equal to `$HOME/.local/state` should be used.
 - The `$XDG_STATE_HOME` contains state data that should persist between (application) restarts, but that is not important or portable enough to the user that it should be stored in `$XDG_DATA_HOME`. It may contain:
@@ -52,5 +37,4 @@ brew autoupdate start 43200 --upgrade --cleanup --immediate
 - User-specific executable files may be stored in `$HOME/.local/bin`. Distributions should ensure this directory shows up in the UNIX `$PATH` environment variable, at an appropriate place.
 - `$XDG_DATA_DIRS` defines the preference-ordered set of base directories to search for data files in addition to the `$XDG_DATA_HOME` base directory. The directories in `$XDG_DATA_DIRS` should be seperated with a colon ':'.
 
-
 [xdg]: https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html

scripts/set-defaults.sh

@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
-echo 'start osx/set-defaults.sh'
+#
+# set-defaults.sh - Sets macOS Defaults that I like
+#
+# This script contains large portions from following scripts:
+# - https://github.com/freekmurze/dotfiles/blob/main/macos/set-defaults.sh
+#
 
 # Ask for the administrator password upfront
 sudo -v
@@ -226,8 +231,11 @@ defaults write com.apple.Safari IncludeInternalDebugMenu -bool true
 
 # Enable the Develop menu and the Web Inspector in Safari
 defaults write com.apple.Safari IncludeDevelopMenu -bool true
-defaults write com.apple.Safari WebKitDeveloperExtrasEnabledPreferenceKey -bool true
+defaults write com.apple.Safari \
-defaults write com.apple.Safari com.apple.Safari.ContentPageGroupIdentifier.WebKit2DeveloperExtrasEnabled -bool true
+  WebKitDeveloperExtrasEnabledPreferenceKey -bool true
+defaults write com.apple.Safari \
+  com.apple.Safari.ContentPageGroupIdentifier.WebKit2DeveloperExtrasEnabled \
+  -bool true
 
 # Don’t display the annoying prompt when quitting iTerm
 #defaults write com.googlecode.iterm2 PromptOnQuit -bool false
@@ -268,10 +276,16 @@ defaults write com.apple.TextEdit PlainTextEncodingForWrite -int 4
 ###############################################################################
 
 # Disable smart quotes as it’s annoying for messages that contain code
-defaults write com.apple.messageshelper.MessageController SOInputLineSettings -dict-add "automaticQuoteSubstitutionEnabled" -bool false
+defaults write com.apple.messageshelper.MessageController \
+  SOInputLineSettings \
+  -dict-add "automaticQuoteSubstitutionEnabled" \
+  -bool false
 
 # Disable continuous spell checking
-defaults write com.apple.messageshelper.MessageController SOInputLineSettings -dict-add "continuousSpellCheckingEnabled" -bool false
+defaults write com.apple.messageshelper.MessageController \
+  SOInputLineSettings \
+  -dict-add "continuousSpellCheckingEnabled" \
+  -bool false
 
 ###############################################################################
 # Kill affected applications                                                  #

scripts/settler.sh

@@ -2,6 +2,7 @@
 #
 # Settler - my macOS setup automator
 # Ismo Vuorinen <https://github.com/ivuorinen> 2018
+#
 
 # Ask for the administrator password upfront
 sudo -v
@@ -43,8 +44,8 @@ else
   /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
 fi
 
-bash ../local/bin/dfm brew install && "Installed Brewfile contents"
+bash "$HOME/.dotfiles/local/bin/dfm" brew install && "Installed Brewfile contents"
-bash ../local/bin/dfm dotfiles link && "Linked all dotfiles"
+bash "$HOME/.dotfiles/local/bin/dfm" dotfiles link && "Linked all dotfiles"
 
 read -r -p "Do you want to set macOS defaults? (y/N) " yn