From ff666d226cd5adb40ae7bda16ae59de0056fa7e0 Mon Sep 17 00:00:00 2001
From: Kelly Joseph Price <kellyjosephprice@gmail.com>
Date: Mon, 16 Dec 2024 17:26:03 -0800
Subject: [PATCH] no idea

---
 .aliases                 | 13 +++++++++----
 .config/kitty/kitty.conf |  6 +++++-
 .config/nvim/init.vim    | 31 ++++++++++++-------------------
 .gitconfig               | 17 +++++++++++++++++
 .zshrc                   |  2 +-
 README.md                | 19 +++++++++++++------
 6 files changed, 57 insertions(+), 31 deletions(-)

diff --git a/.aliases b/.aliases
index 5a0565b..98ff7b2 100644
--- a/.aliases
+++ b/.aliases
@@ -1,9 +1,12 @@
-alias dot='git --git-dir=$HOME/git/dotfiles --work-tree=$HOME'
+alias dot='git --git-dir=$HOME/git/dotfiles/.git --work-tree=$HOME'
 
-alias readme='cd ~/git/readme/'
-alias react='cd ~/git/readme/packages/react/'
+alias readme='cd ~/git/readme'
+alias react='cd ~/git/readme/packages/react'
 alias editor='cd ~/git/readme/packages/react/src/ui/MarkdownEditor'
-alias testme='npm run test -- --watch packages/react/src/ui/MarkdownEditor'
+alias rdmdx='cd ~/git/rdmdx'
+alias markdown='cd ~/git/markdown'
+
+alias prune-merged-branches='git branch --merged | grep -Ev "(^\*|master|main|next|dev)" | xargs git branch -d'
 
 alias plz=sudo
 alias please=sudo
@@ -11,3 +14,5 @@ alias please=sudo
 alias make="make --no-print-directory"
 
 alias tsc-diagnostics=npx tsc --diagnostics --explainFiles
+
+alias cdf='cd $(find . -type d -print | fzf)'
diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf
index d24cf2f..20771db 100644
--- a/.config/kitty/kitty.conf
+++ b/.config/kitty/kitty.conf
@@ -1,4 +1,8 @@
-font_family FiraCode-Retina
+#font_family      FiraCode-Retina
+font_family      Monaspace Argon Var
+bold_font        auto
+italic_font      auto
+bold_italic_font auto
 font_size 12.0
 allow_hyperlinks yes
 
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index c803a67..2650ed2 100755
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -25,10 +25,6 @@ Plug 'arcticicestudio/nord-vim'
 Plug 'ayu-theme/ayu-vim'
 Plug 'sainnhe/gruvbox-material'
 Plug 'dracula/vim'
-"Plug 'junegunn/rainbow_parentheses.vim'
-"autocmd VimEnter * RainbowParentheses
-"Plug 'luochen1990/rainbow'
-"let g:rainbow_active = 1 "set to 0 if you want to enable it later via :RainbowToggle
 
 Plug 'vim-airline/vim-airline'
 Plug 'vim-airline/vim-airline-themes'
@@ -40,8 +36,9 @@ let g:coc_global_extensions = [
   \ 'coc-prettier',
   \ 'coc-eslint',
   \ 'coc-tsserver',
+  \ 'coc-stylelintplus'
   \ ]
-" use <tab> for trigger completion and navigate to the next complete item
+
 function! s:check_back_space() abort
   let col = col('.') - 1
   return !col || getline('.')[col - 1]  =~ '\s'
@@ -108,15 +105,10 @@ nnoremap <silent> <leader>b :Buffers<CR>
 nnoremap <silent> <C-f> :Files<CR>
 
 Plug 'junegunn/goyo.vim'
+Plug 'git@github.com:github/copilot.vim.git'
 
