9 files changed, 58 insertions, 51 deletions
diff --git a/lass/2configs/git.nix b/lass/2configs/git.nix
index 710eb9461..be08d0ec1 100644
--- a/lass/2configs/git.nix
+++ b/lass/2configs/git.nix
@@ -32,10 +32,13 @@ let
   public-repos = mapAttrs make-public-repo {
     stockholm = {
       cgit.desc = "take all the computers hostage, they'll love you!";
+      cgit.section = "configuration";
     };
-    kimsufi-check = {};
   } // mapAttrs make-public-repo-silent {
-    the_playlist = {};
+    the_playlist = {
+      cgit.desc = "Good Music collection + tools";
+      cgit.section  = "art";
+    };
   };
 
   restricted-repos = mapAttrs make-restricted-repo (
diff --git a/lass/2configs/hw/tp-x220.nix b/lass/2configs/hw/tp-x220.nix
index 1e75271ca..cbe5b3410 100644
--- a/lass/2configs/hw/tp-x220.nix
+++ b/lass/2configs/hw/tp-x220.nix
@@ -51,6 +51,10 @@ with import <stockholm/lib>;
 
   services.xserver.synaptics = {
     enable = true;
-    additionalOptions = ''Option "TouchpadOff" "1"'';
+    horizEdgeScroll = false;
+    horizontalScroll = false;
+    maxSpeed = "0.1";
+    minSpeed = "0.01";
+    tapButtons = false;
   };
 }
diff --git a/lass/2configs/mail.nix b/lass/2configs/mail.nix
index a08dc88da..41c7bceb2 100644
--- a/lass/2configs/mail.nix
+++ b/lass/2configs/mail.nix
@@ -113,9 +113,12 @@ let
     macro index ~ ,@( 'Toggle sidebar'      # toggle the sidebar
   '';
 
-  mutt = pkgs.writeDashBin "mutt" ''
-    exec ${pkgs.neomutt}/bin/mutt -F ${muttrc} $@
-  '';
+  mutt = pkgs.concat "mutt" [
+    pkgs.neomutt
+    (pkgs.writeDashBin "mutt" ''
+      exec ${pkgs.neomutt}/bin/mutt -F ${muttrc} $@
+    '')
+  ];
 
 in {
   environment.systemPackages = [
diff --git a/lass/2configs/monitoring/client.nix b/lass/2configs/monitoring/client.nix
index e2b7dcae6..b8c245215 100644
--- a/lass/2configs/monitoring/client.nix
+++ b/lass/2configs/monitoring/client.nix
@@ -23,13 +23,4 @@ with import <stockholm/lib>;
       };
     };
   };
-
-  services.journalbeat = {
-    enable = true;
-    extraConfig = ''
-      output.elasticsearch:
-        hosts: ["prism:9200"]
-        template.enabled: false
-    '';
-  };
 }
diff --git a/lass/2configs/monitoring/server.nix b/lass/2configs/monitoring/server.nix
index b6ccf9cc1..d1ff234ee 100644
--- a/lass/2configs/monitoring/server.nix
+++ b/lass/2configs/monitoring/server.nix
@@ -79,21 +79,9 @@ with import <stockholm/lib>;
     security = import <secrets/grafana_security.nix>; # { AdminUser = ""; adminPassword = ""}
   };
 
-  services.elasticsearch = {
-    enable = true;
-    listenAddress = "0.0.0.0";
-  };
-
-  services.kibana = {
-    enable = true;
-    listenAddress = "0.0.0.0";
-  };
-
   krebs.iptables.tables.filter.INPUT.rules = [
     { predicate = "-p tcp -i retiolum --dport 8086"; target = "ACCEPT"; }
     { predicate = "-p tcp -i retiolum --dport 3000"; target = "ACCEPT"; }
     { predicate = "-p udp -i retiolum --dport 25826"; target = "ACCEPT"; }
-    { predicate = "-p tcp -i retiolum --dport 9200"; target = "ACCEPT"; }
-    { predicate = "-p tcp -i retiolum --dport 5601"; target = "ACCEPT"; }
   ];
 }
diff --git a/lass/2configs/mpv.nix b/lass/2configs/mpv.nix
index 9988e788f..d9c6274db 100644
--- a/lass/2configs/mpv.nix
+++ b/lass/2configs/mpv.nix
@@ -2,15 +2,17 @@
 
 let
 
