From d00f06890ed4dd167bd5d334d5f7f55224c28914 Mon Sep 17 00:00:00 2001
From: Noa Aarts <noa@voorwaarts.nl>
Date: Wed, 20 Nov 2024 21:27:19 +0100
Subject: [PATCH] waaa

---
 common/home.nix                   | 9 +++------
 packages/niri-config/default.nix  | 3 ++-
 packages/niri-config/template.kdl | 2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/common/home.nix b/common/home.nix
index e9a7b0a..dece969 100644
--- a/common/home.nix
+++ b/common/home.nix
@@ -82,14 +82,12 @@ in
       '';
     };
     preferXdgDirectories = true;
-    sessionVariables = lib.mkMerge [
+    sessionVariables =
       {
         EDITOR = "nvim";
         TERM = "kitty";
       }
-      lib.mkIf
-      enableGraphical
-      {
+      // lib.mkIf enableGraphical {
         DISPLAY = ":0";
         GDK_BACKEND = "wayland,x11";
         QT_QPA_PLATFORM = "wayland;xcb";
@@ -98,8 +96,7 @@ in
         XDG_SESSION_TYPE = "wayland";
         XDG_SESSION_DESKTOP = "niri";
         WLR_NO_HARDWARE_CURSORS = "1";
-      }
-    ];
+      };
     stateVersion = "23.11"; # Do not change :3
     username = me.nickname;
   };
diff --git a/packages/niri-config/default.nix b/packages/niri-config/default.nix
index f4055a1..28b9679 100644
--- a/packages/niri-config/default.nix
+++ b/packages/niri-config/default.nix
@@ -16,6 +16,7 @@ let
           name,
           horizontal-resolution,
           vertical-resolution,
+          ...
         }:
         let
           display-shader = pkgs.substituteAll {
@@ -38,10 +39,10 @@ let
             init-shader
             state-shader
             display-shader
-            name
             tps
             cycles
             ;
+          display = name;
           horizontal = builtins.div horizontal-resolution horizontal-dot-size;
           vertical = builtins.div vertical-resolution vertical-dot-size;
         })
diff --git a/packages/niri-config/template.kdl b/packages/niri-config/template.kdl
index c3f650c..8eeeb4a 100644
--- a/packages/niri-config/template.kdl
+++ b/packages/niri-config/template.kdl
@@ -117,7 +117,7 @@ layout {
 // spawn-at-startup "alacritty" "-e" "fish"
 @wallpapers@
 
-@extra@
+@autostart@
 
 // Uncomment this line to ask the clients to omit their client-side decorations if possible.
 // If the client will specifically ask for CSD, the request will be honored.