Refactor configs into modules

1 files changed, 5 insertions, 9 deletions

diff --git a/machines/x1-pincer.nix b/machines/x1-pincer.nix
index ec6fe50..35523d6 100644
--- a/machines/x1-pincer.nix
+++ b/machines/x1-pincer.nix
@@ -3,17 +3,12 @@ let ports = {
   minecraft = 25565;
 }; in
 {
-  networking.networkmanager.enable = true;
+  # orbekk.gaming.enable = true;
+  orbekk.desktop.enable = true;
+  orbekk.thinkpad.enable = true;
 
+  networking.networkmanager.enable = true;
   networking.firewall.allowedTCPPorts = [ ports.minecraft ]; # socks proxy
-  imports = [
-    ../config/desktop.nix
-    #../config/laptop.nix
-    ../config/yubikey.nix
-    ../config/thinkpad.nix
-    # ../config/ap.nix
-    # ../config/pxe.nix
-  ];
 
   networking = {
     hostName = "pincer";
@@ -82,4 +77,5 @@ let ports = {
   boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "sd_mod" ];
   nix.maxJobs = lib.mkDefault 4;
   hardware.enableRedistributableFirmware = lib.mkDefault true;
+  system.stateVersion = "17.04";
 }