diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 7426d05..e13eac4 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -25,9 +25,9 @@ end # Emacs ################################################################################ -set -gx EDITOR "emacs -nw" alias emacs="emacs -nw" -alias gemacs="emacs" +alias gemacs="/usr/bin/emacs" +set -gx EDITOR "emacs" ################################################################################ # Deb maintainer stuff diff --git a/.tmux.conf b/.tmux.conf deleted file mode 100644 index dadf25b..0000000 --- a/.tmux.conf +++ /dev/null @@ -1 +0,0 @@ -set -g default-terminal "tmux-256color" diff --git a/.tmux.conf.local b/.tmux.conf.local index 7872dc8..2fb1130 100644 --- a/.tmux.conf.local +++ b/.tmux.conf.local @@ -190,14 +190,10 @@ tmux_conf_theme_window_status_last_bg="$tmux_conf_theme_colour_2" tmux_conf_theme_window_status_last_attr="none" # status left/right sections separators -tmux_conf_theme_left_separator_main="" -tmux_conf_theme_left_separator_sub="|" -tmux_conf_theme_right_separator_main="" -tmux_conf_theme_right_separator_sub="|" -#tmux_conf_theme_left_separator_main='\uE0B0' # /!\ you don't need to install Powerline -#tmux_conf_theme_left_separator_sub='\uE0B1' # you only need fonts patched with -#tmux_conf_theme_right_separator_main='\uE0B2' # Powerline symbols or the standalone -#tmux_conf_theme_right_separator_sub='\uE0B3' # PowerlineSymbols.otf font, see README.md +tmux_conf_theme_left_separator_main='\uE0B0' # /!\ you don't need to install Powerline +tmux_conf_theme_left_separator_sub='\uE0B1' # you only need fonts patched with +tmux_conf_theme_right_separator_main='\uE0B2' # Powerline symbols or the standalone +tmux_conf_theme_right_separator_sub='\uE0B3' # PowerlineSymbols.otf font, see README.md # status left/right content: # - separate main sections with "|" @@ -226,8 +222,8 @@ tmux_conf_theme_right_separator_sub="|" # - #{uptime_s} # - #{username} # - #{username_ssh} -tmux_conf_theme_status_left=" ❐ #S | ↑#{?uptime_y, #{uptime_y}y,}#{?uptime_d, #{uptime_d}d,}#{?uptime_h, #{uptime_h}h,}#{?uptime_m, #{uptime_m}m,} " -tmux_conf_theme_status_right=" #{prefix}#{mouse}#{pairing}#{synchronized}#{?battery_status,#{battery_status},}#{?battery_bar, #{battery_bar},}#{?battery_percentage, #{battery_percentage},} , %R , %d %b | #{username}#{root} | #{hostname} " +tmux_conf_theme_status_left=" ❐ #S " +tmux_conf_theme_status_right=" #{prefix}#{mouse}#{pairing}#{synchronized}#{?battery_status,#{battery_status},}#{?battery_bar, #{battery_bar},}#{?battery_percentage, #{battery_percentage}, }#{cpu_fg_color} #{cpu_percentage} #{ram_fg_color} #{ram_percentage} #{cpu_temp_fg_color}#{cpu_temp_icon}#{cpu_temp} , %R , %d %b |#{root}" # status left style tmux_conf_theme_status_left_fg="$tmux_conf_theme_colour_6,$tmux_conf_theme_colour_7,$tmux_conf_theme_colour_8" @@ -384,11 +380,15 @@ tmux_conf_uninstall_plugins_on_reload=true # to enable a plugin, use the 'set -g @plugin' syntax: # visit https://github.com/tmux-plugins for available plugins #set -g @plugin 'tmux-plugins/tmux-copycat' -#set -g @plugin 'tmux-plugins/tmux-cpu' +set -g @plugin 'tmux-plugins/tmux-cpu' #set -g @plugin 'tmux-plugins/tmux-resurrect' #set -g @plugin 'tmux-plugins/tmux-continuum' #set -g @continuum-restore 'on' +set -g @cpu_temp_low_icon "" +set -g @cpu_temp_mid_icon "" +set -g @cpu_temp_high_icon "" + # -- custom variables ---------------------------------------------------------- @@ -406,7 +406,7 @@ tmux_conf_uninstall_plugins_on_reload=true # # /!\ do not "uncomment" the functions: the leading "# " characters are needed # # weather() { -# curl -m 1 wttr.in?format=3 2>/dev/null +# curl -m 1 "https://wttr.in?format=3" 2>/dev/null # sleep 900 # sleep for 15 minutes, throttle network requests whatever the value of status-interval # } # @@ -416,3 +416,15 @@ tmux_conf_uninstall_plugins_on_reload=true # # "$@" # # /!\ do not remove the previous line + + +set -gu prefix2 +unbind C-a +unbind _ +bind | split-window -h +set -g status-right-length 10 + + +# Local Variables: +# vc-follow-symlinks: t +# End: diff --git a/install.sh b/install.sh index a84016d..eb414b3 100755 --- a/install.sh +++ b/install.sh @@ -6,7 +6,6 @@ files=".config/fish \ .config/git \ .config/omf \ .config/starship \ -.tmux.conf \ .local/share/omf \ .emacs \ .tmux.conf.local"