fix merge

bash/.bashrc

@@ -10,6 +10,10 @@ set -o vi
 bind -m vi-command 'Control-l: clear-screen'
 bind -m vi-insert 'Control-l: clear-screen'
 
+# Navigation aliases
+alias ftlui='cd ~/doc/dev/projects/ftl-dev/msg-ftl/hydra/golang/src/tibco.com/ftlui/client'
+
+# Command aliases
 alias ls='ls --color=auto'
 alias vi=nvim
 alias py=python3
@@ -20,15 +24,11 @@ alias gcm='git commit -m'
 alias gst='git status'
 alias gp='git push'
 
-alias k9s='$HOME/dotfiles/k9s/.config/k9s/k9s-theme-sync.sh'
+alias k9s='$HOME/doc/dev/dotfiles/k9s/.config/k9s/k9s-theme-sync.sh'
 alias oc='opencode'
 
-# opencode settings
-# export GOOGLE_CLOUD_PROJECT=claude-code-tibco
-# export VERTEX_LOCATION=global
-
 export EDITOR='nvim'
-export PATH=$PATH:/home/matt/Applications/lua_ls/bin
+# export PATH=$PATH:/home/matt/Applications/lua_ls/bin
 
 # k9s
 export K9S_CONFIG_DIR=~/.config/k9s

nvim/.config/nvim/lua/plugins.lua

@@ -77,7 +77,7 @@ require('lazy').setup({
         ft = { 'org' },
         config = function()
             require("orgmode").setup({
-                org_startup_indented = true, -- ← this gives Emacs-style virtual indentation under headings (huge for legibility)
+                org_startup_indented = true,
                 org_agenda_files = '~/doc/org/**/*',
                 org_default_notes_file = '~/doc/org/scratch.org',
                 org_startup_indented = true,