From 8cfca37f5e87dd91e1676b4ad23578a9bf5bdf2b Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Thu, 8 Sep 2016 21:02:39 +0200
Subject: l 1 uriel: configure laptop for locke

---
 lass/1systems/uriel.nix | 42 ++++++++++++++++++++++++++++++------------
 1 file changed, 30 insertions(+), 12 deletions(-)

(limited to 'lass/1systems/uriel.nix')

diff --git a/lass/1systems/uriel.nix b/lass/1systems/uriel.nix
index 16c39280..8b7d827c 100644
--- a/lass/1systems/uriel.nix
+++ b/lass/1systems/uriel.nix
@@ -1,25 +1,43 @@
 { config, pkgs, ... }:
 
 with builtins;
+with config.krebs.lib;
 {
   imports = [
     ../.
     ../2configs/retiolum.nix
-    ../2configs/baseX.nix
     ../2configs/exim-retiolum.nix
-    ../2configs/browsers.nix
-    ../2configs/games.nix
-    ../2configs/pass.nix
-    ../2configs/bird.nix
-    ../2configs/git.nix
-    ../2configs/chromium-patched.nix
-    ../2configs/bitlbee.nix
-    ../2configs/weechat.nix
-    ../2configs/skype.nix
     {
-      lass.umts = {
+      # locke config
+      time.timeZone = "Europe/Berlin";
+      services.xserver.enable = true;
+      users.users.locke = {
+        uid = genid "locke";
+        home = "/home/locke";
+        group = "users";
+        createHome = true;
+        extraGroups = [
+          "audio"
+          "networkmanager"
+        ];
+        useDefaultShell = true;
+      };
+      networking.networkmanager.enable = true;
+      networking.wireless.enable = mkForce false;
+      hardware.pulseaudio = {
+        enable = true;
+        systemWide = true;
+      };
+      environment.systemPackages = with pkgs; [
+        firefox
+        hexchat
+        networkmanagerapplet
+      ];
+      services.xserver.desktopManager.xfce = {
         enable = true;
-        modem = "/dev/serial/by-id/usb-HUAWEI_Technologies_HUAWEI_Mobile-if00-port0";
+        thunarPlugins = [
+          pkgs.xfce/xfce_battery_plugin
+        ];
       };
     }
   ];
-- 
cgit v1.2.3


From d80da94fb1cf9eee4a988d0829559de8256e9331 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Tue, 13 Sep 2016 00:12:45 +0200
Subject: l 1 uriel: xfcePlugins are not thnarPlugins

---
 lass/1systems/uriel.nix | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'lass/1systems/uriel.nix')

diff --git a/lass/1systems/uriel.nix b/lass/1systems/uriel.nix
index 8b7d827c..c6d4dbd8 100644
--- a/lass/1systems/uriel.nix
+++ b/lass/1systems/uriel.nix
@@ -35,9 +35,6 @@ with config.krebs.lib;
       ];
       services.xserver.desktopManager.xfce = {
         enable = true;
-        thunarPlugins = [
-          pkgs.xfce/xfce_battery_plugin
-        ];
       };
     }
   ];
-- 
cgit v1.2.3


From 65494d381ea22b086f4bb30a12a58e0f7b37bf12 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Tue, 11 Oct 2016 17:35:53 +0200
Subject: l 1: explicitly add /tmp as tmpfs

---
 lass/1systems/uriel.nix | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'lass/1systems/uriel.nix')

diff --git a/lass/1systems/uriel.nix b/lass/1systems/uriel.nix
index c6d4dbd8..7f09836d 100644
--- a/lass/1systems/uriel.nix
+++ b/lass/1systems/uriel.nix
@@ -77,6 +77,11 @@ with config.krebs.lib;
     "/boot" = {
       device = "/dev/sda1";
     };
+    "/tmp" = {
+      device = "tmpfs";
+      fsType = "tmpfs";
+      options = ["nosuid" "nodev" "noatime"];
+    };
   };
 
   services.udev.extraRules = ''
-- 
cgit v1.2.3


From 8ef5d94a78104f603d8c5882fd2de331d4d7e2f2 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Wed, 12 Oct 2016 12:16:21 +0200
Subject: l 1 uriel: fix duplicate definition of wireless

---
 lass/1systems/uriel.nix | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'lass/1systems/uriel.nix')

diff --git a/lass/1systems/uriel.nix b/lass/1systems/uriel.nix
index 7f09836d..aa5286ae 100644
--- a/lass/1systems/uriel.nix
+++ b/lass/1systems/uriel.nix
@@ -23,7 +23,6 @@ with config.krebs.lib;
         useDefaultShell = true;
       };
       networking.networkmanager.enable = true;
-      networking.wireless.enable = mkForce false;
       hardware.pulseaudio = {
         enable = true;
         systemWide = true;
@@ -41,8 +40,6 @@ with config.krebs.lib;
 
   krebs.build.host = config.krebs.hosts.uriel;
 
-  networking.wireless.enable = true;
-
   hardware.enableAllFirmware = true;
   nixpkgs.config.allowUnfree = true;
 
-- 
cgit v1.2.3