makefu: cleanup,refactoring after transfer

7 files changed, 89 insertions, 44 deletions

diff --git a/makefu/2configs/base-gui.nix b/makefu/2configs/base-gui.nix
index 55fcd6baa..6896a66dc 100644
--- a/makefu/2configs/base-gui.nix
+++ b/makefu/2configs/base-gui.nix
@@ -1,11 +1,15 @@
 { config, lib, pkgs, ... }:
 ##
-# of course this name is a lie - it prepares a GUI environment close to my
-# current configuration.
+# of course this name is a lie
+# - it prepares a GUI environment close to my
+# current configuration,specifically:
 #
-# autologin with mainUser into awesome
-##
+# * autologin with mainUser into awesome
+# * audio
+# * terminus font
 #
+# if this is not enough, check out main-laptop.nix
+
 with lib;
 let
   mainUser = config.krebs.build.user.name;
@@ -28,14 +32,6 @@ in
     displayManager.auto.user = mainUser;
     desktopManager.xterm.enable = false;
   };
-  services.redshift = {
-    enable = true;
-    latitude = "48.7";
-    longitude = "9.1";
-  };
-
-## FONTS
-# TODO: somewhere else?
 
   i18n.consoleFont = "Lat2-Terminus16";
 
@@ -49,14 +45,12 @@ in
   environment.systemPackages = with pkgs;[
     xlockmore
     rxvt_unicode-with-plugins
-    vlc
     firefox
-    chromium
   ];
-  # TODO: use mainUser
-  users.extraUsers.makefu.extraGroups = [ "audio" ];
+  users.extraUsers.${mainUser}.extraGroups = [ "audio" ];
+
   hardware.pulseaudio = {
-    enable = true;
-  #  systemWide = true;
+     enable = true;
+   #  systemWide = true;
   };
 }
diff --git a/makefu/2configs/main-laptop.nix b/makefu/2configs/main-laptop.nix
new file mode 100644
index 000000000..8d2c8213e
--- /dev/null
+++ b/makefu/2configs/main-laptop.nix
@@ -0,0 +1,23 @@
+{ config, lib, pkgs, ... }:
+
+# stuff for the main laptop
+# this is pretty much nice-to-have and does
+# not fit into base-gui
+
+with lib;
+{
+  imports = [ ./base-gui.nix ];
+  environment.systemPackages = with pkgs;[
+    vlc
+    firefox
+    chromium
+    keepassx
+  ];
+
+  services.redshift = {
+    enable = true;
+    latitude = "48.7";
+    longitude = "9.1";
+  };
+
+}
diff --git a/makefu/2configs/sda-crypto-root-home.nix b/makefu/2configs/sda-crypto-root-home.nix
index 28d140119..3821c7504 100644
--- a/makefu/2configs/sda-crypto-root-home.nix
+++ b/makefu/2configs/sda-crypto-root-home.nix
@@ -1,8 +1,12 @@
 { config, lib, pkgs, ... }:
 
+# ssd #
 # sda:  bootloader grub2
 # sda1: boot ext4 (label nixboot)
-# sda2: cryptoluks -> ext4
+# sda2: cryptoluks -> lvm:
+#       /     (main-root)
+#       /home (main-home)
+
 with lib;
 {
   boot = {
diff --git a/makefu/2configs/tp-x200.nix b/makefu/2configs/tp-x200.nix
index 2bbc75c20..aed6d6448 100644
--- a/makefu/2configs/tp-x200.nix
+++ b/makefu/2configs/tp-x200.nix
@@ -2,36 +2,13 @@
 
 with lib;
 {
-  #services.xserver = {
-  #  videoDriver = "intel";
-  #};
+
+  imports = [ ./tp-x2x0.nix ];
 
   boot = {
     kernelModules = [ "tp_smapi" "msr" ];
     extraModulePackages = [ config.boot.kernelPackages.tp_smapi ];
 
   };
-
-  #networking.wireless.enable = true;
-
-  hardware.enableAllFirmware = true;
-  nixpkgs.config.allowUnfree = true;
-
-  zramSwap.enable = true;
-  zramSwap.numDevices = 2;
-
-  hardware.trackpoint.enable = true;
-  hardware.trackpoint.sensitivity = 255;
-  hardware.trackpoint.speed = 255;
-  services.xserver.displayManager.sessionCommands = ''
-    xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation" 1
-    xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Button" 2
-    xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Timeout" 200
-  '';
-
   services.thinkfan.enable = true;
-  services.tlp.enable = true;
-  services.tlp.extraConfig = ''
-  START_CHARGE_THRESH_BAT0=80
-  '';
 }
diff --git a/makefu/2configs/tp-x220.nix b/makefu/2configs/tp-x220.nix
new file mode 100644
index 000000000..64eb78b19
--- /dev/null
+++ b/makefu/2configs/tp-x220.nix
@@ -0,0 +1,10 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+{
+
+  imports = [ ./tp-x2x0.nix ];
+
+  boot.kernelModules = [ "kvm-intel" ];
+
+}
diff --git a/makefu/2configs/tp-x2x0.nix b/makefu/2configs/tp-x2x0.nix
new file mode 100644
index 000000000..e65563014
--- /dev/null
+++ b/makefu/2configs/tp-x2x0.nix
@@ -0,0 +1,27 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+{
+  # TODO: pot this somewhere else
+  networking.wireless.enable = true;
+
+  hardware.enableAllFirmware = true;
+  nixpkgs.config.allowUnfree = true;
+
+  zramSwap.enable = true;
+  zramSwap.numDevices = 2;
+
+  hardware.trackpoint.enable = true;
+  hardware.trackpoint.sensitivity = 220;
+  hardware.trackpoint.speed = 220;
+  services.xserver.displayManager.sessionCommands = ''
+    xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation" 1
+    xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Button" 2
+    xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Timeout" 200
+  '';
+
+  services.tlp.enable = true;
+  services.tlp.extraConfig = ''
+  START_CHARGE_THRESH_BAT0=80
+  '';
+}
diff --git a/makefu/2configs/zsh-user.nix b/makefu/2configs/zsh-user.nix
new file mode 100644
index 000000000..3089b706a
--- /dev/null
+++ b/makefu/2configs/zsh-user.nix
@@ -0,0 +1,10 @@
+{ config, lib, pkgs, ... }:
+##
+with lib;
+let
+  mainUser = config.krebs.build.user.name;
+in
+{
+  programs.zsh.enable = true;
+  users.extraUsers.${mainUser}.shell = "/run/current-system/sw/bin/zsh";
+}