allways fixing tmux config

.config/fish/config.fish

@@ -12,18 +12,13 @@ end
 
 set fish_greeting ""
 
-if test -x $HOME/.local/bin
-   set PATH $PATH $HOME/.local/bin
-end
-
-
 ################################################################################
 # exa
 ################################################################################
 
 if type -q exa
    alias ls="exa --git -g"
-   set -gx EXA_COLORS "da=35:uu=33:gu=33"
+   set -gx EXA_COLORS "da=36:uu=33:gu=33"
 end
 
 ################################################################################
@@ -33,7 +28,6 @@ end
 alias emacs="emacs -nw"
 alias gemacs="/usr/bin/emacs"
 set -gx EDITOR "emacs"
-set -gx LSP_USE_PLISTS "true"
 
 ################################################################################
 # Deb maintainer stuff
@@ -64,18 +58,16 @@ export MINICOM="-c on"
 
 
 ################################################################################
-# Anaconda / Conda / Mambaforge
+# Conda
 ################################################################################
 
-set CONDA_PREFIXES mambaforge miniforge3 miniconda3 anaconda3
+if test -x $HOME/miniconda3/bin/conda
-for prefix in $CONDA_PREFIXES
+   # >>> conda initialize >>>
-    if test -x $HOME/$prefix/bin/conda
+   # !! Contents within this block are managed by 'conda init' !!
-       eval $HOME/$prefix/bin/conda "shell.fish" "hook" $argv | source
+   eval $HOME/miniconda3/bin/conda "shell.fish" "hook" $argv | source
-       break
+   # <<< conda initialize <<<
-    end
 end
 
-
 ################################################################################
 # direnv
 ################################################################################
@@ -88,22 +80,6 @@ direnv hook fish | source
 
 starship init fish | source
 
-################################################################################
-# CUDA
-################################################################################
-
-if test -d /usr/local/cuda
-   set  PATH $PATH /usr/local/cuda/bin
-end
-
-################################################################################
-# RUST
-################################################################################
-
-if test -d $HOME/.cargo/bin
-   set PATH $PATH $HOME/.cargo/bin
-end
-
 ################################################################################
 # Colortest
 ################################################################################

.config/fish/fish_variables

@@ -1,14 +1,14 @@
 # This file contains fish universal variable definitions.
 # VERSION: 3.0
-SETUVAR __fish_initialized:3400
+SETUVAR __fish_initialized:3100
 SETUVAR fish_color_autosuggestion:969896
 SETUVAR fish_color_cancel:\x2dr
-SETUVAR fish_color_command:b294bb
+SETUVAR fish_color_command:c397d8
-SETUVAR fish_color_comment:f0c674
+SETUVAR fish_color_comment:e7c547
 SETUVAR fish_color_cwd:green
 SETUVAR fish_color_cwd_root:red
-SETUVAR fish_color_end:b294bb
+SETUVAR fish_color_end:c397d8
-SETUVAR fish_color_error:cc6666
+SETUVAR fish_color_error:d54e53
 SETUVAR fish_color_escape:00a6b2
 SETUVAR fish_color_history_current:\x2d\x2dbold
 SETUVAR fish_color_host:normal
@@ -16,9 +16,9 @@ SETUVAR fish_color_host_remote:yellow
 SETUVAR fish_color_match:\x2d\x2dbackground\x3dbrblue
 SETUVAR fish_color_normal:normal
 SETUVAR fish_color_operator:00a6b2
-SETUVAR fish_color_param:81a2be
+SETUVAR fish_color_param:7aa6da
-SETUVAR fish_color_quote:b5bd68
+SETUVAR fish_color_quote:b9ca4a
-SETUVAR fish_color_redirection:8abeb7
+SETUVAR fish_color_redirection:70c0b1
 SETUVAR fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack
 SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack
 SETUVAR fish_color_status:red
@@ -30,4 +30,3 @@ SETUVAR fish_pager_color_completion:normal
 SETUVAR fish_pager_color_description:B3A06D\x1eyellow
 SETUVAR fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
 SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
-SETUVAR fish_pager_color_selected_background:\x2dr

.config/git/config

@@ -3,12 +3,3 @@
 	email = alexandre.tuleu.2005@polytechnique.org
 [credential]
 	helper = cache
-[merge]
-	tool = meld
-[init]
-	defaultBranch = main
-[filter "lfs"]
-	clean = git-lfs clean -- %f
-	smudge = git-lfs smudge -- %f
-	process = git-lfs filter-process
-	required = true

