5 files changed, 10 insertions, 12 deletions
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";
+  };
 }
diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix
index dbb2a853a..5575b7e7b 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
@@ -206,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
-  '';
-
 }
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
 
diff --git a/lass/2configs/nixpkgs.nix b/lass/2configs/nixpkgs.nix
index 576447542..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 = "a75c0d9342ecb86dedd11f61a4e6f59ecc42d151";
-    };
+    url = https://github.com/nixos/nixpkgs;
+    ref = "c5cbda24147de441906871238138eb7fc90282db";
+  };
 }
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" ''