From 0f245df6bacc3f1ad0230efa4d7593db8830849b Mon Sep 17 00:00:00 2001
From: Kjetil Orbekk <kjetil.orbekk@gmail.com>
Date: Fri, 11 Oct 2019 21:43:18 -0400
Subject: Stuff

---
 config/desktop.nix     |  3 +++
 config/users.nix       |  2 +-
 machines/x1-pincer.nix | 17 ++++++++++++++++-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/config/desktop.nix b/config/desktop.nix
index c3f5dc7..76b170c 100644
--- a/config/desktop.nix
+++ b/config/desktop.nix
@@ -4,6 +4,9 @@
   location.latitude = 40.0;
   location.longitude = -74.0;
 
+  location.latitude = 40.0;
+  location.longitude = -74.0;
+
   hardware = {
     opengl = {
       enable = true;
diff --git a/config/users.nix b/config/users.nix
index c6acbe8..fa67378 100644
--- a/config/users.nix
+++ b/config/users.nix
@@ -9,7 +9,7 @@ in {
         home = "/home/orbekk";
         uid = 1000;
         description = "KJ";
-        extraGroups = ["wheel" "networkmanager" "dialout" "uucp" "audio" "plugdev" "lxd" "readonly"];
+        extraGroups = ["wheel" "networkmanager" "dialout" "uucp" "audio" "plugdev" "lxd" "readonly" "input"];
         openssh.authorizedKeys.keyFiles = [
           ../data/pincer_rsa.pub
           ../data/yubikey_rsa.pub
diff --git a/machines/x1-pincer.nix b/machines/x1-pincer.nix
index d763688..cb725e2 100644
--- a/machines/x1-pincer.nix
+++ b/machines/x1-pincer.nix
@@ -1,16 +1,30 @@
 { config, lib, pkgs, ... }:
 {
+  networking.firewall.allowedTCPPorts = [ ]; # socks proxy
   imports = [
     ../config/desktop.nix
     ../config/yubikey.nix
     ../config/thinkpad.nix
+    ../config/ap.nix
   ];
 
   networking = {
     hostName = "pincer";
   };
 
+  # services.displayManager.slim.enable = lib.mkForce false;
+  # services.xserver.desktopManager.kodi.enable = true;
+
+  services.ferm = {
+    enable = false;
+    config = ''
+    '';
+  };
+
   boot = {
+    kernelPackages = pkgs.linuxPackages_latest;
+    kernelModules = ["xpad"];
+
     initrd.luks.devices = [
       {
         device = "/dev/sda6";
@@ -20,7 +34,8 @@
     ];
 
     extraModprobeConfig = ''
-      option iwlwifi swcrypto=1
+      # option iwlwifi swcrypto=1
+      options iwlmvm power_scheme=1
     '';
   };
 
-- 
cgit v1.2.3