10 files changed, 209 insertions, 21 deletions
diff --git a/modules/by-name/fo/foot/module.nix b/modules/by-name/fo/foot/module.nix
index 29d886d6..00c198fa 100644
--- a/modules/by-name/fo/foot/module.nix
+++ b/modules/by-name/fo/foot/module.nix
@@ -11,6 +11,7 @@
   config,
   lib,
   libraries,
+  pkgs,
   ...
 }: let
   cfg = config.soispha.foot;
@@ -20,6 +21,11 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
+    # TODO: Maybe we can use the xdg-autostart mechanism for this? <2026-06-23>
+    soispha.programs.river.init.autoStart = [
+      ["${lib.getExe' pkgs.foot "footclient"}"]
+    ];
+
     home-manager.users.soispha = {
       programs.foot = {
         enable = true;
@@ -52,10 +58,6 @@ in {
           };
         };
       };
-
-      soispha.river.autostart = [
-        "${lib.getExe' config.home-manager.users.soispha.programs.foot.package "footclient"}"
-      ];
     };
   };
 }
diff --git a/modules/by-name/fo/foot/theme.ini b/modules/by-name/fo/foot/theme.ini
index f66cde40..aba19ecb 100644
--- a/modules/by-name/fo/foot/theme.ini
+++ b/modules/by-name/fo/foot/theme.ini
@@ -1,4 +1,17 @@
 # From https://codeberg.org/dnkl/foot/src/commit/43d2d97386663ebd42563eb44b7fca8e9a7584ae/themes/visibone
+# Other themes I considered:
+# - ayu-mirage
+# - catppuccin-mocha
+# - chiba-dark
+# - iterm
+# - kitty
+# - modus-vivendi
+# - modus-vivendi-tinted
+# - molokai
+# - tokyonight-storm
+# - visibone
+# - xterm
+# - poimandres
 # -*- conf -*-
 # VisiBone
 
