current state of things

home/modules/niri.nix

@@ -4,23 +4,22 @@
   config,
   nix-rice,
   rice,
+  inputs,
   ...
 }:
 let
   services =
     let
-      inherit (pkgs) swaynotificationcenter sway-audio-idle-inhibit;
+      inherit (pkgs) swaynotificationcenter;
     in
     [
       swaynotificationcenter
-      sway-audio-idle-inhibit
     ];
   errata =
     let
-      inherit (pkgs) sirula avizo playerctl;
+      inherit (pkgs) avizo playerctl;
     in
     [
-      sirula
       avizo
       playerctl
     ];
@@ -30,9 +29,10 @@ let
         swayidle
         swaybg
         systemd
-        niri-unstable
         avizo
         ;
+
+      inherit (inputs.niri.packages.x86_64-linux) niri-unstable;
     in
     [
       {
@@ -104,7 +104,13 @@ in
             );
         in
         {
-          "Mod+D".action.spawn = "sirula";
+          "Mod+D".action.spawn = [
+            "qs"
+            "ipc"
+            "call"
+            "launch"
+            "toggle"
+          ];
           "Mod+F".action.spawn = "firefox";
           "Mod+E".action.spawn = "nautilus";
           "Mod+Return".action.spawn = "kitty";
@@ -185,7 +191,7 @@ in
         ];
         focus-ring =
           let
-            pal = nix-rice.palette.toRgbHex rice.palette;
+            pal = rice.palette.hex;
           in
           {
             active = {
@@ -198,75 +204,64 @@ in
       };
       prefer-no-csd = true;
       hotkey-overlay.skip-at-startup = true;
-    };
-
-  programs.ironbar = {
-    enable = true;
-    systemd = true;
-    config = {
-      monitors."DP-1" = {
-        position = "top";
-        height = 16;
-        start = [
+      window-rules =
+        let
+          v = 10.0;
+        in
+        [
           {
-            type = "music";
-            player_type = "mpris";
+            geometry-corner-radius = {
+              bottom-left = v;
+              bottom-right = 0.0;
+              top-left = 0.0;
+              top-right = v;
+            };
+            clip-to-geometry = true;
           }
         ];
-        center = [
-          {
-            type = "focused";
-            icon_size = 16;
-            truncate = "middle";
-          }
-        ];
-        end = [
-          { type = "clock"; }
-          { type = "tray"; }
-        ];
-      };
     };
-  };
 
-  systemd.user.services.ironbar = {
+  # programs.ironbar = {
+  #   enable = true;
+  #   systemd = true;
+  #   config = {
+  #     monitors."DP-1" = {
+  #       position = "top";
+  #       height = 16;
+  #       start = [
+  #         {
+  #           type = "music";
+  #           player_type = "mpris";
+  #         }
+  #       ];
+  #       center = [
+  #         {
+  #           type = "focused";
+  #           icon_size = 16;
+  #           truncate = "middle";
+  #         }
+  #       ];
+  #       end = [
+  #         { type = "clock"; }
+  #         { type = "tray"; }
+  #       ];
+  #     };
+  #   };
+  # };
+
+  systemd.user.services.quickshell = {
     Unit.PartOf = [ "graphical-session.target" ];
     Unit.After = [
       "graphical-session.target"
       "niri.service"
     ];
     Install.WantedBy = [ "graphical-session.target" ];
+    Service = {
+      ExecStart = "${lib.getExe' (inputs.quickshell.packages.${pkgs.system}.default.override {
+        withHyprland = false;
+        withI3 = false;
+      }) "qs"}";
+    };
   };
 
-  xdg.configFile = {
-    "sirula/config.toml".text = ''
-      exclusive = false
-      icon_size = 24
-      lines = 2
-      anchor_left = false
-      anchor_right = true
-      anchor_bottom = false
-      anchor_top = false
-      width = 320
-      height = 720
-      command_prefix = ":"
-      frequent_first = true
-      recent_first = true
-      term_command = "kitty {}"
-    '';
-
-    "sirula/style.css".text =
-      let
-        pal = nix-rice.palette.toRgbHex rice.palette;
-      in
-      ''
-        #root-box {
-          background-color: ${pal.normal.black};
-          color: ${pal.normal.yellow};
-          font-family: '${rice.fonts.sans.name}';
-        }
-        /* what's the name of the highlighted search text?
-           color: ${pal.normal.white};
-        */
-      '';
-  };
 }