7 files changed, 9 insertions, 154 deletions
diff --git a/home/terminal/alacritty/default.nix b/home/terminal/alacritty/default.nix
index 00e9ca4..72a6d33 100644
--- a/home/terminal/alacritty/default.nix
+++ b/home/terminal/alacritty/default.nix
@@ -1,7 +1,5 @@
 { config, lib, pkgs, ... }:
-let
-  cfg = config.my.home.terminal;
-  colors = import ./theme.nix;
+let cfg = config.my.home.terminal;
 in {
   config = lib.mkIf (cfg.program == "alacritty") {
     programs.alacritty = {
@@ -17,7 +15,7 @@ in {
           style.blinking = "Never";
           unfocused_hollow = true;
         };
-      } // colors;
+      };
     };
   };
 }
diff --git a/home/terminal/alacritty/theme.nix b/home/terminal/alacritty/theme.nix
deleted file mode 100644
index 90c1abf..0000000
--- a/home/terminal/alacritty/theme.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  colors = {
-    primary = {
-      background = "0xffffff";
-      foreground = "0x000000";
-    };
-
-    normal = {
-      black = "0xfbf1c7";
-      red = "0xcc241d";
-      green = "0x98971a";
-      yellow = "0xd79921";
-      blue = "0x458588";
-      magenta = "0xb16286";
-      cyan = "0x689d6a";
-      white = "0x7c6f64";
-    };
-
-    bright = {
-      black = "0x928374";
-      red = "0x9d0006";
-      green = "0x79740e";
-      yellow = "0xb57614";
-      blue = "0x076678";
-      magenta = "0x8f3f71";
-      cyan = "0x427b58";
-      white = "0x3c3836";
-    };
-  };
-}
diff --git a/home/wm/default.nix b/home/wm/default.nix
index e862696..27a8bf4 100644
--- a/home/wm/default.nix
+++ b/home/wm/default.nix
@@ -6,7 +6,7 @@ let
       default = builtins.any isActivatedWm relatedWMs;
     };
 in {
-  imports = [ ./sway ./waybar ./mako ./swaylock ./wofi ./gammastep ./theme ];
+  imports = [ ./sway ./waybar ./mako ./swaylock ./wofi ./gammastep ];
   options.my.home.wm = with lib; {
     windowManager = mkOption {
       type = with types; nullOr (enum [ "sway" ]);
diff --git a/home/wm/theme/default.nix b/home/wm/theme/default.nix
deleted file mode 100644
index e466d6c..0000000
--- a/home/wm/theme/default.nix
+++ /dev/null
@@ -1,63 +0,0 @@
-{ config, lib, ... }:
-let
-  isEnabled = config.my.home.wm.windowManager == "sway";
-  cfg = config.base16-theme;
-  inherit (lib) mkOption mkMerge mkIf mkEnableOption types;
-  cnotation = builtins.replaceStrings [ "#" ] [ "0x" ];
-  color = default:
-    mkOption {
-      inherit default;
-      type = types.str;
-    };
-  alpha = clr: a: "${clr}${a}";
-in {
-  options.base16-theme = {
-    enable = mkEnableOption "Enable base16 theme systemwide";
-    base00 = color "#2E3440"; # polar night
-    base01 = color "#3B4252"; # polar night
-    base02 = color "#434C5E"; # polar night
-    base03 = color "#4C566A"; # polar night
-    base04 = color "#D8DEE9"; # snow storm
-    base05 = color "#E5E9F0"; # snow storm
-    base06 = color "#ECEFF4"; # snow storm
-    base07 = color "#8FBCBB"; # frost
-    base08 = color "#88C0D0"; # frost
-    base09 = color "#81A1C1"; # frost
-    base0A = color "#5E81AC"; # frost
-    base0B = color "#BF616A"; # aurora
-    base0C = color "#D08770"; # aurora
-    base0D = color "#EBCB8B"; # aurora
-    base0E = color "#A3BE8C"; # aurora
-    base0F = color "#B48EAD"; # aurora
-  };
-
-  config = mkIf isEnabled (mkMerge [({
-    wayland.windowManager.sway.config.colors = rec {
-      focused = {
-        border = cfg.base0A;
-        background = cfg.base0A;
-        text = cfg.base06;
-        indicator = cfg.base0A;
-        childBorder = cfg.base0A;
-      };
-
-      focusedInactive = {
-        border = cfg.base00;
-        background = cfg.base00;
-        text = cfg.base07;
-        indicator = cfg.base00;
-        childBorder = cfg.base00;
-      };
-
-      unfocused = focusedInactive;
-
-      urgent = {
-        border = cfg.base0B;
-        background = cfg.base0B;
-        text = cfg.base05;
-        indicator = cfg.base0B;
-        childBorder = cfg.base0B;
-      };
-    };
-  })]);
-}
diff --git a/home/wm/waybar/style.css b/home/wm/waybar/style.css
index 7f1d9c3..e4565c8 100644
--- a/home/wm/waybar/style.css
+++ b/home/wm/waybar/style.css
@@ -10,16 +10,13 @@
   font-size: 15px;
 }
 window#waybar {
-  background-color: rgba(43, 48, 59, 0.5);
+  background-color: rgba(43, 48, 59, 0.9);
   color: #ffffff;
-  transition-property: background-color;
-  transition-duration: .5s;
 }
 #workspaces button {
   padding: 0 3px;
   background-color: transparent;
   color: #888888;
-  box-shadow: inset 0 -3px transparent;
 }
 #workspaces button.focused {
   background-color: #285577;
