Merge?

.gitconfig

@@ -1,13 +1,13 @@
-# This is Git's per-user configuration file.
 [user]
     name = James Stevenson
     email = [email protected]
 
 [filter "lfs"]
-	clean = git-lfs clean -- %f
-	smudge = git-lfs smudge -- %f
-	process = git-lfs filter-process
-	required = true
+    clean = git-lfs clean -- %f
+    smudge = git-lfs smudge -- %f
+    process = git-lfs filter-process
+    required = true
+
 [submodule]
     recurse = true
 
@@ -21,6 +21,8 @@
     lg2-specific = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(auto)%d%C(reset)%n''          %C(white)%s%C(reset) %C(dim white)- %an%C(reset)'
     lg3-specific = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset) %C(bold cyan)(committed: %cD)%C(reset) %C(auto)%d%C(reset)%n''          %C(white)%s%C(reset)%n''          %C(dim white)- %an <%ae> %C(reset) %C(dim white)(committer: %cn <%ce>)%C(reset)'
 
+    arc = archive -v -o archive.zip --format=zip HEAD
+
 [init]
     defaultBranch = main
 
@@ -37,8 +39,8 @@
     diffFilter = delta --color-only
 
 [delta]
-    navigate = true    # use n and N to move between diff sections
-    light = false      # set to true if you're in a terminal w/ a light background color (e.g. the default macOS terminal)
+    navigate = true
+    true-color = always
 
 [merge]
     conflictstyle = diff3

.irbrc

@@ -28,10 +28,10 @@ if defined?(Rails)
 else
   outer_text = "irb"
 
-  if IRB.conf[:PROMPT].key? :RVM  # requires RVM
-    version = IRB.conf[:PROMPT][:RVM][:PROMPT_I].split(" ")[0]
-    middle_text = "v#{version}"
-  end
+  # if IRB.conf[:PROMPT].key? :RVM  # requires RVM
+  #   version = IRB.conf[:PROMPT][:RVM][:PROMPT_I].split(" ")[0]
+  #   middle_text = "v#{version}"
+  # end
 end
 
 outer_color = "\e[38;2;#{dark};48;2;#{outer_bg_color}m"

ipython_config.py

@@ -426,13 +426,6 @@
 #  in orange: printf "\x1b[38;2;255;100;0mTRUECOLOR\x1b[0m\n"
 c.TerminalInteractiveShell.true_color = True
 
-c.TerminalInteractiveShell.shortcuts = [
-    {
-        "command": "IPython:auto_suggest.accept",
-        "new_keys": ["right"]
-    }
-]
-
 #------------------------------------------------------------------------------
 # HistoryAccessor(HistoryAccessorBase) configuration
 #------------------------------------------------------------------------------

nvim/lua/lsp.lua

@@ -283,9 +283,10 @@ local options_efm = {
         prettier_options,
       },
       javascript = { prettier_options },
+      graphql = { prettier_options },
     },
   },
-  -- filetypes = { "lua", "python", "yaml", "html", "css", "json", "javascript" },
+  -- filetypes = { "lua", "python", "yaml", "html", "css", "json", "javascript", "graphql" },
 }
 
 --------------------------------------------------------------------------------

zsh_config.sh

@@ -35,11 +35,11 @@ get_env_name() {
     elif [[ -n "$VIRTUAL_ENV" ]]; then
         GREEN=$'%{\e[38;2;158;206;106m%}'
         echo "$GREEN\U2699 ${VIRTUAL_ENV##*/}"
-    elif [[ -n "$rvm_ruby_string" ]]; then
-        # red = "247;118;142"
-        RED=$'%{\e[38;2;247;118;142m%}'
-        RUBY_VER="${rvm_ruby_string##*/}"
-        echo "$RED\U2699 ${RUBY_VER:5}"
+    # elif [[ -n "$rvm_ruby_string" ]]; then
+    #     # red = "247;118;142"
+    #     RED=$'%{\e[38;2;247;118;142m%}'
+    #     RUBY_VER="${rvm_ruby_string##*/}"
+    #     echo "$RED\U2699 ${RUBY_VER:5}"
     fi
 }
 
@@ -157,13 +157,13 @@ export VISUAL=/usr/local/bin/nvim
 # readable PATH
 alias printpath="tr ':' '\n' <<< '$PATH'"
 
-# combined cd and show directory (exa)
+# combined cd and show directory (eza)
 function cd {
-    builtin cd "$@" && exa
+    builtin cd "$@" && eza
 }
 
 # colorize and append size measures
-alias ll='exa -l'
+alias ll='eza -l'
 
 # default tree args
 alias trc="tree -AC -I '__pycache__|*.egg-info|build|dynamodb_local|dist'"
@@ -205,3 +205,9 @@ fh() {
 
 # procs alias
 alias prc='procs'
+
+# cleanup docker
+cleandock() {
+  docker rm -vf $(docker ps -aq)
+  docker rmi -f $(docker images -aq)
+}