.chezmoiignore

@@ -1,14 +0,0 @@
-{{- if ne .include_ssh_keys "true" }}
-.config/bash/gitea.sh
-.ssh/gitea
-.ssh/gitea.pub
-.ssh/selfhosted
-.ssh/selfhosted.pub
-.ssh/github
-.ssh/github.pub
-{{- end }}
-{{- if ne .chezmoi.os "linux" }}
-.config/bash/ssh-agent.sh
-.config/bash/xhost.sh
-.config/systemd/
-{{- end }}

dot_bashrc.tmpl

@@ -5,15 +5,6 @@ export MOZ_ENABLE_WAYLAND=1
 # If not running interactively, don't do anything
 [[ $- != *i* ]] && return
 
-{{- if (eq .chezmoi.os "freebsd") -}}
-# start in home directory
-# shellcheck disable=SC2164
-if [ "$PWD" != "$HOME" ] && [ "$PWD" -ef "$HOME" ] ; then cd ; fi
-# change $HOME on FreeBSD to /usr/home/andrew
-# shellcheck disable=SC2164
-if [ -d "/usr$HOME" ] ; then export HOME=/usr$HOME ; cd ; fi
-{{ end }}
-
 # User specific aliases and functions
 if [ -d "$HOME/.config/bash" ]; then
   for rc in $HOME/.config/bash/*; do

dot_config/bash/ssh-agent.sh.tmpl

@@ -1,3 +1,4 @@
+{{- if (eq .chezmoi.os "linux") -}}
 {{- if (contains "microsoft" .chezmoi.kernel.osrelease) -}}
 if [ -z "$(pgrep ssh-agent)" ]; then
    rm -rf /tmp/ssh-*
@@ -10,3 +11,4 @@ fi
 SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/ssh-agent.socket"
 export SSH_AUTH_SOCK
 {{ end }}
+{{- end -}}

dot_config/bash/xhost.sh.tmpl

@@ -1 +1,3 @@
+{{ if (eq .chezmoi.os "linux" ) }}
 xhost +local:root > /dev/null 2>&1
+{{ end }}

dot_config/nvim/init.vim

@@ -50,7 +50,6 @@ set nobackup
 set nowritebackup
 set nowb
 set noswapfile
-set background=light
 let mapleader = " "
 
 " TextEdit might fail if hidden is not set.

dot_config/systemd/user/ssh-agent.service.tmpl

@@ -1,3 +1,4 @@
+{{- if (eq .chezmoi.os "linux") -}}
 [Unit]
 Description=SSH key agent
 
@@ -10,3 +11,4 @@ ExecStart=/usr/bin/ssh-agent -D -a $SSH_AUTH_SOCK
 
 [Install]
 WantedBy=default.target
+{{ end }}

private_dot_ssh/private_authorized_keys.tmpl

@@ -1,3 +1 @@
-{{- if ne .include_ssh_keys "true" }}
+{{- bitwardenAttachment "selfhosted.pub" "selfhosted-ssh-keys" }}
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID3M8FYKBjXXUQpk5+bQXe1zwkONtfbifRnTr+dkNwHt selfhosted@penguincoder.org
-{{- end }}

private_dot_ssh/private_config.tmpl

@@ -4,6 +4,7 @@ Host *
 
 Host penguincoder.org
   Port 2223
+  User {{ (bitwardenFields "item" "selfhosted-ssh-keys").hydrogen_username.value }}
   IdentityFile ~/.ssh/selfhosted
 
 Host git.penguincoder.org
@@ -12,10 +13,16 @@ Host git.penguincoder.org
   IdentityFile ~/.ssh/gitea
   ProxyCommand none
 
-Host helium helium.penguincoder.org
+Host helium.penguincoder.org helium
+  User {{ (bitwardenFields "item" "selfhosted-ssh-keys").hydrogen_username.value }}
   HostName 192.168.1.50
 
-Host potassium potassium.penguincoder.org
+Host hydrogen hydrogen.olympus
+  User {{ (bitwardenFields "item" "selfhosted-ssh-keys").hydrogen_username.value }}
+  HostName 192.168.1.80
+
+Host potassium potassium.olympus
+  User {{ (bitwardenFields "item" "selfhosted-ssh-keys").hydrogen_username.value }}
   HostName 192.168.1.60
   ProxyCommand none
 
@@ -26,3 +33,9 @@ Host *.penguincoder.org !git.penguincoder.org
 Host github.com
   User git
   IdentityFile ~/.ssh/github
+
+Host jolijardin.co
+  User {{ (bitwardenFields "item" "jolijardin.co").username.value }}
+  PubKeyAuthentication no
+  # {{ (bitwardenFields "item" "jolijardin.co").password.value }}
+