From 1bada1bdcceb8506f1696dfa70fcc6b55a529177 Mon Sep 17 00:00:00 2001
From: Kjetil Orbekk <kjetil.orbekk@gmail.com>
Date: Sat, 13 May 2017 11:21:42 -0400
Subject: Fix some missing tools in the configs.

---
 config/common.nix   |  6 +-----
 config/desktop.nix  | 12 +++++++-----
 config/thinkpad.nix |  4 ++--
 config/users.nix    | 18 +++++++++++-------
 4 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/config/common.nix b/config/common.nix
index b7dac7c..e75ed3f 100644
--- a/config/common.nix
+++ b/config/common.nix
@@ -1,10 +1,5 @@
 { config, lib, pkgs, ... }:
 {
-  site = {
-    ports = {
-    };
-  };
-
   programs.fish.enable = true;
 
   environment.shellAliases = {
@@ -12,6 +7,7 @@
   };
   environment.systemPackages = with pkgs; [
     dnsutils
+    git
     gnupg
     haskellPackages.hledger
     htop
diff --git a/config/desktop.nix b/config/desktop.nix
index a5c5885..71013ae 100644
--- a/config/desktop.nix
+++ b/config/desktop.nix
@@ -7,6 +7,10 @@
 
     bluetooth.enable = true;
     pulseaudio.enable = true;
+  };
+
+  boot = {
+    earlyVconsoleSetup = true;
 
     loader = {
       systemd-boot.enable = true;
@@ -15,10 +19,6 @@
     };
   };
 
-  boot = {
-    earlyVconsoleSetup = true;
-  };
-
   networking = {
     networkmanager.enable = true;
     firewall.enable = true;
@@ -40,6 +40,8 @@
     xorg.xev
     xscreensaver
     xss-lock
+    trayer
+    rxvt_unicode-with-plugins
   ];
 
   services = {
@@ -48,7 +50,7 @@
     xserver = {
       enable = true;
       layout = "us";
-      variant = "dvorak";
+      xkbVariant = "dvorak";
 
       windowManager.xmonad = {
         enable = true;
diff --git a/config/thinkpad.nix b/config/thinkpad.nix
index ff832b1..36320b8 100644
--- a/config/thinkpad.nix
+++ b/config/thinkpad.nix
@@ -13,8 +13,8 @@
 
   boot = {
     kernelModules = [ "tp_smapi" "thinkpad_acpi" "fbcon" "i915" "acpi_call" ];
-    extraModulePackages = with config.boot.kernelPackages [ tp_smapi acpi_call ];
-  }
+    extraModulePackages = with config.boot.kernelPackages; [ tp_smapi acpi_call ];
+  };
 
   systemd.services = {
     battery_threshold = {
diff --git a/config/users.nix b/config/users.nix
index 4e0901f..8592970 100644
--- a/config/users.nix
+++ b/config/users.nix
@@ -1,12 +1,16 @@
 { config, lib, pkgs, ... }:
 {
-  users.extraUsers = {
-    orbekk = {
-      isNormalUser = true;
-      home = "/home/orbekk";
-      uid = 1000;
-      description = "KJ";
-      extragroups = ["wheel" "networkmanager" "dialout" "uucp" "audio"];
+  users = {
+    defaultUserShell = pkgs.fish;
+    extraUsers = {
+      orbekk = {
+        isNormalUser = true;
+        home = "/home/orbekk";
+        uid = 1000;
+        description = "KJ";
+        extraGroups = ["wheel" "networkmanager" "dialout" "uucp" "audio"];
+        useDefaultShell = true;
+      };
     };
   };
 }
-- 
cgit v1.2.3