From a632485fab4ec0d01326dcb820545d615fa9f621 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= <hugo@lysator.liu.se>
Date: Sun, 23 Jan 2022 20:24:47 +0100
Subject: Change linux environment configuration.

---
 manifests/workstation.pp | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'manifests/workstation.pp')

diff --git a/manifests/workstation.pp b/manifests/workstation.pp
index 950e420..051f3fc 100644
--- a/manifests/workstation.pp
+++ b/manifests/workstation.pp
@@ -101,15 +101,16 @@ class profiles::workstation (
     '/usr/local/share/cows',
   ]
 
+  # Merge everything from hiera, but provide defeaults for
+  # non-overwritten values.
+  $default_environment = {
+    'COWPATH'  => $cowpath.join(':'),
+  }
+  $user_environment = lookup('environment', undef, 'hash', {})
+  $environment = $default_environment + $user_environment
+
   file { '/etc/environment':
-    content =>  epp('profiles/keyvalue.epp', { values => {
-      'COWPATH'  => $cowpath.join(':'),
-      'MANWIDTH' => 80,
-      'MPD_HOST' => 'jukebox.lysator.liu.se',
-      'PAGER'    => 'less',
-      'EDITOR'   => '/usr/bin/vi',
-      'VISUAL'   => '/usr/bin/vim',
-    }})
+    content => epp('profiles/keyvalue.epp', { values => $environment }),
   }
 
   file { 'Passmenu with OTP support':
-- 
cgit v1.2.3