From c8935f56285a37cabe4d74a8444a7e0679a19906 Mon Sep 17 00:00:00 2001
From: Kjetil Orbekk <kjetil.orbekk@gmail.com>
Date: Sat, 8 Oct 2016 21:46:49 -0400
Subject: Change nixos configuration.

---
 nixos/configuration.nix | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'nixos/configuration.nix')

diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 6a8387f..6a29e71 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -33,6 +33,7 @@
     myArduino = pkgs.stdenv.lib.overrideDerivation pkgs.arduino (o: {
       withGUI = true;
     });
+    myWine = pkgs.wine.override { wineBuild = "wine32"; };
   in [
     neovim
     rustc
@@ -64,6 +65,10 @@
     rofi
     wireshark
     trayer
+    myWine
+    iperf
+    telnet
+    pass
 
     # fonts
     source-code-pro
-- 
cgit v1.2.3


From 4f997d813e1293e23a044cc517b84438790a67fa Mon Sep 17 00:00:00 2001
From: Kjetil Orbekk <kjetil.orbekk@gmail.com>
Date: Sun, 9 Oct 2016 11:34:48 -0400
Subject: Enable synaptics and network manager.

---
 nixos/configuration.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'nixos/configuration.nix')

diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 775ee7a..9ff1f14 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -8,7 +8,8 @@
 
   boot.cleanTmpDir = true;
 
-  networking.wireless.enable = true;
+  networking.networkmanager.enable = true;
+  # networking.wireless.enable = true;
   networking.firewall.enable = true;
 
   programs.zsh.enable = true;
@@ -99,10 +100,16 @@
   services.xserver.windowManager.xmonad.enableContribAndExtras = true;
   services.xserver.windowManager.xmonad.extraPackages = haskellPackages: [
       haskellPackages.xmobar ];
+  services.xserver.desktopManager.gnome3.enable = true;
 
   services.xserver.layout = "us";
   services.xserver.xkbVariant = "dvorak";
 
+  services.xserver.synaptics = {
+    enable = true;
+    twoFingerScroll = true;
+  };
+
   users = {
     defaultUserShell = "/run/current-system/sw/bin/fish";
     extraUsers.orbekk = {
-- 
cgit v1.2.3


From 27ee6b1aaf71715da579633f2f8e1a7baa0224c8 Mon Sep 17 00:00:00 2001
From: Kjetil Orbekk <kjetil.orbekk@gmail.com>
Date: Sun, 16 Oct 2016 00:00:17 -0400
Subject: Update nixos config for laptops.

---
 nixos/configuration.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'nixos/configuration.nix')

diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 9ff1f14..72c4fb0 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -54,7 +54,7 @@
     pavucontrol
     powertop
     kde4.digikam
-    emacs25pre
+    emacs25
     sshfsFuse
     xorg.xbacklight
     rtorrent
@@ -72,6 +72,7 @@
     pass
     rxvt_unicode-with-plugins
     xsel
+    gnupg
 
     # fonts
     source-code-pro
@@ -100,7 +101,7 @@
   services.xserver.windowManager.xmonad.enableContribAndExtras = true;
   services.xserver.windowManager.xmonad.extraPackages = haskellPackages: [
       haskellPackages.xmobar ];
-  services.xserver.desktopManager.gnome3.enable = true;
+  services.xserver.desktopManager.xfce.enable = true;
 
   services.xserver.layout = "us";
   services.xserver.xkbVariant = "dvorak";
@@ -120,6 +121,13 @@
       extraGroups = ["wheel" "networkmanager" "dialout" "uucp"];
       shell = "/run/current-system/sw/bin/fish";
     };
+    extraUsers.guest = {
+      isNormalUser = true;
+      home = "/home/guest";
+      uid = 10001;
+      description = "Guest";
+      extraGroups = ["networkmanager"];
+    };
   };
 
   nix.maxJobs = 4;
-- 
cgit v1.2.3