Several updates

1 files changed, 44 insertions, 30 deletions

diff --git a/software.html b/software.html
index 928ccfc..9e9cd8a 100644
--- a/software.html
+++ b/software.html
@@ -11,44 +11,58 @@
         <header><h1 class=pagetop>Software I Use</h1></header>
     <main>
                 <p>This is some of the software that I use and recommend. 
-                It goes without saying, but all of this software is free as in freedom, 
-                libre, open source.</p>
-
-                <h2>Desktop Programs</h2>
-                <p><strong>Window Manager</strong> - dwm 
-                <a class=qr href="https://git.chudnick.com/dwm">[git]</a></p>
-                <p><strong>Shell</strong> - zsh</p>
-                <p><strong>Terminal Emulator</strong> - urxvt</p>
-                <p><strong>Statusbar</strong> - dwmblocks 
-                <a class=qr href="https://git.chudnick.com/dwmblocks">[git]</a></p>
-                <p><strong>Text Editor</strong> - vim</p>
-                <p><strong>Music Player</strong> - cmus</p>
-                <p><strong>Process Monitor</strong> - htop</p>
-                <p><strong>Media Player</strong> - mpv</p>
-                <p><strong>Email</strong> - neomutt, isync, msmtp 
-                <a class=qr href=articles/mutt.html>[kb]</a></p>
-                <p><strong>RSS</strong> - newsboat</p>
-                <p><strong>PDF Reader</strong> - zathura</p>
-                <p><strong>Sandbox</strong> - firejail</p>
-                <p><strong>Virtualization</strong> - qemu/kvm + libvirt</p>
-                <p><strong>Firewall</strong> - ufw</p>
+                All of this software is FOSS.</p>
 
                 <h2>Server Software</h2>
-                <p>This is some server oriented software that I use.</p>
-                <p><strong>Mail Server</strong> - postfix + dovecot 
-                <a class=qr href=articles/mail-server.html>[kb]</a></p>
 
-                <p><strong>Media Server</strong> - jellyfin</p>
+                <h3>Infrastructure</h3>
+                <p><strong>Virtualization</strong> - Proxmox VE</p>
+                <p><strong>Backups</strong> - Proxmox Backup Server</p>
+                <p><strong>DNS</strong> - Pi-hole</p>
+                
+                <h3>Services</h3>
+                <p><strong>Authentication and Identity</strong> - Authelia</p>
+                <p><strong>LDAP</strong> - FreeIPA <a class=qr href=articles/freeipa-server.html>[kb]</a></p>
+                <p><strong>RSS Aggregator</strong> - FreshRSS</p>
+                <p><strong>Dashboard</strong> - Homer</p>
+                <p><strong>Search Engine</strong> - SearxNG</p>
+                <p><strong>Wiki</strong> - Bookstack</p>
+                <p><strong>Personal Cloud</strong> - Nextcloud</p>
+                <p><strong>Photo Management</strong> - Photoprism</p>
+                <p><strong>Game Streaming</strong> - Sunshine + Moonlight</p>
+                <p><strong>Mail Server</strong> - Postfix + Dovecot <a class=qr href=articles/mail-server.html>[kb]</a></p>
 
-                <p><strong>Server Monitoring</strong> - icinga2 
-                <a class=qr href=articles/icinga-master.html>[kb]</a></p>
+                <h3>Monitoring</h3>
+                <p><strong>Service Monitoring</strong> - Prometheus + Grafana + Cadvisor</p>
+                <p><strong>Log Management</strong> - Loki</p>
 
-                <p><strong>Configuration Management</strong> - ansible</p>
+                <h3>Media</h3>
+                <p><strong>Media Server</strong> - Jellyfin</p>
+                <p><strong>Music Server</strong> - Navidrome</p>
 
-                <p><strong>Identity Management</strong> - FreeIPA
-                <a class=qr href=articles/freeipa-server.html>[kb]</a></p>
+                <h3>Development</h3>
+                <p><strong>Configuration Management</strong> - Ansible</p>
+                <p><strong>Git Repository</strong> - Gitea</p>
+                <p><strong>Git Mirror</strong> - cgit</p>
+                <p><strong>CI/CD</strong> - Jenkins</p>
+                <p><strong>Diagramming</strong> - draw.io</p>
 
 
+                <h2>Desktop Programs</h2>
+                <p><strong>Window Manager</strong> - dwm <a class=qr href="https://git.chudnick.com/dwm/about">[git]</a></p>
+                <p><strong>Shell</strong> - zsh <a class=qr href="https://git.chudnick.com/dotfiles/tree/.config/zsh">[git]</a></p>
+                <p><strong>Terminal Emulator</strong> - st <a class=qr href="https://git.chudnick.com/st/about">[git]</a></p>
+                <p><strong>Text Editor</strong> - vim <a class=qr href="https://git.chudnick.com/dotfiles/tree/.vim">[git]</a></p>
+                <p><strong>Music Player</strong> - cmus <a class=qr href="https://git.chudnick.com/dotfiles/tree/.config/cmus">[git]</a></p>
+                <p><strong>Process Monitor</strong> - htop <a class=qr href="https://git.chudnick.com/dotfiles/tree/.config/htop">[git]</a></p>
+                <p><strong>Media Player</strong> - mpv </p>
+                <p><strong>Email</strong> - neomutt, isync, msmtp 
+                        <a class=qr href="https://git.chudnick.com/dotfiles/tree/.config/mutt">[git]</a>
+                        <a class=qr href=articles/mutt.html> [kb]</a></p>
+                <p><strong>PDF Reader</strong> - zathura <a class=qr href="https://git.chudnick.com/dotfiles/tree/.config/zathura">[git]</a></p>
+                <p><strong>Sandbox</strong> - firejail <a class=qr href="https://git.chudnick.com/dotfiles/tree/.config/firejail">[git]</a></p>
+                <p><strong>Firewall</strong> - ufw</p>
+
 
     </main>
     <footer><a href=index.html>www.chudnick.com</a></footer>