ma tsp.r: refactor

2 files changed, 17 insertions, 3 deletions

diff --git a/makefu/1systems/tsp/config.nix b/makefu/1systems/tsp/config.nix
index 7c65737f..9586578d 100644
--- a/makefu/1systems/tsp/config.nix
+++ b/makefu/1systems/tsp/config.nix
@@ -6,21 +6,26 @@
 {
   imports =
     [ # Include the results of the hardware scan.
+      ./hardware.nix
       <stockholm/makefu>
+      <stockholm/makefu/2configs/nur.nix>
       <stockholm/makefu/2configs/home-manager>
       <stockholm/makefu/2configs/main-laptop.nix>
+      <stockholm/makefu/2configs/editor/neovim>
+      <stockholm/makefu/2configs/tools/core.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-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/home-manager>
+      <stockholm/makefu/2configs/home-manager/desktop.nix>
+      <stockholm/makefu/2configs/home-manager/cli.nix>
       <stockholm/makefu/2configs/tinc/retiolum.nix>
 
       <stockholm/makefu/2configs/sshd-totp.nix>
diff --git a/makefu/1systems/tsp/hardware.nix b/makefu/1systems/tsp/hardware.nix
new file mode 100644
index 00000000..2788eae0
--- /dev/null
+++ b/makefu/1systems/tsp/hardware.nix
@@ -0,0 +1,9 @@
+{ lib, ... }:
+{
+  imports = [
+    # laptop is an acer aspire, but close enough i'd say
+    <stockholm/makefu/2configs/hw/tp-x2x0.nix>
+  ];
+  # the laptop only has the touchpad
+  services.xserver.synaptics.additionalOptions = lib.mkForce ''Option "TouchpadOff" "0"'';
+}