summaryrefslogtreecommitdiff
path: root/public
diff options
context:
space:
mode:
Diffstat (limited to 'public')
-rw-r--r--public/brew/.brewfile7
-rw-r--r--public/git/.gitconfig4
-rw-r--r--public/zsh/.zshenv1
3 files changed, 7 insertions, 5 deletions
diff --git a/public/brew/.brewfile b/public/brew/.brewfile
index c1dad05..e3227af 100644
--- a/public/brew/.brewfile
+++ b/public/brew/.brewfile
@@ -23,6 +23,7 @@ brew "flake8"
brew "flyctl"
brew "fsouza/prettierd/prettierd"
brew "fzf"
+brew "gawk"
brew "geckodriver"
brew "ghz"
brew "git"
@@ -54,8 +55,6 @@ brew "make"
brew "mandoc"
brew "markdownlint-cli2"
brew "minikube"
-brew "segundo/tap/kontext"
-brew "segundo/tap/krash"
brew "neovim", args: ["HEAD"]
brew "node"
brew "node@16"
@@ -76,6 +75,8 @@ brew "python-yq"
brew "rclone"
brew "ripgrep"
brew "rust"
+brew "segundo/tap/kontext"
+brew "segundo/tap/krash"
brew "selene"
brew "shellcheck"
brew "skopeo"
@@ -99,7 +100,6 @@ brew "yamllint"
brew "zig", args: ["HEAD"]
brew "zsh"
cask "1password"
-cask "podman-desktop"
cask "1password-cli1"
cask "alacritty"
cask "authy"
@@ -111,6 +111,7 @@ cask "gimp"
cask "github"
cask "google-cloud-sdk"
cask "gpg-suite-no-mail"
+cask "podman-desktop"
cask "rectangle"
cask "skitch"
cask "slack"
diff --git a/public/git/.gitconfig b/public/git/.gitconfig
index 64e9fd3..61d7614 100644
--- a/public/git/.gitconfig
+++ b/public/git/.gitconfig
@@ -9,10 +9,10 @@
signingkey = 0x8B6B1A3CF906CCEC
[commit]
gpgsign = 1
+[diff]
+ tool = nvimdiff
[core]
excludesfile = ~/.gitignore_global
- ;fsmonitor = true
- ;untrackedcache = true
[pull]
rebase = false
[push]
diff --git a/public/zsh/.zshenv b/public/zsh/.zshenv
index aa7b60e..dfedd7b 100644
--- a/public/zsh/.zshenv
+++ b/public/zsh/.zshenv
@@ -1,6 +1,7 @@
alias kontext="source kontext"
alias vim=vim_wrap
alias docker=podman
+alias vimc="nvim ~/.dotfiles/public/nvim/.nvim"
# fucking hate brew, mac and all these fucking
# hacks and stupid workarounds