diff --git a/.config/aqua/aqua.yaml b/.config/aqua/aqua.yaml index a2baa0d2..ab96c2f1 100644 --- a/.config/aqua/aqua.yaml +++ b/.config/aqua/aqua.yaml @@ -46,3 +46,5 @@ packages: - name: google/yamlfmt@v0.10.0 - name: koalaman/shellcheck@v0.9.0 - name: mvdan/sh@v3.7.0 +- name: stern/stern@v1.26.0 +- name: kubernetes-sigs/kind@v0.20.0 diff --git a/.config/jesseduffield/lazygit/config.yml b/.config/jesseduffield/lazygit/config.yml index b2f1a24e..151ed0fe 100644 --- a/.config/jesseduffield/lazygit/config.yml +++ b/.config/jesseduffield/lazygit/config.yml @@ -1,168 +1,168 @@ gui: - # stuff relating to the UI - scrollHeight: 2 # how many lines you scroll by - scrollPastBottom: true # enable scrolling past the bottom - sidePanelWidth: 0.3333 # number from 0 to 1 - expandFocusedSidePanel: false - mainPanelSplitMode: 'flexible' # one of 'horizontal' | 'flexible' | 'vertical' - theme: - lightTheme: false # For terminals with a light background - activeBorderColor: - - blue - - bold - inactiveBorderColor: - - yellow - optionsTextColor: - - blue - selectedLineBgColor: - - yellow - selectedRangeBgColor: - - default - commitLength: - show: true - mouseEvents: true - skipUnstageLineWarning: false - skipStashWarning: true - git: - paging: - colorArg: always - useConfig: false - merging: - # only applicable to unix users - manualCommit: false - # extra args passed to `git merge`, e.g. --no-ff - args: "" - pull: - mode: 'merge' # one of 'merge' | 'rebase' | 'ff-only' - skipHookPrefix: WIP - autoFetch: true - branchLogCmd: "git log --graph --color=always --abbrev-commit --decorate --date=relative --pretty=medium {{branchName}} --" - allBranchesLogCmd: "git log --graph --all --color=always --abbrev-commit --decorate --date=relative --pretty=medium" - overrideGpg: false # prevents lazygit from spawning a separate process when using GPG - disableForcePushing: false - refresher: - refreshInterval: 10 # file/submodule refresh interval in seconds - fetchInterval: 60 # re-fetch interval in seconds - update: - method: prompt # can be: prompt | background | never - days: 14 # how often an update is checked for - reporting: 'undetermined' # one of: 'on' | 'off' | 'undetermined' - confirmOnQuit: false - # determines whether hitting 'esc' will quit the application when there is nothing to cancel/close - quitOnTopLevelReturn: false - disableStartupPopups: false - notARepository: 'prompt' # one of: 'prompt' | 'create' | 'skip' - keybinding: - universal: - quit: 'q' - quit-alt1: '' # alternative/alias of quit - return: '' # return to previous menu, will quit if there's nowhere to return - quitWithoutChangingDirectory: 'Q' - togglePanel: '' # goto the next panel - prevItem: 'k' # go one line up - nextItem: 'j' # go one line down - prevItem-alt: 'k' # go one line up - nextItem-alt: 'j' # go one line down - prevPage: ',' # go to next page in list - nextPage: '.' # go to previous page in list - gotoTop: '<' # go to top of list - gotoBottom: '>' # go to bottom of list - prevBlock: 'h' # goto the previous block / panel - nextBlock: 'l' # goto the next block / panel - prevBlock-alt: 'h' # goto the previous block / panel - nextBlock-alt: 'l' # goto the next block / panel - nextMatch: 'n' - prevMatch: 'N' - optionMenu: 'x' # show help menu - optionMenu-alt1: '?' # show help menu - select: '' - goInto: '' - confirm: '' - confirm-alt1: 'y' - remove: 'd' - new: 'n' - edit: 'e' - openFile: 'o' - scrollUpMain: 'k' # main panel scrool up - scrollDownMain: 'j' # main panel scrool down - scrollUpMain-alt1: 'K' # main panel scrool up - scrollDownMain-alt1: 'J' # main panel scrool down - scrollUpMain-alt2: '' # main panel scrool up - scrollDownMain-alt2: '' # main panel scrool down - executeCustomCommand: ':' - createRebaseOptionsMenu: 'm' - pushFiles: 'P' - pullFiles: 'p' - refresh: 'R' - createPatchOptionsMenu: '' - nextTab: ']' - prevTab: '[' - nextScreenMode: '+' - prevScreenMode: '_' - undo: 'z' - redo: '' - filteringMenu: '' - diffingMenu: 'W' - diffingMenu-alt: '' # deprecated - copyToClipboard: '' - submitEditorText: '' - appendNewline: '' - status: - checkForUpdate: 'u' - recentRepos: '' - files: - commitChanges: 'c' - commitChangesWithoutHook: 'w' # commit changes without pre-commit hook - amendLastCommit: 'A' - commitChangesWithEditor: 'C' - ignoreFile: 'i' - refreshFiles: 'r' - stashAllChanges: 's' - viewStashOptions: 'S' - toggleStagedAll: 'a' # stage/unstage all - viewResetOptions: 'D' - fetch: 'f' - branches: - createPullRequest: 'o' - checkoutBranchByName: 'c' - forceCheckoutBranch: 'F' - rebaseBranch: 'r' - mergeIntoCurrentBranch: 'M' - viewGitFlowOptions: 'i' - fastForward: 'f' # fast-forward this branch from its upstream - pushTag: 'P' - setUpstream: 'u' # set as upstream of checked-out branch - fetchRemote: 'f' - commits: - squashDown: 's' - renameCommit: 'r' - renameCommitWithEditor: 'R' - viewResetOptions: 'g' - markCommitAsFixup: 'f' - createFixupCommit: 'F' # create fixup commit for this commit - squashAboveCommits: 'S' - moveDownCommit: '' # move commit down one - moveUpCommit: '' # move commit up one - amendToCommit: 'A' - pickCommit: 'p' # pick commit (when mid-rebase) - revertCommit: 't' - cherryPickCopy: 'c' - cherryPickCopyRange: 'C' - pasteCommits: 'v' - tagCommit: 'T' - checkoutCommit: '' - resetCherryPick: '' - copyCommitMessageToClipboard: '' - stash: - popStash: 'g' - commitFiles: - checkoutCommitFile: 'c' - main: - toggleDragSelect: 'v' - toggleDragSelect-alt: 'V' - toggleSelectHunk: 'a' - pickBothHunks: 'b' - submodules: - init: 'i' - update: 'u' - bulkMenu: 'b' + # stuff relating to the UI + scrollHeight: 2 # how many lines you scroll by + scrollPastBottom: true # enable scrolling past the bottom + sidePanelWidth: 0.3333 # number from 0 to 1 + expandFocusedSidePanel: false + mainPanelSplitMode: 'flexible' # one of 'horizontal' | 'flexible' | 'vertical' + theme: + lightTheme: false # For terminals with a light background + activeBorderColor: + - blue + - bold + inactiveBorderColor: + - yellow + optionsTextColor: + - blue + selectedLineBgColor: + - yellow + selectedRangeBgColor: + - default + commitLength: + show: true + mouseEvents: true + skipDiscardChangeWarning: false + skipStashWarning: true + git: + paging: + colorArg: always + useConfig: false + merging: + # only applicable to unix users + manualCommit: false + # extra args passed to `git merge`, e.g. --no-ff + args: "" + pull: + mode: 'merge' # one of 'merge' | 'rebase' | 'ff-only' + skipHookPrefix: WIP + autoFetch: true + branchLogCmd: "git log --graph --color=always --abbrev-commit --decorate --date=relative --pretty=medium {{branchName}} --" + allBranchesLogCmd: "git log --graph --all --color=always --abbrev-commit --decorate --date=relative --pretty=medium" + overrideGpg: false # prevents lazygit from spawning a separate process when using GPG + disableForcePushing: false + refresher: + refreshInterval: 10 # file/submodule refresh interval in seconds + fetchInterval: 60 # re-fetch interval in seconds + update: + method: prompt # can be: prompt | background | never + days: 14 # how often an update is checked for + reporting: 'undetermined' # one of: 'on' | 'off' | 'undetermined' + confirmOnQuit: false + # determines whether hitting 'esc' will quit the application when there is nothing to cancel/close + quitOnTopLevelReturn: false + disableStartupPopups: false + notARepository: 'prompt' # one of: 'prompt' | 'create' | 'skip' + keybinding: + universal: + quit: 'q' + quit-alt1: '' # alternative/alias of quit + return: '' # return to previous menu, will quit if there's nowhere to return + quitWithoutChangingDirectory: 'Q' + togglePanel: '' # goto the next panel + prevItem: 'k' # go one line up + nextItem: 'j' # go one line down + prevItem-alt: 'k' # go one line up + nextItem-alt: 'j' # go one line down + prevPage: ',' # go to next page in list + nextPage: '.' # go to previous page in list + gotoTop: '<' # go to top of list + gotoBottom: '>' # go to bottom of list + prevBlock: 'h' # goto the previous block / panel + nextBlock: 'l' # goto the next block / panel + prevBlock-alt: 'h' # goto the previous block / panel + nextBlock-alt: 'l' # goto the next block / panel + nextMatch: 'n' + prevMatch: 'N' + optionMenu: 'x' # show help menu + optionMenu-alt1: '?' # show help menu + select: '' + goInto: '' + confirm: '' + confirm-alt1: 'y' + remove: 'd' + new: 'n' + edit: 'e' + openFile: 'o' + scrollUpMain: 'k' # main panel scrool up + scrollDownMain: 'j' # main panel scrool down + scrollUpMain-alt1: 'K' # main panel scrool up + scrollDownMain-alt1: 'J' # main panel scrool down + scrollUpMain-alt2: '' # main panel scrool up + scrollDownMain-alt2: '' # main panel scrool down + executeCustomCommand: ':' + createRebaseOptionsMenu: 'm' + pushFiles: 'P' + pullFiles: 'p' + refresh: 'R' + createPatchOptionsMenu: '' + nextTab: ']' + prevTab: '[' + nextScreenMode: '+' + prevScreenMode: '_' + undo: 'z' + redo: '' + filteringMenu: '' + diffingMenu: 'W' + diffingMenu-alt: '' # deprecated + copyToClipboard: '' + submitEditorText: '' + appendNewline: '' + status: + checkForUpdate: 'u' + recentRepos: '' + files: + commitChanges: 'c' + commitChangesWithoutHook: 'w' # commit changes without pre-commit hook + amendLastCommit: 'A' + commitChangesWithEditor: 'C' + ignoreFile: 'i' + refreshFiles: 'r' + stashAllChanges: 's' + viewStashOptions: 'S' + toggleStagedAll: 'a' # stage/unstage all + viewResetOptions: 'D' + fetch: 'f' + branches: + createPullRequest: 'o' + checkoutBranchByName: 'c' + forceCheckoutBranch: 'F' + rebaseBranch: 'r' + mergeIntoCurrentBranch: 'M' + viewGitFlowOptions: 'i' + fastForward: 'f' # fast-forward this branch from its upstream + pushTag: 'P' + setUpstream: 'u' # set as upstream of checked-out branch + fetchRemote: 'f' + commits: + squashDown: 's' + renameCommit: 'r' + renameCommitWithEditor: 'R' + viewResetOptions: 'g' + markCommitAsFixup: 'f' + createFixupCommit: 'F' # create fixup commit for this commit + squashAboveCommits: 'S' + moveDownCommit: '' # move commit down one + moveUpCommit: '' # move commit up one + amendToCommit: 'A' + pickCommit: 'p' # pick commit (when mid-rebase) + revertCommit: 't' + cherryPickCopy: 'c' + cherryPickCopyRange: 'C' + pasteCommits: 'v' + tagCommit: 'T' + checkoutCommit: '' + resetCherryPick: '' + copyCommitMessageToClipboard: '' + stash: + popStash: 'g' + commitFiles: + checkoutCommitFile: 'c' + main: + toggleDragSelect: 'v' + toggleDragSelect-alt: 'V' + toggleSelectHunk: 'a' + pickBothHunks: 'b' + submodules: + init: 'i' + update: 'u' + bulkMenu: 'b' diff --git a/.zsh/zinit_wait.zsh b/.zsh/zinit_wait.zsh index d044eb50..ba42edcd 100644 --- a/.zsh/zinit_wait.zsh +++ b/.zsh/zinit_wait.zsh @@ -172,19 +172,6 @@ zinit light GoogleContainerTools/kpt zinit ice wait'2' lucid as"program" pick"create-kubeconfig" zinit light zlabjp/kubernetes-scripts # }}} -# stern/stern {{{ -zinit ice wait'2' lucid as"program" from"gh-r" \ - mv"stern* -> stern" -zinit light stern/stern -# }}} -# ahmetb/kubectx {{{ -zinit ice wait'2' lucid as"program" pick"kubectx" id-as"kubectx" -zinit light ahmetb/kubectx -# }}} -# ahmetb/kubens {{{ -zinit ice wait'2' lucid as"program" pick"kubens" id-as"kubens" -zinit light ahmetb/kubectx -# }}} # ko-build/ko {{{ zinit ice wait'3' lucid as"program" from"gh-r" \ atclone"./ko completion zsh > ~/.zsh/Completion/_ko" atpull"%atclone" \ @@ -204,12 +191,6 @@ zinit ice wait'2' lucid as"program" from:"gh-r" \ atpull"%atclone" zinit light kubernetes-sigs/kubebuilder # }}} -# kubernetes-sigs/kind {{{ -zinit ice wait'3' lucid as"program" from:"gh-r" \ - mv"kind-*->kind" \ - atclone"kind completion zsh > ~/.zsh/Completion/_kind" atpull"%atclone" -zinit light kubernetes-sigs/kind -# }}} # tektoncd/cli {{{ zinit ice wait'2' lucid as"program" from"gh-r" pick"tkn" \ atclone"./tkn completion zsh > ~/.zsh/Completion/_tkn && ln -s $(which tkn) /usr/local/bin/kubectl-tkn" atpull"%atclone"