From cdaa911344c96610ee327716f576c1eb061a9277 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Mon, 22 Aug 2016 19:15:29 +0200
Subject: l 2 nixpkgs: a75c0d9 -> 671cc4e

---
 lass/2configs/nixpkgs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lass/2configs')

diff --git a/lass/2configs/nixpkgs.nix b/lass/2configs/nixpkgs.nix
index 576447542..10bc3e9cb 100644
--- a/lass/2configs/nixpkgs.nix
+++ b/lass/2configs/nixpkgs.nix
@@ -3,6 +3,6 @@
 {
   krebs.build.source.nixpkgs.git = {
       url = https://github.com/lassulus/nixpkgs;
-      ref = "a75c0d9342ecb86dedd11f61a4e6f59ecc42d151";
+      ref = "671cc4ea1562bfeaa3d32ac21588bd0b6c4346bd";
     };
 }
-- 
cgit v1.2.3


From 4a3bee7aa8a3218ca8a319695bc66520220ce93d Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Wed, 24 Aug 2016 00:03:38 +0200
Subject: l: import retiolum.nix explicit

---
 lass/2configs/default.nix | 1 -
 1 file changed, 1 deletion(-)

(limited to 'lass/2configs')

diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix
index dbb2a853a..cc848c39e 100644
--- a/lass/2configs/default.nix
+++ b/lass/2configs/default.nix
@@ -8,7 +8,6 @@ with config.krebs.lib;
     ../2configs/gc.nix
     ../2configs/mc.nix
     ../2configs/nixpkgs.nix
-    ../2configs/retiolum.nix
     ../2configs/vim.nix
     ../2configs/zsh.nix
     ./backups.nix
-- 
cgit v1.2.3


From 2cc7326aa6aa0a5199a65792099799c2d0d7ca06 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Wed, 24 Aug 2016 08:36:58 +0200
Subject: l 2 vim: change from nvim to vim

---
 lass/2configs/vim.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lass/2configs')

diff --git a/lass/2configs/vim.nix b/lass/2configs/vim.nix
index 9eed08635..2bbec6ab1 100644
--- a/lass/2configs/vim.nix
+++ b/lass/2configs/vim.nix
@@ -123,7 +123,7 @@ let
   vim = pkgs.writeDashBin "vim" ''
     set -efu
     (umask 0077; exec ${pkgs.coreutils}/bin/mkdir -p ${toString mkdirs})
-    exec ${pkgs.neovim}/bin/nvim "$@"
+    exec ${pkgs.vim}/bin/vim "$@"
   '';
 
   vimrc = pkgs.writeText "vimrc" ''
-- 
cgit v1.2.3


From 2e73b7e7051ea923888831d9da20343dddf9eab9 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Wed, 24 Aug 2016 08:38:28 +0200
Subject: l 2 baseX: add synaptics config

---
 lass/2configs/baseX.nix | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'lass/2configs')

diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix
index dce7dae40..a78f52b83 100644
--- a/lass/2configs/baseX.nix
+++ b/lass/2configs/baseX.nix
@@ -88,4 +88,9 @@ in {
     HandleLidSwitch=ignore
   '';
 
+  services.xserver.synaptics = {
+    enable = true;
+    twoFingerScroll = true;
+    accelFactor = "0.035";
+  };
 }
-- 
cgit v1.2.3


From a9409471de543053a179b46735a5ed591dd68b7f Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Wed, 24 Aug 2016 08:39:03 +0200
Subject: l 2 default: remove oboslete workaround

---
 lass/2configs/default.nix | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'lass/2configs')

diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix
index cc848c39e..5575b7e7b 100644
--- a/lass/2configs/default.nix
+++ b/lass/2configs/default.nix
@@ -205,11 +205,4 @@ with config.krebs.lib;
   networking.dhcpcd.extraConfig = ''
     noipv4ll
   '';
-
-  #CVE-2016-0777 and CVE-2016-0778 workaround
-  #https://www.qualys.com/2016/01/14/cve-2016-0777-cve-2016-0778/openssh-cve-2016-0777-cve-2016-0778.txt
-  programs.ssh.extraConfig = ''
-    UseRoaming no
-  '';
-
 }
-- 
cgit v1.2.3


From b73c93c0a4826c076c30d51c3ee1dc9323c179f1 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Wed, 24 Aug 2016 08:40:01 +0200
Subject: l 2 mail: add default value for from=

---
 lass/2configs/mail.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lass/2configs')

diff --git a/lass/2configs/mail.nix b/lass/2configs/mail.nix
index 7c050005b..c637b08fb 100644
--- a/lass/2configs/mail.nix
+++ b/lass/2configs/mail.nix
@@ -44,6 +44,7 @@ let
     set nm_record_tags = "-inbox me archive"
     set virtual_spoolfile=yes                    # enable virtual folders
     set sendmail="${msmtp}/bin/msmtp"                         # enables parsing of outgoing mail
+    set from="lassulus@lassul.us"
     set use_from=yes
     set envelope_from=yes
 
-- 
cgit v1.2.3


From a545159c08c6a748299111184ba5a34b40d7af67 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Wed, 24 Aug 2016 08:41:10 +0200
Subject: l 2 nixpkgs: 671cc4e -> c5cbda2 & fix indent

---
 lass/2configs/nixpkgs.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lass/2configs')

diff --git a/lass/2configs/nixpkgs.nix b/lass/2configs/nixpkgs.nix
index 10bc3e9cb..902af61a7 100644
--- a/lass/2configs/nixpkgs.nix
+++ b/lass/2configs/nixpkgs.nix
@@ -2,7 +2,7 @@
 
 {
   krebs.build.source.nixpkgs.git = {
-      url = https://github.com/lassulus/nixpkgs;
-      ref = "671cc4ea1562bfeaa3d32ac21588bd0b6c4346bd";
-    };
+    url = https://github.com/nixos/nixpkgs;
+    ref = "c5cbda24147de441906871238138eb7fc90282db";
+  };
 }
-- 
cgit v1.2.3