Compare commits

..

14 Commits

14 changed files with 78 additions and 16 deletions

3
.gitmodules vendored
View File

@@ -58,3 +58,6 @@
[submodule "cheat-tldr"] [submodule "cheat-tldr"]
path = config/cheat/cheatsheets/tldr path = config/cheat/cheatsheets/tldr
url = https://github.com/ivuorinen/cheatsheet-tldr.git url = https://github.com/ivuorinen/cheatsheet-tldr.git
[submodule "nvim-kickstart"]
path = config/nvim-kickstart
url = https://github.com/ivuorinen/kickstart.nvim

View File

@@ -10,6 +10,9 @@ git submodule add --name dotbot-include \
git submodule add --name dotbot-pip \ git submodule add --name dotbot-pip \
-f https://github.com/sobolevn/dotbot-pip.git tools/dotbot-pip -f https://github.com/sobolevn/dotbot-pip.git tools/dotbot-pip
git submodule add --name nvim-kickstart \
-f https://github.com/ivuorinen/kickstart.nvim config/nvim-kickstart
# other repos # other repos
git submodule add --name cheat-community \ 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

View File

@@ -324,21 +324,26 @@ chars = "\u0002/"
key = "F" key = "F"
mods = "Command" mods = "Command"
[mouse]
hide_when_typing = true
[[mouse.bindings]] [[mouse.bindings]]
action = "PasteSelection" action = "PasteSelection"
mouse = "Middle" mouse = "Middle"
[selection] [selection]
semantic_escape_chars = ",│`|:\"' ()[]{}<>" semantic_escape_chars = ",│`|:\"' ()[]{}<>"
save_to_clipboard = true
[window] [window]
decorations = "none" decorations = "Full"
dynamic_title = true dynamic_title = true
opacity = 0.98 opacity = 0.98
blur = true
[window.dimensions] [window.dimensions]
columns = 200 columns = 200
lines = 100 lines = 75
[window.padding] [window.padding]
x = 5 x = 5

View File

@@ -51,6 +51,10 @@ alias tmux='tmux new-session -A -s main'
# tmux: attach or create new session # tmux: attach or create new session
alias ta='tmux attach || tmux' alias ta='tmux attach || tmux'
# nvim
alias nvim-ks='NVIM_APPNAME="nvim-kickstart" nvim'
alias ks='NVIM_APPNAME="nvim-kickstart" nvim'
# watch with: differences, precise, beep and color # watch with: differences, precise, beep and color
alias watchx='watch -dpbc' alias watchx='watch -dpbc'
# delete .DS_Store files # delete .DS_Store files

View File

@@ -83,8 +83,8 @@ export OP_CACHE="$XDG_STATE_HOME/1password"
# pyenv, python environments # pyenv, python environments
export WORKON_HOME="$XDG_DATA_HOME/virtualenvs" export WORKON_HOME="$XDG_DATA_HOME/virtualenvs"
export PYENV_ROOT="$XDG_STATE_HOME/pyenv" export PYENV_ROOT="$XDG_STATE_HOME/pyenv"
export PATH="$PYENV_ROOT/bin:$PYENV_ROOT/shims:$PATH"
x-have pyenv && { x-have pyenv && {
export PATH="$PYENV_ROOT/shims:$PATH"
eval "$(pyenv init -)" eval "$(pyenv init -)"
} }

1
config/nvim-kickstart Submodule

Submodule config/nvim-kickstart added at 4eed1621f5

View File

@@ -2,11 +2,10 @@
"extras": [ "extras": [
"lazyvim.plugins.extras.coding.copilot", "lazyvim.plugins.extras.coding.copilot",
"lazyvim.plugins.extras.coding.yanky", "lazyvim.plugins.extras.coding.yanky",
"lazyvim.plugins.extras.editor.aerial",
"lazyvim.plugins.extras.editor.leap", "lazyvim.plugins.extras.editor.leap",
"lazyvim.plugins.extras.editor.outline",
"lazyvim.plugins.extras.formatting.black", "lazyvim.plugins.extras.formatting.black",
"lazyvim.plugins.extras.formatting.prettier", "lazyvim.plugins.extras.formatting.prettier",
"lazyvim.plugins.extras.lang.ansible",
"lazyvim.plugins.extras.lang.docker", "lazyvim.plugins.extras.lang.docker",
"lazyvim.plugins.extras.lang.go", "lazyvim.plugins.extras.lang.go",
"lazyvim.plugins.extras.lang.json", "lazyvim.plugins.extras.lang.json",
@@ -20,10 +19,12 @@
"lazyvim.plugins.extras.ui.edgy", "lazyvim.plugins.extras.ui.edgy",
"lazyvim.plugins.extras.ui.mini-animate", "lazyvim.plugins.extras.ui.mini-animate",
"lazyvim.plugins.extras.util.dot", "lazyvim.plugins.extras.util.dot",
"lazyvim.plugins.extras.vscode" "lazyvim.plugins.extras.vscode",
"lazyvim.plugins.extras.editor.aerial",
"lazyvim.plugins.extras.editor.outline"
], ],
"news": { "news": {
"NEWS.md": "2123" "NEWS.md": "3314"
}, },
"version": 3 "version": 3
} }

