summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Brewfile5
-rwxr-xr-xbin/sync-music3
-rw-r--r--commands.zsh4
-rw-r--r--gitconfig12
-rw-r--r--gitconfig_personal4
-rw-r--r--gitconfig_work4
-rwxr-xr-xmac-install.sh2
-rw-r--r--tmux.conf5
-rw-r--r--zshrc12
9 files changed, 15 insertions, 36 deletions
diff --git a/Brewfile b/Brewfile
index 3560196..3eb60f4 100644
--- a/Brewfile
+++ b/Brewfile
@@ -113,11 +113,9 @@ libelf
libev
libevent
libffi
-libftdi0
libgcrypt
libgpg-error
libheif
-libhid
libid3tag
libidn
libidn2
@@ -169,7 +167,6 @@ lz4
lzo
m4
mas
-mdr
meson
mpd
mpdecimal
@@ -267,4 +264,4 @@ zeromq
zimg
zsh
zstd
-clojure
+clojure
diff --git a/bin/sync-music b/bin/sync-music
deleted file mode 100755
index 8adeb69..0000000
--- a/bin/sync-music
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-rsync -uva --ignore-existing ~/personal/lossless "/Volumes/media1/"
diff --git a/commands.zsh b/commands.zsh
index 2e1ec76..6032f88 100644
--- a/commands.zsh
+++ b/commands.zsh
@@ -54,10 +54,6 @@ function need() {
rg . -l | fzy
}
-function dig() {
- rg . | fzy -l 20 | gawk '{split($0, a, ":"); print a[1]}'
-}
-
function vd() {
v $(dig)
}
diff --git a/gitconfig b/gitconfig
index 38a9cef..bc87346 100644
--- a/gitconfig
+++ b/gitconfig
@@ -1,9 +1,7 @@
-[includeIf "gitdir:~/git/"]
- path = ~/.gitconfig_personal
-[includeIf "gitdir:~/work/"]
- path = ~/.gitconfig_work
-[include]
- path = ~/.gitconfig_sensitive
+[user]
+ email = nick@nvandoorn.com
+ name = Nick Van Doorn
+ signingkey = EA91B002A8F4238E
[core]
excludesfile = ~/.gitignore_global
@@ -27,7 +25,7 @@
process = git-lfs filter-process
required = true
[commit]
- gpgSign = true
+ gpgSign = false
verbose = true
[gpg]
program = /usr/local/MacGPG2/bin/gpg2
diff --git a/gitconfig_personal b/gitconfig_personal
deleted file mode 100644
index 065c809..0000000
--- a/gitconfig_personal
+++ /dev/null
@@ -1,4 +0,0 @@
- [user]
- email = nick@nvandoorn.com
- name = Nick Van Doorn
- signingkey = EA91B002A8F4238E
diff --git a/gitconfig_work b/gitconfig_work
deleted file mode 100644
index eb2f9a0..0000000
--- a/gitconfig_work
+++ /dev/null
@@ -1,4 +0,0 @@
- [user]
- email = nick@super.gd
- name = Nick Van Doorn
- signingkey = EA91B002A8F4238E
diff --git a/mac-install.sh b/mac-install.sh
index 62893cd..4eae1db 100755
--- a/mac-install.sh
+++ b/mac-install.sh
@@ -1,4 +1,4 @@
-RUBY_VERSION="2.6.7"
+RUBY_VERSION="3.2.7"
cat Brewfile | xargs brew install
cat Caskfile | xargs brew install --cask
diff --git a/tmux.conf b/tmux.conf
index 5a18595..a62867c 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -1,8 +1,3 @@
-# some weird fucking hack to make my colours work properly
-# https://www.reddit.com/r/vim/comments/5416d0/true_colors_in_vim_under_tmux/d7y2fif/
-set -g default-terminal 'screen-256color'
-set -ga terminal-overrides ',screen-256color:Tc'
-
set -sg escape-time 0
set-option -g mouse on
diff --git a/zshrc b/zshrc
index 136c131..1181602 100644
--- a/zshrc
+++ b/zshrc
@@ -3,7 +3,6 @@ export DOTFILES_PATH=$HOME/.dotfiles
export KEYTIMEOUT=1
export VISUAL=nvim
export EDITOR=$VISUAL
-export TERM=screen-256color
export VIM_BACKGROUND=dark
export VIM_THEME=gruvbox
export VIM_AIRLINE_THEME=gruvbox
@@ -12,12 +11,12 @@ export VIM_AIRLINE_THEME=gruvbox
source $DOTFILES_PATH/pairing.zsh
source $DOTFILES_PATH/multi-branch.zsh
source $DOTFILES_PATH/git.zsh
-source $DOTFILES_PATH/commands.zsh
source $DOTFILES_PATH/work.zsh
# Version managers
-source /usr/local/share/chruby/chruby.sh
-source /usr/local/share/chruby/auto.sh
+source $HOMEBREW_PREFIX/opt/chruby/share/chruby/chruby.sh
+source $HOMEBREW_PREFIX/opt/chruby/share/chruby/auto.sh
+
source $HOME/.cargo/env
# Use the latest ruby for shells by default
@@ -73,3 +72,8 @@ ulimit -Sn 10240
eval "$(direnv hook zsh)"
eval "`fnm env --use-on-cd`"
+fnm use 18
+
+export LIBRARY_PATH=$LIBRARY_PATH:/opt/homebrew/opt/openssl@3/lib/
+export LIBRARY_PATH=$LIBRARY_PATH:/opt/homebrew/lib/
+source $DOTFILES_PATH/commands.zsh