From 284fcdb7ece9b6a4c4108799b11736516946eef6 Mon Sep 17 00:00:00 2001 From: Fred Collman Date: Thu, 21 Jul 2022 10:14:06 +0100 Subject: [PATCH 01/19] Load local zsh overrides --- .gitignore | 1 + zshrc/.zshrc | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/.gitignore b/.gitignore index 7784ee0..4f1a503 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ config/variables downloads/ zshrc/.zcompdump +zshrc/local-overrides diff --git a/zshrc/.zshrc b/zshrc/.zshrc index f4ebd87..3bef075 100644 --- a/zshrc/.zshrc +++ b/zshrc/.zshrc @@ -10,6 +10,10 @@ . $ZDOTDIR/docker-compose . $ZDOTDIR/brew +if [ -f $ZDOTDIR/local-overrides ]; then + . $ZDOTDIR/local-overrides +fi + # installed via fzf for vim # . ~/.fzf.zsh From 9fe7df3b86ed182fd7a737cf02ec9cf1f136d84b Mon Sep 17 00:00:00 2001 From: Fred Collman Date: Tue, 3 Jan 2023 14:27:39 +0000 Subject: [PATCH 02/19] Prepare commit template using branch name --- .git_template/hooks/prepare-commit-msg | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100755 .git_template/hooks/prepare-commit-msg diff --git a/.git_template/hooks/prepare-commit-msg b/.git_template/hooks/prepare-commit-msg new file mode 100755 index 0000000..495f2a6 --- /dev/null +++ b/.git_template/hooks/prepare-commit-msg @@ -0,0 +1,20 @@ +#!/usr/bin/env sh +target_file="$1" + +commit_type="$2" + +if [ ! -z "$commit_type" ]; then + # re-use existing commit message + exit 0 +fi + + +existing_content=$(cat $target_file) + +branch_type=$(git current | cut -d '/' -f1) + +cat > $target_file < Date: Tue, 3 Jan 2023 14:28:42 +0000 Subject: [PATCH 03/19] Allow overriding keepdoing patterns via env var --- bin/keepdoing | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/keepdoing b/bin/keepdoing index 122a353..a82dfb3 100755 --- a/bin/keepdoing +++ b/bin/keepdoing @@ -1,2 +1,3 @@ #!/usr/bin/env sh -watchmedo shell-command --patterns="*.py;*.sh;*.js;*.jsx;*file" --ignore-directories --recursive --drop --command="$1" +PATTERNS=${KD_PATTERNS:-"*.py;*.sh;*.js;*.jsx;*file"} +watchmedo shell-command --patterns="$PATTERNS" --ignore-directories --recursive --drop --command="$1" From 61b4ff3d0f33d531f7d310ea528d0a698f962c71 Mon Sep 17 00:00:00 2001 From: Fred Collman Date: Tue, 3 Jan 2023 14:29:04 +0000 Subject: [PATCH 04/19] View GitLab MR in browser --- config/.gitconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/config/.gitconfig b/config/.gitconfig index ec1abec..3eb54e0 100644 --- a/config/.gitconfig +++ b/config/.gitconfig @@ -23,6 +23,7 @@ nicelog = !nicelog cloc = !cloc --vcs=git rev = !glab mr checkout + mrv = !glab mr view --web br = !nicebranch [url "https://github.com/"] insteadOf = hub: From b6780c231bd33d13ed6f47c26918a7a68458b4eb Mon Sep 17 00:00:00 2001 From: Fred Collman Date: Tue, 3 Jan 2023 14:29:23 +0000 Subject: [PATCH 05/19] Patch ale to support pnpm+eslint --- nvim/init.vim | 8 ++++---- nvim/lua/plugins.lua | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/nvim/init.vim b/nvim/init.vim index c593694..03baa20 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -20,12 +20,12 @@ endif let g:ale_fix_on_save = 1 let g:ale_fixers = { \ 'python': ['isort', 'black', 'autoflake'], -\ 'javascript': ['prettier'], -\ 'javascriptreact': ['prettier'], +\ 'javascript': ['prettier', 'eslint'], +\ 'javascriptreact': ['prettier', 'eslint'], \ 'json': ['prettier'], \ 'css': ['prettier'], -\ 'typescript': ['prettier'], -\ 'typescriptreact': ['prettier'], +\ 'typescript': ['prettier', 'eslint'], +\ 'typescriptreact': ['prettier', 'eslint'], \ 'elixir': ['mix_format'], \} let g:ale_sign_column_always = 1 diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua index 14b6786..68525ed 100644 --- a/nvim/lua/plugins.lua +++ b/nvim/lua/plugins.lua @@ -38,7 +38,8 @@ return require('packer').startup( use 'tpope/vim-repeat' -- linting and fixing - use 'dense-analysis/ale' + -- use 'dense-analysis/ale' + use '~/dev/ale' -- syntax highlighting: JSX, Jenkinsfile and more From cc89fed282bfdfc3d8656514097780e3e674a529 Mon Sep 17 00:00:00 2001 From: Fred Collman Date: Tue, 3 Jan 2023 14:40:40 +0000 Subject: [PATCH 06/19] Make git browse work with both gh and glab --- bin/git-browse | 5 +++++ config/.gitconfig | 1 + config/local-bin | 1 + 3 files changed, 7 insertions(+) create mode 100755 bin/git-browse diff --git a/bin/git-browse b/bin/git-browse new file mode 100755 index 0000000..37f4dd7 --- /dev/null +++ b/bin/git-browse @@ -0,0 +1,5 @@ +#!/usr/bin/env sh +set -e + +gh repo view --web +glab repo view --web diff --git a/config/.gitconfig b/config/.gitconfig index 3eb54e0..fba6deb 100644 --- a/config/.gitconfig +++ b/config/.gitconfig @@ -25,6 +25,7 @@ rev = !glab mr checkout mrv = !glab mr view --web br = !nicebranch + aliases = !git config -l | grep alias | cut -c 7- [url "https://github.com/"] insteadOf = hub: [include] diff --git a/config/local-bin b/config/local-bin index 53154a1..2ee4bb2 100755 --- a/config/local-bin +++ b/config/local-bin @@ -3,3 +3,4 @@ LOCALBIN_DIR="$HOME/.local/bin" mkdir -p "$LOCALBIN_DIR" ln -s `pwd`/bin/bookmark-manager.sh "$LOCALBIN_DIR/bm" ln -s `pwd`/bin/keepdoing "$LOCALBIN_DIR/kd" +ln -s `pwd`/bin/* "$LOCALBIN_DIR" From e61d20e59b631e5b15fc5023156fa335de5f7ead Mon Sep 17 00:00:00 2001 From: Fred Collman Date: Tue, 3 Jan 2023 15:31:07 +0000 Subject: [PATCH 07/19] Install organize --- scripts/install | 1 + scripts/organize | 3 +++ 2 files changed, 4 insertions(+) create mode 100755 scripts/organize diff --git a/scripts/install b/scripts/install index 2278c65..2f42d33 100755 --- a/scripts/install +++ b/scripts/install @@ -18,3 +18,4 @@ scripts/cloc scripts/neovim scripts/python scripts/nodejs +scripts/organize diff --git a/scripts/organize b/scripts/organize new file mode 100755 index 0000000..739c589 --- /dev/null +++ b/scripts/organize @@ -0,0 +1,3 @@ +#!/usr/bin/env sh +# https://github.com/tfeldmann/organize +pip install "organize-tool" From d908b42ea64588a8382b449d32eae238a8c2c239 Mon Sep 17 00:00:00 2001 From: Fred Collman Date: Tue, 3 Jan 2023 15:32:39 +0000 Subject: [PATCH 08/19] Allow local zsh overrides --- zshrc/local-overrides | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 zshrc/local-overrides diff --git a/zshrc/local-overrides b/zshrc/local-overrides new file mode 100644 index 0000000..fb66498 --- /dev/null +++ b/zshrc/local-overrides @@ -0,0 +1,2 @@ +#!zsh +. ~/.zshrc From e523d4fc62e28f07f07184e01525177e0c36fca1 Mon Sep 17 00:00:00 2001 From: Fred Collman Date: Tue, 3 Jan 2023 18:43:46 +0000 Subject: [PATCH 09/19] Install rust --- config/.tool-versions | 1 + scripts/rust | 4 ++++ 2 files changed, 5 insertions(+) create mode 100755 scripts/rust diff --git a/config/.tool-versions b/config/.tool-versions index 97aeefe..c2ac3db 100644 --- a/config/.tool-versions +++ b/config/.tool-versions @@ -1,3 +1,4 @@ python 3.10.4 nodejs lts yarn 1.22.19 +rust 1.66.0 diff --git a/scripts/rust b/scripts/rust new file mode 100755 index 0000000..f734477 --- /dev/null +++ b/scripts/rust @@ -0,0 +1,4 @@ +#!/usr/bin/env sh +asdf plugin add rust +asdf install rust latest +asdf global rust latest From 56c5d4344fa8da9975b0728538d5034afbbdf9f5 Mon Sep 17 00:00:00 2001 From: Fred Collman Date: Sat, 7 Jan 2023 18:05:22 +0000 Subject: [PATCH 10/19] Install tauri --- config/.tool-versions | 1 + scripts/install | 2 ++ scripts/tauri | 10 ++++++++++ 3 files changed, 13 insertions(+) create mode 100755 scripts/tauri diff --git a/config/.tool-versions b/config/.tool-versions index c2ac3db..f734049 100644 --- a/config/.tool-versions +++ b/config/.tool-versions @@ -2,3 +2,4 @@ python 3.10.4 nodejs lts yarn 1.22.19 rust 1.66.0 +pnpm 7.12.2 diff --git a/scripts/install b/scripts/install index 2278c65..c438345 100755 --- a/scripts/install +++ b/scripts/install @@ -18,3 +18,5 @@ scripts/cloc scripts/neovim scripts/python scripts/nodejs +scripts/rust +scripts/tauri diff --git a/scripts/tauri b/scripts/tauri new file mode 100755 index 0000000..76d213f --- /dev/null +++ b/scripts/tauri @@ -0,0 +1,10 @@ +#!/usr/bin/env sh +# https://tauri.app/v1/guides/getting-started/prerequisites#setting-up-linux +sudo apt install libwebkit2gtk-4.0-dev \ + build-essential \ + curl \ + wget \ + libssl-dev \ + libgtk-3-dev \ + libayatana-appindicator3-dev \ + librsvg2-dev From 8917e91dd573cf0c900aa5861d7e343f80bd97f1 Mon Sep 17 00:00:00 2001 From: Fred Collman Date: Sat, 7 Jan 2023 19:51:09 +0000 Subject: [PATCH 11/19] Support astro in vim --- nvim/init.vim | 3 +++ nvim/lua/plugins.lua | 3 +++ 2 files changed, 6 insertions(+) diff --git a/nvim/init.vim b/nvim/init.vim index c593694..981535e 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -76,6 +76,9 @@ nnoremap gb :Git blame " MaxMEllon/vim-jsx-pretty installed via vim-polyglot let g:vim_jsx_pretty_highlight_close_tag = 1 +" https://github.com/wuelnerdotexe/vim-astro#configuration +let g:astro_typescript = 'enable' + let g:user_emmet_expandabbr_key='' colorscheme molokai diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua index 14b6786..538343d 100644 --- a/nvim/lua/plugins.lua +++ b/nvim/lua/plugins.lua @@ -44,6 +44,9 @@ return require('packer').startup( -- syntax highlighting: JSX, Jenkinsfile and more use 'sheerun/vim-polyglot' + -- syntax highlight: astro + use 'wuelnerdotexe/vim-astro' + -- colour scheme use 'tomasr/molokai' From 296d7db4d7004021676ad24937494bb953986668 Mon Sep 17 00:00:00 2001 From: Fred Collman Date: Mon, 9 Jan 2023 18:58:33 +0000 Subject: [PATCH 12/19] Update GNOME install for 22.04 --- scripts/gnome-extensions | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/gnome-extensions b/scripts/gnome-extensions index 9167e76..ad5a711 100755 --- a/scripts/gnome-extensions +++ b/scripts/gnome-extensions @@ -1,5 +1,6 @@ #!/usr/bin/env sh # sudo apt install chrome-gnome-shell +sudo apt install gnome-shell-extension-manager mkdir -p downloads curl https://extensions.gnome.org/extension-data/caffeinepatapon.info.v37.shell-extension.zip > downloads/caffeine.zip From f2b3360c5993b857377d36bb6ad0b67da0426aaa Mon Sep 17 00:00:00 2001 From: Fred Collman Date: Mon, 27 Feb 2023 10:00:33 +0000 Subject: [PATCH 13/19] Switch to faster tools --- bin/git-browse | 2 +- nvim/init.vim | 7 +++++-- scripts/install | 1 + scripts/pgadmin4 | 12 ++++++++++++ zshrc/shell | 3 ++- 5 files changed, 21 insertions(+), 4 deletions(-) create mode 100755 scripts/pgadmin4 diff --git a/bin/git-browse b/bin/git-browse index 37f4dd7..5388ecf 100755 --- a/bin/git-browse +++ b/bin/git-browse @@ -1,5 +1,5 @@ #!/usr/bin/env sh -set -e +set +e gh repo view --web glab repo view --web diff --git a/nvim/init.vim b/nvim/init.vim index 1f62f94..9897673 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -19,7 +19,7 @@ endif " ALE adjustments let g:ale_fix_on_save = 1 let g:ale_fixers = { -\ 'python': ['isort', 'black', 'autoflake'], +\ 'python': ['black', 'ruff'], \ 'javascript': ['prettier', 'eslint'], \ 'javascriptreact': ['prettier', 'eslint'], \ 'json': ['prettier'], @@ -93,7 +93,10 @@ let g:highlightedyank_highlight_duration = 350 " fzf.vim shortcuts " nnoremap f :GFiles " nnoremap b :Buffers -nnoremap u :Ag \b +nnoremap u :Rg \b +" muscle memory: clobber Ag to use Rg instead +cabbrev Ag Rg +nnoremap t :Tags " navigate smoothly from terminal mode/between windows " via https://thoughtbot.com/upcase/videos/neovim-creating-mappings-for-terminal diff --git a/scripts/install b/scripts/install index 6d02c36..647d304 100755 --- a/scripts/install +++ b/scripts/install @@ -23,3 +23,4 @@ scripts/rust scripts/tauri scripts/terraform scripts/organize +scripts/pgadmin4 diff --git a/scripts/pgadmin4 b/scripts/pgadmin4 new file mode 100755 index 0000000..24769d6 --- /dev/null +++ b/scripts/pgadmin4 @@ -0,0 +1,12 @@ +#!/usr/bin/env sh + +# ref: https://www.pgadmin.org/download/pgadmin-4-apt/ + +# Install the public key for the repository (if not done previously): +curl -fsS https://www.pgadmin.org/static/packages_pgadmin_org.pub | sudo gpg --dearmor -o /usr/share/keyrings/packages-pgadmin-org.gpg + +# Create the repository configuration file: +sudo sh -c 'echo "deb [signed-by=/usr/share/keyrings/packages-pgadmin-org.gpg] https://ftp.postgresql.org/pub/pgadmin/pgadmin4/apt/$(lsb_release -cs) pgadmin4 main" > /etc/apt/sources.list.d/pgadmin4.list && apt update' + +# Install for both desktop and web modes: +sudo apt install pgadmin4 diff --git a/zshrc/shell b/zshrc/shell index a2fb3b1..99fa4f8 100644 --- a/zshrc/shell +++ b/zshrc/shell @@ -15,7 +15,8 @@ set -o emacs bindkey -e function grepp() { - ag --group -A 2 --smart-case --pager="better-less" "$@" + # ag --group -A 2 --smart-case --pager="better-less" "$@" + rg -A 2 --smart-case "$@" } alias "?"=grepp From 6e15ce073506b02242c58e93689d6ffb2ce5c578 Mon Sep 17 00:00:00 2001 From: Fred Collman Date: Mon, 27 Feb 2023 10:05:47 +0000 Subject: [PATCH 14/19] Install misc packages via homebrew --- scripts/brew-leaves | 17 +++++++++++++++++ scripts/install | 1 + 2 files changed, 18 insertions(+) create mode 100755 scripts/brew-leaves diff --git a/scripts/brew-leaves b/scripts/brew-leaves new file mode 100755 index 0000000..07b2678 --- /dev/null +++ b/scripts/brew-leaves @@ -0,0 +1,17 @@ +#!/usr/bin/env sh + +# misc formulae to install +# to calculate:: +# +# brew leaves + +brew install \ + bats-core \ + exercism \ + # gawk \ + # lolcat \ + # luajit-openresty \ + # neovim \ + pipx + # ripgrep \ + # tmate \ diff --git a/scripts/install b/scripts/install index 647d304..47f98b6 100755 --- a/scripts/install +++ b/scripts/install @@ -24,3 +24,4 @@ scripts/tauri scripts/terraform scripts/organize scripts/pgadmin4 +scripts/brew-leaves From f09b2a301980485ce68d00d8b1161df2ff6b9373 Mon Sep 17 00:00:00 2001 From: Fred Collman Date: Tue, 7 Mar 2023 18:33:51 +0000 Subject: [PATCH 15/19] Install tree --- nvim/init.vim | 2 ++ scripts/brew-leaves | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/nvim/init.vim b/nvim/init.vim index 9897673..94d540a 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -96,6 +96,8 @@ let g:highlightedyank_highlight_duration = 350 nnoremap u :Rg \b " muscle memory: clobber Ag to use Rg instead cabbrev Ag Rg +" and deal with casing issues +cabbrev ag Rg nnoremap t :Tags " navigate smoothly from terminal mode/between windows diff --git a/scripts/brew-leaves b/scripts/brew-leaves index 07b2678..246f176 100755 --- a/scripts/brew-leaves +++ b/scripts/brew-leaves @@ -12,6 +12,7 @@ brew install \ # lolcat \ # luajit-openresty \ # neovim \ - pipx + pipx \ # ripgrep \ # tmate \ + tree From 76d1940c92bf75c449773c459caafd708742ac77 Mon Sep 17 00:00:00 2001 From: Fred Collman Date: Wed, 3 May 2023 14:32:52 +0100 Subject: [PATCH 16/19] Switch to docker compose v2 --- bin/readme | 2 ++ nvim/lua/fred.lua | 1 + nvim/lua/snippets.lua | 3 +++ zshrc/docker-compose | 12 ++++++------ 4 files changed, 12 insertions(+), 6 deletions(-) create mode 100755 bin/readme create mode 100644 nvim/lua/snippets.lua diff --git a/bin/readme b/bin/readme new file mode 100755 index 0000000..de93a28 --- /dev/null +++ b/bin/readme @@ -0,0 +1,2 @@ +#!/usr/bin/env sh +sensible-browser README.md diff --git a/nvim/lua/fred.lua b/nvim/lua/fred.lua index 7ea381b..b446711 100644 --- a/nvim/lua/fred.lua +++ b/nvim/lua/fred.lua @@ -2,6 +2,7 @@ modules = { "./plugins", "./lsp", "./searching", + "./snippets", } function _G.reload_fred_config() diff --git a/nvim/lua/snippets.lua b/nvim/lua/snippets.lua new file mode 100644 index 0000000..1b9ff67 --- /dev/null +++ b/nvim/lua/snippets.lua @@ -0,0 +1,3 @@ +vim.g.UltiSnipsExpandTrigger='' + +vim.keymap.set('n', 's', 'UltiSnipsEdit') diff --git a/zshrc/docker-compose b/zshrc/docker-compose index 41239fc..315faa1 100644 --- a/zshrc/docker-compose +++ b/zshrc/docker-compose @@ -3,10 +3,10 @@ alias d="docker" # dc is already taken -alias dco="docker-compose" -alias dcof="docker-compose -f docker-compose.yml" +alias dco="docker compose" +alias dcof="docker compose -f docker-compose.yml" -alias dcu="docker-compose up" -alias dcr="docker-compose run --rm" -alias dcb="docker-compose build" -alias dcl="docker-compose logs --tail=1000 --follow" +alias dcu="docker compose up" +alias dcr="docker compose run --rm" +alias dcb="docker compose build" +alias dcl="docker compose logs --tail=1000 --follow" From ad465eb5a821258f59b3a4860e0995e899cdef8a Mon Sep 17 00:00:00 2001 From: Fred Collman Date: Wed, 6 Sep 2023 12:17:59 +0100 Subject: [PATCH 17/19] Set up terraspace --- nvim/init.vim | 4 ++++ scripts/install | 1 + scripts/ruby | 8 ++++++++ zshrc/terraform | 2 ++ 4 files changed, 15 insertions(+) create mode 100755 scripts/ruby diff --git a/nvim/init.vim b/nvim/init.vim index 94d540a..33c14f4 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -100,6 +100,10 @@ cabbrev Ag Rg cabbrev ag Rg nnoremap t :Tags +nnoremap a :A +nnoremap s :Estory + + " navigate smoothly from terminal mode/between windows " via https://thoughtbot.com/upcase/videos/neovim-creating-mappings-for-terminal if has('nvim') diff --git a/scripts/install b/scripts/install index 47f98b6..24362c5 100755 --- a/scripts/install +++ b/scripts/install @@ -22,6 +22,7 @@ scripts/nodejs scripts/rust scripts/tauri scripts/terraform +scripts/ruby scripts/organize scripts/pgadmin4 scripts/brew-leaves diff --git a/scripts/ruby b/scripts/ruby new file mode 100755 index 0000000..0673528 --- /dev/null +++ b/scripts/ruby @@ -0,0 +1,8 @@ +#!/usr/bin/env sh + +# https://github.com/rbenv/ruby-build/wiki#ubuntudebianmint +sudo apt-get install autoconf bison patch build-essential rustc libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libgmp-dev libncurses5-dev libffi-dev libgdbm6 libgdbm-dev libdb-dev uuid-dev + +asdf plugin add ruby +asdf install ruby latest +asdf global ruby latest diff --git a/zshrc/terraform b/zshrc/terraform index 4711258..159bddd 100644 --- a/zshrc/terraform +++ b/zshrc/terraform @@ -2,3 +2,5 @@ autoload -U +X bashcompinit && bashcompinit complete -o nospace -C $(asdf which terraform) terraform alias tf=terraform + +alias tspace=bundle exec terraspace From d6d246b658a4e64bbc39998572ae005ff4f36808 Mon Sep 17 00:00:00 2001 From: Fred Collman Date: Wed, 6 Sep 2023 12:23:01 +0100 Subject: [PATCH 18/19] Add snippets --- config/nvim | 1 + nvim/UltiSnips/all.snippets | 6 +++++ nvim/UltiSnips/lua.snippets | 3 +++ nvim/UltiSnips/snippets.snippets | 6 +++++ nvim/UltiSnips/typescript.snippets | 33 +++++++++++++++++++++++++ nvim/UltiSnips/typescriptreact.snippets | 17 +++++++++++++ 6 files changed, 66 insertions(+) create mode 100644 nvim/UltiSnips/all.snippets create mode 100644 nvim/UltiSnips/lua.snippets create mode 100644 nvim/UltiSnips/snippets.snippets create mode 100644 nvim/UltiSnips/typescript.snippets create mode 100644 nvim/UltiSnips/typescriptreact.snippets diff --git a/config/nvim b/config/nvim index 115e679..0ba4258 100755 --- a/config/nvim +++ b/config/nvim @@ -9,6 +9,7 @@ fi ln -s `pwd`/nvim/init.vim $NEOVIM_DIR/init.vim ln -s `pwd`/nvim/lua $NEOVIM_DIR/lua +ln -s `pwd`/nvim/UltiSnips $NEOVIM_DIR/UltiSnips git clone https://github.com/k-takata/minpac.git $NEOVIM_DIR/pack/minpac/opt/minpac git clone --depth 1 https://github.com/wbthomason/packer.nvim $NEOVIM_PACKAGES_DIR/pack/packer/start/packer.nvim diff --git a/nvim/UltiSnips/all.snippets b/nvim/UltiSnips/all.snippets new file mode 100644 index 0000000..4a1a657 --- /dev/null +++ b/nvim/UltiSnips/all.snippets @@ -0,0 +1,6 @@ +snippet uuid +`!p import uuid +if not snip.c: + snip.rv = repr(str(uuid.uuid4()))` +endsnippet + diff --git a/nvim/UltiSnips/lua.snippets b/nvim/UltiSnips/lua.snippets new file mode 100644 index 0000000..1646739 --- /dev/null +++ b/nvim/UltiSnips/lua.snippets @@ -0,0 +1,3 @@ +snippet g +vim.g.$1 = "$2" +endsnippet diff --git a/nvim/UltiSnips/snippets.snippets b/nvim/UltiSnips/snippets.snippets new file mode 100644 index 0000000..9bb8b92 --- /dev/null +++ b/nvim/UltiSnips/snippets.snippets @@ -0,0 +1,6 @@ +snippet s +snippet $1 +$2 +`echo endsnippet` +endsnippet + diff --git a/nvim/UltiSnips/typescript.snippets b/nvim/UltiSnips/typescript.snippets new file mode 100644 index 0000000..6d1635f --- /dev/null +++ b/nvim/UltiSnips/typescript.snippets @@ -0,0 +1,33 @@ +snippet noany +// eslint-disable-next-line @typescript-eslint/no-explicit-any +endsnippet + +snippet nothis +// eslint-disable-next-line class-methods-use-this +endsnippet + +snippet i +import $2 from "$1"; +endsnippet + +snippet ir +import $1 from "./$1"; +endsnippet + +snippet lo +import $1 from "lodash/$1"; +endsnippet + +snippet d +describe('$1', () => { + it('$2', () => { + expect(1).toBe(0) + }) +}) +endsnippet + +snippet it +it('$1', () => { + expect(1).toBe(0) +}) +endsnippet diff --git a/nvim/UltiSnips/typescriptreact.snippets b/nvim/UltiSnips/typescriptreact.snippets new file mode 100644 index 0000000..6efcb36 --- /dev/null +++ b/nvim/UltiSnips/typescriptreact.snippets @@ -0,0 +1,17 @@ +extends typescript + +snippet c +`!p fn = snip.basename +proptype = f"{fn}Props" +snip.rv = "\n".join([ +f"interface {proptype} {{", +" todo: null", +"}", +"", +f"const {fn} = ({{todo}}: {proptype}) => {{", +" return <>TODO: {todo}", +"}", +"", +f"export default {fn}", +])` +endsnippet From 0e006aa36727927269922ee4d90c6b5a30786913 Mon Sep 17 00:00:00 2001 From: Fred Collman Date: Wed, 6 Sep 2023 12:26:19 +0100 Subject: [PATCH 19/19] Write up .z* for debugging --- README.md | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/README.md b/README.md index bab34c6..13a6697 100644 --- a/README.md +++ b/README.md @@ -18,3 +18,39 @@ If running on Windows, you might need to make sure that line endings are configu ```sh git config --global core.autocrlf true ``` + +## Examples of home directory dotfiles + +```sh +# .zshenv +source "${XDG_CONFIG_HOME:-$HOME/.config}/asdf-direnv/zshrc" +export DEBUG_SOURCED_HOME_ZSHRC="~/.zshrc at $(date -Is)" + + +eval "$(starship init zsh)" + +# pnpm overrides for muscle memory +alias y="pnpm" +alias y+="pnpm add" +alias yd="pnpm add --save-dev" +``` + +```sh +# .zshrc +source "${XDG_CONFIG_HOME:-$HOME/.config}/asdf-direnv/zshrc" +export DEBUG_SOURCED_HOME_ZSHRC="~/.zshrc at $(date -Is)" + + +eval "$(starship init zsh)" + +# pnpm overrides for muscle memory +alias y="pnpm" +alias y+="pnpm add" +alias yd="pnpm add --save-dev" +``` + +```sh +# .zprofile +BM_HELLO_NOEXPORT=hello +export BM_HELLO_EXPORT=hello +```