Vim and fish configs

Author: binarypie

build_files/hypercube/01-hypercube-packages.sh

@@ -29,7 +29,8 @@ dnf5 -y install \
 ### CLI Tools (skip packages already in bluefin-dx)
 dnf5 -y install \
     fd-find \
-    qt6ct
+    qt6ct \
+    starship
 
 ### Lazygit from COPR
 dnf5 -y copr enable atim/lazygit

build_files/hypercube/03-hypercube-configs.sh

@@ -18,6 +18,17 @@ cp -r "${CONFIG_DIR}/fish/conf.d" /etc/fish/
 cp -r "${CONFIG_DIR}/fish/functions" /etc/fish/ 2>/dev/null || true
 cp -r "${CONFIG_DIR}/fish/completions" /etc/fish/ 2>/dev/null || true
 
+### Set fish as the default shell for all users
+# Add fish to /etc/shells if not present
+grep -qxF '/usr/bin/fish' /etc/shells || echo '/usr/bin/fish' >> /etc/shells
+# Set fish as default shell in /etc/skel for new users (via useradd defaults)
+sed -i 's|^SHELL=.*|SHELL=/usr/bin/fish|' /etc/default/useradd 2>/dev/null || \
+    echo 'SHELL=/usr/bin/fish' >> /etc/default/useradd
+
+### Starship prompt configuration
+# Starship config is read from STARSHIP_CONFIG env var set in fish config
+# Config lives at /usr/share/hypercube/config/starship/starship.toml (read-only)
+
 ### Wezterm configs
 # Wezterm doesn't support XDG_CONFIG_DIRS for system defaults
 install -Dm644 "${CONFIG_DIR}/wezterm/wezterm.lua" /etc/skel/.config/wezterm/wezterm.lua

build_files/hypercube/99-tests.sh

@@ -16,6 +16,7 @@ REQUIRED_PACKAGES=(
     "ghostty"
     "neovim"
     "lazygit"
+    "starship"
 )
 
 for pkg in "${REQUIRED_PACKAGES[@]}"; do
@@ -32,6 +33,7 @@ REQUIRED_FILES=(
     "/usr/lib/environment.d/60-hypercube-xdg.conf"
     "/usr/bin/nvimd"
     "/etc/fish/config.fish"
+    "/usr/share/hypercube/config/starship/starship.toml"
     "/usr/share/themes/Tokyonight-Dark/gtk-3.0/gtk.css"
     "/usr/share/icons/Tokyonight-Dark/index.theme"
 )

dot_files/fish/conf.d/00-hypercube-setup.fish

@@ -0,0 +1,12 @@
+# Hypercube Fish Setup
+# Ensures user has a writable fish config directory for fish_variables
+# Fish writes universal variables to $__fish_config_dir/fish_variables
+# Since system config is in /etc/fish, users need ~/.config/fish for writes
+
+if status is-interactive
+    # Create user's fish config directory if it doesn't exist
+    set -l user_fish_dir "$HOME/.config/fish"
+    if not test -d "$user_fish_dir"
+        mkdir -p "$user_fish_dir"
+    end
+end

dot_files/fish/conf.d/hydro.fish

@@ -7,17 +7,12 @@ if status is-interactive
     # Editor
     set -gx EDITOR nvim
 
-    # Prompt
-    set --global hydro_multiline true
-    set --global fish_prompt_pwd_dir_length 100
-    set --global hydro_color_pwd $fish_color_comment
-    set --global hydro_color_git $fish_color_operator
-    set --global hydro_color_error $fish_color_error
-    set --global hydro_color_prompt $fish_color_command
-    set --global hydro_color_duration $fish_color_param
+    # Prompt - Starship
+    set -gx STARSHIP_CONFIG /usr/share/hypercube/config/starship/starship.toml
+    starship init fish | source
 
     # Env Variables
-    set -Ux GOOGLE_CLOUD_PROJECT ibexio-src
+    set -gx GOOGLE_CLOUD_PROJECT ibexio-src
 
     # Path
     fish_add_path $HOME/.local/bin

dot_files/fish/config.fish

@@ -1,2 +1,6 @@
+-- Store lazyvim.json in data dir so config can remain read-only
+-- Must be set before loading lazy.nvim
+vim.g.lazyvim_json = vim.fn.stdpath("data") .. "/lazyvim.json"
+
 -- bootstrap lazy.nvim, LazyVim and your plugins
 require("config.lazy")

dot_files/nvim/init.lua

@@ -21,6 +21,8 @@ require("lazy").setup({
     -- import/override with your plugins
     { import = "plugins" },
   },
+  -- Store lockfile in data dir so config can remain read-only
+  lockfile = vim.fn.stdpath("data") .. "/lazy-lock.json",
   defaults = {
     -- By default, only LazyVim plugins will be lazy-loaded. Your custom plugins will load during startup.
     -- If you know what you're doing, you can set this to `true` to have all your custom plugins lazy-loaded by default.