Reorganize

container/home/dot-config/containers/containers.conf

@@ -0,0 +1,2 @@
+[engine]
+compose_warning_logs=false

config/fish/config.fish → container/home/dot-config/fish/config.fish

@@ -1,15 +1,30 @@
 set -gx EDITOR nvim
 set -gx VISUAL nvim
+set -gx PODMAN_COMPOSE_WARNING_LOGS false
 
 set -l BREW_HOME /home/linuxbrew/.linuxbrew
 
 $BREW_HOME/bin/brew shellenv | source
 
-set -U fish_greeting ""
+if [ -d $BREW_HOME/lib/ruby/gems/3.3.0/bin ]
+  fish_add_path --prepend --path $BREW_HOME/lib/ruby/gems/3.3.0/bin
+end
 
-fish_add_path --prepend --path $BREW_HOME/lib/ruby/gems/3.3.0/bin
 fish_add_path --prepend --path $HOME/.local/bin
 
+for pkg in node@20 postgresql@17 [email protected]
+  if [ -d "$BREW_HOME/opt/$pkg" ]
+    set -l dir "$BREW_HOME/opt/$pkg"
+
+    set -gx LDFLAGS "$LDFLAGS:-L$dir/lib"
+    set -gx CPPFLAGS "$CPPFLAGS:-I$dir/include"
+
+    fish_add_path --prepend --path $dir/bin
+  end
+end
+
+set -U fish_greeting ""
+
 if status is-interactive
   set fish_cursor_default block
   set fish_cursor_insert line

container/home/dot-config/fish/fish_variables

@@ -0,0 +1,32 @@
+# This file contains fish universal variable definitions.
+# VERSION: 3.0
+SETUVAR __fish_initialized:3400
+SETUVAR fish_color_autosuggestion:brblack
+SETUVAR fish_color_cancel:\x2dr
+SETUVAR fish_color_command:blue
+SETUVAR fish_color_comment:red
+SETUVAR fish_color_cwd:green
+SETUVAR fish_color_cwd_root:red
+SETUVAR fish_color_end:green
+SETUVAR fish_color_error:brred
+SETUVAR fish_color_escape:brcyan
+SETUVAR fish_color_history_current:\x2d\x2dbold
+SETUVAR fish_color_host:normal
+SETUVAR fish_color_host_remote:yellow
+SETUVAR fish_color_normal:normal
+SETUVAR fish_color_operator:brcyan
+SETUVAR fish_color_param:cyan
+SETUVAR fish_color_quote:yellow
+SETUVAR fish_color_redirection:cyan\x1e\x2d\x2dbold
+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
+SETUVAR fish_color_user:brgreen
+SETUVAR fish_color_valid_path:\x2d\x2dunderline
+SETUVAR fish_greeting:
+SETUVAR fish_key_bindings:fish_vi_key_bindings
+SETUVAR fish_pager_color_completion:normal
+SETUVAR fish_pager_color_description:yellow\x1e\x2di
+SETUVAR fish_pager_color_prefix:normal\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 → container/home/dot-config/git/config

@@ -1,18 +1,11 @@
-[diff]
-  colorMoved = true
-
-[merge]
-  conflictStyle = "diff3"
+[core]
+  pager = "delta"
 
-[rerere]
-  enabled = true
 [credential "https://gist.github.com"]
   helper = !gh auth git-credential
 
 [credential "https://github.com"]
   helper = !gh auth git-credential
-[core]
-  pager = "delta"
 
 [delta]
   hyperlinks = true
@@ -21,5 +14,18 @@
   side-by-side = true
   true-color = "always"
 
+[diff]
+  colorMoved = true
+
 [interactive]
   diffFilter = "delta --color-only"
+
+[merge]
+  conflictStyle = "diff3"
+
+[rerere]
+  enabled = true
+
+[user]
+  email = [email protected]
+  name = David Leal