.config/git/ignore

@@ -1,7 +1,3 @@
 *~
 .dir-locals.el
 .envrc
-.direnv
-cover.out
-.projectile
-.clangd

.config/omf/bundle

@@ -1,4 +1,2 @@
-package foreign-env
-package nvm
 theme bobthefish
 theme default

.config/starship.toml

@@ -8,8 +8,8 @@ disabled = true
 
 
 [character]                            # The name of the module we are configuring is "character"
-success_symbol = "[](#444444)"     # The "success_symbol" segment is being set to "➜" with the color "bold green"
+success_symbol = "[◤](#444444)"     # The "success_symbol" segment is being set to "➜" with the color "bold green"
-error_symbol = "[](red)"     # The "success_symbol" segment is being set to "➜" with the color "bold green"
+error_symbol = "[◤](red)"     # The "success_symbol" segment is being set to "➜" with the color "bold green"
 
 [username]
 style_user="bold green"
@@ -44,12 +44,12 @@ format="[$symbol$version]($style) "
 disabled = false
 map_symbol = true
 style="bg:#444444 red"
-format = "[](#444444 bg:red)[$symbol $status ](bg:red)"
+format = "[◤](#444444 bg:red)[$symbol $status ](bg:red)"
 
 [time]
 disabled = false
 style="bg:#444444 bright-white"
-format="[$time ]($style)"
+format="[◢](#444444)[$time ]($style)"
 time_format = '%a %b %d %R'
 
 [git_branch]
@@ -67,8 +67,4 @@ disabled=false
 
 [git_status]
 style="bold red"
-format='([\[$all_status$ahead_behind\]]($style) )'
+format='([\[$all_status$ahead_behind\]]($style) )'
-
-# Local Variables:
-# vc-follow-symlinks: t
-# End:

.tmux.conf.local

@@ -45,31 +45,31 @@ tmux_conf_new_session_prompt=false
 #  - false (default)
 tmux_conf_24b_colour=true
 
-th_color_black="#282A2E"
+th_color_black="#2A2A2A"
-th_color_black_light="#373B41"
+th_color_black_light="#424242"
-th_color_red="#CC6666"
+th_color_red="#E44455"
-th_color_red_light="#FF9999"
+th_color_red_light="#FF7485"
-th_color_orange="#DE935F"
+th_color_orange="#F5864F"
-th_color_orange_light="#FFC38F"
+th_color_orange_light="#FFB67F"
-th_color_yellow="#F0C674"
+th_color_yellow="#F0C15A"
-th_color_yellow_light="#FFF6A4"
+th_color_yellow_light="#FFF18A"
-th_color_green="#B5BD68"
+th_color_green="#BAC85B"
-th_color_green_light="#E5ED98"
+th_color_green_light="#EAF88B"
-th_color_cyan="#8ABEB7"
+th_color_cyan="#57C1B2"
-th_color_cyan_light="#BAEEE7"
+th_color_cyan_light="#87F1E2"
-th_color_blue="#81A2BE"
+th_color_blue="#69A9D7"
-th_color_blue_light="#B1D2EE"
+th_color_blue_light="#99D9FF"
-th_color_magenta="#B294BB"
+th_color_magenta="#C798D4"
-th_color_magenta_light="#E2C4EB"
+th_color_magenta_light="#F7C8FF"
 th_color_gray="#969896"
-th_color_white="#C5C8C6"
+th_color_white="#EAEAEA"
 
 
 # default theme
 tmux_conf_theme_colour_1="$th_color_black_light"    # dark gray
 tmux_conf_theme_colour_2="$th_color_black"    # gray
 tmux_conf_theme_colour_3="$th_color_gray"    # light gray
-tmux_conf_theme_colour_4="$th_color_cyan"
+tmux_conf_theme_colour_4="$th_color_cyan_light"
 #command-line
 tmux_conf_theme_colour_5="$th_color_green"
 #status left fg
@@ -108,7 +108,7 @@ tmux_conf_theme_focused_pane_bg="$tmux_conf_theme_colour_2"
 tmux_conf_theme_pane_border_style=thin
 
 # pane borders colours:
-tmux_conf_theme_pane_border="$th_color_gray"
+tmux_conf_theme_pane_border="$tmux_conf_theme_colour_2"
 tmux_conf_theme_pane_active_border="$tmux_conf_theme_colour_4"
 
 # pane indicator colours (when you hit <prefix> + q)
