Merge branch 'master' of sabaki.orbekk.com:/storage/projects/dotfiles

3 files changed, 37 insertions, 8 deletions

diff --git a/nixos/aji.nix b/nixos/aji.nix
index e953204..abda9f8 100644
--- a/nixos/aji.nix
+++ b/nixos/aji.nix
@@ -43,10 +43,6 @@
   '';
 
   services.xserver.xkbModel = "thinkpad60";
-  services.xserver.synaptics = {
-    enable = true;
-    twoFingerScroll = true;
-  };
 
   # The NixOS release to be compatible with for stateful data such as databases.
   system.stateVersion = "16.03";
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index c5eaca8..66d6f8d 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;
@@ -33,6 +34,7 @@
     myArduino = pkgs.stdenv.lib.overrideDerivation pkgs.arduino (o: {
       withGUI = true;
     });
+    myWine = pkgs.wine.override { wineBuild = "wine32"; };
   in [
     neovim
     rustc
@@ -52,7 +54,7 @@
     pavucontrol
     powertop
     kde4.digikam
-    emacs25pre
+    emacs25
     sshfsFuse
     xorg.xbacklight
     rtorrent
@@ -64,9 +66,14 @@
     rofi
     wireshark
     trayer
+    myWine
+    iperf
+    telnet
+    pass
     rxvt_unicode-with-plugins
     xsel
     geeqie
+    gnupg
 
     # fonts
     source-code-pro
@@ -95,11 +102,19 @@
   services.xserver.windowManager.xmonad.enableContribAndExtras = true;
   services.xserver.windowManager.xmonad.extraPackages = haskellPackages: [
       haskellPackages.xmobar ];
+  services.xserver.desktopManager.xfce.enable = true;
 
   services.xserver.layout = "us";
   services.xserver.xkbVariant = "dvorak";
 
+<<<<<<< HEAD
   services.cron.enable = true;
+=======
+  services.xserver.synaptics = {
+    enable = true;
+    twoFingerScroll = true;
+  };
+>>>>>>> 27ee6b1aaf71715da579633f2f8e1a7baa0224c8
 
   users = {
     defaultUserShell = "/run/current-system/sw/bin/fish";
@@ -111,6 +126,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;
diff --git a/nixos/pincer.nix b/nixos/pincer.nix
index a59b51f..ee5f7ee 100644
--- a/nixos/pincer.nix
+++ b/nixos/pincer.nix
@@ -5,7 +5,10 @@
     ./configuration.nix
   ];
   networking.hostName = "pincer";
+  networking.firewall.allowedTCPPorts = [5201];
+  networking.firewall.allowedUDPPorts = [5201];
 
+  hardware.opengl.driSupport32Bit = true;
   boot.loader.systemd-boot.enable = true;
   boot.loader.timeout = 0;
   boot.loader.efi.canTouchEfiVariables = true;
@@ -16,8 +19,10 @@
       allowDiscards = true;
     }
   ];
-  boot.kernelModules = ["tp_smapi" "thinkpad_acpi" "fbcon" "i915"];
-  boot.extraModulePackages = [config.boot.kernelPackages.tp_smapi];
+  # boot.kernelPackages = pkgs.linuxPackages_4_7;
+  boot.kernelModules = ["tp_smapi" "thinkpad_acpi" "fbcon" "i915" "acpi_call"];
+  boot.extraModulePackages = with config.boot.kernelPackages;
+      [tp_smapi acpi_call];
   boot.extraModprobeConfig = ''
     options iwlwifi swcrypto=1
   '';
@@ -35,6 +40,12 @@
       fsType = "btrfs";
       options = ["subvol=active/nixos-root" "discard" "compress=lzo"];
     };
+    "/btrfs" = {
+      mountPoint = "/btrfs";
+      device = "/dev/mapper/cryptroot";
+      fsType = "btrfs";
+      options = ["discard" "compress=lzo"];
+    };
   };
 
   services.tlp.enable = true;