Updates

.config/alacritty/alacritty.toml

@@ -0,0 +1,53 @@
+[colors.bright]
+black = "0x676767"
+blue = "0x50b3d8"
+cyan = "0x50b3d8"
+green = "0x77bc64"
+magenta = "0xef7c2a"
+red = "0xea3d54"
+white = "0xfefefe"
+yellow = "0xe6ce57"
+
+[colors.cursor]
+cursor = "0xd9d9d9"
+text = "0x2c2c2c"
+
+[colors.dim]
+black = "0x232323"
+blue = "0x556b79"
+cyan = "0x5c8482"
+green = "0x5e6547"
+magenta = "0x6e4962"
+red = "0x74423f"
+white = "0x828282"
+yellow = "0x8b7653"
+
+[colors.normal]
+black = "0x4b4b4b"
+blue = "0x50b3d8"
+cyan = "0x50b3d8"
+green = "0x77bc64"
+magenta = "0xef7c2a"
+red = "0xff4f6b"
+white = "0xcbcdd1"
+yellow = "0xe6ce57"
+
+[colors.primary]
+background = "0x2c2c2c"
+bright_foreground = "0xd9d9d9"
+dim_foreground = "0xdbdbdb"
+foreground = "0xd6d6d6"
+
+[font]
+size = 14
+
+[font.bold]
+family = "Fira Code"
+style = "Bold"
+
+[font.italic]
+family = "Fira Code"
+
+[font.normal]
+family = "Fira Code"
+style = "Retina"

.gitconfig

@@ -25,34 +25,22 @@
 
 [alias]
   br = branch
-  cl = clone
-  ci = commit
-  cm = commit -a
   co = checkout
-  dc = diff --cached
   df = diff --color
   dfst = diff --stat
-  feature = !sh -c 'git checkout -b $(whoami)/$(date +%s | md5 | cut -c 1-7)'
   fixup = !sh -c 'git commit --fixup=HEAD' -
-  fork = !sh -c 'git remote add fork [email protected]:$0.git'
   ign = ls-files -o -i --exclude-standard
   lg = log --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr by %an)%Creset' --abbrev-commit --date=relative
-  lgg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr by %an)%Creset' --abbrev-commit --date=relative
   msg = commit --allow-empty -m
   new = checkout -b
   nuke = reset --hard HEAD
-  pl = pull origin master
-  ps = push origin master
-  po = push origin gh-pages
   ri = rebase --interactive --autosquash
   sh = stash save
   shap = !sh -c 'git stash apply stash@{$1}'
   shdf = !sh -c 'git stash show -u stash@{$1}'
   shls = stash list
-  squash = !git add . && !git fixup HEAD && !git ri HEAD~2
+  squash = !sh -c 'git add . && git fixup HEAD && git ri HEAD~2'
   st = status -s
-  stage = add
-  switch = checkout
   unstage = reset HEAD
 [core]
 	editor = /usr/bin/vim

.gitignore

@@ -1 +1,2 @@
 .vim/.netrwhist
+.DS_Store

.tmux.conf.local

@@ -0,0 +1,5 @@
+set-window-option -g mode-keys vi
+bind-key -T copy-mode-vi v send -X begin-selection
+bind-key -T copy-mode-vi V send -X select-line
+bind-key -T copy-mode-vi y send -X copy-pipe-and-cancel 'xclip -in -selection clipboard'
+set-option -g default-shell /usr/bin/fish

.vimrc

@@ -3,29 +3,36 @@ set nocompatible
 call plug#begin('~/.vim/plugged')
 
 Plug 'Lokaltog/vim-easymotion' " Moving within vim \\w
+Plug 'ctrlpvim/ctrlp.vim'
+Plug 'dense-analysis/ale' " ALE for linting/prettier integration
 Plug 'editorconfig/editorconfig-vim'
 Plug 'ervandew/supertab' " <3
 Plug 'goatslacker/mango.vim' " Syntax colors
 Plug 'itchyny/lightline.vim' " Statusline
 Plug 'jlanzarotta/bufexplorer' " \be to open buffers
