fixed tmux mem cpu load issue. Working on making everything a submodule
This commit is contained in:
		
							parent
							
								
									3079c5b7b9
								
							
						
					
					
						commit
						004565e190
					
				
							
								
								
									
										3
									
								
								.gitmodules
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								.gitmodules
									
									
									
									
										vendored
									
									
								
							@ -50,3 +50,6 @@
 | 
			
		||||
[submodule "vim/pack/man/start/vimtex"]
 | 
			
		||||
	path = vim/pack/man/start/vimtex
 | 
			
		||||
	url = https://github.com/lervag/vimtex.git
 | 
			
		||||
[submodule "bin/tmux-mem-cpu-load"]
 | 
			
		||||
	path = bin/tmux-mem-cpu-load
 | 
			
		||||
	url = https://github.com/thewtex/tmux-mem-cpu-load
 | 
			
		||||
 | 
			
		||||
@ -1,9 +1,7 @@
 | 
			
		||||
#!/usr/bin/env bash
 | 
			
		||||
# checks for agent status and echos to status bar
 | 
			
		||||
 | 
			
		||||
SOCK=$(readlink -f ~/.ssh/ssh_auth_sock)
 | 
			
		||||
 | 
			
		||||
if [ -e $SOCK ] ; then
 | 
			
		||||
if [ -S ~/.ssh/ssh_auth_sock ] ; then
 | 
			
		||||
    # agent active
 | 
			
		||||
    clr='#[fg=color34]' # green
 | 
			
		||||
    symb=$(echo -e '\uf00c')
 | 
			
		||||
 | 
			
		||||
@ -1,7 +1,7 @@
 | 
			
		||||
#!/bin/bash
 | 
			
		||||
set -e
 | 
			
		||||
 | 
			
		||||
cd $HOME/.dotfiles/tmux/plugins/tmux-mem-cpu-load
 | 
			
		||||
cd $HOME/.dotfiles/bin/tmux-mem-cpu-load
 | 
			
		||||
cmake .
 | 
			
		||||
make
 | 
			
		||||
sudo make install
 | 
			
		||||
							
								
								
									
										1
									
								
								bin/tmux-mem-cpu-load
									
									
									
									
									
										Submodule
									
								
							
							
								
								
								
								
								
								
									
									
								
							
						
						
									
										1
									
								
								bin/tmux-mem-cpu-load
									
									
									
									
									
										Submodule
									
								
							@ -0,0 +1 @@
 | 
			
		||||
Subproject commit 5dccd1801f36efb14e6b43ad90cb9569fe220d1c
 | 
			
		||||
@ -1,9 +1,9 @@
 | 
			
		||||
TEMP=35.06000000000000000000
 | 
			
		||||
HUMIDITY=63.929305394195
 | 
			
		||||
ICON=skc
 | 
			
		||||
TEMP=42.08000000000000000000
 | 
			
		||||
HUMIDITY=88.816089115542
 | 
			
		||||
ICON=ovc
 | 
			
		||||
LOCATION=
 | 
			
		||||
ZONE=https://api.weather.gov/zones/forecast/MAZ014
 | 
			
		||||
CITY="Cambridge"
 | 
			
		||||
STATE="MA"
 | 
			
		||||
CITY=Cambridge
 | 
			
		||||
STATE=MA
 | 
			
		||||
TOD=night
 | 
			
		||||
EXPIRATION=1673315272
 | 
			
		||||
EXPIRATION=1673570805
 | 
			
		||||
 | 
			
		||||
@ -1,3 +1,24 @@
 | 
			
		||||
#!/bin/bash
 | 
			
		||||
#source "$HOME/.dotfiles/.priv/key"
 | 
			
		||||
#source "$HOME/.dotfiles/bin/weather/.env.location"
 | 
			
		||||
#source "$HOME/.dotfiles/bin/weather/.env.weather"
 | 
			
		||||
# API_KEY=$(cat "$HOME/.dotfiles/bin/weather/.priv/key")
 | 
			
		||||
# getting weather
 | 
			
		||||
CUR_TIMESTAMP=$(date +%s)
 | 
			
		||||
# only update weather every 30 seconds
 | 
			
		||||
 | 
			
		||||
