diff --git a/config/macos/karabiner/automatic_backups/karabiner_20250531.json b/config/macos/karabiner/automatic_backups/karabiner_20250531.json new file mode 100644 index 0000000..672a8e8 --- /dev/null +++ b/config/macos/karabiner/automatic_backups/karabiner_20250531.json @@ -0,0 +1,43 @@ +{ + "profiles": [ + { + "devices": [ + { + "identifiers": { "is_keyboard": true }, + "simple_modifications": [ + { + "from": { "key_code": "non_us_backslash" }, + "to": [{ "key_code": "grave_accent_and_tilde" }] + } + ] + }, + { + "identifiers": { + "is_keyboard": true, + "product_id": 49164, + "vendor_id": 7276 + }, + "simple_modifications": [ + { + "from": { "key_code": "left_command" }, + "to": [{ "key_code": "left_option" }] + }, + { + "from": { "key_code": "left_option" }, + "to": [{ "key_code": "left_command" }] + } + ] + } + ], + "name": "Default profile", + "selected": true, + "simple_modifications": [ + { + "from": { "key_code": "caps_lock" }, + "to": [{ "key_code": "left_control" }] + } + ], + "virtual_hid_keyboard": { "keyboard_type_v2": "ansi" } + } + ] +} \ No newline at end of file diff --git a/config/macos/karabiner/karabiner.json b/config/macos/karabiner/karabiner.json index 672a8e8..52bcba2 100644 --- a/config/macos/karabiner/karabiner.json +++ b/config/macos/karabiner/karabiner.json @@ -1,4 +1,5 @@ { + "global": { "show_in_menu_bar": false }, "profiles": [ { "devices": [ diff --git a/config/shared/ghostty/config b/config/shared/ghostty/config index 2b20b3c..93c839a 100644 --- a/config/shared/ghostty/config +++ b/config/shared/ghostty/config @@ -1,4 +1,4 @@ -theme = catppuccin-frappe +theme = catppuccin-latte # Terminal term = "xterm-256color" @@ -9,9 +9,9 @@ font-size = 14 font-thicken = true # Cell width (affects letter spacing) -adjust-cell-width = -1 -adjust-cell-height = -1 -adjust-font-baseline = -1 +# adjust-cell-width = -1 +# adjust-cell-height = -1 +# adjust-font-baseline = -1 # Cursor cursor-style-blink = false @@ -32,8 +32,8 @@ window-width = 100 window-height = 26 window-padding-x = 4 window-padding-y = 2 -window-colorspace = display-p3 -macos-titlebar-style = native +# window-colorspace = display-p3 +# macos-titlebar-style = native #macos-titlebar-style = transparent @@ -42,8 +42,8 @@ macos-titlebar-style = native #window-padding-balance = true # Background -background-opacity = 1 -background-blur-radius = 0 +# background-opacity = 1 +# background-blur-radius = 0 diff --git a/config/shared/nvim b/config/shared/nvim index 863b000..ecae856 100644 --- a/config/shared/nvim +++ b/config/shared/nvim @@ -20,6 +20,8 @@ local function nmap(lhs, rhs, opts) map("n", lhs, rhs, opts) end local function imap(lhs, rhs, opts) map("i", lhs, rhs, opts) end local function vmap(lhs, rhs, opts) map("v", lhs, rhs, opts) end local function tmap(lhs, rhs, opts) map("t", lhs, rhs, opts) end +vim.opt.signcolumn = "no" + -- Map Leader vim.g.mapleader = " " diff --git a/config/shared/zsh b/config/shared/zsh index 79babb1..1e13a5f 100644 --- a/config/shared/zsh +++ b/config/shared/zsh @@ -1,81 +1,6 @@ -# Add /bin to path -export PATH="$PATH:$HOME/bin" - -# Set locales -export LANGUAGE="en_US:en" -export LANG=en_US.UTF-8 -export LC_ALL=en_US.UTF-8 - -autoload -Uz compinit && compinit # Autocomplete -zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' # Case Insensitive - -setopt autocd # cd without it -setopt share_history - -# Set terminal title to hostname -echo -n -e "\033]0;SSH: $(hostname)\007" - -# Git prompt function -git_prompt_info() { - if git rev-parse --is-inside-work-tree >/dev/null 2>&1; then - local branch=$(git symbolic-ref --short HEAD 2>/dev/null || git rev-parse --short HEAD) - echo " %F{green}($branch)%f" - fi -} - -# Set up the prompt -setopt PROMPT_SUBST # Dyna -PROMPT='%n@%m%f %F{blue}%~%f$(git_prompt_info) $ ' - -# Disable the log builtin, so we don't conflict with /usr/bin/log -disable log - -# Save command history -HISTFILE=${ZDOTDIR:-$HOME}/.zsh_history -HISTSIZE=2000 -SAVEHIST=1000 -setopt HIST_IGNORE_ALL_DUPS - -# Load functions -autoload -U up-line-or-beginning-search -autoload -U down-line-or-beginning-search -zle -N up-line-or-beginning-search -zle -N down-line-or-beginning-search - -# Bind both common escape sequences -bindkey '^[[A' up-line-or-beginning-search # normal mode -bindkey '^[OA' up-line-or-beginning-search # application mode -bindkey '^[[B' down-line-or-beginning-search # normal mode -bindkey '^[OB' down-line-or-beginning-search # application mode - -# Aliases for ls -OS_TYPE=$(uname) -if [[ "$OS_TYPE" == "Linux" ]]; then - alias ls='ls --color=auto --group-directories-first' -elif [[ "$OS_TYPE" == "Darwin" ]]; then - alias ls='ls --color=auto' +if [ -f "$HOME/.config/zsh/zshrc" ]; then + source "$HOME/.config/zsh/zshrc" +else + echo "Warning: ~/.config/zsh/zshrc not found, skipping custom Zsh configuration." fi -alias ll='ls -lF' -alias lla='ll -a' -alias ld='ls -ld */' # List only directories -# Aliases for git -alias g='git' -alias ga='git add' -alias gaa='git add --all' -alias gb='git branch' -alias gcm='git commit -m' -alias gam='git commit -am' -alias gco='git checkout' -alias gd='git diff' -alias gf='git fetch' -alias gl='git pull' -alias gp='git push' -alias gst='git status' -alias glg='git log --graph --oneline --decorate --all' -alias gm='git merge' -alias grb='git rebase' -alias grs='git reset' -alias grv='git remote -v' - -alias tree='tree -I node_modules'