View File

@@ -93,20 +93,19 @@ set-window-option -g mode-keys vi
# ╰──────────────────────────────────────────────────────────╯ # ╰──────────────────────────────────────────────────────────╯
# Make sure status sides are long enough and centered is in the middle # Make sure status sides are long enough and centered is in the middle
set -g status-left-length "30" set -g status-left-length "0"
set -g status-right-length "30" set -g status-right-length "30"
set-option -g status-position "bottom" set-option -g status-position "bottom"
set-option -g status-style 'bg=default,fg=#ffffff' set-option -g status-style 'bg=default,fg=#ffffff'
set-option -g status-justify centre set-option -g status-justify left
set-option -g status-left '#h ' set-option -g status-left ''
set-window-option -g window-status-style 'fg=#ffffff,bg=default' set-window-option -g window-status-style 'fg=#ffffff,bg=default'
set-option -g window-status-format ' #I:#W ' set-option -g window-status-format ' #I:#W '
set-window-option -g window-status-current-style 'fg=#111111,bg=#7aa2f7' set-window-option -g window-status-current-style 'fg=#111111,bg=#7aa2f7'
set-option -g window-status-current-format ' #I:#W#{?window_zoomed_flag,  , } ' set-option -g window-status-current-format ' #I:#W#{?window_zoomed_flag,  , } '
set-option -g status-left "#{hostname_short}/#S" set-option -g status-right "#{hostname_short}/#S %H:%M #{tmux_mode_indicator}"
set-option -g status-right "%H:%M #{tmux_mode_indicator}"
# ╭──────────────────────────────────────────────────────────╮ # ╭──────────────────────────────────────────────────────────╮
# │ Plugins related configurations │ # │ Plugins related configurations │

View File

@@ -213,6 +213,8 @@ function section_brew
"update:Updates and upgrades brew packages" "update:Updates and upgrades brew packages"
"updatebundle:Updates Brewfile with descriptions" "updatebundle:Updates Brewfile with descriptions"
"autoupdate:Setups brew auto-update and runs it immediately" "autoupdate:Setups brew auto-update and runs it immediately"
"leaves:List brew leaves (installed on request)"
"clean:Clean up brew packages"
) )
x-have brew && { x-have brew && {
@@ -231,6 +233,12 @@ function section_brew
--file="$BREWFILE" \ --file="$BREWFILE" \
--describe && msg_yay "Done!" --describe && msg_yay "Done!"
;; ;;
leaves)
brew leaves --installed-on-request
;;
clean)
brew bundle cleanup --file="$BREWFILE" && msg_yay "Done!"
;;
autoupdate) autoupdate)
brew autoupdate delete brew autoupdate delete
brew autoupdate start 43200 --upgrade --cleanup --immediate brew autoupdate start 43200 --upgrade --cleanup --immediate

View File

@@ -0,0 +1,17 @@
#!/usr/bin/env bash
REPO=$1
if [ -z "$REPO" ]; then
echo "Usage: $0 <repo> (e.g. ivuorinen/dotfiles)"
exit 1
fi
LOCATION=$(curl -s "https://api.github.com/repos/${REPO}/releases/latest" \
| sed -Ene '/^[[:blank:]]+"tarball_url":[[:blank:]]"(https:[^"]+)",/s//\1/p')
echo "Downloading and extracting from: $LOCATION"
curl --location --silent "$LOCATION" | tar --extract --gzip --file=-
# vim: set ts=2 sw=2 ft=sh et:

View File

@@ -0,0 +1,18 @@
#!/usr/bin/env bash
REPO=$1
if [ -z "$REPO" ]; then
echo "Usage: $0 <repo> (e.g. ivuorinen/dotfiles)"
exit 1
fi
VERSION=$(
curl -s "https://api.github.com/repos/${REPO}/releases/latest" \
| grep "tag_name" \
| awk '{print substr($2, 2, length($2)-3)}'
)
echo "$VERSION"
# vim: set ts=2 sw=2 ft=sh et:

View File

@@ -29,5 +29,6 @@
"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"
} },
"packageManager": "yarn@1.22.22"
} }

View File

@@ -2,4 +2,6 @@ Include shared.d/*
Include local.d/* Include local.d/*
Host * Host *
ServerAliveInterval 300 # send null packets every 5min to keep connection alive
ServerAliveCountMax 2 # if the server doesn't respond 2 times, it's gone so give up
# IdentityAgent "~/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock" # IdentityAgent "~/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock"

View File

@@ -4691,9 +4691,9 @@ supports-preserve-symlinks-flag@^1.0.0:
integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
tar@^6.1.11, tar@^6.1.2, tar@^6.2.0: tar@^6.1.11, tar@^6.1.2, tar@^6.2.0:
version "6.2.0" version "6.2.1"
resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.0.tgz#b14ce49a79cb1cd23bc9b016302dea5474493f73" resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a"
integrity sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ== integrity sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==
dependencies: dependencies:
chownr "^2.0.0" chownr "^2.0.0"
fs-minipass "^2.0.0" fs-minipass "^2.0.0"