-  mpv-config = pkgs.writeText "mpv-config" ''
-    script=${lib.concatStringsSep "," [
-      good
-      delete
-    ]}
-  '';
-  mpv = pkgs.writeDashBin "mpv" ''
-    exec ${pkgs.mpv}/bin/mpv --no-config --include=${mpv-config} "$@"
-  '';
+  scripts = lib.concatStringsSep "," [
+    good
+    delete
+  ];
+
+  mpv = pkgs.concat "mpv" [
+    pkgs.mpv
+    (pkgs.writeDashBin "mpv" ''
+      exec ${pkgs.mpv}/bin/mpv --no-config --script=${scripts} "$@"
+    '')
+  ];
 
   moveToDir = key: dir: pkgs.writeText "move-with-${key}.lua" ''
     tmp_dir = "${dir}"
@@ -31,20 +33,6 @@ let
   up = moveToDir "U" "./up";
   down = moveToDir "Y" "./down";
 
-  deleteCurrentTrack = pkgs.writeText "delete.lua" ''
-    deleted_tmp = "./.graveyard"
-
-    -- Delete the current track by moving it to the `deleted_tmp` location.
-    function delete_current_track()
-      track = mp.get_property("path")
-      os.execute("mkdir -p '" .. deleted_tmp .. "'")
-      os.execute("mv '" .. track .. "' '" .. deleted_tmp .. "'")
-      print("'" .. track .. "' deleted.")
-    end
-
-    mp.add_key_binding("D", "delete_current_track", delete_current_track)
-  '';
-
 in {
   krebs.per-user.lass.packages = [
     mpv
diff --git a/lass/2configs/nixpkgs.nix b/lass/2configs/nixpkgs.nix
index 7f6512552..24437d040 100644
--- a/lass/2configs/nixpkgs.nix
+++ b/lass/2configs/nixpkgs.nix
@@ -3,6 +3,6 @@
 {
   krebs.build.source.nixpkgs.git = {
     url = https://cgit.lassul.us/nixpkgs;
-    ref = "ade5837";
+    ref = "a563923";
   };
 }
diff --git a/lass/2configs/repo-sync.nix b/lass/2configs/repo-sync.nix
index dfea637ed..74e508549 100644
--- a/lass/2configs/repo-sync.nix
+++ b/lass/2configs/repo-sync.nix
@@ -10,6 +10,7 @@ let
       public = true;
       name = mkDefault "${name}";
       cgit.desc = mkDefault "mirror for ${name}";
+      cgit.section = mkDefault "mirror";
       hooks = mkIf announce (mkDefault {
         post-receive = pkgs.git-hooks.irc-announce {
           nick = config.networking.hostName;
diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix
index daecdcd2f..684742512 100644
--- a/lass/2configs/websites/domsen.nix
+++ b/lass/2configs/websites/domsen.nix
@@ -21,6 +21,22 @@ let
     exec ${pkgs.msmtp}/bin/msmtp --read-envelope-from -C ${msmtprc} "$@"
   '';
 
+  restartPhpfpm_o.ubikmedia = pkgs.writeDash "restartPhpfpm_o.ubikmedia.org" ''
+    ${pkgs.systemd}/bin/systemctl restart phpfpm-o.ubikmedia.de.service
+  '';
+
+  restartPhpfpm_o.ubikmedia_wrapper = pkgs.writeDashBin "restartPhpfpm_o.ubikmedia" ''
+    /run/wrappers/bin/sudo ${restartPhpfpm_o.ubikmedia}
+  '';
+
+  restartPhpfpm_ubikmedia = pkgs.writeDash "restartPhpfpm_ubikmedia.org" ''
+    ${pkgs.systemd}/bin/systemctl restart phpfpm-ubikmedia.de.service
+  '';
+
+  restartPhpfpm_ubikmedia_wrapper = pkgs.writeDashBin "restartPhpfpm_ubikmedia" ''
+    /run/wrappers/bin/sudo ${restartPhpfpm_ubikmedia}
+  '';
+
 in {
   imports = [
     ./sqlBackup.nix
@@ -120,6 +136,7 @@ in {
     sender_domains = [
       "jla-trading.com"
       "ubikmedia.eu"
+      "ubikmedia.de"
     ];
     ssl_cert = "/var/lib/acme/lassul.us/fullchain.pem";
     ssl_key = "/var/lib/acme/lassul.us/key.pem";
@@ -161,5 +178,17 @@ in {
     useDefaultShell = true;
     createHome = true;
   };
+
+  #sudo restart wrappers
+  security.sudo.extraConfig = ''
+    domsen ALL= (root) NOPASSWD: ${restartPhpfpm_o.ubikmedia}
+    domsen ALL= (root) NOPASSWD: ${restartPhpfpm_ubikmedia}
+  '';
+
+  krebs.per-user.domsen.packages = [
+    restartPhpfpm_ubikmedia_wrapper
+    restartPhpfpm_o.ubikmedia_wrapper
+  ];
+
 }