-Plug '907th/vim-auto-save'
-let g:auto_save = 0
-augroup ft_markdown
-  au!
-  au FileType markdown let b:auto_save = 1
-augroup END
-
-"Plug 'jdonaldson/vaxe'
+let g:copilot_no_tab_map = v:true
+inoremap <silent><expr> <S-TAB> copilot#Accept("")
 
 call plug#end()
 
@@ -127,6 +119,8 @@ set clipboard+=unnamedplus
 
 set expandtab
 set tabstop=2
+set softtabstop=2
+set shiftwidth=2
 
 set textwidth=79
 set fo+=t
@@ -137,9 +131,6 @@ autocmd FileType javascript JsPreTmpl
 autocmd FileType javascriptreact JsPreTmpl
 autocmd FileType typescript JsPreTmpl
 
-" markdown to html
-map <F3> :%!markdown<CR>
-
 " Stop using arrow keys!
 noremap <Up> <nop>
 noremap <Down> <nop>
@@ -148,9 +139,6 @@ noremap <Right> <nop>
 
 set cmdheight=2
 
-" Print Options
-set printoptions=header:0,syntax:n,paper:letter,formfeed:y
-
 " Don't use Ex mode, use Q for formatting
 map Q gq
 
@@ -165,5 +153,10 @@ autocmd VimLeave * call system("tmux setw automatic-rename")
 
 autocmd BufRead,BufNewFile *eslintrc set filetype=json
 
+set backup
+set backupdir=~/.vim/backup
+
+highlight Comment cterm=italic gui=italic
 
 command Bacon :r! curl -s "https://baconipsum.com/api/?type=all-meat&paras=3&format=text"
+command Lemon :r! ~/bin/lemon-ipsum.js
diff --git a/.gitconfig b/.gitconfig
index e112255..a30b5db 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -3,6 +3,7 @@
 	name = Kelly Joseph Price
 [push]
 	default = current
+	autoSetupRemote = true
 [core]
 	pager = less -F -X
   hooksPath = ~/.config/git/hooks'
@@ -12,6 +13,7 @@
 	enabled = true
 [diff]
 	tool = vimdiff
+	alogrithm = histogram
 [help]
 	autocorrect = 1
 [filter "lfs"]
@@ -26,3 +28,18 @@
 	helper = store
 [url "git@github.com:"]
   insteadOf = https://github.com/
+[pull]
+	ff = only
+	rebase = true
+[remote]
+	pushDefault = origin
+[advice]
+	skippedCherryPicks = false
+[init]
+	defaultBranch = main
+[credential "https://github.com"]
+	helper = 
+	helper = !/usr/bin/gh auth git-credential
+[credential "https://gist.github.com"]
+	helper = 
+	helper = !/usr/bin/gh auth git-credential
diff --git a/.zshrc b/.zshrc
index 748a5af..1d172eb 100644
--- a/.zshrc
+++ b/.zshrc
@@ -68,7 +68,7 @@ COMPLETION_WAITING_DOTS="true"
 # Add wisely, as too many plugins slow down shell startup.
 plugins=(
   fzf
-  zsh-vi-mode
+#  zsh-vi-mode
 )
 
 source $ZSH/oh-my-zsh.sh
diff --git a/README.md b/README.md
index e2a1300..653ef6f 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,17 @@
 # dotfiles
 
-## TODO
+### Setup
 
-* setup instructions
-* host-specific config
+Install packages:
+```
+$ sudo apt install zsh git tmux neovim curl ripgrep
+```
 
-### Setup
+Switch to `zsh`:
+```
+$ sudo chsh -s /bin/zsh $USER
+```
 
-* install zsh git tmux neovim curl fzf
-* `sudo chsh -s /bin/zsh $USER`
 * setup ssh
 * * setup ssh-agent
     `ssh-add .ssh/id_rsa`
@@ -43,3 +46,7 @@ sh -c 'curl -fLo "${XDG_DATA_HOME:-$HOME/.local/share}"/nvim/site/autoload/plug.
 tmux source ~/.tmux.conf
 ctrl+a I
 ```
+
+### TPM
+
+ctrl+a I