From 822b4242183fd466c3326b2dfb26ae5a9222407c Mon Sep 17 00:00:00 2001
From: Caroline Larimore <caroline@larimo.re>
Date: Sun, 12 May 2024 12:57:34 -0700
Subject: Relocate some packages and scripts to better locations

---
 home.nix                 | 14 --------------
 modules/home/discord.nix |  8 +++++++-
 modules/home/eww.nix     | 16 +++++++++++++++-
 3 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/home.nix b/home.nix
index f1f0721..6f92d91 100644
--- a/home.nix
+++ b/home.nix
@@ -88,25 +88,11 @@
       i3-msg restart
     '')
 
-    eww
-    (writeShellScriptBin "eww-toggle"''
-      #!/usr/bin/env bash
-
-      if ${pkgs.eww}/bin/eww active-windows | grep $1; then
-          ${pkgs.eww}/bin/eww close $1
-      else
-          ${pkgs.eww}/bin/eww open $@
-      fi
-    '')
-
     pfetch
 
     kdePackages.breeze
 
     irssi
-    (discord.override {
-      withVencord = true;
-    })
 
     qbittorrent
     jellyfin-media-player
diff --git a/modules/home/discord.nix b/modules/home/discord.nix
index f303f1f..91fbd8e 100644
--- a/modules/home/discord.nix
+++ b/modules/home/discord.nix
@@ -1,8 +1,14 @@
-{ config, lib, ... }:
+{ config, lib, pkgs, ... }:
 
 let
   conversion = import ../../util/color-conversion.nix { inherit lib; };
 in {
+  home.packages = with pkgs; [
+    (discord.override {
+      withVencord = true;
+    })
+  ];
+
   xdg.configFile."Vencord/themes/nix.theme.css".text = let c = config.theme.colors; in ''
     @import url(https://mwittrien.github.io/BetterDiscordAddons/Themes/BasicBackground/BasicBackground.css);
 
diff --git a/modules/home/eww.nix b/modules/home/eww.nix
index 70bdff2..0e6d00f 100644
--- a/modules/home/eww.nix
+++ b/modules/home/eww.nix
@@ -1,6 +1,20 @@
-{ config, lib, ... }:
+{ config, lib, pkgs, ... }:
 
 {
+  home.packages = with pkgs; [
+    eww
+
+    (writeShellScriptBin "eww-toggle"''
+      #!/usr/bin/env bash
+
+      if ${pkgs.eww}/bin/eww active-windows | grep $1; then
+          ${pkgs.eww}/bin/eww close $1
+      else
+          ${pkgs.eww}/bin/eww open $@
+      fi
+    '')
+  ];
+
   xdg.configFile."eww/colors.css".text = let c = config.theme.colors; in ''
     @define-color accent #${c.accent};
 
-- 
cgit v1.2.3