Merge branch 'master' of codeberg.org:snonux/conf

8 files changed, 19 insertions, 9 deletions

diff --git a/dotfiles/Rexfile b/dotfiles/Rexfile
index 9c42cae..e0e002e 100644
--- a/dotfiles/Rexfile
+++ b/dotfiles/Rexfile
@@ -4,10 +4,10 @@ use Rex::Logger;
 our $HOME = $ENV{HOME};
 
 # In a public Git rapository.
-our $DOT = "$HOME/git/rexfiles/dotfiles";
+our $DOT = "$HOME/git/conf/dotfiles";
 
 # In a private Git repository.
-our $DOT_PRIVATE = "$HOME/git/rexfiles_private/dotfiles";
+our $DOT_PRIVATE = "$HOME/git/conf_private/dotfiles";
 
 sub ensure_dir {
     my ( $src_glob, $dst_dir, $file_mode ) = @_;
diff --git a/dotfiles/fish/conf.d/ai.fish b/dotfiles/fish/conf.d/ai.fish
index d72867d..1f5dcd1 100644
--- a/dotfiles/fish/conf.d/ai.fish
+++ b/dotfiles/fish/conf.d/ai.fish
@@ -1,7 +1,7 @@
 abbr -a gpt chatgpt
 abbr -a gpti "chatgpt --interactive"
-abbr -a suggest 'gh copilot suggest'
-abbr -a explain 'gh copilot explain'
+abbr -a suggest hexai
+abbr -a explain 'hexai explain'
 abbr -a aic 'aichat -e'
 
 # helix-gpt env vars used
@@ -25,6 +25,7 @@ claude-4.0-sonnet
 gemini-2.5-pro" >~/.aimodels
 
     set -gx COPILOT_MODEL (cat ~/.aimodels | fzf)
+    set -gx OPENAI_MODEL $COPILOT_MODEL
 
     if test -d $COPILOT_CHAT_DIR
         set -l model_config "$COPILOT_CHAT_DIR/config-$COPILOT_MODEL.lua"
diff --git a/dotfiles/fish/conf.d/k8s.fish b/dotfiles/fish/conf.d/k8s.fish
index 19df726..ee1584b 100644
--- a/dotfiles/fish/conf.d/k8s.fish
+++ b/dotfiles/fish/conf.d/k8s.fish
@@ -1,5 +1,7 @@
-if command -q -v kubectl >/dev/null
-    kubectl completion fish | source
+function kcompletions
+    if command -q -v kubectl >/dev/null
+        kubectl completion fish | source
+    end
 end
 
 # Check if the directory $HOME/.krew exists and update PATH
diff --git a/dotfiles/fish/conf.d/update.fish b/dotfiles/fish/conf.d/update.fish
index b6228cf..47374fe 100644
--- a/dotfiles/fish/conf.d/update.fish
+++ b/dotfiles/fish/conf.d/update.fish
@@ -5,7 +5,7 @@ function update::tools
     go install golang.org/x/tools/cmd/goimports@latest
 
     set pids
-    for prog in tasksamurai timr
+    for prog in tasksamurai timr hexai
         echo "Installing/updating $prog from codeberg.org/snonux/$prog/cmd/$prog@latest"
         go install codeberg.org/snonux/$prog/cmd/$prog@latest &
         set -a pids $last_pid
diff --git a/dotfiles/gitsyncer/config.json b/dotfiles/gitsyncer/config.json
index 238f416..3ebb778 100644
--- a/dotfiles/gitsyncer/config.json
+++ b/dotfiles/gitsyncer/config.json
@@ -14,6 +14,11 @@
     }
   ],
   "repositories": [],
+  "skip_releases": {
+    "fapi": [
+      "0.0.1"
+    ]
+  },
   "exclude_from_showcase": [
     "bratwurstmitsenf",
     "Adv360-Pro-ZMK",
diff --git a/dotfiles/helix/config.toml b/dotfiles/helix/config.toml
index 2ef4fbf..fdeed9d 100644
--- a/dotfiles/helix/config.toml
+++ b/dotfiles/helix/config.toml
@@ -50,7 +50,7 @@ C-v = { b = "paste_clipboard_before", a = "paste_clipboard_after", r = ":clipboa
 A-c = "toggle_comments" # Was originally C-c, so mapped to ALT now
 
 # Helix related helpers
-C-h = { c = ":config-open", r = ":config-reload", C = ":run-shell-command cp -v ~/.config/helix/*.toml ~/git/rexfiles/dotfiles/helix/", l = ":open ~/.config/helix/languages.toml", h = ":open ~/git/worktime/HelixCheat.md", L = ":log-open", d = ":theme default" }
+C-h = { c = ":config-open", r = ":config-reload", C = ":run-shell-command cp -v ~/.config/helix/*.toml ~/git/conf/dotfiles/helix/", l = ":open ~/.config/helix/languages.toml", h = ":open ~/git/worktime/HelixCheat.md", L = ":log-open", d = ":theme default" }
 
 C-r = [ ":config-reload", ":reload-all" ]
 
diff --git a/dotfiles/scripts/taskwarriorfeeder.rb b/dotfiles/scripts/taskwarriorfeeder.rb
index ac513f5..a007ada 100644
--- a/dotfiles/scripts/taskwarriorfeeder.rb
+++ b/dotfiles/scripts/taskwarriorfeeder.rb
@@ -8,7 +8,7 @@ require 'set'
 PERSONAL_TIMESPAN_D = 30
 WORK_TIMESPAN_D = 14
 WORKTIME_DIR = "#{ENV['HOME']}/git/worktime".freeze
-GOS_DIR = "#{ENV['HOME']}/Notes/GosDir".freeze
+GOS_DIR = "#{ENV['HOME']}/.gosdir".freeze
 MAX_PENDING_RANDOM_TASKS = 11
 
 def maybe?
diff --git a/dotfiles/tmux/tmux.conf b/dotfiles/tmux/tmux.conf
index 1623b64..9745f9d 100644
--- a/dotfiles/tmux/tmux.conf
+++ b/dotfiles/tmux/tmux.conf
@@ -24,3 +24,5 @@ bind-key p setw synchronize-panes off
 bind-key P setw synchronize-panes on
 bind-key r source-file ~/.tmux.conf \; display-message "~/.tmux.conf reloaded"
 bind-key T choose-tree
+
+set-option -g pane-active-border-style fg=red,bold