From 57ae89a63d1d21884861df02b5b552696353eb7a Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 2 Jan 2017 14:48:45 +0100
Subject: machines/managed: Implement a preliminary profile

Currently I just needed to support HP printers and scanners among all
the managed machines, so I thought it would be a good oportunity to
start a common profile for end user machines.

Right now there isn't that much factored out yet, but instead of copy &
pasting the printer/scanner config into all three machines I'm putting
it into the profile.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 machines/aszlig/managed/brawndo.nix | 10 +++-------
 machines/aszlig/managed/notsure.nix |  6 ++++--
 machines/aszlig/managed/tyree.nix   | 10 ++--------
 3 files changed, 9 insertions(+), 17 deletions(-)

(limited to 'machines')

diff --git a/machines/aszlig/managed/brawndo.nix b/machines/aszlig/managed/brawndo.nix
index ae7a361c..33b74be0 100644
--- a/machines/aszlig/managed/brawndo.nix
+++ b/machines/aszlig/managed/brawndo.nix
@@ -89,8 +89,7 @@ in {
 
   services = {
     deluge.enable = true;
-    printing.enable = true;
-    printing.drivers = [ pkgs.gutenprint pkgs.hplip pkgs.cups-bjnp ];
+    printing.drivers = [ pkgs.cups-bjnp ];
     tlp.enable = true;
 
     xserver = {
@@ -110,11 +109,8 @@ in {
 
   time.timeZone = "Europe/Berlin";
 
-  users.users.dwenola = {
-    isNormalUser = true;
-    uid = 1000;
-    extraGroups = [ "video" "wheel" "networkmanager" ];
-  };
+  vuizvui.user.aszlig.profiles.managed.enable = true;
+  vuizvui.user.aszlig.profiles.managed.mainUser = "dwenola";
 
   vuizvui.user.aszlig.programs.vim.enable = true;
   vuizvui.enableGlobalNixpkgsConfig = true;
diff --git a/machines/aszlig/managed/notsure.nix b/machines/aszlig/managed/notsure.nix
index 758f3c72..7b129839 100644
--- a/machines/aszlig/managed/notsure.nix
+++ b/machines/aszlig/managed/notsure.nix
@@ -70,8 +70,7 @@ in {
 
   services = {
     deluge.enable = true;
-    printing.enable = true;
-    printing.drivers = [ pkgs.gutenprint pkgs.hplip pkgs.cups-bjnp ];
+    printing.drivers = [ pkgs.cups-bjnp ];
     tlp.enable = true;
 
     xserver = {
@@ -88,6 +87,9 @@ in {
 
   time.timeZone = "Europe/Berlin";
 
+  vuizvui.user.aszlig.profiles.managed.enable = true;
+  vuizvui.user.aszlig.profiles.managed.mainUser = "dwenola";
+
   vuizvui.user.aszlig.programs.vim.enable = true;
   vuizvui.enableGlobalNixpkgsConfig = true;
 }
diff --git a/machines/aszlig/managed/tyree.nix b/machines/aszlig/managed/tyree.nix
index d7ee1cea..27a044b5 100644
--- a/machines/aszlig/managed/tyree.nix
+++ b/machines/aszlig/managed/tyree.nix
@@ -67,9 +67,6 @@
   services.openssh.enable = true;
   services.tlp.enable = true;
 
-  services.printing.enable = true;
-  services.printing.drivers = [ pkgs.gutenprint pkgs.hplip ];
-
   services.xserver.enable = true;
   services.xserver.layout = "de";
   services.xserver.xkbOptions = "eurosign:e,caps:none";
@@ -80,11 +77,8 @@
 
   time.timeZone = "Europe/Berlin";
 
-  users.users.bla = {
-    isNormalUser = true;
-    uid = 1000;
-    extraGroups = [ "video" "wheel" "networkmanager" ];
-  };
+  vuizvui.user.aszlig.profiles.managed.enable = true;
+  vuizvui.user.aszlig.profiles.managed.mainUser = "bla";
 
   vuizvui.hardware.t100ha.enable = true;
   vuizvui.user.aszlig.programs.vim.enable = true;
-- 
cgit 1.4.1