README.md

@@ -49,6 +49,7 @@ pamac install \
   base-devel \
   bash-completion \
   bat \
+  bitwarden-cli \
   bottom \
   direnv \
   dust \
@@ -83,29 +84,21 @@ pamac install \
   starship \
   tealdeer \
   tmux \
-  unzip \
   vim \
   virt-manager \
   zoxide
 # not available by default
 #jc mbuffer
 pamac build lightly-qt
-systemctl enable --now --user ssh-agent.service
 ```
 
 # Bitwarden
 
 ```bash
-curl -Lo bw.zip 'https://vault.bitwarden.com/download/?app=cli&platform=linux'
-unzip bw.zip
-mkdir -p "$HOME/.local/bin" "$HOME/.config/bash"
-install -m 755 bw "$HOME/.local/bin/"
-rm -f bw bw.zip
 bw config server https://bitwarden.penguincoder.org
 bw login
 echo "export BW_SESSION=$(bw unlock --raw)" > "$HOME/.config/bash/bitwarden.sh"
 source "$HOME/.config/bash/bitwarden.sh"
-bw sync
 ```
 
 # Kitty
@@ -130,9 +123,3 @@ sh <(curl -L https://nixos.org/nix/install) --daemon
 curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
 ```
 
-# Chezmoi
-
-```bash
-sh -c "$(curl -fsLS chezmoi.io/get)"
-mv ./bin/chezmoi "$HOME/.local/bin/"
-```

dot_bashrc

@@ -1,13 +1,9 @@
-{{- if (eq .chezmoi.os "linux") -}}
-export QT_AUTO_SCREEN_SCALE_FACTOR=1
-export MOZ_ENABLE_WAYLAND=1
-{{ end }}
 # If not running interactively, don't do anything
 [[ $- != *i* ]] && return
 
 # User specific aliases and functions
 if [ -d "$HOME/.config/bash" ]; then
