diff options
| author | kkard2 <[email protected]> | 2026-05-07 18:00:21 +0200 |
|---|---|---|
| committer | kkard2 <[email protected]> | 2026-05-07 18:00:21 +0200 |
| commit | e69fce27eeae3419bd33ace5e514efd910e4e2ac (patch) | |
| tree | 670aa2fcc1721931198dce4a76f5ff7eb496c4be | |
| parent | b44b1125990fbd5bbf773d04c0cd4747ad6f7011 (diff) | |
cleanup
| -rw-r--r-- | LICENSE | 2 | ||||
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | _linux/hypr/hyprland.conf | 221 | ||||
| -rw-r--r-- | _linux/waybar/config | 218 | ||||
| -rw-r--r-- | _linux/waybar/style.css | 264 | ||||
| -rw-r--r-- | _windows/README.md | 3 | ||||
| -rw-r--r-- | _windows/ahk/capslock.ahk | 70 | ||||
| -rw-r--r-- | _windows/ahk/run.ps1 | 1 | ||||
| -rw-r--r-- | _windows/startup.ps1 | 1 | ||||
| -rw-r--r-- | alacritty/alacritty.toml | 27 | ||||
| -rw-r--r-- | git-stack | 166 | ||||
| -rw-r--r-- | kanata/kanata.kbd | 20 | ||||
| -rw-r--r-- | nvim/ftplugin/php.lua | 11 | ||||
| -rwxr-xr-x | setup.sh | 25 | ||||
| -rw-r--r-- | zed/keymap.json | 60 | ||||
| -rw-r--r-- | zed/settings.json | 34 |
16 files changed, 2 insertions, 1125 deletions
@@ -1,6 +1,6 @@ MIT License -Copyright (c) 2023 Karol Kasperek +Copyright (c) 2026 kkard2 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -1,11 +1,10 @@ # .dotfiles -config stuff (i need to move everything into one place) +config stuff # links * `~/.ideavimrc` -> `./idea/.ideavimrc` * `$XDG_CONFIG_HOME/espanso` -> `./espanso` * `$XDG_CONFIG_HOME/nvim` -> `./nvim` -* `$XDG_CONFIG_HOME/kanata` -> `./kanata` * `$XDG_CONFIG_HOME/mpv` -> `./mpv` * `$XDG_CONFIG_HOME/alacritty` -> `./alacritty` * `~/.vsvimrc` -> `./vs/.vsvimrc` @@ -17,7 +16,6 @@ config stuff (i need to move everything into one place) [include] path = <repo>/global_gitconfig ``` -DO NOT SYMLINK PLEASE # windows [README.md](_windows/README.md) diff --git a/_linux/hypr/hyprland.conf b/_linux/hypr/hyprland.conf deleted file mode 100644 index 9b3aa03..0000000 --- a/_linux/hypr/hyprland.conf +++ /dev/null @@ -1,221 +0,0 @@ -# See https://wiki.hyprland.org/Configuring/Monitors/ -monitor=,preferred,auto,auto - - -# See https://wiki.hyprland.org/Configuring/Keywords/ for more - -# Execute your favorite apps at launch -exec-once = waybar -exec-once = lxqt-policykit-agent -exec-once = copyq - -# :weary: (temp btw) -exec-once = /home/kkard2/soft/espanso-thing - -# Set programs that you use -$terminal = st -f "Noto Sans Mono:style=Regular:size=12" -e tmux -$fileManager = thunar -$menu = dmenu_run - -# Some default env vars. -env = XCURSOR_SIZE,24 -env = QT_QPA_PLATFORMTHEME,qt5ct # change to qt6ct if you have that -env = LIBVA_DRIVER_NAME,nvidia -env = XDG_SESSION_TYPE,wayland -env = GBM_BACKEND,nvidia-drm -env = __GLX_VENDOR_LIBRARY_NAME,nvidia -env = WLR_NO_HARDWARE_CURSORS,1 - -# For all categories, see https://wiki.hyprland.org/Configuring/Variables/ -input { - kb_layout = pl - kb_variant = - kb_model = - kb_options = caps:escape_shifted_capslock - kb_rules = - - follow_mouse = 1 - - touchpad { - natural_scroll = false - } - - repeat_rate = 40 - repeat_delay = 400 - sensitivity = 0 # -1.0 - 1.0, 0 means no modification. - accel_profile = flat -} - -general { - # See https://wiki.hyprland.org/Configuring/Variables/ for more - - gaps_in = 0 - gaps_out = 0 - border_size = 1 - col.active_border = rgba(ff00ffff) - col.inactive_border = rgba(222222ff) - - layout = dwindle - - # Please see https://wiki.hyprland.org/Configuring/Tearing/ before you turn this on - allow_tearing = false -} - -decoration { - # See https://wiki.hyprland.org/Configuring/Variables/ for more - - rounding = 0 - - blur { - enabled = false - } - - drop_shadow = false -} - -animations { - enabled = false - - # these are the best ones i got, but they still suck - animation = windows, 1, 1, default - animation = border, 0 - animation = borderangle, 0 - animation = fade, 0 - animation = workspaces, 0 -} - -dwindle { - # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more - pseudotile = true # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below - preserve_split = true # you probably want this -} - -master { - # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more - new_is_master = true -} - -gestures { - # See https://wiki.hyprland.org/Configuring/Variables/ for more - workspace_swipe = false -} - -misc { - # See https://wiki.hyprland.org/Configuring/Variables/ for more - force_default_wallpaper = -1 # Set to 0 to disable the anime mascot wallpapers -} - -# Example per-device config -# See https://wiki.hyprland.org/Configuring/Keywords/#per-device-input-configs for more -device:epic-mouse-v1 { - sensitivity = -0.5 -} - -# Example windowrule v1 -# windowrule = float, ^(kitty)$ -# Example windowrule v2 -# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$ -# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more -windowrulev2 = nomaximizerequest, class:.* # You'll probably like this. -windowrulev2 = float, class:^(pavucontrol)$ -windowrulev2 = float, title:^(Authentication Required)$ -windowrulev2 = float, title:^.*(CopyQ)$ - -# See https://wiki.hyprland.org/Configuring/Keywords/ for more -$mainMod = SUPER - -# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more -bind = $mainMod, Return, exec, $terminal -bind = $mainMod, C, killactive, - -# why -#bind = $mainMod, M, exit, - -bind = $mainMod, E, exec, $fileManager -bind = $mainMod, F, togglefloating, -bind = $mainMod, R, exec, $menu - -# idk what this does -bind = $mainMod, P, pseudo, # dwindle - -bind = $mainMod, S, togglesplit, # dwindle - - -# Move focus with mainMod + hjkl -bind = $mainMod, H, movefocus, l -bind = $mainMod, L, movefocus, r -bind = $mainMod, K, movefocus, u -bind = $mainMod, J, movefocus, d - -bind = $mainMod SHIFT, H, movewindow, l -bind = $mainMod SHIFT, L, movewindow, r -bind = $mainMod SHIFT, K, movewindow, u -bind = $mainMod SHIFT, J, movewindow, d - -binde = $mainMod CTRL, H, resizeactive, -20 0 -binde = $mainMod CTRL, L, resizeactive, 20 0 -binde = $mainMod CTRL, K, resizeactive, 0 -20 -binde = $mainMod CTRL, J, resizeactive, 0 20 - -# Move focus with mainMod + arrows -bind = $mainMod, Left, movefocus, l -bind = $mainMod, Right, movefocus, r -bind = $mainMod, Up, movefocus, u -bind = $mainMod, Down, movefocus, d - -bind = $mainMod SHIFT, Left, movewindow, l -bind = $mainMod SHIFT, Right, movewindow, r -bind = $mainMod SHIFT, Up, movewindow, u -bind = $mainMod SHIFT, Down, movewindow, d - - -# Switch workspaces with mainMod + [0-9] -bind = $mainMod, 1, workspace, 1 -bind = $mainMod, 2, workspace, 2 -bind = $mainMod, 3, workspace, 3 -bind = $mainMod, 4, workspace, 4 -bind = $mainMod, 5, workspace, 5 -bind = $mainMod, 6, workspace, 6 -bind = $mainMod, 7, workspace, 7 -bind = $mainMod, 8, workspace, 8 -bind = $mainMod, 9, workspace, 9 -bind = $mainMod, 0, workspace, 10 - -# Move active window to a workspace with mainMod + SHIFT + [0-9] -bind = $mainMod SHIFT, 1, movetoworkspace, 1 -bind = $mainMod SHIFT, 2, movetoworkspace, 2 -bind = $mainMod SHIFT, 3, movetoworkspace, 3 -bind = $mainMod SHIFT, 4, movetoworkspace, 4 -bind = $mainMod SHIFT, 5, movetoworkspace, 5 -bind = $mainMod SHIFT, 6, movetoworkspace, 6 -bind = $mainMod SHIFT, 7, movetoworkspace, 7 -bind = $mainMod SHIFT, 8, movetoworkspace, 8 -bind = $mainMod SHIFT, 9, movetoworkspace, 9 -bind = $mainMod SHIFT, 0, movetoworkspace, 10 - -# move a window to the shadow realm (if it can't be closed) -bind = $mainMod, F4, movetoworkspacesilent, special - -# Move/resize windows with mainMod + LMB/RMB and dragging -bindm = $mainMod, mouse:272, movewindow -bindm = $mainMod, mouse:273, resizewindow - -# volume -bind = $mainMod CTRL, up, exec, pactl set-sink-volume @DEFAULT_SINK@ +5% -bind = $mainMod CTRL, down, exec, pactl set-sink-volume @DEFAULT_SINK@ -5% - -# notifications -bind = $mainMod, N, exec, makoctl dismiss -bind = $mainMod ALT, N, exec, makoctl dismiss --all -bind = $mainMod SHIFT, N, exec, makoctl restore -bind = $mainMod CTRL, N, exec, makoctl invoke -bind = $mainMod CTRL, N, exec, makoctl dismiss -bind = $mainMod CTRL, N, focusurgentorlast - -bind = $mainMod, U, focusurgentorlast - -bind = $mainMod SHIFT, S, exec, grim -g "$(slurp)" - | wl-copy - -bind = $mainMod, M, exec, pactl set-source-mute @DEFAULT_SOURCE@ toggle - -bind = $mainMod, V, exec, copyq toggle diff --git a/_linux/waybar/config b/_linux/waybar/config deleted file mode 100644 index 160160c..0000000 --- a/_linux/waybar/config +++ /dev/null @@ -1,218 +0,0 @@ -{ - "layer": "top", - "position": "top", - - "modules-left": [ -// "sway/mode", - "hyprland/workspaces", -// "custom/arrow10", - "hyprland/window" - ], - - "modules-right": [ - "custom/arrow9", - "pulseaudio", - "custom/arrow8", - "network", - "custom/arrow7", - "memory", - "custom/arrow6", - "cpu", - "custom/arrow5", - "temperature", - "custom/arrow4", -// "battery", -// "custom/arrow3", - "hyprland/language", - "custom/arrow2", - "tray", - "clock#date", - "custom/arrow1", - "clock#time" - ], - - // Modules - - "battery": { - "interval": 10, - "states": { - "warning": 30, - "critical": 15 - }, - "format-time": "{H}:{M:02}", - "format": "{icon} {capacity}% ({time})", - "format-charging": " {capacity}% ({time})", - "format-charging-full": " {capacity}%", - "format-full": "{icon} {capacity}%", - "format-alt": "{icon} {power}W", - "format-icons": [ - "", - "", - "", - "", - "" - ], - "tooltip": false - }, - - "clock#time": { - "interval": 10, - "format": "{:%H:%M}", - "tooltip": false - }, - - "clock#date": { - "interval": 20, - "format": "{:%e %b %Y}", - "tooltip": false - //"tooltip-format": "{:%e %B %Y}" - }, - - "cpu": { - "interval": 5, - "tooltip": false, - "format": " {usage}%", - "format-alt": " {load}", - "states": { - "warning": 70, - "critical": 90 - } - }, - - "hyprland/language": { - "format": " {}", - "min-length": 5, - "on-click": "hyprctl switchxkblayout keyboard next", - "tooltip": false - }, - - "memory": { - "interval": 5, - "format": " {used:0.1f}G/{total:0.1f}G", - "states": { - "warning": 70, - "critical": 90 - }, - "tooltip": false - }, - - "network": { - "interval": 5, - "format-wifi": " {essid} ({signalStrength}%)", - "format-ethernet": " {ifname}", - "format-disconnected": "No connection", - // "format-alt": " {ipaddr}/{cidr}", - "on-click": "nm-connection-editor", - "tooltip": false - }, - - "sway/mode": { - "format": "{}", - "tooltip": false - }, - - "hyprland/window": { - "format": "{}", -// "max-length": 30, - "tooltip": false, - "separate-outputs": true - }, - - "hyprland/workspaces": { - "disable-scroll-wraparound": true, - "smooth-scrolling-threshold": 4, - "enable-bar-scroll": true, - "format": "{name}" - }, - - "pulseaudio": { - "format": "{format_source} {icon} {volume}%", - "format-bluetooth": "{icon} {volume}%", - "format-muted": "", - "format-icons": { - "headphone": "", - "hands-free": "", - "headset": "", - "phone": "", - "portable": "", - "car": "", - "default": ["", ""] - }, - "format-source": " ", - "format-source-muted": " ", - "scroll-step": 1, - "on-click": "pavucontrol", - "tooltip": false - }, - - "temperature": { - "critical-threshold": 90, - "interval": 5, - "format": "{icon} {temperatureC}°", - "format-icons": [ - "", - "", - "", - "", - "" - ], - "tooltip": false - }, - - "tray": { - "icon-size": 18 - //"spacing": 10 - }, - - "custom/arrow1": { - "format": "", - "tooltip": false - }, - - "custom/arrow2": { - "format": "", - "tooltip": false - }, - - "custom/arrow3": { - "format": "", - "tooltip": false - }, - - "custom/arrow4": { - "format": "", - "tooltip": false - }, - - "custom/arrow5": { - "format": "", - "tooltip": false - }, - - "custom/arrow6": { - "format": "", - "tooltip": false - }, - - "custom/arrow7": { - "format": "", - "tooltip": false - }, - - "custom/arrow8": { - "format": "", - "tooltip": false - }, - - "custom/arrow9": { - "format": "", - "tooltip": false - }, - - "custom/arrow10": { - "format": "", - "tooltip": false - } -} - -// vi:ft=jsonc diff --git a/_linux/waybar/style.css b/_linux/waybar/style.css deleted file mode 100644 index 2cd7c4a..0000000 --- a/_linux/waybar/style.css +++ /dev/null @@ -1,264 +0,0 @@ -/* Keyframes */ - -@keyframes blink-critical { - to { - /*color: @white;*/ - background-color: @critical; - } -} - - -/* Styles */ - -/* Colors (gruvbox) */ -@define-color black #282828; -@define-color red #ff0000; -@define-color green #98971a; -@define-color yellow #d79921; -@define-color blue #458588; -@define-color purple #b16286; -@define-color aqua #689d6a; -@define-color gray #a89984; -@define-color brgray #928374; -@define-color brred #fb4934; -@define-color brgreen #b8bb26; -@define-color bryellow #fabd2f; -@define-color brblue #83a598; -@define-color brpurple #d3869b; -@define-color braqua #8ec07c; -@define-color white #ffffff; -@define-color bg2 #504945; - -@define-color warning @bryellow; -@define-color critical @red; -@define-color mode @black; -@define-color unfocused @bg2; -@define-color focused @braqua; -@define-color inactive @purple; - -@define-color sound #ff007f; -@define-color network #ff7f00; -@define-color memory #ffff00; -@define-color cpu #7fff00; -@define-color temp #00ff7f; -@define-color layout #00ffff; -/*@define-color battery @aqua;*/ -@define-color date #ffffff; -@define-color time #000000; - -/* Reset all styles */ -* { - border: none; - border-radius: 0; - min-height: 0; - margin: 0; - padding: 0; - box-shadow: none; - text-shadow: none; - -gtk-icon-shadow: none; -} - -/* The whole bar */ -#waybar { - background: #101010; - color: @white; - font-family: JetBrains Mono, Siji; - font-size: 10pt; -} - -/* Each module */ -#battery, -#clock, -#cpu, -#language, -#memory, -#mode, -#network, -#pulseaudio, -#temperature, -#tray, -#backlight, -#idle_inhibitor, -#disk, -#user, -#mpris { - padding-left: 8pt; - padding-right: 8pt; -} - -/* Each critical module */ - -#mode, -#memory.critical, -#cpu.critical, -#temperature.critical, -#battery.critical.discharging { - color: #ff0000; -} - -/* Each warning */ -/* #network.disconnected, */ -/* #memory.warning, */ -/* #cpu.warning, */ -/* #temperature.warning, */ -/* #battery.warning.discharging { */ -/* color: @warning; */ -/* } */ - -/* And now modules themselves in their respective order */ - -/* Current sway mode (resize etc) */ -#mode { - color: @white; - background: @mode; -} - -/* Workspaces stuff */ -#workspaces button { - /*font-weight: bold;*/ - padding-left: 2pt; - padding-right: 2pt; - color: @white; - background: #303030; -} - -/* Inactive (on unfocused output) */ -#workspaces button.visible { - color: @white; - background: #ff00ff; -} - -/* Active (on focused output) */ -#workspaces button.focused { - color: @black; - background: @focused; -} - -/* Contains an urgent window */ -#workspaces button.urgent { - color: @black; - background: @warning; -} - -/* Style when cursor is on the button */ -#workspaces button:hover { - background: @black; - color: @white; -} - -#window { - margin-right: 15pt; - margin-left: 15pt; -} - -#pulseaudio { - background: @sound; - color: @white; -} - -#network { - background: @network; - color: @black; -} - -#memory { - background: @memory; - color: @black; -} - -#cpu { - background: @cpu; - min-width: 35pt; - color: @black; -} - -#temperature { - background: @temp; - color: @black; -} - -#language { - background: @layout; - color: @black; -} - -/* -#battery { - background: @battery; - color: @white; -} -*/ - -#tray { - background: #ff7f00; -} - -#clock.date { - background: @date; - color: @black; -} - -#clock.time { - background: @time; - color: @white; -} - -#custom-arrow1 { - font-size: 11pt; - color: @time; - background: @date; -} - -#custom-arrow2 { - font-size: 11pt; - color: @date; - background: @layout; -} - -#custom-arrow3 { - font-size: 11pt; - color: @layout; - background: @battery; -} - -#custom-arrow4 { - font-size: 11pt; - color: @layout; - background: @temp; -} - -#custom-arrow5 { - font-size: 11pt; - color: @temp; - background: @cpu; -} - -#custom-arrow6 { - font-size: 11pt; - color: @cpu; - background: @memory; -} - -#custom-arrow7 { - font-size: 11pt; - color: @memory; - background: @network; -} - -#custom-arrow8 { - font-size: 11pt; - color: @network; - background: @sound; -} - -#custom-arrow9 { - font-size: 11pt; - color: @sound; - background: transparent; -} - -#custom-arrow10 { - font-size: 11pt; - color: @unfocused; - background: transparent; -} diff --git a/_windows/README.md b/_windows/README.md index db0c130..391b886 100644 --- a/_windows/README.md +++ b/_windows/README.md @@ -1,5 +1,2 @@ -# prepare -* build VirtualDesktopSwitcher and move to path or sth - # running * `./startup.ps1` on startup (via task scheduler is optimal) diff --git a/_windows/ahk/capslock.ahk b/_windows/ahk/capslock.ahk deleted file mode 100644 index 0f03daf..0000000 --- a/_windows/ahk/capslock.ahk +++ /dev/null @@ -1,70 +0,0 @@ -#Requires AutoHotkey v2 -#SingleInstance Force - -CapsLock::Esc - -SetKeyDelay 1 - -global CurrentDesktop := 1 - -ShowCurrentWindows() { - titles := [] - text := "" - - hwnds := WinGetList() - for hwnd in hwnds { - ; skip tool windows - style := DllCall("GetWindowLongPtr", "Ptr", hwnd, "Int", -20, "Ptr") - WS_EX_TOOLWINDOW := 0x80 - if style & WS_EX_TOOLWINDOW - continue - - title := WinGetTitle("ahk_id " hwnd) - if title = "" - continue - - titles.Push(title) - text .= title - text .= "`n" - } - ToolTip text, 0, 0 - SetTimer ToolTip, -1000 -} - -SwitchDesktop(num) { - global CurrentDesktop - While CurrentDesktop > num { - SendEvent "{Ctrl down}{LWin down}{Left}{LWin up}{Ctrl up}" - CurrentDesktop-- - } - While CurrentDesktop < num { - SendEvent "{Ctrl down}{LWin down}{Right}{LWin up}{Ctrl up}" - CurrentDesktop++ - } - ShowCurrentWindows() -} - -!1::SwitchDesktop(1) -!2::SwitchDesktop(2) -!3::SwitchDesktop(3) -!4::SwitchDesktop(4) -!5::SwitchDesktop(5) -!6::SwitchDesktop(6) -!7::SwitchDesktop(7) -!8::SwitchDesktop(8) -!9::SwitchDesktop(9) -!0::SwitchDesktop(10) - -~^#Left::{ - global CurrentDesktop - if (CurrentDesktop > 1) - CurrentDesktop-- -} - -~^#Right::{ - global CurrentDesktop - if (CurrentDesktop < 10) - CurrentDesktop++ -} - -RCtrl & Backspace::Reload diff --git a/_windows/ahk/run.ps1 b/_windows/ahk/run.ps1 index c802d23..cb48bdd 100644 --- a/_windows/ahk/run.ps1 +++ b/_windows/ahk/run.ps1 @@ -1,4 +1,3 @@ Push-Location $PSScriptRoot -.\capslock.ahk .\media.ahk Pop-Location diff --git a/_windows/startup.ps1 b/_windows/startup.ps1 index 3c64315..7c8d4f4 100644 --- a/_windows/startup.ps1 +++ b/_windows/startup.ps1 @@ -1,4 +1,3 @@ Push-Location $PSScriptRoot .\ahk\run.ps1 -#kanata --cfg ../kanata/kanata.kbd Pop-Location diff --git a/alacritty/alacritty.toml b/alacritty/alacritty.toml deleted file mode 100644 index 33fb2b5..0000000 --- a/alacritty/alacritty.toml +++ /dev/null @@ -1,27 +0,0 @@ -[colors.primary] -background = '#000000' -foreground = '#ffffff' - -[colors.cursor] -text = '#000000' -cursor = '#ffffff' - -[colors.normal] -black = '#0e1415' -red = '#e25d56' -green = '#73ca50' -yellow = '#e9bf57' -blue = '#4a88e4' -magenta = '#ff00ff' -cyan = '#00ffff' -white = '#f0f0f0' - -[colors.bright] -black = '#777777' -red = '#f36868' -green = '#88db3f' -yellow = '#f0bf7a' -blue = '#6f8fdb' -magenta = '#ff22ff' -cyan = '#00ffff' -white = '#FFFFFF' diff --git a/git-stack b/git-stack deleted file mode 100644 index c5828f6..0000000 --- a/git-stack +++ /dev/null @@ -1,166 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail - -app_name="git-stack" - -die() { - echo "$app_name: $*" >&2 - exit 1 -} - -in_repo() { - git rev-parse --git-dir >/dev/null 2>&1 -} - -require_repo() { - in_repo || die "not inside a Git repository" -} - -git_path() { - git rev-parse --git-path "$1" -} - -stack_file() { - local p - p="$(git_path "$app_name/messages")" - mkdir -p "$(dirname "$p")" - touch "$p" - printf '%s\n' "$p" -} - -install_hook() { - local hooks_dir hook tmp - hooks_dir="$(git_path hooks)" - hook="$hooks_dir/pre-commit" - mkdir -p "$hooks_dir" - - if [ -f "$hook" ] && ! grep -Fq "# managed-by: $app_name" "$hook"; then - return 0 - fi - - tmp="$(mktemp)" - cat >"$tmp" <<'EOF' -#!/usr/bin/env bash -# managed-by: git-stack -set -euo pipefail - -stack_file="$(git rev-parse --git-path git-stack/messages)" -if [ -f "$stack_file" ] && [ -s "$stack_file" ]; then - echo "git-stack: commit blocked; message stack is not empty" >&2 - echo "git-stack: pending messages:" >&2 - nl -ba "$stack_file" >&2 - echo "git-stack: clear with: git stack pop / git stack clear" >&2 - exit 1 -fi -EOF - - chmod +x "$tmp" - mv "$tmp" "$hook" -} - -ensure_ready() { - require_repo - install_hook -} - -cmd_push() { - ensure_ready - [ "$#" -ge 1 ] || die 'usage: git stack push "message"' - local file msg - file="$(stack_file)" - msg="$*" - printf '%s\n' "$msg" >>"$file" - echo "$msg" -} - -cmd_peek() { - ensure_ready - local file - file="$(stack_file)" - [ -s "$file" ] || die "stack is empty" - tail -n 1 "$file" -} - -cmd_list() { - ensure_ready - local file - file="$(stack_file)" - [ -s "$file" ] || exit 0 - nl -ba "$file" -} - -cmd_pop() { - ensure_ready - local file last tmp - file="$(stack_file)" - [ -s "$file" ] || die "stack is empty" - - last="$(tail -n 1 "$file")" - echo "$last" - - tmp="$(mktemp)" - sed '$d' "$file" >"$tmp" || true - mv "$tmp" "$file" -} - -cmd_clear() { - ensure_ready - : >"$(stack_file)" -} - -cmd_install() { - ensure_ready - echo "hook installed in $(git_path hooks)/pre-commit" -} - -usage() { - cat <<'EOF' -Usage: - git stack push "message" - git stack peek - git stack list - git stack pop - git stack clear - git stack install -EOF -} - -main() { - [ "$#" -ge 1 ] || { - usage - exit 1 - } - - case "$1" in - push) - shift - cmd_push "$@" - ;; - peek) - shift - cmd_peek "$@" - ;; - list) - shift - cmd_list "$@" - ;; - pop) - shift - cmd_pop "$@" - ;; - clear) - shift - cmd_clear "$@" - ;; - install) - shift - cmd_install "$@" - ;; - *) - usage - exit 1 - ;; - esac -} - -main "$@" diff --git a/kanata/kanata.kbd b/kanata/kanata.kbd deleted file mode 100644 index d9d2794..0000000 --- a/kanata/kanata.kbd +++ /dev/null @@ -1,20 +0,0 @@ -(defcfg - process-unmapped-keys yes - concurrent-tap-hold yes -) - -(defsrc - grv 1 2 3 4 5 6 7 8 9 0 - = bspc - tab q w e r t y u i o p [ ] \ - caps a s d f g h j k l ; ' ret - lsft z x c v b n m , . / rsft - lctl lmet lalt spc ralt rmet rctl -) - -(deflayer default - _ _ _ _ _ _ _ _ _ _ _ _ _ _ - _ _ _ _ _ _ _ _ _ _ _ _ _ _ - esc _ _ _ _ _ _ _ _ _ _ _ _ - _ _ _ _ _ _ _ _ _ _ _ _ - _ _ _ _ _ _ _ -) diff --git a/nvim/ftplugin/php.lua b/nvim/ftplugin/php.lua deleted file mode 100644 index 8d7c165..0000000 --- a/nvim/ftplugin/php.lua +++ /dev/null @@ -1,11 +0,0 @@ -local copy_indent_macro = "<Esc>^\"_d0" -- clear current indentation - .. "?.<CR>" -- find first non-empty line above - .. "<cmd>noh<CR>" -- clear highlight - .. "^\"yy0" -- copy indentation to y register - .. "<C-o>0" -- return to original line - .. "\"yP" -- paste y register - .. "a" -- enter insert mode - -vim.keymap.set({ "n" }, "o", "o" .. copy_indent_macro, { buffer = 0 }) -vim.keymap.set({ "n" }, "O", "O" .. copy_indent_macro, { buffer = 0 }) -vim.keymap.set({ "i" }, "<CR>", "<CR>" .. copy_indent_macro, { buffer = 0 }) diff --git a/setup.sh b/setup.sh deleted file mode 100755 index e516716..0000000 --- a/setup.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -set -e - -CFG="${XDG_CONFIG_HOME:-$HOME/.config}" -echo $CFG - -link_helper () { - echo "$CFG/$1" - ln -s "$(realpath ./$1)" "$CFG" || true -} - -linux_link_helper () { - echo "$CFG/$1" - ln -s "$(realpath ./_linux/$1)" "$CFG" || true -} - -link_helper "espanso" -link_helper "nvim" -link_helper "kanata" -link_helper "mpv" - -linux_link_helper "tmux" -linux_link_helper "i3" -linux_link_helper "i3status" -linux_link_helper "sxhkd" diff --git a/zed/keymap.json b/zed/keymap.json deleted file mode 100644 index b06f33b..0000000 --- a/zed/keymap.json +++ /dev/null @@ -1,60 +0,0 @@ -// Zed keymap -// -// For information on binding keys, see the Zed -// documentation: https://zed.dev/docs/key-bindings -// -// To see the default key bindings run `zed: open default keymap` -// from the command palette. -[ - { - // idk why this needs to be editor - "context": "vim_mode == normal && Editor", - "bindings": { - "space space": "file_finder::Toggle" - } - }, - { - "context": "Editor", - "bindings": { - // "j k": ["workspace::SendKeystrokes", "escape"] - } - }, - { - "context": "vim_mode == normal && !menu", - "bindings": { - "shift-y": ["workspace::SendKeystrokes", "y $"], // Use neovim's yank behavior: yank to end of line. - "space l f": "editor::Format", - "space f x": "workspace::CloseAllDocks" - } - }, - { - "context": "vim_mode == visual", - "bindings": { - "shift-s": ["vim::PushAddSurrounds", {}] - } - }, - { - "context": "vim_mode == insert", - "bindings": { - "ctrl-y": "editor::ConfirmCompletion" - } - }, - { - "context": "Dock", - "bindings": { - "ctrl-w h": "workspace::ActivatePaneLeft", - "ctrl-w l": "workspace::ActivatePaneRight", - "ctrl-w k": "workspace::ActivatePaneUp", - "ctrl-w j": "workspace::ActivatePaneDown" - // ... or other keybindings - } - }, - - { - // like the command picker and stuff - "context": "Editor && mode == single_line", - "bindings": { - "ctrl-w": "editor::DeleteToPreviousWordStart" - } - } -] diff --git a/zed/settings.json b/zed/settings.json deleted file mode 100644 index a8e97c3..0000000 --- a/zed/settings.json +++ /dev/null @@ -1,34 +0,0 @@ -// Zed settings -// -// For information on how to configure Zed, see the Zed -// documentation: https://zed.dev/docs/configuring-zed -// -// To see all of Zed's default settings without changing your -// custom settings, run `zed: open default settings` from the -// command palette (cmd-shift-p / ctrl-shift-p) -{ - "assistant": { - "default_model": { - "provider": "lmstudio", - "model": "qwen2.5-coder-3b-instruct" - }, - "version": "2" - }, - "base_keymap": "JetBrains", - "telemetry": { - "metrics": false - }, - "vim_mode": true, - "ui_font_size": 15, - "buffer_font_size": 15, - "buffer_font_features": { - // Disable ligatures: - "calt": false - }, - "theme": { - "mode": "system", - "light": "Ayu Dark", - "dark": "One Dark" - }, - "relative_line_numbers": true -} |
