groups/cryde/programs.nix

@@ -25,6 +25,8 @@
 
     # Games
     upkgs.olympus # celeste
+    discord
+    discordo
     upkgs.ekphos
 
     prismlauncher # minecraft

homes/modules/apps/nixcord.nix

@@ -1,19 +1,11 @@
-{
+{inputs, ...}: {
-  inputs,
-  pkgs,
-  ...
-}: {
   imports = [
     inputs.nixcord.homeModules.nixcord
   ];
 
-  home.packages = with pkgs; [
-    discordo
-  ];
-
   programs.nixcord = {
     enable = true;
-    equibop.enable = true;
+    # equibop.enable = true;
 
     discord = {
       vencord.enable = false;

homes/modules/de/waybar/default.nix

@@ -1,4 +1,4 @@
-{...}: {
+{upkgs, ...}: {
   programs.waybar = {
     enable = true;
     settings = {
@@ -6,8 +6,8 @@
         layer = "top";
         position = "top";
         height = 30;
-
+        # modules-left = ["hyprland/workspaces" "wlr/taskbar" "custom/media"];
-        modules-left = ["hyprland/workspaces"];
+        modules-left = ["hyprland/workspaces" "wlr/taskbar"];
         modules-center = ["clock"];
         modules-right = ["cpu" "memory" "network" "pulseaudio" "privacy" "tray"];
 
@@ -21,10 +21,20 @@
           ignore-hidden = true;
           on-click = "activate";
         };
+        "wlr/taskbar" = {
+          format = "{icon}";
+          icon-size = 12;
+        };
+        # "custom/media" = {
+        #   exec = "auroramedia";
+        #   return-type = "json";
+        #   escape = true;
+        #   restart-interval = 1;
+        # };
 
         # center
         "clock" = {
-          format = "{:%b %a | %d %r}";
+          format = "{:%Y %b %a %d %H:%M:%S}";
           interval = 1;
           tooltip = false;
         };
@@ -39,10 +49,10 @@
           interval = 1;
         };
         "network" = {
-          format = "{bandwidthUpBits}   {bandwidthDownBits}  {ifname}";
+          format = "{bandwidthUpBytes}   {bandwidthDownBytes}  {ifname}";
-          format-wifi = "  {bandwidthUpBits}   {bandwidthDownBits}  {ifname}";
+          format-wifi = "  {bandwidthUpBytes}   {bandwidthDownBytes} ";
-          format-ethernet = "󰈀  {bandwidthUpBits}   {bandwidthDownBits}  {ifname}";
+          format-ethernet = "󰈀  {bandwidthUpBytes}   {bandwidthDownBytes} ";
-          format-disconnected = "no internet ~ rawr! ~ ;w;"; # empty format hides module
+          format-disconnected = "no internet ~ rawr! ~ x3"; # empty format hides module
           interval = 1;
           max-length = 32;
         };

homes/modules/de/waybar/style.css

@@ -123,7 +123,6 @@ right-side modules
 #network {
   margin: 4px 0 4px 0;
   border-radius: 0px 32px 32px 0px;
-  min-width: 100px; /* surely there's a better way to fix the size? */
 }
 
 #workspaces button {