From 2ef2d5bf65884e6c1c7bcc337bbeadc2eac669c2 Mon Sep 17 00:00:00 2001
From: Chris Toph <toph@ryot.foo>
Date: Tue, 29 Apr 2025 23:16:09 -0400
Subject: [PATCH] Updates host switch and completions paths
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

• Adjusts rebuild command in shell function to include host specification more directly
• Moves fish completions file to the vendor completions directory
---
 flake.lock                   | 6 +++---
 functions/__yay_rebuild.fish | 4 ++--
 pkgs/default.nix             | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/flake.lock b/flake.lock
index faa26f5..1f98193 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1745526057,
-        "narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=",
+        "lastModified": 1745930157,
+        "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f771eb401a46846c1aebd20552521b233dd7e18b",
+        "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae",
         "type": "github"
       },
       "original": {
diff --git a/functions/__yay_rebuild.fish b/functions/__yay_rebuild.fish
index 0d7004d..4b57918 100644
--- a/functions/__yay_rebuild.fish
+++ b/functions/__yay_rebuild.fish
@@ -20,9 +20,9 @@ function __yay_rebuild
     set orig (pwd)
     cd $flake_path
     if set -q _flag_trace
-        __yay_run "nh os switch . -- --impure --show-trace"
+        __yay_run "nh os switch .#$host -- --impure --show-trace"
     else
-        __yay_run "nh os switch . -- --impure"
+        __yay_run "nh os switch .#$host -- --impure"
     end
     cd $orig
 end
\ No newline at end of file
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 3a31457..091c4cf 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -10,8 +10,8 @@ let
 
   # Copy completions
   fishCompletions = pkgs.runCommand "yay-fish-completions" { } ''
-    mkdir -p $out/share/fish/completions
-    cp ${../share/fish/completions}/yay.fish $out/share/fish/completions/
+    mkdir -p $out/share/fish/vendor_completions.d
+    cp ${../share/fish/completions}/yay.fish $out/share/fish/vendor_completions.d/
   '';
 
   # Create main yay binary that correctly passes args to fish