Move pipx, rsync, bash-completion, emacs-nox from workstation to basic_software

diff --git a/personal_infra/puppet/modules/basic_software/manifests/init.pp b/personal_infra/puppet/modules/basic_software/manifests/init.pp
index fdfaeabc4bd642ef77ce0322c7d9e5ee18a1e70e..723f8a29a3bed5584db2ff9d3cdc587b61a96d10 100644 (file)
--- a/personal_infra/puppet/modules/basic_software/manifests/init.pp
+++ b/personal_infra/puppet/modules/basic_software/manifests/init.pp
@@ -1,7 +1,22 @@
 class basic_software {
-  package {['less', 'mlocate', 'traceroute', 'nmap', 'tree', 'tar', 'screen', 'git', 'net-tools']:}
+  package {['less', 'mlocate', 'traceroute', 'nmap', 'tree', 'tar', 'screen', 'git', 'net-tools', 'pipx', 'rsync', 'bash-completion']:}
 
   if($facts['os']['family'] == 'RedHat') {
     package {'which':}
   }
+
+  if ($facts['os']['family'] == 'Debian') {
+    file {'/etc/apt/preferences.d/90_emacs':
+      content => @(EOT)
+      Package: src:emacs
+      Pin: release n=bookworm-backports
+      Pin-Priority: 990
+      | EOT
+      ,
+    }
+    ~>
+    Exec["/usr/bin/apt update"]
+    ->
+    package {'emacs-nox':}
+  }
 }

diff --git a/personal_infra/puppet/modules/workstation/manifests/init.pp b/personal_infra/puppet/modules/workstation/manifests/init.pp
index 7aee7c4b8781bdd31445256075a4e5b754c62414..82963bc2bdf2d1f3edf8092ccb0f29789e51f243 100644 (file)
--- a/personal_infra/puppet/modules/workstation/manifests/init.pp
+++ b/personal_infra/puppet/modules/workstation/manifests/init.pp
@@ -1,22 +1,9 @@
 class workstation {
-  package {['pipx', 'rclone', 'rsync', 'sshpass', 'bash-completion', 'python3-pip', 'xclip']:}
+  package {['rclone', 'sshpass', 'python3-pip', 'xclip']:}
 
   if ($facts['os']['family'] == 'Debian') {
     package {['nextcloud-desktop']:}
 
-    file {'/etc/apt/preferences.d/90_emacs':
-      content => @(EOT)
-      Package: src:emacs
-      Pin: release n=bookworm-backports
-      Pin-Priority: 990
-      | EOT
-      ,
-    }
-    ~>
-    Exec["/usr/bin/apt update"]
-    ->
-    package {'emacs-nox':}
-
     file {'/etc/apt/keyrings/packages.mozilla.org.asc':
       content => @(EOT)
       -----BEGIN PGP PUBLIC KEY BLOCK-----