Merge remote-tracking branch 'cd/master'

16 files changed, 192 insertions, 35 deletions

diff --git a/lass/1systems/cloudkrebs.nix b/lass/1systems/cloudkrebs.nix
index 7c95e0f87..5235c25e5 100644
--- a/lass/1systems/cloudkrebs.nix
+++ b/lass/1systems/cloudkrebs.nix
@@ -25,14 +25,15 @@
 
   krebs.build = {
     user = config.krebs.users.lass;
-    target = "root@cloudkrebs";
     host = config.krebs.hosts.cloudkrebs;
-    deps = {
-      secrets = {
-        url = "/home/lass/secrets/${config.krebs.build.host.name}";
+    source = {
+      dir.secrets = {
+        host = config.krebs.hosts.mors;
+        path = "/home/lass/secrets/${config.krebs.build.host.name}";
       };
-      stockholm = {
-        url = toString ../..;
+      dir.stockholm = {
+        host = config.krebs.hosts.mors;
+        path = "/home/lass/dev/stockholm";
       };
     };
   };
diff --git a/lass/1systems/echelon.nix b/lass/1systems/echelon.nix
index 92976366f..d1a3f34f7 100644
--- a/lass/1systems/echelon.nix
+++ b/lass/1systems/echelon.nix
@@ -28,14 +28,15 @@ in {
 
   krebs.build = {
     user = config.krebs.users.lass;
-    target = "root@${ip}";
     host = config.krebs.hosts.echelon;
-    deps = {
-      secrets = {
-        url = "/home/lass/secrets/${config.krebs.build.host.name}";
+    source = {
+      dir.secrets = {
+        host = config.krebs.hosts.mors;
+        path = "/home/lass/secrets/${config.krebs.build.host.name}";
       };
-      stockholm = {
-        url = toString ../..;
+      dir.stockholm = {
+        host = config.krebs.hosts.mors;
+        path = "/home/lass/dev/stockholm";
       };
     };
   };
diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix
index 4724fd3e3..b7291a8f2 100644
--- a/lass/1systems/mors.nix
+++ b/lass/1systems/mors.nix
@@ -22,18 +22,20 @@
     ../2configs/retiolum.nix
     ../2configs/wordpress.nix
     ../2configs/bitlbee.nix
+    ../2configs/firefoxPatched.nix
   ];
 
   krebs.build = {
     user = config.krebs.users.lass;
-    target = "root@mors";
     host = config.krebs.hosts.mors;
-    deps = {
-      secrets = {
-        url = "/home/lass/secrets/${config.krebs.build.host.name}";
+    source = {
+      dir.secrets = {
+        host = config.krebs.hosts.mors;
+        path = "/home/lass/secrets/${config.krebs.build.host.name}";
       };
-      stockholm = {
-        url = toString ../..;
+      dir.stockholm = {
+        host = config.krebs.hosts.mors;
+        path = "/home/lass/dev/stockholm";
       };
     };
   };
@@ -172,6 +174,7 @@
 
   environment.systemPackages = with pkgs; [
     cac
+    get
   ];
 
   #TODO: fix this shit
diff --git a/lass/1systems/uriel.nix b/lass/1systems/uriel.nix
index bb98975e4..9d96e7814 100644
--- a/lass/1systems/uriel.nix
+++ b/lass/1systems/uriel.nix
@@ -27,12 +27,14 @@ with builtins;
     user = config.krebs.users.lass;
     target = "root@uriel";
     host = config.krebs.hosts.uriel;
-    deps = {
-      secrets = {
-        url = "/home/lass/secrets/${config.krebs.build.host.name}";
+    source = {
+      dir.secrets = {
+        host = config.krebs.hosts.mors;
+        path = "/home/lass/secrets/${config.krebs.build.host.name}";
       };
-      stockholm = {
-        url = toString ../..;
+      dir.stockholm = {
+        host = config.krebs.hosts.mors;
+        path = "/home/lass/dev/stockholm";
       };
     };
   };
diff --git a/lass/2configs/base.nix b/lass/2configs/base.nix
index 7c4835461..46435649b 100644
--- a/lass/2configs/base.nix
+++ b/lass/2configs/base.nix
@@ -42,9 +42,11 @@ with lib;
     enable = true;
     search-domain = "retiolum";
     exim-retiolum.enable = true;
-    build.deps.nixpkgs = {
-      url = https://github.com/Lassulus/nixpkgs;
-      rev = "e74d0e7ff83c16846a81e1173543f180ad565076";
+    build.source = {
+      git.nixpkgs = {
+        url = https://github.com/Lassulus/nixpkgs;
+        rev = "68bd8e4a9dc247726ae89cc8739574261718e328";
+      };
     };
   };
 
diff --git a/lass/2configs/browsers.nix b/lass/2configs/browsers.nix
index 4fe06b729..f37dace2c 100644
--- a/lass/2configs/browsers.nix
+++ b/lass/2configs/browsers.nix
@@ -62,7 +62,7 @@ in {
   imports = [
     ../3modules/per-user.nix
   ] ++ [
-    ( createFirefoxUser "ff" [ "audio" ] [ pkgs.firefox ] )
+    ( createFirefoxUser "ff" [ "audio" ] [ ] )
     ( createChromiumUser "cr" [ "audio" ] [ pkgs.chromium ] )
     ( createChromiumUser "fb" [ ] [ pkgs.chromium ] )
     ( createChromiumUser "gm" [ ] [ pkgs.chromium ] )
diff --git a/lass/2configs/desktop-base.nix b/lass/2configs/desktop-base.nix
index 52c29d7e8..8ae768ca9 100644
--- a/lass/2configs/desktop-base.nix
+++ b/lass/2configs/desktop-base.nix
@@ -61,4 +61,8 @@ in {
     xkbOptions = "caps:backspace";
   };
 
+  services.logind.extraConfig = ''
+    HandleLidSwitch=ignore
+  '';
+
 }
diff --git a/lass/2configs/firefoxPatched.nix b/lass/2configs/firefoxPatched.nix
new file mode 100644
index 000000000..daf8a28be
--- /dev/null
+++ b/lass/2configs/firefoxPatched.nix
@@ -0,0 +1,58 @@
+{ config, lib, pkgs, ... }:
+
+let
+  lpkgs = import ../5pkgs { inherit pkgs; };
+
+  inherit (lib)
+    concatMapStrings
+  ;
+
+  plugins = with lpkgs.firefoxPlugins; [
+    noscript
+    ublock
+    vimperator
+  ];
+
+  copyXpi = plugin:
+    "cp ${plugin}/*.xpi $out/usr/lib/firefox-*/browser/extensions/";
+
+  preferences = pkgs.writeText "autoload.js" ''
+    pref('general.config.filename', 'firefox.cfg');
+    pref('general.config.obscure_value', 0);
+  '';
+
+  config = pkgs.writeText "firefox.cfg" ''
+    //
+    lockPref("app.update.enabled", false);
+    lockPref("extensions.update.enabled", false);
+    lockPref("autoadmin.global_config_url", "");
+    lockPref("extensions.checkUpdateSecurity", false);
+    lockPref("services.sync.enabled", false);
+    lockPref("browser.shell.checkDefaultBrowser", false);
+    lockPref("layout.spellcheckDefault", 0);
+    lockPref("app.update.auto", false);
+    lockPref("browser.newtabpage.enabled", false);
+    lockPref("noscript.firstRunRedirection", false);
+    lockPref("noscript.hoverUI", false);
+    lockPref("noscript.notify", false);
+    defaultPref("extensions.newAddons", false);
+    defaultPref("extensions.autoDisableScopes", 0);
+    defaultPref("plugin.scan.plid.all", false);
+  '';
+
+in {
+  environment.systemPackages = [
+    (pkgs.lib.overrideDerivation pkgs.firefox-bin (original : {
+      installPhase = ''
+        ${original.installPhase}
+        find $out/usr/lib
+        ${concatMapStrings copyXpi plugins}
+        cd $out/usr/lib/firefox-*/
+        mkdir -p browser/defaults/preferences
+        cp ${preferences} browser/defaults/preferences/autoload.js
+        cp ${config} ./firefox.cfg
+      '';
+    }))
+  ];
+}
+
diff --git a/lass/2configs/programs.nix b/lass/2configs/programs.nix
index 41d241bac..e4840383f 100644
--- a/lass/2configs/programs.nix
+++ b/lass/2configs/programs.nix
@@ -7,7 +7,6 @@
     gnupg1compat
     htop
     i3lock
-    mc
     mosh
     mpv
     pass
diff --git a/lass/2configs/retiolum.nix b/lass/2configs/retiolum.nix
index 17cd1d822..d7df15027 100644
--- a/lass/2configs/retiolum.nix
+++ b/lass/2configs/retiolum.nix
@@ -21,6 +21,7 @@
     connectTo = [
       "fastpoke"
       "cloudkrebs"
+      "echelon"
       "pigstarter"
       "gum"
       "flap"
diff --git a/lass/2configs/texlive.nix b/lass/2configs/texlive.nix
index 18d72297d..fa20ef81f 100644
--- a/lass/2configs/texlive.nix
+++ b/lass/2configs/texlive.nix
@@ -2,6 +2,11 @@
 
 {
   environment.systemPackages = with pkgs; [
-    texLive
+    (texLiveAggregationFun { paths = [
+      texLive
+      texLiveExtra
+      texLiveCMSuper
+      texLiveModerncv
+    ];})
   ];
 }
diff --git a/lass/2configs/zsh.nix b/lass/2configs/zsh.nix
index 646e816fd..64aa45823 100644
--- a/lass/2configs/zsh.nix
+++ b/lass/2configs/zsh.nix
@@ -57,7 +57,7 @@
       #exports
       export EDITOR='vim'
       export MANPAGER='most'
-      export PAGER='vim -'
+      export PAGER='vim -R -'
       # export MANPAGER='sed -r "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g" | vim -R -c "set ft=man nonu nomod nolist" -'
 
       #beautiful colors
@@ -103,23 +103,21 @@
 
       case $UID in
         0)
-          username='%F{red}root%f'
+          username='%F{red}root%f '
           ;;
         1337)
           username=""
           ;;
         *)
-          username='%F{blue}%n%f'
+          username='%F{blue}%n%f '
           ;;
       esac
 
       if test -n "$SSH_CLIENT"; then
         PROMPT="$error$username@%F{magenta}%M%f %~ "
       else
-        PROMPT="$error$username %~ "
+        PROMPT="$error$username%~ "
       fi
-
-
     '';
   };
   users.defaultUserShell = "/run/current-system/sw/bin/zsh";
diff --git a/lass/5pkgs/default.nix b/lass/5pkgs/default.nix
index 6df35b905..7427cb620 100644
--- a/lass/5pkgs/default.nix
+++ b/lass/5pkgs/default.nix
@@ -8,4 +8,9 @@ rec {
   bitlbee-dev = callPackage ./bitlbee-dev.nix {};
   bitlbee-steam = callPackage ./bitlbee-steam.nix { inherit bitlbee-dev; };
   bitlbee = callPackage ./bitlbee.nix { inherit bitlbee-steam; };
+  firefoxPlugins = {
+    noscript = callPackage ./firefoxPlugins/noscript.nix {};
+    ublock = callPackage ./firefoxPlugins/ublock.nix {};
+    vimperator = callPackage ./firefoxPlugins/vimperator.nix {};
+  };
 }
diff --git a/lass/5pkgs/firefoxPlugins/noscript.nix b/lass/5pkgs/firefoxPlugins/noscript.nix
new file mode 100644
index 000000000..67a00a1b2
--- /dev/null
+++ b/lass/5pkgs/firefoxPlugins/noscript.nix
@@ -0,0 +1,28 @@
+{ fetchgit, stdenv, bash, zip }:
+
+stdenv.mkDerivation rec {
+  name = "noscript";
+  id = "{73a6fe31-595d-460b-a920-fcc0f8843232}";
+
+  src = fetchgit {
+    url = "https://github.com/avian2/noscript";
+    rev = "c900a079793868bb080ab1e23522d29dc121b4c6";
+    sha256 = "1y06gh5a622yrsx0h7v92qnvdi97i54ln09zc1lvk8x430z5bdly";
+  };
+
+  buildInputs = [ zip ];
+
+  patchPhase = ''
+    substituteInPlace "version.sh" \
+    --replace "/bin/bash" "${bash}/bin/bash"
+  '';
+
+  buildPhase = ''
+    ./makexpi.sh
+  '';
+
+  installPhase = ''
+    mkdir -p $out/
+    cp *.xpi $out/${id}.xpi
+  '';
+}
diff --git a/lass/5pkgs/firefoxPlugins/ublock.nix b/lass/5pkgs/firefoxPlugins/ublock.nix
new file mode 100644
index 000000000..29ef250e8
--- /dev/null
+++ b/lass/5pkgs/firefoxPlugins/ublock.nix
@@ -0,0 +1,31 @@
+{ fetchgit, stdenv, bash, python, zip }:
+
+stdenv.mkDerivation rec {
+  name = "ublock";
+  id = "{2b10c1c8-a11f-4bad-fe9c-1c11e82cac42}";
+
+  src = fetchgit {
+    url = "https://github.com/chrisaljoudi/uBlock";
+    rev = "a70a50052a7914cbf86d46a725812b98434d8c70";
+    sha256 = "1qfzy79f8x01i33x0m95k833z1jgxjwb8wvlr6fj6id1kxfvzh77";
+  };
+
+  buildInputs = [
+    zip
+    python
+  ];
+
+  patchPhase = ''
+    substituteInPlace "tools/make-firefox.sh" \
+    --replace "/bin/bash" "${bash}/bin/bash"
+  '';
+
+  buildPhase = ''
+    tools/make-firefox.sh all
+  '';
+
+  installPhase = ''
+    mkdir -p $out/
+    cp dist/build/uBlock.firefox.xpi $out/${id}.xpi
+  '';
+}
diff --git a/lass/5pkgs/firefoxPlugins/vimperator.nix b/lass/5pkgs/firefoxPlugins/vimperator.nix
new file mode 100644
index 000000000..dabef3d20
--- /dev/null
+++ b/lass/5pkgs/firefoxPlugins/vimperator.nix
@@ -0,0 +1,19 @@
+{ fetchgit, stdenv, zip }:
+
+stdenv.mkDerivation rec {
+  name = "vimperator";
+  id = "vimperator@mozdev.org";
+
+  src = fetchgit {
+    url = "https://github.com/vimperator/vimperator-labs.git";
+    rev = "ba7d8e72516fdc22246748c8183d7bc90f6fb073";
+    sha256 = "0drz67qm5hxxzw699rswlpjkg4p2lfipx119pk1nyixrqblcsvq2";
+  };
+
+  buildInputs = [ zip ];
+
+  installPhase = ''
+    mkdir -p $out/
+    cp downloads/vimperator*.xpi $out/${id}.xpi
+  '';
+}