Cleanup

diff --git a/.tmux.conf b/.tmux.conf
index 3e977b7763a59e18a4319ef7327b414a49c0eaa3..16a9aa98694ed1682b96c6211c823d40145d0b0e 100644 (file)
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -1,49 +1,20 @@
-# Start numbering at 1
-set -g base-index 1
+set -g default-terminal "screen-256color"
+
+# mouse on for scrolling
+set -g mouse on

 
 # Allows for faster key repetition
 set -s escape-time 0
 
 
 # Allows for faster key repetition
 set -s escape-time 0
 

+# constrain window size to the maximum size of any client connected to that window
+setw -g aggressive-resize on
+

 # Set status bar
 # Set status bar

-set -g status-bg default
+set -g status-bg colour0

 set -g status-fg white
 set -g status-left-length 20
 set -g status-right-length 40
 set -g status-fg white
 set -g status-left-length 20
 set -g status-right-length 40

-set -g status-left "#[bg=colour0]#[fg=colour4] #h [#[fg=colour15]#I#[fg=colour4]] >>> "
+set -g status-left "#[bg=colour0]#[fg=colour4] #h [#[fg=colour15]#I#[fg=colour4]] "

 # set -g status-right "#[bg=colour33]#[fg=colour255]#[fg=colour232] #[fg=colour255]#(uptime | awk {'print $8, $9, $10'})#[fg=colour232] #[bg=colour232] #[bg=colour33] #[fg=colour255]#(date '+%H:%M %d-%m-%Y')#[fg=colour232] "
 # set -g status-right "#[bg=colour33]#[fg=colour255]#[fg=colour232] #[fg=colour255]#(uptime | awk {'print $8, $9, $10'})#[fg=colour232] #[bg=colour232] #[bg=colour33] #[fg=colour255]#(date '+%H:%M %d-%m-%Y')#[fg=colour232] "

-set -g status-right "#[bg=colour33]#[fg=colour255]#[fg=colour232]#[bg=colour232]#[fg=colour149]#(date '+%H:%M %Y-%m-%d')"
-set -g terminal-overrides 'xterm*:smcup@:rmcup@'
-set -g default-terminal "screen-256color"
-
-# Rather than constraining window size to the maximum size of any client
-# connected to the *session*, constrain window size to the maximum size of any
-# client connected to *that window*. Much more reasonable.
-setw -g aggressive-resize on
-
-# Allows us to use C-a a <command> to send commands to a TMUX session inside
-# another TMUX session
-bind-key a send-prefix
-
-# Highlight active window
-set-window-option -g window-status-current-format '#[bg=colour33]#[fg=colour255] #I #W '
-# set scroll back history limit
-set-option -g history-limit 10000
-
-## set status bar
-# set-option -g status-utf8 on
-set-option -g status-interval 1
-
-set-option -g status-right-length 100
-set-option -g status-left-length 120
-
-## set window notifications
-set-option -g visual-activity on
-
-## set-option -g visual-content on
-set-window-option -g monitor-activity off
-set-window-option -g automatic-rename off
+set -g status-right "#[bg=colour0]#[fg=colour255]#[fg=colour232]#[bg=colour0]#[fg=colour149]#(date '+%H:%M %Y-%m-%d')"

 
 

-## tmux window titling for X
-set-option -g set-titles on
-set-option -g set-titles-string '[#I] #W'
-set-window-option -g window-status-format ' #I #W '

diff --git a/.zsh-darwin b/.zsh-darwin
index 218c40a47f8b3f301a06146a7b9628cafa7db660..cf674306e5e220ff2b304f72000f53801c62960d 100644 (file)
--- a/.zsh-darwin
+++ b/.zsh-darwin
@@ -15,7 +15,6 @@ PROMPT='%F{cyan}%n@%m%f %F{240}%1~ %f%# '
 RPROMPT='%F{green}${vcs_info_msg_0_} %F{240}%*%f'
 
 # aliases
 RPROMPT='%F{green}${vcs_info_msg_0_} %F{240}%*%f'
 
 # aliases

-alias cfg='/usr/bin/git --git-dir=/Users/gld/.cfg/ --work-tree=/Users/gld'

 alias ls='ls -G'
 alias cats='highlight -O ansi --force'
 alias x86='arch -x86_64 zsh' # Start Shell in Rosetta 2 (M1 Macs)
 alias ls='ls -G'
 alias cats='highlight -O ansi --force'
 alias x86='arch -x86_64 zsh' # Start Shell in Rosetta 2 (M1 Macs)


@@ -32,7 +31,6 @@ alias ubuntu='limactl shell ubuntu'
 # ncdu - directory size
 # fzf - fuzzy file search
 
 # ncdu - directory size
 # fzf - fuzzy file search
 

-

 # if x86, show in prompt
 if [ `arch` = "i386" ];
 then
 # if x86, show in prompt
 if [ `arch` = "i386" ];
 then


@@ -50,9 +48,5 @@ export NVM_DIR="$HOME/.nvm"
 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
 [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
 
 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
 [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
 

-# ruby
-export PATH="/Users/gld/.gem/ruby/3.1.1/bin:/opt/homebrew/opt/ruby/bin:/opt/homebrew/lib/ruby/gems/3.1.1/bin:$PATH"
-

 # LaTeX
 export PATH="/etc/paths.d/TeX:/Library/TeX/texbin:$PATH"
 # LaTeX
 export PATH="/etc/paths.d/TeX:/Library/TeX/texbin:$PATH"

-

diff --git a/.zshrc b/.zshrc
index ffba2fb8c406c1d8e79f1bbda566f30fc6a2ac20..9fcca49c1f0581a3dd90ef5f393c4c8517e999fa 100644 (file)
--- a/.zshrc
+++ b/.zshrc
@@ -1,6 +1,6 @@
 if [[ "$OSTYPE" == "darwin"* ]]; then
 
 if [[ "$OSTYPE" == "darwin"* ]]; then
 

-    # if OSX
+    # OSX

     if [[ -e ~/.zsh-darwin ]]; then
         source ~/.zsh-darwin
     fi
     if [[ -e ~/.zsh-darwin ]]; then
         source ~/.zsh-darwin
     fi


@@ -8,7 +8,6 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
 else
     
     # Linux or other
 else
     
     # Linux or other

-    # Source zsh config

     if [[ -e ~/.zsh-config ]]; then
         source ~/.zsh-config
     fi
     if [[ -e ~/.zsh-config ]]; then
         source ~/.zsh-config
     fi


@@ -18,4 +17,4 @@ else
         source ~/.zsh-prompt
     fi
 
         source ~/.zsh-prompt
     fi
 

-fi
+fi
\ No newline at end of file