diff --git a/.gitconfig b/.gitconfig index 876d2e3..6ebd742 100644 --- a/.gitconfig +++ b/.gitconfig @@ -1,13 +1,13 @@ -# This is Git's per-user configuration file. [user] name = James Stevenson email = james.stevenson@nationwidechildrens.org [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 diff --git a/.irbrc b/.irbrc index ac6c65b..9fe628e 100644 --- a/.irbrc +++ b/.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" diff --git a/ipython_config.py b/ipython_config.py index afda24e..fe6b5e4 100644 --- a/ipython_config.py +++ b/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 #------------------------------------------------------------------------------ diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json deleted file mode 100644 index d25b375..0000000 --- a/nvim/lazy-lock.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" }, - "auto-pairs": { "branch": "master", "commit": "39f06b873a8449af8ff6a3eee716d3da14d63a76" }, - "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" }, - "conflict-marker.vim": { "branch": "master", "commit": "11a4d42244755505b66b15cd4496a150432eb5e3" }, - "gitsigns.nvim": { "branch": "main", "commit": "749267aaa863c30d721c9913699c5d94e0c07dd3" }, - "lazy.nvim": { "branch": "main", "commit": "dac844ed617dda4f9ec85eb88e9629ad2add5e05" }, - "lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "2997f467881ac4faa6f8c5e7065e3a672297c8ad" }, - "mason.nvim": { "branch": "main", "commit": "a51c2d063c5377ee9e58c5f9cda7c7436787be72" }, - "nvim-bufferline.lua": { "branch": "main", "commit": "417b303328118b6d836ae330142e88771c48a8a3" }, - "nvim-cmp": { "branch": "main", "commit": "51f1e11a89ec701221877532ee1a23557d291dd5" }, - "nvim-lspconfig": { "branch": "master", "commit": "67f151e84daddc86cc65f5d935e592f76b9f4496" }, - "nvim-tmux": { "branch": "main", "commit": "f8f13b8172071eb5464bb204fca6188730825824" }, - "nvim-treesitter": { "branch": "master", "commit": "2ee71c1a2fa74c10692be10ae420ff0c3a02eb3c" }, - "nvim-treesitter-endwise": { "branch": "master", "commit": "9298b3ac8fd6d0d8f9e321194c6d3fd37e417cf9" }, - "nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" }, - "nvim-web-devicons": { "branch": "master", "commit": "cfc8824cc1db316a276b36517f093baccb8e799a" }, - "playground": { "branch": "master", "commit": "2b81a018a49f8e476341dfcb228b7b808baba68b" }, - "plenary.nvim": { "branch": "master", "commit": "267282a9ce242bbb0c5dc31445b6d353bed978bb" }, - "rainbow_csv": { "branch": "master", "commit": "7453a3f9679f0c753ec9d77f9ea8588778f35aeb" }, - "rest.nvim": { "branch": "main", "commit": "22673c848768ff25517154a5aebfebc0c77d0b4f" }, - "rust.vim": { "branch": "master", "commit": "889b9a7515db477f4cb6808bef1769e53493c578" }, - "tabular": { "branch": "master", "commit": "339091ac4dd1f17e225fe7d57b48aff55f99b23a" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "9bc8237565ded606e6c366a71c64c0af25cd7a50" }, - "telescope.nvim": { "branch": "master", "commit": "776b509f80dd49d8205b9b0d94485568236d1192" }, - "tokyonight.nvim": { "branch": "main", "commit": "1ee11019f8a81dac989ae1db1a013e3d582e2033" }, - "vim-hexokinase": { "branch": "master", "commit": "62324b43ea858e268fb70665f7d012ae67690f43" }, - "vim-http": { "branch": "master", "commit": "e642fb95754f7335244b941827c25f3d5d0bc415" }, - "vim-python-pep8-indent": { "branch": "master", "commit": "60ba5e11a61618c0344e2db190210145083c91f8" }, - "vim-racket": { "branch": "master", "commit": "2c7ec0f35a2ad1ca00305e5d67837bc1f1d4b6cc" }, - "vim-slime": { "branch": "main", "commit": "c1f6a5bdd86f2beceaaf694e34a2587aca76319a" }, - "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, - "vim-vsnip": { "branch": "master", "commit": "7753ba9c10429c29d25abfd11b4c60b76718c438" }, - "vim-vsnip-integ": { "branch": "master", "commit": "1914e72cf3de70df7f5dde476cd299aba2440aef" }, - "vimtex": { "branch": "master", "commit": "534fd725f2475a9083b032e402c7e73b8a3fc6bb" } -} \ No newline at end of file diff --git a/nvim/lua/lsp.lua b/nvim/lua/lsp.lua index 9fefb94..b2fdda7 100644 --- a/nvim/lua/lsp.lua +++ b/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" }, } -------------------------------------------------------------------------------- diff --git a/zsh_config.sh b/zsh_config.sh index 37217d4..1953f0f 100644 --- a/zsh_config.sh +++ b/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) +}