diff --git a/platforms/mac/fastfetch.jsonc b/platforms/mac/fastfetch.jsonc new file mode 100644 index 0000000..45adeaa --- /dev/null +++ b/platforms/mac/fastfetch.jsonc @@ -0,0 +1,54 @@ +// %UserProfile%\.config\fastfetch\config.jsonc +{ + "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json", + "logo": { + "type": "auto", + // "source": "Windows 7", + "padding": { + "top": 2, + "left": 1, + "right": 2 + } + }, + "general": { + "multithreading": true + }, + "display": { + "separator": " ", + "key": { + "width": 10, + "paddingLeft": 2, + "type": "icon" + } + }, + "modules": [ + { + "type": "title", + "format": "{#1}───────────── {#}{user-name-colored}@{host-name-colored}" + }, + { + "type": "colors", + "symbol": "diamond", + "paddingLeft": 15 + }, + "os", + "host", + "kernel", + "uptime", + { + "type": "packages" + }, + "shell", + "display", + "cursor", + "terminal", + "terminalfont", + "cpu", + "memory", + "swap", + "disk", + "battery", + "poweradapter", + "locale" + ] +} \ No newline at end of file diff --git a/platforms/mac/karabiner/karabiner.json b/platforms/mac/karabiner/karabiner.json index cccd225..034bc93 100644 --- a/platforms/mac/karabiner/karabiner.json +++ b/platforms/mac/karabiner/karabiner.json @@ -894,9 +894,32 @@ ] }, { - "description": "Caps Lock to Esc and Ctrl", + "description": "Caps Lock: Ctrl in when coding, Cmd elsewhere, Esc when alone", "manipulators": [ { + "conditions": [ + { + "bundle_identifiers": [ + "^com\\.apple\\.Terminal$", + "^org\\.alacritty$", + "^com\\.googlecode\\.iterm2$", + "^com\\.github\\.wez\\.wezterm$", + "^net\\.kovidgoyal\\.kitty$", + "^com\\.mitchellh\\.ghostty$", + "^com\\.neovide\\.neovide$", + "^org\\.gnu\\.Emacs$", + "^com\\.microsoft\\.VSCode$", + "^com\\.jetbrains\\.rider$", + "^com\\.jetbrains\\.pycharm$", + "^com\\.jetbrains\\.intellij$", + "^com\\.jetbrains\\.goland$", + "^com\\.jetbrains\\.clion$", + "^com\\.jetbrains\\.rustrover$", + "^dev\\.zed\\.Zed$" + ], + "type": "frontmost_application_if" + } + ], "from": { "key_code": "caps_lock", "modifiers": { "optional": ["any"] } @@ -904,6 +927,38 @@ "to": [{ "key_code": "left_control" }], "to_if_alone": [{ "key_code": "escape" }], "type": "basic" + }, + { + "conditions": [ + { + "bundle_identifiers": [ + "^com\\.apple\\.Terminal$", + "^org\\.alacritty$", + "^com\\.googlecode\\.iterm2$", + "^com\\.github\\.wez\\.wezterm$", + "^net\\.kovidgoyal\\.kitty$", + "^com\\.mitchellh\\.ghostty$", + "^com\\.neovide\\.neovide$", + "^org\\.gnu\\.Emacs$", + "^com\\.microsoft\\.VSCode$", + "^com\\.jetbrains\\.rider$", + "^com\\.jetbrains\\.pycharm$", + "^com\\.jetbrains\\.intellij$", + "^com\\.jetbrains\\.goland$", + "^com\\.jetbrains\\.clion$", + "^com\\.jetbrains\\.rustrover$", + "^dev\\.zed\\.Zed$" + ], + "type": "frontmost_application_unless" + } + ], + "from": { + "key_code": "caps_lock", + "modifiers": { "optional": ["any"] } + }, + "to": [{ "key_code": "left_command" }], + "to_if_alone": [{ "key_code": "escape" }], + "type": "basic" } ] } diff --git a/platforms/mac/skhdrc b/platforms/mac/skhdrc index 4450a5f..6a85116 100644 --- a/platforms/mac/skhdrc +++ b/platforms/mac/skhdrc @@ -30,10 +30,10 @@ fn - 9 : yabai -m space --focus 9 fn - 0 : yabai -m space --focus 10 # minimize window -alt - m : yabai -m window --minimize +fn - m : yabai -m window --minimize # float / unfloat window and center on screen -ctrl - f : yabai -m window --toggle float +fn - f : yabai -m window --toggle float # toggle window native fullscreen shift + ctrl - f : yabai -m window --toggle native-fullscreen diff --git a/platforms/mac/yabairc b/platforms/mac/yabairc index fd5d9b2..c2bdbce 100644 --- a/platforms/mac/yabairc +++ b/platforms/mac/yabairc @@ -41,7 +41,7 @@ yabai -m config \ right_padding 12 \ window_gap 06 \ layout bsp \ - mouse_modifier cmd \ + mouse_modifier fn \ mouse_action1 move \ mouse_action2 resize \ mouse_drop_action swap \ diff --git a/platforms/win/fastfetch.jsonc b/platforms/win/fastfetch.jsonc index 1824115..4ee7771 100644 --- a/platforms/win/fastfetch.jsonc +++ b/platforms/win/fastfetch.jsonc @@ -40,10 +40,6 @@ }, "shell", "display", - "de", - "wm", - "wmtheme", - "theme", "icons", "font", "cursor", diff --git a/tools/kitty/kitty.conf b/tools/kitty/kitty.conf index 4fdfc8e..4acdec9 100644 --- a/tools/kitty/kitty.conf +++ b/tools/kitty/kitty.conf @@ -39,7 +39,7 @@ include current-theme.conf # macOS {{{ -macos_opttion_as_alt yes +macos_option_as_alt yes macos_quit_when_last_window_closed yes # }}} @@ -77,4 +77,3 @@ map ctrl+q>shift+I kitten window.py -resize right map cmd+enter toggle_layout stack map ctrl+shift+enter toggle_layout stack # }}} - diff --git a/tools/wezterm/appearance.lua b/tools/wezterm/appearance.lua index 9c70be8..9b32511 100644 --- a/tools/wezterm/appearance.lua +++ b/tools/wezterm/appearance.lua @@ -61,7 +61,7 @@ return function(config) config.window_frame = { font = wezterm.font("PingFang SC"), } - + config.window_decorations = "RESIZE" config.command_palette_fg_color = color.lavender config.command_palette_bg_color = color.base -- UnixLong / Emacs / AppleSymbols / WindowsLong / WindowsSymbols