+Plug 'jremmen/vim-ripgrep' " :Rg <pattern>
 Plug 'rhysd/committia.vim' " Nice commit editing experience
 Plug 'sickill/vim-pasta' " Fixes for paste+indent
 Plug 'spolu/dwm.vim' " Window management: C-N, C-J/K, C-Space
 Plug 'tomtom/tcomment_vim' " gcc / visual: gc
 Plug 'tpope/vim-fugitive' " Git utils
 Plug 'wincent/ferret' " Find & Replace :Acks /{pattern}/{replacement}/
-Plug 'dense-analysis/ale' " ALE for linting/prettier integration
-Plug 'jremmen/vim-ripgrep' " :Rg <pattern>
-Plug 'ctrlpvim/ctrlp.vim'
 
 " Languages
+Plug 'MaxMEllon/vim-jsx-pretty'
+Plug 'Vimjas/vim-python-pep8-indent'
+Plug 'elixir-lang/vim-elixir'
 Plug 'elzr/vim-json'
-Plug 'gabrielelana/vim-markdown'
+Plug 'ericpruitt/tmux.vim'
+Plug 'vim-python/python-syntax'
 Plug 'leafgarland/typescript-vim'
 Plug 'mxw/vim-jsx'
 Plug 'pangloss/vim-javascript'
-Plug 'toyamarinyon/vim-swift'
 Plug 'peitalin/vim-jsx-typescript'
+Plug 'plasticboy/vim-markdown'
+Plug 'rust-lang/rust.vim'
+Plug 'toyamarinyon/vim-swift'
+Plug 'udalov/kotlin-vim'
 
 call plug#end()
 
@@ -131,9 +138,6 @@ autocmd! bufwritepost vimrc source ~/.vim_runtime/vimrc
 " Use tabs for Makefile
 autocmd BufNewFile,BufRead [Mm]akefile* set noexpandtab
 
-" make Python follow PEP8 ( http://www.python.org/dev/peps/pep-0008/ )
-au FileType python set softtabstop=4 tabstop=4 shiftwidth=4 textwidth=79
-
 " Remove any trailing whitespace that is in the file
 autocmd BufRead,BufWrite * if ! &bin | silent! %s/\s\+$//ge | endif
 
@@ -200,6 +204,7 @@ let g:ale_completion_tsserver_autoimport = 1
 let g:ale_linters = {
       \'html': [],
       \'javascript': ['eslint'],
+      \'python': ['ruff', 'pyright'],
       \'typescript': ['eslint', 'tsserver', 'typecheck'],
       \'typescriptreact': ['eslint', 'tsserver', 'typecheck'],
       \}
@@ -210,6 +215,7 @@ let g:ale_fixers = {
       \'javascript': ['prettier'],
       \'json': ['prettier'],
       \'markdown': ['prettier'],
+      \'python': ['ruff', 'ruff_format'],
       \'typescript': ['prettier'],
       \'typescriptreact': ['prettier'],
       \}
@@ -227,9 +233,13 @@ nnoremap <silent> <Left> :ALEPrevious<CR>
 nnoremap <silent> <Right> :ALENext<CR>
 
 let g:ctrlp_map = '<c-p>'
-let g:ctrlp_cmd = 'CtrlP'
+let g:ctrlp_cmd = 'CtrlP .'
 let g:ctrlp_working_path_mode = 'ra'
 if executable('rg')
   let g:ctrlp_user_command = 'rg %s --files --color=never --glob ""'
 endif
 let g:ctrlp_use_caching=0
+
+let g:python_highlight_all = 1
+
+let g:vim_markdown_folding_disabled = 1

rsync-include

@@ -4,6 +4,7 @@
 + .hgrc
 + .config/alacritty
 + .config/fish
++ .config/fish/functions
 + .tmux.conf
 - .vim/plugged
 - /*