desktop: Add dunst, setup xwaylandwayland

4 files changed, 41 insertions, 33 deletions

diff --git a/gui/conf/niri.kdl b/gui/conf/niri.kdl
index b40c444..d20cb61 100644
--- a/gui/conf/niri.kdl
+++ b/gui/conf/niri.kdl
@@ -1,16 +1,12 @@
-// This config is in the KDL format: https://kdl.dev
-// "/-" comments out the following node.
-// Check the wiki for a full description of the configuration:
-// https://github.com/YaLTeR/niri/wiki/Configuration:-Introduction
+spawn-at-startup "xwayland-satellite"
 
 environment {
     QT_QPA_PLATFORM "wayland"
-    DISPLAY null
+    DISPLAY ":0"
 }
 
-// Input device configuration.
-// Find the full list of options on the wiki:
-// https://github.com/YaLTeR/niri/wiki/Configuration:-Input
+prefer-no-csd
+
 input {
     keyboard {
         xkb {
@@ -18,10 +14,7 @@ input {
         }
     }
 
-    // Next sections include libinput settings.
-    // Omitting settings disables them, or leaves them at their default values.
     touchpad {
-        // off
         tap
         // dwt
         // dwtp
@@ -36,10 +29,6 @@ input {
 
     mouse {
         // off
-        // natural-scroll
-        // accel-speed 0.2
-        // accel-profile "flat"
-        // scroll-method "no-scroll"
     }
 
     trackpoint {
@@ -51,13 +40,6 @@ input {
         // scroll-button 273
         // middle-emulation
     }
-
-    // Uncomment this to make the mouse warp to the center of newly focused windows.
-    // warp-mouse-to-focus
-
-    // Focus windows and outputs automatically when moving the mouse into them.
-    // Setting max-scroll-amount="0%" makes it work only on windows already fully on screen.
-    // focus-follows-mouse max-scroll-amount="0%"
 }
 
 // You can configure outputs by their name, which you can find
@@ -129,10 +111,6 @@ layout {
     }
 }
 
-//spawn-at-startup "waybar"
-
-prefer-no-csd
-
 screenshot-path "~/screenshot_%Y_%m_%d_%H_%M_%S.png"
 
 // Animation settings.
@@ -162,9 +140,6 @@ window-rule {
 
 // Open the Firefox picture-in-picture player as floating by default.
 window-rule {
-    // This app-id regular expression will work for both:
-    // - host Firefox (app-id is "firefox")
-    // - Flatpak Firefox (app-id is "org.mozilla.firefox")
     match app-id=r#"firefox$"# title="^Picture-in-Picture$"
     open-floating true
 }
diff --git a/gui/dunst.nix b/gui/dunst.nix
new file mode 100644
index 0000000..a75b56d
--- /dev/null
+++ b/gui/dunst.nix
@@ -0,0 +1,25 @@
+{ config, pkgs, ... }:
+
+{
+  home.packages = with pkgs; [
+    swaylock
+    libnotify
+  ];
+
+  services.dunst = {
+    enable = true;
+    settings = {
+      global = {
+        width = 300;
+        height = 50;
+        offset = "5x5";
+        origin = "bottom-right";
+        transparency = 10;
+        frame_color = "#909737";
+        background = "#909737";
+        foreground = "#111111";
+        font = "Iosevka 11";
+      };
+    };
+  };
+}
diff --git a/gui/niri.nix b/gui/niri.nix
index 7381e4f..114857e 100644
--- a/gui/niri.nix
+++ b/gui/niri.nix
@@ -3,9 +3,11 @@
 {
   imports = [
     ./gtk.nix
+    ./dunst.nix
   ];
 
   home.pointerCursor = {
+    enable = true;
     package = pkgs.vanilla-dmz;
     name    = "Vanilla-DMZ-AA";
     size    = 16;
@@ -13,10 +15,6 @@
 
   #home.file.".config/niri/config.kdl".source = config.lib.file.mkOutOfStoreSymlink ./conf/niri.kdl;
 
-  home.packages = with pkgs; [
-    swaylock
-  ];
-
   services.screen-locker = {
     enable  = true;
     lockCmd = "${pkgs.swaylock}/bin/swaylock -c #000000";
diff --git a/host/hephaestus.nix b/host/hephaestus.nix
index 9945ca5..ea3b5ab 100644
--- a/host/hephaestus.nix
+++ b/host/hephaestus.nix
@@ -7,6 +7,16 @@
     ../gui/networkmanager.nix
   ];
 
+  home.packages = with pkgs; [
+    xwayland-satellite
+  ];
+
+  home.sessionVariables = {
+    QT_QPA_PLATFORM = "wayland";
+    GBM_BACKEND = "nvidia-drm";
+    __GLX_VENDOR_LIBRARY_NAME = "nvidia";
+  };
+
   services = {
     kdeconnect.enable = true;
     screen-locker.enable = pkgs.lib.mkForce false;