diff --git a/modules/by-name/i3/i3bar-river/module.nix b/modules/by-name/i3/i3bar-river/module.nix
index 2b9150d3..982ec1e3 100644
--- a/modules/by-name/i3/i3bar-river/module.nix
+++ b/modules/by-name/i3/i3bar-river/module.nix
@@ -110,20 +110,28 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
-    home-manager.users.soispha = {
-      systemd.user.services."i3bar-river" = {
-        description = "Highly customizable Wayland bar for river";
-        partOf = "graphical-session.target";
-        after = "graphical-session.target";
-        requisite = "graphical-session.target";
-        serviceConfig = {
-          ExecStart = "${lib.getExe cfg.package}";
-          ExecReload = "kill -SIGUSR2 $MAINPID";
-          Restart = "on-failure";
-        };
-        wantedBy = "graphical-session.target";
+    systemd.user.services."i3bar-river" = {
+      description = "Highly customizable Wayland bar for river";
+      partOf = ["graphical-session.target"];
+      after = ["graphical-session.target"];
+      requisite = ["graphical-session.target"];
+
+      path = [
+        pkgs.bash # `sh` is needed for starting the status command
+
+        # TODO: This should be a wrapper of the status command <2026-06-23>
+        pkgs.btrfs-progs # `btrfs` is needed by the storage block in the status command
+      ];
+
+      serviceConfig = {
+        ExecStart = "${lib.getExe cfg.package}";
+        ExecReload = "kill -SIGUSR2 $MAINPID";
+        Restart = "on-failure";
       };
+      wantedBy = ["graphical-session.target"];
+    };
 
+    home-manager.users.soispha = {
       programs.i3bar-river = {
         enable = true;
         inherit (cfg) package;
diff --git a/modules/by-name/ly/ly/module.nix b/modules/by-name/ly/ly/module.nix
index dedabe81..e2d3b0ae 100644
--- a/modules/by-name/ly/ly/module.nix
+++ b/modules/by-name/ly/ly/module.nix
@@ -31,6 +31,7 @@
     Terminal=true
   '';
 
+  # TODO: This could use the `services.display-manager.sessionPackages` option <2026-06-23>
   customSessionsDir =
     pkgs.runCommand "custom-sessions" {}
     /*
@@ -39,8 +40,22 @@
     ''
       mkdir "$out";
       cp "${riverDesktop}/share/applications/river.desktop" "$out"
-      cp "${shellDesktop}" "$out"
+      cp "${shellDesktop}" "$out/zsh.desktop"
     '';
+
+  setup = pkgs.writeShellApplication {
+    name = "setup";
+
+    bashOptions = [];
+
+    runtimeInputs = [
+      pkgs.findutils
+      pkgs.systemd
+    ];
+    inheritPath = true;
+
+    text = builtins.readFile ./setup.sh;
+  };
 in {
   options.soispha.programs.ly = {
     enable = lib.mkEnableOption "ly";
@@ -84,6 +99,11 @@ in {
         dur_file_path = "${./blackhole-smooth-240x67.dur}";
         full_color = true;
 
+        # NOTE: This does the same as the default nixos setup cmd, but we don't
+        # immidiately start the `graphical-session.target`. That is started by river's
+        # init. <2026-06-23>
+        setup_cmd = "${lib.getExe setup}";
+
         custom_sessions = "${customSessionsDir}";
 
         # Clear the screen before starting up (otherwise error messages might linger on
@@ -98,12 +118,12 @@ in {
         clock = "%c";
 
         hibernate_cmd = "systemctl hibernate";
-        inactivity_cmd = "systmectl suspend-then-hibernate";
+        inactivity_cmd = "systemctl suspend-then-hibernate";
         restart_cmd = "reboot";
         shutdown_cmd = "shutdown $PLATFORM_SHUTDOWN_ARG now";
         sleep_cmd = "systemctl suspend";
 
-        inactivity_delay = 30; # unit is seconds
+        inactivity_delay = 120; # unit is seconds
       };
     };
   };
diff --git a/modules/by-name/ly/ly/setup.sh b/modules/by-name/ly/ly/setup.sh
new file mode 100644
index 00000000..6e8bed2b
--- /dev/null
+++ b/modules/by-name/ly/ly/setup.sh
@@ -0,0 +1,47 @@
+#! /usr/bin/env bash
+
+# Shared environment setup for graphical sessions.
+
+# shellcheck disable=1091
+. /etc/profile
+
+cd "$HOME" || {
+    echo 1>&2 "No HOME :("
+    exit 1
+}
+
+if [ -z "$_DID_SYSTEMD_CAT" ]; then
+  export _DID_SYSTEMD_CAT=1
+  exec systemd-cat -t xsession "$0" "$@"
+fi
+
+
+# Import environment variables into the systemd user environment.
+/run/current-system/systemd/bin/systemctl --user import-environment DBUS_SESSION_BUS_ADDRESS DISPLAY XAUTHORITY XDG_SESSION_ID
+
+# Speed up application start by 50-150ms according to
+# https://kdemonkey.blogspot.com/2008/04/magic-trick.html
+compose_cache="${XCOMPOSECACHE:-$HOME/.compose-cache}"
+mkdir -p "$compose_cache"
+# To avoid accidentally deleting a wrongly set up XCOMPOSECACHE directory,
+# defensively try to delete cache *files* only, following the file format specified in
+# https://gitlab.freedesktop.org/xorg/lib/libx11/-/blob/master/modules/im/ximcp/imLcIm.c#L353-358
+# sprintf (*res, "%s/%c%d_%03x_%08x_%08x", dir, _XimGetMyEndian(), XIM_CACHE_VERSION, (unsigned int)sizeof (DefTree), hash, hash2);
+find "$compose_cache" -maxdepth 1 -regextype posix-extended -regex '.*/[Bl][0-9]+_[0-9a-f]{3}_[0-9a-f]{8}_[0-9a-f]{8}' -delete
+unset compose_cache
+
+# Work around KDE errors when a user first logs in and
+# .local/share doesn't exist yet.
+mkdir -p "${XDG_DATA_HOME:-$HOME/.local/share}"
+
+unset _DID_SYSTEMD_CAT
+
+
+if test "$1"; then
+    # Run the supplied session command.
+    exec "$@"
+else
+    # TODO: Do we need this? Should not the session always exist?
+    echo "error: unknown session $1" 1>&2
+    exit 1
+fi
diff --git a/modules/by-name/ri/river/module.nix b/modules/by-name/ri/river/module.nix
index bc747c9d..ad17091b 100644
--- a/modules/by-name/ri/river/module.nix
+++ b/modules/by-name/ri/river/module.nix
@@ -166,7 +166,9 @@ in {
       };
 
       autoStart = lib.mkOption {
-        type = lib.types.listOf lib.types.package;
+        type =
+          lib.types.listOf (lib.types.either lib.types.package (lib.types.listOf
+              lib.types.str));
         description = "List of programs to be started at river start";
         example = ''
           [
@@ -237,13 +239,22 @@ in {
             # ${text}
             ${other_stuff}
           '';
+
+          sessionVars =
+            builtins.concatStringsSep " " (builtins.attrNames
+              config.home-manager.users.soispha.home.sessionVariables);
         in
           builtins.readFile ./init_base.sh
           +
           # bash
           mkHeading "Environment variables" ''
-            err_fail ${riverctl} spawn "${lib.getExe' pkgs.dbus "dbus-update-activation-environment"} --verbose --systemd SEATD_SOCK DISPLAY WAYLAND_DISPLAY DESKTOP_SESSION=river XDG_CURRENT_DESKTOP=river"
             export XDG_CURRENT_DESKTOP=river DESKTOP_SESSION=river;
+
+            err_fail ${riverctl} spawn "${lib.getExe' pkgs.dbus "dbus-update-activation-environment"} --verbose --systemd SEATD_SOCK DISPLAY WAYLAND_DISPLAY DESKTOP_SESSION XDG_CURRENT_DESKTOP ${sessionVars}"
+            err_fail ${riverctl} spawn "systemctl --user import-environment SEATD_SOCK
+            DISPLAY WAYLAND_DISPLAY DESKTOP_SESSION XDG_CURRENT_DESKTOP ${sessionVars}"
+
+            err_fail systemctl --user start nixos-fake-graphical-session.target
           ''
           + mkHeading "Key Mappings" keymappings
           + mkHeading "Rules" ruleSetup
diff --git a/modules/by-name/sw/swaybg/images/abstract-nord.png b/modules/by-name/sw/swaybg/images/abstract-nord.png
new file mode 100644
index 00000000..5ef498bf
--- /dev/null
+++ b/modules/by-name/sw/swaybg/images/abstract-nord.png
diff --git a/modules/by-name/sw/swaybg/images/abstract-nord.png.license b/modules/by-name/sw/swaybg/images/abstract-nord.png.license
new file mode 100644
index 00000000..eae6a84c
--- /dev/null
+++ b/modules/by-name/sw/swaybg/images/abstract-nord.png.license
@@ -0,0 +1,9 @@
+nixos-config - My current NixOS configuration
+
+Copyright (C) 2025 Benedikt Peetz <benedikt.peetz@b-peetz.de>
+SPDX-License-Identifier: GPL-3.0-or-later
+
+This file is part of my nixos-config.
+
+You should have received a copy of the License along with this program.
+If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>.
diff --git a/modules/by-name/sw/swaybg/module.nix b/modules/by-name/sw/swaybg/module.nix
new file mode 100644
index 00000000..fa6a079a
--- /dev/null
+++ b/modules/by-name/sw/swaybg/module.nix
@@ -0,0 +1,35 @@
+# nixos-config - My current NixOS configuration
+#
+# Copyright (C) 2025 Benedikt Peetz <benedikt.peetz@b-peetz.de>
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+# This file is part of my nixos-config.
+#
+# You should have received a copy of the License along with this program.
+# If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>.
+{
+  config,
+  lib,
+  pkgs,
+  libraries,
+  ...
+}: let
+  cfg = config.soispha.programs.swaybg;
+in {
+  options.soispha.programs.swaybg = {
+    enable = libraries.base.options.mkEnable "swaybg";
+  };
+
+  config = lib.mkIf cfg.enable {
+    systemd.user.services."swaybg" = {
+      description = "Background display for river";
+      partOf = ["graphical-session.target"];
+      after = ["graphical-session.target"];
+      requisite = ["graphical-session.target"];
+      serviceConfig = {
+        ExecStart = "${lib.getExe pkgs.swaybg} --image ${./images/abstract-nord.png}";
+      };
+      wantedBy = ["graphical-session.target"];
+    };
+  };
+}
diff --git a/modules/by-name/sw/swayidle/module.nix b/modules/by-name/sw/swayidle/module.nix
new file mode 100644
index 00000000..a29b5952
--- /dev/null
+++ b/modules/by-name/sw/swayidle/module.nix
@@ -0,0 +1,43 @@
+# nixos-config - My current NixOS configuration
+#
+# Copyright (C) 2025 Benedikt Peetz <benedikt.peetz@b-peetz.de>
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+# This file is part of my nixos-config.
+#
+# You should have received a copy of the License along with this program.
+# If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>.
+{
+  config,
+  lib,
+  libraries,
+  ...
+}: let
+  cfg = config.soispha.programs.swayidle;
+in {
+  options.soispha.programs.swayidle = {
+    enable = libraries.base.options.mkEnable "swayidle";
+  };
+
+  config = lib.mkIf cfg.enable {
+    home-manager.users.soispha = {
+      services.swayidle = {
+        enable = true;
+        events = {
+          "before-sleep" = "swaylock -f ";
+        };
+
+        timeouts = [
+          {
+            timeout = 180;
+            command = "swaylock -fF";
+          }
+          {
+            timeout = 360;
+            command = "systemctl suspend-then-hibernate";
+          }
+        ];
+      };
+    };
+  };
+}