From 227dcc58d95225c99f0b20cd070e654d01f7a710 Mon Sep 17 00:00:00 2001
From: Tyler Mayoff <tyler@tylermayoff.com>
Date: Sun, 31 Aug 2025 11:39:09 -0400
Subject: [PATCH] niri with shell, wrapped discord attempt

---
 dot_config/flake/flake.nix            |  2 +-
 dot_config/flake/home/gui.nix         |  2 +-
 dot_config/flake/home/niri.nix        | 24 ++++++++++++------------
 dot_config/flake/overlays/default.nix | 17 +++++++++++++++++
 4 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/dot_config/flake/flake.nix b/dot_config/flake/flake.nix
index e2c3614..50a7c83 100644
--- a/dot_config/flake/flake.nix
+++ b/dot_config/flake/flake.nix
@@ -13,7 +13,7 @@
       url = "github:sodiboo/niri-flake";
     };
     caelestia-shell = {
-      url = "github:caelestia-dots/shell";
+      url = "github:jutraim/niri-caelestia-shell";
     };
 
     darwin = {
diff --git a/dot_config/flake/home/gui.nix b/dot_config/flake/home/gui.nix
index 875e52c..8f8da7e 100644
--- a/dot_config/flake/home/gui.nix
+++ b/dot_config/flake/home/gui.nix
@@ -6,7 +6,7 @@
   home.packages = with pkgs; [
     adw-gtk3
 
-    discord
+    pkgs.mods.discord
 
     # Office
     libreoffice
diff --git a/dot_config/flake/home/niri.nix b/dot_config/flake/home/niri.nix
index 148d159..9c34392 100644
--- a/dot_config/flake/home/niri.nix
+++ b/dot_config/flake/home/niri.nix
@@ -13,19 +13,19 @@
 
   programs.caelestia = {
     enable = true;
-    settings = {
-      bar.status = {
-        showBattery = true;
-      };
+    # settings = {
+    #   bar.status = {
+    #     showBattery = true;
+    #   };
 
-      appearance.transparency.enable = true;
-    };
-    cli = {
-      enable = true; # Also add caelestia-cli to path
-      settings = {
-        theme.enableGtk = true;
-      };
-    };
+    #   # appearance.transparency.enable = true;
+    # };
+    # cli = {
+    #   enable = true; # Also add caelestia-cli to path
+    #   settings = {
+    #     theme.enableGtk = true;
+    #   };
+    # };
   };
 
   programs.niri.settings = {
diff --git a/dot_config/flake/overlays/default.nix b/dot_config/flake/overlays/default.nix
index bddc121..6943f14 100644
--- a/dot_config/flake/overlays/default.nix
+++ b/dot_config/flake/overlays/default.nix
@@ -3,6 +3,23 @@
 
   modifications = final: prev: {
     mods = {
+      discord = final.stdenv.mkDerivation {
+        pname = "discord-wayland";
+        version = prev.discord.version;
+
+        buildInputs = [final.makeWrapper];
+        nativeBuildInputs = [final.makeWrapper];
+
+        unpackPhase = "true";
+        installPhase = ''
+          mkdir -p $out/bin
+          ln -s ${prev.discord}/bin/discord $out/bin/.discord-wrapped
+          wrapProgram $out/bin/.discord-wrapped \
+            --prefix PATH : ${final.lib.makeBinPath [final.xdg-utils final.coreutils]} \
+            --add-flags "--enable-features=UseOzonePlatform --ozone-platform=wayland"
+          ln -s $out/bin/.discord-wrapped $out/bin/discord
+        '';
+      };
     };
   };