Move install.sh to update.sh

.config/fish/config.fish

@@ -18,7 +18,7 @@ set fish_greeting ""
 
 if type -q exa
    alias ls="exa --git -g"
-   set -gx EXA_COLORS "da=36:uu=33:gu=33"
+   set -gx EXA_COLORS "da=35:uu=33:gu=33"
 end
 
 ################################################################################

.config/fish/fish_variables

@@ -3,12 +3,12 @@
 SETUVAR __fish_initialized:3100
 SETUVAR fish_color_autosuggestion:969896
 SETUVAR fish_color_cancel:\x2dr
-SETUVAR fish_color_command:c397d8
+SETUVAR fish_color_command:b294bb
-SETUVAR fish_color_comment:e7c547
+SETUVAR fish_color_comment:f0c674
 SETUVAR fish_color_cwd:green
 SETUVAR fish_color_cwd_root:red
-SETUVAR fish_color_end:c397d8
+SETUVAR fish_color_end:b294bb
-SETUVAR fish_color_error:d54e53
+SETUVAR fish_color_error:cc6666
 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:7aa6da
+SETUVAR fish_color_param:81a2be
-SETUVAR fish_color_quote:b9ca4a
+SETUVAR fish_color_quote:b5bd68
-SETUVAR fish_color_redirection:70c0b1
+SETUVAR fish_color_redirection:8abeb7
 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

.config/starship.toml

@@ -49,7 +49,7 @@ format = "[◤](#444444 bg:red)[$symbol $status ](bg:red)"
 [time]
 disabled = false
 style="bg:#444444 bright-white"
-format="[◢](#444444)[$time ]($style)"
+format="[$time ]($style)"
 time_format = '%a %b %d %R'
 
 [git_branch]
@@ -68,3 +68,7 @@ disabled=false
 [git_status]
 style="bold red"
 format='([\[$all_status$ahead_behind\]]($style) )'
+
+# Local Variables:
+# vc-follow-symlinks: t
+# End:

.emacs

@@ -18,7 +18,6 @@
  '(global-display-line-numbers-mode t)
  '(gofmt-command "goimports")
  '(inhibit-startup-screen t)
- '(magit-revert-buffers (quote silent) t)
  '(org-agenda-files (quote ("~/org/1.TODO.org")))
  '(package-archives
    (quote
@@ -130,6 +129,8 @@
 (use-package magit
   :commands (magit-status)
   :bind ("C-x g" . magit-status)
+  :custom
+  (magit-credential-cache-daemon-socket nil)
   )
 
 (use-package company

.tmux.conf.local

@@ -45,31 +45,31 @@ tmux_conf_new_session_prompt=false
 #  - false (default)
 tmux_conf_24b_colour=true
 
-th_color_black="#2A2A2A"
+th_color_black="#282A2E"
-th_color_black_light="#424242"
+th_color_black_light="#373B41"
-th_color_red="#E44455"
+th_color_red="#CC6666"
-th_color_red_light="#FF7485"
+th_color_red_light="#FF9999"
-th_color_orange="#F5864F"
+th_color_orange="#DE935F"
-th_color_orange_light="#FFB67F"
+th_color_orange_light="#FFC38F"
-th_color_yellow="#F0C15A"
+th_color_yellow="#F0C674"
-th_color_yellow_light="#FFF18A"
+th_color_yellow_light="#FFF6A4"
-th_color_green="#BAC85B"
+th_color_green="#B5BD68"
-th_color_green_light="#EAF88B"
+th_color_green_light="#E5ED98"
-th_color_cyan="#57C1B2"
+th_color_cyan="#8ABEB7"
-th_color_cyan_light="#87F1E2"
+th_color_cyan_light="#BAEEE7"
-th_color_blue="#69A9D7"
+th_color_blue="#81A2BE"
-th_color_blue_light="#99D9FF"
+th_color_blue_light="#B1D2EE"
-th_color_magenta="#C798D4"
+th_color_magenta="#B294BB"
-th_color_magenta_light="#F7C8FF"
+th_color_magenta_light="#E2C4EB"
 th_color_gray="#969896"
-th_color_white="#EAEAEA"
+th_color_white="#C5C8C6"
 
 
 # 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_light"
+tmux_conf_theme_colour_4="$th_color_cyan"
 #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="$tmux_conf_theme_colour_2"
+tmux_conf_theme_pane_border="$th_color_gray"
 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, #{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"
@@ -431,6 +431,10 @@ unbind _
 bind | split-window -h
 set -g status-right-length 10
 
+# fixes <prefix> + e for non-vi user
+unbind e
+bind e new-window -n "~/.tmux.conf.local" "\$EDITOR ~/.tmux.conf.local && tmux source ~/.tmux.conf && tmux display \"~/.tmux.conf sourced\""
+
 
 # Local Variables:
 # vc-follow-symlinks: t

gnome-terminal-profiles.dconf

@@ -0,0 +1,15 @@
+[: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 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'

update.sh

@@ -5,7 +5,7 @@ set -e
 files=".config/fish \
 .config/git \
 .config/omf \
-.config/starship \
+.config/starship.toml \
 .local/share/omf \
 .emacs \
 .tmux.conf.local"
@@ -20,6 +20,9 @@ function run() {
 	$@
 }
 
+function load_gnome_terminal_profiles() {
+	run dconf load /org/gnome/terminal/legacy/profiles:/ < $(this_script_root_dir)/gnome-terminal-profiles.dconf
+}
 
 function install_home() {
 	for f in $files
@@ -33,6 +36,7 @@ function install_home() {
 		run ln -sf $(this_script_root_dir)/$f $HOME/$f
 	done
 	run ln -sf $(this_script_root_dir)/.tmux/.tmux.conf $HOME/.tmux.conf
+	load_gnome_terminal_profiles
 }