19 files changed, 385 insertions, 50 deletions
diff --git a/modules/by-name/ba/backup/env.vars b/modules/by-name/ba/backup/env.vars
new file mode 100644
index 00000000..339c5a5b
--- /dev/null
+++ b/modules/by-name/ba/backup/env.vars
@@ -0,0 +1 @@
+RESTIC_COMPRESSION=max
diff --git a/modules/by-name/ba/backup/module.nix b/modules/by-name/ba/backup/module.nix
index dd0dfac7..031445cf 100644
--- a/modules/by-name/ba/backup/module.nix
+++ b/modules/by-name/ba/backup/module.nix
@@ -63,12 +63,23 @@ in {
     soispha.impermanence.directories = lib.mkMerge [
       (lib.mkIf cfg.storagebox.enable [
         "/var/cache/restic-backups-storagebox"
+
+        # Generate the base systemd.mount from impermanence (we will override this, so it
+        # points to the non-admin one instead)
+        "/var/cache/restic-backups-storagebox-admin"
       ])
       (lib.mkIf cfg.local.enable [
         "/var/cache/restic-backups-local"
       ])
     ];
 
+    # TODO: Make this work (`systemd.mounts` is a list, so _this_ doesn't work.) <2026-07-07>
+    # systemd.mounts."/var/cache/restic-backups-storagebox-admin" = {
+    #   # TODO: Don't hardcode the path, but use
+    #   # `systemd.mounts."/var/cache/restic-backups-storagebox".what` instead <2026-07-07>
+    #   what = "/srv/var/cache/restic-backups-storagebox";
+    # };
+
     age.secrets = {
       resticStorageboxSshKey = lib.mkIf cfg.storagebox.enable {
         file = cfg.storagebox.sshKey;
@@ -97,6 +108,8 @@ in {
       };
     };
 
+    programs.fuse.enable = cfg.storagebox.enable || cfg.local.enable;
+
     systemd.services = {
       prepare-backup = {
         requires = [];
@@ -154,16 +167,21 @@ in {
       ];
       exclude = [
         "${homeDir}/soispha/.cache"
+        "${homeDir}/soispha/.local/share/lutris/install"
+        "${homeDir}/soispha/.local/share/Steam/steamapps/common"
       ];
       extraBackupArgs = [
+        # Don't scan the filesystem to determine an estimate.
+        "--no-scan"
         "--verbose=2"
       ];
+      environmentFile = "${./env.vars}";
     in {
       local = lib.mkIf cfg.local.enable {
         inhibitsSleep = true;
         initialize = true;
 
-        inherit paths exclude extraBackupArgs;
+        inherit paths exclude extraBackupArgs environmentFile;
 
         passwordFile = config.age.secrets.resticLocalRepositoryPassword.path;
 
@@ -177,7 +195,7 @@ in {
         inhibitsSleep = true;
         initialize = true;
 
-        inherit paths exclude extraBackupArgs;
+        inherit paths exclude extraBackupArgs environmentFile;
 
         passwordFile = config.age.secrets.resticStorageboxRepositoryPassword.path;
         extraOptions = [
@@ -199,9 +217,13 @@ in {
 
       # This is only for listing, pruning and such stuff.
       storagebox-admin = lib.mkIf cfg.storagebox.enable {
-        inhibitsSleep = false;
+        inhibitsSleep = true;
+
+        # Don't create the repository if it doesn't exist yet.
         initialize = false;
 
+        inherit paths exclude extraBackupArgs environmentFile;
+
         passwordFile = config.age.secrets.resticStorageboxRepositoryPassword.path;
         extraOptions = [
           "rclone.program='ssh -p 23 ${cfg.storagebox.user}@${cfg.storagebox.user}.your-storagebox.de command_forced_on_remote'"
diff --git a/modules/by-name/bo/boot/module.nix b/modules/by-name/bo/boot/module.nix
index 4dc9130a..8c8b2af1 100644
--- a/modules/by-name/bo/boot/module.nix
+++ b/modules/by-name/bo/boot/module.nix
@@ -57,11 +57,11 @@
     ]
     ## Systemd log options
     ++ [
-      "systemd.log_level=debug"
-      "systemd.log_target=console"
-      "console=tty1"
-      "systemd.journald.forward_to_console=1"
-      "systemd.unit=rescue.target"
+      # "systemd.log_level=debug"
+      # "systemd.log_target=console"
+      # "console=tty1"
+      # "systemd.journald.forward_to_console=1"
+      # "systemd.unit=rescue.target"
     ]
     ## Options for the first `init` script
     ++ [
@@ -72,7 +72,7 @@
       "plymouth.enable=0"
 
       # "quiet"
-      "debug"
+      # "debug"
     ]
     ## Options for the `*-live` `init` scripts
     ++ [
@@ -207,6 +207,8 @@ in {
           };
 
           extraFiles = {
+            # TODO: Check that the ISO we use for booting is _actually_ still the one we
+            # copied there (someone might exchange it in between) <2026-06-09>
             "${tails.root}" = "${iso}/tails.iso";
             "${tails.vmlinuz}" = "${iso}/live/vmlinuz-linux";
             "${tails.initrd}" = "${iso}/live/initrd.img";
diff --git a/modules/by-name/fo/foot/module.nix b/modules/by-name/fo/foot/module.nix
index d818aac0..74273b49 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,25 +21,36 @@ 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 = {
+      systemd.user.services.foot = {
+        # Don't restart the foot server (otherwise all my open foot terminals would exit
+        # too)
+        Unit.X-SwitchMethod = "keep-old";
+
+        # TODO: This should probably be added <2026-07-02>
+        # OOMScoreAdjust=-100;
+      };
+
       programs.foot = {
         enable = true;
         server.enable = true;
         settings = {
           main = {
+            include = "${./theme.ini}";
             font = "SauceCodePro Nerd Font Mono:size=12";
-            horizontal-letter-offset = -1;
-            vertical-letter-offset = -1;
+            letter-spacing = "-0.25";
           };
-          # environment = {
-          #   COLORTERM = "truecolor";
-          # };
           "regex:hashes" = {
             regex = "([a-fA-F0-9]{7,128})";
             launch = "git show \${match}";
           };
           "regex:paths" = {
-            regex = "([^ '\"`=:\\\\[\\\\(]*/)([^/: '\"`\\\\)\\\\]]*)";
+            regex = "([^ '\"`=:\\\\[\\\\(]*/[^/: '\"`\\\\)\\\\]*)";
             launch = "ll \${match}";
           };
 
@@ -54,29 +66,6 @@ in {
           };
         };
       };
-
-      systemd.user.services = let
-        footCfg = config.home-manager.users.soispha.programs.foot;
-        inherit (footCfg.server) systemdTarget;
-      in {
-        foot-initial-term = {
-          Unit = {
-            Description = "Fast, lightweight and minimalistic Wayland terminal emulator.";
-            Documentation = "man:foot(1)";
-            PartOf = [systemdTarget];
-            After = [systemdTarget];
-            ConditionEnvironment = "WAYLAND_DISPLAY";
-          };
-
-          Service = {
-            ExecStart = "${lib.getExe' footCfg.package "footclient"}";
-          };
-
-          Install = {
-            WantedBy = [systemdTarget];
-          };
-        };
-      };
     };
   };
 }
diff --git a/modules/by-name/fo/foot/theme.ini b/modules/by-name/fo/foot/theme.ini
new file mode 100644
index 00000000..f5f36039
--- /dev/null
+++ b/modules/by-name/fo/foot/theme.ini
@@ -0,0 +1,40 @@
+# From https://github.com/mbadolato/iTerm2-Color-Schemes/blob/75bc70670c28b5dc97625af38deb3ae49f4363e6/foot/Carbonfox.ini
+# 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
+
+[colors-dark]
+cursor=161616 f2f4f8
+foreground=f2f4f8
+background=161616
+regular0=282828
+regular1=ee5396
+regular2=25be6a
+regular3=08bdba
+regular4=78a9ff
+regular5=be95ff
+regular6=33b1ff
+regular7=dfdfe0
+bright0=484848
+bright1=f16da6
+bright2=46c880
+bright3=2dc7c4
+bright4=8cb6ff
+bright5=c8a5ff
+bright6=52bdff
+bright7=e4e4e5
+selection-foreground=f2f4f8
+selection-background=2a2a2a
+
diff --git a/modules/by-name/gi/git/module.nix b/modules/by-name/gi/git/module.nix
index 64a64904..28e61ecb 100644
--- a/modules/by-name/gi/git/module.nix
+++ b/modules/by-name/gi/git/module.nix
@@ -9,6 +9,7 @@
 # If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>.
 {
   lib,
+  pkgs,
   config,
   ...
 }: let
@@ -43,6 +44,14 @@ in {
         };
       };
 
+      # Add my custom git-scripts
+      home.packages = [
+        pkgs.git-edit-index # Allows you to edit the indexed version of a file
+        pkgs.git-cm # A wrapper that re-adds the last commit's subject
+        pkgs.git-cgit # Allows fast cgit settings setup
+        pkgs.stamp # Add a license header to a file
+      ];
+
       programs.git = {
         enable = true;
 
diff --git a/modules/by-name/i3/i3bar-river/module.nix b/modules/by-name/i3/i3bar-river/module.nix
index 8a2203aa..982ec1e3 100644
--- a/modules/by-name/i3/i3bar-river/module.nix
+++ b/modules/by-name/i3/i3bar-river/module.nix
@@ -110,7 +110,26 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
-    soispha.programs.river.init.backgroundStart = [cfg.package];
+    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 = {
diff --git a/modules/by-name/lu/lutris/module.nix b/modules/by-name/lu/lutris/module.nix
new file mode 100644
index 00000000..f0b92a0b
--- /dev/null
+++ b/modules/by-name/lu/lutris/module.nix
@@ -0,0 +1,39 @@
+# 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>.
+{
+  lib,
+  config,
+  libraries,
+  pkgs,
+  ...
+}: let
+  cfg = config.soispha.programs.lutris;
+in {
+  options.soispha.programs.lutris = {
+    enable = libraries.base.options.mkEnable "Lutris";
+  };
+
+  config = lib.mkIf cfg.enable {
+    soispha.impermanence.userDirectories = [
+      ".config/lutris"
+    ];
+
+    home-manager.users.soispha = {
+      programs.lutris = {
+        enable = true;
+        steamPackage = lib.mkIf config.programs.steam.enable config.programs.steam.package;
+        defaultWinePackage = pkgs.proton-ge-bin;
+        protonPackages = [pkgs.proton-ge-bin];
+
+        # winePackages = [pkgs.wineWow64Packages.full];
+      };
+    };
+  };
+}
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/ni/nix/module.nix b/modules/by-name/ni/nix/module.nix
index 65b6ed5c..7caa8a8e 100644
--- a/modules/by-name/ni/nix/module.nix
+++ b/modules/by-name/ni/nix/module.nix
@@ -59,6 +59,9 @@ in {
       };
 
       settings = {
+        # Don't warn about dirty git trees (It is usually absolutely useless)
+        warn-dirty = false;
+
         auto-optimise-store = true;
         experimental-features = [
           "nix-command"
diff --git a/modules/by-name/ri/river/keymap.nix b/modules/by-name/ri/river/keymap.nix
index eacfd75b..897d11df 100644
--- a/modules/by-name/ri/river/keymap.nix
+++ b/modules/by-name/ri/river/keymap.nix
@@ -44,7 +44,7 @@ in {
       "<LEFT_SUPER>" = {
         # Spawn standard programs
         "r" = {
-          "a" = mkSpawn pkgs.alacritty "" {};
+          "a" = mkSpawn' pkgs.foot "footclient" "" {};
           "b" = mkSpawn pkgs.tskm "open select" {once = true;};
           "k" = mkSpawn pkgs.keepassxc "" {once = true;};
           # "s" = mkSpawn pkgs.signal-desktop "" {once = true;};
@@ -69,7 +69,7 @@ in {
         "x" = {
           "q" = ["exit"];
           "l" = mkSpawn pkgs.lock "" {once = true;};
-          "h" = mkSpawn' pkgs.procps "pkill" "--signal USR1 i3bar-river" {once = true;};
+          "h" = mkSpawn pkgs.systemd-toggle "--user i3bar-river.service" {once = true;};
         };
 
         # Media control
diff --git a/modules/by-name/ri/river/module.nix b/modules/by-name/ri/river/module.nix
index bafaf0a3..7eb30014 100644
--- a/modules/by-name/ri/river/module.nix
+++ b/modules/by-name/ri/river/module.nix
@@ -35,7 +35,9 @@
       else builtins.map esa input
     );
   in "err_fail ${program} &";
-  longRunningPrograms = builtins.concatStringsSep "\n" (builtins.map mkLrProgram cfg.init.backgroundStart);
+  longRunningPrograms =
+    builtins.concatStringsSep "\n" (builtins.map mkLrProgram
+      cfg.init.autoStart);
 
   keymapFormat = pkgs.formats.json {};
   keymapGenerate = name: value:
@@ -163,12 +165,14 @@ in {
         '';
       };
 
-      backgroundStart = lib.mkOption {
-        type = lib.types.listOf (lib.types.either lib.types.package (lib.types.listOf lib.types.str));
-        description = "List of programs to start in the background";
+      autoStart = lib.mkOption {
+        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 = ''
           [
-            pkgs.gammastep
+            ''${lib.getExe pkgs.foot}
           ]
         '';
       };
@@ -235,14 +239,49 @@ in {
             # ${text}
             ${other_stuff}
           '';
+
+          sessionVars =
+            (builtins.attrNames config.environment.sessionVariables)
+            ++ (builtins.attrNames config.home-manager.users.soispha.home.sessionVariables)
+            ++ [
+              "WAYLAND_DISPLAY"
+              "DISPLAY"
+              "XDG_RUNTIME_DIR"
+            ];
+
+          part = acc: vars: let
+            firstTen = lib.lists.take 5 vars;
+          in
+            if firstTen == []
+            then acc
+            else part (acc ++ [firstTen]) (lib.lists.removePrefix firstTen vars);
+
+          partedSessionVars = part [] sessionVars;
+
+          mkEnvSet = prefix: vars: let
+            stringVars = builtins.concatStringsSep " " vars;
+          in ''err_fail ${riverctl} spawn "${prefix} ${stringVars}"'';
+
+          dbusEnvs =
+            builtins.map
+            (mkEnvSet "${lib.getExe' pkgs.dbus "dbus-update-activation-environment"} --verbose --systemd")
+            partedSessionVars;
+          systemdUserEnvs =
+            builtins.map
+            (mkEnvSet "systemctl --user --verbose import-environment")
+            partedSessionVars;
         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;
           ''
+          + mkHeading "Informing dbus about changed env-vars" (builtins.concatStringsSep "\n" dbusEnvs)
+          + mkHeading "Informing systemd user about changed env-vars" (builtins.concatStringsSep "\n" systemdUserEnvs)
+          + mkHeading "Starting graphical-session-target" ''
+            err_fail systemctl --user start nixos-fake-graphical-session.target
+          ''
           + mkHeading "Key Mappings" keymappings
           + mkHeading "Rules" ruleSetup
           + mkHeading "General Settings" generalSettings
diff --git a/modules/by-name/ss/ssh/module.nix b/modules/by-name/ss/ssh/module.nix
index 87c50728..39c203fd 100644
--- a/modules/by-name/ss/ssh/module.nix
+++ b/modules/by-name/ss/ssh/module.nix
@@ -55,6 +55,13 @@ in {
               text = cfg.rootKnownHosts;
             })
           );
+          "Host *.your-storagebox.de" = {
+            # Don't try to authenticate via password for these, because we need to use the
+            # forced commands, and they are only provided via the ssh key login.
+            # So password login is a footgun (it is, however, valid to use it for non-root
+            # use-cases)
+            PasswordAuthentication = false;
+          };
         };
       };
 
@@ -64,6 +71,11 @@ in {
 
         settings = {
           "Host *" = mkDefaultMatchBlock "${config.home-manager.users.soispha.xdg.dataHome}/ssh/known_hosts";
+          "Host *.your-storagebox.de" = {
+            # Port 22 is for sftp, and when we connect as user, we probably want an
+            # interactive shell.
+            Port = 23;
+          };
         };
       };
     };
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..9bda534f
--- /dev/null
+++ b/modules/by-name/sw/swayidle/module.nix
@@ -0,0 +1,45 @@
+# 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,
+  pkgs,
+  lib,
+  libraries,
+  ...
+}: let
+  cfg = config.soispha.programs.swayidle;
+  swaylock = lib.getExe pkgs.swaylock;
+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";
+          }
+        ];
+      };
+    };
+  };
+}
diff --git a/modules/by-name/yt/yt/module.nix b/modules/by-name/yt/yt/module.nix
index 81bacf44..f001c030 100644
--- a/modules/by-name/yt/yt/module.nix
+++ b/modules/by-name/yt/yt/module.nix
@@ -113,6 +113,10 @@ in {
 
   config = {
     home-manager.users.soispha = lib.mkIf cfg.enable {
+      home.packages = [
+        pkgs.yt
+      ];
+
       xdg.configFile = {
         "yt/mpv.conf".text = renderOptions mpvConf;
         "yt/mpv.input.conf".text = renderBindings mpvInputConfig;