fix: path, cleanup db-assemble, chezmoi loginctl outside db

scottames · Aug 12, 2023 · df8295b · df8295b
1 parent 5fe5415
commit df8295b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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