@@ -28,11 +25,8 @@ window#waybar {
 }
 #workspaces button.urgent {
   background-color: #900000;
-  color: #ffffff;
   border: 1px solid #2f343a;
-}
-#tray {
-  /* No styles */
+  color: #ffffff;
 }
 #clock,
 #battery,
@@ -44,10 +38,10 @@ window#waybar {
   padding-right: 10px;
 }
 #mode {
-  background: #64727D;
-  border-top: 2px solid white;
-  /* To compensate for the top border and still have vertical centering */
-  padding-bottom: 2px;
+  /* No styles */
+}
+#tray {
+  /* No styles */
 }
 #clock {
   /* No styles */
diff --git a/home/wm/wofi/default.nix b/home/wm/wofi/default.nix
index f1e1663..ad3c759 100644
--- a/home/wm/wofi/default.nix
+++ b/home/wm/wofi/default.nix
@@ -4,6 +4,5 @@ in {
   config = lib.mkIf isEnabled {
     home.packages = with pkgs; [ wofi ];
     xdg.configFile."wofi/config".source = ./config;
-    xdg.configFile."wofi/style.css".source = ./style.css;
   };
 }
diff --git a/home/wm/wofi/style.css b/home/wm/wofi/style.css
deleted file mode 100644
index bf6f2aa..0000000
--- a/home/wm/wofi/style.css
+++ /dev/null
@@ -1,43 +0,0 @@
-*{
-  font-family: monospace;
-}
-
-window {
-  color: #5E81AC;
-  background-color: rgba(27, 27, 28, 0.92);
-  border: 2px solid #75d5ff;
-}
-
-#input {
-  margin: 10px 0px;
-  border-radius: 0px;
-  border: none;
-  background: transparent;
-  color: white;
-}
-
-#inner-box {
-  background-color: transparent;
-}
-
-#outer-box {
-  margin: 0px;
-  padding:5px;
-  background-color: transparent;
-}
-
-#text {
-  padding: 5px;
-  color: white;
-}
-
-#entry:selected {
-  color: #75d5ff;
-  background-color: transparent;
-  border: 0px;
-}
-
-#text:selected {
-  color: #75d5ff;
-  background-color: transparent;
-}