@@ -162,7 +162,7 @@ tmux_conf_theme_window_status_bg="$tmux_conf_theme_colour_1"
 tmux_conf_theme_window_status_attr="none"
 tmux_conf_theme_window_status_format="#I #W"
 #tmux_conf_theme_window_status_format="#{circled_window_index} #W"
-tmux_conf_theme_window_status_format="#I #W#{?window_bell_flag,🔔,}#{?window_zoomed_flag,🔍,}"
+#tmux_conf_theme_window_status_format="#I #W#{?window_bell_flag,🔔,}#{?window_zoomed_flag,🔍,}"
 
 # window current status style
 #   - built-in variables are:
@@ -230,7 +230,7 @@ tmux_conf_theme_right_separator_sub='\uE0B3'  #   PowerlineSymbols.otf font, see
 #     - #{username}
 #     - #{username_ssh}
 tmux_conf_theme_status_left=" ❐ #S "
-tmux_conf_theme_status_right=" #{prefix}#{pairing}#{synchronized} ,#{?battery_status,#{battery_status},}#{?battery_vbar, #{battery_vbar},}#{?battery_percentage, #{battery_percentage}, } #{weather} #{cpu_fg_color} #{cpu_percentage} #{ram_fg_color}󰍛 #{ram_percentage} #{cpu_temp_fg_color}#{cpu_temp_icon}#{cpu_temp} , %R , %d %b |#{root}"
+tmux_conf_theme_status_right=" #{prefix}#{pairing}#{synchronized} ,#{?battery_status,#{battery_status},}#{?battery_vbar, #{battery_vbar},}#{?battery_percentage, #{battery_percentage}, }#{weather}, #{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"
@@ -341,11 +341,11 @@ tmux_conf_copy_to_os_clipboard=false
 #set -g mode-keys vi
 
 # replace C-b by C-a instead of using both prefixes
-set -gu prefix2
+# set -gu prefix2
-unbind C-a
+# unbind C-a
-unbind C-b
+# unbind C-b
-set -g prefix C-\\
+# set -g prefix C-a
-bind C-\\ send-prefix
+# bind C-a send-prefix
 
 # move status line to top
 #set -g status-position top

README.md

@@ -1,24 +0,0 @@
-# Personnal configuration
-
-## Installation
-You can install this configuration on a new system using
-
-```bash
-curl -sSL https://git.tuleu.science/atuleu/home/raw/branch/master/update.sh | bash && $HOME/.home/update.sh
-```
-
-## Keeping it synced
-
-You can then update the configuration with:
-
-```bash
-$HOME/.home/update.sh
-```
-
-On a GNOME environment you may want to:
-
-```bash
-$HOME/.home/update.sh --gnome
-```
-
-This will install necessary fonts and makes GNOME terminal actually looks good.

gnome-terminal-profiles.dconf

@@ -1,15 +0,0 @@
-[:b1dcc9dd-5262-4d8d-a863-c897e6d979b9]
-background-color='rgb(40,42,46)'
-background-transparency-percent=21
-bold-color-same-as-fg=true
-custom-command='env TERM=xterm-direct /usr/bin/fish'
-font='UbuntuMono Nerd Font Mono 11'
-foreground-color='rgb(197,200,198)'
-login-shell=false
-palette=['rgb(40,42,46)', 'rgb(204,102,102)', 'rgb(181,189,104)', 'rgb(240,198,116)', 'rgb(129,162,190)', 'rgb(178,148,187)', 'rgb(138,190,183)', 'rgb(150,152,150)', 'rgb(55,59,65)', 'rgb(255,153,153)', 'rgb(229,237,152)', 'rgb(255,246,164)', 'rgb(177,210,238)', 'rgb(226,196,235)', 'rgb(186,238,231)', 'rgb(197,200,198)']
-use-custom-command=true
-use-system-font=false
-use-theme-colors=false
-use-theme-transparency=true
-use-transparent-background=false
-visible-name='atuleu'

install.sh

@@ -0,0 +1,44 @@
+#!/bin/bash
+
+set -e
+
+files=".config/fish \
+.config/git \
+.config/omf \
+.config/starship \
+.local/share/omf \
+.emacs \
+.tmux.conf.local"
+
+
+function this_script_root_dir() {
+	dirname $(realpath ${BASH_SOURCE[0]})
+}
+
+function run() {
+	echo "$@"
+	$@
+}
+
+
+function install_home() {
+	for f in $files
+	do
+		run rm -Rf $HOME/$f
+		dir=$(dirname $f)
+		if [ ! "$dir" = "." ]
+		then
+			run mkdir -p $HOME/$dir
+		fi
+		run ln -sf $(this_script_root_dir)/$f $HOME/$f
+	done
+	run ln -sf $(this_script_root_dir)/.tmux/.tmux.conf $HOME/.tmux.conf
+}
+
+
+pushd $(this_script_root_dir)
+git pull
+git submodule init
+git submodule update
+popd
+install_home

