From 0d257a925bf936d2bd08ab2b04e0ab2762f289f0 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 12 Nov 2017 12:59:30 +0100
Subject: l helios.r: add umts

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

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

diff --git a/lass/1systems/helios/config.nix b/lass/1systems/helios/config.nix
index c64789d8d..46ea9ebd8 100644
--- a/lass/1systems/helios/config.nix
+++ b/lass/1systems/helios/config.nix
@@ -68,6 +68,16 @@ with import <stockholm/lib>;
       repo = [ config.krebs.git.repos.stockholm ];
       perm = with git; push "refs/heads/*" [ fast-forward non-fast-forward create delete merge ];
     }
+    {
+      lass.umts = {
+        enable = true;
+        modem = "/dev/serial/by-id/usb-Lenovo_F5521gw_2C7D8D7C35FC7040-if09";
+        initstrings = ''
+          Init1 = AT+CFUN=1
+          Init2 = AT+CGDCONT=1,"IP","pinternet.interkom.de","",0,0
+        '';
+      };
+    }
   ];
 
   # Use the systemd-boot EFI boot loader.
-- 
cgit v1.2.3


From 8ccfefb51f8eb4601025fee5e6bd9971dd032f9e Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 12 Nov 2017 12:59:45 +0100
Subject: l helios.r: add monitor config

---
 lass/1systems/helios/config.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

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

diff --git a/lass/1systems/helios/config.nix b/lass/1systems/helios/config.nix
index 46ea9ebd8..0f0dd7dd9 100644
--- a/lass/1systems/helios/config.nix
+++ b/lass/1systems/helios/config.nix
@@ -110,11 +110,16 @@ with import <stockholm/lib>;
 
   services.xserver.videoDrivers = [ "nvidia" ];
   services.xserver.xrandrHeads = [
-    { output = "DP-0.8"; }
-    { output = "DP-4"; monitorConfig = ''Option "Rotate" "right"''; }
     { output = "DP-2"; primary = true; }
+    { output = "DP-4"; monitorConfig = ''Option "Rotate" "left"''; }
+    { output = "DP-0"; }
   ];
 
+  services.xserver.displayManager.sessionCommands = ''
+    ${pkgs.xorg.xrandr}/bin/xrandr --output DP-6 --off --output DP-5 --off --output DP-4 --mode 2560x1440 --pos 3840x0 --rotate left --output DP-3 --off --output DP-2 --primary --mode 3840x2160 --pos 0x400 --rotate normal --output DP-1 --off --output DP-0 --mode 2560x1440 --pos 5280x1120 --rotate normal
+    ${pkgs.systemd}/bin/systemctl start xresources.service
+  '';
+
   networking.hostName = lib.mkForce "BLN02NB0162";
 
   security.pki.certificateFiles = [
-- 
cgit v1.2.3


From 8ca59b00fc157abf3fbcbfe179e52816047ac65d Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 12 Nov 2017 13:00:03 +0100
Subject: l helios.r: minimize printing config

---
 lass/1systems/helios/config.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

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

diff --git a/lass/1systems/helios/config.nix b/lass/1systems/helios/config.nix
index 0f0dd7dd9..a3429f479 100644
--- a/lass/1systems/helios/config.nix
+++ b/lass/1systems/helios/config.nix
@@ -138,8 +138,6 @@ with import <stockholm/lib>;
   programs.adb.enable = true;
   users.users.mainUser.extraGroups = [ "adbusers" ];
 
-  services.printing = {
-    enable = true;
-    drivers = [ pkgs.postscript-lexmark ];
-  };
+  services.printing.drivers = [ pkgs.postscript-lexmark ];
+
 }
-- 
cgit v1.2.3


From d050f9a8a99820c2dc64875aa4613af1b4805a15 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 12 Nov 2017 13:54:15 +0100
Subject: l helios.r: disable git

---
 lass/1systems/helios/config.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/lass/1systems/helios/config.nix b/lass/1systems/helios/config.nix
index a3429f479..eb45d92ec 100644
--- a/lass/1systems/helios/config.nix
+++ b/lass/1systems/helios/config.nix
@@ -10,7 +10,8 @@ with import <stockholm/lib>;
     <stockholm/lass/2configs/pass.nix>
     <stockholm/lass/2configs/retiolum.nix>
     <stockholm/lass/2configs/otp-ssh.nix>
-    <stockholm/lass/2configs/git.nix>
+    # TODO fix krebs.git.rules.[definition 2-entry 2].lass not defined
+    #<stockholm/lass/2configs/git.nix>
     <stockholm/lass/2configs/dcso-vpn.nix>
     { # automatic hardware detection
       boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
-- 
cgit v1.2.3