Merge pull request #14 from baileywickham/update-tmux-config

Update tmux config

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "oh-my-zsh"]
-	path = oh-my-zsh
-	url = [email protected]:baileywickham/oh-my-zsh.git
 [submodule "sshconfig"]
 	path = sshconfig
 	url = [email protected]:baileywickham/sshconfig.git

config/.aliases

@@ -6,6 +6,7 @@ alias df='df -h'
 alias cover='for file in *test*.py; do coverage3 run -p $file; done; coverage combine; coverage3 report -m'
 alias obse='watchman-make -p "*.rkt" --run "racket *.rkt"'
 alias observe='watchman-make -p "*test*.py" --run "for file in *test*.py; do coverage3 run -p $file; done; coverage combine; coverage3 report -m"'
+alias m=make
 
 
 alias docker_prune="sudo docker system prune -a -f"
@@ -43,5 +44,10 @@ alias o='xdg-open '
 alias rysnc='rsync --progress -h -v -r'
 alias bfg='java -jar ~/.builds/bfg-1.14.0.jar'
 alias myipv4='curl https://ipinfo.io/ip'
+
 alias pn=pnpm
+alias pnx='pnpm exec'
 alias shmig='shmig -d baileywickham'
+alias pl=pulumi
+alias tsx='pnpm exec tsx'
+alias prisma='pnx prisma'

config/.env