if [[ $CUR_TIMESTAMP -gt $EXPIRATION  || -z $EXPIRATION ]] ; then
 | 
			
		||||
    WEATHER=$(curl --silent "http://wttr.in/${LOCATION}?format=j2" | gojq -r '.current_condition[0]')
 | 
			
		||||
 | 
			
		||||
    echo $WEATHER
 | 
			
		||||
    TEMP=$(echo $WEATHER | gojq -r '.temp_F')
 | 
			
		||||
    HUMIDITY=$(echo $WEATHER | gojq -r '.humidity')
 | 
			
		||||
    ICON=$(echo $WEATHER | gojq -r '.weatherCode')
 | 
			
		||||
    EXPIRATION=$(($CUR_TIMESTAMP+30))
 | 
			
		||||
    echo "TEMP: $TEMP HUMIDITY: $HUMIDITY ICON: $ICON"
 | 
			
		||||
    #printf 'TEMP=%s\nHUMIDITY=%s\nICON=%s\nEXPIRATION=%s\n' "$TEMP" "$HUMIDITY" "$ICON" "$EXPIRATION" >"$HOME/.dotfiles/bin/weather/.env.weather"
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
#!/usr/bin/env bash
 | 
			
		||||
 | 
			
		||||
WEATHER_DIR="${HOME}/.dotfiles/bin/weather"
 | 
			
		||||
							
								
								
									
										
											BIN
										
									
								
								bin/weather/archived/weather
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								bin/weather/archived/weather
									
									
									
									
									
										Executable file
									
								
							
										
											Binary file not shown.
										
									
								
							@ -1,20 +0,0 @@
 | 
			
		||||
#!/bin/bash
 | 
			
		||||
#source "$HOME/.dotfiles/.priv/key"
 | 
			
		||||
#source "$HOME/.dotfiles/bin/weather/.env.location"
 | 
			
		||||
#source "$HOME/.dotfiles/bin/weather/.env.weather"
 | 
			
		||||
# API_KEY=$(cat "$HOME/.dotfiles/bin/weather/.priv/key")
 | 
			
		||||
# getting weather
 | 
			
		||||
CUR_TIMESTAMP=$(date +%s)
 | 
			
		||||
# only update weather every 30 seconds
 | 
			
		||||
 | 
			
		||||
if [[ $CUR_TIMESTAMP -gt $EXPIRATION  || -z $EXPIRATION ]] ; then
 | 
			
		||||
    WEATHER=$(curl --silent "http://wttr.in/${LOCATION}?format=j2" | gojq -r '.current_condition[0]')
 | 
			
		||||
 | 
			
		||||
    echo $WEATHER
 | 
			
		||||
    TEMP=$(echo $WEATHER | gojq -r '.temp_F')
 | 
			
		||||
    HUMIDITY=$(echo $WEATHER | gojq -r '.humidity')
 | 
			
		||||
    ICON=$(echo $WEATHER | gojq -r '.weatherCode')
 | 
			
		||||
    EXPIRATION=$(($CUR_TIMESTAMP+30))
 | 
			
		||||
    echo "TEMP: $TEMP HUMIDITY: $HUMIDITY ICON: $ICON"
 | 
			
		||||
    #printf 'TEMP=%s\nHUMIDITY=%s\nICON=%s\nEXPIRATION=%s\n' "$TEMP" "$HUMIDITY" "$ICON" "$EXPIRATION" >"$HOME/.dotfiles/bin/weather/.env.weather"
 | 
			
		||||
fi
 | 
			
		||||
@ -1,46 +0,0 @@
 | 
			
		||||
#!/usr/bin/env bash
 | 
			
		||||
 | 
			
		||||
# source symbol based on $WEATHER_CODE and $TOD
 | 
			
		||||
# WeatherCodesDay := map[string]rune{
 | 
			
		||||
# "Unkown":              '\ue374',
 | 
			
		||||
# "Cloudy":              '\ue302',
 | 
			
		||||
# "Fog":                 '\ue303',
 | 
			
		||||
# "HeavyRain":           '\ue318',
 | 
			
		||||
# "HeavyShowers":        '\ue318',
 | 
			
		||||
# "HeavySnow":           '\ue31a',
 | 
			
		||||
# "HeavySnowShowers":    '\ue31a',
 | 
			
		||||
