From 3ef9a0744e716ab2c5484c253c1cb40dd703e1b0 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Mon, 6 Jun 2016 22:09:57 +0200
Subject: l 1: move hardware: mors <-> shodan

---
 lass/1systems/shodan.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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

diff --git a/lass/1systems/shodan.nix b/lass/1systems/shodan.nix
index 6829428ff..b05b9d265 100644
--- a/lass/1systems/shodan.nix
+++ b/lass/1systems/shodan.nix
@@ -69,8 +69,8 @@ with builtins;
     };
   };
 
-  #services.udev.extraRules = ''
-  #  SUBSYSTEM=="net", ATTR{address}=="64:27:37:7d:d8:ae", NAME="wl0"
-  #  SUBSYSTEM=="net", ATTR{address}=="f0:de:f1:b8:c8:2e", NAME="et0"
-  #'';
+  services.udev.extraRules = ''
+    SUBSYSTEM=="net", ATTR{address}=="a0:88:b4:29:26:bc", NAME="wl0"
+    SUBSYSTEM=="net", ATTR{address}=="f0:de:f1:0c:a7:63", NAME="et0"
+  '';
 }
-- 
cgit v1.2.3


From 85ab676579beac3083b6c278858c0efea4efb358 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Mon, 6 Jun 2016 22:11:52 +0200
Subject: l 1 shodan: activate git

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

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

diff --git a/lass/1systems/shodan.nix b/lass/1systems/shodan.nix
index b05b9d265..9a29682a2 100644
--- a/lass/1systems/shodan.nix
+++ b/lass/1systems/shodan.nix
@@ -5,6 +5,7 @@ with builtins;
   imports = [
     ../.
     ../2configs/baseX.nix
+    ../2configs/git.nix
     ../2configs/exim-retiolum.nix
     ../2configs/browsers.nix
     ../2configs/programs.nix
-- 
cgit v1.2.3


From fd95a5a2049580ef66886ca15563bcf798d254b2 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Mon, 6 Jun 2016 22:12:55 +0200
Subject: l 1 shodan: mount /dev/pool/home-lass

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

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

diff --git a/lass/1systems/shodan.nix b/lass/1systems/shodan.nix
index 9a29682a2..073d86790 100644
--- a/lass/1systems/shodan.nix
+++ b/lass/1systems/shodan.nix
@@ -68,6 +68,11 @@ with builtins;
     "/boot" = {
       device = "/dev/sda1";
     };
+
+    "/home/lass" = {
+      device = "/dev/pool/home-lass";
+      fsType = "ext4";
+    };
   };
 
   services.udev.extraRules = ''
-- 
cgit v1.2.3


From 2b74d0defdc3c97ffa5e1f18a5e86637f208d7cb Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sat, 25 Jun 2016 18:38:30 +0200
Subject: l: cleanup

---
 lass/1systems/shodan.nix | 26 +-------------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

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

diff --git a/lass/1systems/shodan.nix b/lass/1systems/shodan.nix
index 073d86790..96d64bda3 100644
--- a/lass/1systems/shodan.nix
+++ b/lass/1systems/shodan.nix
@@ -4,6 +4,7 @@ with builtins;
 {
   imports = [
     ../.
+    ../2configs/hw/tp-x220.nix
     ../2configs/baseX.nix
     ../2configs/git.nix
     ../2configs/exim-retiolum.nix
@@ -20,34 +21,10 @@ with builtins;
     #    };
     #  };
     #}
-    {
-      #x220 config from mors
-      #TODO: make x220 config file (or look in other user dir)
-      hardware.trackpoint = {
-        enable = true;
-        sensitivity = 220;
-        speed = 0;
-        emulateWheel = true;
-      };
-
-      services.xserver = {
-        videoDriver = "intel";
-        vaapiDrivers = [ pkgs.vaapiIntel ];
-        deviceSection = ''
-          Option "AccelMethod" "sna"
-          BusID "PCI:0:2:0"
-        '';
-      };
-    }
   ];
 
   krebs.build.host = config.krebs.hosts.shodan;
 
-  networking.wireless.enable = true;
-
-  hardware.enableAllFirmware = true;
-  nixpkgs.config.allowUnfree = true;
-
   boot = {
     loader.grub.enable = true;
     loader.grub.version = 2;
@@ -57,7 +34,6 @@ with builtins;
     initrd.luks.cryptoModules = [ "aes" "sha512" "sha1" "xts" ];
     initrd.availableKernelModules = [ "xhci_hcd" "ehci_pci" "ahci" "usb_storage" ];
     #kernelModules = [ "kvm-intel" "msr" ];
-    kernelModules = [ "msr" ];
   };
   fileSystems = {
     "/" = {
-- 
cgit v1.2.3