-  for rc in $HOME/.config/bash/*; do
+  for rc in "$HOME/.config/bash/*"; do
     if [ -f "$rc" ]; then
       # shellcheck source=/dev/null
       . "$rc"

dot_config/bash/bash-setup.sh

@@ -27,9 +27,9 @@ unset rc
 complete -cf sudo
 
 # local paths
-if ! [[ "$PATH" =~ "$HOME/.local/bin:" ]]
+if ! [[ "$PATH" =~ $HOME/.local/bin:$HOME/bin: ]]
 then
-    PATH="$HOME/.local/bin:$PATH"
+    PATH="$HOME/.local/bin:$HOME/bin:$PATH"
 fi
 export PATH
 

dot_config/bash/wsl-ssh-agent.sh.tmpl

@@ -7,8 +7,5 @@ else
    export SSH_AGENT_PID=$(pgrep ssh-agent)
    export SSH_AUTH_SOCK=$(find /tmp/ssh-* -name agent.*)
 fi
-{{- else -}}
+{{- end -}}
-SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/ssh-agent.socket"
-export SSH_AUTH_SOCK
-{{ end }}
 {{- end -}}

dot_config/nvim/init.vim

@@ -21,6 +21,8 @@ Plug 'kyazdani42/nvim-web-devicons'
 Plug 'kyazdani42/nvim-tree.lua'
 Plug 'svermeulen/vimpeccable'
 Plug 'sp5/nvim-colors-solarized'
+"Plug 'neoclide/coc.nvim', {'branch': 'release'}
+Plug 'preservim/nerdtree'
 Plug 'NoahTheDuke/vim-just'
 Plug 'dewyze/vim-tada'
 call plug#end()
@@ -141,14 +143,17 @@ noremap <F6> :call NumberToggle()<cr>
 " File Browser
 nnoremap <leader>e :NvimTreeToggle<CR>
 nnoremap <leader>r :NvimTreeRefresh<CR>
+nnoremap <leader>n :NvimTreeFindFile<CR>
 let g:nvim_tree_auto_close = 1
 " let g:nvim_tree_quit_on_open = 1
 let g:nvim_tree_git_hl = 1
-lua require'nvim-tree'.setup()
-autocmd BufEnter * ++nested if winnr('$') == 1 && bufname() == 'NvimTree_' . tabpagenr() | quit | endif
 
 "set guifont=OperatorMono\ Nerd\ Font:h16
 
+" Set internal encoding of vim, not needed on neovim, since coc.nvim using some
+" unicode characters in the file autoload/float.vim
+set encoding=utf-8
+
 " TextEdit might fail if hidden is not set.
 set hidden
 

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

@@ -1,14 +0,0 @@
-{{- if (eq .chezmoi.os "linux") -}}
-[Unit]
-Description=SSH key agent
-
-[Service]
-Type=simple
-Environment=SSH_AUTH_SOCK=%t/ssh-agent.socket
-# DISPLAY required for ssh-askpass to work
-Environment=DISPLAY=:0
-ExecStart=/usr/bin/ssh-agent -D -a $SSH_AUTH_SOCK
-
-[Install]
-WantedBy=default.target
-{{ end }}

private_dot_ssh/private_authorized_keys.tmpl

@@ -1 +1,7 @@
-{{- bitwardenAttachment "selfhosted.pub" "selfhosted-ssh-keys" }}
+{{- if (eq .chezmoi.hostname "hydrogen") -}}
+{{ (bitwardenAttachment "hydrogen.pub" "selfhosted-ssh-keys") }}
+{{- else if (hasSuffix "freebsd" .chezmoi.hostname) -}}
+{{ (bitwardenAttachment "hydrogen.pub" "selfhosted-ssh-keys") }}
+{{- else if (eq .chezmoi.hostname "lithium") -}}
+{{ (bitwardenAttachment "lithium.pub" "selfhosted-ssh-keys") }}
+{{- end -}}

private_dot_ssh/private_bluehost-waldenfarmshoa.pub.tmpl

@@ -0,0 +1 @@
+{{- (bitwardenAttachment "bluehost-waldenfarmshoa.pub" "thewaldenfarms.com-ssh-keys") -}}

private_dot_ssh/private_bluehost-waldenfarmshoa.tmpl

@@ -0,0 +1 @@
+{{- (bitwardenAttachment "bluehost-waldenfarmshoa" "thewaldenfarms.com-ssh-keys") -}}

private_dot_ssh/private_config.tmpl

@@ -1,34 +1,30 @@
+Include consolo.services.d/*.conf
+
 Host *
   ForwardAgent yes
-  AddKeysToAgent yes
 
 Host penguincoder.org
   Port 2223
-  User {{ (bitwardenFields "item" "selfhosted-ssh-keys").hydrogen_username.value }}
+  User {{ (bitwardenFields "item" "selfhosted-ssh-keys").lithium_username.value }}
-  IdentityFile ~/.ssh/selfhosted
+  IdentityFile ~/.ssh/lithium
 
 Host git.penguincoder.org
   Port 2222
   User git
   IdentityFile ~/.ssh/gitea
-  ProxyCommand none
 
-Host helium.penguincoder.org helium
+Host lithium lithium.olympus
-  User {{ (bitwardenFields "item" "selfhosted-ssh-keys").hydrogen_username.value }}
+  User {{ (bitwardenFields "item" "selfhosted-ssh-keys").lithium_username.value }}
-  HostName 192.168.1.50
+  IdentityFile ~/.ssh/lithium
 
 Host hydrogen hydrogen.olympus
   User {{ (bitwardenFields "item" "selfhosted-ssh-keys").hydrogen_username.value }}
-  HostName 192.168.1.80
+  IdentityFile ~/.ssh/hydrogen
 
-Host potassium potassium.olympus
+Host unifi
-  User {{ (bitwardenFields "item" "selfhosted-ssh-keys").hydrogen_username.value }}
+  HostName 192.168.1.97
-  HostName 192.168.1.60
+  User {{ (bitwardenFields "item" "selfhosted-ssh-keys").unifi_username.value }}
-  ProxyCommand none
+  IdentityFile ~/.ssh/lithium
-
-Host *.penguincoder.org !git.penguincoder.org
-  IdentityFile ~/.ssh/selfhosted
-  ProxyCommand ssh -W %h:%p penguincoder.org -p 2223
 
 Host github.com
   User git
@@ -39,3 +35,6 @@ Host jolijardin.co
   PubKeyAuthentication no
   # {{ (bitwardenFields "item" "jolijardin.co").password.value }}
 
+Host thewaldenfarms.com
+  User {{ (bitwardenFields "item" "thewaldenfarms.com-ssh-keys").username.value }}
+  IdentityFile ~/.ssh/bluehost-waldenfarmshoa

private_dot_ssh/private_consolo.services.d/private_aws-devops.pub.tmpl

@@ -0,0 +1 @@
+{{- (bitwardenAttachment "aws-devops.pub" "Wellsky-AWS") -}}

private_dot_ssh/private_consolo.services.d/private_aws-devops.tmpl

@@ -0,0 +1 @@
+{{- (bitwardenAttachment "aws-devops" "Wellsky-AWS") -}}

private_dot_ssh/private_consolo.services.d/private_aws-prod.pub.tmpl

@@ -0,0 +1 @@
+{{- (bitwardenAttachment "aws-devops.pub" "Wellsky-AWS") -}}

private_dot_ssh/private_consolo.services.d/private_aws-prod.tmpl

@@ -0,0 +1 @@
+{{- (bitwardenAttachment "aws-prod" "Wellsky-AWS") -}}

private_dot_ssh/private_consolo.services.d/private_aws-sigma.pub.tmpl

@@ -0,0 +1 @@
+{{- (bitwardenAttachment "aws-sigma.pub" "Wellsky-AWS") -}}

private_dot_ssh/private_consolo.services.d/private_aws-sigma.tmpl

@@ -0,0 +1 @@
+{{- (bitwardenAttachment "aws-sigma" "Wellsky-AWS") -}}

private_dot_ssh/private_consolo.services.d/private_devops.conf.tmpl

@@ -0,0 +1 @@
+{{- (bitwardenAttachment "devops.conf" "Wellsky-AWS") -}}

private_dot_ssh/private_consolo.services.d/private_nonprod.conf.tmpl

@@ -0,0 +1 @@
+{{- (bitwardenAttachment "nonprod.conf" "Wellsky-AWS") -}}

private_dot_ssh/private_consolo.services.d/private_peak10.conf.tmpl

@@ -0,0 +1 @@
+{{- (bitwardenAttachment "peak10.conf" "Wellsky-AWS") -}}

private_dot_ssh/private_consolo.services.d/private_prod-a.conf.tmpl

@@ -0,0 +1 @@
+{{- (bitwardenAttachment "prod-a.conf" "Wellsky-AWS") -}}

private_dot_ssh/private_gitea

@@ -0,0 +1,38 @@
+-----BEGIN OPENSSH PRIVATE KEY-----
+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
+-----END OPENSSH PRIVATE KEY-----

private_dot_ssh/private_gitea.tmpl

@@ -1 +0,0 @@
-{{- (bitwardenAttachment "gitea" "selfhosted-ssh-keys") -}}

private_dot_ssh/private_hydrogen.pub.tmpl

@@ -0,0 +1 @@
+{{- (bitwardenAttachment "hydrogen.pub" "selfhosted-ssh-keys") -}}

private_dot_ssh/private_hydrogen.tmpl

@@ -0,0 +1 @@
+{{- (bitwardenAttachment "hydrogen" "selfhosted-ssh-keys") -}}

private_dot_ssh/private_lithium.pub.tmpl

@@ -0,0 +1 @@
+{{- (bitwardenAttachment "lithium.pub" "selfhosted-ssh-keys") -}}

private_dot_ssh/private_lithium.tmpl

@@ -0,0 +1 @@
+{{- (bitwardenAttachment "lithium" "selfhosted-ssh-keys") -}}

private_dot_ssh/private_selfhosted.pub.tmpl

@@ -1 +0,0 @@
-{{- (bitwardenAttachment "selfhosted.pub" "selfhosted-ssh-keys") -}}

private_dot_ssh/private_selfhosted.tmpl

@@ -1 +0,0 @@
-{{- (bitwardenAttachment "selfhosted" "selfhosted-ssh-keys") -}}