1 files changed, 13 insertions, 17 deletions

diff --git a/configurations/eonwe/default.nix b/configurations/eonwe/default.nix
index d9ae2bc..d6bc46c 100644
--- a/configurations/eonwe/default.nix
+++ b/configurations/eonwe/default.nix
@@ -4,15 +4,14 @@
   pkgs,
   ...
 }:
-with lib;
 {
-  imports = attrValues (modulesIn ./.);
+  imports = lib.modulesIn ./. |> lib.attrValues;
 
   nixfiles.modules = {
     ark.enable = true;
 
     wireguard.client.enable = true;
-    wireguard-ng.client.enable = false;
+    # wireguard-ng.client.enable = false;
 
     syncthing.enable = true;
 
@@ -42,12 +41,12 @@ with lib;
     ];
 
     programs = {
-      beets.settings.directory = mkForce "/mnt/udata/music";
+      beets.settings.directory = lib.mkForce "/mnt/udata/music";
 
       mpv = {
         profiles =
           let
-            mapShaders = map (args: toString (pkgs.fetchurl args));
+            mapShaders = map (x: x |> pkgs.fetchurl |> toString);
             cfl-prediction = mapShaders [
               {
                 url = "https://raw.githubusercontent.com/Artoriuz/glsl-chroma-from-luma-prediction/9fdd0bc68cd8ae42a8072a7d5d098f118daa4293/CfL_Prediction.glsl";
@@ -105,7 +104,7 @@ with lib;
           vf = "format=colorlevels=full:colormatrix=auto";
           video-output-levels = "full";
 
-          glsl-shaders-append = map (text: toString (pkgs.writeText "shader.hook" text)) [
+          glsl-shaders-append = map (x: x |> pkgs.writeText "shader.hook" |> toString) [
             ''
               //!HOOK LUMA
               //!BIND HOOKED
@@ -143,7 +142,7 @@ with lib;
     };
 
     services = {
-      mpd.musicDirectory = mkForce "/mnt/udata/music";
+      mpd.musicDirectory = lib.mkForce "/mnt/udata/music";
 
       xsettingsd.settings."Xft/DPI" = "93";
     };
@@ -154,27 +153,24 @@ with lib;
   services = {
     displayManager = {
       sddm.enable = lib.mkForce false;
-      ly = {
-        enable = true;
-        settings.animation = "matrix";
-      };
+      ly.enable = true;
     };
 
     smartd = {
       enable = true;
       notifications.mail = {
         enable = true;
-        sender = "admin+smartd@${my.domain.shire}";
-        recipient = "admin+smartd@${my.domain.shire}";
+        sender = "root@${lib.my.domain.shire}";
+        recipient = "root@${lib.my.domain.shire}";
       };
     };
 
     openssh.settings = {
-      KbdInteractiveAuthentication = mkForce true;
-      PasswordAuthentication = mkForce true;
+      KbdInteractiveAuthentication = lib.mkForce true;
+      PasswordAuthentication = lib.mkForce true;
     };
 
-    udev.packages = with pkgs; [ vial ];
+    udev.packages = [ pkgs.vial ];
 
     xserver.wacom.enable = true;
   };
@@ -267,7 +263,7 @@ with lib;
     # [1]: https://github.com/ryantm/agenix/issues/45#issuecomment-847852593
     # [1]: https://github.com/nix-community/impermanence/issues/22
     # [1]: https://github.com/NixOS/nixpkgs/pull/86967#pullrequestreview-667929259
-    "/home/${my.username}".neededForBoot = true;
+    "/home/${lib.my.username}".neededForBoot = true;
 
     "/mnt/ydata/music" = {
       device = "yavanna.shire.net:/export/music";