diff options
| author | Eugene Triguba <eugene.triguba@paymentworks.com> | 2025-07-07 08:45:05 -0400 |
|---|---|---|
| committer | Eugene Triguba <eugene.triguba@paymentworks.com> | 2025-07-07 08:45:05 -0400 |
| commit | b6f57c53d10e9f0b841c41aadcd0234332ec1438 (patch) | |
| tree | 9d24d92191e36390bae35bad050b3609c12795dc | |
| parent | tweak nvim config (diff) | |
| parent | adjust hotkey (diff) | |
| download | dotfiles-b6f57c53d10e9f0b841c41aadcd0234332ec1438.zip | |
Merge remote-tracking branch 'upstream'
32 files changed, 305 insertions, 223 deletions
@@ -1,2 +1,3 @@ .DS_Store /tags +/tmux/.config/tmux/plugins @@ -1,12 +1,28 @@ # Dotfiles -These are my personal dotfiles for macOS systems. +Configuration files and scripts for my macOS development environment. -All configuration files are managed using [GNU Stow](https://www.gnu.org/software/stow/), which automatically creates symlinks from this repository to the appropriate locations in your `$HOME` directory. The repository also includes scripts for managing and syncing your Homebrew packages via a Brewfile. + + +## What's Included + +- Terminal: GhostTY +- Shell: Zsh +- Editor: Neovim +- Multiplexer: Tmux with TPM for plugin management +- Git & GPG configurations +- Custom scripts, such as `gh-clone-all`, which makes it easy to clone GitHub + repositories and keep them up to date in bulk. + +## Structure + +The repository uses [GNU Stow](https://www.gnu.org/software/stow/) to manage +symlinks between these configuration files and the user's home directory. +Homebrew packages are tracked via a Brewfile. ## Installation -Clone the repository (recommended: `~/.dotfiles`) and run the installation script: +Clone the repository and run the installation script: ```sh git clone git@github.com:eugenetriguba/dotfiles.git ~/.dotfiles @@ -15,14 +31,22 @@ chmod u+x install.sh ./install.sh ``` -## Homebrew Packages +💡 Note: The repository is intended to be cloned into a top-level directory in +the `$HOME` directory because GNU Stow defaults to using the parent directory +for it's symlinking. If cloned elsewhere, the `stow` commands in `install.sh` +would need to be updated. + +## Homebrew Management -To update your `homebrew/Brewfile` with your currently installed Homebrew formulae and casks, run: +To update your `homebrew/Brewfile` with your currently installed Homebrew +formulae and casks, run: ```sh chmod u+x homebrew/sync-brewfile.sh ./homebrew/sync-brewfile.sh ``` -This script only updates the `homebrew/Brewfile` with your current manually installed Homebrew packages; it does not install or remove any packages. You can then use `git diff` to review the changes. +This script only updates the `homebrew/Brewfile` with your current manually +installed Homebrew packages. It does not install or remove any packages. +You can then use `git diff` to review the changes. diff --git a/executables/bin/tmux-toggle-term b/executables/bin/tmux-toggle-term new file mode 100755 index 0000000..6d6cbd7 --- /dev/null +++ b/executables/bin/tmux-toggle-term @@ -0,0 +1,23 @@ +#!/usr/bin/env bash +set -uo pipefail + +FLOAT_TERM="${1:-}" +LIST_PANES="$(tmux list-panes -F '#F')" +PANE_ZOOMED="$(echo "${LIST_PANES}" | grep Z)" +PANE_COUNT="$(echo "${LIST_PANES}" | wc -l | bc)" + +if [ -n "${FLOAT_TERM}" ]; then + if [ "$(tmux display-message -p -F "#{session_name}")" = "popup" ]; then + tmux detach-client + else + tmux popup -d '#{pane_current_path}' -xC -yC -w90% -h80% -E "tmux attach -t popup || tmux new -s popup" + fi +else + if [ "${PANE_COUNT}" = 1 ]; then + tmux split-window -c "#{pane_current_path}" + elif [ -n "${PANE_ZOOMED}" ]; then + tmux select-pane -t:.- + else + tmux resize-pane -Z -t1 + fi +fi diff --git a/ghostty/.config/ghostty/config b/ghostty/.config/ghostty/config index b4d0429..3575def 100644 --- a/ghostty/.config/ghostty/config +++ b/ghostty/.config/ghostty/config @@ -41,26 +41,16 @@ # # which is explained in the docs for that config option. # # Just for example: # resize-overlay-duration = 4s 200ms - theme = "tokyonight" font-family = "Hack" font-size = 16 -keybind = cmd+/=new_split:right -keybind = cmd+.=new_split:down - -keybind = opt+h=goto_split:left -keybind = opt+j=goto_split:bottom -keybind = opt+k=goto_split:top -keybind = opt+l=goto_split:right - -keybind = opt+shift+h=new_split:left -keybind = opt+shift+j=new_split:down -keybind = opt+shift+k=new_split:up -keybind = opt+shift+l=new_split:right - keybind = global:cmd+shift+t=toggle_quick_terminal quick-terminal-autohide = false quick-terminal-screen = main +shell-integration = zsh +mouse-hide-while-typing = true +scrollback-limit = 1000000 macos-option-as-alt = true +window-save-state = always diff --git a/homebrew/Brewfile b/homebrew/Brewfile index e956ef5..62e7b80 100644 --- a/homebrew/Brewfile +++ b/homebrew/Brewfile @@ -3,8 +3,10 @@ tap "eugenetriguba/bolt" brew "act" brew "ansible" brew "bandit" +brew "bash" brew "bat" brew "bats-core" +brew "bc" brew "ca-certificates" brew "clang-format" brew "cmake" @@ -17,18 +19,24 @@ brew "curl" brew "doxygen" brew "duckdb" brew "eugenetriguba/bolt/bolt" +brew "eugenetriguba/justify/justify" brew "fd" brew "ffmpeg" brew "fzf" +brew "gawk" brew "gcc" brew "gh" brew "git" +brew "glab" +brew "gnu-sed" brew "gnupg" brew "go" brew "gradle" brew "hadolint" brew "htop" brew "icu4c@76" +brew "icu4c@77" +brew "isort" brew "jc" brew "jq" brew "jsonlint" @@ -48,6 +56,7 @@ brew "ncdu" brew "neovim" brew "nmap" brew "node" +brew "nowplaying-cli" brew "nvm" brew "ollama" brew "openblas" @@ -58,6 +67,7 @@ brew "pipx" brew "pkgconf" brew "postgresql@14" brew "pre-commit" +brew "prettierd" brew "pyenv-virtualenv" brew "pyenv" brew "python@3.11" @@ -65,10 +75,13 @@ brew "python@3.12" brew "python@3.13" brew "qemu" brew "readline" +brew "reattach-to-user-namespace" brew "ripgrep" brew "rsync" brew "ruff" brew "rustup" +brew "shellcheck" +brew "shfmt" brew "speedtest-cli" brew "splint" brew "stow" @@ -79,6 +92,7 @@ brew "tflint" brew "tldr" brew "tmux" brew "tree" +brew "vale" brew "vim" brew "wget" brew "xz" @@ -92,8 +106,9 @@ cask "elgato-control-center" cask "font-hack-nerd-font" cask "font-inter" cask "font-menlo-for-powerline" +cask "font-monaspace-nerd-font" +cask "font-noto-sans-symbols-2" cask "ghostty" -cask "hashicorp-vagrant" cask "obsidian" cask "omnifocus" cask "neovide" @@ -101,3 +116,4 @@ cask "raycast" cask "rectangle" cask "spotify" cask "vagrant" +cask "vivaldi" diff --git a/homebrew/sync-brewfile.sh b/homebrew/sync-brewfile.sh index bf36e10..fbe45e0 100755 --- a/homebrew/sync-brewfile.sh +++ b/homebrew/sync-brewfile.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -eou pipefail # Create a new Brewfile with only manually installed formulae and casks ( @@ -26,6 +26,11 @@ main() { stow tmux stow ghostty echo "Successfully linked all dotfiles." + + echo "Initializing TPM (Tmux Plugin Manager)..." + setup_tpm + + echo "Setup complete!" } # Prompt the user for confirmation on an action. @@ -63,4 +68,34 @@ install_homebrew() { fi } +setup_tpm() { + local tpm_dir="$HOME/.config/tpm/plugins/tpm" + if [[ ! -d "$tpm_dir" ]]; then + echo "Cloning TPM..." + git clone https://github.com/tmux-plugins/tpm "$tpm_dir" + else + echo "TPM already exists, updating..." + (cd "$tpm_dir" && git pull) + fi + + if command -v tmux >/dev/null 2>&1; then + echo "Installing tmux plugins..." + # Start a tmux server in the background and install plugins + tmux start-server + tmux new-session -d -s tpm_install + tmux send-keys -t tpm_install "$tpm_dir/scripts/install_plugins.sh" Enter + + # Wait a moment for plugins to install + sleep 3 + + # Kill the temporary session + tmux kill-session -t tpm_install 2>/dev/null || true + + echo "TPM plugins installed successfully." + else + echo "Warning: tmux not found. TPM cloned but plugins not installed." + echo "Run 'tmux' and then press 'prefix + I' to install plugins manually." + fi +} + main diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index 9db9f24..e5f0f12 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -4,40 +4,39 @@ "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" }, "blink-cmp-copilot": { "branch": "main", "commit": "439cff78780c033aa23cf061d7315314b347e3c1" }, "blink.cmp": { "branch": "main", "commit": "9bcb14b43852a6f2bfd5ac9ef29cb5cf09b1b39b" }, - "conform.nvim": { "branch": "master", "commit": "f54259518695178168fbad442468e25f121230d4" }, + "conform.nvim": { "branch": "master", "commit": "973f3cb73887d510321653044791d7937c7ec0fa" }, "copilot.lua": { "branch": "master", "commit": "46f4b7d026cba9497159dcd3e6aa61a185cb1c48" }, "fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" }, - "gitsigns.nvim": { "branch": "main", "commit": "588264bee92993df92535b6742576f5655c91b1c" }, + "gitsigns.nvim": { "branch": "main", "commit": "362fe61f9f19e9bceff178792780df5cce118a7d" }, "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" }, "lazygit.nvim": { "branch": "main", "commit": "4839ab642962cc76bb1bf278427dc4c59be15072" }, "lualine.nvim": { "branch": "master", "commit": "a94fc68960665e54408fe37dcf573193c4ce82c9" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "c4c84f4521d62de595c0d0f718a9a40c1890c8ce" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "c2465eb07db648026eee81005a659abe26e6d077" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "4c2cdc69d69fe00c15ae8648f7e954d99e5de3ea" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "517ef5994ef9d6b738322664d5fdd948f0fdeb46" }, "mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" }, + "mini.icons": { "branch": "main", "commit": "94848dad1589a199f876539bd79befb0c5e3abf0" }, "mini.nvim": { "branch": "main", "commit": "48f48e4b3f317e9da34ee7a01958b4c5018e2d34" }, - "neo-tree.nvim": { "branch": "main", "commit": "f481de16a0eb59c985abac8985e3f2e2f75b4875" }, - "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, - "nvim-dap": { "branch": "master", "commit": "14fe46ae16eb272629144a93f7738f5279665a4f" }, + "nvim-dap": { "branch": "master", "commit": "1c75a797b4017fec6491f509cf196c8c8833f26f" }, "nvim-dap-go": { "branch": "main", "commit": "8763ced35b19c8dc526e04a70ab07c34e11ad064" }, "nvim-dap-python": { "branch": "master", "commit": "261ce649d05bc455a29f9636dc03f8cdaa7e0e2c" }, "nvim-dap-ui": { "branch": "master", "commit": "73a26abf4941aa27da59820fd6b028ebcdbcf932" }, - "nvim-lint": { "branch": "master", "commit": "2b0039b8be9583704591a13129c600891ac2c596" }, - "nvim-lspconfig": { "branch": "master", "commit": "1cb30b1bafe5a63a5c6ac20dc39f83487df38855" }, + "nvim-lint": { "branch": "master", "commit": "3c5e34c24834a67b1cb37600ab7663eefd2b0390" }, + "nvim-lspconfig": { "branch": "master", "commit": "7fac9025a967a4d0846660f751cd392fac6bb788" }, "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, "nvim-web-devicons": { "branch": "master", "commit": "19d6211c78169e78bab372b585b6fb17ad974e82" }, "obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" }, + "oil.nvim": { "branch": "master", "commit": "bbad9a76b2617ce1221d49619e4e4b659b3c61fc" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" }, "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, - "toggleterm.nvim": { "branch": "main", "commit": "9a88eae817ef395952e08650b3283726786fb5fb" }, "tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" }, "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" }, "vim-tmux-navigator": { "branch": "master", "commit": "412c474e97468e7934b9c217064025ea7a69e05e" }, diff --git a/nvim/.config/nvim/lua/plugins/copilot.lua b/nvim/.config/nvim/lua/plugins/copilot.lua index 23ee23e..7f99c10 100644 --- a/nvim/.config/nvim/lua/plugins/copilot.lua +++ b/nvim/.config/nvim/lua/plugins/copilot.lua @@ -19,11 +19,11 @@ return { build = 'make tiktoken', -- Only on MacOS or Linux config = function() require('CopilotChat').setup { - model = 'gpt-4o', + model = 'claude-3.5-sonnet', + vim.keymap.set('n', '<leader>tc', function() + vim.cmd 'CopilotChatToggle' + end, { desc = '[T]oggle [C]opilot Chat' }), } - vim.keymap.set('n', '<leader>tc', function() - vim.cmd 'CopilotChatToggle' - end, { desc = '[T]oggle [C]opilot Chat' }) end, }, } diff --git a/nvim/.config/nvim/lua/plugins/neo-tree.lua b/nvim/.config/nvim/lua/plugins/neo-tree.lua deleted file mode 100644 index fa2b5db..0000000 --- a/nvim/.config/nvim/lua/plugins/neo-tree.lua +++ /dev/null @@ -1,40 +0,0 @@ --- Neo-tree is a Neovim plugin to browse the file system --- https://github.com/nvim-neo-tree/neo-tree.nvim - -return { - 'nvim-neo-tree/neo-tree.nvim', - version = '*', - lazy = false, - dependencies = { - 'nvim-lua/plenary.nvim', - 'nvim-tree/nvim-web-devicons', - 'MunifTanjim/nui.nvim', - }, - cmd = 'Neotree', - keys = { - { '\\', ':Neotree reveal<CR>', desc = 'NeoTree reveal', silent = true }, - }, - opts = { - filesystem = { - window = { - mappings = { - ['\\'] = 'close_window', - }, - }, - }, - filtered_items = { - visible = true, - hide_dotfiles = false, - hide_gitignored = true, - hide_by_name = { - '.DS_Store', - 'thumbs.db', - '.git', - }, - always_show_by_pattern = { - '.env*', - '.gitignore', - }, - }, - }, -} diff --git a/nvim/.config/nvim/lua/plugins/oil.lua b/nvim/.config/nvim/lua/plugins/oil.lua new file mode 100644 index 0000000..f200559 --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/oil.lua @@ -0,0 +1,13 @@ +return { + 'stevearc/oil.nvim', + ---@module 'oil' + ---@type oil.SetupOpts + opts = {}, + dependencies = { { 'echasnovski/mini.icons', opts = {} } }, + config = function(_, opts) + vim.keymap.set('n', '\\', '<CMD>Oil --float<CR>', { desc = 'Open parent directory in floating window' }) + vim.keymap.set('n', '-', '<CMD>Oil<CR>', { desc = 'Open parent directory' }) + require('oil').setup(opts) + end, + lazy = false, +} diff --git a/nvim/.config/nvim/lua/plugins/toggleterm.lua b/nvim/.config/nvim/lua/plugins/toggleterm.lua deleted file mode 100644 index 283123f..0000000 --- a/nvim/.config/nvim/lua/plugins/toggleterm.lua +++ /dev/null @@ -1,14 +0,0 @@ -return { - { - 'akinsho/toggleterm.nvim', - config = function() - require('toggleterm').setup { - size = 15, - open_mapping = [[<C-\>]], - shade_filetypes = {}, - shade_terminals = true, - direction = 'horizontal', - } - end, - }, -} diff --git a/screenshots/overview.png b/screenshots/overview.png Binary files differnew file mode 100644 index 0000000..bb3ddfa --- /dev/null +++ b/screenshots/overview.png diff --git a/tmux/.config/tmux/key-remappings.conf b/tmux/.config/tmux/key-remappings.conf deleted file mode 100644 index 1a6cfde..0000000 --- a/tmux/.config/tmux/key-remappings.conf +++ /dev/null @@ -1,21 +0,0 @@ -# Start from a blank slate. Unremap all default key bindings. -# unbind-key -a - -# Remap prefix from 'C-b' to 'C-a' -# -# This works well if you remap the regular Caps Lock key to Ctrl. -unbind C-b -set-option -g prefix C-a -bind-key C-a send-prefix - -# Remap pane splits. -# -# Split panes using | for horizontal splits and - for vertical splits -bind-key | split-window -h -bind-key - split-window -v -unbind '"' -unbind % - -bind-key r source-file ~/.config/tmux/tmux.conf -bind-key x kill-pane - diff --git a/tmux/.config/tmux/key-remappings.tmux b/tmux/.config/tmux/key-remappings.tmux new file mode 100644 index 0000000..d7dfa8d --- /dev/null +++ b/tmux/.config/tmux/key-remappings.tmux @@ -0,0 +1,23 @@ +# Remap prefix from 'C-b' to 'C-a' +# +# This works well if you remap the regular Caps Lock key to Ctrl. +unbind C-b +set-option -g prefix C-a +bind-key C-a send-prefix + +# Remap pane splits to something more sane than the default. +# +# Split panes using | for horizontal splits and - for vertical splits +bind-key | split-window -h +bind-key - split-window -v +unbind '"' +unbind % + +# Easier configuration reloading and pane killing +bind-key r source-file ~/.config/tmux/tmux.conf \; display-message "Config reloaded!" +bind-key x kill-pane + +# Add key bindings for toggling terminal windows +bind-key -n 'C-\\' run-shell -b "${HOME}/bin/tmux-toggle-term" +bind-key -n 'C-f' run-shell -b "${HOME}/bin/tmux-toggle-term float" + diff --git a/tmux/.config/tmux/macos.tmux b/tmux/.config/tmux/macos.tmux new file mode 100644 index 0000000..02fbde3 --- /dev/null +++ b/tmux/.config/tmux/macos.tmux @@ -0,0 +1,14 @@ +# Related: [issue #67](https://github.com/tmux-plugins/tpm/issues/67) +set-environment -g PATH "/opt/homebrew/bin:/bin:/usr/bin" + +# Setting the namespace +set -g default-command "reattach-to-user-namespace -l /bin/zsh" + +# Prefix C-c copy buffer to system clipboard +bind C-c run "tmux save-buffer - | reattach-to-user-namespace pbcopy" + +# Prefix C-v paste system clipboard into tmux +bind C-v run "tmux set-buffer \"$(reattach-to-user-namespace pbpaste)\"; tmux paste-buffer" + +bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel "reattach-to-user-namespace pbcopy" +bind -T copy-mode-vi Enter send-keys -X copy-pipe-and-cancel "reattach-to-user-namespace pbcopy" diff --git a/tmux/.config/tmux/options.conf b/tmux/.config/tmux/options.tmux index ac1cb84..ab6a97e 100644 --- a/tmux/.config/tmux/options.conf +++ b/tmux/.config/tmux/options.tmux @@ -8,8 +8,11 @@ set-option -g allow-rename off # Enable mouse support (clickable windows, panes, resizable panes) set-option -g mouse on -# Set terminal colors -set-option -g default-terminal "screen-256color" +# Enable system clipboard integration (macOS) +set-option -g set-clipboard on + +# Allow focus events (for editors like Neovim) +set -g focus-events on # Start windows and panes at 1, not 0 set-option -g base-index 1 @@ -26,3 +29,10 @@ set-option -g bell-action none # Enable hyperlinks set-option -as terminal-features ",*:hyperlinks" + +# Enable true color support +set -ga terminal-overrides ",*256col*:Tc" +set -ga terminal-overrides ",tmux-256color:Tc" + +set -g default-terminal "tmux-256color" +set -g default-shell /bin/zsh diff --git a/tmux/.config/tmux/plugins.conf b/tmux/.config/tmux/plugins.tmux index 58ca774..e5750e3 100644 --- a/tmux/.config/tmux/plugins.conf +++ b/tmux/.config/tmux/plugins.tmux @@ -1,4 +1,5 @@ # Plugin manager +set-environment -g TMUX_PLUGIN_MANAGER_PATH "$HOME/.config/tmux/plugins/" set-option -g @plugin 'tmux-plugins/tpm' # 'Sensible' set of defaults @@ -24,4 +25,21 @@ set-option -g @resurrect-strategy-nvim 'session' # Vim Tmux Navigator allows you to navigate between Vim and tmux panes set-option -g @plugin 'christoomey/vim-tmux-navigator' -run '~/.tmux/plugins/tpm/tpm' +set-option -g @plugin 'tmux-plugins/tmux-yank' +set-option -g @plugin 'tmux-plugins/tmux-open' +set-option -g @plugin 'tmux-plugins/tmux-copycat' + +set-option -g @plugin "janoamaral/tokyo-night-tmux" +set -g @tokyo-night-tmux_theme night +set -g @tokyo-night-tmux_transparent 1 +set -g @tokyo-night-tmux_window_id_style digital +set -g @tokyo-night-tmux_pane_id_style hsquare +set -g @tokyo-night-tmux_zoom_id_style dsquare +set -g @tokyo-night-tmux_terminal_icon  +set -g @tokyo-night-tmux_active_terminal_icon  +set -g @tokyo-night-tmux_window_tidy_icons 1 +set -g @tokyo-night-tmux_show_datetime 1 +set -g @tokyo-night-tmux_date_format YMD +set -g @tokyo-night-tmux_time_format 24H + +run '$HOME/.config/tmux/plugins/tpm/tpm' diff --git a/tmux/.config/tmux/plugins/tmux-sensible b/tmux/.config/tmux/plugins/tmux-sensible deleted file mode 160000 -Subproject 25cb91f42d020f675bb0a2ce3fbd3a5d96119ef diff --git a/tmux/.config/tmux/plugins/tpm b/tmux/.config/tmux/plugins/tpm deleted file mode 160000 -Subproject 99469c4a9b1ccf77fade25842dc7bafbc8ce994 diff --git a/tmux/.config/tmux/theme.conf b/tmux/.config/tmux/theme.conf deleted file mode 100644 index f0668ae..0000000 --- a/tmux/.config/tmux/theme.conf +++ /dev/null @@ -1,32 +0,0 @@ -# Clock mode -setw -g clock-mode-colour yellow - -# Copy mode -setw -g mode-style 'fg=black bg=red bold' - -set -g pane-border-style 'fg=red' -set -g pane-active-border-style 'fg=yellow' - -# Statusbar -set -g status-position bottom -set -g status-justify left -set -g status-style 'fg=red' - -set -g status-left '' -set -g status-left-length 10 - -set -g status-right-style 'fg=black bg=yellow' -set -g status-right '%Y-%m-%d %H:%M ' -set -g status-right-length 50 - -setw -g window-status-current-style 'fg=black bg=red' -setw -g window-status-current-format ' #I #W #F ' - -setw -g window-status-style 'fg=red bg=black' -setw -g window-status-format ' #I #[fg=white]#W #[fg=yellow]#F ' - -setw -g window-status-bell-style 'fg=yellow bg=red bold' - -# Messages -set -g message-style 'fg=yellow bg=red bold' - diff --git a/tmux/.config/tmux/tmux.conf b/tmux/.config/tmux/tmux.conf index 4783498..4d2dbde 100644 --- a/tmux/.config/tmux/tmux.conf +++ b/tmux/.config/tmux/tmux.conf @@ -6,9 +6,9 @@ # https://github.com/tmux-plugins/tpm/issues/67#issuecomment-319561401 set-environment -g PATH "/usr/local/bin:/bin:/usr/bin" -source-file ~/.config/tmux/key-remappings.conf -source-file ~/.config/tmux/options.conf -source-file ~/.config/tmux/vi.conf -source-file ~/.config/tmux/theme.conf -source-file ~/.config/tmux/plugins.conf +source-file ~/.config/tmux/key-remappings.tmux +source-file ~/.config/tmux/options.tmux +source-file ~/.config/tmux/vi.tmux +if-shell "uname | grep -q Darwin" "source-file ~/.config/tmux/macos.tmux" +source-file ~/.config/tmux/plugins.tmux diff --git a/tmux/.config/tmux/vi.conf b/tmux/.config/tmux/vi.tmux index 6592f10..85f2f37 100644 --- a/tmux/.config/tmux/vi.conf +++ b/tmux/.config/tmux/vi.tmux @@ -1,8 +1,6 @@ -# Set vi mode set-window-option -g mode-keys vi # Use visual selection mode as vi bind-key -T copy-mode-vi v send-keys -X begin-selection bind-key -T copy-mode-vi C-v send-keys -X rectangle-toggle bind-key -T copy-mode-vi y send-keys -X copy-selection-and-cancel - diff --git a/tmux/.tmux/plugins/tpm b/tmux/.tmux/plugins/tpm deleted file mode 160000 -Subproject 99469c4a9b1ccf77fade25842dc7bafbc8ce994 diff --git a/zsh/.zsh/aliases.sh b/zsh/.zsh/aliases.sh new file mode 100644 index 0000000..6239f43 --- /dev/null +++ b/zsh/.zsh/aliases.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env zsh + +# Git +alias gs="git status" +alias gc="git commit" +alias ga="git add" +alias gd="git diff" +alias gds="git diff --staged" +alias gp="git push" +alias gpo="git push origin" +alias gpl="git pull" +alias gplrb="git pull --rebase" +alias gl="git log" +alias gv="git log --graph --decorate --oneline" +alias gch="git checkout" +alias gcb="git checkout -b" + +# System +alias h="history 25" +alias j="jobs -l" +alias l="ls -alG" +alias vi="nvim" +alias vim="nvim" +alias tf="terraform" diff --git a/zsh/.zsh/completion.sh b/zsh/.zsh/completion.sh new file mode 100644 index 0000000..981c523 --- /dev/null +++ b/zsh/.zsh/completion.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env zsh + +autoload -Uz compinit +compinit diff --git a/zsh/.zsh/env.sh b/zsh/.zsh/env.sh new file mode 100644 index 0000000..429c8a4 --- /dev/null +++ b/zsh/.zsh/env.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env zsh + +export EDITOR="nvim" +export BROWSER="" +export GPG_TTY=$(tty) +export PAGER="less" +export MANPAGER="less" +export BAT_THEME="tokyonight_night" +export SRC_DIR="$HOME/src" +export BIN_DIR="$HOME/bin" diff --git a/zsh/.zsh/history.sh b/zsh/.zsh/history.sh new file mode 100644 index 0000000..e834b85 --- /dev/null +++ b/zsh/.zsh/history.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env zsh + +export HISTFILE=~/.zhistory +export HISTSIZE=100000 +export SAVEHIST=100000 diff --git a/zsh/.zsh/languages.sh b/zsh/.zsh/languages.sh new file mode 100644 index 0000000..36ade67 --- /dev/null +++ b/zsh/.zsh/languages.sh @@ -0,0 +1,35 @@ +#!/usr/bin/env zsh + +# Go +export GOPATH="$SRC_DIR/go" +export GOBIN="$SRC_DIR/go/bin" +export PATH="$GOPATH/bin:$PATH" +export PATH="$GOROOT/bin:$PATH" +export PATH="$GOBIN:$PATH" + +# Python +export PYENV_ROOT="$HOME/.pyenv" +export PATH="$PYENV_ROOT/bin:$PATH" +command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH" +eval "$(pyenv init -)" +eval "$(pyenv virtualenv-init -)" + +# Rust +source "$HOME/.cargo/env" + +# Node.js +export NVM_DIR="$HOME/.nvm" +[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" + +# PNPM +export PNPM_HOME="/Users/eugene/Library/pnpm" +case ":$PATH:" in +*":$PNPM_HOME:"*) ;; +*) export PATH="$PNPM_HOME:$PATH" ;; +esac + +# Homebrew +eval "$(brew shellenv)" +export LDFLAGS="-L/opt/homebrew/lib" +export CPPFLAGS="-I/opt/homebrew/include" +export LIBRARY_PATH="$LIBRARY_PATH:$(brew --prefix)/lib" diff --git a/zsh/.zsh/path.sh b/zsh/.zsh/path.sh new file mode 100644 index 0000000..d000618 --- /dev/null +++ b/zsh/.zsh/path.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env zsh + +export PATH="$BIN_DIR:$PATH" +export PATH="$HOME/.local/bin:$PATH" +export PATH="$HOME/.poetry/bin:$PATH" +export PATH="/opt/homebrew/opt/curl/bin:$PATH" diff --git a/zsh/.zsh/tmux.sh b/zsh/.zsh/tmux.sh new file mode 100644 index 0000000..1c0620d --- /dev/null +++ b/zsh/.zsh/tmux.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env zsh +# +if [[ -z "$TMUX" ]]; then + tmux attach-session -t "$USER" || tmux new-session -s "$USER" +fi @@ -1,75 +1,10 @@ #!/usr/bin/env zsh source ~/.zsh/prompt.sh - -autoload -Uz compinit -compinit - -export HISTFILE=~/.zhistory -export HISTSIZE=100000 -export SAVEHIST=100000 - -export EDITOR="nvim" -export BROWSER="" -export BAT_THEME="tokyonight_night" -export MANPAGER="less" -export PAGER="less" -export TERM="xterm-256color" - -export GPG_TTY=$(tty) - -export SRC_DIR="$HOME/src" -export BIN_DIR="$HOME/bin" - -export PATH="$BIN_DIR:$PATH" -export PATH="$HOME/.poetry/bin:$PATH" -export PATH="$GOPATH/bin:$PATH" -export PATH="$GOROOT/bin:$PATH" -export PATH="$HOME/.local/bin:$PATH" - -export GOPATH="$SRC_DIR/go" -export GOBIN="$SRC_DIR/go/bin" -export PATH="$GOBIN:$PATH" - -export PYENV_ROOT="$HOME/.pyenv" -export PATH="$PYENV_ROOT/bin:$PATH" -command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH" -eval "$(pyenv init -)" -eval "$(pyenv virtualenv-init -)" - -export NVM_DIR="$HOME/.nvm" -[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" - -export PNPM_HOME="/Users/eugene/Library/pnpm" -case ":$PATH:" in -*":$PNPM_HOME:"*) ;; -*) export PATH="$PNPM_HOME:$PATH" ;; -esac - -eval "$(brew shellenv)" -export LDFLAGS="-L/opt/homebrew/lib" -export CPPFLAGS="-I/opt/homebrew/include" -export LIBRARY_PATH="$LIBRARY_PATH:$(brew --prefix)/lib" -export PATH="/opt/homebrew/opt/curl/bin:$PATH" - -alias gs="git status" -alias gc="git commit" -alias ga="git add" -alias gd="git diff" -alias gds="git diff --staged" -alias gp="git push" -alias gpo='git push origin' -alias gplrb='git pull --rebase' -alias gpl="git pull" -alias gl='git log' -alias gch="git checkout" -alias gcb='git checkout -b' -alias gv='git log --graph --decorate --oneline' - -alias h="history 25" -alias j="jobs -l" -alias l="ls -alG" - -alias tf="terraform" -alias vi="nvim" -alias vim="nvim" +source ~/.zsh/tmux.sh +source ~/.zsh/completion.sh +source ~/.zsh/history.sh +source ~/.zsh/env.sh +source ~/.zsh/path.sh +source ~/.zsh/languages.sh +source ~/.zsh/aliases.sh |