From c29856b3421c66862bf01bf0662c9b2dc9c2430d Mon Sep 17 00:00:00 2001
From: alex <alex@pdp7.net>
Date: Mon, 7 Oct 2024 21:26:16 +0200
Subject: [PATCH] Move pipx, rsync, bash-completion, emacs-nox from workstation
 to basic_software

---
 .../modules/basic_software/manifests/init.pp    | 17 ++++++++++++++++-
 .../modules/workstation/manifests/init.pp       | 15 +--------------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/personal_infra/puppet/modules/basic_software/manifests/init.pp b/personal_infra/puppet/modules/basic_software/manifests/init.pp
index fdfaeab..723f8a2 100644
--- 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 7aee7c4..82963bc 100644
--- 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-----
-- 
2.47.3