From b7d40f68d0794616c2c6b8d8dcd7895031fa92d1 Mon Sep 17 00:00:00 2001
From: Chris Cochrun <chris@cochrun.xyz>
Date: Tue, 14 Oct 2025 11:17:43 -0500
Subject: [PATCH] fix portals for niri and fix waybar issues

---
 home/home.nix         | 7 ++++---
 home/modules/niri.nix | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/home/home.nix b/home/home.nix
index e8a763e..3f7ac97 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -47,8 +47,8 @@ in {
       configPackages = [ pkgs.cosmic-session pkgs.xdg-desktop-portal-cosmic pkgs.kdePackages.kwallet ];
       config = {
         common = {
-          default = [ "cosmic" "kde" ];
-          "org.freedesktop.impl.portal.FileChooser" = [ "cosmic" "kde" ];
+          default = [ "kde" "cosmic" "gtk" ];
+          "org.freedesktop.impl.portal.FileChooser" = [ "kde" ];
           "org.freedesktop.impl.portal.Access" = [ "kde" ];
           "org.freedesktop.impl.portal.OpenUri" = [ "kde" ];
           "org.freedesktop.impl.portal.Desktop" = [ "kde" ];
@@ -775,7 +775,7 @@ in {
           format = "{:%b %e, %I:%M %p}";
         };
         cpu = { format = "  {usage}%"; on-click = "alacritty --class btop -e btop"; };
-        memory = { format = "  {}%"; on-click = "alacritty --class btop -e btop"; };
+        memory = { format = "  {used:0.1f}Gb / {total:0.1f}Gb {percentage}%"; on-click = "alacritty --class btop -e btop"; };
         "custom/gpu" = {
           exec = "cat /sys/class/hwmon/hwmon0/device/gpu_busy_percent";
           format = "󱤓  {}%";
@@ -908,6 +908,7 @@ in {
           background: @backtransparent;
           box-shadow: 5px 5px 4px 4px #202020;
           border-radius: 20px;
+          margin-left: 12px;
      }
 
       .modules-left {
diff --git a/home/modules/niri.nix b/home/modules/niri.nix
index 53ee43f..1e705d3 100644
--- a/home/modules/niri.nix
+++ b/home/modules/niri.nix
@@ -141,9 +141,9 @@ in
         { argv = ["hyprpaper"]; }
         { argv = ["${pkgs.xwayland-satellite}/bin/xwayland-satellite"]; }
         { argv = ["/usr/lib/kdeconnectd"]; }
+        { argv = ["cosmic-settings-daemon"]; }
         { argv = ["cosmic-osd"]; }
         { argv = ["cosmic-idle"]; }
-        { argv = ["cosmic-settings-daemon"]; }
         { argv = ["kwalletd6"]; }
         { argv = ["swww-daemon"]; }
         { argv = ["dbus-update-activation-environment --systemd --all"]; }