diff --git a/home/tuckershea/graphical/aerospace/aerospace.toml b/home/tuckershea/graphical/aerospace/aerospace.toml index 29ae913..d76fccd 100644 --- a/home/tuckershea/graphical/aerospace/aerospace.toml +++ b/home/tuckershea/graphical/aerospace/aerospace.toml @@ -12,7 +12,7 @@ after-login-command = [] after-startup-command = [] # Start AeroSpace at login -start-at-login = false +start-at-login = true # Normalizations. See: https://nikitabobko.github.io/AeroSpace/guide#normalization enable-normalization-flatten-containers = true @@ -88,111 +88,49 @@ outer.right = 0 # ''' # See: https://nikitabobko.github.io/AeroSpace/commands#layout -alt-slash = 'layout tiles horizontal vertical' -alt-comma = 'layout accordion horizontal vertical' +alt-ctrl-cmd-minus = 'layout vertical tiles accordion' +alt-ctrl-cmd-shift-minus = 'layout horizontal tiles accordion' # See: https://nikitabobko.github.io/AeroSpace/commands#focus -alt-h = 'focus left' -alt-j = 'focus down' -alt-k = 'focus up' -alt-l = 'focus right' +alt-ctrl-cmd-h = 'focus left' +alt-ctrl-cmd-j = 'focus down' +alt-ctrl-cmd-k = 'focus up' +alt-ctrl-cmd-l = 'focus right' # See: https://nikitabobko.github.io/AeroSpace/commands#move -alt-shift-h = 'move left' -alt-shift-j = 'move down' -alt-shift-k = 'move up' -alt-shift-l = 'move right' +alt-ctrl-cmd-shift-h = 'move left' +alt-ctrl-cmd-shift-j = 'move down' +alt-ctrl-cmd-shift-k = 'move up' +alt-ctrl-cmd-shift-l = 'move right' # See: https://nikitabobko.github.io/AeroSpace/commands#resize -alt-shift-minus = 'resize smart -50' -alt-shift-equal = 'resize smart +50' +alt-ctrl-cmd-equal = 'resize smart -50' +alt-ctrl-cmd-shift-equal = 'resize smart +50' # See: https://nikitabobko.github.io/AeroSpace/commands#workspace -alt-1 = 'workspace 1' -alt-2 = 'workspace 2' -alt-3 = 'workspace 3' -alt-4 = 'workspace 4' -alt-5 = 'workspace 5' -alt-6 = 'workspace 6' -alt-7 = 'workspace 7' -alt-8 = 'workspace 8' -alt-9 = 'workspace 9' -alt-a = 'workspace A' # In your config, you can drop workspace bindings that you don't need -alt-b = 'workspace B' -alt-c = 'workspace C' -alt-d = 'workspace D' -alt-e = 'workspace E' -alt-f = 'workspace F' -alt-g = 'workspace G' -alt-i = 'workspace I' -alt-m = 'workspace M' -alt-n = 'workspace N' -alt-o = 'workspace O' -alt-p = 'workspace P' -alt-q = 'workspace Q' -alt-r = 'workspace R' -alt-s = 'workspace S' -alt-t = 'workspace T' -alt-u = 'workspace U' -alt-v = 'workspace V' -alt-w = 'workspace W' -alt-x = 'workspace X' -alt-y = 'workspace Y' -alt-z = 'workspace Z' +alt-ctrl-cmd-1 = 'workspace 1' +alt-ctrl-cmd-2 = 'workspace 2' +alt-ctrl-cmd-3 = 'workspace 3' +alt-ctrl-cmd-4 = 'workspace 4' +alt-ctrl-cmd-5 = 'workspace 5' +alt-ctrl-cmd-6 = 'workspace 6' +alt-ctrl-cmd-7 = 'workspace 7' +alt-ctrl-cmd-8 = 'workspace 8' +alt-ctrl-cmd-9 = 'workspace 9' # See: https://nikitabobko.github.io/AeroSpace/commands#move-node-to-workspace -alt-shift-1 = 'move-node-to-workspace 1' -alt-shift-2 = 'move-node-to-workspace 2' -alt-shift-3 = 'move-node-to-workspace 3' -alt-shift-4 = 'move-node-to-workspace 4' -alt-shift-5 = 'move-node-to-workspace 5' -alt-shift-6 = 'move-node-to-workspace 6' -alt-shift-7 = 'move-node-to-workspace 7' -alt-shift-8 = 'move-node-to-workspace 8' -alt-shift-9 = 'move-node-to-workspace 9' -alt-shift-a = 'move-node-to-workspace A' -alt-shift-b = 'move-node-to-workspace B' -alt-shift-c = 'move-node-to-workspace C' -alt-shift-d = 'move-node-to-workspace D' -alt-shift-e = 'move-node-to-workspace E' -alt-shift-f = 'move-node-to-workspace F' -alt-shift-g = 'move-node-to-workspace G' -alt-shift-i = 'move-node-to-workspace I' -alt-shift-m = 'move-node-to-workspace M' -alt-shift-n = 'move-node-to-workspace N' -alt-shift-o = 'move-node-to-workspace O' -alt-shift-p = 'move-node-to-workspace P' -alt-shift-q = 'move-node-to-workspace Q' -alt-shift-r = 'move-node-to-workspace R' -alt-shift-s = 'move-node-to-workspace S' -alt-shift-t = 'move-node-to-workspace T' -alt-shift-u = 'move-node-to-workspace U' -alt-shift-v = 'move-node-to-workspace V' -alt-shift-w = 'move-node-to-workspace W' -alt-shift-x = 'move-node-to-workspace X' -alt-shift-y = 'move-node-to-workspace Y' -alt-shift-z = 'move-node-to-workspace Z' +alt-ctrl-cmd-shift-1 = 'move-node-to-workspace 1' +alt-ctrl-cmd-shift-2 = 'move-node-to-workspace 2' +alt-ctrl-cmd-shift-3 = 'move-node-to-workspace 3' +alt-ctrl-cmd-shift-4 = 'move-node-to-workspace 4' +alt-ctrl-cmd-shift-5 = 'move-node-to-workspace 5' +alt-ctrl-cmd-shift-6 = 'move-node-to-workspace 6' +alt-ctrl-cmd-shift-7 = 'move-node-to-workspace 7' +alt-ctrl-cmd-shift-8 = 'move-node-to-workspace 8' +alt-ctrl-cmd-shift-9 = 'move-node-to-workspace 9' # See: https://nikitabobko.github.io/AeroSpace/commands#workspace-back-and-forth -alt-tab = 'workspace-back-and-forth' +alt-cmd-ctrl-tab = 'workspace-back-and-forth' # See: https://nikitabobko.github.io/AeroSpace/commands#move-workspace-to-monitor -alt-shift-tab = 'move-workspace-to-monitor --wrap-around next' +alt-cmd-ctrl-shift-tab = 'move-workspace-to-monitor --wrap-around next' -# See: https://nikitabobko.github.io/AeroSpace/commands#mode -alt-shift-semicolon = 'mode service' - -# 'service' binding mode declaration. -# See: https://nikitabobko.github.io/AeroSpace/guide#binding-modes -[mode.service.binding] -esc = ['reload-config', 'mode main'] -r = ['flatten-workspace-tree', 'mode main'] # reset layout -f = ['layout floating tiling', 'mode main'] # Toggle between floating and tiling layout -backspace = ['close-all-windows-but-current', 'mode main'] - -# sticky is not yet supported https://github.com/nikitabobko/AeroSpace/issues/2 -#s = ['layout sticky tiling', 'mode main'] - -alt-shift-h = ['join-with left', 'mode main'] -alt-shift-j = ['join-with down', 'mode main'] -alt-shift-k = ['join-with up', 'mode main'] -alt-shift-l = ['join-with right', 'mode main'] diff --git a/home/tuckershea/graphical/alacritty.nix b/home/tuckershea/graphical/alacritty.nix index 7e151a2..4f04e66 100644 --- a/home/tuckershea/graphical/alacritty.nix +++ b/home/tuckershea/graphical/alacritty.nix @@ -10,7 +10,8 @@ # https://gist.github.com/andersevenrud/015e61af2fd264371032763d4ed965b6 env.TERM = "xterm-256color"; - window.startup_mode = "Fullscreen"; + window.startup_mode = "Windowed"; + window.decorations = "None"; font.normal.family = "JetBrainsMono Nerd Font Mono"; keyboard.bindings = [ diff --git a/hosts/common/darwin/kanata/kanata.kbd b/hosts/common/darwin/kanata/kanata.kbd index abe1c2d..52ad6b4 100644 --- a/hosts/common/darwin/kanata/kanata.kbd +++ b/hosts/common/darwin/kanata/kanata.kbd @@ -47,10 +47,10 @@ (deflayer super esc brdn brup f13 f14 f15 f16 prev pp next mute vold volu - lsgt @su1 @su2 @su3 @su4 @su5 @su6 @su7 @su8 @su9 @su0 - = bspc - tab @suq @suw @sue @sur @sut @suy @suu @sui @suo @sup [ ] \ - _ @sua @sus @sud @suf @sug @suh @suj @suk @sul ; ' ret - @suls grv @suz @sux @suc @suv @sub @sun @sum , . / _ + lsgt @su1 @su2 @su3 @su4 @su5 @su6 @su7 @su8 @su9 @su0 @su- @su= bspc + @sutb @suq @suw @sue @sur @sut @suy @suu @sui @suo @sup [ ] \ + _ @sua @sus @sud @suf @sug @suh @suj @suk @sul ; ' ret + @suls grv @suz @sux @suc @suv @sub @sun @sum , . / _ _ _ _ _ @susp _ _ ) @@ -93,6 +93,10 @@ su9 (chord super 9) su0 (chord super 0) + sutb (chord super tab) + su- (chord super -) + su= (chord super =) + suls (chord super lsft) susp (chord super spc) ) @@ -107,11 +111,15 @@ (f) (multi @supr f) ;; homerow find (lsft f) (multi @dupr f) ;; homerow search (g) nop0 - (h) (multi @dupr 1) ;; switch to space 1 + (h) (multi @supr h) ;; aerospace + (lsft h) (multi @dupr h) ;; aerospace (i) nop0 - (j) (multi @dupr lft) ;; switch space left - (k) (multi @dupr rght) ;; switch space right - (l) nop0 + (j) (multi @supr j) ;; aerospace + (lsft j) (multi @dupr j) ;; aerospace + (k) (multi @supr k) ;; aerospace + (lsft k) (multi @dupr k) ;; aerospace + (l) (multi @supr l) ;; aerospace + (lsft l) (multi @dupr l) ;; aerospace (m) nop0 (n) nop0 (o) nop0 @@ -127,19 +135,33 @@ (y) nop0 (z) nop0 - (1) nop0 - (2) nop0 - (3) (multi lmet lctl 3) ;; screenshot bindings - (lsft 3) (multi lsft lmet lctl 3) - (4) (multi lmet lctl 4) - (lsft 4) (multi lsft lmet lctl 4) - (5) (multi lmet lctl 5) - (6) nop0 - (7) nop0 - (8) nop0 - (9) nop0 + (1) (multi @supr 1) ;; aerospace + (lsft 1) (multi @dupr 1) ;; aerospace + (2) (multi @supr 2) ;; aerospace + (lsft 2) (multi @dupr 2) ;; aerospace + (3) (multi @supr 3) ;; aerospace + (lsft 3) (multi @dupr 3) ;; aerospace + (4) (multi @supr 4) ;; aerospace + (lsft 4) (multi @dupr 4) ;; aerospace + (5) (multi @supr 5) ;; aerospace + (lsft 5) (multi @dupr 5) ;; aerospace + (6) (multi @supr 6) ;; aerospace + (lsft 6) (multi @dupr 6) ;; aerospace + (7) (multi @supr 7) ;; aerospace + (lsft 7) (multi @dupr 7) ;; aerospace + (8) (multi @supr 8) ;; aerospace + (lsft 8) (multi @dupr 8) ;; aerospace + (9) (multi @supr 9) ;; aerospace + (lsft 9) (multi @dupr 9) ;; aerospace (0) nop0 + (tab) (multi @supr tab ) ;; aerospace + (lsft tab) (multi @dupr tab) ;; aerospace + (-) (multi @supr -) ;; aerospace + (lsft -) (multi @dupr -) ;; aerospace + (=) (multi @supr =) ;; aerospace + (lsft =) (multi @dupr =) ;; aerospace + (spc) (multi lmet spc) (b a r) (multi lctl f2) ;; focus menu bar