Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ repos:
exclude: '\.patch$'
- id: check-merge-conflict
- id: check-added-large-files
args: ["--maxkb=500"]
args: ["--maxkb=1000"]
- id: detect-private-key
- id: check-json
files: \.json$
Expand Down
2 changes: 1 addition & 1 deletion macos/Brewfile
Original file line number Diff line number Diff line change
Expand Up @@ -137,12 +137,12 @@ cask "zen"
# Development tools.
cask "android-studio"
cask "docker-desktop"
cask "iterm2"
cask "mongodb-compass"
cask "postman"
cask "raycast" # Alternative to Spotlight and Alfred with focus on development features.
cask "redis-insight"
cask "visual-studio-code"
cask "wezterm@nightly" # Use nightly build as there hasn't been a stable release in a long time.

# AI applications.
cask "chatgpt"
Expand Down
4 changes: 4 additions & 0 deletions macos/home/.config/aerospace/aerospace.toml
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,10 @@ automatically-unhide-macos-hidden-apps = true
# Application-specific workspace assignments

# Terminal applications
[[on-window-detected]]
if.app-id = "com.github.wez.wezterm"
run = "move-node-to-workspace T"

[[on-window-detected]]
if.app-id = "com.googlecode.iterm2"
run = "move-node-to-workspace T"
Expand Down
15 changes: 9 additions & 6 deletions macos/home/.config/tmux/tmux.conf
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

# Enable true color support (24-bit color)
set -g default-terminal "tmux-256color"
set -ag terminal-overrides ",xterm-256color:RGB"
set -as terminal-features ",xterm*:RGB"

# Set tmux messages display duration to 2s
set -g display-time 2000
Expand Down Expand Up @@ -106,7 +106,7 @@ set -g @plugin "tmux-plugins/tmux-yank"
set -g @plugin "christoomey/vim-tmux-navigator"
set -g @plugin "tmux-plugins/tmux-cpu"
set -g @plugin "tmux-plugins/tmux-battery"
set -g @plugin "tmux-plugins/tmux-online-status"
set -g @plugin "minhdanh/tmux-network-speed"

# Plugin configurations
set -g @resurrect-capture-pane-contents "on"
Expand All @@ -124,6 +124,12 @@ set -g @vim_navigator_mapping_prev "C-M-\\"
# Increase the size for pane resizing set by `pain-control` from 5 to 8
set-option -g @pane_resize "8"

# Network speed configuration
set -g @network_speed_interface "en0"
set -g @network_speed_download_color "#[fg=#{@thm_green}]"
set -g @network_speed_upload_color "#[fg=#{@thm_peach}]"
set -g @network_speed_format "%.1f"

# Catppuccin configuration
set -g @catppuccin_flavor "mocha"
set -g @catppuccin_status_background "none"
Expand Down Expand Up @@ -157,13 +163,10 @@ set -ga status-right "#{?#{e|>=:80,#{cpu_percentage}},#{#[bg=#{@thm_red},fg=#{@t
set -ga status-right "#[bg=#{@thm_bg},fg=#{@thm_overlay_0}, none] "
set -ga status-right "#{?#{e|>=:10,#{battery_percentage}},#{#[bg=#{@thm_red},fg=#{@thm_bg}]},#{#[bg=#{@thm_bg},fg=#{@thm_pink}]}} #{battery_icon} #{battery_percentage} "
set -ga status-right "#[bg=#{@thm_bg},fg=#{@thm_overlay_0}, none] "
set -ga status-right "#[bg=#{@thm_bg}]#{?#{==:#{online_status},ok},#[fg=#{@thm_mauve}] 󰖩 on ,#[fg=#{@thm_red},bold]#[reverse] 󰖪 off }"
set -ga status-right "#[bg=#{@thm_bg},fg=#{@thm_mauve}] 󰓅 #{network_speed}"
set -ga status-right "#[bg=#{@thm_bg},fg=#{@thm_overlay_0}, none] "
set -ga status-right "#[bg=#{@thm_bg},fg=#{@thm_blue}] 󰭦 %Y-%m-%d 󰅐 %H:%M "

# Set custom string for online/offline icons to enable matching for custom logic defined above.
set -g @online_icon "ok"
set -g @offline_icon "notok"

# =====================================
# Pane
Expand Down
54 changes: 54 additions & 0 deletions macos/home/.config/wezterm/wezterm.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
-- Pull in the wezterm API
local wezterm = require("wezterm")

local config = wezterm.config_builder()

-- Font settings
config.font = wezterm.font_with_fallback({
{ family = "Cascadia Code" },
{
family = "Monaspace Argon",
-- Enable Monaspace Texture Healing and Coding Ligatures
harfbuzz_features = { "calt", "liga", "ss01", "ss02", "ss03", "ss04", "ss05", "ss06", "ss07", "ss08", "ss09" },
},
{ family = "Symbols Nerd Font" },
})
config.font_size = 15

-- Appearance
local color_scheme = "Catppuccin Mocha"
local base = wezterm.color.get_builtin_schemes()[color_scheme]

config.color_scheme = color_scheme -- Provide base color scheme.
config.colors = base -- Explicitly ensure colors are applied in all elements of the terminal.

config.window_decorations = "RESIZE"
config.hide_tab_bar_if_only_one_tab = true
config.show_new_tab_button_in_tab_bar = false -- Since we can't theme it.

config.window_frame = {
font = wezterm.font({ family = "Cascadia Code", weight = "Bold" }),
font_size = 13,
active_titlebar_bg = base.cursor_fg,
active_titlebar_fg = base.foreground,
inactive_titlebar_bg = base.cursor_fg,
inactive_titlebar_fg = base.foreground,
button_bg = base.cursor_fg,
button_fg = base.foreground,
}

-- Command Palette
config.command_palette_bg_color = base.cursor_fg
config.command_palette_fg_color = base.foreground
config.command_palette_font = wezterm.font({ family = "Cascadia Code" })
config.command_palette_font_size = 15

-- Miscellaneous
config.front_end = "WebGpu" -- Use Metal/Vulkan/DX12 rather than OpenGL.
config.max_fps = 120
config.scrollback_lines = 10000
config.audible_bell = "Disabled"
config.initial_cols = 150 -- Useful when not using a TWM
config.initial_rows = 45

return config
3 changes: 0 additions & 3 deletions macos/home/.zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,6 @@ source ~/.api_keys
# Required by Homebrew.
eval "$(perl -I$HOME/perl5/lib/perl5 -Mlocal::lib=$HOME/perl5)"

# Integrate Iterm utilities.
test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell_integration.zsh"

# Hook Direnv into shell.
(( ${+commands[direnv]} )) && emulate zsh -c "$(direnv hook zsh)"

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>NSServices</key>
<array>
<dict>
<key>NSBackgroundColorName</key>
<string>background</string>
<key>NSIconName</key>
<string>workflowCustomImage</string>
<key>NSMenuItem</key>
<dict>
<key>default</key>
<string>New WezTerm Tab Here</string>
</dict>
<key>NSMessage</key>
<string>runWorkflowAsService</string>
<key>NSRequiredContext</key>
<dict>
<key>NSApplicationIdentifier</key>
<string>com.apple.finder</string>
</dict>
<key>NSSendFileTypes</key>
<array>
<string>public.folder</string>
</array>
</dict>
</array>
</dict>
</plist>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Loading