From 7fdc46bb9d911838edfa723d985ede6a604c0c5a Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 6 Jul 2017 21:47:47 +0200
Subject: move source config from module system to 1systems/*/source.nix

---
 tv/1systems/alnus/config.nix | 96 ++++++++++++++++++++++++++++++++++++++++++++
 tv/1systems/alnus/source.nix |  3 ++
 2 files changed, 99 insertions(+)
 create mode 100644 tv/1systems/alnus/config.nix
 create mode 100644 tv/1systems/alnus/source.nix

(limited to 'tv/1systems/alnus')

diff --git a/tv/1systems/alnus/config.nix b/tv/1systems/alnus/config.nix
new file mode 100644
index 000000000..d08a2901b
--- /dev/null
+++ b/tv/1systems/alnus/config.nix
@@ -0,0 +1,96 @@
+{ config, pkgs, ... }:
+
+with import <stockholm/lib>;
+
+{
+  imports = [
+    <stockholm/tv>
+    <stockholm/tv/2configs/hw/x220.nix>
+    <stockholm/tv/2configs/exim-retiolum.nix>
+    <stockholm/tv/2configs/retiolum.nix>
+  ];
+
+  # TODO remove non-hardware stuff from ../2configs/hw/x220.nix
+  # networking.wireless.enable collides with networkmanager
+  networking.wireless.enable = mkForce false;
+
+  boot = {
+    initrd = {
+      availableKernelModules = [ "ahci" ];
+      luks = {
+        cryptoModules = [ "aes" "sha512" "xts" ];
+        devices = [ { name = "luksroot"; device = "/dev/sda2"; } ];
+      };
+    };
+  };
+
+  environment.systemPackages = with pkgs; [
+    chromium
+    firefoxWrapper
+    networkmanagerapplet
+    pidginotr
+    pidgin-with-plugins
+  ];
+
+  fileSystems = {
+    "/boot" = {
+      device = "/dev/sda1";
+    };
+    "/" = {
+      device = "/dev/mapper/main-root";
+      fsType = "btrfs";
+      options = [ "defaults" "noatime" ];
+    };
+    "/home" = {
+      device = "/dev/mapper/main-home";
+      fsType = "btrfs";
+      options = [ "defaults" "noatime" ];
+    };
+  };
+
+  hardware = {
+    opengl.driSupport32Bit = true;
+    pulseaudio.enable = true;
+  };
+
+  i18n.defaultLocale = "de_DE.UTF-8";
+
+  krebs.build = {
+    host = config.krebs.hosts.alnus;
+    user = mkForce config.krebs.users.dv;
+    source.nixpkgs.git.ref = mkForce "9b948ea439ddbaa26740ce35543e7e35d2aa6d18";
+  };
+
+  networking.networkmanager.enable = true;
+
+  nixpkgs.config = {
+    allowUnfree = true;
+  };
+
+  services.xserver = {
+    enable = true;
+    layout = "de";
+    xkbOptions = "eurosign:e";
+    synaptics = {
+      enable = true;
+      twoFingerScroll = true;
+    };
+    desktopManager.xfce.enable = true;
+    displayManager.auto = {
+      enable = true;
+      user = "dv";
+    };
+  };
+
+  swapDevices =[ ];
+
+  users.users.dv = {
+    inherit (config.krebs.users.dv) home uid;
+    isNormalUser = true;
+    extraGroups = [
+      "audio"
+      "video"
+      "networkmanager"
+    ];
+  };
+}
diff --git a/tv/1systems/alnus/source.nix b/tv/1systems/alnus/source.nix
new file mode 100644
index 000000000..f9dcefee6
--- /dev/null
+++ b/tv/1systems/alnus/source.nix
@@ -0,0 +1,3 @@
+import <stockholm/tv/source.nix> {
+  name = "alnus";
+}
-- 
cgit v1.2.3


From cd47613a4d8daf185f4ac0f8ef43af11985a2f65 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 12 Jul 2017 18:01:18 +0200
Subject: tv alnus source: overrid nixpkgs ref

---
 tv/1systems/alnus/config.nix | 1 -
 tv/1systems/alnus/source.nix | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

(limited to 'tv/1systems/alnus')

diff --git a/tv/1systems/alnus/config.nix b/tv/1systems/alnus/config.nix
index d08a2901b..dd9e594fc 100644
--- a/tv/1systems/alnus/config.nix
+++ b/tv/1systems/alnus/config.nix
@@ -58,7 +58,6 @@ with import <stockholm/lib>;
   krebs.build = {
     host = config.krebs.hosts.alnus;
     user = mkForce config.krebs.users.dv;
-    source.nixpkgs.git.ref = mkForce "9b948ea439ddbaa26740ce35543e7e35d2aa6d18";
   };
 
   networking.networkmanager.enable = true;
diff --git a/tv/1systems/alnus/source.nix b/tv/1systems/alnus/source.nix
index f9dcefee6..c3ed4dcfb 100644
--- a/tv/1systems/alnus/source.nix
+++ b/tv/1systems/alnus/source.nix
@@ -1,3 +1,4 @@
 import <stockholm/tv/source.nix> {
   name = "alnus";
+  override.nixpkgs.git.ref = "9b948ea439ddbaa26740ce35543e7e35d2aa6d18";
 }
-- 
cgit v1.2.3