ma: random cleanup

2 files changed, 18 insertions, 43 deletions

diff --git a/makefu/1systems/sdev/config.nix b/makefu/1systems/sdev/config.nix
index c2cd23d1..2f289d50 100644
--- a/makefu/1systems/sdev/config.nix
+++ b/makefu/1systems/sdev/config.nix
@@ -6,13 +6,13 @@
     [ # Include the results of the hardware scan.
       <stockholm/makefu>
 
-     #  <stockholm/makefu/2configs/hw/vbox-guest.nix>
-      { # until virtualbox-image is fixed
-        imports = [
-            <stockholm/makefu/2configs/fs/single-partition-ext4.nix>
-          ];
-        boot.loader.grub.device = "/dev/sda";
-      }
+       <stockholm/makefu/2configs/hw/vbox-guest.nix>
+      #{ # until virtualbox-image is fixed
+      #  imports = [
+      #      <stockholm/makefu/2configs/fs/single-partition-ext4.nix>
+      #    ];
+      #  boot.loader.grub.device = lib.mkForce "/dev/sda";
+      #}
       <stockholm/makefu/2configs/main-laptop.nix>
       # <secrets/extra-hosts.nix>
 
diff --git a/makefu/1systems/tsp/config.nix b/makefu/1systems/tsp/config.nix
index 680fa2cb..2921e2bc 100644
--- a/makefu/1systems/tsp/config.nix
+++ b/makefu/1systems/tsp/config.nix
@@ -8,57 +8,32 @@
     [ # Include the results of the hardware scan.
       <stockholm/makefu>
       <stockholm/makefu/2configs/main-laptop.nix>
-      <stockholm/makefu/2configs/tools/all.nix>
-      <stockholm/makefu/2configs/fs/sda-crypto-root.nix>
+      # <stockholm/makefu/2configs/tools/all.nix>
+      <stockholm/makefu/2configs/fs/single-partition-ext4.nix>
       # hardware specifics are in here
       # imports tp-x2x0.nix
-      # <stockholm/makefu/2configs/hw/tp-x200.nix>
+      <stockholm/makefu/2configs/hw/tp-x230.nix>
+      <stockholm/makefu/2configs/hw/bluetooth.nix>
+      <stockholm/makefu/2configs/hw/network-manager.nix>
 
       # <stockholm/makefu/2configs/rad1o.nix>
 
       <stockholm/makefu/2configs/zsh-user.nix>
       <stockholm/makefu/2configs/exim-retiolum.nix>
       <stockholm/makefu/2configs/tinc/retiolum.nix>
+
+      <stockholm/makefu/2configs/sshd-totp.nix>
+      {
+        programs.adb.enable = true;
+      }
     ];
-  # not working in vm
   krebs.build.host = config.krebs.hosts.tsp;
-  boot.initrd.luks.devices = [ { name = "luksroot"; device = "/dev/sda2"; allowDiscards=true; }];
-  boot.loader.grub.copyKernels = true;
+  boot.loader.grub.device = "/dev/sda";
 
   networking.firewall.allowedTCPPorts = [
     25
   ];
 
-  # acer aspire
-  networking.wireless.enable = lib.mkDefault true;
-
-  services.xserver.synaptics.enable = true;
-
   hardware.enableAllFirmware = true;
   nixpkgs.config.allowUnfree = true;
-
-  hardware.cpu.intel.updateMicrocode = true;
-
-  zramSwap.enable = true;
-  zramSwap.numDevices = 2;
-
-  services.tlp.enable = true;
-  services.tlp.extraConfig = ''
-    # BUG: http://linrunner.de/en/tlp/docs/tlp-faq.html#erratic-battery
-    START_CHARGE_THRESH_BAT0=67
-    STOP_CHARGE_THRESH_BAT0=100
-
-
-    CPU_SCALING_GOVERNOR_ON_AC=performance
-    CPU_SCALING_GOVERNOR_ON_BAT=ondemand
-    CPU_MIN_PERF_ON_AC=0
-    CPU_MAX_PERF_ON_AC=100
-    CPU_MIN_PERF_ON_BAT=0
-    CPU_MAX_PERF_ON_BAT=30
-  '';
-
-  powerManagement.resumeCommands = ''
-    ${pkgs.rfkill}/bin/rfkill unblock all
-  '';
-
 }