Compare changes

Choose any two refs to compare.

Changed files
+163 -26
config
fish
conf.d
ghostty
git
jj
niri
zellij
+1 -1
config/fish/conf.d/aliases.fish
··· 16 16 17 17 alias g git 18 18 if type -q hledger; alias f hledger; end 19 - if type -q jj; alias j jj; end 19 + if type -q jj; abbr --add j jj; end 20 20 21 21 if type -q nvim 22 22 alias vim nvim
+10
config/ghostty/config
··· 1 + theme = TokyoNight Night 2 + window-theme = ghostty 3 + font-family = Jetbrains Mono 4 + font-size = 13 5 + command = fish 6 + mouse-hide-while-typing = true 7 + 8 + keybind = ctrl+,=unbind 9 + keybind = ctrl+shift+.=move_tab:1 10 + keybind = ctrl+shift+,=move_tab:-1
+1 -1
config/git/config
··· 3 3 [user] 4 4 name = Oleksandr Smirnov 5 5 email = olexsmir@gmail.com 6 - signingkey = ~/.ssh/id_ed25519.pub 6 + signingkey = ~/.ssh/git-sign.pub 7 7 8 8 [gpg] 9 9 program = gpg2
+1
config/git/ignore
··· 3 3 /.docker/ 4 4 .env 5 5 AGENTS.md 6 + tags
+9 -2
config/jj/config.toml
··· 13 13 14 14 [signing] 15 15 backend = "ssh" 16 - key = "~/.ssh/id_ed25519.pub" 16 + key = "~/.ssh/git-sign.pub" 17 17 18 18 [git] 19 19 sign-on-push = true 20 - auto-local-bookmark = true 20 + private-commits = "description(glob:'wip:*') | description(glob:'private:*')" 21 + 22 + [remotes] 23 + origin.auto-track-bookmarks = "glob:*" 24 + olexsmir.auto-track-bookmarks = "glob:*" 25 + upstream.auto-track-bookmarks = "main | master" 21 26 22 27 [aliases] 23 28 l = ["log", "-r", "ancestors(reachable(@, mutable()), 2)"] 29 + llog = ["log", "-r", ".."] 24 30 tug = ["bookmark", "move", "--from", "heads(::@- & bookmarks())", "--to", "@-"] 25 31 26 32 [templates] 33 + git_push_bookmark = '"olexsmir/" ++ change_id.short()' 27 34 draft_commit_description = ''' 28 35 concat( 29 36 coalesce(description, default_commit_description, "\n"),
+12 -22
config/niri/config.kdl
··· 25 25 tap 26 26 dwt 27 27 // dwtp 28 - drag-lock 29 - accel-speed 0.1 30 - scroll-factor 0.5 28 + // drag-lock 29 + accel-speed 0.2 30 + scroll-factor 1.5 31 31 accel-profile "adaptive" 32 32 click-method "clickfinger" 33 33 scroll-method "two-finger" 34 - disabled-on-external-mouse 35 34 } 36 35 focus-follows-mouse max-scroll-amount="25%" 37 36 mouse { ··· 83 82 // disables client-side decorrations if possible 84 83 prefer-no-csd 85 84 hotkey-overlay { skip-at-startup; } 85 + animations { off; } 86 86 87 87 // set to null if u want disable saving to disk behavior 88 88 screenshot-path "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png" 89 - 90 - // https://github.com/YaLTeR/niri/wiki/Configuration:-Animations 91 - animations { 92 - off 93 - slowdown 1.0 94 - } 95 89 // }}} 96 90 // window/workspace rules {{{ 97 91 // https://github.com/YaLTeR/niri/wiki/Configuration:-Window-Rules 98 92 // https://github.com/YaLTeR/niri/wiki/Configuration:-move-column-to-workspace 99 93 100 94 workspace "tools" { open-on-output "HDMI-A-1"; } 101 - workspace "web"{ open-on-output "HDMI-A-1"; } 102 - workspace "dev"{ open-on-output "HDMI-A-1"; } 95 + workspace "web" { open-on-output "HDMI-A-1"; } 96 + workspace "dev" { open-on-output "HDMI-A-1"; } 103 97 workspace "laptop" { open-on-output "eDP-1"; } 104 98 105 99 window-rule { ··· 114 108 match app-id="zen" 115 109 match app-id="firefox" 116 110 match app-id="Brave-browser" 111 + match app-id="brave-browser" 117 112 open-on-workspace "web" 118 - } 119 - 120 - window-rule { 121 - match app-id="Emacs" 122 - match app-id="Code" 123 - match app-id="Zed" 124 - open-on-workspace "dev" 113 + open-focused true 125 114 } 126 115 127 116 window-rule { ··· 147 136 match app-id="firefox" 148 137 match app-id="Brave-browser" 149 138 match app-id="kitty" 139 + match app-id="ghostty" 150 140 match app-id="obsidian" 151 141 match app-id="Code" 152 142 match app-id="Zed" ··· 172 162 Mod+d { spawn "dunstctl" "close"; } 173 163 Mod+q { close-window; } 174 164 Mod+Alt+l { spawn "hyprlock"; } 175 - Mod+Return { spawn "kitty"; } 165 + Mod+Return { spawn "ghostty"; } 176 166 Mod+Shift+Escape { spawn "~/bin/wofi-power-menu" "niri";} 177 167 Mod+Shift+Return { spawn "wofi" "--show" "drun"; } 178 168 ··· 243 233 Mod+Shift+4 { move-column-to-workspace 4; } 244 234 Mod+Shift+5 { move-column-to-workspace 5; } 245 235 246 - Mod+WheelScrollDown cooldown-ms=150 { focus-workspace-down; } 247 - Mod+WheelScrollUp cooldown-ms=150 { focus-workspace-up; } 236 + Mod+WheelScrollDown cooldown-ms=50 { focus-workspace-down; } 237 + Mod+WheelScrollUp cooldown-ms=50 { focus-workspace-up; } 248 238 // }}} 249 239 } 250 240 // }}}
+123
config/zellij/config.kdl
··· 1 + show_release_notes false 2 + show_startup_tips false 3 + simplified_ui true 4 + auto_layout false 5 + pane_frames false 6 + mouse_mode true 7 + show_tips false 8 + 9 + theme "tokyonight" 10 + default_shell "fish" 11 + default_layout "defaulty" 12 + scrollback_editor "nvim" 13 + scroll_buffer_size 10000 14 + 15 + ui { 16 + tab_bar { location "top"; } 17 + } 18 + 19 + keybinds clear-defaults=true { 20 + normal { 21 + bind "Ctrl t" { SwitchToMode "tmux"; } 22 + 23 + bind "Alt 1" { GoToTab 1; SwitchToMode "normal"; } 24 + bind "Alt 2" { GoToTab 2; SwitchToMode "normal"; } 25 + bind "Alt 3" { GoToTab 3; SwitchToMode "normal"; } 26 + bind "Alt 4" { GoToTab 4; SwitchToMode "normal"; } 27 + bind "Alt 5" { GoToTab 5; SwitchToMode "normal"; } 28 + bind "Alt 6" { GoToTab 6; SwitchToMode "normal"; } 29 + bind "Alt 7" { GoToTab 7; SwitchToMode "normal"; } 30 + bind "Alt 8" { GoToTab 8; SwitchToMode "normal"; } 31 + bind "Alt 8" { GoToTab 8; SwitchToMode "normal"; } 32 + bind "Alt 9" { GoToTab 9; SwitchToMode "normal"; } 33 + } 34 + 35 + tmux { 36 + bind "Ctrl t" { Write 20; SwitchToMode "normal"; } 37 + bind "Space" { NextSwapLayout; } 38 + 39 + bind "d" { Detach; } 40 + bind "tab" { GoToPreviousTab; SwitchToMode "normal"; } 41 + bind "t" { NewTab; SwitchToMode "normal"; } 42 + bind "r" { SwitchToMode "renametab"; TabNameInput 0; } 43 + bind "," { MoveTab "left"; SwitchToMode "normal"; } 44 + bind "." { MoveTab "right"; SwitchToMode "normal"; } 45 + 46 + bind "esc" { SwitchToMode "normal"; } 47 + bind "/" { SwitchToMode "entersearch"; } 48 + bind "s" { SwitchToMode "scroll"; } 49 + 50 + bind "h" { MoveFocus "Left"; SwitchToMode "normal"; } 51 + bind "j" { MoveFocus "Down"; SwitchToMode "normal"; } 52 + bind "k" { MoveFocus "Up"; SwitchToMode "normal"; } 53 + bind "l" { MoveFocus "Right"; SwitchToMode "normal"; } 54 + bind "n" { NewPane; SwitchToMode "normal"; } 55 + bind "N" { NewPane "down"; SwitchToMode "normal"; } 56 + 57 + bind "f" { ToggleFocusFullscreen; SwitchToMode "normal"; } 58 + bind "w" { CloseFocus; SwitchToMode "normal"; } 59 + bind "+" "=" { Resize "Increase"; SwitchToMode "normal"; } 60 + bind "-" { Resize "Decrease"; SwitchToMode "normal"; } 61 + 62 + bind "o" { 63 + LaunchOrFocusPlugin "session-manager" { 64 + floating true 65 + move_to_focused_tab true 66 + } 67 + SwitchToMode "normal"; 68 + } 69 + } 70 + 71 + renametab { 72 + bind "esc" { UndoRenameTab; SwitchToMode "normal"; } 73 + bind "enter" { SwitchToMode "normal"; } 74 + } 75 + 76 + entersearch { 77 + bind "esc" { SwitchToMode "normal"; } 78 + bind "enter" { SwitchToMode "search"; } 79 + } 80 + 81 + search { 82 + bind "esc" "q" { SwitchToMode "normal"; } 83 + bind "/" { SwitchToMode "entersearch"; } 84 + bind "c" { SearchToggleOption "CaseSensitivity"; } 85 + bind "n" { Search "down"; } 86 + bind "N" { Search "up"; } 87 + bind "p" { Search "up"; } 88 + } 89 + 90 + scroll { 91 + bind "esc" { SwitchToMode "normal"; } 92 + bind "/" { SwitchToMode "entersearch"; SearchInput 0; } 93 + bind "e" { EditScrollback; SwitchToMode "normal"; } 94 + bind "j" { ScrollDown; } 95 + bind "k" { ScrollUp; } 96 + bind "Ctrl d" { HalfPageScrollDown; } 97 + bind "Ctrl u" { HalfPageScrollUp; } 98 + bind "g" { ScrollToTop; } 99 + bind "G" { ScrollToBottom; } 100 + } 101 + } 102 + 103 + plugins { 104 + compact-bar location="zellij:compact-bar" 105 + configuration location="zellij:configuration" 106 + session-manager location="zellij:session-manager" 107 + } 108 + 109 + themes { 110 + tokyonight { 111 + fg "#c0caf5" 112 + bg "#292e42" 113 + black "#1a1b26" 114 + red "#f7768e" 115 + yellow "#e0af68" 116 + blue "#7aa2f7" 117 + magenta "#bb9af7" 118 + cyan "#7dcfff" 119 + green "#7aa2f7" // #9ece6a 120 + white "#a9b1d6" 121 + orange "#ff9e64" 122 + } 123 + }
+6
config/zellij/layouts/defaulty.kdl
··· 1 + layout { 2 + pane size=1 borderless=true { 3 + plugin location="compact-bar" 4 + } 5 + pane 6 + }