nixdirfmt + swaylock -> exprs + katexprs update

config/modules/home/default.nix

@@ -8,7 +8,6 @@
     (import sources.anicca).modules.home
     ./deploy.nix
     ./theme.nix
-    ./swaylock.nix
     ./secrets.nix
     (sources.tf-nix + "/modules/home/secrets.nix")
   ];

config/modules/home/swaylock.nix

@@ -1,44 +0,0 @@
-{ config, lib, pkgs, ... }: with lib;
-
-let cfg = config.programs.swaylock; in
-{
-  options.programs.swaylock = {
-    enable = mkEnableOption "locker integration";
-    package = mkOption {
-      type = types.package;
-      default = pkgs.swaylock-effects;
-    };
-    wrapped = mkOption {
-      type = types.package;
-    };
-    script = mkOption {
-      type = types.path;
-      default = "${cfg.wrapped}/bin/swaylock";
-    };
-    colors = mkOption {
-      type = types.attrsOf types.str;
-      default = { };
-    };
-    args = mkOption {
-      type = with types; attrsOf (oneOf [ str bool int float ]);
-      default = { };
-    };
-  };
-  config = mkIf cfg.enable {
-    programs.swaylock = let
-      argList = concatLists (mapAttrsToList (arg: value:
-      if value == true then
-      singleton "--${toString arg}"
-      else [
-        "--${arg}"
-        (toString value)
-      ]) cfg.args);
-      argStr = escapeShellArgs argList;
-    in {
-      args = mapAttrs' (arg: color: nameValuePair ("${arg}-color") (removePrefix "#" color)) cfg.colors;
-      wrapped = pkgs.writeShellScriptBin "swaylock" ''
-        ${cfg.package}/bin/swaylock ${argStr} $@
-      '';
-    };
-  };
-}

config/modules/home/theme.nix

@@ -1,8 +1,8 @@
 { config, pkgs, lib, ... }:
 
 /*
-This module:
-* provides a central way to change the font my system uses.
+  This module:
+  * provides a central way to change the font my system uses.
 */
 
 with lib;
