Nixos configuration for pincer.

2 files changed, 59 insertions, 3 deletions

diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index c25f009..6a8387f 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -61,12 +61,16 @@
     geeqie
     inkscape
     silver-searcher
-    termite
     rofi
     wireshark
+    trayer
+
+    # fonts
+    source-code-pro
+    inconsolata
 
-    haskellPackages.xmonad
-    haskellPackages.xmonad-contrib
+    # haskellPackages.xmonad
+    # haskellPackages.xmonad-contrib
     haskellPackages.xmobar
   ];
 
@@ -86,6 +90,8 @@
   services.xserver.enable = true;
   services.xserver.windowManager.xmonad.enable = true;
   services.xserver.windowManager.xmonad.enableContribAndExtras = true;
+  services.xserver.windowManager.xmonad.extraPackages = haskellPackages: [
+      haskellPackages.xmobar ];
 
   services.xserver.layout = "us";
   services.xserver.xkbVariant = "dvorak";
diff --git a/nixos/pincer.nix b/nixos/pincer.nix
new file mode 100644
index 0000000..a59b51f
--- /dev/null
+++ b/nixos/pincer.nix
@@ -0,0 +1,50 @@
+{ config, pkgs, hardware, ... }:
+
+{
+  imports = [
+    ./configuration.nix
+  ];
+  networking.hostName = "pincer";
+
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.timeout = 0;
+  boot.loader.efi.canTouchEfiVariables = true;
+  boot.initrd.luks.devices = [
+    {
+      device = "/dev/sda6";
+      name = "cryptroot";
+      allowDiscards = true;
+    }
+  ];
+  boot.kernelModules = ["tp_smapi" "thinkpad_acpi" "fbcon" "i915"];
+  boot.extraModulePackages = [config.boot.kernelPackages.tp_smapi];
+  boot.extraModprobeConfig = ''
+    options iwlwifi swcrypto=1
+  '';
+
+
+  fileSystems = {
+    "/boot" = {
+      mountPoint = "/boot";
+      device = "/dev/sda1";
+      fsType = "vfat";
+    };
+    "/" = {
+      mountPoint = "/";
+      device = "/dev/mapper/cryptroot";
+      fsType = "btrfs";
+      options = ["subvol=active/nixos-root" "discard" "compress=lzo"];
+    };
+  };
+
+  services.tlp.enable = true;
+  services.tlp.extraConfig = ''
+    # Needed for either SSD or btrfs.
+    SATA_LINKPWR_ON_BAT=max_performance
+  '';
+
+  services.xserver.xkbModel = "thinkpad60";
+
+  # The NixOS release to be compatible with for stateful data such as databases.
+  system.stateVersion = "16.03";
+}