From df8295be8d3b3cf80caeb4eccb8efadca66bae65 Mon Sep 17 00:00:00 2001
From: Scott Ames <scott@ames.sh>
Date: Sat, 12 Aug 2023 11:41:35 -0700
Subject: [PATCH] fix: path, cleanup db-assemble, chezmoi loginctl outside db

---
 home/.chezmoi.toml.tmpl                         | 2 ++
 home/private_dot_config/distrobox/assemble.ini  | 4 ----
 home/private_dot_config/fish/conf.d/__path.fish | 4 ++--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/home/.chezmoi.toml.tmpl b/home/.chezmoi.toml.tmpl
index f475a5f9..adf16ca3 100644
--- a/home/.chezmoi.toml.tmpl
+++ b/home/.chezmoi.toml.tmpl
@@ -23,6 +23,8 @@
 {{-   else if $isContainer -}}
 {{-     $chassis = "container" }}
 {{-   else -}}
+{{      $loginSession = output "loginctl" "-o" "json" | fromJson | jq (printf ".[] | select(.user==\"%s\") | .session" .chezmoi.username) | first }}
+{{      $loginSessionType = output "loginctl" "show-session" $loginSession "-p" "Type" | replace "Type=" "" | trim -}}
 {{-     $chassis = output "hostnamectl" "chassis" | trim -}}
 {{-   end -}}
 {{- end -}}
diff --git a/home/private_dot_config/distrobox/assemble.ini b/home/private_dot_config/distrobox/assemble.ini
index 3e5fdb02..a5f6c2f6 100644
--- a/home/private_dot_config/distrobox/assemble.ini
+++ b/home/private_dot_config/distrobox/assemble.ini
@@ -1,11 +1,7 @@
 [at]
 image=ghcr.io/scottames/archlinux-toolbox:latest
-init=false
 nvidia=false
 pull=true
 root=false
 replace=true
-init_hooks=ln -sf /usr/bin/distrobox-host-exec /usr/local/bin/xclip;
-init_hooks=ln -sf /usr/bin/distrobox-host-exec /usr/local/bin/nmcli;
-init_hooks=ln -sf /usr/bin/distrobox-host-exec /usr/local/bin/rpm-ostree;
 
diff --git a/home/private_dot_config/fish/conf.d/__path.fish b/home/private_dot_config/fish/conf.d/__path.fish
index 883cd9a5..c3f33567 100644
--- a/home/private_dot_config/fish/conf.d/__path.fish
+++ b/home/private_dot_config/fish/conf.d/__path.fish
@@ -32,10 +32,10 @@ if $IS_MAC
 else if $IS_LINUX
 
   set -a _bin_dirs          \
-    /usr/local/bin          \
     /usr/bin                \
-    /usr/local/sbin         \
     /usr/sbin               \
+    /usr/local/sbin         \
+    /usr/local/bin          \
     /var/lib/snapd/snap/bin \
     /usr/local/packer