mirror of
https://github.com/ivuorinen/dotfiles.git
synced 2026-02-04 18:48:52 +00:00
Compare commits
17 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 735807f245 | |||
| 6d531e2d40 | |||
| 77f89c0f48 | |||
| 7f3c7b7e1c | |||
| fc16b8231e | |||
| 64a626d5c4 | |||
| 54816c2ce9 | |||
| 3acaea5611 | |||
| e4a313abe7 | |||
| 0b1c75cbdd | |||
| cab0f4da49 | |||
| cef15eddce | |||
| f8987818b8 | |||
|
|
15d1f6a59a | ||
| ba586fca7d | |||
|
|
d93bc7aae3 | ||
| 77b0428cec |
@@ -1 +1 @@
|
|||||||
extends @ivuorinen/browserslist-config
|
extends @ivuorinen/browserslist-config
|
||||||
|
|||||||
@@ -27,3 +27,9 @@ space_redirects = true
|
|||||||
keep_padding = false
|
keep_padding = false
|
||||||
function_next_line = true # --func-next-line
|
function_next_line = true # --func-next-line
|
||||||
|
|
||||||
|
# Ignore the entire "third_party" directory when calling shfmt on directories,
|
||||||
|
# such as "shfmt -l -w .". When formatting files directly,
|
||||||
|
# like "shfmt -w third_party/foo.sh" or "shfmt --filename=third_party/foo.sh",
|
||||||
|
# the ignore logic is applied only when the --apply-ignore flag is given.
|
||||||
|
[{tools/**,local/bin/asdf/**,config/cheat/cheatsheets/**}]
|
||||||
|
ignore = true
|
||||||
|
|||||||
18
.github/workflows/semantic-pr.yml
vendored
Normal file
18
.github/workflows/semantic-pr.yml
vendored
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
name: Semantic PR
|
||||||
|
|
||||||
|
on:
|
||||||
|
pull_request_target:
|
||||||
|
types:
|
||||||
|
- opened
|
||||||
|
- edited
|
||||||
|
- synchronize
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
semantic-pr:
|
||||||
|
runs-on: self-hosted
|
||||||
|
steps:
|
||||||
|
- uses: amannn/action-semantic-pull-request@v5.5.3
|
||||||
|
env:
|
||||||
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
with:
|
||||||
|
validateSingleCommit: true
|
||||||
3
.gitmodules
vendored
3
.gitmodules
vendored
@@ -64,3 +64,6 @@
|
|||||||
[submodule "tmux/tmux-dark-notify"]
|
[submodule "tmux/tmux-dark-notify"]
|
||||||
path = config/tmux/plugins/tmux-dark-notify
|
path = config/tmux/plugins/tmux-dark-notify
|
||||||
url = https://github.com/erikw/tmux-dark-notify.git
|
url = https://github.com/erikw/tmux-dark-notify.git
|
||||||
|
[submodule "asdf"]
|
||||||
|
path = local/bin/asdf
|
||||||
|
url = https://github.com/asdf-vm/asdf.git
|
||||||
|
|||||||
@@ -1,8 +1,12 @@
|
|||||||
.mypy_cache/*
|
.mypy_cache/*
|
||||||
tools/dotbot*
|
|
||||||
local/bin/antigen.zsh
|
|
||||||
config/cheat/cheatsheets/community
|
|
||||||
config/tmux/plugins/*
|
|
||||||
lazy-lock.json
|
|
||||||
Brewfile.lock.json
|
Brewfile.lock.json
|
||||||
|
config/cheat/cheatsheets/community
|
||||||
|
config/cheat/cheatsheets/tldr
|
||||||
|
config/fzf/*
|
||||||
|
config/nvim-kickstart/*
|
||||||
|
config/tmux/plugins/*
|
||||||
|
config/zsh/*
|
||||||
|
lazy-lock.json
|
||||||
|
local/bin/antigen.zsh
|
||||||
|
local/bin/asdf
|
||||||
|
tools/dotbot*
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
module.exports = {
|
module.exports = {
|
||||||
|
plugins: ['prettier-plugin-sh'],
|
||||||
...require('@ivuorinen/prettier-config'),
|
...require('@ivuorinen/prettier-config'),
|
||||||
trailingComma: 'all',
|
trailingComma: 'all',
|
||||||
// Add custom options below:
|
// Add custom options below:
|
||||||
|
|||||||
@@ -18,6 +18,8 @@ git submodule add --name cheat-community \
|
|||||||
-f https://github.com/cheat/cheatsheets.git config/cheat/cheatsheets/community
|
-f https://github.com/cheat/cheatsheets.git config/cheat/cheatsheets/community
|
||||||
git submodule add --name cheat-tldr \
|
git submodule add --name cheat-tldr \
|
||||||
-f https://github.com/ivuorinen/cheatsheet-tldr.git config/cheat/cheatsheets/tldr
|
-f https://github.com/ivuorinen/cheatsheet-tldr.git config/cheat/cheatsheets/tldr
|
||||||
|
git submodule add --name asdf \
|
||||||
|
-f https://github.com/asdf-vm/asdf.git local/bin/asdf
|
||||||
|
|
||||||
# tmux plugin manager and plugins
|
# tmux plugin manager and plugins
|
||||||
git submodule add --name tmux/tmux-continuum \
|
git submodule add --name tmux/tmux-continuum \
|
||||||
|
|||||||
35
base/bashrc
35
base/bashrc
@@ -1,26 +1,8 @@
|
|||||||
# this is my bashrc config. there are many like it, but this one is mine.
|
# this is my bashrc config. there are many like it, but this one is mine.
|
||||||
# shellcheck shell=bash
|
# shellcheck shell=bash
|
||||||
|
|
||||||
# Defaults
|
source "$HOME/.dotfiles/config/shared"
|
||||||
export DOTFILES="$HOME/.dotfiles"
|
|
||||||
|
|
||||||
# Explicitly set XDG folders
|
|
||||||
# https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
|
|
||||||
export XDG_CONFIG_HOME="$HOME/.config"
|
|
||||||
export XDG_DATA_HOME="$HOME/.local/share"
|
|
||||||
export XDG_STATE_HOME="$HOME/.local/state"
|
|
||||||
|
|
||||||
# custom variables
|
|
||||||
export XDG_BIN_HOME="$HOME/.local/bin"
|
|
||||||
export XDG_CACHE_HOME="$HOME/.cache"
|
|
||||||
export XDG_RUNTIME_DIR="$HOME/.local/run"
|
|
||||||
|
|
||||||
# Paths
|
|
||||||
export PATH="$XDG_BIN_HOME:$DOTFILES/local/bin:$HOME/.local/go/bin:$XDG_DATA_HOME/cargo/bin:$PATH"
|
|
||||||
|
|
||||||
source "$DOTFILES/config/exports"
|
|
||||||
source "$DOTFILES/config/functions"
|
|
||||||
source "$DOTFILES/config/alias"
|
|
||||||
x-load-configs
|
x-load-configs
|
||||||
|
|
||||||
# shellcheck source=../config/fzf/fzf.bash
|
# shellcheck source=../config/fzf/fzf.bash
|
||||||
@@ -30,14 +12,13 @@ x-load-configs
|
|||||||
# Import ssh keys in keychain
|
# Import ssh keys in keychain
|
||||||
ssh-add -A 2>/dev/null
|
ssh-add -A 2>/dev/null
|
||||||
|
|
||||||
|
x-have oh-my-posh && {
|
||||||
|
eval "$(oh-my-posh init bash --config "$DOTFILES/config/omp/own.toml")"
|
||||||
|
}
|
||||||
|
|
||||||
|
. "$XDG_BIN_HOME/asdf/asdf.sh"
|
||||||
|
. "$XDG_BIN_HOME/asdf/completions/asdf.bash"
|
||||||
|
|
||||||
x-have antidot && {
|
x-have antidot && {
|
||||||
eval "$(antidot init)"
|
eval "$(antidot init)"
|
||||||
}
|
}
|
||||||
|
|
||||||
x-have rbenv && {
|
|
||||||
eval "$(rbenv init - bash)"
|
|
||||||
}
|
|
||||||
|
|
||||||
x-have oh-my-posh && {
|
|
||||||
eval "$(oh-my-posh init bash --config $DOTFILES/config/omp/own.toml)"
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,6 +1,4 @@
|
|||||||
#!/bin/env bash
|
#!/bin/env bash
|
||||||
|
|
||||||
[ -z "$NVM_DIR" ] && export NVM_DIR="$HOME/.config/nvm"
|
[ -z "$NVM_DIR" ] && export NVM_DIR="$HOME/.config/nvm"
|
||||||
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
|
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
|
||||||
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion
|
|
||||||
|
|
||||||
|
|||||||
@@ -16,6 +16,4 @@ export XDG_BIN_HOME="$HOME/.local/bin"
|
|||||||
export XDG_CACHE_HOME="$HOME/.cache"
|
export XDG_CACHE_HOME="$HOME/.cache"
|
||||||
export XDG_RUNTIME_DIR="$HOME/.local/run"
|
export XDG_RUNTIME_DIR="$HOME/.local/run"
|
||||||
|
|
||||||
source "$DOTFILES/config/exports"
|
source "$DOTFILES/config/shared"
|
||||||
source "$DOTFILES/config/alias"
|
|
||||||
|
|
||||||
|
|||||||
27
base/zshrc
27
base/zshrc
@@ -1,25 +1,14 @@
|
|||||||
# this is my zsh config. there are many like it, but this one is mine.
|
# this is my zsh config. there are many like it, but this one is mine.
|
||||||
# shellcheck shell=bash
|
# shellcheck shell=bash
|
||||||
|
|
||||||
export DOTFILES="$HOME/.dotfiles"
|
source "$HOME/.dotfiles/config/shared"
|
||||||
|
|
||||||
# Explicitly set XDG folders
|
|
||||||
# https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
|
|
||||||
export XDG_CONFIG_HOME="$HOME/.config"
|
|
||||||
export XDG_DATA_HOME="$HOME/.local/share"
|
|
||||||
export XDG_STATE_HOME="$HOME/.local/state"
|
|
||||||
|
|
||||||
# custom variables
|
|
||||||
export XDG_BIN_HOME="$HOME/.local/bin"
|
|
||||||
export XDG_CACHE_HOME="$HOME/.cache"
|
|
||||||
export XDG_RUNTIME_DIR="$HOME/.local/run"
|
|
||||||
|
|
||||||
export PATH="$XDG_BIN_HOME:$DOTFILES/local/bin:$HOME/.local/go/bin:$XDG_DATA_HOME/bob/nvim-bin:$XDG_DATA_HOME/cargo/bin:/opt/homebrew/bin:/usr/local/bin:$PATH"
|
export PATH="$XDG_BIN_HOME:$DOTFILES/local/bin:$HOME/.local/go/bin:$XDG_DATA_HOME/bob/nvim-bin:$XDG_DATA_HOME/cargo/bin:/opt/homebrew/bin:/usr/local/bin:$PATH"
|
||||||
|
|
||||||
x-load-configs
|
x-load-configs
|
||||||
|
|
||||||
x-have oh-my-posh && {
|
x-have oh-my-posh && {
|
||||||
eval "$(oh-my-posh init zsh --config $DOTFILES/config/omp/own.toml)"
|
eval "$(oh-my-posh init zsh --config "$DOTFILES/config/omp/own.toml")"
|
||||||
}
|
}
|
||||||
|
|
||||||
export COMPLETION_WAITING_DOTS=true
|
export COMPLETION_WAITING_DOTS=true
|
||||||
@@ -88,12 +77,12 @@ x-have pyenv && {
|
|||||||
# Autoupdate tmux window name
|
# Autoupdate tmux window name
|
||||||
TMUX_WINDOW_NAME_PLUGIN="$DOTFILES/config/tmux/plugins/tmux-window-name/scripts/rename_session_windows.py"
|
TMUX_WINDOW_NAME_PLUGIN="$DOTFILES/config/tmux/plugins/tmux-window-name/scripts/rename_session_windows.py"
|
||||||
[ -f "$TMUX_WINDOW_NAME_PLUGIN" ] && {
|
[ -f "$TMUX_WINDOW_NAME_PLUGIN" ] && {
|
||||||
tmux-window-name()
|
tmux_window_name()
|
||||||
{
|
{
|
||||||
($TMUX_WINDOW_NAME_PLUGIN &)
|
($TMUX_WINDOW_NAME_PLUGIN &)
|
||||||
}
|
}
|
||||||
add-zsh-hook chpwd tmux-window-name
|
add-zsh-hook chpwd tmux_window_name
|
||||||
tmux-window-name
|
tmux_window_name
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -105,8 +94,8 @@ source "$DOTFILES/config/alias"
|
|||||||
|
|
||||||
# Herd checks for a few environment variables to inject PHP binaries and configurations.
|
# Herd checks for a few environment variables to inject PHP binaries and configurations.
|
||||||
# Herd injected PHP binary.
|
# Herd injected PHP binary.
|
||||||
# export PATH="/Users/ivuorinen/Library/Application Support/Herd/bin/":$PATH
|
# export PATH="/Users/ivuorinen/Library/Application\ Support/Herd/bin/":$PATH
|
||||||
# Herd injected PHP 8.3 configuration.
|
# Herd injected PHP 8.3 configuration.
|
||||||
# export HERD_PHP_83_INI_SCAN_DIR="/Users/ivuorinen/Library/Application Support/Herd/config/php/83/"
|
# export HERD_PHP_83_INI_SCAN_DIR="/Users/ivuorinen/Library/Application\ Support/Herd/config/php/83/"
|
||||||
# Herd injected PHP 7.4 configuration.
|
# Herd injected PHP 7.4 configuration.
|
||||||
# export HERD_PHP_74_INI_SCAN_DIR="/Users/ivuorinen/Library/Application Support/Herd/config/php/74/"
|
# export HERD_PHP_74_INI_SCAN_DIR="/Users/ivuorinen/Library/Application\ Support/Herd/config/php/74/"
|
||||||
|
|||||||
@@ -17,6 +17,14 @@ alias ....="cd ../../.."
|
|||||||
# cd to git root directory
|
# cd to git root directory
|
||||||
alias cdgr='cd "$(git root)"'
|
alias cdgr='cd "$(git root)"'
|
||||||
|
|
||||||
|
# interesting folders, and shortcuts
|
||||||
|
alias .="cd $HOME"
|
||||||
|
alias .b="cd $XDG_BIN_HOME"
|
||||||
|
alias .c="cd $HOME/Code"
|
||||||
|
alias .d="cd $DOTFILES"
|
||||||
|
alias .dx="cd $DOTFILES;ks"
|
||||||
|
alias .l="cd $HOME/.local"
|
||||||
|
|
||||||
# Shortcuts for listing
|
# Shortcuts for listing
|
||||||
alias ll="ls -la"
|
alias ll="ls -la"
|
||||||
alias l="ls -a"
|
alias l="ls -a"
|
||||||
@@ -24,6 +32,7 @@ alias l="ls -a"
|
|||||||
# Prevent common typos
|
# Prevent common typos
|
||||||
alias cd..="cd .."
|
alias cd..="cd .."
|
||||||
alias sl="ls"
|
alias sl="ls"
|
||||||
|
alias ls-="ls -$1"
|
||||||
|
|
||||||
# List only directories
|
# List only directories
|
||||||
alias lsd="ls -lF | grep '^d'"
|
alias lsd="ls -lF | grep '^d'"
|
||||||
|
|||||||
5
config/asdf/asdfrc
Normal file
5
config/asdf/asdfrc
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
# See the docs for explanations: https://asdf-vm.com/manage/configuration.html
|
||||||
|
|
||||||
|
legacy_version_file=yes
|
||||||
|
use_release_candidates=no
|
||||||
|
concurrency=auto
|
||||||
21
config/asdf/golang-packages
Normal file
21
config/asdf/golang-packages
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
// These are golang packages I use,
|
||||||
|
// so they should be available with all versions
|
||||||
|
|
||||||
|
// sysadmin/scripting utilities, distributed as a single binary
|
||||||
|
github.com/skx/sysbox@release-0.18.0
|
||||||
|
// Git Profile allows you to switch between user profiles in git repos
|
||||||
|
github.com/dotzero/git-profile@v1.4.0
|
||||||
|
// An extensible command line tool or library to format yaml files.
|
||||||
|
github.com/google/yamlfmt/cmd/yamlfmt@v0.13.0
|
||||||
|
// Parsing HTML at the command line
|
||||||
|
github.com/ericchiang/pup@v0.4.0
|
||||||
|
// HTML to Markdown converter
|
||||||
|
github.com/suntong/html2md@v1.5.0
|
||||||
|
// cheat allows you to create and view interactive cheatsheets on the cli.
|
||||||
|
github.com/cheat/cheat/cmd/cheat@4.4.2
|
||||||
|
// Render markdown on the CLI, with pizzazz! 💅
|
||||||
|
github.com/charmbracelet/glow@v1.5.1
|
||||||
|
// Static checker for GitHub Actions workflow files
|
||||||
|
github.com/rhysd/actionlint/cmd/actionlint@v1.7.1
|
||||||
|
// Cleans up your $HOME from those pesky dotfiles
|
||||||
|
github.com/doron-cohen/antidot@v0.6.3
|
||||||
7
config/asdf/npm-packages
Normal file
7
config/asdf/npm-packages
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
blade-formatter
|
||||||
|
corepack
|
||||||
|
editorconfig-checker
|
||||||
|
github-release-notes
|
||||||
|
neovim
|
||||||
|
npm
|
||||||
|
stylelint-lsp
|
||||||
27
config/asdf/plugin-versions
Normal file
27
config/asdf/plugin-versions
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
1password-cli https://github.com/NeoHsu/asdf-1password-cli.git f5d5aab
|
||||||
|
age https://github.com/threkk/asdf-age.git 4df80a0
|
||||||
|
asdf-plugin-manager https://github.com/asdf-community/asdf-plugin-manager.git 50d2735
|
||||||
|
bottom https://github.com/carbonteq/asdf-btm.git fd8a55a
|
||||||
|
dotenv-linter https://github.com/wesleimp/asdf-dotenv-linter.git 1369f53
|
||||||
|
editorconfig-checker https://github.com/gabitchov/asdf-editorconfig-checker.git 585c1d5
|
||||||
|
eza https://github.com/lwiechec/asdf-eza.git 08c1b65
|
||||||
|
fd https://gitlab.com/wt0f/asdf-fd.git 17d56e0
|
||||||
|
github-cli https://github.com/bartlomiejdanek/asdf-github-cli.git e0605b7
|
||||||
|
hadolint https://github.com/devlincashman/asdf-hadolint.git 335e230
|
||||||
|
kubectl https://github.com/asdf-community/asdf-kubectl.git cbe6df4
|
||||||
|
lazygit https://github.com/nklmilojevic/asdf-lazygit.git 78e04f1
|
||||||
|
neovim https://github.com/richin13/asdf-neovim d6118ad
|
||||||
|
nodejs https://github.com/asdf-vm/asdf-nodejs.git c5b7c40
|
||||||
|
pipx https://github.com/yozachar/asdf-pipx.git 31db618
|
||||||
|
pre-commit https://github.com/jonathanmorley/asdf-pre-commit.git 26bfc42
|
||||||
|
ripgrep https://gitlab.com/wt0f/asdf-ripgrep.git e836665
|
||||||
|
semgrep https://github.com/brentjanderson/asdf-semgrep.git 13ff78b
|
||||||
|
shellcheck https://github.com/luizm/asdf-shellcheck.git 780d78d
|
||||||
|
shfmt https://github.com/luizm/asdf-shfmt.git a42c5ff
|
||||||
|
terraform-ls https://github.com/asdf-community/asdf-hashicorp.git f1602b6
|
||||||
|
terraform-lsp https://github.com/bartlomiejdanek/asdf-terraform-lsp.git bba7106
|
||||||
|
terragrunt https://github.com/ohmer/asdf-terragrunt 4a6651a
|
||||||
|
tf-summarize https://github.com/adamcrews/asdf-tf-summarize.git 880ad26
|
||||||
|
vault https://github.com/asdf-community/asdf-hashicorp.git f1602b6
|
||||||
|
yamllint https://github.com/ericcornelissen/asdf-yamllint.git d5c3161
|
||||||
|
yq https://github.com/sudermanjr/asdf-yq.git 772992f
|
||||||
28
config/asdf/tool-versions
Normal file
28
config/asdf/tool-versions
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
1password-cli 2.29.0
|
||||||
|
age 1.2.0
|
||||||
|
asdf-plugin-manager 1.3.1
|
||||||
|
bottom 0.9.6
|
||||||
|
dotenv-linter 3.3.0
|
||||||
|
editorconfig-checker 2.8.0
|
||||||
|
eza 0.18.21
|
||||||
|
fd 10.1.0
|
||||||
|
github-cli 2.52.0
|
||||||
|
golang 1.22.5
|
||||||
|
hadolint 2.12.0
|
||||||
|
kubectl 1.30.2
|
||||||
|
lazygit 0.43.1
|
||||||
|
neovim system
|
||||||
|
nodejs 22.4.1
|
||||||
|
pipx 1.6.0
|
||||||
|
pre-commit 3.7.1
|
||||||
|
ripgrep 14.1.0
|
||||||
|
semgrep system
|
||||||
|
shellcheck 0.10.0
|
||||||
|
shfmt 3.8.0
|
||||||
|
terraform-ls 0.33.3
|
||||||
|
terraform-lsp 0.0.12
|
||||||
|
terragrunt 0.62.1
|
||||||
|
tf-summarize 0.3.10
|
||||||
|
vault 1.17.2+ent
|
||||||
|
yamllint 1.35.1
|
||||||
|
yq 4.44.2
|
||||||
@@ -37,12 +37,16 @@ have()
|
|||||||
# function to run dark-notify and change alacritty theme
|
# function to run dark-notify and change alacritty theme
|
||||||
# it uses flock to prevent running multiple instances
|
# it uses flock to prevent running multiple instances
|
||||||
# install flock with `brew install flock` on macOS
|
# install flock with `brew install flock` on macOS
|
||||||
function darknotify-alacritty {
|
function darknotify-alacritty
|
||||||
|
{
|
||||||
have flock && [[ -f /tmp/dark-notify-alacritty.lock ]] && return
|
have flock && [[ -f /tmp/dark-notify-alacritty.lock ]] && return
|
||||||
have dark-notify && {
|
have dark-notify && {
|
||||||
# true is used to prevent the command show it was backgrounded
|
# true is used to prevent the command show it was backgrounded
|
||||||
true & flock /tmp/dark-notify-alacritty.lock dark-notify -c "$HOME/.dotfiles/local/bin/x-change-alacritty-theme" &
|
true \
|
||||||
|
&& flock /tmp/dark-notify-alacritty.lock dark-notify -c "$HOME/.dotfiles/local/bin/x-change-alacritty-theme" &
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return 0
|
||||||
}
|
}
|
||||||
darknotify-alacritty
|
darknotify-alacritty
|
||||||
|
|
||||||
|
|||||||
@@ -21,6 +21,21 @@ x-dc "$ANSIBLE_GALAXY_CACHE_DIR"
|
|||||||
|
|
||||||
export ANDROID_HOME="$XDG_DATA_HOME/android"
|
export ANDROID_HOME="$XDG_DATA_HOME/android"
|
||||||
|
|
||||||
|
# asdf
|
||||||
|
# https://github.com/asdf-vm/asdf
|
||||||
|
export ASDF_DIR="${XDG_BIN_HOME}/asdf"
|
||||||
|
export ASDF_CONFIG_FILE="${XDG_CONFIG_HOME}/asdf/asdfrc"
|
||||||
|
export ASDF_DATA_DIR="${ASDF_DIR}"
|
||||||
|
# This seems wrong, but `asdf info` and `versions.bash` differ on path resolution.
|
||||||
|
export ASDF_DEFAULT_TOOL_VERSIONS_FILENAME=".config/asdf/tool-versions"
|
||||||
|
export ASDF_PLUGIN_MANAGER_PLUGIN_VERSIONS_FILENAME="${XDG_CONFIG_HOME}/asdf/plugin-versions"
|
||||||
|
export ASDF_LOG_FILE="${XDG_CACHE_HOME}/asdf/asdf.log"
|
||||||
|
export ASDF_NODEJS_LEGACY_FILE_DYNAMIC_STRATEGY="latest_available"
|
||||||
|
export ASDF_NPM_DEFAULT_PACKAGES_FILE="${XDG_CONFIG_HOME}/asdf/npm-packages"
|
||||||
|
export ASDF_GOLANG_MOD_VERSION_ENABLED=true
|
||||||
|
export ASDF_GOLANG_DEFAULT_PACKAGES_FILE="${XDG_CONFIG_HOME}/asdf/golang-packages"
|
||||||
|
export PATH="${ASDF_DIR}/bin:${PATH}"
|
||||||
|
|
||||||
# bob manages nvim versions
|
# bob manages nvim versions
|
||||||
export PATH="$XDG_DATA_HOME/bob/nvim-bin:$PATH"
|
export PATH="$XDG_DATA_HOME/bob/nvim-bin:$PATH"
|
||||||
|
|
||||||
@@ -56,13 +71,13 @@ export GOBIN="$XDG_BIN_HOME"
|
|||||||
|
|
||||||
# Herd, herd.laravel.com
|
# Herd, herd.laravel.com
|
||||||
# Herd injected PHP binary.
|
# Herd injected PHP binary.
|
||||||
export PATH="$HOME/Library/Application Support/Herd/bin/":$PATH
|
export PATH="$HOME/Library/Application\ Support/Herd/bin/":$PATH
|
||||||
|
|
||||||
x-have herd && {
|
x-have herd && {
|
||||||
# Herd injected PHP 8.3 configuration.
|
# Herd injected PHP 8.3 configuration.
|
||||||
export HERD_PHP_83_INI_SCAN_DIR="$HOME/Library/Application Support/Herd/config/php/83/"
|
export HERD_PHP_83_INI_SCAN_DIR="$HOME/Library/Application\ Support/Herd/config/php/83/"
|
||||||
# Herd injected PHP 7.4 configuration.
|
# Herd injected PHP 7.4 configuration.
|
||||||
export HERD_PHP_74_INI_SCAN_DIR="$HOME/Library/Application Support/Herd/config/php/74/"
|
export HERD_PHP_74_INI_SCAN_DIR="$HOME/Library/Application\ Support/Herd/config/php/74/"
|
||||||
}
|
}
|
||||||
|
|
||||||
# nb, https://xwmx.github.io/nb/
|
# nb, https://xwmx.github.io/nb/
|
||||||
|
|||||||
@@ -32,4 +32,4 @@
|
|||||||
"NEWS.md": "6077"
|
"NEWS.md": "6077"
|
||||||
},
|
},
|
||||||
"version": 6
|
"version": 6
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -111,9 +111,7 @@
|
|||||||
{
|
{
|
||||||
"background": "transparent",
|
"background": "transparent",
|
||||||
"foreground": "lightGreen",
|
"foreground": "lightGreen",
|
||||||
"foreground_templates": [
|
"foreground_templates": ["{{ if gt .Code 0 }}red{{ end }}"],
|
||||||
"{{ if gt .Code 0 }}red{{ end }}"
|
|
||||||
],
|
|
||||||
"properties": {
|
"properties": {
|
||||||
"always_enabled": true
|
"always_enabled": true
|
||||||
},
|
},
|
||||||
@@ -128,9 +126,7 @@
|
|||||||
"transient_prompt": {
|
"transient_prompt": {
|
||||||
"background": "transparent",
|
"background": "transparent",
|
||||||
"foreground": "lightGreen",
|
"foreground": "lightGreen",
|
||||||
"foreground_templates": [
|
"foreground_templates": ["{{ if gt .Code 0 }}red{{ end }}"],
|
||||||
"{{ if gt .Code 0 }}red{{ end }}"
|
|
||||||
],
|
|
||||||
"template": "\u279c "
|
"template": "\u279c "
|
||||||
},
|
},
|
||||||
"version": 2
|
"version": 2
|
||||||
|
|||||||
24
config/shared
Normal file
24
config/shared
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
# shellcheck shell=bash
|
||||||
|
|
||||||
|
# Defaults
|
||||||
|
export DOTFILES="$HOME/.dotfiles"
|
||||||
|
|
||||||
|
# Explicitly set XDG folders
|
||||||
|
# https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
|
||||||
|
export XDG_CONFIG_HOME="$HOME/.config"
|
||||||
|
export XDG_DATA_HOME="$HOME/.local/share"
|
||||||
|
export XDG_STATE_HOME="$HOME/.local/state"
|
||||||
|
|
||||||
|
# custom variables
|
||||||
|
export XDG_BIN_HOME="$HOME/.local/bin"
|
||||||
|
export XDG_CACHE_HOME="$HOME/.cache"
|
||||||
|
export XDG_RUNTIME_DIR="$HOME/.local/run"
|
||||||
|
|
||||||
|
# Paths
|
||||||
|
export PATH="$XDG_BIN_HOME:$DOTFILES/local/bin:$HOME/.local/go/bin:$XDG_DATA_HOME/bob/nvim-bin:$XDG_DATA_HOME/cargo/bin:/opt/homebrew/bin:/usr/local/bin:$PATH"
|
||||||
|
|
||||||
|
# Split config files
|
||||||
|
source "$DOTFILES/config/exports"
|
||||||
|
source "$DOTFILES/config/functions"
|
||||||
|
source "$DOTFILES/config/alias"
|
||||||
|
|
||||||
@@ -3,6 +3,8 @@
|
|||||||
```txt
|
```txt
|
||||||
|
|
||||||
n <Esc> * <Cmd>nohlsearch<CR>
|
n <Esc> * <Cmd>nohlsearch<CR>
|
||||||
|
n <Space>tc * <Cmd>CloakToggle<CR>
|
||||||
|
Toggle Cloak
|
||||||
n <Space>zg * :Rg<CR>
|
n <Space>zg * :Rg<CR>
|
||||||
FZF: search with rg (aka live grep).
|
FZF: search with rg (aka live grep).
|
||||||
n <Space>zm * :Maps<CR>
|
n <Space>zm * :Maps<CR>
|
||||||
@@ -17,31 +19,29 @@ n <Space>zc * :Commands<CR>
|
|||||||
FZF: search commands.
|
FZF: search commands.
|
||||||
n <Space>zf * :FZF<Space>
|
n <Space>zf * :FZF<Space>
|
||||||
FZF: search for files in given path.
|
FZF: search for files in given path.
|
||||||
n <Space>tc * <Cmd>CloakToggle<CR>
|
<Space>f * <Lua 40: ~/.dotfiles/config/nvim-kickstart/init.lua:505>
|
||||||
Toggle Cloak
|
|
||||||
<Space>f * <Lua 76: ~/.dotfiles/config/nvim-kickstart/init.lua:515>
|
|
||||||
[F]ormat buffer
|
[F]ormat buffer
|
||||||
n <Space>1 * <Lua 58: ~/.local/share/nvim-kickstart/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
|
n <Space>e * <Lua 80: ~/.local/share/nvim-kickstart/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
|
||||||
harpoon to file 1
|
n <Space>tz * <Lua 60: ~/.local/share/nvim-kickstart/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
|
||||||
n <Space>xn * <Lua 57: ~/.local/share/nvim-kickstart/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
|
|
||||||
harpoon to next file
|
|
||||||
n <Space>xN * <Lua 56: ~/.local/share/nvim-kickstart/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
|
|
||||||
harpoon to previous file
|
|
||||||
n <Space>xa * <Lua 55: ~/.local/share/nvim-kickstart/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
|
|
||||||
harpoon quick menu
|
|
||||||
n <Space>xA * <Lua 54: ~/.local/share/nvim-kickstart/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
|
|
||||||
harpoon file
|
|
||||||
n <Space>5 * <Lua 53: ~/.local/share/nvim-kickstart/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
|
|
||||||
harpoon to file 5
|
|
||||||
n <Space>4 * <Lua 52: ~/.local/share/nvim-kickstart/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
|
|
||||||
harpoon to file 4
|
|
||||||
n <Space>3 * <Lua 51: ~/.local/share/nvim-kickstart/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
|
|
||||||
harpoon to file 3
|
|
||||||
n <Space>2 * <Lua 49: ~/.local/share/nvim-kickstart/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
|
|
||||||
harpoon to file 2
|
|
||||||
n <Space>tz * <Lua 43: ~/.local/share/nvim-kickstart/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
|
|
||||||
Toggle ZenMode
|
Toggle ZenMode
|
||||||
n <Space>e * <Lua 41: ~/.local/share/nvim-kickstart/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
|
n <Space>4 * <Lua 58: ~/.local/share/nvim-kickstart/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
|
||||||
|
harpoon to file 4
|
||||||
|
n <Space>3 * <Lua 57: ~/.local/share/nvim-kickstart/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
|
||||||
|
harpoon to file 3
|
||||||
|
n <Space>2 * <Lua 56: ~/.local/share/nvim-kickstart/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
|
||||||
|
harpoon to file 2
|
||||||
|
n <Space>1 * <Lua 55: ~/.local/share/nvim-kickstart/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
|
||||||
|
harpoon to file 1
|
||||||
|
n <Space>xn * <Lua 54: ~/.local/share/nvim-kickstart/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
|
||||||
|
harpoon to next file
|
||||||
|
n <Space>xN * <Lua 53: ~/.local/share/nvim-kickstart/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
|
||||||
|
harpoon to previous file
|
||||||
|
n <Space>xa * <Lua 52: ~/.local/share/nvim-kickstart/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
|
||||||
|
harpoon quick menu
|
||||||
|
n <Space>xA * <Lua 51: ~/.local/share/nvim-kickstart/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
|
||||||
|
harpoon file
|
||||||
|
n <Space>5 * <Lua 49: ~/.local/share/nvim-kickstart/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
|
||||||
|
harpoon to file 5
|
||||||
n <Space>qq * <Cmd>wq!<CR>
|
n <Space>qq * <Cmd>wq!<CR>
|
||||||
Quickly Quit
|
Quickly Quit
|
||||||
n <Space>bq * <Lua 27: ~/.local/share/bob/v0.10.0/nvim-macos-arm64/share/nvim/runtime/lua/vim/diagnostic.lua:1984>
|
n <Space>bq * <Lua 27: ~/.local/share/bob/v0.10.0/nvim-macos-arm64/share/nvim/runtime/lua/vim/diagnostic.lua:1984>
|
||||||
@@ -74,17 +74,17 @@ n ]% <Plug>(MatchitNormalMultiForward)
|
|||||||
n ]d * <Lua 14: vim/_defaults.lua:0>
|
n ]d * <Lua 14: vim/_defaults.lua:0>
|
||||||
Jump to the next diagnostic
|
Jump to the next diagnostic
|
||||||
x a% <Plug>(MatchitVisualTextObject)
|
x a% <Plug>(MatchitVisualTextObject)
|
||||||
o al <Lua 388: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/ai.lua:1145>
|
o al <Lua 322: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/ai.lua:1145>
|
||||||
Around last textobject
|
Around last textobject
|
||||||
o an <Lua 387: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/ai.lua:1145>
|
o an <Lua 318: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/ai.lua:1145>
|
||||||
Around next textobject
|
Around next textobject
|
||||||
x al <Lua 384: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/ai.lua:1145>
|
x al <Lua 292: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/ai.lua:1145>
|
||||||
Around last textobject
|
Around last textobject
|
||||||
x an <Lua 383: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/ai.lua:1145>
|
x an <Lua 291: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/ai.lua:1145>
|
||||||
Around next textobject
|
Around next textobject
|
||||||
o a <Lua 381: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/ai.lua:1145>
|
o a <Lua 288: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/ai.lua:1145>
|
||||||
Around textobject
|
Around textobject
|
||||||
x a <Lua 379: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/ai.lua:1145>
|
x a <Lua 285: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/ai.lua:1145>
|
||||||
Around textobject
|
Around textobject
|
||||||
n dj * <Lua 25: ~/.local/share/bob/v0.10.0/nvim-macos-arm64/share/nvim/runtime/lua/vim/diagnostic.lua:1222>
|
n dj * <Lua 25: ~/.local/share/bob/v0.10.0/nvim-macos-arm64/share/nvim/runtime/lua/vim/diagnostic.lua:1222>
|
||||||
Go to next [D]iagnostic message
|
Go to next [D]iagnostic message
|
||||||
@@ -93,21 +93,21 @@ n dk * <Lua 23: ~/.local/share/bob/v0.10.0/nvim-macos-arm64/share/nvim
|
|||||||
o g% <Plug>(MatchitOperationBackward)
|
o g% <Plug>(MatchitOperationBackward)
|
||||||
x g% <Plug>(MatchitVisualBackward)
|
x g% <Plug>(MatchitVisualBackward)
|
||||||
n g% <Plug>(MatchitNormalBackward)
|
n g% <Plug>(MatchitNormalBackward)
|
||||||
o g] <Lua 378: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/ai.lua:1142>
|
o g] <Lua 281: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/ai.lua:1142>
|
||||||
Move to right "around"
|
Move to right "around"
|
||||||
x g] <Lua 377: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/ai.lua:1142>
|
x g] <Lua 280: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/ai.lua:1142>
|
||||||
Move to right "around"
|
Move to right "around"
|
||||||
n g] <Lua 376: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/ai.lua:1142>
|
n g] <Lua 278: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/ai.lua:1142>
|
||||||
Move to right "around"
|
Move to right "around"
|
||||||
o g[ <Lua 374: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/ai.lua:1141>
|
o g[ <Lua 277: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/ai.lua:1141>
|
||||||
Move to left "around"
|
Move to left "around"
|
||||||
x g[ <Lua 372: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/ai.lua:1141>
|
x g[ <Lua 273: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/ai.lua:1141>
|
||||||
Move to left "around"
|
Move to left "around"
|
||||||
n g[ <Lua 368: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/ai.lua:1141>
|
n g[ <Lua 266: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/ai.lua:1141>
|
||||||
Move to left "around"
|
Move to left "around"
|
||||||
n gcA * <Lua 365: ~/.local/share/nvim-kickstart/lazy/Comment.nvim/lua/Comment/api.lua:218>
|
n gcA * <Lua 275: ~/.local/share/nvim-kickstart/lazy/Comment.nvim/lua/Comment/api.lua:218>
|
||||||
Comment insert end of line
|
Comment insert end of line
|
||||||
n gcO * <Lua 364: ~/.local/share/nvim-kickstart/lazy/Comment.nvim/lua/Comment/api.lua:179>
|
n gcO * <Lua 274: ~/.local/share/nvim-kickstart/lazy/Comment.nvim/lua/Comment/api.lua:179>
|
||||||
Comment insert above
|
Comment insert above
|
||||||
n gco * <Lua 11: ~/.local/share/nvim-kickstart/lazy/Comment.nvim/lua/Comment/api.lua:182>
|
n gco * <Lua 11: ~/.local/share/nvim-kickstart/lazy/Comment.nvim/lua/Comment/api.lua:182>
|
||||||
Comment insert below
|
Comment insert below
|
||||||
@@ -129,53 +129,53 @@ x gx * <Lua 9: vim/_defaults.lua:0>
|
|||||||
Opens filepath or URI under cursor with the system handler (file explorer, web browser, …)
|
Opens filepath or URI under cursor with the system handler (file explorer, web browser, …)
|
||||||
n gx * <Lua 8: vim/_defaults.lua:0>
|
n gx * <Lua 8: vim/_defaults.lua:0>
|
||||||
Opens filepath or URI under cursor with the system handler (file explorer, web browser, …)
|
Opens filepath or URI under cursor with the system handler (file explorer, web browser, …)
|
||||||
o il <Lua 390: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/ai.lua:1145>
|
o il <Lua 325: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/ai.lua:1145>
|
||||||
Inside last textobject
|
Inside last textobject
|
||||||
o in <Lua 389: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/ai.lua:1145>
|
o in <Lua 324: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/ai.lua:1145>
|
||||||
Inside next textobject
|
Inside next textobject
|
||||||
x il <Lua 386: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/ai.lua:1145>
|
x il <Lua 296: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/ai.lua:1145>
|
||||||
Inside last textobject
|
Inside last textobject
|
||||||
x in <Lua 385: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/ai.lua:1145>
|
x in <Lua 295: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/ai.lua:1145>
|
||||||
Inside next textobject
|
Inside next textobject
|
||||||
o i <Lua 382: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/ai.lua:1145>
|
o i <Lua 289: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/ai.lua:1145>
|
||||||
Inside textobject
|
Inside textobject
|
||||||
x i <Lua 380: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/ai.lua:1145>
|
x i <Lua 286: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/ai.lua:1145>
|
||||||
Inside textobject
|
Inside textobject
|
||||||
n shn * <Lua 407: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/surround.lua:1220>
|
n shn * <Lua 428: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/surround.lua:1220>
|
||||||
Highlight next surrounding
|
Highlight next surrounding
|
||||||
n sFn * <Lua 406: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/surround.lua:1220>
|
n sFn * <Lua 427: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/surround.lua:1220>
|
||||||
Find next left surrounding
|
Find next left surrounding
|
||||||
n sfn * <Lua 405: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/surround.lua:1220>
|
n sfn * <Lua 426: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/surround.lua:1220>
|
||||||
Find next right surrounding
|
Find next right surrounding
|
||||||
n srn * <Lua 404: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/surround.lua:1220>
|
n srn * <Lua 425: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/surround.lua:1220>
|
||||||
Replace next surrounding
|
Replace next surrounding
|
||||||
n sdn * <Lua 403: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/surround.lua:1220>
|
n sdn * <Lua 424: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/surround.lua:1220>
|
||||||
Delete next surrounding
|
Delete next surrounding
|
||||||
n shl * <Lua 402: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/surround.lua:1220>
|
n shl * <Lua 423: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/surround.lua:1220>
|
||||||
Highlight previous surrounding
|
Highlight previous surrounding
|
||||||
n sFl * <Lua 401: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/surround.lua:1220>
|
n sFl * <Lua 422: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/surround.lua:1220>
|
||||||
Find previous left surrounding
|
Find previous left surrounding
|
||||||
n sfl * <Lua 400: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/surround.lua:1220>
|
n sfl * <Lua 421: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/surround.lua:1220>
|
||||||
Find previous right surrounding
|
Find previous right surrounding
|
||||||
n srl * <Lua 399: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/surround.lua:1220>
|
n srl * <Lua 386: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/surround.lua:1220>
|
||||||
Replace previous surrounding
|
Replace previous surrounding
|
||||||
n sdl * <Lua 398: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/surround.lua:1220>
|
n sdl * <Lua 371: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/surround.lua:1220>
|
||||||
Delete previous surrounding
|
Delete previous surrounding
|
||||||
x sa * :<C-U>lua MiniSurround.add('visual')<CR>
|
x sa * :<C-U>lua MiniSurround.add('visual')<CR>
|
||||||
Add surrounding to selection
|
Add surrounding to selection
|
||||||
n sn * <Lua 397: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/surround.lua:861>
|
n sn * <Lua 370: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/surround.lua:861>
|
||||||
Update `MiniSurround.config.n_lines`
|
Update `MiniSurround.config.n_lines`
|
||||||
n sh * <Lua 396: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/surround.lua:1220>
|
n sh * <Lua 351: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/surround.lua:1220>
|
||||||
Highlight surrounding
|
Highlight surrounding
|
||||||
n sF * <Lua 395: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/surround.lua:1220>
|
n sF * <Lua 59: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/surround.lua:1220>
|
||||||
Find left surrounding
|
Find left surrounding
|
||||||
n sf * <Lua 394: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/surround.lua:1220>
|
n sf * <Lua 331: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/surround.lua:1220>
|
||||||
Find right surrounding
|
Find right surrounding
|
||||||
n sr * <Lua 393: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/surround.lua:1220>
|
n sr * <Lua 330: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/surround.lua:1220>
|
||||||
Replace surrounding
|
Replace surrounding
|
||||||
n sd * <Lua 392: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/surround.lua:1220>
|
n sd * <Lua 328: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/surround.lua:1220>
|
||||||
Delete surrounding
|
Delete surrounding
|
||||||
n sa * <Lua 391: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/surround.lua:1220>
|
n sa * <Lua 327: ~/.local/share/nvim-kickstart/lazy/mini.nvim/lua/mini/surround.lua:1220>
|
||||||
Add surrounding
|
Add surrounding
|
||||||
x <Plug>(MatchitVisualTextObject) <Plug>(MatchitVisualMultiBackward)o<Plug>(MatchitVisualMultiForward)
|
x <Plug>(MatchitVisualTextObject) <Plug>(MatchitVisualMultiBackward)o<Plug>(MatchitVisualMultiForward)
|
||||||
o <Plug>(MatchitOperationMultiForward) * :<C-U>call matchit#MultiMatch("W", "o")<CR>
|
o <Plug>(MatchitOperationMultiForward) * :<C-U>call matchit#MultiMatch("W", "o")<CR>
|
||||||
@@ -190,7 +190,6 @@ x <Plug>(MatchitVisualBackward) * :<C-U>call matchit#Match_wrapper('',0,'v')<CR
|
|||||||
x <Plug>(MatchitVisualForward) * :<C-U>call matchit#Match_wrapper('',1,'v')<CR>:if col("''") != col("$") | exe ":normal! m'" | endif<CR>gv``
|
x <Plug>(MatchitVisualForward) * :<C-U>call matchit#Match_wrapper('',1,'v')<CR>:if col("''") != col("$") | exe ":normal! m'" | endif<CR>gv``
|
||||||
n <Plug>(MatchitNormalBackward) * :<C-U>call matchit#Match_wrapper('',0,'n')<CR>
|
n <Plug>(MatchitNormalBackward) * :<C-U>call matchit#Match_wrapper('',0,'n')<CR>
|
||||||
n <Plug>(MatchitNormalForward) * :<C-U>call matchit#Match_wrapper('',1,'n')<CR>
|
n <Plug>(MatchitNormalForward) * :<C-U>call matchit#Match_wrapper('',1,'n')<CR>
|
||||||
n <Plug>PlenaryTestFile * :lua require('plenary.test_harness').test_file(vim.fn.expand("%:p"))<CR>
|
|
||||||
n <C-P> * :Files<CR>
|
n <C-P> * :Files<CR>
|
||||||
FZF: search for files starting at current directory.
|
FZF: search for files starting at current directory.
|
||||||
o <Plug>(fzf-maps-o) * <C-C>:<C-U>call fzf#vim#maps('o', 0)<CR>
|
o <Plug>(fzf-maps-o) * <C-C>:<C-U>call fzf#vim#maps('o', 0)<CR>
|
||||||
@@ -198,28 +197,29 @@ x <Plug>(fzf-maps-x) * :<C-U>call fzf#vim#maps('x', 0)<CR>
|
|||||||
n <Plug>(fzf-maps-n) * :<C-U>call fzf#vim#maps('n', 0)<CR>
|
n <Plug>(fzf-maps-n) * :<C-U>call fzf#vim#maps('n', 0)<CR>
|
||||||
n <Plug>(fzf-normal) * <Nop>
|
n <Plug>(fzf-normal) * <Nop>
|
||||||
n <Plug>(fzf-insert) * i
|
n <Plug>(fzf-insert) * i
|
||||||
|
n <Plug>PlenaryTestFile * :lua require('plenary.test_harness').test_file(vim.fn.expand("%:p"))<CR>
|
||||||
x <Plug>(comment_toggle_blockwise_visual) * <Esc><Cmd>lua require("Comment.api").locked("toggle.blockwise")(vim.fn.visualmode())<CR>
|
x <Plug>(comment_toggle_blockwise_visual) * <Esc><Cmd>lua require("Comment.api").locked("toggle.blockwise")(vim.fn.visualmode())<CR>
|
||||||
Comment toggle blockwise (visual)
|
Comment toggle blockwise (visual)
|
||||||
x <Plug>(comment_toggle_linewise_visual) * <Esc><Cmd>lua require("Comment.api").locked("toggle.linewise")(vim.fn.visualmode())<CR>
|
x <Plug>(comment_toggle_linewise_visual) * <Esc><Cmd>lua require("Comment.api").locked("toggle.linewise")(vim.fn.visualmode())<CR>
|
||||||
Comment toggle linewise (visual)
|
Comment toggle linewise (visual)
|
||||||
n <Plug>(comment_toggle_blockwise_count) * <Lua 362: ~/.local/share/nvim-kickstart/lazy/Comment.nvim/lua/Comment/api.lua:246>
|
n <Plug>(comment_toggle_blockwise_count) * <Lua 272: ~/.local/share/nvim-kickstart/lazy/Comment.nvim/lua/Comment/api.lua:246>
|
||||||
Comment toggle blockwise with count
|
Comment toggle blockwise with count
|
||||||
n <Plug>(comment_toggle_linewise_count) * <Lua 361: ~/.local/share/nvim-kickstart/lazy/Comment.nvim/lua/Comment/api.lua:246>
|
n <Plug>(comment_toggle_linewise_count) * <Lua 271: ~/.local/share/nvim-kickstart/lazy/Comment.nvim/lua/Comment/api.lua:246>
|
||||||
Comment toggle linewise with count
|
Comment toggle linewise with count
|
||||||
n <Plug>(comment_toggle_blockwise_current) * <Lua 360: ~/.local/share/nvim-kickstart/lazy/Comment.nvim/lua/Comment/api.lua:246>
|
n <Plug>(comment_toggle_blockwise_current) * <Lua 270: ~/.local/share/nvim-kickstart/lazy/Comment.nvim/lua/Comment/api.lua:246>
|
||||||
Comment toggle current block
|
Comment toggle current block
|
||||||
n <Plug>(comment_toggle_linewise_current) * <Lua 359: ~/.local/share/nvim-kickstart/lazy/Comment.nvim/lua/Comment/api.lua:246>
|
n <Plug>(comment_toggle_linewise_current) * <Lua 269: ~/.local/share/nvim-kickstart/lazy/Comment.nvim/lua/Comment/api.lua:246>
|
||||||
Comment toggle current line
|
Comment toggle current line
|
||||||
n <Plug>(comment_toggle_blockwise) * <Lua 358: ~/.local/share/nvim-kickstart/lazy/Comment.nvim/lua/Comment/api.lua:246>
|
n <Plug>(comment_toggle_blockwise) * <Lua 268: ~/.local/share/nvim-kickstart/lazy/Comment.nvim/lua/Comment/api.lua:246>
|
||||||
Comment toggle blockwise
|
Comment toggle blockwise
|
||||||
n <Plug>(comment_toggle_linewise) * <Lua 357: ~/.local/share/nvim-kickstart/lazy/Comment.nvim/lua/Comment/api.lua:246>
|
n <Plug>(comment_toggle_linewise) * <Lua 267: ~/.local/share/nvim-kickstart/lazy/Comment.nvim/lua/Comment/api.lua:246>
|
||||||
Comment toggle linewise
|
Comment toggle linewise
|
||||||
n <C-Bslash> * <Lua 72: ~/.local/share/nvim-kickstart/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
|
n <C-Bslash> * <Lua 75: ~/.local/share/nvim-kickstart/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
|
||||||
n <C-S> * <Cmd>w<CR>
|
n <C-S> * <Cmd>w<CR>
|
||||||
Save file
|
Save file
|
||||||
n <C-K> * <Lua 75: ~/.local/share/nvim-kickstart/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
|
n <C-K> * <Lua 78: ~/.local/share/nvim-kickstart/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
|
||||||
n <C-J> * <Lua 73: ~/.local/share/nvim-kickstart/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
|
n <C-J> * <Lua 76: ~/.local/share/nvim-kickstart/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
|
||||||
n <C-H> * <Lua 74: ~/.local/share/nvim-kickstart/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
|
n <C-H> * <Lua 77: ~/.local/share/nvim-kickstart/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
|
||||||
n <Down> * <Cmd>echo "Use j to move!!"<CR>
|
n <Down> * <Cmd>echo "Use j to move!!"<CR>
|
||||||
n <Up> * <Cmd>echo "Use k to move!!"<CR>
|
n <Up> * <Cmd>echo "Use k to move!!"<CR>
|
||||||
n <Right> * <Cmd>echo "Use l to move!!"<CR>
|
n <Right> * <Cmd>echo "Use l to move!!"<CR>
|
||||||
@@ -228,7 +228,7 @@ n <C-W><C-D> <C-W>d
|
|||||||
Show diagnostics under the cursor
|
Show diagnostics under the cursor
|
||||||
n <C-W>d * <Lua 16: vim/_defaults.lua:0>
|
n <C-W>d * <Lua 16: vim/_defaults.lua:0>
|
||||||
Show diagnostics under the cursor
|
Show diagnostics under the cursor
|
||||||
n <C-L> * <Lua 70: ~/.local/share/nvim-kickstart/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
|
n <C-L> * <Lua 73: ~/.local/share/nvim-kickstart/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
|
||||||
```
|
```
|
||||||
|
|
||||||
- Generated on Tue 25 Jun 2024 09:49:41 EEST
|
- Generated on Sun 30 Jun 2024 14:16:28 EEST
|
||||||
|
|||||||
@@ -16,6 +16,8 @@
|
|||||||
~/.local/bin:
|
~/.local/bin:
|
||||||
~/.local/run:
|
~/.local/run:
|
||||||
~/.local/share:
|
~/.local/share:
|
||||||
|
~/.local/share/gnupg:
|
||||||
|
mode: 0700
|
||||||
~/.local/state:
|
~/.local/state:
|
||||||
~/.ssh:
|
~/.ssh:
|
||||||
mode: 0700
|
mode: 0700
|
||||||
|
|||||||
1
local/bin/asdf
Submodule
1
local/bin/asdf
Submodule
Submodule local/bin/asdf added at ccdd47df9b
@@ -62,19 +62,20 @@ function section_install
|
|||||||
$0 install antigen
|
$0 install antigen
|
||||||
$0 brew install
|
$0 brew install
|
||||||
$0 install ohmyposh
|
$0 install ohmyposh
|
||||||
$0 install ohmybash
|
$0 install asdf
|
||||||
$0 install pip
|
# $0 install ohmybash
|
||||||
|
# $0 install pip
|
||||||
$0 install cargo
|
$0 install cargo
|
||||||
$0 install composer
|
$0 install composer
|
||||||
$0 install dotenv
|
# $0 install dotenv
|
||||||
$0 install fzf
|
$0 install fzf
|
||||||
$0 install gh
|
# $0 install gh
|
||||||
$0 install go
|
# $0 install go
|
||||||
$0 install cheat-databases
|
$0 install cheat-databases
|
||||||
$0 install imagick
|
$0 install imagick
|
||||||
$0 install neofetch
|
# $0 install neofetch
|
||||||
$0 install nvm
|
# $0 install nvm
|
||||||
$0 install npm
|
# $0 install npm
|
||||||
$0 install ntfy
|
$0 install ntfy
|
||||||
$0 install z
|
$0 install z
|
||||||
msgr msg "Reloading configurations again..."
|
msgr msg "Reloading configurations again..."
|
||||||
@@ -86,6 +87,11 @@ function section_install
|
|||||||
curl -sSfL git.io/antigen -o "$DOTFILES/local/bin/antigen.zsh" \
|
curl -sSfL git.io/antigen -o "$DOTFILES/local/bin/antigen.zsh" \
|
||||||
&& msg_yay "New antigen installed!"
|
&& msg_yay "New antigen installed!"
|
||||||
;;
|
;;
|
||||||
|
asdf)
|
||||||
|
msg "Installing asdf..."
|
||||||
|
bash "$DOTFILES/scripts/install-asdf.sh" \
|
||||||
|
&& msg_yay "asdf installed!"
|
||||||
|
;;
|
||||||
cargo)
|
cargo)
|
||||||
msg "Installing cargo packages..."
|
msg "Installing cargo packages..."
|
||||||
bash "$DOTFILES/scripts/install-cargo-packages.sh" \
|
bash "$DOTFILES/scripts/install-cargo-packages.sh" \
|
||||||
|
|||||||
@@ -2,12 +2,12 @@
|
|||||||
# Load our configuration files
|
# Load our configuration files
|
||||||
# Copyright (c) 2023 Ismo Vuorinen. All Rights Reserved.
|
# Copyright (c) 2023 Ismo Vuorinen. All Rights Reserved.
|
||||||
|
|
||||||
set -euo pipefail
|
# Enable verbosity with VERBOSE=1 x-load-configs
|
||||||
|
|
||||||
# Set verbosity with VERBOSE=1 x-load-configs
|
|
||||||
VERBOSE="${VERBOSE:=0}"
|
VERBOSE="${VERBOSE:=0}"
|
||||||
|
# Enable debugging with DEBUG=1 x-load-configs
|
||||||
|
DEBUG="${DEBUG:=0}"
|
||||||
|
|
||||||
[ "$VERBOSE" = "1" ] && {
|
[ "$DEBUG" = "1" ] && {
|
||||||
set -x
|
set -x
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -37,7 +37,7 @@ loadConfigFiles()
|
|||||||
HOST_FILE=$CONFIG_FILE-$HOST
|
HOST_FILE=$CONFIG_FILE-$HOST
|
||||||
SECRET_HOST=$HOST_FILE-secret
|
SECRET_HOST=$HOST_FILE-secret
|
||||||
|
|
||||||
[ "$VERBOSE" = "1" ] && configMsg "?" "$CONFIG_FILE"
|
[ "$VERBOSE" = "1" ] && configMsg "Looking for" "$CONFIG_FILE"
|
||||||
|
|
||||||
# global (exports|alias|functions) FILENAME for all hosts
|
# global (exports|alias|functions) FILENAME for all hosts
|
||||||
# shellcheck source=../config/exports
|
# shellcheck source=../config/exports
|
||||||
@@ -47,19 +47,19 @@ loadConfigFiles()
|
|||||||
|
|
||||||
# global secret FILENAME, git ignored
|
# global secret FILENAME, git ignored
|
||||||
# shellcheck source=../config/exports-secret
|
# shellcheck source=../config/exports-secret
|
||||||
[ "$VERBOSE" = "1" ] && configMsg "?" "$SECRET_FILE"
|
[ "$VERBOSE" = "1" ] && configMsg "Looking for" "$SECRET_FILE"
|
||||||
[ -r "$SECRET_FILE" ] && {
|
[ -r "$SECRET_FILE" ] && {
|
||||||
source "$SECRET_FILE" && [ "$VERBOSE" = "1" ] && configMsg "Found" "$SECRET_FILE"
|
source "$SECRET_FILE" && [ "$VERBOSE" = "1" ] && configMsg "Found" "$SECRET_FILE"
|
||||||
}
|
}
|
||||||
# host specific (exports|alias|functions) FILENAME
|
# host specific (exports|alias|functions) FILENAME
|
||||||
# shellcheck source=../config/exports
|
# shellcheck source=../config/exports
|
||||||
[ "$VERBOSE" = "1" ] && configMsg "?" "$HOST_FILE"
|
[ "$VERBOSE" = "1" ] && configMsg "Looking for" "$HOST_FILE"
|
||||||
[ -r "$HOST_FILE" ] && {
|
[ -r "$HOST_FILE" ] && {
|
||||||
source "$HOST_FILE" && [ "$VERBOSE" = "1" ] && configMsg "Found" "$HOST_FILE"
|
source "$HOST_FILE" && [ "$VERBOSE" = "1" ] && configMsg "Found" "$HOST_FILE"
|
||||||
}
|
}
|
||||||
# host specific (exports|alias|functions) FILENAME, git ignored
|
# host specific (exports|alias|functions) FILENAME, git ignored
|
||||||
# shellcheck source=../config/exports
|
# shellcheck source=../config/exports
|
||||||
[ "$VERBOSE" = "1" ] && configMsg "?" "$SECRET_HOST"
|
[ "$VERBOSE" = "1" ] && configMsg "Looking for" "$SECRET_HOST"
|
||||||
[ -r "$SECRET_HOST" ] && {
|
[ -r "$SECRET_HOST" ] && {
|
||||||
source "$SECRET_HOST" \
|
source "$SECRET_HOST" \
|
||||||
&& [ "$VERBOSE" = "1" ] && configMsg "Found" "$SECRET_HOST"
|
&& [ "$VERBOSE" = "1" ] && configMsg "Found" "$SECRET_HOST"
|
||||||
|
|||||||
@@ -28,7 +28,8 @@
|
|||||||
},
|
},
|
||||||
"homepage": "https://github.com/ivuorinen/dotfiles#readme",
|
"homepage": "https://github.com/ivuorinen/dotfiles#readme",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@ivuorinen/base-configs": "^1.1.0"
|
"@ivuorinen/base-configs": "^1.1.0",
|
||||||
|
"prettier-plugin-sh": "^0.14.0"
|
||||||
},
|
},
|
||||||
"packageManager": "yarn@1.22.22"
|
"packageManager": "yarn@1.22.22"
|
||||||
}
|
}
|
||||||
|
|||||||
64
scripts/install-asdf.sh
Executable file
64
scripts/install-asdf.sh
Executable file
@@ -0,0 +1,64 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
#
|
||||||
|
# Install asdf
|
||||||
|
|
||||||
|
source "${XDG_CONFIG_HOME}/shared"
|
||||||
|
source "${DOTFILES}/scripts/shared.sh"
|
||||||
|
|
||||||
|
export ASDF_DIR="${XDG_BIN_HOME}/asdf"
|
||||||
|
export PATH="${ASDF_DIR}/bin:$PATH"
|
||||||
|
|
||||||
|
msg "Sourcing asdf in your shell"
|
||||||
|
. "$ASDF_DIR/asdf.sh"
|
||||||
|
|
||||||
|
# Update asdf, and plugins
|
||||||
|
asdf update
|
||||||
|
|
||||||
|
asdf plugin add asdf-plugin-manager https://github.com/asdf-community/asdf-plugin-manager.git
|
||||||
|
asdf install asdf-plugin-manager latest
|
||||||
|
asdf global asdf-plugin-manager "$(asdf latest asdf-plugin-manager)"
|
||||||
|
asdf-plugin-manager version
|
||||||
|
asdf-plugin-manager add-all
|
||||||
|
|
||||||
|
asdf install
|
||||||
|
|
||||||
|
ASDF_INSTALLABLES=(
|
||||||
|
"1password-cli:github.com/NeoHsu/asdf-1password-cli.git"
|
||||||
|
"age:github.com/threkk/asdf-age.git"
|
||||||
|
"bottom:github.com/carbonteq/asdf-btm.git"
|
||||||
|
"dotenv-linter:github.com/wesleimp/asdf-dotenv-linter.git"
|
||||||
|
"editorconfig-checker:github.com/gabitchov/asdf-editorconfig-checker.git"
|
||||||
|
"eza:github.com/lwiechec/asdf-eza.git"
|
||||||
|
"fd:gitlab.com/wt0f/asdf-fd.git"
|
||||||
|
"github-cli:github.com/bartlomiejdanek/asdf-github-cli.git"
|
||||||
|
"golang:github.com/asdf-community/asdf-golang.git"
|
||||||
|
"hadolint:github.com/devlincashman/asdf-hadolint.git"
|
||||||
|
"kubectl:github.com/asdf-community/asdf-kubectl.git"
|
||||||
|
"lazygit:github.com/nklmilojevic/asdf-lazygit.git"
|
||||||
|
"nodejs:github.com/asdf-vm/asdf-nodejs.git"
|
||||||
|
"pipx:github.com/yozachar/asdf-pipx.git"
|
||||||
|
"pre-commit:github.com/jonathanmorley/asdf-pre-commit.git"
|
||||||
|
"ripgrep:gitlab.com/wt0f/asdf-ripgrep.git"
|
||||||
|
"semgrep:github.com/brentjanderson/asdf-semgrep.git"
|
||||||
|
"shellcheck:github.com/luizm/asdf-shellcheck.git"
|
||||||
|
"shfmt:github.com/luizm/asdf-shfmt.git"
|
||||||
|
"terraform-ls:github.com/asdf-community/asdf-hashicorp.git"
|
||||||
|
"terraform-lsp:github.com/bartlomiejdanek/asdf-terraform-lsp.git"
|
||||||
|
"terragrunt:github.com/ohmer/asdf-terragrunt.git"
|
||||||
|
"tf-summarize:github.com/adamcrews/asdf-tf-summarize.git"
|
||||||
|
"vault:github.com/asdf-community/asdf-hashicorp.git"
|
||||||
|
"yamllint:github.com/ericcornelissen/asdf-yamllint.git"
|
||||||
|
"yq:github.com/sudermanjr/asdf-yq.git"
|
||||||
|
)
|
||||||
|
|
||||||
|
msg "Installing asdf plugins, if not already installed"
|
||||||
|
for item in "${ASDF_INSTALLABLES[@]}"; do
|
||||||
|
CMD=$(echo "${item}" | awk -F ":" '{print $1}')
|
||||||
|
URL=$(echo "${item}" | awk -F ":" '{print $2}')
|
||||||
|
asdf plugin add "${CMD}" "https://${URL}"
|
||||||
|
asdf install "${CMD}" latest
|
||||||
|
asdf global "${CMD}" "$(asdf latest "${CMD}")"
|
||||||
|
done
|
||||||
|
|
||||||
|
msg "Reshim asdf"
|
||||||
|
asdf reshim
|
||||||
@@ -53,7 +53,7 @@ x-have git-profile && {
|
|||||||
|
|
||||||
x-have antidot && {
|
x-have antidot && {
|
||||||
antidot update \
|
antidot update \
|
||||||
&& msg_ok "Updated antidot database"
|
&& msg_ok "Updated antidot database"
|
||||||
}
|
}
|
||||||
|
|
||||||
echo ""
|
echo ""
|
||||||
|
|||||||
@@ -12,21 +12,11 @@
|
|||||||
|| [[ -n $BASH_VERSION ]] && (return 0 2> /dev/null)
|
|| [[ -n $BASH_VERSION ]] && (return 0 2> /dev/null)
|
||||||
) && sourced=1 || sourced=0
|
) && sourced=1 || sourced=0
|
||||||
|
|
||||||
export DOTFILES="$HOME/.dotfiles"
|
source "$HOME/.dotfiles/config/shared"
|
||||||
|
|
||||||
DOTFILES_CURRENT_SHELL=$(ps -p $$ -oargs=)
|
DOTFILES_CURRENT_SHELL=$(ps -p $$ -oargs=)
|
||||||
export DOTFILES_CURRENT_SHELL
|
export DOTFILES_CURRENT_SHELL
|
||||||
|
|
||||||
# Explicitly set XDG folders
|
|
||||||
# https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
|
|
||||||
export XDG_CONFIG_HOME="$HOME/.config"
|
|
||||||
export XDG_DATA_HOME="$HOME/.local/share"
|
|
||||||
export XDG_STATE_HOME="$HOME/.local/state"
|
|
||||||
|
|
||||||
# custom variables
|
|
||||||
export XDG_BIN_HOME="$HOME/.local/bin"
|
|
||||||
export XDG_CACHE_HOME="$HOME/.cache"
|
|
||||||
export XDG_RUNTIME_DIR="$HOME/.local/run"
|
|
||||||
|
|
||||||
# Other variables
|
# Other variables
|
||||||
export OHMYPOSH_CFG="$HOME/.dotfiles/config/omp/own.toml"
|
export OHMYPOSH_CFG="$HOME/.dotfiles/config/omp/own.toml"
|
||||||
|
|
||||||
|
|||||||
25
yarn.lock
25
yarn.lock
@@ -3418,6 +3418,11 @@ mute-stream@^1.0.0:
|
|||||||
resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-1.0.0.tgz#e31bd9fe62f0aed23520aa4324ea6671531e013e"
|
resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-1.0.0.tgz#e31bd9fe62f0aed23520aa4324ea6671531e013e"
|
||||||
integrity sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==
|
integrity sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==
|
||||||
|
|
||||||
|
mvdan-sh@^0.10.1:
|
||||||
|
version "0.10.1"
|
||||||
|
resolved "https://registry.yarnpkg.com/mvdan-sh/-/mvdan-sh-0.10.1.tgz#5b3a4462a89cf20739b12d851589342c875f4d1f"
|
||||||
|
integrity sha512-kMbrH0EObaKmK3nVRKUIIya1dpASHIEusM13S4V1ViHFuxuNxCo+arxoa6j/dbV22YBGjl7UKJm9QQKJ2Crzhg==
|
||||||
|
|
||||||
mz@^2.4.0:
|
mz@^2.4.0:
|
||||||
version "2.7.0"
|
version "2.7.0"
|
||||||
resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32"
|
resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32"
|
||||||
@@ -4008,6 +4013,14 @@ prelude-ls@^1.2.1:
|
|||||||
resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
|
resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
|
||||||
integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
|
integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
|
||||||
|
|
||||||
|
prettier-plugin-sh@^0.14.0:
|
||||||
|
version "0.14.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/prettier-plugin-sh/-/prettier-plugin-sh-0.14.0.tgz#22b186adea79b36212ccd9faa8dd01f33ef34ff6"
|
||||||
|
integrity sha512-hfXulj5+zEl/ulrO5kMuuTPKmXvOg0bnLHY1hKFNN/N+/903iZbNp8NyZBTsgI8dtkSgFfAEIQq0IQTyP1ZVFQ==
|
||||||
|
dependencies:
|
||||||
|
mvdan-sh "^0.10.1"
|
||||||
|
sh-syntax "^0.4.1"
|
||||||
|
|
||||||
prettier@3.3.2:
|
prettier@3.3.2:
|
||||||
version "3.3.2"
|
version "3.3.2"
|
||||||
resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.3.2.tgz#03ff86dc7c835f2d2559ee76876a3914cec4a90a"
|
resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.3.2.tgz#03ff86dc7c835f2d2559ee76876a3914cec4a90a"
|
||||||
@@ -4353,6 +4366,13 @@ set-function-name@^2.0.1:
|
|||||||
functions-have-names "^1.2.3"
|
functions-have-names "^1.2.3"
|
||||||
has-property-descriptors "^1.0.2"
|
has-property-descriptors "^1.0.2"
|
||||||
|
|
||||||
|
sh-syntax@^0.4.1:
|
||||||
|
version "0.4.2"
|
||||||
|
resolved "https://registry.yarnpkg.com/sh-syntax/-/sh-syntax-0.4.2.tgz#3bad5c6134b510e7b4c53b16f409ce4fd2a65245"
|
||||||
|
integrity sha512-/l2UZ5fhGZLVZa16XQM9/Vq/hezGGbdHeVEA01uWjOL1+7Ek/gt6FquW0iKKws4a9AYPYvlz6RyVvjh3JxOteg==
|
||||||
|
dependencies:
|
||||||
|
tslib "^2.6.2"
|
||||||
|
|
||||||
shebang-command@^2.0.0:
|
shebang-command@^2.0.0:
|
||||||
version "2.0.0"
|
version "2.0.0"
|
||||||
resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
|
resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
|
||||||
@@ -4796,6 +4816,11 @@ tsconfig-paths@^3.15.0:
|
|||||||
minimist "^1.2.6"
|
minimist "^1.2.6"
|
||||||
strip-bom "^3.0.0"
|
strip-bom "^3.0.0"
|
||||||
|
|
||||||
|
tslib@^2.6.2:
|
||||||
|
version "2.6.3"
|
||||||
|
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.3.tgz#0438f810ad7a9edcde7a241c3d80db693c8cbfe0"
|
||||||
|
integrity sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==
|
||||||
|
|
||||||
tuf-js@^2.2.1:
|
tuf-js@^2.2.1:
|
||||||
version "2.2.1"
|
version "2.2.1"
|
||||||
resolved "https://registry.yarnpkg.com/tuf-js/-/tuf-js-2.2.1.tgz#fdd8794b644af1a75c7aaa2b197ddffeb2911b56"
|
resolved "https://registry.yarnpkg.com/tuf-js/-/tuf-js-2.2.1.tgz#fdd8794b644af1a75c7aaa2b197ddffeb2911b56"
|
||||||
|
|||||||
Reference in New Issue
Block a user