# "LightRain":           '\ue308',
 | 
			
		||||
# "LightShowers":        '\ue308',
 | 
			
		||||
# "LightSleet":          '\ue3aa',
 | 
			
		||||
# "LightSleetShowers":   '\ue3aa',
 | 
			
		||||
# "LightSnow":           '\ue30a',
 | 
			
		||||
# "LightSnowShowers":    '\ue30a',
 | 
			
		||||
# "PartlyCloudy":        '\ue37b',
 | 
			
		||||
# "Sunny":               '\ue30d',
 | 
			
		||||
# "ThunderyHeavyRain":   '\ue31d',
 | 
			
		||||
# "ThunderyShowers":     '\ue31d',
 | 
			
		||||
# "ThunderySnowShowers": '\ue365',
 | 
			
		||||
# "VeryCloudy":          '\ue312',
 | 
			
		||||
# }
 | 
			
		||||
 | 
			
		||||
# WeatherCodesNight := map[string]rune{
 | 
			
		||||
# "Unkown":              '\ue374',
 | 
			
		||||
# "Cloudy":              '\ue37e',
 | 
			
		||||
# "Fog":                 '\ue346',
 | 
			
		||||
# "HeavyRain":           '\ue318',
 | 
			
		||||
# "HeavyShowers":        '\ue318',
 | 
			
		||||
# "HeavySnow":           '\ue31a',
 | 
			
		||||
# "HeavySnowShowers":    '\ue31a',
 | 
			
		||||
# "LightRain":           '\ue325',
 | 
			
		||||
# "LightShowers":        '\ue325',
 | 
			
		||||
# "LightSleet":          '\ue3ac',
 | 
			
		||||
# "LightSleetShowers":   '\ue3ac',
 | 
			
		||||
# "LightSnow":           '\ue361',
 | 
			
		||||
# "LightSnowShowers":    '\ue361',
 | 
			
		||||
# "PartlyCloudy":        '\ue379',
 | 
			
		||||
# "Sunny":               '\ue32b',
 | 
			
		||||
# "ThunderyHeavyRain":   '\ue31d',
 | 
			
		||||
# "ThunderyShowers":     '\ue31d',
 | 
			
		||||
# "ThunderySnowShowers": '\ue366',
 | 
			
		||||
# "VeryCloudy":          '\ue312',
 | 
			
		||||
# }
 | 
			
		||||
@ -1 +0,0 @@
 | 
			
		||||
{ "FeelsLikeC": "28", "FeelsLikeF": "82", "cloudcover": "75", "humidity": "48", "localObsDateTime": "2022-08-17 01:09 PM", "observation_time": "05:09 PM", "precipInches": "0.0", "precipMM": "0.3", "pressure": "1015", "pressureInches": "30", "temp_C": "25", "temp_F": "77", "uvIndex": "4", "visibility": "16", "visibilityMiles": "9", "weatherCode": "116", "weatherDesc": [ { "value": "Partly cloudy" } ], "weatherIconUrl": [ { "value": "" } ], "winddir16Point": "E", "winddirDegree": "80", "windspeedKmph": "22", "windspeedMiles": "14" }
 | 
			
		||||
										
											Binary file not shown.
										
									
								
							@ -28,6 +28,12 @@
 | 
			
		||||
    - [cp ./vim/hybrid/colors/hybrid.vim ./vim/colors/hybrid.vim, Setting up theme]
 | 
			
		||||
    - [tmux/plugins/tpm/bin/install_plugins, Installing Tmux Plugins]
 | 
			
		||||
    - [tmux/plugins/tpm/bin/update_plugins all, Updating Tmux Plugins]
 | 
			
		||||
    -
 | 
			
		||||
      command: bin/mclinstall.sh
 | 
			
		||||
      stdin: true
 | 
			
		||||
      stdout: true
 | 
			
		||||
      stderr: true
 | 
			
		||||
      description: Installing tmux_mem_cpu_load
 | 
			
		||||
    -
 | 
			
		||||
      command: pip install ranger-fm
 | 
			
		||||
      stdin: true
 | 
			
		||||