@@ -6,5 +6,11 @@ function path () {
 path "$HOME/.local/bin"
 path "${HOME}/bin"
 path "${HOME}/bin/metaculus"
+path "${HOME}/bin/cnsl"
 export EDITOR="nvim"
 export TERM="xterm-256color"
+export PGDATA=/opt/homebrew/var/postgresql@16
+#export PATH="$DENO_INSTALL/bin:$PATH"
+export DENO_INSTALL="/Users/baileywickham/.deno"
+export PATH="$DENO_INSTALL/bin:$PATH"
+export DO_NOT_TRACK=1

config/.gitconfig

@@ -1,12 +1,23 @@
 [user]
 	email = [email protected]
 	name = baileywickham
+	signingkey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHOWcMHjoKR3leGpTX/9q9suTboagTTDq1MAPCO+iK8S
 [core]
 	excludesfile = /home/y/.gitignore_global
 
 [url "git+ssh://[email protected]/"]
     insteadof = lp
-[credential]
-	helper = /usr/share/doc/git/contrib/credential/libsecret/git-credential-libsecret
+#[credential]
+    #helper = /usr/share/doc/git/contrib/credential/libsecret/git-credential-libsecret
 [init]
 	defaultBranch = main
+[push]
+    autoSetupRemote = true
+[gpg]
+	format = ssh
+[gpg "ssh"]
+	program = /Applications/1Password.app/Contents/MacOS/op-ssh-sign
+[commit]
+	gpgsign = true
+[rebase]
+	autosquash = true

config/.tmux.conf.local

@@ -466,3 +466,6 @@ bind-key -T copy-mode-vi 'C-j' select-pane -D
 bind-key -T copy-mode-vi 'C-k' select-pane -U
 bind-key -T copy-mode-vi 'C-l' select-pane -R
 bind-key -T copy-mode-vi 'C-\' select-pane -l
+
+setw -g mouse
+

config/.tmux.conf.remote

@@ -1 +0,0 @@
-set -g status-position top

config/.zshrc

@@ -14,13 +14,13 @@ export PATH=$HOME/bin:/usr/local/bin:$PATH
 #  exec tmux
 #fi
 
-if [[ "$(awk -F=  '{ print $2 }' /etc/os-release | head -n 1 | tr -d \")" == "Linux Mint" ]]; then
-    export LOCATION="mint"
-fi
-if [[ "$(awk -F=  '{ print $2 }' /etc/os-release | head -n 1 | tr -d \")" == "Ubuntu" ]]; then
-    export LOCATION="ubuntu"
-fi
-export LOCATION="mint"
+# if [[ "$(awk -F=  '{ print $2 }' /etc/os-release | head -n 1 | tr -d \")" == "Linux Mint" ]]; then
+#     export LOCATION="mint"
+# fi
+# if [[ "$(awk -F=  '{ print $2 }' /etc/os-release | head -n 1 | tr -d \")" == "Ubuntu" ]]; then
+#     export LOCATION="ubuntu"
+# fi
+# export LOCATION="mint"
 
 
 # Set f2 to edit zshrc
@@ -59,17 +59,11 @@ git-search () {
 }
 
 
-if [[ $LOCATION == "mint" ]]; then
-    ZSH_THEME="powerlevel10k/powerlevel10k"
-elif [[ $LOCATION == "mint" ]]; then
-    ZSH_THEME="bira"
-fi
-
+ZSH_THEME="powerlevel10k/powerlevel10k"
 plugins=(
     poetry
     command-not-found
-    docker
-    docker-compose
+    direnv
 )
 
 source $ZSH/oh-my-zsh.sh
@@ -92,17 +86,33 @@ export NVM_DIR="$HOME/.nvm"
 bindkey "\e[1;5D" backward-word
 bindkey "\e[1;5C" forward-word
 
-export PYENV_ROOT="$HOME/.pyenv"
-command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH"
-eval "$(pyenv init -)"
+[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
 
+export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")"
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
 
-[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
+source ~/workspace/toolbox/activate.sh
+#eval "$(direnv hook zsh)"
+
+source <(temporal completion zsh)
 
 # pnpm
-export PNPM_HOME="/home/work/.local/share/pnpm"
+export PNPM_HOME="/Users/baileywickham/Library/pnpm"
 case ":$PATH:" in
   *":$PNPM_HOME:"*) ;;
   *) export PATH="$PNPM_HOME:$PATH" ;;
 esac
-# pnpm end
+# pnpm end
+
+# bun completions
+[ -s "/Users/baileywickham/.oh-my-zsh/completions/_bun" ] && source "/Users/baileywickham/.oh-my-zsh/completions/_bun"
+
+# bun
+export BUN_INSTALL="$HOME/.bun"
+export PATH="$BUN_INSTALL/bin:$PATH"
+eval "$(jump shell)"
+
+
+. "$HOME/.cargo/env"
+source "$HOME/.rye/env"
+

config/init.el

@@ -8,7 +8,6 @@
   (package-refresh-contents)
   (package-install 'use-package))
 
-(setq initial-buffer-choice "~/workspace/CategoryTheory/cat.org")
 (setq show-paren-delay 0)
 (show-paren-mode 1)
 (set-default 'truncate-lines t)
@@ -70,3 +69,15 @@
          ("\\.md\\'" . markdown-mode)
          ("\\.markdown\\'" . markdown-mode))
   :init (setq markdown-command "multimarkdown"))
+(custom-set-variables
+ ;; custom-set-variables was added by Custom.
+ ;; If you edit it by hand, you could mess it up, so be careful.
+ ;; Your init file should contain only one such instance.
+ ;; If there is more than one, they won't work right.
+ '(package-selected-packages '(which-key dracula-theme undo-tree evil helm)))
+(custom-set-faces
+ ;; custom-set-faces was added by Custom.
+ ;; If you edit it by hand, you could mess it up, so be careful.
+ ;; Your init file should contain only one such instance.
+ ;; If there is more than one, they won't work right.
+ )

config/nvim/init.vim

@@ -37,10 +37,14 @@ set nu "line numbers
 set nobackup
 set noerrorbells
 set autowrite "writes on make
+
+au BufReadPost cnsl set syntax=bash
+
 set autoread "reads modified files
 set noswapfile
 set hidden
 set inccommand=nosplit
+set nowrap
 
 " coc settings
 "set cmdheight=2

personal_packages.sh

@@ -67,7 +67,6 @@ function neoneofetch() {
 
 function create_directories() {
     task "Creating directories"
-    with_sudo mkdir -p /etc/udev/rules.d
 
     directories=(".ssh"
         ".config"