From 3ba95a71cf8578d2cc33e07e3b5a797be12c8dcb Mon Sep 17 00:00:00 2001
From: Tom Willemse
Date: Wed, 10 Dec 2025 01:51:44 -0800
Subject: pop-os: Add ‘nala’ and default common subcommands

I was hoping that the configuration would be additive onto the original
defaults, sadly they get overwritten instead. Now I've added the defaults back.
---
 oni/home/config/pop-os.scm | 54 +++++++++++++++++++++++++++++++---------------
 1 file changed, 37 insertions(+), 17 deletions(-)

diff --git a/oni/home/config/pop-os.scm b/oni/home/config/pop-os.scm
index f7e11ec..9ed904e 100644
--- a/oni/home/config/pop-os.scm
+++ b/oni/home/config/pop-os.scm
@@ -114,23 +114,43 @@
 
 (define oni-home-zsh-configuration
   (home-module
-    (services (list home-zsh-service
-                    ;; This has to be the first extension because it needs to be added to the
-                    ;; configuration last.
-                    (service home-zsh-syntax-highlighting-service-type)
-                    (service home-zsh-autosuggestions-service-type)
-                    (service home-zsh-contextual-abbrevs-service-type)
-                    (service home-zsh-atuin-service-type
-                             (home-zsh-atuin-configuration
-                              (inline-height 20)
-                              (filter-mode 'directory)
-                              (history-filter
-                               '("^ +"))
-                              (enter-accept #t)
-                              (common-subcommands
-                               '("guix"))
-                              (sync-address "http://phoenix.fold-kanyu.ts.net:8888")
-                              (search-mode "skim")))))))
+   (services (list home-zsh-service
+                   ;; This has to be the first extension because it needs to be added to the
+                   ;; configuration last.
+                   (service home-zsh-syntax-highlighting-service-type)
+                   (service home-zsh-autosuggestions-service-type)
+                   (service home-zsh-contextual-abbrevs-service-type)
+                   (service home-zsh-atuin-service-type
+                            (home-zsh-atuin-configuration
+                             (inline-height 20)
+                             (filter-mode 'directory)
+                             (history-filter
+                              '("^ +"))
+                             (enter-accept #t)
+                             (common-subcommands
+                              '("guix"
+                                "nala"
+                                "apt"
+                                "cargo"
+                                "composer"
+                                "dnf"
+                                "docker"
+                                "git"
+                                "go"
+                                "ip"
+                                "kubectl"
+                                "nix"
+                                "nmcli"
+                                "npm"
+                                "pecl"
+                                "pnpm"
+                                "podman"
+                                "port"
+                                "systemctl"
+                                "tmux"
+                                "yarn"))
+                             (sync-address "http://phoenix.fold-kanyu.ts.net:8888")
+                             (search-mode "skim")))))))
 
 (define oni-home-herbstluftwm-configuration
   (home-module
-- 
cgit v1.3-2-g0d8e