Merge branch 'master' of sabaki:/storage/projects/dotfiles

4 files changed, 42 insertions, 8 deletions

diff --git a/Xresources-pincer b/Xresources-pincer
index c71dfdc..93f706c 100644
--- a/Xresources-pincer
+++ b/Xresources-pincer
@@ -2,6 +2,7 @@ urxvt*font: xft:dejavu sans mono:size=13:antialias=true
 !urxvt*font: xft:inconsolata:size=14:antialias=true
 urxvt*scrollBar: false
 URxvt*termName: xterm-256color
+Xterm*termName: xterm-256color
 
 urxvt*foreground: white
 urxvt*background: black
@@ -22,3 +23,16 @@ urxvt*background: black
 *color13: #AD7FA8
 *color14: #fcaf3e
 *color15: #EEEEEC
+
+URxvt.keysym.M-c:   perl:clipboard:copy
+URxvt.keysym.M-v:   perl:clipboard:paste
+URxvt.saveLines: 40000
+
+URxvt.perl-ext-common: default,matcher,resize-font,clipboard
+URxvt.clipboard.autocopy: true
+URxvt.resize-font.smaller: C-Down
+URxvt.resize-font.bigger: C-Up
+URxvt.iso14755: false
+URxvt.iso14755_52: false
+URxvt.url-launcher: /usr/bin/xdg-open
+URxvt.matcher.button: 1
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 775ee7a..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;
@@ -53,7 +54,7 @@
     pavucontrol
     powertop
     kde4.digikam
-    emacs25pre
+    emacs25
     sshfsFuse
     xorg.xbacklight
     rtorrent
@@ -71,6 +72,8 @@
     pass
     rxvt_unicode-with-plugins
     xsel
+    geeqie
+    gnupg
 
     # fonts
     source-code-pro
@@ -99,10 +102,20 @@
   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";
     extraUsers.orbekk = {
@@ -113,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 cab2b15..ee5f7ee 100644
--- a/nixos/pincer.nix
+++ b/nixos/pincer.nix
@@ -5,6 +5,8 @@
     ./configuration.nix
   ];
   networking.hostName = "pincer";
+  networking.firewall.allowedTCPPorts = [5201];
+  networking.firewall.allowedUDPPorts = [5201];
 
   hardware.opengl.driSupport32Bit = true;
   boot.loader.systemd-boot.enable = true;
@@ -17,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
   '';