From f95acee54d7a6dfe48b8f073a622da0fd1d17c06 Mon Sep 17 00:00:00 2001
From: kat witch <kat@kittywit.ch>
Date: Thu, 6 May 2021 16:08:14 +0100
Subject: [PATCH] witch: Further deprecation efforts

---
 default.nix                               |  2 +-
 lib/hosts.nix                             |  4 +-
 users/kat/home/sway/mako.nix              | 10 ++---
 users/kat/home/sway/sway.nix              | 48 +++++++++++-----------
 users/kat/home/sway/waybar/default.nix    |  8 ++--
 users/kat/home/sway/waybar/waybar.css.nix | 50 +++++++++++------------
 6 files changed, 61 insertions(+), 61 deletions(-)

diff --git a/default.nix b/default.nix
index 6b23d13e..164bcf54 100644
--- a/default.nix
+++ b/default.nix
@@ -11,7 +11,7 @@ rec {
   users = modList { modulesDir = ./users; };
 
   inherit (import ./lib/hosts.nix {
-    inherit pkgs sources witch profiles users;
+    inherit pkgs sources profiles users;
     inherit (deploy) target;
   })
     hosts targets;
diff --git a/lib/hosts.nix b/lib/hosts.nix
index 173c3aad..3dbf9c22 100644
--- a/lib/hosts.nix
+++ b/lib/hosts.nix
@@ -1,5 +1,5 @@
 { pkgs, target, users, hostsDir ? ../hosts, profiles, pkgsPath ? ../pkgs
-, sources ? { }, witch ? { } }:
+, sources ? { } }:
 
 with pkgs.lib;
 
@@ -27,7 +27,7 @@ rec {
         else
           { })
       ];
