aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-x.bashrc8
-rw-r--r--.gitconfig4
-rw-r--r--.local/share/yadm/archive (renamed from .config/yadm/files.gpg)bin614 -> 614 bytes
-rw-r--r--Brewfile88
-rw-r--r--Library/Application Support/Code/User/settings.json8
-rwxr-xr-xbrew.sh113
6 files changed, 104 insertions, 117 deletions
diff --git a/.bashrc b/.bashrc
index 8803a45..f8d2d68 100755
--- a/.bashrc
+++ b/.bashrc
@@ -32,10 +32,14 @@ export GPG_TTY
# Shell
if [ -z "$SSH_AUTH_SOCK" ] ; then
eval `ssh-agent -s`
- /usr/bin/ssh-add -K
+ {
+ /usr/bin/ssh-add -K
+ } &> /dev/null
fi
-/usr/bin/ssh-add -K
+{
+ /usr/bin/ssh-add -K
+} &> /dev/null
# TODO: Fix /dev/fd/13:type:12979: bad option: -t issue
# source kubectl bash completion
diff --git a/.gitconfig b/.gitconfig
index 82ad4bd..f03a42d 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -44,6 +44,8 @@
# program = gpg
[user]
name = Simen A. W. Olsen
- email = cobraz@cobraz.no
+ email = so@bjerk.io
[github]
user = cobraz
+[pull]
+ rebase = true
diff --git a/.config/yadm/files.gpg b/.local/share/yadm/archive
index 4f4b882..4f4b882 100644
--- a/.config/yadm/files.gpg
+++ b/.local/share/yadm/archive
Binary files differ
diff --git a/Brewfile b/Brewfile
new file mode 100644
index 0000000..38067af
--- /dev/null
+++ b/Brewfile
@@ -0,0 +1,88 @@
+brew "mas"
+
+
+# Install some other useful utilities like `sponge`.
+brew "moreutils"
+# Install GNU `find`, `locate`, `updatedb`, and `xargs`, `g`-prefixed.
+brew "findutils"
+
+# Install GNU `sed`, overwriting the built-in `sed`.
+brew "gnu-sed"
+
+# Install a modern version of Bash.
+brew "bash"
+brew "bash-completion2"
+
+# Install `wget` with IRI support.
+brew "wget"
+
+# Install GnuPG to enable PGP-signing commits.
+brew "gnupg"
+
+# Install more recent versions of some macOS tools.
+brew "vim"
+brew "grep"
+brew "openssh"
+brew "screen"
+brew "gmp"
+
+# Install font tools
+tap "bramstein/webfonttools"
+tap "homebrew/cask-drivers"
+brew "sfnt2woff"
+brew "sfnt2woff-zopfli"
+brew "woff2"
+
+# Programming languages
+brew "golang"
+cask "adoptopenjdk8"
+
+# Other useful binaries
+brew "ack"
+brew "git"
+brew "git-lfs"
+brew "gs"
+brew "lua"
+brew "p7zip"
+brew "pigz"
+brew "pv"
+brew "rename"
+brew "rlwrap"
+brew "ssh-copy-id"
+brew "tree"
+brew "vbindiff"
+brew "zopfli"
+brew "ghq"
+brew "kubectl"
+brew "emacs"
+brew "nmap"
+brew "pulumi"
+brew "fork-cleaner"
+
+tap "bufbuild/buf"
+brew "buf"
+brew "clang-format"
+
+# Tooling
+cask "google-chrome"
+cask "google-drive-file-stream"
+cask "adobe-creative-cloud"
+cask "visual-studio-code"
+cask "google-cloud-sdk"
+cask "iterm2"
+cask "spotify"
+cask "memory"
+cask "slack"
+cask "docker"
+cask "postman"
+cask "sonos"
+cask "tunnelblick"
+cask "drawio"
+cask "figma"
+cask "discord"
+
+# My tools
+brew "cobraz/tools/trippl-timely"
+
+# Mac Application
+mas "gifski", id: 1351639930
diff --git a/Library/Application Support/Code/User/settings.json b/Library/Application Support/Code/User/settings.json
index a7a8250..0e4e70f 100644
--- a/Library/Application Support/Code/User/settings.json
+++ b/Library/Application Support/Code/User/settings.json
@@ -59,5 +59,11 @@
"python.languageServer": "Microsoft",
"debug.javascript.breakOnConditionalError": true,
"debug.javascript.autoAttachFilter": "smart",
- "debug.javascript.usePreview": false
+ "debug.javascript.usePreview": false,
+ "todo-tree.tree.showScanModeButton": false,
+ "editor.suggestSelection": "first",
+ "vsintellicode.modify.editor.suggestSelection": "automaticallyOverrodeDefaultValue",
+ "[dockerfile]": {
+ "editor.defaultFormatter": "ms-azuretools.vscode-docker"
+ }
} \ No newline at end of file
diff --git a/brew.sh b/brew.sh
deleted file mode 100755
index f10c95f..0000000
--- a/brew.sh
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/usr/bin/env bash
-
-# Install command-line tools using Homebrew.
-
-# Make sure we’re using the latest Homebrew.
-brew update
-
-# Upgrade any already-installed formulae.
-brew upgrade
-
-# Save Homebrew’s installed location.
-BREW_PREFIX=$(brew --prefix)
-
-# Install GNU core utilities (those that come with macOS are outdated).
-# Don’t forget to add `$(brew --prefix coreutils)/libexec/gnubin` to `$PATH`.
-brew install coreutils
-ln -s "${BREW_PREFIX}/bin/gsha256sum" "${BREW_PREFIX}/bin/sha256sum"
-
-# Install some other useful utilities like `sponge`.
-brew install moreutils
-# Install GNU `find`, `locate`, `updatedb`, and `xargs`, `g`-prefixed.
-brew install findutils
-# Install GNU `sed`, overwriting the built-in `sed`.
-#TODO: Replace with a way that replaced built-in
-#brew install gnu-sed --with-default-names
-# Install a modern version of Bash.
-brew install bash
-brew install bash-completion2
-
-# Switch to using brew-installed bash as default shell
-if ! fgrep -q "${BREW_PREFIX}/bin/bash" /etc/shells; then
- echo "${BREW_PREFIX}/bin/bash" | sudo tee -a /etc/shells
- chsh -s "${BREW_PREFIX}/bin/bash"
-fi
-
-# Install `wget` with IRI support.
-brew install wget --with-iri
-
-# Install GnuPG to enable PGP-signing commits.
-brew install gnupg
-
-# Install more recent versions of some macOS tools.
-brew install vim
-brew install grep
-brew install openssh
-brew install screen
-brew install gmp
-
-# Install font tools.
-brew tap bramstein/webfonttools
-brew tap homebrew/cask-drivers
-brew install sfnt2woff
-brew install sfnt2woff-zopfli
-brew install woff2
-
-# Programming languages
-brew install golang
-brew install adoptopenjdk8
-
-# Install other useful binaries.
-brew install ack
-#brew install exiv2
-brew install git
-brew install git-lfs
-brew install gs
-brew install lua
-brew install p7zip
-brew install pigz
-brew install pv
-brew install rename
-brew install rlwrap
-brew install ssh-copy-id
-brew install tree
-brew install vbindiff
-brew install zopfli
-brew install ghq
-brew install kubectl
-brew install emacs
-brew install nmap
-brew install pulumi
-brew install figma
-brew tap bufbuild/buf
-brew install buf
-brew install clang-format
-
-# Tooling
-brew cask install google-chrome
-brew cask install google-drive-file-stream
-brew cask install adobe-creative-cloud
-brew cask install visual-studio-code
-brew cask install google-cloud-sdk
-brew cask install iterm2
-brew cask install spotify
-brew cask install memory
-brew cask install slack
-brew cask install docker
-brew cask install postman
-brew cask install sonos
-brew cask install tunnelblick
-brew install discord
-brew install fork-cleaner
-
-# Github CLI
-brew install gh
-
-# My tools
-brew install cobraz/tools/trippl-timely
-
-# Quick Look Plugins (https://github.com/sindresorhus/quick-look-plugins)
-brew cask install qlcolorcode qlstephen qlmarkdown quicklook-json qlprettypatch quicklook-csv qlimagesize webpquicklook qlvideo
-
-# Remove outdated versions from the cellar.
-brew cleanup