@ -46,11 +52,6 @@
 | 
			
		||||
      stdout: true
 | 
			
		||||
      stderr: true
 | 
			
		||||
      description: Installing Fzf
 | 
			
		||||
    - 
 | 
			
		||||
      command: bin/tmux_mem_cpu_load.sh
 | 
			
		||||
      stdin: true
 | 
			
		||||
      stdout: true
 | 
			
		||||
      description: Building the mem-cpu-load tracker for tmux
 | 
			
		||||
    - 
 | 
			
		||||
      command: bin/weather/symbol_test.sh
 | 
			
		||||
      stdout: true
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										11
									
								
								tmux.conf
									
									
									
									
									
								
							
							
						
						
									
										11
									
								
								tmux.conf
									
									
									
									
									
								
							@ -17,7 +17,7 @@ set -g @plugin 'tmux-plugins/tpm'
 | 
			
		||||
set -g @plugin 'tmux-plugins/tmux-sensible'
 | 
			
		||||
 | 
			
		||||
# status bar
 | 
			
		||||
set -g @plugin 'thewtex/tmux-mem-cpu-load'
 | 
			
		||||
#set -g @plugin 'thewtex/tmux-mem-cpu-load'
 | 
			
		||||
 | 
			
		||||
# clock settings
 | 
			
		||||
set -g clock-mode-colour white
 | 
			
		||||
@ -25,9 +25,10 @@ set -g clock-mode-colour white
 | 
			
		||||
# status config
 | 
			
		||||
set -g status-interval 10
 | 
			
		||||
set -g status-style "bg=black, fg=brightWhite"
 | 
			
		||||
set -g status-right "#(~/.dotfiles/bin/docker.sh)| #(~/.dotfiles/bin/agent/checker.sh) | #(~/.tmux/plugins/tmux-mem-cpu-load/tmux-mem-cpu-load -p -i 1 -a 1) | #(~/.dotfiles/bin/up.sh) | %A, %b %d %l:%M %P "
 | 
			
		||||
#set -g status-right "#(~/.dotfiles/bin/docker.sh)| #(~/.dotfiles/bin/agent/checker.sh) | #($TMUX_PLUGIN_MANAGER_PATH/tmux-mem-cpu-load/tmux-mem-cpu-load -p -i 1 -a 1) | #(~/.dotfiles/bin/up.sh) | %A, %b %d %l:%M %P "
 | 
			
		||||
set -g status-right "#(~/.dotfiles/bin/docker.sh)| #(~/.dotfiles/bin/agent/checker.sh) | #(tmux-mem-cpu-load -p -i 1 -a 1) | #(~/.dotfiles/bin/up.sh) | %A, %b %d %l:%M %P "
 | 
			
		||||
set -g status-right-length 100
 | 
			
		||||
set -g status-left "#(~/.dotfiles/bin/weather/weather) | #(~/.dotfiles/bin/bluebikes/bb -c) | #(~/.dotfiles/bin/water/water.sh -Scr) |"
 | 
			
		||||
set -g status-left "#(~/.dotfiles/bin/weather/weather -p) | #(~/.dotfiles/bin/bluebikes/bb -c) | #(~/.dotfiles/bin/water/water.sh -Scr) |"
 | 
			
		||||
set -g status-left-length 100
 | 
			
		||||
 | 
			
		||||
# tmux auto start
 | 
			
		||||
@ -39,11 +40,11 @@ set -g @continuum-save-interval 10
 | 
			
		||||
set -g @resurrect-capture-pane-contents 'on'
 | 
			
		||||
set -g @resurrect-strategy-vim 'session'
 | 
			
		||||
set -g @continuum-boot 'on'
 | 
			
		||||
set -g @continuum-systemd-start-cmd 'new-session -d -s doormat'
 | 
			
		||||
#set -g @continuum-systemd-start-cmd 'new-session -d -s doormat'
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
# run tpm
 | 
			
		||||
run '~/.tmux/plugins/tpm/tpm'
 | 
			
		||||
#-#-# start_of_ranger_tmux_config #-#-#
 | 
			
		||||
bind-key Bspace run-shell -b '/sbin/python -m ranger_tmux.drop'
 | 
			
		||||
bind-key Bspace run-shell -b '/usr/bin/python -m ranger_tmux.drop'
 | 
			
		||||
#-#-# end_of_ranger_tmux_config #-#-#
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user