-      specialArgs = { inherit sources target profiles witch hostName users; };
+      specialArgs = { inherit sources target profiles hostName users; };
     })) hostNames);
 
   targets = foldAttrs (host: hosts: [ host ] ++ hosts) [ ] (mapAttrsToList
diff --git a/users/kat/home/sway/mako.nix b/users/kat/home/sway/mako.nix
index 90313d66..1b6e97fc 100644
--- a/users/kat/home/sway/mako.nix
+++ b/users/kat/home/sway/mako.nix
@@ -1,9 +1,9 @@
 { config, pkgs, lib, witch, ... }:
 
 let
-  witch.style.base16 = lib.mapAttrs' (k: v: lib.nameValuePair k "#${v.hex.rgb}")
+  base16 = lib.mapAttrs' (k: v: lib.nameValuePair k "#${v.hex.rgb}")
     config.lib.arc.base16.schemeForAlias.default;
-  witch.style.font = {
+  font = {
     name = "FantasqueSansMono Nerd Font";
     size = "10";
     size_css = "14px";
@@ -27,8 +27,8 @@ in {
   programs.mako = {
     enable = true;
     defaultTimeout = 3000;
-    borderColor = witch.style.base16.base0A;
-    backgroundColor = "${witch.style.base16.base00}70";
-    textColor = witch.style.base16.base05;
+    borderColor = base16.base0A;
+    backgroundColor = "${base16.base00}70";
+    textColor = base16.base05;
   };
 }
diff --git a/users/kat/home/sway/sway.nix b/users/kat/home/sway/sway.nix
index 1e8c8834..0a0e2ca6 100644
--- a/users/kat/home/sway/sway.nix
+++ b/users/kat/home/sway/sway.nix
@@ -1,9 +1,9 @@
 { config, pkgs, lib, witch, ... }:
 
 let
-  witch.style.base16 = lib.mapAttrs' (k: v: lib.nameValuePair k "#${v.hex.rgb}")
+  base16 = lib.mapAttrs' (k: v: lib.nameValuePair k "#${v.hex.rgb}")
     config.lib.arc.base16.schemeForAlias.default;
-  witch.style.font = {
+  font = {
     name = "FantasqueSansMono Nerd Font";
     size = "10";
     size_css = "14px";
@@ -76,7 +76,7 @@ in {
     enable = true;
     config = let
       dmenu =
-        "${pkgs.bemenu}/bin/bemenu --fn '${witch.style.font.name} ${witch.style.font.size}' --nb '${witch.style.base16.base00}' --nf '${witch.style.base16.base07}' --sb '${witch.style.base16.base01}' --sf '${witch.style.base16.base07}' -l 5 -m -1 -i";
+        "${pkgs.bemenu}/bin/bemenu --fn '${font.name} ${font.size}' --nb '${base16.base00}' --nf '${base16.base07}' --sb '${base16.base01}' --sf '${base16.base07}' -l 5 -m -1 -i";
       lockCommand = "swaylock -i LVDS-1:${./wallpapers/main.png}-i eDP-1:${
           ./wallpapers/main.png
         } -i HDMI-A-1:${./wallpapers/main.png} -i DP-1:${
@@ -94,7 +94,7 @@ in {
         };
       };
 
-      fonts = [ "${witch.style.font.name} ${witch.style.font.size}" ];
+      fonts = [ "${font.name} ${font.size}" ];
       terminal = "${pkgs.kitty}/bin/kitty";
       # TODO: replace with wofi
       menu =
@@ -205,32 +205,32 @@ in {
 
       colors = {
         focused = {
-          border = witch.style.base16.base08;
-          background = witch.style.base16.base0A;
-          text = witch.style.base16.base00;
-          indicator = witch.style.base16.base0B;
-          childBorder = witch.style.base16.base08;
+          border = base16.base08;
+          background = base16.base0A;
+          text = base16.base00;
+          indicator = base16.base0B;
+          childBorder = base16.base08;
         };
         focusedInactive = {
-          border = witch.style.base16.base00;
-          background = witch.style.base16.base07;
-          text = witch.style.base16.base0A;
-          indicator = witch.style.base16.base0B;
-          childBorder = witch.style.base16.base03;
+          border = base16.base00;
+          background = base16.base07;
+          text = base16.base0A;
+          indicator = base16.base0B;
+          childBorder = base16.base03;
         };
         unfocused = {
-          border = witch.style.base16.base00;
-          background = witch.style.base16.base01;
-          text = witch.style.base16.base04;
-          indicator = witch.style.base16.base08;
-          childBorder = witch.style.base16.base08;
+          border = base16.base00;
+          background = base16.base01;
+          text = base16.base04;
+          indicator = base16.base08;
+          childBorder = base16.base08;
         };
         urgent = {
-          border = witch.style.base16.base00;
-          background = witch.style.base16.base09;
-          text = witch.style.base16.base00;
-          indicator = witch.style.base16.base01;
-          childBorder = witch.style.base16.base08;
+          border = base16.base00;
+          background = base16.base09;
+          text = base16.base00;
+          indicator = base16.base01;
+          childBorder = base16.base08;
         };
       };
     };
diff --git a/users/kat/home/sway/waybar/default.nix b/users/kat/home/sway/waybar/default.nix
index c7950c24..f073104a 100644
--- a/users/kat/home/sway/waybar/default.nix
+++ b/users/kat/home/sway/waybar/default.nix
@@ -1,9 +1,9 @@
 { config, lib, pkgs, witch, ... }:
 
 let
-  witch.style.base16 = lib.mapAttrs' (k: v: lib.nameValuePair k "#${v.hex.rgb}")
+  base16 = lib.mapAttrs' (k: v: lib.nameValuePair k "#${v.hex.rgb}")
     config.lib.arc.base16.schemeForAlias.default;
-  witch.style.font = {
+  font = {
     name = "FantasqueSansMono Nerd Font";
     size = "10";
     size_css = "14px";
@@ -13,8 +13,8 @@ in {
     programs.waybar = {
       enable = true;
       style = import ./waybar.css.nix {
-        style = witch.style;
-        hextorgba = pkgs.hextorgba;
+        inherit font base16;
+        inherit (pkgs) hextorgba;
       };
       settings = [{
         modules-left = [ "sway/workspaces" "sway/mode" "sway/window" ];
diff --git a/users/kat/home/sway/waybar/waybar.css.nix b/users/kat/home/sway/waybar/waybar.css.nix
index 86e20855..8a5be1ce 100644
--- a/users/kat/home/sway/waybar/waybar.css.nix
+++ b/users/kat/home/sway/waybar/waybar.css.nix
@@ -1,11 +1,11 @@
-{ hextorgba, style }:
+{ hextorgba, base16, font }:
 
 ''
    * {
     border: none;
     border-radius: 0;
-    font-family: "${style.font.name}";
-    font-size: ${style.font.size_css};
+    font-family: "${font.name}";
+    font-size: ${font.size_css};
     min-height: 14px
    }
 
@@ -15,18 +15,18 @@
     padding-left: 8px;
     padding-right: 8px;
     transition: none;
-    border-bottom: 2px solid ${style.base16.base00};
-    color: ${style.base16.base05}
+    border-bottom: 2px solid ${base16.base00};
+    color: ${base16.base05}
   }
 
-  window#waybar { background: ${hextorgba style.base16.base00} }
+  window#waybar { background: ${hextorgba base16.base00} }
 
   #tray {
     margin-left: 8px;
   }
 
   #window {
-    color: ${style.base16.base06};
+    color: ${base16.base06};
     padding-left: 16px;
     padding-right: 16px
   }
@@ -34,40 +34,40 @@
   #workspaces { padding: 0px 4px 0px 4px }
 
   #workspaces button {
-    color: ${style.base16.base04};
-    background: ${hextorgba style.base16.base02};
+    color: ${base16.base04};
+    background: ${hextorgba base16.base02};
     font-size: 16px;
     margin: 0px 4px 0px 4px;
     border-bottom: 2px solid transparent;
-    border-left: 1px solid ${style.base16.base07};
-    border-right: 1px solid ${style.base16.base07}
+    border-left: 1px solid ${base16.base07};
+    border-right: 1px solid ${base16.base07}
   }
 
   #workspaces button:last-child { margin-right: 0px }
 
   #workspaces button.focused {
-      color: ${style.base16.base0A};
-      border-bottom-color: ${style.base16.base0A}
+      color: ${base16.base0A};
+      border-bottom-color: ${base16.base0A}
   }
 
   #workspaces button:hover {
     transition: none;
     box-shadow: inherit;
     text-shadow: inherit;
-    color: ${style.base16.base0F};
-    border-bottom-color: ${style.base16.base0F}
+    color: ${base16.base0F};
+    border-bottom-color: ${base16.base0F}
   }
 
   #mpd, #idle_inhibitor { border-color: #5af78e }
   #mpd.disconnected, #mpd.stopped { border-color: #282a36 }
-  #network { border-color: ${style.base16.base08} }
-  #custom-weather { border-color: ${style.base16.base00} }
-  #custom-gpg-status { border-color: ${style.base16.base09} }
-  #pulseaudio { border-color: ${style.base16.base0A} }
-  #temperature { border-color: ${style.base16.base0B} }
-  #battery { border-color: ${style.base16.base0C} }
-  #backlight { border-color: ${style.base16.base0D} }
-  #cpu { border-color: ${style.base16.base0E} }
-  #memory { border-color: ${style.base16.base0F} }
-  #clock { border-color: ${style.base16.base06} }
+  #network { border-color: ${base16.base08} }
+  #custom-weather { border-color: ${base16.base00} }
+  #custom-gpg-status { border-color: ${base16.base09} }
+  #pulseaudio { border-color: ${base16.base0A} }
+  #temperature { border-color: ${base16.base0B} }
+  #battery { border-color: ${base16.base0C} }
+  #backlight { border-color: ${base16.base0D} }
+  #cpu { border-color: ${base16.base0E} }
+  #memory { border-color: ${base16.base0F} }
+  #clock { border-color: ${base16.base06} }
 ''