@@ -57,99 +57,101 @@ let cfg = config.kw.theme; in
   config = mkIf (cfg.enable) {
     kw.theme = {
       base16 = lib.mapAttrs' (k: v: lib.nameValuePair k "#${v.hex.rgb}")
-      (lib.filterAttrs (n: _: lib.hasInfix "base" n) config.lib.arc.base16.schemeForAlias.default);
+        (lib.filterAttrs (n: _: lib.hasInfix "base" n) config.lib.arc.base16.schemeForAlias.default);
       base16t = lib.mapAttrs' (k: v: lib.nameValuePair "${k}t" "rgba(${toString v.rgb.r}, ${toString v.rgb.g}, ${toString v.rgb.b}, ${toString cfg.alpha})")
-      (lib.filterAttrs (n: _: lib.hasInfix "base" n) config.lib.arc.base16.schemeForAlias.default);
+        (lib.filterAttrs (n: _: lib.hasInfix "base" n) config.lib.arc.base16.schemeForAlias.default);
       alpha = 0.7;
     };
 
-      programs.swaylock = mkIf (cfg.swaylock) {
-        enable = true;
-        args = {
-          screenshots = true;
-          daemonize = true;
-          show-failed-attempts = true;
-          indicator = true;
-          indicator-radius = 110;
-          indicator-thickness = 8;
-          font = cfg.font.name;
-          font-size = cfg.font.size_css;
-          clock = true;
-          datestr = "%F";
-          timestr = "%T";
-          effect-blur = "5x2";
-          fade-in = 0.2;
-        };
-        colors = with cfg.base16; {
-          key-hl = base0C;
-          separator = base01;
-          line = base01;
-          line-clear = base01;
-          line-caps-lock = base01;
-          line-ver = base01;
-          line-wrong = base01;
-          ring = base00;
-          ring-clear = base0B;
-          ring-caps-lock = base09;
-          ring-ver = base0D;
-          ring-wrong = base08;
-          inside = base00;
-          inside-clear = base00;
-          inside-caps-lock = base00;
-          inside-ver = base00;
-          inside-wrong = base00;
-          text = base05;
-          text-clear = base05;
-          text-caps-lock = base05;
-          text-ver = base05;
-          text-wrong = base05;
-        };
+    programs.swaylock = mkIf (cfg.swaylock) {
+      enable = true;
+      args = {
+        screenshots = true;
+        daemonize = true;
+        show-failed-attempts = true;
+        indicator = true;
+        indicator-radius = 110;
+        indicator-thickness = 8;
+        font = cfg.font.name;
+        font-size = cfg.font.size_css;
+        clock = true;
+        datestr = "%F";
+        timestr = "%T";
+        effect-blur = "5x2";
+        fade-in = 0.2;
       };
+      colors = with cfg.base16; {
+        key-hl = base0C;
+        separator = base01;
+        line = base01;
+        line-clear = base01;
+        line-caps-lock = base01;
+        line-ver = base01;
+        line-wrong = base01;
+        ring = base00;
+        ring-clear = base0B;
+        ring-caps-lock = base09;
+        ring-ver = base0D;
+        ring-wrong = base08;
+        inside = base00;
+        inside-clear = base00;
+        inside-caps-lock = base00;
+        inside-ver = base00;
+        inside-wrong = base00;
+        text = base05;
+        text-clear = base05;
+        text-caps-lock = base05;
+        text-ver = base05;
+        text-wrong = base05;
+      };
+    };
 
-      systemd.user.services.swayidle = mkIf (cfg.swaylock) {
-        Unit = {
-          Description = "swayidle";
-          Documentation = [ "man:swayidle(1)" ];
-          PartOf = [ "graphical-session.target" ];
-        };
-        Service = {
-          Type = "simple";
-          ExecStart = let
+    systemd.user.services.swayidle = mkIf (cfg.swaylock) {
+      Unit = {
+        Description = "swayidle";
+        Documentation = [ "man:swayidle(1)" ];
+        PartOf = [ "graphical-session.target" ];
+      };
+      Service = {
+        Type = "simple";
+        ExecStart =
+          let
             lockCommand = config.programs.swaylock.script;
-          in ''
+          in
+          ''
             ${pkgs.swayidle}/bin/swayidle -w \
             timeout 300 '${lockCommand}' \
             timeout 600 'swaymsg "output * dpms off"' \
             resume 'swaymsg "output * dpms on"' \
             before-sleep '${lockCommand}'
           '';
-          RestartSec = 3;
-          Restart = "always";
-        };
-        Install = { WantedBy = [ "sway-session.target" ]; };
+        RestartSec = 3;
+        Restart = "always";
       };
+      Install = { WantedBy = [ "sway-session.target" ]; };
+    };
 
-      lib.kw.sassTemplate = { name, src }:
+    lib.kw.sassTemplate = { name, src }:
       let
         variables = pkgs.writeText "base-variables.sass" ''
           ${(concatStringsSep "\n" (mapAttrsToList(var: con: "\$${var}: ${con}") cfg.sass.variables))}
         '';
         source = pkgs.callPackage
-        ({ sass, stdenv }: stdenv.mkDerivation {
-          inherit name src variables;
-          nativeBuildInputs = lib.singleton sass;
-          phases = [ "buildPhase" ];
-          buildPhase = ''
+          ({ sass, stdenv }: stdenv.mkDerivation {
+            inherit name src variables;
+            nativeBuildInputs = lib.singleton sass;
+            phases = [ "buildPhase" ];
+            buildPhase = ''
               cat $variables $src > src-mut.sass
               sass src-mut.sass $out --sourcemap=none --style=${cfg.sass.css_style}
-          '';
-        })
-        { };
+            '';
+          })
+          { };
       in
       {
         inherit source;
         text = builtins.readFile source;
       };
-      _module.args = { inherit (config.lib) kw; };
-    };
-  }
+    _module.args = { inherit (config.lib) kw; };
+  };
+}