Compare commits

...

6 Commits

Author SHA1 Message Date
6b26215197 chore: add move.sh and skhdrc tweaks 2025-06-24 04:43:11 +03:00
a72c8ff33a chore(config): zed config update 2025-06-24 04:42:23 +03:00
19d9035214 chore(config): don't format config/op/plugins 2025-06-23 20:04:50 +03:00
7ca077c852 fix(ci): typo
Signed-off-by: Ismo Vuorinen <ismo@ivuorinen.net>
2025-06-23 20:00:04 +03:00
48604d81d6 fix(ci): add actions/setup-node to linters.yml
Signed-off-by: Ismo Vuorinen <ismo@ivuorinen.net>
2025-06-23 19:57:34 +03:00
github-actions[bot]
405e68f895 chore: update pre-commit hooks (#135) 2025-06-23 10:18:13 +03:00
8 changed files with 134 additions and 16 deletions

View File

@@ -21,6 +21,9 @@ jobs:
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Setup Node.js environment
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
- name: GitHub Actions
uses: reviewdog/action-actionlint@a5524e1c19e62881d79c1f1b9b6f09f16356e281 # v1.65.2
with:

View File

@@ -1,6 +1,7 @@
# only care about files that are directly under our control
config/cheat/cheatsheets/community/*
config/cheat/cheatsheets/tldr/*
config/op/plugins/used_plugins/*
config/tmux/plugins/*
local/bin/asdf/*
tools/*

View File

@@ -49,7 +49,7 @@ repos:
- id: actionlint
- repo: https://github.com/renovatebot/pre-commit-hooks
rev: 40.61.2
rev: 41.1.4
hooks:
- id: renovate-config-validator

View File

@@ -5,6 +5,7 @@ config/cheat/cheatsheets/community
config/cheat/cheatsheets/tldr
config/fzf/*
config/nvim/*
config/op/plugins/used_plugins/*
config/tmux/plugins/*
config/zsh/*
lazy-lock.json

View File

@@ -1,7 +1 @@
[
{
"account_id": "S5Z2DMNFKJEZBPCWRHRWC4DCGI",
"vault_id": "injcin7obv3jdet3r2u3kfihfy",
"item_id": "f6vinbnc6l7ngdzvlw66ayewlq"
}
]
[{"account_id":"S5Z2DMNFKJEZBPCWRHRWC4DCGI","vault_id":"injcin7obv3jdet3r2u3kfihfy","item_id":"f6vinbnc6l7ngdzvlw66ayewlq"}]

52
config/skhd/move.sh Executable file
View File

@@ -0,0 +1,52 @@
#!/bin/bash
direction="$1" # east | west
# Active window and display
window=$(yabai -m query --windows --window)
display=$(yabai -m query --displays --display)
win_x=$(echo "$window" | jq '.frame.x')
win_w=$(echo "$window" | jq '.frame.w')
disp_x=$(echo "$display" | jq '.frame.x')
disp_w=$(echo "$display" | jq '.frame.w')
# Edge detection buffer
padding=20
move_to_display=false
if [[ "$direction" == "east" ]]; then
[[ $((win_x + win_w)) -ge $((disp_x + disp_w - padding)) ]] && move_to_display=true
elif [[ "$direction" == "west" ]]; then
[[ $win_x -le $((disp_x + padding)) ]] && move_to_display=true
fi
if $move_to_display; then
# Find the target display based on the direction
if [[ "$direction" == "east" ]]; then
target_display=$(yabai -m query --displays | jq ".[] | select(.frame.x > $disp_x)" | jq -s '.[0].index')
else
target_display=$(yabai -m query --displays | jq ".[] | select(.frame.x < $disp_x)" | jq -s '.[-1].index')
fi
if [[ -n "$target_display" && "$target_display" != "null" ]]; then
# Find current space on the target display
target_space=$(yabai -m query --spaces | jq ".[] | select(.display == $target_display) | .index" | head -n1)
# If no space found, create a new one
if [[ -z "$target_space" || "$target_space" == "null" ]]; then
yabai -m space --create
sleep 0.3
# Asign the new space to the target display
target_space=$(yabai -m query --spaces | jq ".[] | select(.display == $target_display) | .index" | head -n1)
fi
# Move the window to the new space and focus it
yabai -m window --space "$target_space"
yabai -m space --focus "$target_space"
yabai -m display --focus "$target_display"
fi
else
yabai -m window --warp "$direction"
fi

View File

@@ -80,10 +80,12 @@ ctrl + alt - h : yabai -m window --grid 1:2:0:0:1:1 # 1/2 left
ctrl + alt - l : yabai -m window --grid 1:2:1:0:1:1 # 1/2 right
## swap windows
shift + alt - h : yabai -m window --swap west
#shift + alt - h : yabai -m window --swap west
shift + alt - j : yabai -m window --swap south
shift + alt - k : yabai -m window --swap north
shift + alt - l : yabai -m window --swap east
#shift + alt - l : yabai -m window --swap east
alt + shift - l : ~/.config/skhd/move.sh east
alt + shift - h : ~/.config/skhd/move.sh west
## resize windows
ctrl + alt - h : yabai -m window --resize left:-50:0; \

View File

@@ -16,6 +16,9 @@
"version": "2"
},
"languages": {
"PHP": {
"language_servers": ["intelephense", "phpactor"]
},
"Python": {
"enable_language_server": true,
"allow_rewrap": "anywhere",
@@ -30,6 +33,13 @@
"source.fixAll.eslint": true
}
},
"Markdown": {
"enable_language_server": true,
"preferred_line_length": 160,
"prettier": {
"allowed": true
}
},
"Lua": {
"enable_language_server": true,
"tab_size": 2
@@ -55,13 +65,32 @@
}
}
},
"diagnostics": {
"button": true,
"include_warnings": true,
"lsp_pull_diagnostics": {
"enabled": true,
"debounce_ms": 50
},
"inline": {
"enabled": true,
"update_debounce_ms": 150
}
},
"multi_cursor_modifier": "cmd_or_ctrl", // alias: "cmd", "ctrl"
"indent_guides": {
"enabled": true,
"coloring": "indent_aware"
},
"preferred_line_length": 100,
"soft_wrap": "bounded",
"wrap_guides": [100, 120, 160, 200],
"format_on_save": "on",
"vim_mode": true,
"theme": {
"mode": "system",
"light": "Tokyo Night Light",
"dark": "Tokyo Night Storm"
"light": "Tomorrow",
"dark": "Tomorrow at Midnight"
},
"inlay_hints": {
"enabled": true,
@@ -72,8 +101,44 @@
"ui_font_size": 16,
"buffer_font_size": 16,
"buffer_font_fallbacks": ["JetBrainsMono Nerd Font"],
"edit_predictions": {
"disabled_globs": [".env", ".env.*"]
},
"hour_format": "hour24"
"use_autoclose": false,
"hour_format": "hour24",
"auto_install_extensions": {
"angular": true,
"ansible": true,
"basher": true,
"biome": true,
"blade": true,
"csharp": true,
"css-modules-kit": true,
"dockerfile": true,
"git-firefly": true,
"github-activity-summarizer": true,
"golangci-lint": true,
"gosum": true,
"go-snippets": true,
"html": true,
"ini": true,
"json": true,
"json5": true,
"just": true,
"just-ls": true,
"lua": true,
"make": true,
"php": true,
"python-snippets": true,
"python-requirements": true,
"ruff": true,
"scss": true,
"sieve": true,
"stylelint": true,
"sql": true,
"toml": true,
"vue": true,
"vue-snippets": true,
"wakatime": true,
"xcode-themes": true,
"yaml": true,
"tomorrow-theme": true
}
}