Cleanup

diff --git a/.gitignore b/.gitignore
index 46c0644ff0c9de8a6df88db6a006853d3e97619d..637e3faf87975589311aa10c7e39f7722aa49e5a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -6,9 +6,6 @@
 .zsh/cd-smart.aliases
 .local/state/cd-smart.tsv
 
 .zsh/cd-smart.aliases
 .local/state/cd-smart.tsv
 

-# Optional machine- or work-specific shell settings.
-.zsh/local.zsh
-

 # Zsh-generated caches and command history.
 .zcompdump*
 .zsh/cache/
 # Zsh-generated caches and command history.
 .zcompdump*
 .zsh/cache/

diff --git a/.tmux.conf b/.tmux.conf
index 95398b4d658dd74e662fcc069720cae45382c566..39c8e159caf839d1d5b2499f553b0010b4485237 100644 (file)
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -10,10 +10,6 @@ set -s escape-time 0
 set -g extended-keys on
 set -g extended-keys-format csi-u
 
 set -g extended-keys on
 set -g extended-keys-format csi-u
 

-# bind new keys for splits
-bind | split-window -hc "#{pane_current_path}"
-bind - split-window -vc "#{pane_current_path}"
-

 # reload conf
 bind r source-file ~/.tmux.conf \; display "Reloaded .tmux.conf"
 
 # reload conf
 bind r source-file ~/.tmux.conf \; display "Reloaded .tmux.conf"
 

diff --git a/.zsh/linux.zsh b/.zsh/linux.zsh
index 8e822b6d004f2b3ac31a81cf17e47c5dd4a322af..8ab09d5b303c4d0cd724c60cb782fe85436c02f6 100644 (file)
--- a/.zsh/linux.zsh
+++ b/.zsh/linux.zsh
@@ -1,10 +1,8 @@
 # Linux-specific Zsh settings
 
 # Linux-specific Zsh settings
 

-if command -v ls >/dev/null 2>&1; then
-    alias ls='ls --color=auto'
-fi
+alias ls='ls --color=auto'

 
 

-# Shared settings initialize completion before Linux-specific plugins load.
+# shared settings initialize completion before plugins load.

 source "$HOME/.zsh/common.zsh"
 
 if command -v fzf-tab >/dev/null 2>&1; then
 source "$HOME/.zsh/common.zsh"
 
 if command -v fzf-tab >/dev/null 2>&1; then

diff --git a/.zsh/macos.zsh b/.zsh/macos.zsh
index 23f9457d6c101fdfc72c9d28e5fbd9302e6baab8..a8a72aadb910b399be42933ed8a7486d138870a0 100644 (file)
--- a/.zsh/macos.zsh
+++ b/.zsh/macos.zsh
@@ -13,22 +13,22 @@ elif [[ -x /usr/local/bin/brew ]]; then
 fi
 
 if [[ -n ${HOMEBREW_PREFIX:-} ]]; then
 fi
 
 if [[ -n ${HOMEBREW_PREFIX:-} ]]; then

-    # Add Homebrew's tools and completion definitions without running Homebrew.
+    # Add brew's tools and completion definitions without running Homebrew.

     export PATH="$HOMEBREW_PREFIX/bin:$HOMEBREW_PREFIX/sbin:$PATH"
     export MANPATH="$HOMEBREW_PREFIX/share/man${MANPATH:+:$MANPATH}"
     export INFOPATH="$HOMEBREW_PREFIX/share/info${INFOPATH:+:$INFOPATH}"
     FPATH="$HOMEBREW_PREFIX/share/zsh/site-functions:${FPATH}"
 fi
 
     export PATH="$HOMEBREW_PREFIX/bin:$HOMEBREW_PREFIX/sbin:$PATH"
     export MANPATH="$HOMEBREW_PREFIX/share/man${MANPATH:+:$MANPATH}"
     export INFOPATH="$HOMEBREW_PREFIX/share/info${INFOPATH:+:$INFOPATH}"
     FPATH="$HOMEBREW_PREFIX/share/zsh/site-functions:${FPATH}"
 fi
 

-# fnm is installed through Homebrew on this macOS setup.
+# fnm via brew

 if [[ -d "${HOMEBREW_PREFIX:-}/opt/fnm/bin" ]]; then
     eval "$(fnm env --shell zsh)"
 fi
 
 if [[ -d "${HOMEBREW_PREFIX:-}/opt/fnm/bin" ]]; then
     eval "$(fnm env --shell zsh)"
 fi
 

-# Load shared settings after Homebrew has added its completion definitions.
+# Load shared settings brew's got its completion definitions.

 source "$HOME/.zsh/common.zsh"
 
 source "$HOME/.zsh/common.zsh"
 

-# Load plugins after compinit; syntax highlighting must be the final plugin loaded.
+# load plugins after compinit; syntax highlighting is the final plugin loaded.

 if [[ -n ${HOMEBREW_PREFIX:-} ]]; then
     [[ -r "$HOMEBREW_PREFIX/opt/fzf-tab/share/fzf-tab/fzf-tab.zsh" ]] && \
         source "$HOMEBREW_PREFIX/opt/fzf-tab/share/fzf-tab/fzf-tab.zsh"
 if [[ -n ${HOMEBREW_PREFIX:-} ]]; then
     [[ -r "$HOMEBREW_PREFIX/opt/fzf-tab/share/fzf-tab/fzf-tab.zsh" ]] && \
         source "$HOMEBREW_PREFIX/opt/fzf-tab/share/fzf-tab/fzf-tab.zsh"


@@ -38,5 +38,3 @@ if [[ -n ${HOMEBREW_PREFIX:-} ]]; then
     [[ -r "$HOMEBREW_PREFIX/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh" ]] && \
         source "$HOMEBREW_PREFIX/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh"
 fi
     [[ -r "$HOMEBREW_PREFIX/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh" ]] && \
         source "$HOMEBREW_PREFIX/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh"
 fi

-
-[[ -r "$HOME/.docker/init-zsh.sh" ]] && source "$HOME/.docker/init-zsh.sh"

diff --git a/.zshrc b/.zshrc
index 04fd875314d0cdcac240d51ce9a256d4ec5aaaa6..38e89b6ca4fbf4a7b31381e8e54ca1226bad91dd 100644 (file)
--- a/.zshrc
+++ b/.zshrc
@@ -8,5 +8,3 @@ else
     source "$HOME/.zsh/common.zsh"
 fi
 
     source "$HOME/.zsh/common.zsh"
 fi
 

-# optional local settings
-[[ -r "$HOME/.zsh/local.zsh" ]] && source "$HOME/.zsh/local.zsh"