From a70fc9b95abf47aca54d39076529b3718adeb7cc Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 21 Aug 2017 12:36:04 +0200
Subject: l: mors <-> daedalus

---
 lass/1systems/daedalus/config.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lass/1systems/daedalus')

diff --git a/lass/1systems/daedalus/config.nix b/lass/1systems/daedalus/config.nix
index 290d8a780..72a45a3d9 100644
--- a/lass/1systems/daedalus/config.nix
+++ b/lass/1systems/daedalus/config.nix
@@ -4,7 +4,7 @@
   imports = [
     <stockholm/lass>
     <stockholm/lass/2configs/hw/x220.nix>
-    <stockholm/lass/2configs/boot/stock-x220.nix>
+    <stockholm/lass/2configs/boot/coreboot.nix>
 
     <stockholm/lass/2configs/mouse.nix>
     <stockholm/lass/2configs/retiolum.nix>
@@ -29,7 +29,7 @@
   };
 
   services.udev.extraRules = ''
-    SUBSYSTEM=="net", ATTR{address}=="00:24:d7:f0:e8:c8", NAME="wl0"
-    SUBSYSTEM=="net", ATTR{address}=="f0:de:f1:8f:8a:78", NAME="et0"
+    SUBSYSTEM=="net", ATTR{address}=="08:11:96:0a:5d:6c", NAME="wl0"
+    SUBSYSTEM=="net", ATTR{address}=="f0:de:f1:71:cb:35", NAME="et0"
   '';
 }
-- 
cgit v1.2.3


From 51cb5bb1f10aaf68499f6fbe53923959d35f039b Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 21 Aug 2017 12:37:57 +0200
Subject: l daedalus.r: add kde desktop

---
 lass/1systems/daedalus/config.nix | 68 ++++++++++++++++++++++++++++++++++-----
 1 file changed, 60 insertions(+), 8 deletions(-)

(limited to 'lass/1systems/daedalus')

diff --git a/lass/1systems/daedalus/config.nix b/lass/1systems/daedalus/config.nix
index 72a45a3d9..36daea1d5 100644
--- a/lass/1systems/daedalus/config.nix
+++ b/lass/1systems/daedalus/config.nix
@@ -1,3 +1,4 @@
+with import <stockholm/lib>;
 { config, pkgs, ... }:
 
 {
@@ -6,18 +7,69 @@
     <stockholm/lass/2configs/hw/x220.nix>
     <stockholm/lass/2configs/boot/coreboot.nix>
 
-    <stockholm/lass/2configs/mouse.nix>
     <stockholm/lass/2configs/retiolum.nix>
-    <stockholm/lass/2configs/git.nix>
-    <stockholm/lass/2configs/exim-retiolum.nix>
-    <stockholm/lass/2configs/baseX.nix>
-    <stockholm/lass/2configs/browsers.nix>
-    <stockholm/lass/2configs/programs.nix>
-    <stockholm/lass/2configs/fetchWallpaper.nix>
     <stockholm/lass/2configs/backups.nix>
-    <stockholm/lass/2configs/games.nix>
+    {
+      # bubsy config
+      users.users.bubsy = {
+        uid = genid "bubsy";
+        home = "/home/bubsy";
+        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; [
+        pavucontrol
+        firefox
+        hexchat
+        networkmanagerapplet
+      ];
+      services.xserver.enable = true;
+      services.xserver.displayManager.lightdm.enable = true;
+      services.xserver.desktopManager.plasma5.enable = true;
+    }
+    {
+      krebs.per-user.bitcoin.packages = [
+        pkgs.electrum
+      ];
+      users.extraUsers = {
+        bitcoin = {
+          name = "bitcoin";
+          description = "user for bitcoin stuff";
+          home = "/home/bitcoin";
+          useDefaultShell = true;
+          createHome = true;
+        };
+      };
+      security.sudo.extraConfig = ''
+        bubsy ALL=(bitcoin) NOPASSWD: ALL
+      '';
+    }
   ];
 
+  time.timeZone = "Europe/Berlin";
+
+  hardware.trackpoint = {
+    enable = true;
+    sensitivity = 220;
+    speed = 0;
+    emulateWheel = true;
+  };
+
+  services.logind.extraConfig = ''
+    HandleLidSwitch=ignore
+  '';
+
   krebs.build.host = config.krebs.hosts.daedalus;
 
   fileSystems = {
-- 
cgit v1.2.3


From 28aadfeb357ed1c57c8af0d79045406c8f1ef0cd Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 2 Sep 2017 16:13:30 +0200
Subject: l daedalus.r: add de keyboard layout

---
 lass/1systems/daedalus/config.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lass/1systems/daedalus')

diff --git a/lass/1systems/daedalus/config.nix b/lass/1systems/daedalus/config.nix
index 36daea1d5..a3db0f1b4 100644
--- a/lass/1systems/daedalus/config.nix
+++ b/lass/1systems/daedalus/config.nix
@@ -37,6 +37,7 @@ with import <stockholm/lib>;
       services.xserver.enable = true;
       services.xserver.displayManager.lightdm.enable = true;
       services.xserver.desktopManager.plasma5.enable = true;
+      services.xserver.layout = "de";
     }
     {
       krebs.per-user.bitcoin.packages = [
-- 
cgit v1.2.3


From 495d8cddb0b59351f08ee6154b483f1826b3d70c Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 2 Sep 2017 22:16:46 +0200
Subject: l daedalus.r: add pkgs.libreoffice

---
 lass/1systems/daedalus/config.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lass/1systems/daedalus')

diff --git a/lass/1systems/daedalus/config.nix b/lass/1systems/daedalus/config.nix
index a3db0f1b4..db1bb5d3a 100644
--- a/lass/1systems/daedalus/config.nix
+++ b/lass/1systems/daedalus/config.nix
@@ -33,6 +33,7 @@ with import <stockholm/lib>;
         firefox
         hexchat
         networkmanagerapplet
+        libreoffice
       ];
       services.xserver.enable = true;
       services.xserver.displayManager.lightdm.enable = true;
-- 
cgit v1.2.3


From 5184d19651f9319d63fd812601f3df635b1416b8 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 2 Sep 2017 22:17:31 +0200
Subject: l daedalus.r: add remote control

---
 lass/1systems/daedalus/config.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'lass/1systems/daedalus')

diff --git a/lass/1systems/daedalus/config.nix b/lass/1systems/daedalus/config.nix
index db1bb5d3a..e1bce5da8 100644
--- a/lass/1systems/daedalus/config.nix
+++ b/lass/1systems/daedalus/config.nix
@@ -57,6 +57,15 @@ with import <stockholm/lib>;
         bubsy ALL=(bitcoin) NOPASSWD: ALL
       '';
     }
+    {
+      #remote control
+      environment.systemPackages = with pkgs; [
+        x11vnc
+      ];
+      krebs.iptables.tables.filter.INPUT.rules = [
+        { predicate = "-p tcp -i retiolum --dport 5900"; target = "ACCEPT"; }
+      ];
+    }
   ];
 
   time.timeZone = "Europe/Berlin";
-- 
cgit v1.2.3