update.sh

@@ -1,332 +0,0 @@
-#!/bin/bash
-
-set -e
-
-function print_help() {
-	echo "usage .home/update.sh [-g/--gnome] [-h/--help] [-v/--berbose] [-d/--dry]
-
-Installs and updates shared configuration on a system. Options are:
-
-  -h/--help    : print this help
-  --reinstall  : force reinstallation
-  -g/--gnome   : system is intended to run in a GNOME environement, and
-                 will setup gnome-terminal accordingly. Do not
-                 activate on headless system.
-  --font       : Installs font for gnome environment (selected if --gnome)
-  -v/--verbose : prints command before running them
-  -n/--dry     : dry run, do not execute commands. Implies --verbose.
-"
-}
-
-function exit_error() {
-	print_help
-	exit 1
-}
-
-GNOME=false
-FONT=false
-VERBOSE=false
-DRY=false
-REINSTALL=false
-
-function set_reinstall_on() {
-	REINSTALL=true
-}
-
-function set_gnome_on() {
-	GNOME=true
-	FONT=true
-}
-
-function set_font_on() {
-	FONT=true
-}
-
-function set_verbose_on() {
-	VERBOSE=true
-}
-
-function set_dry_on() {
-	DRY=true
-	VERBOSE=true
-}
-
-while getopts "vnhg-:" optchar
-do
-	case "${optchar}" in
-		-)
-			case "${OPTARG}" in
-				reinstall)
-					set_reinstall_on
-					;;
-				gnome)
-					set_gnome_on
-					;;
-				verbose)
-					set_verbose_on
-					;;
-				font)
-					set_font_on
-					;;
-				dry)
-					set_dry_on
-					;;
-				*)
-					echo "invalid argument --${OPTARG}"
-					exit_error
-					;;
-			esac;;
-		h)
-			print_help
-			exit 0
-			;;
-		g)
-			set_gnome_on
-			;;
-		n)
-			set_dry_on
-			;;
-		v)
-			set_verbose_on
-			;;
-		*)
-			exit_error
-			;;
-	esac
-done
-
-
-files=".config/fish \
-.config/git \
-.config/omf \
-.config/starship.toml \
-.local/share/omf \
-.emacs \
-.tmux.conf.local"
-
-
-
-
-function this_script_root_dir() {
-	dirname $(realpath ${BASH_SOURCE[0]})
-}
-
-function run() {
-	if $VERBOSE
-	then
-		echo "[$@]"
-	fi
-	if ! $DRY
-	then
-	   $@
-	fi
-}
-
-function run_git() {
-	if $VERBOSE
-	then
-	   echo "[git $@] in $(this_script_root_dir)"
-	fi
-	if ! $DRY
-	then
-		pushd $(this_script_root_dir) 1>/dev/null
-		if $VERBOSE
-		then
-			git $@
-		else
-			git $@ 1>/dev/null
-		fi
-		popd 1>/dev/null
-	fi
-}
-
-
-function load_gnome_terminal_profiles() {
-	echo "--- Installing GNOME terminal profile"
-	if which dconf 1>/dev/null
-	then
-		run dconf load /org/gnome/terminal/legacy/profiles:/ < $(this_script_root_dir)/gnome-terminal-profiles.dconf
-	fi
-}
-
-function install_fish() {
-	echo "--- Ensuring fish is current shell"
-	local fish_good=0
-	if ! which fish 1>/dev/null
-	then
-		fish_good=1
-	fi
-
-	local current_version=$(fish --version | cut -d " " -f 3)
-	local current_version_test=$(cat <<EOF
-${current_version}
-3.4.0
-EOF
-				)
-	if [ $(echo "${current_version_test}" | sort | head -1) != "3.4.0" ]
-	then
-		echo "Wrong version of fish ${current_version}"
-		fish_good=1
-	fi
-
-	if [ $fish_good -eq 1 ]
-	then
-		echo "+++ Installing fish from PPA"
-		run sudo add-apt-repository -y ppa:fish-shell/release-3
-		run sudo apt update
-		run sudo apt install -y fish
-	else
-		echo "+++ Fish is installed"
-    fi
-
-    fish=$(which fish)
-    current_shell=$(grep $USER /etc/passwd | cut -d ":" -f 7)
-    if [ $current_shell != $fish ]
-    then
-		echo "+++ Changing shell to $fish (you will be prompted for passwd)"
-		run chsh -s $fish
-	else
-		echo "+++ Default shell is $fish"
-    fi
-}
-
-function install_direnv() {
-	echo "--- Ensuring direnv is installed"
-    if ! which direnv 1>/dev/null
-    then
-		echo "++ Installing direnv"
-		run sudo apt-get install -y direnv
-	else
-		echo "+++ direnv is installed"
-    fi
-}
-
-
-function install_starship() {
-	echo "--- Ensuring starship is installed"
-    if which starship 1>/dev/null
-	then
-		echo "+++ Starship is installed"
-		if ! $REINSTALL
-		then
-			return
-		fi
-		echo "+++ Reinstalling starship"
-	fi
-	echo "+++ Installing starship"
-	if $VERBOSE
-	then
-		echo "[curl -sS https://starship.rs/install.sh | sh -s -- --yes]"
-	fi
-	if ! $DRY
-	then
-		curl -sS https://starship.rs/install.sh | sh -s -- --yes
-	fi
-}
-
-function install_ubuntu_mono_nerd() {
-	echo "--- Ensuring Ubuntu Mono Nerd font is present"
-	if [ ! -e /usr/share/terminfo/x/xterm-direct ]
-	then
-		run sudo apt-get install -y ncurses-term
-	else
-		echo "+++ xterm-direct is in terminfo database"
-	fi
-
-    if fc-list | grep "UbuntuMono Nerd Font" 1>/dev/null
-	then
-		echo "+++ UbuntuMono Nerd font is installed"
-		if ! $REINSTALL
-		then
-			return
-		fi
-		echo "+++ Reinstalling UbuntuMono Nerd font"
-	fi
-
-	echo "+++ Fetching UbuntuMono Nerd Font"
-	run mkdir -p ~/.local/share/fonts
-	pushd ~/.local/share/fonts
-	run curl -fL -o UbuntuMonoNerdFontMono-Regular.ttf https://github.com/ryanoasis/nerd-fonts/raw/master/patched-fonts/UbuntuMono/Regular/UbuntuMonoNerdFontMono-Regular.ttf
-	popd
-	run fc-cache -f
-
-}
-
-function install_deps() {
-    install_fish
-    install_direnv
-    install_starship
-	if $FONT
-	then
-		install_ubuntu_mono_nerd
-	fi
-}
-
-function install_files() {
-	echo "--- Ensuring symlinks to git file are present"
-	for f in $files
-	do
-		run rm -Rf $HOME/$f
-		dir=$(dirname $f)
-		if [ ! "$dir" = "." ]
-		then
-			run mkdir -p $HOME/$dir
-		fi
-		run ln -sf $(this_script_root_dir)/$f $HOME/$f
-	done
-	run ln -sf $(this_script_root_dir)/.tmux/.tmux.conf $HOME/.tmux.conf
-}
-
-function update_oh_my_fish() {
-	echo "--- Updating Oh My Fish"
-	FISH=$(which fish)
-	if $VERBOSE
-	then
-	   echo "[$FISH -c 'omf install']"
-	fi
-	if ! $DRY
-	then
-		if $VERBOSE
-		then
-			$FISH -c 'omf install'
-		else
-			$FISH -c 'omf install' 1>/dev/null
-		fi
-	fi
-}
-
-function update_home() {
-	if $VERBOSE
-	then
-		echo "--- this_script_root_dir: $(this_script_root_dir)"
-	fi
-	update_repos
-    install_deps
-	install_files
-	update_oh_my_fish
-	if $GNOME
-	then
-		load_gnome_terminal_profiles
-	fi
-	if ! $DRY
-	then
-	   echo "--- git.tuleu.science:atuleu/home.git updated and set"
-	fi
-}
-
-function update_repos() {
-	echo "--- Updating git.tuleu.science:atuleu/home.git"
-	run_git pull
-	run_git submodule init
-	run_git submodule update
-}
-
-if [ -z $BASH_SOURCE ] && [ ! -d "$HOME/.home" ]
-then
-	echo "--- cloning git.tuleu.science:atuleu/home.git in $HOME/.home"
-	pushd $HOME 1>/dev/null
-	run_git clone https://git.tuleu.science/atuleu/home.git .home
-	popd 1>/dev/null
-else
-	update_home
-fi