Modules/Niri: Update DMS default config

README.md

@@ -1,6 +1,6 @@
 # NixOS Configuration
 
-Modular NixOS configuration, using Hyprland for a lightweight desktop.
+Modular NixOS configuration, using Hyprland (yikes) or Niri for a tiling/scrolling desktop.
 
 ![](FastFetch.png)
 
@@ -10,7 +10,10 @@ Modular NixOS configuration, using Hyprland for a lightweight desktop.
   <img src="/Btop.png" width="33%" />
 </p>
 
+![](Niri.png)
+
 To install, run `nixos-rebuild` with the `--flake` parameter from the `NixFlake` directory: `nixos-rebuild switch --flake .#nixinator`.
+Alternatively, use `nh os switch` or `nh os boot`.
 
 ## NixFlake/system
 
@@ -19,6 +22,7 @@ Contains all the system configurations.
 - There is a common configuration used for all systems: `NixFlake/system/default.nix`
 - Every system has its own special configuration: `NixFlake/system/<hostname>/default.nix`
 - System modules are located in `NixFlake/system/modules`
+- Hosted services are located in `NixFlake/system/services`
 
 When creating a NixOS configuration inside the `NixFlake/flake.nix` the common configuration is imported.
 Because the hostname is propagated to the common configuration, it can import the host-specific config by itself.
@@ -41,6 +45,6 @@ Each derivation is loaded into `NixFlake/derivations/default.nix`.
 
 ## NixFlake/overlays
 
-Contains (not at the moment) all overlays.
+Contains all overlays, e.g. package version overrides.
-The `NixFlake/overlays/default.nix` imports all of the overlays and all of the derivations.
+The `NixFlake/overlays/default.nix` imports all overlays and all derivations.
-It is then imported by the toplevel `NixFlake/flake.nix`, to make everything available to the system/home configurations.
+It is then imported by the top-level `NixFlake/flake.nix`, to make everything available to the system/home configurations.

config/navi/christoph.cheat

@@ -200,6 +200,16 @@ $ file: eza -1
 sudo chattr -R -i <file>
 $ file: eza -1
 
+% dos2unix
+# Convert line endings to unix format
+dos2unix <file>
+$ file: eza -1
+
+% unix2dos
+Convert line endings to dos format
+unix2dos <file>
+$ file: eza -1
+
 ; ===========================
 ; SECRETS
 ; ===========================

derivations/tidal-dl-ng/default.nix

@@ -6,82 +6,95 @@
   pkgs,
 }: let
   #
-  # Dependencies
+  # Custom Dependencies
   #
-  requests_2_32_4 = pkgs.python3Packages.requests.overridePythonAttrs (old: {
+  pythonPkgs = pkgs.python313Packages.overrideScope (self: super: {
-    version = "2.32.4";
+    typer = super.typer.overridePythonAttrs (old: {
-    src = pkgs.python3Packages.fetchPypi {
+      version = "0.20.0";
+      src = super.fetchPypi {
         inherit (old) pname;
-      version = "2.32.4";
+        version = "0.20.0";
-      sha256 = "sha256-J9AxZoLIopg00yZIIAJLYqNpQgg9Usry8UwFkTNtNCI=";
+        sha256 = "sha256-Gq9klAMXk+SHb7C6z6apErVRz0PB5jyADfixqGZyDDc=";
-    };
-    patches =
-      builtins.filter (
-        p: !pkgs.lib.strings.hasInfix "CVE-2024-47081" (toString p)
-      )
-      old.patches;
-  });
-
-  pycryptodome_3_23_0 = pkgs.python3Packages.pycryptodome.overridePythonAttrs (old: {
-    version = "3.23.0";
-    src = pkgs.python3Packages.fetchPypi {
-      inherit (old) pname;
-      version = "3.23.0";
-      sha256 = "sha256-RHcAplcYLWAzi6sJ/bJ1GPiFauzYCuTGvd22f/XaRO8=";
       };
     });
 
-  pathvalidate_3_3_1 = pkgs.python3Packages.pathvalidate.overridePythonAttrs (old: {
+    rich = super.rich.overridePythonAttrs (old: {
-    version = "3.3.1";
+      version = "14.2.0";
-    src = pkgs.python3Packages.fetchPypi {
+      src = super.fetchPypi {
         inherit (old) pname;
-      version = "3.3.1";
+        version = "14.2.0";
-      sha256 = "sha256-sYwHISv+rWJDRbuOHWFBzc8Vo5c2mU6guUA1rSsboXc=";
+        sha256 = "sha256-c/9Qx8DBx3yCQweSg/Tts3bw9kQkM67LjOfm0LktH+Q=";
       };
+      doCheck = false;
+    });
   });
 
-  typer_0_16_0 = pkgs.python3Packages.typer.overridePythonAttrs (old: {
+  # typer_0_20_0 = pkgs.python313Packages.typer.overridePythonAttrs (old: {
-    version = "0.16.0";
+  #   version = "0.20.0";
-    src = pkgs.python3Packages.fetchPypi {
+  #   src = pkgs.python313Packages.fetchPypi {
-      inherit (old) pname;
+  #     inherit (old) pname;
-      version = "0.16.0";
+  #     version = "0.20.0";
-      sha256 = "sha256-rzd/+u4dvjeulEDLTo8RaG6lzk6brgG4SufGO4fx3Ts=";
+  #     sha256 = "sha256-Gq9klAMXk+SHb7C6z6apErVRz0PB5jyADfixqGZyDDc=";
-    };
+  #   };
-  });
+  # });
+  #
+  # rich_14_2_0 = pkgs.python313Packages.rich.overridePythonAttrs (old: {
+  #   version = "14.2.0";
+  #   src = pkgs.python313Packages.fetchPypi {
+  #     inherit (old) pname;
+  #     version = "14.2.0";
+  #     sha256 = "sha256-c/9Qx8DBx3yCQweSg/Tts3bw9kQkM67LjOfm0LktH+Q=";
+  #   };
+  #   doCheck = false;
+  # });
 
-  tidalDlNg = pkgs.python3Packages.buildPythonApplication rec {
+  # rich_14_2_0 = pkgs.python313Packages.rich.overridePythonAttrs (old: {
+  #   version = "14.2.0";
+  #   src = pkgs.fetchFromGitHub {
+  #     owner = "Textualize";
+  #     repo = "rich";
+  #     tag = "v14.2.0";
+  #     hash = "sha256-oQbxRbZnVr/Ln+i/hpBw5FlpUp3gcp/7xsxi6onPkn8=";
+  #   };
+  # });
+
+  tidalDlNg = pythonPkgs.buildPythonApplication rec {
     pname = "tidal-dl-ng";
-    version = "0.26.2";
+    version = "0.31.3";
     format = "pyproject";
 
     src = pkgs.fetchFromGitHub {
       owner = "exislow";
       repo = "tidal-dl-ng";
       rev = "v${version}";
-      sha256 = "sha256-9C7IpLKeR08/nMbePltwGrzIgXfdaVfyOeFQnfCwMKg=";
+      sha256 = "sha256-PUT0anx1yivgXwW21jah7Rv1/BabOT+KPoW446NFNyg=";
     };
 
     doCheck = false;
     catchConflicts = false;
 
-    nativeBuildInputs = with pkgs.python3Packages; [poetry-core setuptools];
+    nativeBuildInputs = with pythonPkgs; [poetry-core setuptools];
 
-    propagatedBuildInputs = with pkgs.python3Packages; [
+    # https://github.com/exislow/tidal-dl-ng/blob/master/pyproject.toml
-      requests_2_32_4
+    propagatedBuildInputs = with pythonPkgs; [
-      coloredlogs
+      # Nixpkgs
-      dataclasses-json
+      requests
-      m3u8
-      mpegdash
       mutagen
-      pathvalidate_3_3_1
+      dataclasses-json
-      pycryptodome_3_23_0
+      pathvalidate
-      python-ffmpeg
+      m3u8
-      rich
+      coloredlogs
-      tidalapi
-      toml
-      typer_0_16_0
       pyside6
       pyqtdarktheme
+      toml
+      pycryptodome
+      tidalapi
+      python-ffmpeg
+      ansi2html
+
+      # Custom Deps
+      typer
+      rich
     ];
 
     # pythonOutputDistPhase = ''
@@ -118,7 +131,7 @@
 
   tidal-dl-ng-gui-desktopfile = pkgs.stdenv.mkDerivation {
     pname = "tdng";
-    version = "0.26.2";
+    version = "0.31.3";
     dontUnpack = true;
 
     nativeBuildInputs = [pkgs.makeWrapper];

flake.nix

@@ -32,7 +32,7 @@
     sops-nix.inputs.nixpkgs.follows = "nixpkgs";
 
     # Secure boot
-    lanzaboote.url = "github:nix-community/lanzaboote/v0.4.2";
+    lanzaboote.url = "github:nix-community/lanzaboote/v0.4.3";
     lanzaboote.inputs.nixpkgs.follows = "nixpkgs";
 
     # Nix User Repository (e.g. Firefox addons)
@@ -49,6 +49,38 @@
     # https://github.com/thiagokokada/nix-alien#user-content-nixos-installation-with-flakes
     # nix-alien.inputs.nixpkgs.follows = "nixpkgs";
 
+    # Niri
+    niri.url = "github:sodiboo/niri-flake";
+    niri.inputs.nixpkgs.follows = "nixpkgs";
+
+    # Quickshell
+    quickshell.url = "github:quickshell-mirror/quickshell";
+    quickshell.inputs.nixpkgs.follows = "nixpkgs";
+
+    # Noctalia shell
+    noctalia.url = "github:noctalia-dev/noctalia-shell";
+    noctalia.inputs.nixpkgs.follows = "nixpkgs";
+    # noctalia.inputs.quickshell.follows = "quickshell";
+
+    # Lol
+    waifu-cursors.url = "github:kagurazakei/waifu-cursors";
+
+    # Caelestia shell
+    caelestia.url = "github:caelestia-dots/shell";
+    caelestia.inputs.nixpkgs.follows = "nixpkgs";
+    caelestia.inputs.quickshell.follows = "quickshell";
+    # caelestia-cli.url = "github:caelestia-dots/cli";
+    # caelestia-cli.inputs.nixpkgs.follows = "nixpkgs";
+
+    # DankMaterialShell
+    dgop.url = "github:AvengeMedia/dgop";
+    dgop.inputs.nixpkgs.follows = "nixpkgs";
+    # dms-cli.url = "github:AvengeMedia/danklinux";
+    # dms-cli.inputs.nixpkgs.follows = "nixpkgs";
+    dankMaterialShell.url = "github:AvengeMedia/DankMaterialShell";
+    dankMaterialShell.inputs.nixpkgs.follows = "nixpkgs";
+    dankMaterialShell.inputs.dgop.follows = "dgop";
+
     # Hyprland (use flake so plugins are not built from source)
     hyprland.url = "github:hyprwm/Hyprland";
     hyprland.inputs.nixpkgs.follows = "nixpkgs";
@@ -130,6 +162,7 @@
       in [
         inputs.devshell.overlays.default
         inputs.nur.overlays.default
+        inputs.niri.overlays.niri
         # inputs.emacs-overlay.overlay
 
         # All my own overlays (derivations + modifications)
@@ -167,6 +200,10 @@
       inputs.sops-nix.nixosModules.sops
       inputs.impermanence.nixosModules.impermanence
       inputs.lanzaboote.nixosModules.lanzaboote
+
+      # We need the niri module also on the headless hosts
+      # so nix can parse the config (although it is disabled...)
+      inputs.niri.nixosModules.niri # This also imports the HM module
     ];
   in {
     # Local shell for NixFlake directory
@@ -202,9 +239,7 @@
         hostname = "nixtop";
         username = "christoph";
         headless = false;
-        extraModules =
+        extraModules = [] ++ commonModules;
-          []
-          ++ commonModules;
       };
       servenix = mylib.nixos.mkNixosConfigWithHomeManagerModule {
         inherit system mylib publicKeys;

home/christoph/default.nix

@@ -14,11 +14,13 @@
   pkgs,
   headless,
   ...
-}:
+}: let
-# This is a HM module.
+  inherit (config.modules) color;
-# Because no imports/options/config is defined explicitly, everything is treated as config:
+in
-# { inputs, lib, ... }: { ... } gets turned into { inputs, lib, ... }: { config = { ... }; } implicitly.
+  # This is a HM module.
-{
+  # Because no imports/options/config is defined explicitly, everything is treated as config:
+  # { inputs, lib, ... }: { ... } gets turned into { inputs, lib, ... }: { config = { ... }; } implicitly.
+  {
     # Every module is a nix expression, specifically a function { inputs, lib, ... }: { ... }.
     # Every module (/function) is called with the same arguments as this module.
     # Arguments with matching names are "plugged in" into the right slots,
@@ -51,14 +53,28 @@
       };
 
       color = {
-      scheme = "catppuccin-mocha";
+        installPackages = !headless;
-      font = builtins.head nixosConfig.fonts.fontconfig.defaultFonts.monospace;
+        extraPackages = with pkgs; [
-      wallpaper = "Windows";
+          papirus-icon-theme
+          bibata-cursors
+          inputs.waifu-cursors.packages.${pkgs.stdenv.hostPlatform.system}.all
+        ];
 
+        cursor = "Bibata-Modern-Classic";
+        cursorSize = 24;
+        cursorPackage = pkgs.bibata-cursors;
+
+        iconTheme = "Papirus";
+        iconPackage = pkgs.papirus-icon-theme;
+
+        scheme = "catppuccin-mocha";
         accent = "mauve";
         accentHl = "pink";
         accentDim = "lavender";
         accentText = "base";
+
+        wallpaper = "Windows";
+        font = builtins.head nixosConfig.fonts.fontconfig.defaultFonts.monospace;
       };
 
       docs.enable = !headless;
@@ -81,8 +97,190 @@
         signCommits = true;
       };
 
-    hyprland = import ./hyprland.nix {inherit pkgs config headless;};
+      hyprland = {
-    hyprpanel.enable = !headless;
+        enable = false;
+        dunst.enable = !config.modules.hyprpanel.enable; # Disable for hyprpanel
+        bars.enable = false;
+        dynamicCursor.enable = false;
+        trails.enable = true;
+        hyprspace.enable = false; # Always broken
+        hyprpanel.enable = true;
+        caelestia.enable = false;
+
+        keybindings = {
+          main-mod = "SUPER";
+
+          bindings = lib.mergeAttrsList [
+            # Use Rofi if we don't have caelestia
+            (lib.optionalAttrs (!config.modules.hyprland.caelestia.enable) {
+              "$mainMod, a" = ["exec, rofi -drun-show-actions -show drun"];
+              "$mainMod, c" = ["exec, clipman pick --tool=rofi"];
+              "$mainMod SHIFT, l" = ["exec, loginctl lock-session"];
+            })
+
+            # Caelestia
+            (lib.optionalAttrs (config.modules.hyprland.caelestia.enable) {
+              "$mainMod, a" = ["exec, caelestia shell drawers toggle launcher"];
+              # "$mainMod, c" = ["exec, caelestia clipboard"];
+              "$mainMod SHIFT, l" = ["exec, caelestia shell lock lock"];
+
+              "$mainMod, escape" = ["exec, caelestia shell drawers toggle session"];
+            })
+
+            {
+              # Applications
+              "$mainMod, t" = ["exec, kitty"];
+              "$mainMod, e" = ["exec, kitty --title=Yazi yazi"];
+              "$mainMod, n" = ["exec, neovide"];
+              # "$mainMod, r" = ["exec, kitty --title=Rmpc rmpc"];
+              "$mainMod CTRL, n" = ["exec, kitty --title=Navi navi"];
+              "$mainMod SHIFT, n" = ["exec, neovide ${config.paths.dotfiles}/navi/christoph.cheat"];
+              "$mainMod SHIFT, f" = ["exec, neovide ${config.paths.dotfiles}/flake.nix"];
+              # "ALT, tab" = ["exec, rofi -show window"];
+
+              # Screenshots
+              "$mainMod, p" = ["exec, hyprpicker --autocopy --format=hex"];
+              "$mainMod, s" = ["exec, grim -g \"$(slurp)\""];
+              "$mainMod SHIFT, s" = ["exec, grim -g \"$(slurp)\" - | wl-copy"];
+
+              # Audio
+              ", XF86AudioRaiseVolume" = ["exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%+"];
+              ", XF86AudioLowerVolume" = ["exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%-"];
+              ", XF86AudioPlay" = ["exec, playerctl play-pause"];
+              ", XF86AudioPrev" = ["exec, playerctl previous"];
+              ", XF86AudioNext" = ["exec, playerctl next"];
+
+              # Brightness
+              ", XF86MonBrightnessDown" = ["exec, hyprctl hyprsunset gamma -10"];
+              ", XF86MonBrightnessUp" = ["exec, hyprctl hyprsunset gamma +10"];
+              "$mainMod, XF86MonBrightnessDown" = ["exec, hyprctl hyprsunset temperature 5750"];
+              "$mainMod, XF86MonBrightnessUp" = ["exec, hyprctl hyprsunset identity"];
+
+              "CTRL ALT, f" = let
+                hyprctl = "${config.wayland.windowManager.hyprland.package}/bin/hyprctl";
+                grep = "${pkgs.gnugrep}/bin/grep";
+                awk = "${pkgs.gawk}/bin/gawk";
+                notify = "${pkgs.libnotify}/bin/notify-send";
+
+                toggleMouseFocus = pkgs.writeScriptBin "hypr-toggle-mouse-focus" ''
+                  CURRENT=$(${hyprctl} getoption input:follow_mouse | ${grep} int | ${awk} -F' ' '{print $2}')
+
+                  if [[ "$CURRENT" == "1" ]]; then
+                    ${hyprctl} keyword input:follow_mouse 0
+                    ${notify} "Disabled Mouse Focus!"
+                  else
+                    ${hyprctl} keyword input:follow_mouse 1
+                    ${notify} "Enabled Mouse Focus!"
+                  fi
+                '';
+              in ["exec, ${toggleMouseFocus}/bin/hypr-toggle-mouse-focus"];
+
+              # "CTRL ALT, t" = ["exec, bash -c 'systemctl --user restart hyprpanel.service'"];
+            }
+          ];
+
+          ws-bindings = {
+            # "<Workspace>" = "<Key>";
+            "1" = "1";
+            "2" = "2";
+            "3" = "3";
+            "4" = "4";
+            "5" = "5";
+            "6" = "6";
+            "7" = "7";
+            "8" = "8";
+            "9" = "9";
+            "10" = "0";
+          };
+
+          special-ws-bindings = {
+            "ferdium" = "x";
+            "msty" = "z";
+            "btop" = "b";
+            "rmpc" = "r";
+          };
+        };
+
+        autostart = {
+          immediate = [
+            "kitty --hold fastfetch"
+            "zeal"
+            "nextcloud --background"
+            "protonvpn-app"
+
+            # "kdeconnect-indicator" # started by services.kdeconnect.indicator
+          ];
+
+          delayed = [
+            "keepassxc" # The tray doesn't work when started too early
+          ];
+
+          special-silent = {
+            "ferdium" = ["ferdium"];
+            "msty" = ["msty"];
+            "btop" = ["kitty --title=Btop btop"];
+            "rmpc" = ["kitty --title=Rmpc rmpc"];
+          };
+        };
+
+        windowrules = [
+          # Fix jetbrains tooltip flicker
+          "match:class ^(jetbrains-.*)$, match:title ^(win[0-9]+)$, float 1"
+          "match:class ^(jetbrains-.*)$, match:title ^(win[0-9]+)$, no_initial_focus 1"
+        ];
+
+        workspacerules = {
+          "1" = [];
+          "2" = ["Zotero" "neovide" "code-url-handler"];
+          "3" = ["obsidian"];
+          "4" = ["firefox" "Google-chrome" "chromium-browser" "org.qutebrowser.qutebrowser"];
+          "5" = ["steam"];
+          "6" = ["steam_app_(.+)"];
+          "7" = ["signal"];
+          "8" = ["tidal-hifi"];
+          "9" = ["discord"];
+          "10" = ["python3"];
+        };
+
+        floating = [
+          {class = "org.kde.polkit-kde-authentication-agent-1";}
+          {
+            class = "thunar";
+            title = "File Operation Progress";
+          }
+          {class = "ffplay";}
+          {class = "Unity";}
+        ];
+
+        transparent-opacity = "0.75";
+
+        transparent = [
+          "kitty"
+          "Alacritty"
+          "discord"
+          "signal"
+          "vesktop"
+          "Spotify"
+          "tidal-hifi"
+          "obsidian"
+          "firefox"
+          "org.qutebrowser.qutebrowser"
+          "jetbrains-clion"
+          "jetbrains-idea"
+          "jetbrains-pycharm"
+          "jetbrains-rustrover"
+          "jetbrains-rider"
+          "jetbrains-webstorm"
+          "code-url-handler"
+          "neovide"
+          "steam"
+          "ferdium"
+          "Msty"
+        ];
+      };
+
+      # hyprpanel.enable = !headless; # Enabled by hyprland module
+
       kitty.enable = !headless;
       lazygit.enable = true;
       mpd.enable = !headless;
@@ -93,6 +291,7 @@
         neovide = !headless;
       };
 
+      niri.enable = !headless;
       nnn.enable = false; # Use yazi
       qutebrowser.enable = !headless;
       rmpc.enable = !headless;
@@ -291,7 +490,7 @@
 
             # Hardware/Software info
             pciutils # lspci
-          glxinfo # OpenGL info
+            mesa-demos # OpenGL info
             wayland-utils # wayland-info
             clinfo # OpenCL info
             vulkan-tools # vulkaninfo
@@ -312,7 +511,7 @@
             spotdl
 
             # Document utils
-          poppler_utils # pdfunite
+            poppler-utils # pdfunite
             graphviz # generate graphs from code
             d2 # generate diagrams from code
             plantuml # generate diagrams
@@ -334,16 +533,14 @@
             cifs-utils # Mount samba shares
             nfs-utils # Mount NFS shares
             sshfs # Mount remote directories via SSH
-          protonvpn-cli_2
-          protonmail-bridge # TODO: Enable on startup, email module
 
             # Run unpatched binaries on NixOS
             # Sets NIX_LD_LIBRARY_PATH and NIX_LD variables for nix-ld.
             # Usage: "nix-alien-ld -- <Executable>".
-          inputs.nix-alien.packages.${system}.nix-alien
+            inputs.nix-alien.packages.${pkgs.stdenv.hostPlatform.system}.nix-alien
 
             # Search nixpkgs
-          inputs.nps.packages.${system}.default
+            inputs.nps.packages.${pkgs.stdenv.hostPlatform.system}.default
 
             # Use NixCommunity binary cache
             cachix
@@ -357,6 +554,7 @@
             protonmail-bridge-gui
 
             # GUI stuff
+            nautilus # Just in case
             signal-desktop
             anki
             font-manager # Previews fonts, but doesn't set them
@@ -365,7 +563,7 @@
             thunderbird # TODO: Email module
             obsidian
             zotero
-          zeal-qt6 # docs browser
+            zeal # docs browser
             helvum
             vlc
             audacity
@@ -374,9 +572,11 @@
             tidal-hifi
             tidal-dl-ng
             picard
+            handbrake
+            teamspeak6-client
 
             # Office
-          wacomtablet # For xournalpp/krita
+            kdePackages.wacomtablet # For xournalpp/krita
             xournalpp # Write with a pen, like old people
             hunspell # I cna't type
             hunspellDicts.en_US
@@ -431,9 +631,7 @@
             waves = false; # default false
           };
 
-        color = let
+          color = {
-          color = config.modules.color;
-        in {
             # https://github.com/catppuccin/cava/blob/main/themes/latte-transparent.cava
             gradient = 1;
 
@@ -459,6 +657,7 @@
         enableFishIntegration = config.modules.fish.enable;
       };
 
+      # TODO: Module
       fastfetch = {
         enable = true;
 
@@ -615,6 +814,19 @@
         enableFishIntegration = config.modules.fish.enable;
       };
 
+      imv = {
+        enable = !headless;
+        settings = {
+          options = {
+            background = "${color.hex.base}";
+            overlay = true;
+            overlay_font = "${color.font}:12";
+            overlay_background_color = "${color.hex.accent}";
+            overlay_text_color = "${color.hex.accentText}";
+          };
+        };
+      };
+
       keychain = {
         enable = true;
         enableFishIntegration = config.modules.fish.enable;
@@ -623,7 +835,7 @@
       };
 
       mpv = {
-      enable = false;
+        enable = !headless;
         config = {
           gpu-context = "wayland";
         };
@@ -642,7 +854,7 @@
       nushell.enable = false;
 
       # spicetify = let
-    #   spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system};
+      #   spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.stdenv.hostPlatform.system};
       # in {
       #   enable = true;
       #
@@ -666,9 +878,21 @@
 
       ssh = {
         enable = true;
-      compression = true;
+        enableDefaultConfig = false;
 
         matchBlocks = {
+          "*" = {
+            forwardAgent = false;
+            addKeysToAgent = "no";
+            compression = true;
+            serverAliveInterval = 0;
+            serverAliveCountMax = 3;
+            hashKnownHosts = false;
+            userKnownHostsFile = "~/.ssh/known_hosts";
+            controlMaster = "no";
+            controlPath = "~/.ssh/master-%r@%n:%p";
+            controlPersist = "no";
+          };
           "nixinator" = {
             user = "christoph";
             hostname = "192.168.86.50";
@@ -796,24 +1020,25 @@
 
     systemd = {
       user = {
-      tmpfiles.rules = lib.mkMerge [
+        # TODO: This has been deprecated and replaced with a bad alternative in a stupid HM update
-        []
+        # tmpfiles.rules = lib.mkMerge [
-        (lib.mkIf (mylib.modules.contains
+        #   []
-          config.services.flatpak.packages
+        #   (lib.mkIf (mylib.modules.contains
-          "com.discordapp.Discord") [
+        #     config.services.flatpak.packages
-          # Fix Discord rich presence for Flatpak
+        #     "com.discordapp.Discord") [
-          "L %t/discord-ipc-0 - - - - app/com.discordapp.Discord/discord-ipc-0"
+        #     # Fix Discord rich presence for Flatpak
-        ])
+        #     "L %t/discord-ipc-0 - - - - app/com.discordapp.Discord/discord-ipc-0"
-        (lib.mkIf (mylib.modules.contains
+        #   ])
-          config.services.flatpak.packages
+        #   (lib.mkIf (mylib.modules.contains
-          "com.discordapp.DiscordCanary") [
+        #     config.services.flatpak.packages
-          # Fix Discord rich presence for Flatpak
+        #     "com.discordapp.DiscordCanary") [
-          "L %t/discord-ipc-0 - - - - app/com.discordapp.DiscordCanary/discord-ipc-0"
+        #     # Fix Discord rich presence for Flatpak
-        ])
+        #     "L %t/discord-ipc-0 - - - - app/com.discordapp.DiscordCanary/discord-ipc-0"
-      ];
+        #   ])
+        # ];
 
         # Nicely reload system units when changing configs
         startServices = "sd-switch";
       };
     };
-}
+  }

home/christoph/hyprland.nix

@@ -1,161 +0,0 @@
-{
-  pkgs,
-  config,
-  headless,
-}: {
-  enable = !headless;
-  dunst.enable = !config.modules.hyprpanel.enable; # Disable for hyprpanel
-  bars.enable = false;
-  dynamicCursor.enable = false;
-  trails.enable = true;
-  hyprspace.enable = true;
-
-  keybindings = {
-    main-mod = "SUPER";
-
-    bindings = {
-      "$mainMod, t" = ["exec, kitty"];
-      "$mainMod, e" = ["exec, kitty --title=Yazi yazi"];
-      "$mainMod, n" = ["exec, neovide"];
-      # "$mainMod, r" = ["exec, kitty --title=Rmpc rmpc"];
-      "$mainMod CTRL, n" = ["exec, kitty --title=Navi navi"];
-      "$mainMod SHIFT, n" = ["exec, neovide ${config.paths.dotfiles}/navi/christoph.cheat"];
-      "$mainMod SHIFT, f" = ["exec, neovide ${config.paths.dotfiles}/flake.nix"];
-
-      "$mainMod, p" = ["exec, hyprpicker --autocopy --format=hex"];
-      "$mainMod, s" = ["exec, grim -g \"$(slurp)\""];
-      "$mainMod CTRL, s" = ["exec, grim -g \"$(slurp)\" - | wl-copy"];
-      "$mainMod SHIFT, s" = ["exec, grim -g \"$(slurp)\" - | wl-copy"];
-
-      ", XF86AudioRaiseVolume" = ["exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%+"];
-      ", XF86AudioLowerVolume" = ["exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%-"];
-      ", XF86AudioPlay" = ["exec, playerctl play-pause"];
-      ", XF86AudioPrev" = ["exec, playerctl previous"];
-      ", XF86AudioNext" = ["exec, playerctl next"];
-
-      ", XF86MonBrightnessDown" = ["exec, hyprctl hyprsunset gamma -10"];
-      ", XF86MonBrightnessUp" = ["exec, hyprctl hyprsunset gamma +10"];
-      "$mainMod, XF86MonBrightnessDown" = ["exec, hyprctl hyprsunset temperature 5750"];
-      "$mainMod, XF86MonBrightnessUp" = ["exec, hyprctl hyprsunset identity"];
-
-      "CTRL ALT, f" = let
-        hyprctl = "${config.wayland.windowManager.hyprland.package}/bin/hyprctl";
-        grep = "${pkgs.gnugrep}/bin/grep";
-        awk = "${pkgs.gawk}/bin/gawk";
-        notify = "${pkgs.libnotify}/bin/notify-send";
-
-        toggleMouseFocus = pkgs.writeScriptBin "hypr-toggle-mouse-focus" ''
-          CURRENT=$(${hyprctl} getoption input:follow_mouse | ${grep} int | ${awk} -F' ' '{print $2}')
-
-          if [[ "$CURRENT" == "1" ]]; then
-            ${hyprctl} keyword input:follow_mouse 0
-            ${notify} "Disabled Mouse Focus!"
-          else
-            ${hyprctl} keyword input:follow_mouse 1
-            ${notify} "Enabled Mouse Focus!"
-          fi
-        '';
-      in ["exec, ${toggleMouseFocus}/bin/hypr-toggle-mouse-focus"];
-
-      # "CTRL ALT, t" = ["exec, bash -c 'systemctl --user restart hyprpanel.service'"];
-    };
-
-    ws-bindings = {
-      # "<Workspace>" = "<Key>";
-      "1" = "1";
-      "2" = "2";
-      "3" = "3";
-      "4" = "4";
-      "5" = "5";
-      "6" = "6";
-      "7" = "7";
-      "8" = "8";
-      "9" = "9";
-      "10" = "0";
-    };
-
-    special-ws-bindings = {
-      "ferdium" = "x";
-      "msty" = "z";
-      "btop" = "b";
-      "rmpc" = "r";
-    };
-  };
-
-  autostart = {
-    immediate = [
-      "kitty --hold fastfetch"
-      "zeal"
-      "nextcloud --background"
-      "protonvpn-app"
-
-      # "kdeconnect-indicator" # started by services.kdeconnect.indicator
-    ];
-
-    delayed = [
-      "keepassxc" # The tray doesn't work when started too early
-    ];
-
-    special-silent = {
-      "ferdium" = ["ferdium"];
-      "msty" = ["msty"];
-      "btop" = ["kitty --title=Btop btop"];
-      "rmpc" = ["kitty --title=Rmpc rmpc"];
-    };
-  };
-
-  windowrules = [
-    # Fix jetbrains tooltip flicker
-    "float,class:^(jetbrains-.*)$,title:^(win[0-9]+)$"
-    "nofocus,class:^(jetbrains-.*)$,title:^(win[0-9]+)$"
-  ];
-
-  workspacerules = {
-    "1" = [];
-    "2" = ["Zotero" "neovide" "code-url-handler"];
-    "3" = ["obsidian"];
-    "4" = ["firefox" "Google-chrome" "chromium-browser" "org.qutebrowser.qutebrowser"];
-    "5" = ["steam"];
-    "6" = ["steam_app_(.+)"];
-    "7" = ["signal"];
-    "8" = ["tidal-hifi"];
-    "9" = ["discord"];
-    "10" = ["python3"];
-  };
-
-  floating = [
-    {class = "org.kde.polkit-kde-authentication-agent-1";}
-    {
-      class = "thunar";
-      title = "File Operation Progress";
-    }
-    {class = "ffplay";}
-    {class = "Unity";}
-  ];
-
-  transparent-opacity = "0.75";
-
-  transparent = [
-    "kitty"
-    "Alacritty"
-    "discord"
-    "signal"
-    "vesktop"
-    "Spotify"
-    "tidal-hifi"
-    "obsidian"
-    "firefox"
-    "org.qutebrowser.qutebrowser"
-    "jetbrains-clion"
-    "jetbrains-idea"
-    "jetbrains-pycharm"
-    "jetbrains-rustrover"
-    "jetbrains-rider"
-    "jetbrains-webstorm"
-    "code-url-handler"
-    "neovide"
-    "steam"
-    "ferdium"
-    "Msty"
-  ];
-}

home/christoph/nixinator/default.nix

@@ -28,16 +28,16 @@
         };
 
         monitors = {
-          "HDMI-A-1" = {
+          "DP-1" = {
-            width = 2560;
+            width = 3440;
             height = 1440;
-            rate = 144;
+            rate = 165;
             x = 1920;
             y = 0;
             scale = 1;
           };
 
-          "DP-1" = {
+          "DP-2" = {
             width = 1920;
             height = 1080;
             rate = 60;
@@ -48,8 +48,8 @@
         };
 
         workspaces = {
-          "HDMI-A-1" = [1 2 3 4 5 6 7 8 9];
+          "DP-1" = [1 2 3 4 5 6 7 8 9];
-          "DP-1" = [10];
+          "DP-2" = [10];
         };
 
         autostart = {
@@ -65,7 +65,7 @@
         ];
       };
 
-      waybar.monitor = "HDMI-A-1";
+      waybar.monitor = "DP-1";
     };
 
     home = let
@@ -140,6 +140,8 @@
         makemkv
         lrcget
         msty
+        # jellyfin-media-player # CVE, can't install
+        jellyfin-mpv-shim
 
         steam-devices-udev-rules
       ];
@@ -205,21 +207,28 @@
 
       flatpak = {
         packages = [
-          "com.valvesoftware.Steam"
+          # "com.valvesoftware.Steam"
-          "com.valvesoftware.Steam.Utility.steamtinkerlaunch"
+          # "com.valvesoftware.Steam.Utility.steamtinkerlaunch"
-          "net.davidotek.pupgui2"
+          # "net.davidotek.pupgui2"
-
+          # "org.freedesktop.Platform.VulkanLayer.gamescope/x86_64/24.08"
-          "org.freedesktop.Platform.VulkanLayer.gamescope/x86_64/24.08"
+          # "org.freedesktop.Platform.VulkanLayer.MangoHud/x86_64/24.08"
-          "org.freedesktop.Platform.VulkanLayer.MangoHud/x86_64/24.08"
 
           "org.prismlauncher.PrismLauncher"
           "com.usebottles.bottles"
-          "io.github.lawstorant.boxflat"
+          # "io.github.lawstorant.boxflat"
 
           # "com.unity.UnityHub"
         ];
 
         overrides = {
+          "org.prismlauncher.PrismLauncher".Context = {
+            filesystems = [
+              "${config.home.homeDirectory}/Downloads"
+
+              "/tmp" # To allow temporary world folder creation for datapack installation
+            ];
+          };
+
           "com.valvesoftware.Steam".Context = {
             filesystems = [
               "${config.home.homeDirectory}/Games"

home/modules/1_deprecated/ags/default.nix

@@ -17,20 +17,20 @@ in {
 
       # AGS libs go here
       extraPackages = [
-        inputs.ags.packages.${pkgs.system}.apps
+        inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.apps
-        inputs.ags.packages.${pkgs.system}.auth
+        inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.auth
-        inputs.ags.packages.${pkgs.system}.battery
+        inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.battery
-        inputs.ags.packages.${pkgs.system}.bluetooth
+        inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.bluetooth
-        inputs.ags.packages.${pkgs.system}.cava
+        inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.cava
-        # inputs.ags.packages.${pkgs.system}.greet
+        # inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.greet
-        inputs.ags.packages.${pkgs.system}.hyprland
+        inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.hyprland
-        inputs.ags.packages.${pkgs.system}.mpris
+        inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.mpris
-        inputs.ags.packages.${pkgs.system}.network
+        inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.network
-        inputs.ags.packages.${pkgs.system}.notifd
+        inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.notifd
-        # inputs.ags.packages.${pkgs.system}.powerprofiles
+        # inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.powerprofiles
-        # inputs.ags.packages.${pkgs.system}.river
+        # inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.river
-        inputs.ags.packages.${pkgs.system}.tray
+        inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.tray
-        inputs.ags.packages.${pkgs.system}.wireplumber
+        inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.wireplumber
       ];
 
       # This should symlink but doesn't, it copies the files :/
@@ -40,7 +40,7 @@ in {
     # The ags module doesn't expose the "astal" cli tool or extraPackages
     home.packages =
       [
-        inputs.ags.packages.${pkgs.system}.io
+        inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.io
       ]
       ++ config.programs.ags.extraPackages;
 

home/modules/1_deprecated/flatpak/default.nix

@@ -81,7 +81,7 @@ with mylib.modules;
             cp -f ${pkgs.lxgw-wenkai}/share/fonts/truetype/LXGWWenKaiMono-Regular.ttf ${config.home.homeDirectory}/.local/share/fonts/
             cp -f ${pkgs.nerdfonts.override {fonts = ["JetBrainsMono"];}}/share/fonts/truetype/NerdFonts/JetBrainsMonoNerdFontMono-Regular.ttf ${config.home.homeDirectory}/.local/share/fonts/
             cp -f ${pkgs.noto-fonts}/share/fonts/noto/NotoSans[wdth,wght].ttf ${config.home.homeDirectory}/.local/share/fonts/
-            cp -f ${pkgs.noto-fonts-emoji}/share/fonts/noto/NotoColorEmoji.ttf ${config.home.homeDirectory}/.local/share/fonts/
+            cp -f ${pkgs.noto-fonts-color-emoji}/share/fonts/noto/NotoColorEmoji.ttf ${config.home.homeDirectory}/.local/share/fonts/
           '';
         })
         (mkElse cfg.fontFix {

home/modules/1_deprecated/ranger/default.nix

@@ -33,7 +33,7 @@ in {
           python310Packages.pillow
           ffmpegthumbnailer
           imagemagick
-          poppler_utils
+          poppler-utils
         ])
       ];
 

home/modules/beets/default.nix

@@ -50,7 +50,8 @@ in {
           "edit" # edit metadata in text editor
           "fetchart" # pickup local cover art or search online
           "fish" # beet fish generates ~/.config/fish/completions file
-          "lyrics" # fetch song lyrics
+          # "lyrics" # fetch song lyrics
+          "musicbrainz" # auto tagger data source
           "replaygain" # write replaygain tags for automatic loudness adjustments
         ];
 
@@ -59,10 +60,10 @@ in {
           sources = "filesystem coverart itunes amazon albumart"; # sources are queried in this order
         };
 
-        lyrics = {
+        # lyrics = {
-          auto = "yes"; # only embeds lyrics into metadata, needed for jellyfin but useless for rmpc
+        #   auto = "yes"; # only embeds lyrics into metadata, needed for jellyfin but useless for rmpc
-          synced = "yes"; # prefer synced lyrics if provided
+        #   synced = "yes"; # prefer synced lyrics if provided
-        };
+        # };
 
         replaygain = {
           auto = "yes"; # analyze on import automatically

home/modules/color/default.nix

@@ -7,7 +7,7 @@
 }: let
   inherit (config.modules) color;
 in {
-  options.modules.color = import ./options.nix {inherit lib mylib;};
+  options.modules.color = import ./options.nix {inherit lib mylib pkgs;};
 
   config = {
     home.packages = let
@@ -50,10 +50,13 @@ in {
             |> builtins.concatStringsSep "\n")
           ''echo ${lib.concatStrings (lib.replicate 20 "=")}''
         ]);
-    in [
+    in
+      [
         applyColors
         printNixColors
-    ];
+      ]
+      ++ (lib.optionals color.installPackages [color.iconPackage color.cursorPackage])
+      ++ (lib.optionals color.installPackages color.extraPackages);
 
     # This module sets its own options to the values specified in a colorscheme file.
     modules.color = let

home/modules/color/options.nix

@@ -1,6 +1,7 @@
 {
   lib,
   mylib,
+  pkgs,
   ...
 }: let
   colorKeys = [
@@ -50,6 +51,54 @@ in rec {
     default = "JetBrainsMono Nerd Font Mono";
   };
 
+  cursor = lib.mkOption {
+    type = lib.types.str;
+    description = "The cursor to use";
+    example = "Bibata-Modern-Classic";
+    default = "Bibata-Modern-Classic";
+  };
+
+  cursorSize = lib.mkOption {
+    type = lib.types.int;
+    description = "The cursor size";
+    example = 24;
+    default = 24;
+  };
+
+  cursorPackage = lib.mkOption {
+    type = lib.types.package;
+    description = "The cursor package";
+    example = pkgs.bibata-cursors;
+    default = pkgs.bibata-cursors;
+  };
+
+  iconTheme = lib.mkOption {
+    type = lib.types.str;
+    description = "The icon theme to use";
+    example = "Papirus";
+    default = "Papirus";
+  };
+
+  iconPackage = lib.mkOption {
+    type = lib.types.package;
+    description = "The icon theme package";
+    example = pkgs.papirus-icon-theme;
+    default = pkgs.papirus-icon-theme;
+  };
+
+  extraPackages = lib.mkOption {
+    type = lib.types.listOf lib.types.package;
+    description = "Extra packages to install";
+    example = ''
+      [
+        pkgs.bibata-cursors
+      ]
+    '';
+    default = [];
+  };
+
+  installPackages = lib.mkEnableOption "Install cursor and icon themes";
+
   # This option is set automatically
   wallpapers = let
     # Collect all the available wallpapers.

home/modules/default.nix

@@ -18,6 +18,7 @@
     ./lazygit
     ./mpd
     ./neovim
+    ./niri
     ./nnn
     ./paths
     ./qutebrowser
@@ -31,6 +32,11 @@
     inputs.nix-flatpak.homeManagerModules.nix-flatpak
     inputs.nixvim.homeModules.nixvim
     inputs.textfox.homeManagerModules.default
+    # inputs.niri.homeModules.niri # Imported by system module
+    inputs.noctalia.homeModules.default
+    inputs.caelestia.homeManagerModules.default
+    inputs.dankMaterialShell.homeModules.dankMaterialShell.default
+    inputs.dankMaterialShell.homeModules.dankMaterialShell.niri
 
     # NOTE: Do NOT use this, use the system module (the HM module has to rely on fuse)
     # inputs.impermanence.homeManagerModules.impermanence

home/modules/docs/default.nix

@@ -12,8 +12,11 @@ in {
   config = lib.mkIf docs.enable {
     home = {
       packages = with pkgs; [
-        texliveFull
         inkscape
+
+        texliveFull # TODO: LaTeX packages
+
+        typst # TODO: Typst packages
       ];
 
       file = {

home/modules/fcitx/default.nix

@@ -22,8 +22,8 @@ in {
           # fcitx5-configtool
           catppuccin-fcitx5
 
-          libsForQt5.fcitx5-qt # QT5
+          kdePackages.fcitx5-qt # QT5
-          libsForQt5.fcitx5-chinese-addons
+          kdePackages.fcitx5-chinese-addons
 
           qt6Packages.fcitx5-qt # QT6
           qt6Packages.fcitx5-chinese-addons

home/modules/git/default.nix

@@ -11,30 +11,29 @@ in {
   options.modules.git = import ./options.nix {inherit lib mylib;};
 
   config = lib.mkIf git.enable {
-    programs.git = {
+    programs.diff-so-fancy = {
       enable = true;
+      enableGitIntegration = true;
 
-      # userEmail = "christoph.urlacher@protonmail.com";
+      settings = {
-      # userName = "Christoph Urlacher";
-
-      userEmail = git.userEmail;
-      userName = git.userName;
-
-      signing = {
-        signByDefault = git.signCommits;
-        format = "ssh";
-        key = "~/.ssh/id_ed25519.pub";
-      };
-
-      lfs.enable = true;
-      diff-so-fancy = {
-        enable = true;
         changeHunkIndicators = true;
         markEmptyLines = false;
         stripLeadingSymbols = true;
       };
+    };
+
+    programs.git = {
+      enable = true;
+
+      # settings.user.email = "christoph.urlacher@protonmail.com";
+      # settings.user.name = "Christoph Urlacher";
+
+      settings = {
+        user = {
+          email = git.userEmail;
+          name = git.userName;
+        };
 
-      extraConfig = {
         core = {
           compression = 9;
           # whitespace = "error";
@@ -111,6 +110,14 @@ in {
           };
         };
       };
+
+      signing = {
+        signByDefault = git.signCommits;
+        format = "ssh";
+        key = "~/.ssh/id_ed25519.pub";
+      };
+
+      lfs.enable = true;
     };
   };
 }

home/modules/hyprland/autostart.nix

@@ -6,6 +6,8 @@
 }:
 builtins.concatLists [
   (lib.optionals hyprland.dunst.enable ["dunst"]) # Notifications
+  (lib.optionals hyprland.hyprpanel.enable ["hyprpanel"]) # Panel
+  (lib.optionals hyprland.caelestia.enable ["caelestia shell"]) # Panel/Shell # TODO: Crashes on startup
   [
     # Start clipboard management
     "wl-paste -t text --watch clipman store --no-persist"

home/modules/hyprland/caelestia.nix

@@ -0,0 +1,516 @@
+{
+  config,
+  hyprland,
+  color,
+}: {
+  enable = hyprland.caelestia.enable;
+
+  systemd = {
+    enable = false; # Start from hyprland autostart
+    target = "graphical-session.target";
+    environment = [];
+  };
+
+  settings = {
+    appearance = {
+      anim = {durations = {scale = 1;};};
+      font = {
+        family = {
+          clock = "Rubik";
+          material = "Material Symbols Rounded";
+          mono = color.font;
+          sans = color.font;
+        };
+        size = {scale = 1;};
+      };
+
+      padding = {scale = 1;};
+      rounding = {scale = 1;};
+      spacing = {scale = 1;};
+
+      transparency = {
+        base = 0.85;
+        enabled = false;
+        layers = 0.4;
+      };
+    };
+
+    background = {
+      desktopClock = {enabled = false;};
+      enabled = true;
+
+      # Lags when visible on both monitors (different refresh rates?)
+      visualiser = {
+        autoHide = true;
+        blur = true;
+        enabled = false;
+        rounding = 1;
+        spacing = 1;
+      };
+    };
+
+    bar = {
+      clock = {showIcon = true;};
+      dragThreshold = 20;
+
+      entries = [
+        {
+          enabled = true;
+          id = "logo";
+        }
+        {
+          enabled = true;
+          id = "workspaces";
+        }
+        {
+          enabled = true;
+          id = "spacer";
+        }
+        {
+          enabled = true;
+          id = "activeWindow";
+        }
+        {
+          enabled = true;
+          id = "spacer";
+        }
+        {
+          enabled = true;
+          id = "clock";
+        }
+        {
+          enabled = true;
+          id = "tray";
+        }
+        {
+          enabled = true;
+          id = "statusIcons";
+        }
+        {
+          enabled = true;
+          id = "power";
+        }
+      ];
+
+      persistent = true;
+
+      popouts = {
+        activeWindow = true;
+        statusIcons = true;
+        tray = true;
+      };
+
+      scrollActions = {
+        brightness = false;
+        volume = true;
+        workspaces = true;
+      };
+
+      showOnHover = true;
+
+      status = {
+        showAudio = true;
+        showBattery = false;
+        showBluetooth = true;
+        showKbLayout = false;
+        showLockStatus = true;
+        showMicrophone = false;
+        showNetwork = true;
+      };
+
+      tray = {
+        background = true;
+        compact = false;
+        iconSubs = [];
+        recolour = false;
+      };
+
+      workspaces = {
+        activeIndicator = true;
+        activeLabel = "󰮯";
+        activeTrail = true;
+        label = "  ";
+        occupiedBg = false;
+        occupiedLabel = "󰮯";
+        perMonitorWorkspaces = false;
+        showWindows = false;
+        shown = 10;
+
+        # Pick them here: https://fonts.google.com/icons
+        specialWorkspaceIcons = [
+          {
+            icon = "music_note";
+            name = "rmpc";
+          }
+          {
+            icon = "memory";
+            name = "btop";
+          }
+          {
+            icon = "mark_chat_unread";
+            name = "ferdium";
+          }
+          {
+            icon = "network_intelligence";
+            name = "msty";
+          }
+        ];
+      };
+    };
+
+    border = {
+      rounding = 25;
+      thickness = 10;
+    };
+
+    dashboard = {
+      dragThreshold = 50;
+      enabled = true;
+      mediaUpdateInterval = 500;
+      showOnHover = true;
+    };
+
+    general = {
+      apps = {
+        audio = ["kitty" "--title=NcpaMixer" "-e" "ncpamixer"];
+        explorer = ["kitty" "--title=Yazi" "-e" "yazi"];
+        playback = ["mpv"];
+        terminal = ["kitty"];
+      };
+
+      battery = {
+        criticalLevel = 3;
+        warnLevels = [
+          {
+            icon = "battery_android_frame_2";
+            level = 20;
+            message = "You might want to plug in a charger";
+            title = "Low battery";
+          }
+          {
+            icon = "battery_android_frame_1";
+            level = 10;
+            message = "You should probably plug in a charger <b>now</b>";
+            title = "Did you see the previous message?";
+          }
+          {
+            critical = true;
+            icon = "battery_android_alert";
+            level = 5;
+            message = "PLUG THE CHARGER RIGHT NOW!!";
+            title = "Critical battery level";
+          }
+        ];
+      };
+
+      idle = {
+        inhibitWhenAudio = true;
+        lockBeforeSleep = true;
+        timeouts = [
+          {
+            idleAction = "lock";
+            timeout = 600;
+          }
+          {
+            # idleAction = "dpms off";
+            # returnAction = "dpms on";
+            idleAction = "echo 'idle'";
+            returnAction = "echo 'return'";
+            timeout = 10000;
+          }
+          {
+            # idleAction = ["systemctl" "suspend-then-hibernate"];
+            idleAction = ["echo" "'idle'"];
+            timeout = 20000;
+          }
+        ];
+      };
+    };
+
+    launcher = {
+      actionPrefix = ">";
+      actions = [
+        {
+          command = ["autocomplete" "calc"];
+          dangerous = false;
+          description = "Do simple math equations (powered by Qalc)";
+          enabled = true;
+          icon = "calculate";
+          name = "Calculator";
+        }
+        {
+          command = ["autocomplete" "scheme"];
+          dangerous = false;
+          description = "Change the current colour scheme";
+          enabled = true;
+          icon = "palette";
+          name = "Scheme";
+        }
+        {
+          command = ["autocomplete" "wallpaper"];
+          dangerous = false;
+          description = "Change the current wallpaper";
+          enabled = true;
+          icon = "image";
+          name = "Wallpaper";
+        }
+        {
+          command = ["autocomplete" "variant"];
+          dangerous = false;
+          description = "Change the current scheme variant";
+          enabled = true;
+          icon = "colors";
+          name = "Variant";
+        }
+        {
+          command = ["autocomplete" "transparency"];
+          dangerous = false;
+          description = "Change shell transparency";
+          enabled = false;
+          icon = "opacity";
+          name = "Transparency";
+        }
+        {
+          command = ["caelestia" "wallpaper" "-r"];
+          dangerous = false;
+          description = "Switch to a random wallpaper";
+          enabled = false;
+          icon = "casino";
+          name = "Random";
+        }
+        {
+          command = ["setMode" "light"];
+          dangerous = false;
+          description = "Change the scheme to light mode";
+          enabled = true;
+          icon = "light_mode";
+          name = "Light";
+        }
+        {
+          command = ["setMode" "dark"];
+          dangerous = false;
+          description = "Change the scheme to dark mode";
+          enabled = true;
+          icon = "dark_mode";
+          name = "Dark";
+        }
+        {
+          command = ["systemctl" "poweroff"];
+          dangerous = true;
+          description = "Shutdown the system";
+          enabled = true;
+          icon = "power_settings_new";
+          name = "Shutdown";
+        }
+        {
+          command = ["systemctl" "reboot"];
+          dangerous = true;
+          description = "Reboot the system";
+          enabled = true;
+          icon = "cached";
+          name = "Reboot";
+        }
+        {
+          command = ["loginctl" "terminate-user" ""];
+          dangerous = true;
+          description = "Log out of the current session";
+          enabled = true;
+          icon = "exit_to_app";
+          name = "Logout";
+        }
+        {
+          command = ["loginctl" "lock-session"];
+          dangerous = false;
+          description = "Lock the current session";
+          enabled = true;
+          icon = "lock";
+          name = "Lock";
+        }
+        {
+          command = ["systemctl" "suspend-then-hibernate"];
+          dangerous = false;
+          description = "Suspend then hibernate";
+          enabled = false;
+          icon = "bedtime";
+          name = "Sleep";
+        }
+      ];
+
+      dragThreshold = 50;
+      enableDangerousActions = true;
+      hiddenApps = [];
+      maxShown = 7;
+      maxWallpapers = 9;
+      showOnHover = false;
+      specialPrefix = "@";
+      useFuzzy = {
+        actions = false;
+        apps = false;
+        schemes = false;
+        variants = false;
+        wallpapers = false;
+      };
+      vimKeybinds = false;
+    };
+
+    lock = {recolourLogo = false;};
+
+    notifs = {
+      actionOnClick = false;
+      clearThreshold = 0.3;
+      defaultExpireTimeout = 5000;
+      expandThreshold = 20;
+      expire = true;
+    };
+
+    osd = {
+      enableBrightness = false;
+      enableMicrophone = true;
+      enabled = true;
+      hideDelay = 2000;
+    };
+
+    paths = {
+      mediaGif = "root:/assets/bongocat.gif";
+      sessionGif = "root:/assets/kurukuru.gif";
+      wallpaperDir = "~/NixFlake/wallpapers";
+    };
+
+    services = {
+      audioIncrement = 0.1;
+      defaultPlayer = "MPD";
+      gpuType = "";
+      maxVolume = 1;
+      playerAliases = [
+        {
+          from = "com.github.th_ch.youtube_music";
+          to = "YT Music";
+        }
+      ];
+      smartScheme = true;
+      useFahrenheit = false;
+      useTwelveHourClock = false;
+      visualiserBars = 45;
+      weatherLocation = "Dortmund, Germany";
+    };
+
+    session = {
+      commands = {
+        hibernate = ["systemctl" "hibernate"];
+        logout = ["loginctl" "terminate-user" ""];
+        reboot = ["systemctl" "reboot"];
+        shutdown = ["systemctl" "poweroff"];
+      };
+      dragThreshold = 30;
+      enabled = true;
+      vimKeybinds = false;
+    };
+
+    sidebar = {
+      dragThreshold = 80;
+      enabled = true;
+    };
+
+    utilities = {
+      enabled = true;
+      maxToasts = 4;
+      toasts = {
+        audioInputChanged = true;
+        audioOutputChanged = true;
+        capsLockChanged = true;
+        chargingChanged = true;
+        configLoaded = true;
+        dndChanged = true;
+        gameModeChanged = true;
+        kbLayoutChanged = false;
+        nowPlaying = false;
+        numLockChanged = true;
+        vpnChanged = true;
+      };
+
+      vpn = {
+        enabled = false;
+        provider = [
+          {
+            displayName = "Wireguard (Your VPN)";
+            interface = "your-connection-name";
+            name = "wireguard";
+          }
+        ];
+      };
+    };
+  };
+
+  cli = {
+    enable = hyprland.caelestia.enable;
+
+    settings = {
+      record = {extraArgs = [];};
+
+      theme = {
+        enableBtop = false;
+        enableDiscord = false;
+        enableFuzzel = false;
+        enableGtk = false;
+        enableHypr = false;
+        enableQt = false;
+        enableSpicetify = false;
+        enableTerm = false;
+      };
+
+      toggles = {
+        communication = {
+          discord = {
+            command = ["discord"];
+            enable = false;
+            match = [{class = "discord";}];
+            move = true;
+          };
+          whatsapp = {
+            enable = false;
+            match = [{class = "whatsapp";}];
+            move = true;
+          };
+        };
+
+        music = {
+          feishin = {
+            enable = false;
+            match = [{class = "feishin";}];
+            move = true;
+          };
+          spotify = {
+            command = ["spicetify" "watch" "-s"];
+            enable = false;
+            match = [{class = "Spotify";} {initialTitle = "Spotify";} {initialTitle = "Spotify Free";}];
+            move = true;
+          };
+        };
+
+        sysmon = {
+          btop = {
+            command = ["kitty" "--title" "Btop" "-e" "btop"];
+            enable = false;
+            match = [
+              {
+                class = "btop";
+                title = "Btop";
+                workspace = {name = "special:sysmon";};
+              }
+            ];
+          };
+        };
+
+        todo = {
+          todoist = {
+            command = ["todoist"];
+            enable = false;
+            match = [{class = "Todoist";}];
+            move = true;
+          };
+        };
+      };
+      wallpaper = {postHook = "echo $WALLPAPER_PATH";};
+    };
+  };
+}

home/modules/hyprland/default.nix

@@ -34,21 +34,29 @@ in {
         assertion = builtins.hasAttr "hyprlock" nixosConfig.security.pam.services;
         message = "Can't enable Hyprland module without Hyprlock PAM service!";
       }
+      {
+        assertion = hyprland.hyprpanel.enable != hyprland.caelestia.enable;
+        message = "Can't enable Hyprpanel and Caelestia at the same time!";
+      }
     ];
 
     gtk = {
       enable = true;
-      iconTheme.package = pkgs.papirus-icon-theme;
+      iconTheme.package = lib.mkDefault color.iconPackage;
-      iconTheme.name = "Papirus";
+      iconTheme.name = color.iconTheme;
+    };
+
+    modules = {
+      hyprpanel.enable = hyprland.hyprpanel.enable;
     };
 
     home = {
       pointerCursor = {
-        gtk.enable = true;
+        gtk.enable = lib.mkDefault true;
-        x11.enable = true;
+        x11.enable = lib.mkDefault true;
-        package = pkgs.bibata-cursors;
+        package = lib.mkDefault color.cursorPackage;
-        name = "Bibata-Modern-Classic";
+        name = color.cursor;
-        size = 24;
+        size = color.cursorSize;
       };
 
       packages = with pkgs; [
@@ -61,7 +69,7 @@ in {
         wl-clipboard
         clipman # Clipboard manager (wl-paste)
         libnotify
-        inotifyTools # Includes inotifywait
+        inotify-tools # Includes inotifywait
 
         ncpamixer # Audio control
         slurp # Region selector for screensharing
@@ -113,33 +121,29 @@ in {
 
     programs = {
       hyprlock = import ./hyprlock.nix {inherit config hyprland color;};
-
+      caelestia = import ./caelestia.nix {inherit config hyprland color;};
-      # TODO: IMV shouldn't be part of the hyprland module
-      imv = {
-        enable = true;
-        settings = {
-          options = {
-            background = "${color.hex.base}";
-            overlay = true;
-            overlay_font = "${color.font}:12";
-            overlay_background_color = "${color.hex.accent}";
-            overlay_text_color = "${color.hex.accentText}";
-          };
-        };
-      };
     };
 
     services = {
-      # TODO: Dunst shouldn't be part of the hyprland module
       dunst = import ./dunst.nix {inherit pkgs config hyprland color;};
       hypridle = import ./hypridle.nix {inherit config hyprland color;};
       hyprpaper = import ./hyprpaper.nix {inherit config hyprland color;};
     };
 
+    # Make sure the units only start when using Hyprland
+    systemd.user.services.dunst.Unit.After = lib.mkIf hyprland.dunst.enable (lib.mkForce ["hyprland-session.target"]);
+    systemd.user.services.dunst.Unit.PartOf = lib.mkIf hyprland.dunst.enable (lib.mkForce ["hyprland-session.target"]);
+    systemd.user.services.hypridle.Install.WantedBy = lib.mkIf (!hyprland.caelestia.enable) (lib.mkForce ["hyprland-session.target"]);
+    systemd.user.services.hypridle.Unit.After = lib.mkIf (!hyprland.caelestia.enable) (lib.mkForce ["hyprland-session.target"]);
+    systemd.user.services.hypridle.Unit.PartOf = lib.mkIf (!hyprland.caelestia.enable) (lib.mkForce ["hyprland-session.target"]);
+    systemd.user.services.hyprpaper.Install.WantedBy = lib.mkIf (!hyprland.caelestia.enable) (lib.mkForce ["hyprland-session.target"]);
+    systemd.user.services.hyprpaper.Unit.After = lib.mkIf (!hyprland.caelestia.enable) (lib.mkForce ["hyprland-session.target"]);
+    systemd.user.services.hyprpaper.Unit.PartOf = lib.mkIf (!hyprland.caelestia.enable) (lib.mkForce ["hyprland-session.target"]);
+
     wayland.windowManager.hyprland = {
       enable = true;
-      package = inputs.hyprland.packages.${pkgs.system}.hyprland;
+      package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
-      portalPackage = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland;
+      portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
 
       systemd.enable = true; # Enable hyprland-session.target
       systemd.variables = ["--all"]; # Import PATH into systemd
@@ -148,16 +152,16 @@ in {
       plugins = builtins.concatLists [
         (lib.optionals
           hyprland.bars.enable
-          [inputs.hyprland-plugins.packages.${pkgs.system}.hyprbars])
+          [inputs.hyprland-plugins.packages.${pkgs.stdenv.hostPlatform.system}.hyprbars])
         (lib.optionals
           hyprland.dynamicCursor.enable
-          [inputs.hypr-dynamic-cursors.packages.${pkgs.system}.hypr-dynamic-cursors])
+          [inputs.hypr-dynamic-cursors.packages.${pkgs.stdenv.hostPlatform.system}.hypr-dynamic-cursors])
         (lib.optionals
           hyprland.trails.enable
-          [inputs.hyprland-plugins.packages.${pkgs.system}.hyprtrails])
+          [inputs.hyprland-plugins.packages.${pkgs.stdenv.hostPlatform.system}.hyprtrails])
         (lib.optionals
           hyprland.hyprspace.enable
-          [inputs.hyprspace.packages.${pkgs.system}.Hyprspace])
+          [inputs.hyprspace.packages.${pkgs.stdenv.hostPlatform.system}.Hyprspace])
       ];
 
       settings = import ./settings.nix {

home/modules/hyprland/dunst.nix

@@ -6,8 +6,8 @@
 }: {
   enable = hyprland.dunst.enable;
 
-  iconTheme.package = pkgs.papirus-icon-theme;
+  iconTheme.package = color.iconPackage;
-  iconTheme.name = "Papirus";
+  iconTheme.name = color.iconTheme;
 
   settings = {
     global = {

home/modules/hyprland/hypridle.nix

@@ -3,7 +3,7 @@
   hyprland,
   color,
 }: {
-  enable = true;
+  enable = !hyprland.caelestia.enable;
 
   settings = {
     general = {

home/modules/hyprland/hyprpaper.nix

@@ -3,7 +3,7 @@
   hyprland,
   color,
 }: {
-  enable = true;
+  enable = !hyprland.caelestia.enable;
 
   settings = {
     ipc = "on";

home/modules/hyprland/mappings.nix

@@ -6,14 +6,10 @@
 lib.mergeAttrsList [
   {
     # Hyprland control
-    "$mainMod, a" = ["exec, rofi -drun-show-actions -show drun"];
     "$mainMod, q" = ["killactive"];
     "$mainMod, v" = ["togglefloating"];
     "$mainMod, f" = ["fullscreen"];
-    "$mainMod, c" = ["exec, clipman pick --tool=rofi"];
-    "$mainMod SHIFT, l" = ["exec, loginctl lock-session"];
     "$mainMod, tab" = ["workspace, previous"];
-    "ALT, tab" = ["exec, rofi -show window"];
     # "$mainMod, g" = ["togglegroup"];
     # "ALT, tab" = ["changegroupactive"];
 

home/modules/hyprland/options.nix

@@ -5,11 +5,13 @@
 }: {
   enable = lib.mkEnableOption "Hyprland Window Manager + Compositor";
 
-  dunst.enable = lib.mkEnableOption "Enable dunst notification daemon";
+  dunst.enable = lib.mkEnableOption "Enable Dunst notification daemon";
   bars.enable = lib.mkEnableOption "Enable window bars";
   dynamicCursor.enable = lib.mkEnableOption "Enable dynamic cursors";
   trails.enable = lib.mkEnableOption "Enable dynamic window trails";
-  hyprspace.enable = lib.mkEnableOption "Enable hyprspace workspace overview";
+  hyprspace.enable = lib.mkEnableOption "Enable Hyprspace workspace overview";
+  hyprpanel.enable = lib.mkEnableOption "Enable Hyprpanel";
+  caelestia.enable = lib.mkEnableOption "Enable Caelestia";
 
   keyboard = {
     layout = lib.mkOption {

home/modules/hyprland/settings.nix

@@ -111,19 +111,19 @@
 
   windowrule = let
     mkWorkspaceRule = workspace: class:
-      "workspace ${workspace}, "
+      "match:class ^(${class})$, "
-      + "class:^(${class})$";
+      + "workspace ${workspace}";
     mkWorkspaceRules = workspace: class-list:
       builtins.map (mkWorkspaceRule workspace) class-list;
 
     mkFloatingRule = attrs:
-      "float"
+      (lib.optionalString (builtins.hasAttr "class" attrs) "match:class ^(${attrs.class})$, ")
-      + (lib.optionalString (builtins.hasAttr "class" attrs) ", class:^(${attrs.class})$")
+      + (lib.optionalString (builtins.hasAttr "title" attrs) "match:title ^(${attrs.title})$, ")
-      + (lib.optionalString (builtins.hasAttr "title" attrs) ", title:^(${attrs.title})$");
+      + "float 1";
 
     mkTranslucentRule = class:
-      "opacity ${hyprland.transparent-opacity} ${hyprland.transparent-opacity}, "
+      "match:class ^(${class})$, "
-      + "class:^(${class})$";
+      + "opacity ${hyprland.transparent-opacity} ${hyprland.transparent-opacity}";
   in
     lib.mkMerge [
       (hyprland.workspacerules
@@ -146,9 +146,9 @@
     new_status = "master";
   };
 
-  gestures = {
+  gesture = [
-    workspace_swipe = false;
+    "3, horizontal, workspace" # 3 Fingers, horizontal, workspace swipe
-  };
+  ];
 
   misc = {
     # Say no to the anime girl
@@ -165,15 +165,15 @@
   # Because those are not windows, but layers,
   # we have to blur them explicitly
   layerrule = [
-    "blur,rofi"
+    "match:class rofi, blur 1"
-    "ignorealpha 0.001,rofi" # Fix pixelated corners
+    # "match:class rofi, ignore_alpha 0.001" # Fix pixelated corners
-    "xray 0,rofi" # Render on top of other windows
+    # "match:class rofi, xray 0" # Render on top of other windows
-    "dimaround,rofi"
+    # "match:class rofi, dim_around 1"
 
-    "blur,waybar"
+    "match:class waybar, blur 1"
-    "blur,gtk4-layer-shell"
+    "match:class gtk4-layer-shell, blur 1"
-    "blur,bar-0"
+    "match:class bar-0, blur 1"
-    "blur,bar-1"
+    "match:class bar-1, blur 1"
   ];
 
   decoration = {

home/modules/hyprpanel/default.nix

@@ -13,7 +13,7 @@ in {
   config = lib.mkIf hyprpanel.enable {
     programs.hyprpanel = {
       enable = true;
-      systemd.enable = true;
+      systemd.enable = hyprpanel.systemd.enable;
 
       settings = {
         #
@@ -31,12 +31,12 @@ in {
         # TODO: To module option
         # TODO: This should contain battery etc. for laptop
         "bar.layouts" = {
-          "HDMI-A-1" = {
+          "DP-1" = {
             "left" = ["workspaces" "windowtitle"];
             "middle" = ["media"]; # "cava"
             "right" = ["volume" "network" "cpu" "ram" "storage" "clock" "systray" "notifications"]; # "bluetooth"
           };
-          "DP-1" = {
+          "DP-2" = {
             "left" = ["workspaces" "windowtitle"];
             "middle" = ["media"]; # "cava"
             "right" = ["volume" "clock" "notifications"];

home/modules/hyprpanel/options.nix

@@ -5,5 +5,6 @@
 }:
 with lib;
 with mylib.modules; {
-  enable = mkEnableOption "hyprpanel";
+  enable = mkEnableOption "Enable Hyprpanel";
+  systemd.enable = mkEnableOption "Start using systemd";
 }

home/modules/neovim/default.nix

@@ -1,6 +1,7 @@
 {
   inputs,
   system,
+  headless,
   username,
   hostname,
   config,
@@ -27,13 +28,7 @@ in {
         builtins.concatLists [
           (lib.optionals neovim.neovide [neovide])
 
-          [
+          (lib.optionals (!headless) [
-            (pkgs.ripgrep.override {withPCRE2 = true;})
-
-            # Dependencies
-            lua54Packages.jsregexp # For tree-sitter
-            # nodejs_latest
-
             # Language servers
             clang-tools
             clojure-lsp
@@ -42,7 +37,7 @@ in {
             jdt-language-server
             ltex-ls # TODO: Only enable on-demand
             lua-language-server
-            nil
+            # nil
             nixd
             basedpyright
             pyrefly
@@ -52,8 +47,9 @@ in {
             tailwindcss-language-server
             tex-fmt
             texlab
+            tinymist
             typescript
-            # vscode-langservers-extracted # includes nodejs
+            vscode-langservers-extracted # includes nodejs
 
             # Linters
             checkstyle # java
@@ -78,6 +74,15 @@ in {
             # nodePackages_latest.prettier # Use local install as plugins change per project
             rustfmt
             stylua
+            typstyle
+          ])
+
+          [
+            (pkgs.ripgrep.override {withPCRE2 = true;})
+
+            # Dependencies
+            lua54Packages.jsregexp # For tree-sitter
+            # nodejs_latest
           ]
         ];
     };
@@ -406,7 +411,7 @@ in {
               };
 
               fuzzy = {
-                use_frecency = true;
+                frecency.enabled = true;
                 use_proximity = true;
               };
 
@@ -512,9 +517,10 @@ in {
                 nix = ["alejandra"];
                 python = ["black"];
                 qml = ["qmlformat"];
+                rust = ["rustfmt"];
                 svelte = ["prettierd" "prettier"];
                 typescript = ["prettierd" "prettier"];
-                rust = ["rustfmt"];
+                typst = ["typstyle"];
               };
 
               default_format_opts = {
@@ -581,89 +587,89 @@ in {
             # Don't call setup!
           };
 
-          hover = let
+          # hover = let
-            # Display LSP information and Diagnostics at the same time
+          #   # Display LSP information and Diagnostics at the same time
-            # https://github.com/lewis6991/hover.nvim/issues/34#issuecomment-1625662866
+          #   # https://github.com/lewis6991/hover.nvim/issues/34#issuecomment-1625662866
-            lspWithDiag = ''
+          #   lspWithDiag = ''
-              {
+          #     {
-                 name = "LSP",
+          #        name = "LSP",
-                 priority = 1000,
+          #        priority = 1000,
-                 enabled = function()
+          #        enabled = function()
-                   return true
+          #          return true
-                 end,
+          #        end,
-
+          #
-                 execute = function(opts, done)
+          #        execute = function(opts, done)
-                   local params = vim.lsp.util.make_position_params()
+          #          local params = vim.lsp.util.make_position_params()
-                   local ___ = "\n─────────────────────────────────────────────────────────────────────────────\n"
+          #          local ___ = "\n─────────────────────────────────────────────────────────────────────────────\n"
-
+          #
-                   vim.lsp.buf_request_all(0, 'textDocument/hover', params, function(responses)
+          #          vim.lsp.buf_request_all(0, 'textDocument/hover', params, function(responses)
-                     local value = ""
+          #            local value = ""
-                     for _, response in pairs(responses) do
+          #            for _, response in pairs(responses) do
-                       local result = response.result
+          #              local result = response.result
-                       if result and result.contents and result.contents.value then
+          #              if result and result.contents and result.contents.value then
-                         if value ~= "" then
+          #                if value ~= "" then
-                           value = value .. ___
+          #                  value = value .. ___
-                         end
+          #                end
-                         value = value .. result.contents.value
+          #                value = value .. result.contents.value
-                       end
+          #              end
-                     end
+          #            end
-
+          #
-                     local _, row = unpack(vim.fn.getpos("."))
+          #            local _, row = unpack(vim.fn.getpos("."))
-                     local lineDiag = vim.diagnostic.get(0, { lnum = row - 1 })
+          #            local lineDiag = vim.diagnostic.get(0, { lnum = row - 1 })
-                     for _, d in pairs(lineDiag) do
+          #            for _, d in pairs(lineDiag) do
-                       if d.message then
+          #              if d.message then
-                         if value ~= "" then
+          #                if value ~= "" then
-                           value = value .. ___
+          #                  value = value .. ___
-                         end
+          #                end
-                         value = value .. string.format("*%s* %s", d.source, d.message)
+          #                value = value .. string.format("*%s* %s", d.source, d.message)
-                       end
+          #              end
-                     end
+          #            end
-                     value = value:gsub("\r", "")
+          #            value = value:gsub("\r", "")
-
+          #
-                     if value ~= "" then
+          #            if value ~= "" then
-                       done({ lines = vim.split(value, "\n", true), filetype = "markdown" })
+          #              done({ lines = vim.split(value, "\n", true), filetype = "markdown" })
-                     else
+          #            else
-                       done()
+          #              done()
-                     end
+          #            end
-                   end)
+          #          end)
-                 end,
+          #        end,
-               }
+          #      }
-            '';
+          #   '';
-          in rec {
+          # in rec {
-            name = "hover";
+          #   name = "hover";
-            pkg = pkgs.vimPlugins.hover-nvim;
+          #   pkg = pkgs.vimPlugins.hover-nvim;
-            lazy = true;
+          #   lazy = true;
-            event = ["BufReadPost" "BufNewFile"];
+          #   event = ["BufReadPost" "BufNewFile"];
-            config = mkDefaultConfig name;
+          #   config = mkDefaultConfig name;
-            opts = {
+          #   opts = {
-              init.__raw = ''
+          #     init.__raw = ''
-                function()
+          #       function()
-                  -- Register custom providers
+          #         -- Register custom providers
-                  require('hover').register(${lspWithDiag})
+          #         require('hover').register(${lspWithDiag})
-
+          #
-                  -- Require providers
+          #         -- Require providers
-                  -- require("hover.providers.lsp")
+          #         -- require("hover.providers.lsp")
-                  -- require('hover.providers.diagnostic')
+          #         -- require('hover.providers.diagnostic')
-                  require('hover.providers.fold_preview')
+          #         require('hover.providers.fold_preview')
-                  require('hover.providers.man')
+          #         require('hover.providers.man')
-
+          #
-                  -- require('hover.providers.gh')
+          #         -- require('hover.providers.gh')
-                  -- require('hover.providers.gh_user')
+          #         -- require('hover.providers.gh_user')
-                  -- require('hover.providers.jira')
+          #         -- require('hover.providers.jira')
-                  -- require('hover.providers.dap')
+          #         -- require('hover.providers.dap')
-                  -- require('hover.providers.dictionary')
+          #         -- require('hover.providers.dictionary')
-                  -- require('hover.providers.highlight')
+          #         -- require('hover.providers.highlight')
-                end
+          #       end
-              '';
+          #     '';
-              preview_opts = {
+          #     preview_opts = {
-                border = "rounded";
+          #       border = "rounded";
-              };
+          #     };
-              # Whether the contents of a currently open hover window should be moved
+          #     # Whether the contents of a currently open hover window should be moved
-              # to a :h preview-window when pressing the hover keymap.
+          #     # to a :h preview-window when pressing the hover keymap.
-              preview_window = false;
+          #     preview_window = false;
-              title = false;
+          #     title = false;
-            };
+          #   };
-          };
+          # };
 
           illuminate = rec {
             name = "illuminate";
@@ -820,10 +826,11 @@ in {
           };
 
           # NOTE: This entire thing is rough, I should rewrite...
+          # TODO: Need to rewrite this once lspconfig 3.0 comes around
           lspconfig = {
             name = "lspconfig";
             pkg = pkgs.vimPlugins.nvim-lspconfig;
-            lazy = true;
+            lazy = false;
             cmd = ["LspInfo"];
             event = ["BufReadPost" "BufNewFile"];
             dependencies = [_lazydev];
@@ -837,14 +844,17 @@ in {
                   extraOptions = {
                     root_dir.__raw = ''
                       function(fname)
-                        return require("lspconfig.util").root_pattern(
+                        -- return require("lspconfig.util").root_pattern(
+                        return vim.lsp.config.util.root_pattern(
                           "Makefile",
                           "CMakeLists.txt",
                           ".clang-format",
                           ".clang-tidy"
-                        )(fname) or require("lspconfig.util").root_pattern(
+                        -- )(fname) or require("lspconfig.util").root_pattern(
+                        )(fname) or vim.lsp.config.util.root_pattern(
                           "compile_commands.json"
-                        )(fname) or require("lspconfig.util").find_git_ancestor(fname)
+                        -- )(fname) or require("lspconfig.util").find_git_ancestor(fname)
+                        )(fname) or vim.lsp.config.util.find_git_ancestor(fname)
                       end
                     '';
 
@@ -872,7 +882,7 @@ in {
                 {name = "clojure_lsp";}
                 {name = "cmake";}
                 {name = "cssls";}
-                # {name = "html";} # vscode-langservers-extracted
+                {name = "html";} # vscode-langservers-extracted
                 {name = "lua_ls";}
                 {
                   name = "ltex";
@@ -883,7 +893,7 @@ in {
                     };
                   };
                 }
-                {name = "nil_ls";}
+                # {name = "nil_ls";}
                 {
                   name = "nixd";
                   extraOptions.cmd = [
@@ -934,6 +944,14 @@ in {
                 {name = "svelte";}
                 {name = "tailwindcss";}
                 {name = "texlab";}
+                {
+                  name = "tinymist";
+                  extraOptions.settings = {
+                    formatterMode = "typstyle";
+                    exportPdf = "onType";
+                    semanticTokens = "disable";
+                  };
+                }
 
                 # {name = "jdtls";} # Don't set up when using nvim-jdtls
                 # {name = "rust_analyzer";} # Don't set up when using rustaceanvim
@@ -941,9 +959,6 @@ in {
               ];
             in ''
               function(_, opts)
-                -- Make LspInfo window border rounded
-                require("lspconfig.ui.windows").default_options.border = "rounded"
-
                 local __lspOnAttach = function(client, bufnr)
 
                   -- NOTE: The ltex-extra package needs to be loaded in ltex's onAttach.
@@ -985,9 +1000,12 @@ in {
                   capabilities = __lspCapabilities(),
                 }
 
+                -- Enable configured servers
                 for i, server in ipairs(${servers}) do
                   if type(server) == "string" then
-                    require("lspconfig")[server].setup(__setup)
+                    -- require("lspconfig")[server].setup(__setup)
+                    vim.lsp.config(server, __setup)
+                    vim.lsp.enable(server)
                   else
                     local options = server.extraOptions
 
@@ -997,7 +1015,9 @@ in {
                       options = vim.tbl_extend("keep", options, __setup)
                     end
 
-                    require("lspconfig")[server.name].setup(options)
+                    -- require("lspconfig")[server.name].setup(options)
+                    vim.lsp.config(server.name, options)
+                    vim.lsp.enable(server.name)
                   end
                 end
               end
@@ -1495,6 +1515,8 @@ in {
                 line_length = 1000;
               };
 
+              bufdelete.enabled = false;
+
               dashboard = {
                 enabled = true;
 
@@ -1556,11 +1578,24 @@ in {
                 };
               };
 
+              debug.enabled = false;
+              dim.enabled = false;
+
               explorer = {
                 enabled = false;
                 replace_netrw = false; # Use yazi for that
               };
 
+              gh.enabled = false;
+              git.enabled = false;
+              gitbrowse.enabled = false;
+              image.enabled = false;
+              indent.enabled = false;
+              input.enabled = false;
+              keymap.enabled = false;
+              layout.enabled = false;
+              lazygit.enabled = true;
+
               notifier = {
                 enabled = true;
               };
@@ -1593,6 +1628,20 @@ in {
                   };
                 };
               };
+
+              profiler.enabled = false;
+              quickfile.enabled = false;
+              rename.enabled = false;
+              scope.enabled = false;
+              scratch.enabled = false;
+              scroll.enabled = false;
+              statuscolumn.enabled = false;
+              terminal.enabled = false;
+              toggle.enabled = false;
+              util.enabled = false;
+              win.enabled = false;
+              words.enabled = false;
+              zen.enabled = false;
             };
           };
 
@@ -1884,6 +1933,24 @@ in {
             config = mkDefaultConfig name;
           };
 
+          typst-preview = rec {
+            name = "typst-preview";
+            pkg = pkgs.vimPlugins.typst-preview-nvim;
+            lazy = true;
+            ft = ["typst"];
+            config = mkDefaultConfig name;
+            opts = {
+              dependencies_bin.__raw = ''
+                {
+                  ['tinymist'] = "${pkgs.tinymist}/bin/tinymist",
+                  ['websocat'] = "${pkgs.websocat}/bin/websocat"
+                }
+              '';
+              # open_cmd = "qutebrowser %s";
+              # open_cmd = "firefox %s -P typst-preview --class typst-preview";
+            };
+          };
+
           _promise = {
             name = "promise";
             pkg = pkgs.vimPlugins.promise-async;
@@ -2057,7 +2124,9 @@ in {
           flash # Highlight f/F search results
           gitsigns # Show git line additions/deletions/changes in the gutter
           haskell-tools # Haskell integration
-          hover # Multiple hover providers
+
+          # hover # Multiple hover providers
+
           illuminate # Highlight usages of word under cursor
 
           intellitab # Indent to the correct level on blanklines # TODO: Behaves bit fishy sometimes
@@ -2098,6 +2167,7 @@ in {
           trouble # Diagnostics window
           ts-autotag # Automatic html tag insertion/updating
           typescript-tools # Typescript tsserver LSP
+          typst-preview # Typst support
           ufo # Code folding
           vimtex # LaTeX support
           # wakatime # Time tracking
@@ -2106,7 +2176,8 @@ in {
           window-picker # Jump to window without multiple <leader-hjkl>
           winshift # Move windows around
           yanky # Clipboard history
-          yazi
+
+          yazi # File manager: TODO: Theming
         ];
       };
     };

home/modules/neovim/extraConfigLuaPost.lua

@@ -14,7 +14,7 @@ if g.neovide then
 	g.neovide_padding_bottom = 0
 	g.neovide_padding_right = 0
 	g.neovide_padding_left = 0
-	g.neovide_refresh_rate = 144
+	g.neovide_refresh_rate = 165
 	g.neovide_floating_corner_radius = 0.0
 	-- g.neovide_theme = "light"
 

home/modules/neovim/mappings.nix

@@ -259,18 +259,18 @@ _: let
       action = "<cmd>nohlsearch<cr>";
       options.desc = "Clear Search Highlights";
     }
-    # {
-    #   mode = "n";
-    #   key = "K";
-    #   action = "<cmd>lua vim.lsp.buf.hover()<cr>";
-    #   options.desc = "LSP Hover";
-    # }
     {
       mode = "n";
       key = "K";
-      action = "<cmd>lua require('hover').hover()<cr>";
+      action = "<cmd>lua vim.lsp.buf.hover()<cr>";
       options.desc = "LSP Hover";
     }
+    # {
+    #   mode = "n";
+    #   key = "K";
+    #   action = "<cmd>lua require('hover').hover()<cr>";
+    #   options.desc = "LSP Hover";
+    # }
     {
       mode = "n";
       key = "/";
@@ -834,19 +834,19 @@ _: let
     {
       mode = "n";
       key = "<leader>tt";
-      action = "<cmd>Trouble diagnostics toggle focus=false win.position=bottom<cr>";
+      action = "<cmd>Trouble diagnostics toggle focus=false win.position=left<cr>";
       options.desc = "Trouble Diagnostics";
     }
     {
       mode = "n";
       key = "<leader>tD";
-      action = "<cmd>Trouble todo toggle focus=false win.position=bottom<cr>";
+      action = "<cmd>Trouble todo toggle focus=false win.position=left<cr>";
       options.desc = "Toggle TODOs";
     }
     {
       mode = "n";
       key = "<leader>ts";
-      action = "<cmd>Trouble symbols toggle focus=false win.position=right<cr>";
+      action = "<cmd>Trouble symbols toggle focus=false win.position=left<cr>";
       options.desc = "Trouble Symbols";
     }
     {

home/modules/neovim/vim_opts.nix

@@ -10,6 +10,7 @@ _: {
   formatexpr = "v:lua.require('conform').formatexpr()";
   laststatus = 3; # Global statusline
   winblend = 30; # Floating popup transparency
+  winborder = "rounded";
   sessionoptions = ["buffers" "curdir" "folds" "globals" "help" "skiprtp" "tabpages" "winsize"]; # What should be saved when creating a session
   showtabline = 2; # Disable tabline with 0, show for > 1 with 1, always show with 2
   conceallevel = 2;

home/modules/niri/dankMaterialShell.nix

@@ -0,0 +1,482 @@
+{color}: {
+  enable = true;
+
+  systemd = {
+    enable = false;
+    restartIfChanged = true;
+  };
+
+  # Deprecated
+  # enableClipboard = true;
+  # enableBrightnessControl = false;
+  # enableColorPicker = true;
+  # enableSystemSound = false;
+
+  enableSystemMonitoring = true;
+  enableVPN = true;
+  enableDynamicTheming = false;
+  enableAudioWavelength = true;
+  enableCalendarEvents = false;
+
+  niri = {
+    enableKeybinds = false;
+    enableSpawn = false;
+  };
+
+  # This is generated from the DMS settings dialog.
+  # Run: nix eval --impure --expr 'builtins.fromJSON (builtins.readFile ~/.config/DankMaterialShell/settings.json)'
+  default.settings = {
+    # Bar
+    barConfigs = [
+      {
+        # Widgets
+        leftWidgets = [
+          {
+            enabled = true;
+            id = "launcherButton";
+          }
+          {
+            enabled = true;
+            id = "workspaceSwitcher";
+          }
+          {
+            enabled = true;
+            focusedWindowCompactMode = true;
+            id = "focusedWindow";
+          }
+        ];
+        centerWidgets = [
+          {
+            enabled = true;
+            id = "music";
+            mediaSize = 1;
+          }
+        ];
+        rightWidgets = [
+          {
+            enabled = true;
+            id = "cpuUsage";
+            minimumWidth = true;
+          }
+          {
+            enabled = true;
+            id = "memUsage";
+            minimumWidth = true;
+          }
+          {
+            enabled = true;
+            id = "diskUsage";
+          }
+          {
+            enabled = true;
+            id = "clipboard";
+          }
+          {
+            enabled = true;
+            id = "controlCenterButton";
+          }
+          {
+            enabled = true;
+            id = "systemTray";
+          }
+          {
+            clockCompactMode = true;
+            enabled = true;
+            id = "clock";
+          }
+          {
+            enabled = true;
+            id = "notificationButton";
+          }
+        ];
+
+        enabled = true;
+        id = "default";
+        name = "Main Bar";
+
+        # Behavior
+        autoHide = false;
+        autoHideDelay = 250;
+        maximizeDetection = true;
+        openOnOverview = false;
+
+        # Border
+        borderColor = "surfaceText";
+        borderEnabled = false;
+        borderOpacity = 1;
+        borderThickness = 2;
+        gothCornerRadiusOverride = false;
+        gothCornerRadiusValue = 12;
+        gothCornersEnabled = false;
+
+        # Styling
+        position = 0;
+        fontScale = 1.1;
+        bottomGap = 0;
+        innerPadding = 4;
+        noBackground = false;
+        popupGapsAuto = true;
+        popupGapsManual = 4;
+        spacing = 0;
+        transparency = 1;
+        widgetOutlineColor = "primary";
+        widgetOutlineEnabled = false;
+        widgetOutlineOpacity = 1;
+        widgetOutlineThickness = 2;
+        widgetTransparency = 1;
+        squareCorners = true;
+        screenPreferences = ["all"];
+        showOnLastDisplay = true;
+        visible = true;
+      }
+    ];
+
+    # Power saving
+    acLockTimeout = 0;
+    acMonitorTimeout = 0;
+    acProfileName = "";
+    acSuspendBehavior = 0;
+    acSuspendTimeout = 0;
+
+    animationSpeed = 1;
+
+    # Launcher
+    appLauncherGridColumns = 4;
+    appLauncherViewMode = "list";
+    launchPrefix = "";
+    launcherLogoBrightness = 0.5;
+    launcherLogoColorInvertOnMode = false;
+    launcherLogoColorOverride = "";
+    launcherLogoContrast = 1;
+    launcherLogoCustomPath = "";
+    launcherLogoMode = "os";
+    launcherLogoSizeOffset = 0;
+
+    # Audio
+    audioInputDevicePins = {};
+    audioOutputDevicePins = {};
+    audioVisualizerEnabled = true;
+
+    # Battery
+    batteryLockTimeout = 0;
+    batteryMonitorTimeout = 0;
+    batteryProfileName = "";
+    batterySuspendBehavior = 0;
+    batterySuspendTimeout = 0;
+
+    # Wallpaper
+    blurWallpaperOnOverview = true;
+    blurredWallpaperLayer = false;
+    wallpaperFillMode = "Fill";
+
+    # Control center
+    controlCenterShowAudioIcon = true;
+    controlCenterShowBatteryIcon = false;
+    controlCenterShowBluetoothIcon = true;
+    controlCenterShowBrightnessIcon = false;
+    controlCenterShowMicIcon = true;
+    controlCenterShowNetworkIcon = true;
+    controlCenterShowPrinterIcon = false;
+    controlCenterShowVpnIcon = true;
+    controlCenterWidgets = [
+      {
+        enabled = true;
+        id = "volumeSlider";
+        width = 50;
+      }
+      {
+        enabled = true;
+        id = "brightnessSlider";
+        width = 50;
+      }
+      {
+        enabled = true;
+        id = "wifi";
+        width = 50;
+      }
+      {
+        enabled = true;
+        id = "bluetooth";
+        width = 50;
+      }
+      {
+        enabled = true;
+        id = "audioOutput";
+        width = 50;
+      }
+      {
+        enabled = true;
+        id = "audioInput";
+        width = 50;
+      }
+      {
+        enabled = true;
+        id = "nightMode";
+        width = 50;
+      }
+      {
+        enabled = true;
+        id = "darkMode";
+        width = 50;
+      }
+    ];
+
+    # Styling
+    cornerRadius = 10;
+    currentThemeName = "cat-mauve";
+    customAnimationDuration = 500;
+    fontFamily = "MonoLisa Normal";
+    monoFontFamily = "MonoLisa Normal";
+    fontScale = 1;
+    fontWeight = 500;
+    gtkThemingEnabled = false;
+    iconTheme = "System Default";
+
+    # Lock
+    fadeToLockEnabled = true;
+    fadeToLockGracePeriod = 5;
+    lockBeforeSuspend = false;
+    lockDateFormat = "yyyy-MM-dd";
+    lockScreenActiveMonitor = "all";
+    lockScreenInactiveColor = "#000000";
+    lockScreenShowDate = true;
+    lockScreenShowPasswordField = true;
+    lockScreenShowPowerActions = true;
+    lockScreenShowProfileImage = true;
+    lockScreenShowSystemIcons = true;
+    lockScreenShowTime = true;
+    loginctlLockIntegration = true;
+
+    # Notifications
+    notificationOverlayEnabled = false;
+    notificationPopupPosition = 0;
+    notificationTimeoutCritical = 0;
+    notificationTimeoutLow = 5000;
+    notificationTimeoutNormal = 5000;
+
+    # OSD
+    osdAlwaysShowValue = true;
+    osdAudioOutputEnabled = true;
+    osdBrightnessEnabled = true;
+    osdCapsLockEnabled = true;
+    osdIdleInhibitorEnabled = true;
+    osdMediaVolumeEnabled = true;
+    osdMicMuteEnabled = true;
+    osdPosition = 7;
+    osdPowerProfileEnabled = false;
+    osdVolumeEnabled = true;
+
+    # Power menu
+    powerActionConfirm = true;
+    powerActionHoldDuration = 0.5;
+    powerMenuActions = ["reboot" "logout" "poweroff" "lock" "restart"];
+    powerMenuDefaultAction = "poweroff";
+    powerMenuGridLayout = false;
+
+    # Settings
+    focusedWindowCompactMode = false;
+    hideBrightnessSlider = false;
+    keyboardLayoutNameCompactMode = false;
+    modalDarkenBackground = true;
+    nightModeEnabled = false;
+    niriOverviewOverlayEnabled = true;
+    showBattery = false;
+    showCapsLockIndicator = false;
+    showClipboard = true;
+    showClock = true;
+    showControlCenterButton = true;
+    showCpuTemp = true;
+    showCpuUsage = true;
+    showDock = false;
+    showFocusedWindow = true;
+    showGpuTemp = false;
+    showLauncherButton = true;
+    showMemUsage = true;
+    showMusic = true;
+    showNotificationButton = true;
+    showOccupiedWorkspacesOnly = false;
+    showPrivacyButton = false;
+    showSystemTray = true;
+    showWorkspaceApps = false;
+    showWorkspaceIndex = false;
+    showWorkspacePadding = false;
+    showWorkspaceSwitcher = true;
+    soundNewNotification = true;
+    soundPluggedIn = true;
+    soundVolumeChanged = true;
+    soundsEnabled = false;
+
+    # Launcher
+    sortAppsAlphabetically = false;
+    spotlightCloseNiriOverview = true;
+    spotlightModalViewMode = "list";
+
+    # Clock
+    use24HourClock = true;
+    showSeconds = true;
+    clockCompactMode = false;
+    clockDateFormat = "yyyy-MM-dd";
+
+    # Media
+    waveProgressEnabled = true;
+    scrollTitleEnabled = true;
+
+    # Weather
+    showWeather = true;
+    useFahrenheit = false;
+    useAutoLocation = false;
+    weatherCoordinates = "51.5142273,7.4652789";
+    weatherEnabled = true;
+    weatherLocation = "Dortmund, Nordrhein-Westfalen";
+
+    # Workspaces
+    workspaceNameIcons = {};
+    workspaceScrolling = false;
+    workspacesPerMonitor = true;
+
+    # Dock
+    dockAutoHide = false;
+    dockBorderColor = "surfaceText";
+    dockBorderEnabled = false;
+    dockBorderOpacity = 1;
+    dockBorderThickness = 1;
+    dockBottomGap = 0;
+    dockGroupByApp = false;
+    dockIconSize = 40;
+    dockIndicatorStyle = "circle";
+    dockMargin = 0;
+    dockOpenOnOverview = false;
+    dockPosition = 1;
+    dockSpacing = 4;
+    dockTransparency = 1;
+
+    # Random shit
+    widgetBackgroundColor = "sc";
+    widgetColorMode = "default";
+    wifiNetworkPins = {};
+    brightnessDevicePins = {};
+    bluetoothDevicePins = {};
+    centeringMode = "index";
+    useSystemSoundTheme = false;
+    vpnLastConnected = "";
+    syncModeWithPortal = true;
+    terminalsAlwaysDark = false;
+    updaterCustomCommand = "";
+    updaterTerminalAdditionalParams = "";
+    updaterUseCustomCommand = false;
+    showOnLastDisplay = {};
+    dwlShowAllTags = false;
+    enableFprint = false;
+    enabledGpuPciIds = [];
+    customPowerActionHibernate = "";
+    customPowerActionLock = "";
+    customPowerActionLogout = "";
+    customPowerActionPowerOff = "";
+    customPowerActionReboot = "";
+    customPowerActionSuspend = "";
+    customThemeFile = "";
+    displayNameMode = "system";
+    matugenScheme = "scheme-tonal-spot";
+    matugenTargetMonitor = "";
+    matugenTemplateAlacritty = true;
+    matugenTemplateDgop = true;
+    matugenTemplateFirefox = true;
+    matugenTemplateFoot = true;
+    matugenTemplateGhostty = true;
+    matugenTemplateGtk = true;
+    matugenTemplateKcolorscheme = true;
+    matugenTemplateKitty = true;
+    matugenTemplateNiri = true;
+    matugenTemplatePywalfox = true;
+    matugenTemplateQt5ct = true;
+    matugenTemplateQt6ct = true;
+    matugenTemplateVesktop = true;
+    matugenTemplateVscode = true;
+    matugenTemplateWezterm = true;
+    notepadFontFamily = "";
+    notepadFontSize = 14;
+    notepadLastCustomTransparency = 0.7;
+    notepadShowLineNumbers = false;
+    notepadTransparencyOverride = -1;
+    notepadUseMonospace = true;
+    maxFprintTries = 15;
+    maxWorkspaceIcons = 3;
+    mediaSize = 1;
+    networkPreference = "auto";
+    selectedGpuIndex = 0;
+    popupTransparency = 1;
+    privacyShowCameraIcon = false;
+    privacyShowMicIcon = false;
+    privacyShowScreenShareIcon = false;
+    qtThemingEnabled = false;
+    runDmsMatugenTemplates = false;
+    runUserMatugenTemplates = false;
+    runningAppsCompactMode = true;
+    runningAppsCurrentWorkspace = false;
+    runningAppsGroupByApp = false;
+    screenPreferences = {};
+
+    configVersion = 2;
+  };
+
+  default.session = {
+    # Settings
+    doNotDisturb = false;
+    isLightMode = false;
+    weatherHourlyDetailed = true;
+
+    # Night
+    nightModeAutoEnabled = true;
+    nightModeAutoMode = "time";
+    nightModeEnabled = true;
+    nightModeEndHour = 6;
+    nightModeEndMinute = 0;
+    nightModeHighTemperature = 6500;
+    nightModeLocationProvider = "";
+    nightModeStartHour = 22;
+    nightModeStartMinute = 0;
+    nightModeTemperature = 5500;
+    nightModeUseIPLocation = false;
+
+    # Hardware
+    nonNvidiaGpuTempEnabled = false;
+    nvidiaGpuTempEnabled = false;
+    selectedGpuIndex = 0;
+    wifiDeviceOverride = "";
+    enabledGpuPciIds = [];
+    lastBrightnessDevice = "";
+
+    # Wallpapers
+    perModeWallpaper = false;
+    perMonitorWallpaper = false;
+    wallpaperCyclingEnabled = false;
+    wallpaperCyclingInterval = 300;
+    wallpaperCyclingMode = "interval";
+    wallpaperCyclingTime = "06:00";
+    wallpaperPath = "/home/christoph/NixFlake/wallpapers/Windows.jpg";
+    wallpaperPathDark = "";
+    wallpaperPathLight = "";
+    wallpaperTransition = "iris bloom";
+
+    # Random shit
+    includedTransitions = ["fade" "wipe" "disc" "stripes" "iris bloom" "pixelate" "portal"];
+    launchPrefix = "";
+    latitude = 0;
+    longitude = 0;
+    pinnedApps = [];
+    hiddenTrayIds = [];
+    recentColors = [];
+    showThirdPartyPlugins = true;
+
+    # Ultra random shit
+    monitorCyclingSettings = {};
+    monitorWallpapers = {};
+    monitorWallpapersDark = {};
+    monitorWallpapersLight = {};
+    brightnessExponentValues = {};
+    brightnessExponentialDevices = {};
+    brightnessUserSetValues = {};
+
+    configVersion = 1;
+  };
+}

home/modules/niri/default.nix

@@ -0,0 +1,580 @@
+{
+  config,
+  nixosConfig,
+  lib,
+  mylib,
+  inputs,
+  pkgs,
+  ...
+}: let
+  inherit (config.modules) niri color;
+in {
+  options.modules.niri = import ./options.nix {inherit lib mylib;};
+
+  config = lib.mkIf niri.enable rec {
+    assertions = [
+      {
+        assertion = nixosConfig.programs.niri.enable;
+        message = "Can't enable Niri config with Niri disabled!";
+      }
+      {
+        assertion = !(programs.noctalia-shell.enable && programs.dankMaterialShell.enable);
+        message = "Can't enable Noctalia and DankMaterialShell at the same time!";
+      }
+    ];
+
+    gtk = {
+      enable = true;
+      iconTheme.package = color.iconPackage;
+      iconTheme.name = color.iconTheme;
+    };
+
+    # Disable niri polkit if we use DMS, as it has its own
+    systemd.user.services.niri-flake-polkit = lib.mkForce {};
+
+    home = {
+      sessionVariables = {
+        QT_QPA_PLATFORMTHEME = "gtk3"; # For Noctalia
+        GDK_BACKEND = "wayland"; # For screen sharing
+      };
+
+      pointerCursor = {
+        gtk.enable = true;
+        x11.enable = true;
+        package = color.cursorPackage;
+        name = color.cursor;
+        size = color.cursorSize;
+      };
+
+      packages = with pkgs; [
+        xwayland-satellite
+        ncpamixer # Audio control
+
+        nautilus # Fallback file chooser used by xdg-desktop-portal-gnome
+
+        # In case we fallback to the default config
+        alacritty
+        fuzzel
+      ];
+    };
+
+    programs = {
+      # TODO: Those should be modules with their own options
+      noctalia-shell = import ./noctalia.nix {inherit color;};
+      dankMaterialShell = import ./dankMaterialShell.nix {inherit color;};
+
+      # TODO: Extract options
+      niri = {
+        # enable = true; # Enabled in system module
+
+        settings = {
+          input = {
+            focus-follows-mouse = {
+              enable = true;
+              # max-scroll-amount = "0%"; # Skip partial windows that would scroll the viewport on focus
+            };
+
+            keyboard = {
+              xkb = {
+                layout = "us";
+                variant = "altgr-intl";
+                options = "nodeadkeys";
+              };
+            };
+
+            touchpad = {
+              click-method = "clickfinger";
+              tap = true;
+              drag = true;
+              dwt = true;
+              natural-scroll = true;
+              scroll-method = "two-finger";
+            };
+          };
+
+          hotkey-overlay = {
+            hide-not-bound = true;
+            skip-at-startup = true;
+          };
+
+          prefer-no-csd = true; # Disable client-side decorations (e.g. window titlebars)
+
+          spawn-at-startup = [
+            # TODO: Depend on options
+            # {argv = ["noctalia-shell"];}
+            {argv = ["dms" "run"];}
+
+            {argv = ["kitty" "--hold" "fastfetch"];}
+            {argv = ["zeal"];}
+            {argv = ["protonvpn-app"];}
+            {argv = ["fcitx5"];}
+            {argv = ["jellyfin-mpv-shim"];}
+
+            {sh = "sleep 5s && nextcloud --background";}
+            {sh = "sleep 5s && keepassxc";}
+          ];
+
+          workspaces = {
+            "1" = {open-on-output = "DP-1";};
+            "2" = {open-on-output = "DP-1";};
+            "3" = {open-on-output = "DP-1";};
+            "4" = {open-on-output = "DP-1";};
+            "5" = {open-on-output = "DP-1";};
+            "6" = {open-on-output = "DP-1";};
+            "7" = {open-on-output = "DP-1";};
+            "8" = {open-on-output = "DP-1";};
+            "9" = {open-on-output = "DP-1";};
+            "10" = {open-on-output = "DP-2";};
+          };
+
+          outputs = {
+            "DP-1" = {
+              focus-at-startup = true;
+              mode = {
+                width = 3440;
+                height = 1440;
+                refresh = 164.999;
+              };
+              position = {
+                x = 1920;
+                y = 0;
+              };
+            };
+            "DP-2" = {
+              focus-at-startup = false;
+              mode = {
+                width = 1920;
+                height = 1080;
+                refresh = 60.0;
+              };
+              position = {
+                x = 0;
+                y = 0;
+              };
+            };
+          };
+
+          cursor = {
+            hide-when-typing = true;
+            theme = color.cursor;
+            size = color.cursorSize;
+          };
+
+          layout = {
+            # This border is drawn INSIDE the window
+            border = {
+              enable = true;
+              width = 2;
+              active = {color = color.hex.accent;};
+              inactive = {color = color.hex.base;};
+            };
+
+            # This border is drawn OUTSIDE of the focused window
+            focus-ring = {
+              enable = false;
+            };
+
+            # Hint where a dragged window will be inserted
+            insert-hint = {
+              enable = true;
+              display = {color = color.hex.accentDim;};
+            };
+
+            always-center-single-column = true;
+
+            # Gaps between windows
+            gaps = 8;
+
+            # Gaps at screen borders
+            struts = {
+              # left = 8;
+              # right = 8;
+              top = 4; # Somehow the bar eclusivity doesn't work as expected
+              bottom = 2;
+            };
+          };
+
+          gestures = {
+            hot-corners = {enable = false;};
+          };
+
+          window-rules = [
+            # Rules for all windows
+            {
+              default-column-width.proportion = 0.5;
+              default-window-height.proportion = 1.0;
+
+              # Rounded corners
+              clip-to-geometry = true;
+              geometry-corner-radius = {
+                bottom-left = 8.0;
+                bottom-right = 8.0;
+                top-left = 8.0;
+                top-right = 8.0;
+              };
+
+              # open-floating = false;
+              # open-focused = false;
+              # open-fullscreen = false;
+              # open-maximized = false;
+
+              # open-on-output = "DP-1";
+              # open-on-workspace = "2";
+
+              # opacity = 0.8;
+            }
+
+            # Rules for specific windows
+            {
+              matches = [{app-id = "Zotero";}];
+              open-on-workspace = "2";
+            }
+            {
+              matches = [{app-id = "neovide";}];
+              open-on-workspace = "2";
+              open-maximized = true;
+            }
+            {
+              matches = [{app-id = "code-url-handler";}];
+              open-on-workspace = "2";
+              open-floating = true;
+            }
+            {
+              matches = [{app-id = "obsidian";}];
+              open-on-workspace = "3";
+            }
+            {
+              matches = [{app-id = "firefox";}];
+              open-on-workspace = "4";
+              open-maximized = true;
+            }
+            {
+              matches = [{app-id = "Google-chrome";}];
+              open-on-workspace = "4";
+            }
+            {
+              matches = [{app-id = "chromium-browser";}];
+              open-on-workspace = "4";
+            }
+            {
+              matches = [{app-id = "org.qutebrowser.qutebrowser";}];
+              open-on-workspace = "4";
+            }
+            {
+              matches = [{app-id = "steam";}];
+              open-on-workspace = "5";
+            }
+            {
+              matches = [{app-id = "steam_app_(.+)";}];
+              open-on-workspace = "6";
+              open-floating = true;
+              open-maximized = true;
+            }
+            {
+              matches = [{app-id = "signal";}];
+              open-on-workspace = "7";
+              open-maximized = true;
+            }
+            {
+              matches = [{app-id = "discord";}];
+              open-on-workspace = "9";
+              open-maximized = true;
+            }
+          ];
+
+          layer-rules = [
+            {
+              # Set the overview wallpaper on the backdrop.
+              matches = [{namespace = "^noctalia-overview*";}];
+              place-within-backdrop = true;
+            }
+          ];
+
+          debug = {
+            # Allows notification actions and window activation from Noctalia.
+            honor-xdg-activation-with-invalid-serial = [];
+          };
+
+          # TODO: Only start hypr... stuff with hyprland, not systemd (hypridle, hyprpaper currently)
+
+          # TODO: Move values to config option and set in home/christoph/niri.nix
+          binds = with config.lib.niri.actions; {
+            # Applications
+            "Mod+T" = {
+              action = spawn "kitty";
+              hotkey-overlay = {title = "Spawn Kitty.";};
+            };
+            "Mod+E" = {
+              action = spawn "kitty" "--title=Yazi" "yazi";
+              hotkey-overlay = {title = "Spawn Yazi.";};
+            };
+            "Mod+B" = {
+              action = spawn "kitty" "--title=Btop" "btop";
+              hotkey-overlay = {title = "Spawn Btop.";};
+            };
+            "Mod+R" = {
+              action = spawn "kitty" "--title=Rmpc" "rmpc";
+              hotkey-overlay = {title = "Spawn Rmpc.";};
+            };
+            "Mod+N" = {
+              action = spawn "neovide";
+              hotkey-overlay = {title = "Spawn Neovide.";};
+            };
+            "Mod+Ctrl+N" = {
+              action = spawn "kitty" "--title=Navi" "navi";
+              hotkey-overlay = {title = "Call Navi for help.";};
+            };
+            "Mod+Shift+N" = {
+              action = spawn "neovide" "${config.paths.dotfiles}/navi/christoph.cheat";
+              hotkey-overlay = {title = "Edit the Navi cheats.";};
+            };
+            "Mod+Shift+F" = {
+              action = spawn "neovide" "${config.paths.dotfiles}/flake.nix";
+              hotkey-overlay = {title = "Edit the NixFlake.";};
+            };
+
+            # TODO: Enable with Noctalia option
+            # Noctalia
+            # "Mod+A" = {
+            #   action = spawn "noctalia-shell" "ipc" "call" "launcher" "toggle";
+            #   hotkey-overlay = {title = "Toggle the application launcher.";};
+            # };
+            # "Mod+Ctrl+L" = {
+            #   action = spawn "noctalia-shell" "ipc" "call" "lockScreen" "lock";
+            #   hotkey-overlay = {title = "Lock the screen.";};
+            # };
+            # "Mod+W" = {
+            #   action = spawn "noctalia-shell" "ipc" "call" "wallpaper" "toggle";
+            #   hotkey-overlay = {title = "Toggle the wallpaper chooser.";};
+            # };
+            # "Mod+Escape" = {
+            #   action = spawn "noctalia-shell" "ipc" "call" "sessionMenu" "toggle";
+            #   hotkey-overlay = {title = "Toggle the session menu.";};
+            # };
+
+            # TODO: Enable with DMS option
+            # DankMaterialShell
+            "Mod+A" = {
+              action = spawn "dms" "ipc" "call" "spotlight" "toggle";
+              hotkey-overlay = {title = "Toggle the application launcher.";};
+            };
+            "Mod+Ctrl+L" = {
+              action = spawn "dms" "ipc" "call" "lock" "lock";
+              hotkey-overlay = {title = "Lock the screen.";};
+            };
+            "Mod+Escape" = {
+              action = spawn "dms" "ipc" "call" "powermenu" "toggle";
+              hotkey-overlay = {title = "Toggle the session menu.";};
+            };
+            "Mod+C" = {
+              action = spawn "dms" "ipc" "call" "clipboard" "toggle";
+              hotkey-overlay = {title = "Show clipboard history.";};
+            };
+
+            # Screenshots
+            "Mod+S" = {
+              action.screenshot-window = {write-to-disk = true;};
+              hotkey-overlay = {title = "Take a screenshot of the current window.";};
+            };
+            "Mod+Shift+S" = {
+              action.screenshot = {show-pointer = true;};
+              hotkey-overlay = {title = "Take a screenshot of a region.";};
+            };
+
+            # Niri
+            "Mod+Shift+Slash" = {
+              action = show-hotkey-overlay;
+              hotkey-overlay = {hidden = true;};
+            };
+
+            # Audio
+            "XF86AudioRaiseVolume" = {
+              action = spawn "wpctl" "set-volume" "-l" "1.5" "@DEFAULT_AUDIO_SINK@" "5%+";
+              hotkey-overlay = {hidden = true;};
+            };
+            "XF86AudioLowerVolume" = {
+              action = spawn "wpctl" "set-volume" "-l" "1.5" "@DEFAULT_AUDIO_SINK@" "5%-";
+              hotkey-overlay = {hidden = true;};
+            };
+            "XF86AudioPlay" = {
+              action = spawn "playerctl" "play-pause";
+              hotkey-overlay = {hidden = true;};
+            };
+            "XF86AudioPrev" = {
+              action = spawn "playerctl" "previous";
+              hotkey-overlay = {hidden = true;};
+            };
+            "XF86AudioNext" = {
+              action = spawn "playerctl" "next";
+              hotkey-overlay = {hidden = true;};
+            };
+
+            # Niri windows
+            "Mod+Q" = {
+              action = close-window;
+              hotkey-overlay = {title = "Close the current window.";};
+            };
+            "Mod+F" = {
+              action = fullscreen-window;
+              hotkey-overlay = {title = "Toggle between fullscreen and tiled window.";};
+            };
+            "Mod+Equal" = {
+              action = set-column-width "+10%";
+              hotkey-overlay = {title = "Increase column width";};
+            };
+            "Mod+Minus" = {
+              action = set-column-width "-10%";
+              hotkey-overlay = {title = "Decrease column width";};
+            };
+            "Mod+Shift+M" = {
+              action = set-column-width "50%";
+              hotkey-overlay = {title = "Set column width to 50%";};
+            };
+            "Mod+M" = {
+              action = maximize-column;
+              hotkey-overlay = {title = "Maximize column.";};
+            };
+            "Mod+V" = {
+              action = toggle-window-floating;
+              hotkey-overlay = {title = "Toggle between floating and tiled window.";};
+            };
+            "Mod+O" = {
+              action = toggle-overview;
+              hotkey-overlay = {title = "Toggle overlay.";};
+            };
+            "Mod+H" = {
+              action = focus-column-or-monitor-left;
+              hotkey-overlay = {title = "Focus column on the left. Equivalent bindings for other directions.";};
+            };
+            "Mod+J" = {
+              action = focus-window-or-workspace-down;
+              hotkey-overlay = {hidden = true;};
+            };
+            "Mod+K" = {
+              action = focus-window-or-workspace-up;
+              hotkey-overlay = {hidden = true;};
+            };
+            "Mod+L" = {
+              action = focus-column-or-monitor-right;
+              hotkey-overlay = {hidden = true;};
+            };
+            "Mod+WheelScrollUp" = {
+              action = focus-column-left;
+              hotkey-overlay = {title = "Focus column on the left. Equivalent binding for other direction.";};
+            };
+            "Mod+WheelScrollDown" = {
+              action = focus-column-right;
+              hotkey-overlay = {hidden = true;};
+            };
+            "Mod+Shift+WheelScrollUp" = {
+              action = focus-workspace-up;
+              hotkey-overlay = {title = "Focus previous workspace. Equivalent binding for other direction.";};
+            };
+            "Mod+Shift+WheelScrollDown" = {
+              action = focus-workspace-down;
+              hotkey-overlay = {hidden = true;};
+            };
+            "Mod+Shift+H" = {
+              action = move-column-left-or-to-monitor-left;
+              hotkey-overlay = {title = "Move column to the left. Equivalent bindings for other directions.";};
+            };
+            "Mod+Shift+J" = {
+              action = move-window-down-or-to-workspace-down;
+              hotkey-overlay = {hidden = true;};
+            };
+            "Mod+Shift+K" = {
+              action = move-window-up-or-to-workspace-up;
+              hotkey-overlay = {hidden = true;};
+            };
+            "Mod+Shift+L" = {
+              action = move-column-right-or-to-monitor-right;
+              hotkey-overlay = {hidden = true;};
+            };
+
+            # Niri workspaces
+            "Mod+1" = {
+              action = focus-workspace 1;
+              hotkey-overlay = {title = "Focus workspace 1. Equivalent bindings for other workspaces.";};
+            };
+            "Mod+2" = {
+              action = focus-workspace 2;
+              hotkey-overlay = {hidden = true;};
+            };
+            "Mod+3" = {
+              action = focus-workspace 3;
+              hotkey-overlay = {hidden = true;};
+            };
+            "Mod+4" = {
+              action = focus-workspace 4;
+              hotkey-overlay = {hidden = true;};
+            };
+            "Mod+5" = {
+              action = focus-workspace 5;
+              hotkey-overlay = {hidden = true;};
+            };
+            "Mod+6" = {
+              action = focus-workspace 6;
+              hotkey-overlay = {hidden = true;};
+            };
+            "Mod+7" = {
+              action = focus-workspace 7;
+              hotkey-overlay = {hidden = true;};
+            };
+            "Mod+8" = {
+              action = focus-workspace 8;
+              hotkey-overlay = {hidden = true;};
+            };
+            "Mod+9" = {
+              action = focus-workspace 9;
+              hotkey-overlay = {hidden = true;};
+            };
+            "Mod+0" = {
+              action = focus-workspace 10;
+              hotkey-overlay = {hidden = true;};
+            };
+            "Mod+Shift+1" = {
+              action.move-window-to-workspace = 1;
+              hotkey-overlay = {title = "Move current window to workspace 1. Equivalent bindings for other workspaces.";};
+            };
+            "Mod+Shift+2" = {
+              action.move-window-to-workspace = 2;
+              hotkey-overlay = {hidden = true;};
+            };
+            "Mod+Shift+3" = {
+              action.move-window-to-workspace = 3;
+              hotkey-overlay = {hidden = true;};
+            };
+            "Mod+Shift+4" = {
+              action.move-window-to-workspace = 4;
+              hotkey-overlay = {hidden = true;};
+            };
+            "Mod+Shift+5" = {
+              action.move-window-to-workspace = 5;
+              hotkey-overlay = {hidden = true;};
+            };
+            "Mod+Shift+6" = {
+              action.move-window-to-workspace = 6;
+              hotkey-overlay = {hidden = true;};
+            };
+            "Mod+Shift+7" = {
+              action.move-window-to-workspace = 7;
+              hotkey-overlay = {hidden = true;};
+            };
+            "Mod+Shift+8" = {
+              action.move-window-to-workspace = 8;
+              hotkey-overlay = {hidden = true;};
+            };
+            "Mod+Shift+9" = {
+              action.move-window-to-workspace = 9;
+              hotkey-overlay = {hidden = true;};
+            };
+            "Mod+Shift+0" = {
+              action.move-window-to-workspace = 10;
+              hotkey-overlay = {hidden = true;};
+            };
+          };
+        };
+      };
+    };
+  };
+}

home/modules/niri/noctalia.nix

@@ -0,0 +1,265 @@
+{color}: {
+  enable = false;
+
+  settings = {
+    # configure noctalia here; defaults will
+    # be deep merged with these attributes.
+
+    colorSchemes.predefinedScheme = "Catppuccin";
+
+    general = {
+      avatarImage = ../../../config/face.jpeg;
+      radiusRatio = 0.2;
+      showScreenCorners = false;
+      forceBlackScreenCorners = false;
+      dimDesktop = true;
+      scaleRatio = 1;
+      screenRadiusRatio = 1;
+      animationSpeed = 1;
+      animationDisabled = false;
+      compactLockScreen = false;
+      lockOnSuspend = true;
+      enableShadows = true;
+      shadowDirection = "bottom_right";
+      shadowOffsetX = 2;
+      shadowOffsetY = 3;
+      language = "";
+    };
+
+    ui = {
+      fontDefault = color.font;
+      fontFixed = color.font;
+      tooltipsEnabled = true;
+      panelsAttachedToBar = true;
+      settingsPanelAttachTobar = true;
+      fontDefaultScale = 1;
+      fontFixedScale = 1;
+      settingsPanelAttachToBar = false;
+    };
+
+    location = {
+      name = "Dortmund, Germany";
+      monthBeforeDay = true;
+      weatherEnabled = true;
+      useFahrenheit = false;
+      use12hourFormat = false;
+      showWeekNumberInCalendar = false;
+      showCalendarEvents = true;
+      showCalendarWeather = true;
+      analogClockInCalendar = false;
+      firstDayOfWeek = -1;
+    };
+
+    screenRecorder = {
+      directory = "~/Videos/Recordings";
+      frameRate = 60;
+      audioCodec = "aac";
+      videoCodec = "h265";
+      quality = "very_high";
+      colorRange = "limited";
+      showCursor = true;
+      audioSource = "default_output";
+      videoSource = "portal";
+    };
+
+    wallpaper = {
+      enabled = true;
+      overviewEnabled = true;
+      directory = "~/NixFlake/wallpapers";
+      enableMultiMonitorDirectories = false;
+      recursiveSearch = false;
+      setWallpaperOnAllMonitors = true;
+      defaultWallpaper = ../../../wallpapers/Windows.jpg;
+      fillMode = "crop";
+      fillColor = "#000000";
+      randomEnabled = false;
+      randomIntervalSec = 300;
+      transitionDuration = 1500;
+      transitionType = "random";
+      transitionEdgeSmoothness = 0.05;
+      monitors = [];
+      panelPosition = "follow_bar";
+    };
+
+    appLauncher = {
+      enableClipboardHistory = true;
+      position = "center";
+      backgroundOpacity = 1;
+      pinnedExecs = [];
+      useApp2Unit = false;
+      sortByMostUsed = true;
+      terminalCommand = "kitty -e";
+      customLaunchPrefixEnabled = false;
+      customLaunchPrefix = "";
+    };
+
+    dock = {
+      enabled = false;
+    };
+
+    network = {
+      wifiEnabled = true;
+      bluetoothEnabled = true;
+    };
+
+    notifications = {
+      enabled = true;
+      monitors = [];
+      location = "top_right";
+      overlayLayer = true;
+      backgroundOpacity = 1;
+      respectExpireTimeout = false;
+      lowUrgencyDuration = 3;
+      normalUrgencyDuration = 8;
+      criticalUrgencyDuration = 15;
+    };
+
+    osd = {
+      enabled = true;
+      location = "top_right";
+      monitors = [];
+      autoHideMs = 2000;
+      overlayLayer = true;
+    };
+
+    audio = {
+      volumeStep = 5;
+      volumeOverdrive = true;
+      cavaFrameRate = 30;
+      visualizerType = "linear";
+      visualizerQuality = "high";
+      mprisBlacklist = [];
+      preferredPlayer = "";
+      externalMixer = "kitty --title=Ncpamixer ncpamixer";
+    };
+
+    nightLight = {
+      enabled = false;
+      forced = false;
+      autoSchedule = true;
+      nightTemp = "5000";
+      dayTemp = "6500";
+      manualSunrise = "06:30";
+      manualSunset = "21:30";
+    };
+
+    sessionMenu = {
+      countdownDuration = 10000;
+      enableCountdown = true;
+      position = "center";
+      powerOptions = [
+        {
+          action = "lock";
+          enabled = true;
+        }
+        {
+          action = "suspend";
+          enabled = false;
+        }
+        {
+          action = "reboot";
+          enabled = true;
+        }
+        {
+          action = "logout";
+          enabled = true;
+        }
+        {
+          action = "shutdown";
+          enabled = true;
+        }
+      ];
+      showHeader = true;
+    };
+
+    bar = {
+      density = "default";
+      position = "top";
+      showCapsule = false;
+      outerCorners = false;
+      exclusive = true;
+      backgroundOpacity = 1;
+      monitors = [];
+      floating = false;
+      marginVertical = 0.25;
+      marginHorizontal = 0.25;
+
+      widgets = {
+        left = [
+          {
+            id = "SidePanelToggle";
+            useDistroLogo = true;
+          }
+          {
+            hideUnoccupied = false;
+            id = "Workspace";
+            labelMode = "none";
+          }
+          {
+            id = "ActiveWindow";
+            maxWidth = 250;
+          }
+        ];
+        center = [
+          {
+            id = "MediaMini";
+            maxWidth = 250;
+            showAlbumArt = true;
+          }
+          {
+            id = "AudioVisualizer";
+            width = 100;
+            visualizerType = "mirrored";
+          }
+        ];
+        right = [
+          # {
+          #   id = "SystemMonitor";
+          #   usePrimaryColor = true;
+          #   showCpuUsage = true;
+          #   showCpuTemp = false;
+          #   showMemoryUsage = true;
+          #   showMemoryAsPercent = false;
+          #   showNetworkStats = true;
+          #   showDiskUsage = true;
+          #   diskPath = "/";
+          # }
+          {
+            id = "Volume";
+            # displayMode = "alwaysShow";
+          }
+          {
+            id = "Microphone";
+            # displayMode = "alwaysShow";
+          }
+          {
+            id = "Bluetooth";
+            # displayMode = "alwaysShow";
+          }
+          {
+            id = "WiFi";
+            # displayMode = "alwaysShow";
+          }
+          {
+            id = "VPN";
+            # displayMode = "alwaysShow";
+          }
+          {
+            id = "Tray";
+            drawerEnabled = false;
+          }
+          {
+            formatHorizontal = "yyyy-MM-dd HH:mm";
+            formatVertical = "HH mm";
+            id = "Clock";
+            useMonospacedFont = true;
+            usePrimaryColor = true;
+          }
+          {
+            id = "NotificationHistory";
+          }
+        ];
+      };
+    };
+  };
+}

home/modules/niri/options.nix

@@ -0,0 +1,7 @@
+{
+  lib,
+  mylib,
+  ...
+}: {
+  enable = lib.mkEnableOption "Niri";
+}

home/modules/rmpc/default.nix

@@ -49,7 +49,7 @@ in {
             enable_config_hot_reload: true,
             status_update_interval_ms: 1000,
             rewind_to_start_sec: 30,
-            lyrics_dir: "${config.home.homeDirectory}/Music/.lyrics",
+            lyrics_dir: "${config.home.homeDirectory}/Music",
 
             // Keep this on false, otherwise queue changes will be applied to the current playlist
             reflect_changes_to_playlist: false,

home/modules/rofi/default.nix

@@ -15,7 +15,7 @@ in {
   config = lib.mkIf rofi.enable {
     programs.rofi = {
       enable = true;
-      package = pkgs.rofi-wayland;
+      package = pkgs.rofi;
       terminal = "kitty";
       font = "${color.font} 14";
       location = "center";
@@ -24,7 +24,7 @@ in {
       extraConfig = {
         modi = "run,drun,ssh,filebrowser";
         show-icons = true;
-        icon-theme = "Papirus";
+        icon-theme = color.iconTheme;
         drun-display-format = "{icon} {name}";
         disable-history = false;
         hide-scrollbar = true;
@@ -184,7 +184,8 @@ in {
         (color.wallpapers
           |> builtins.map (setWallpaperOnMonitors monitors)
           |> lib.mergeAttrsList);
-    in {
+    in
+      lib.mkIf (!config.modules.hyprland.caelestia.enable) {
         bindings = lib.mergeAttrsList [
           {
             "$mainMod, escape" = ["exec, \"${power-menu}/bin/rofi-menu-power\""];

home/modules/yazi/default.nix

@@ -68,7 +68,7 @@ in {
         opener = {
           play = [
             {
-              run = ''vlc "$@"'';
+              run = ''mpv "$@"'';
               orphan = true;
               desc = "Play selection";
             }

overlays/default.nix

@@ -26,6 +26,10 @@
     #     localSystem = {inherit (prev) system;};
     #   }).unityhub;
 
+    # Remove this after jetbrains.jdk builds again (nixpkgs issue 425328)
+    # jetbrains.rider = pkgs-stable.jetbrains.rider;
+
+    # Now in Nixpkgs
     # neovide = prev.neovide.overrideAttrs (finalAttrs: prevAttrs: {
     #   version = "0.15.1";
     #   src = prev.fetchFromGitHub {
@@ -41,8 +45,21 @@
     #   };
     # });
 
-    # Remove this after jetbrains.jdk builds again (nixpkgs issue 425328)
+    # Now in Nixpkgs
-    # jetbrains.rider = pkgs-stable.jetbrains.rider;
+    # rmpc = prev.rmpc.overrideAttrs (finalAttrs: prevAttrs: {
+    #   version = "0.10.0";
+    #   src = prev.fetchFromGitHub {
+    #     owner = "mierak";
+    #     repo = "rmpc";
+    #     rev = "v0.10.0";
+    #     hash = "sha256-NU8T26oPhm8L7wdO4p65cpNa0pax7/oqHGs98QDoEc0=";
+    #   };
+    #   cargoHash = "sha256-d2/4q2s/11HNE18D8d8Y2yWidhT+XsUS4J9ahnxToI0=";
+    #   cargoDeps = prev.rustPlatform.fetchCargoVendor {
+    #     inherit (finalAttrs) pname src version;
+    #     hash = finalAttrs.cargoHash;
+    #   };
+    # });
   };
 in
   # Composes a list of overlays and returns a single overlay function that combines them.

system/default.nix

@@ -41,6 +41,7 @@ with mylib.networking; {
 
       termfilechooser.enable = true;
       hyprland.enable = config.programs.hyprland.enable;
+      niri.enable = config.programs.niri.enable;
     };
 
     docker = {
@@ -69,8 +70,8 @@ with mylib.networking; {
       defaultWebBrowser = "firefox.desktop";
       defaultPdfViewer = "org.pwmt.zathura.desktop";
       defaultImageViewer = "imv-dir.desktop";
-      defaultAudioPlayer = "vlc.desktop";
+      defaultAudioPlayer = "mpv.desktop";
-      defaultVideoPlayer = "vlc.desktop";
+      defaultVideoPlayer = "mpv.desktop";
     };
 
     network = {
@@ -143,7 +144,7 @@ with mylib.networking; {
 
   # Bootloader/Kernel stuff
   boot = {
-    kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
+    kernelPackages = lib.mkDefault pkgs.linuxPackages;
     kernelParams = ["mitigations=off"]; # I don't care
 
     # Make /tmp volatile
@@ -324,7 +325,7 @@ with mylib.networking; {
     firejail.enable = true; # Use to run app in network namespace (e.g. through vpn)
     fuse.userAllowOther = true; # Allow users to mount e.g. samba shares (cifs)
     git.enable = true;
-    kdeconnect.enable = !headless; # Use this instead of HM for firewall setup
+    # kdeconnect.enable = !headless; # Use this instead of HM for firewall setup
     neovim.enable = true;
     nix-ld.enable = true; # Load dynamically linked executables
 
@@ -340,11 +341,13 @@ with mylib.networking; {
       enableSSHSupport = true;
     };
 
+    gpu-screen-recorder.enable = !headless;
+
     hyprland = {
       enable = !headless;
 
-      package = inputs.hyprland.packages.${system}.hyprland;
+      package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
-      portalPackage = inputs.hyprland.packages.${system}.xdg-desktop-portal-hyprland;
+      portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
 
       xwayland.enable = true;
       withUWSM = true;
@@ -357,6 +360,7 @@ with mylib.networking; {
       flake = "/home/${username}/NixFlake";
     };
 
+    niri.enable = !headless;
     ssh.startAgent = true; # Use gnupg
     starship.enable = true;
     xwayland.enable = !headless;
@@ -385,6 +389,21 @@ with mylib.networking; {
       wacom.enable = true;
     };
 
+    # greetd = {
+    #   enable = !headless;
+    #   restart = false;
+    #   useTextGreeter = true;
+    #
+    #   settings = {
+    #     terminal.vt = 1;
+    #
+    #     default_session = {
+    #       command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd $SHELL";
+    #       user = "greeter";
+    #     };
+    #   };
+    # };
+
     # Enable touchpad support (enabled default in most desktopManager).
     libinput.enable = !headless;
 
@@ -444,6 +463,7 @@ with mylib.networking; {
     services."refresh-nps-cache" = {
       # Make sure `nix` and `nix-env` are findable by systemd.services.
       path = ["/run/current-system/sw/"];
+      after = ["network.target"];
       serviceConfig = {
         Type = "oneshot";
         User = "${username}";
@@ -451,7 +471,7 @@ with mylib.networking; {
       script = ''
         set -eu
         echo "Start refreshing nps cache..."
-        ${inputs.nps.packages.${system}.default}/bin/nps -dddd -e -r
+        ${inputs.nps.packages.${pkgs.stdenv.hostPlatform.system}.default}/bin/nps -dddd -e -r
         echo "... finished nps cache with exit code $?."
       '';
     };

system/modules/desktopportal/default.nix

@@ -14,7 +14,7 @@ in {
       portal = {
         enable = true;
         xdgOpenUsePortal = true;
-        wlr.enable = false;
+        wlr.enable = true;
 
         # TODO: Replace lib.optional(s) throughout the config with mkMerge
         config = lib.mkMerge [
@@ -35,6 +35,14 @@ in {
             (desktopportal.hyprland.enable && desktopportal.termfilechooser.enable) {
               hyprland."org.freedesktop.impl.portal.FileChooser" = ["termfilechooser"];
             })
+
+          (lib.mkIf desktopportal.niri.enable {
+            niri.default = ["gtk" "gnome"];
+          })
+
+          (lib.mkIf (desktopportal.niri.enable && desktopportal.termfilechooser.enable) {
+            niri."org.freedesktop.impl.portal.FileChooser" = ["termfilechooser"];
+          })
         ];
 
         extraPortals = with pkgs;

system/modules/desktopportal/options.nix

@@ -6,4 +6,5 @@
   enable = lib.mkEnableOption "Enable XDG desktop portals";
   termfilechooser.enable = lib.mkEnableOption "Enable xdg-desktop-portal-termfilechooser";
   hyprland.enable = lib.mkEnableOption "Configure portals for Hyprland";
+  niri.enable = lib.mkEnableOption "Configure portals for Niri";
 }

system/modules/docker/default.nix

@@ -2,6 +2,7 @@
   config,
   lib,
   mylib,
+  pkgs,
   ...
 }: let
   inherit (config.modules) docker;
@@ -22,6 +23,8 @@ in {
         enable = !docker.podman;
         autoPrune.enable = true;
 
+        extraPackages = with pkgs; [docker-compose];
+
         rootless = {
           enable = docker.docker.rootless;
           setSocketVariable = true;
@@ -54,7 +57,7 @@ in {
         dockerSocket.enable = true;
         defaultNetwork.settings.dns_enabled = true;
 
-        # extraPackages = with pkgs; [];
+        extraPackages = with pkgs; [podman-compose];
       };
 
       oci-containers.backend =

system/modules/fonts/default.nix

@@ -29,7 +29,7 @@ in {
 
         # Sans/Serif fonts
         noto-fonts
-        noto-fonts-emoji
+        noto-fonts-color-emoji
         noto-fonts-cjk-sans
         lxgw-wenkai
       ];

system/modules/impermanence/default.nix

@@ -69,9 +69,12 @@ in {
           # https://github.com/nix-community/impermanence/issues/253
           (mkRDir "/usr/systemd-placeholder" m755)
 
+          (mkRDir "/var/cache/restic-backups-synology" m755)
+
           (mkRDir "/var/db/sudo" m711)
 
           (mkRDir "/var/lib/bluetooth" m755) # m700
+          (mkRDir "/var/lib/btrfs" m755)
           (mkRDir "/var/lib/containers" m755)
           (mkRDir "/var/lib/flatpak" m755)
           (mkRDir "/var/lib/libvirt" m755)
@@ -102,7 +105,7 @@ in {
             (mkUDir "Pictures" m755)
             (mkUDir "Projects" m755)
             (mkUDir "Public" m755)
-            (mkUDir "Unity" m755)
+            # (mkUDir "Unity" m755)
             (mkUDir "Videos" m755)
 
             # Secrets
@@ -111,15 +114,16 @@ in {
             (mkUDir ".ssh" m755) # m644
 
             # The shit some applications add to ~/ without asking
-            (mkUDir ".android" m755) # Unity
+            # (mkUDir ".android" m755) # Unity
-            (mkUDir ".gradle" m755) # Unity
+            # (mkUDir ".gradle" m755) # Unity
-            (mkUDir ".java" m755) # Unity/Rider
+            # (mkUDir ".java" m755) # Unity/Rider
+            (mkUDir ".MakeMKV" m755)
             (mkUDir ".mozilla/firefox" m755) # TODO: Remove this someday
             (mkUDir ".mozilla/native-messaging-hosts" m755)
             (mkUDir ".nix-package-search" m755)
-            (mkUDir ".nv" m755) # Unity
+            # (mkUDir ".nv" m755) # Unity
             (mkUDir ".ollama" m755)
-            (mkUDir ".plastic4" m755) # Unity
+            # (mkUDir ".plastic4" m755) # Unity
             (mkUDir ".var/app" m755)
             (mkUDir ".vim/undo" m755)
             (mkUDir ".zotero" m755)
@@ -131,14 +135,15 @@ in {
             (mkUDir ".cache/nvim" m755)
 
             # Config
-            (mkUDir ".config/.android" m755) # Unity
+            # (mkUDir ".config/.android" m755) # Unity
             (mkUDir ".config/beets" m755)
             (mkUDir ".config/blender" m755)
             (mkUDir ".config/chromium" m755) # TODO: Remove this someday
             (mkUDir ".config/Ferdium" m755)
             (mkUDir ".config/fish/completions" m755)
             (mkUDir ".config/impermanence" m755)
-            (mkUDir ".config/JetBrains" m755) # Unity/Rider
+            (mkUDir ".config/jellyfin-mpv-shim" m755)
+            (mkUDir ".config/JetBrains" m755)
             (mkUDir ".config/kdeconnect" m755)
             (mkUDir ".config/keepassxc" m755)
             (mkUDir ".config/Msty" m755)
@@ -146,11 +151,12 @@ in {
             (mkUDir ".config/obsidian" m755)
             (mkUDir ".config/obs-studio" m755)
             (mkUDir ".config/Signal" m755)
-            (mkUDir ".config/singularitygroup-hotreload" m755) # Unity
+            # (mkUDir ".config/singularitygroup-hotreload" m755) # Unity
+            (mkUDir ".config/TeamSpeak" m755)
             (mkUDir ".config/tidal-hifi" m755)
             (mkUDir ".config/tidal_dl_ng" m755)
-            (mkUDir ".config/unity3d" m755) # Unity
+            # (mkUDir ".config/unity3d" m755) # Unity
-            (mkUDir ".config/unityhub" m755) # Unity
+            # (mkUDir ".config/unityhub" m755) # Unity
             (mkUDir ".config/vlc" m755)
             (mkUDir ".config/Zeal" m755)
 
@@ -162,12 +168,14 @@ in {
             (mkUDir ".local/share/JetBrains" m755) # Unity
             (mkUDir ".local/share/hyprland" m755)
             (mkUDir ".local/share/keyrings" m755) # m700
+            (mkUDir ".local/share/LRCGET" m755)
             (mkUDir ".local/share/mime" m755)
+            (mkUDir ".local/share/net.lrclib.lrcget" m755)
             (mkUDir ".local/share/nix" m755)
             (mkUDir ".local/share/nvim" m755)
             (mkUDir ".local/share/qutebrowser" m755)
             (mkUDir ".local/share/systemd" m755)
-            (mkUDir ".local/share/unity3d" m755) # Unity
+            # (mkUDir ".local/share/unity3d" m755) # Unity
             (mkUDir ".local/share/zoxide" m755)
 
             # State

system/nixinator/default.nix

@@ -12,6 +12,9 @@
     ./disks.nix
 
     ../modules
+
+    # General services
+    ../services/fileflows-node.nix
   ];
 
   modules = {
@@ -104,7 +107,8 @@
   };
 
   boot = {
-    # kernelPackages = pkgs.linuxPackages_zen;
+    kernelPackages = pkgs.linuxPackages_zen;
+    # kernelPackages = pkgs.linuxPackages_latest;
 
     # kernelParams = [ "quiet" ];
     # plymouth.enable = true;

system/nixinator/hardware-configuration.nix

@@ -35,6 +35,10 @@
       "vfat"
     ];
 
+    supportedFilesystems = [
+      # "zfs" # Probably requires LTS kernel + networking.hostId
+    ];
+
     kernelModules = [
       "kvm-amd"
       "sg" # Blu-Ray drive
@@ -60,6 +64,9 @@
     ];
   };
 
+  # Required for supportedFilesystems = ["zfs"];, so pools don't get imported on the wrong machine
+  # networking.hostId = "611e6afb";
+
   fileSystems = {
     # NOTE: Some filesystems are managed by disko (see ./disks.nix)
 
@@ -82,29 +89,39 @@
     # Using  NFS over TCP or increasing the value of the retrans option may mitigate
     # some of the risks of using the soft option.
 
-    "/home/${username}/Movies" = {
+    # Synology DS223j
-      device = "192.168.86.20:/mnt/SG Exos Mirror 18TB/Movie";
-      fsType = "nfs";
-      options = ["defaults" "rw" "noatime" "_netdev" "bg" "soft"];
-    };
-
-    "/home/${username}/Shows" = {
-      device = "192.168.86.20:/mnt/SG Exos Mirror 18TB/Show";
-      fsType = "nfs";
-      options = ["defaults" "rw" "noatime" "_netdev" "bg" "soft"];
-    };
-
-    "/home/${username}/Music" = {
-      device = "192.168.86.20:/mnt/SG Exos Mirror 18TB/Music";
-      fsType = "nfs";
-      options = ["defaults" "rw" "noatime" "_netdev" "bg" "soft"];
-    };
 
     "/home/${username}/Restic" = {
       device = "192.168.86.15:/volume1/NixinatorPersistence";
       fsType = "nfs";
       options = ["defaults" "rw" "noatime" "_netdev" "bg" "soft"];
     };
+
+    # TrueNAS
+
+    "/home/${username}/Movies" = {
+      device = "192.168.86.20:/mnt/Seagate4TB/Movies";
+      fsType = "nfs";
+      options = ["defaults" "rw" "noatime" "_netdev" "bg" "soft"];
+    };
+
+    "/home/${username}/Shows" = {
+      device = "192.168.86.20:/mnt/Seagate4TB/Shows";
+      fsType = "nfs";
+      options = ["defaults" "rw" "noatime" "_netdev" "bg" "soft"];
+    };
+
+    "/home/${username}/Music" = {
+      device = "192.168.86.20:/mnt/Seagate4TB/Music";
+      fsType = "nfs";
+      options = ["defaults" "rw" "noatime" "_netdev" "bg" "soft"];
+    };
+
+    "/media/Box" = {
+      device = "192.168.86.20:/mnt/Seagate4TB/Box";
+      fsType = "nfs";
+      options = ["defaults" "rw" "relatime" "_netdev" "bg" "soft"];
+    };
   };
 
   hardware = {
@@ -116,8 +133,8 @@
     nvidia-container-toolkit.enable = true;
 
     nvidia = {
-      package = config.boot.kernelPackages.nvidiaPackages.stable;
+      # package = config.boot.kernelPackages.nvidiaPackages.stable;
-      # package = config.boot.kernelPackages.nvidiaPackages.beta;
+      package = config.boot.kernelPackages.nvidiaPackages.beta;
 
       open = true;
       nvidiaSettings = false; # Those are for x-server
@@ -131,7 +148,7 @@
 
       # https://nixos.wiki/wiki/Accelerated_Video_Playback
       extraPackages = with pkgs; [
-        vaapiVdpau # Taken from wiki, this is also part of nixos-hardware/common/gpu/nvidia
+        libva-vdpau-driver # Taken from wiki, this is also part of nixos-hardware/common/gpu/nvidia
         libvdpau-va-gl # Taken from wiki
 
         # https://discourse.nixos.org/t/nvidia-open-breaks-hardware-acceleration/58770/3

system/nixtop/hardware-configuration.nix

@@ -71,8 +71,8 @@
       # driSupport = true; # NOTE: Deprecated
       extraPackages = with pkgs; [
         intel-media-driver
-        vaapiIntel
+        intel-vaapi-driver
-        vaapiVdpau
+        libva-vdpau-driver
         libvdpau-va-gl
       ];
     };

system/servenix/default.nix

@@ -20,18 +20,30 @@
     ../services/heidi.nix
     ../services/formula10.nix
     ../services/formula11.nix
+    ../services/statespaces.nix
 
     # General services
     ../services/authelia.nix
+    ../services/bazarr.nix
+    ../services/box.nix
+    ../services/fileflows.nix
     ../services/gitea.nix
-    ../services/gitea-runner.nix
     ../services/immich.nix
     ../services/jellyfin.nix
     ../services/kopia.nix
     ../services/nextcloud.nix
     ../services/nginx-proxy-manager.nix
     ../services/paperless.nix
+    # ../services/plex.nix # Their monetization strategy is absolutely atrocious
     ../services/portainer-agent.nix
+    ../services/pulse-agent-servenix.nix
+    ../services/prowlarr.nix
+    ../services/radarr.nix
+    ../services/sabnzbd-movies.nix
+    ../services/sabnzbd-shows.nix
+    ../services/sonarr.nix
+    ../services/teamspeak.nix
+    ../services/tinymediamanager.nix
     ../services/whats-up-docker.nix
   ];
 
@@ -57,16 +69,30 @@
         };
       };
 
+      # NOTE: Streams: Ports have to be opened in the VPS firewall + VPS UFW and bound in the VPS Nginx compose file.
+
       allowedTCPPorts = [
-        53 # DNS
+        53 # DNS (Adguard Home)
-        80 # HTTP
+        67 # DHCP
-        3000 # Gitea runner needs to reach local gitea instance
+        80 # HTTP (Nginx Proxy Manager)
+        443 # HTTPS (Nginx Proxy Manager)
+
+        3000 # Gitea (runner needs to reach local gitea instance)
+
+        30033 # Teamspeak
+        10080 # Teamspeak
       ];
 
       allowedUDPPorts = [
-        53 # DNS
+        53 # DNS (Adguard Home)
         67 # DHCP
-        3000 # Gitea runner needs to reach local gitea instance
+        80 # HTTP (Nginx Proxy Manager)
+        443 # HTTPS (Nginx Proxy Manager)
+
+        3000 # Gitea (runner needs to reach local gitea instance)
+
+        30033 # Teamspeak
+        9987 # Teamspeak
       ];
     };
 

system/servenix/hardware-configuration.nix

@@ -44,22 +44,28 @@
       options = ["defaults" "rw" "relatime" "_netdev" "bg" "soft"];
     };
 
-    # SG Exos Mirror Shares
+    # TrueNAS
 
     "/media/Movie" = {
-      device = "192.168.86.20:/mnt/SG Exos Mirror 18TB/Movie";
+      device = "192.168.86.20:/mnt/Seagate4TB/Movies";
       fsType = "nfs";
       options = ["defaults" "rw" "relatime" "_netdev" "bg" "soft"];
     };
 
     "/media/Show" = {
-      device = "192.168.86.20:/mnt/SG Exos Mirror 18TB/Show";
+      device = "192.168.86.20:/mnt/Seagate4TB/Shows";
       fsType = "nfs";
       options = ["defaults" "rw" "relatime" "_netdev" "bg" "soft"];
     };
 
     "/media/TV-Music" = {
-      device = "192.168.86.20:/mnt/SG Exos Mirror 18TB/Music";
+      device = "192.168.86.20:/mnt/Seagate4TB/Music";
+      fsType = "nfs";
+      options = ["defaults" "rw" "relatime" "_netdev" "bg" "soft"];
+    };
+
+    "/media/Box" = {
+      device = "192.168.86.20:/mnt/Seagate4TB/Box";
       fsType = "nfs";
       options = ["defaults" "rw" "relatime" "_netdev" "bg" "soft"];
     };
@@ -92,7 +98,7 @@
       enable32Bit = true;
 
       extraPackages = with pkgs; [
-        vaapiVdpau
+        libva-vdpau-driver
         libvdpau-va-gl
 
         nvidia-vaapi-driver

system/services/authelia.nix

@@ -20,9 +20,7 @@ in {
         passwordFile = "${config.sops.secrets.docker-password.path}";
       };
 
-      dependsOn = [
+      dependsOn = [];
-        # "pihole"
-      ];
 
       ports = [
         # "9091:9091"

system/services/bazarr.nix

@@ -0,0 +1,49 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  bazarrVersion = "1.5.3";
+in {
+  virtualisation.oci-containers.containers = {
+    bazarr = {
+      image = "linuxserver/bazarr:${bazarrVersion}";
+      autoStart = true;
+
+      login = {
+        # Uses DockerHub by default
+        # registry = "";
+
+        # DockerHub Credentials
+        username = "christoph.urlacher@protonmail.com";
+        passwordFile = "${config.sops.secrets.docker-password.path}";
+      };
+
+      dependsOn = [];
+
+      ports = [
+        # "6767:6767"
+      ];
+
+      volumes = [
+        "/media/Movie:/media/movies"
+        "/media/Show:/media/shows"
+
+        "bazarr_config:/config"
+      ];
+
+      environment = {
+        PUID = "1000";
+        PGID = "1000";
+        TZ = "Europe/Berlin";
+      };
+
+      extraOptions = [
+        # "--privileged"
+        # "--device=nvidia.com/gpu=all"
+        "--net=behind-nginx"
+      ];
+    };
+  };
+}

system/services/box.nix

@@ -0,0 +1,59 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  boxVersion = "v0.29.3";
+in {
+  virtualisation.oci-containers.containers = {
+    box = {
+      image = "stashapp/stash:${boxVersion}";
+      autoStart = true;
+
+      login = {
+        # Uses DockerHub by default
+        # registry = "";
+
+        # DockerHub Credentials
+        username = "christoph.urlacher@protonmail.com";
+        passwordFile = "${config.sops.secrets.docker-password.path}";
+      };
+
+      dependsOn = [];
+
+      ports = [
+        # "9999:9999"
+      ];
+
+      volumes = [
+        "/etc/localtime:/etc/localtime:ro"
+
+        "/media/Box:/data"
+
+        "box_config:/root/.stash"
+        "box_metadata:/metadata"
+        "box_cache:/cache"
+        "box_blobs:/blobs"
+        "box_generated:/generated"
+      ];
+
+      environment = {
+        PUID = "3000";
+        PGID = "3000";
+        TZ = "Europe/Berlin";
+
+        STASH_STASH = "/data/";
+        STASH_GENERATED = "/generated/";
+        STASH_METADATA = "/metadata/";
+        STASH_CACHE = "/cache/";
+      };
+
+      extraOptions = [
+        "--privileged"
+        "--device=nvidia.com/gpu=all"
+        "--net=behind-nginx"
+      ];
+    };
+  };
+}

system/services/fileflows-node.nix

@@ -0,0 +1,54 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  fileflowsVersion = "25.10";
+in {
+  virtualisation.oci-containers.containers = {
+    fileflows-node = {
+      image = "revenz/fileflows:${fileflowsVersion}";
+      autoStart = true;
+
+      login = {
+        # Uses DockerHub by default
+        # registry = "";
+
+        # DockerHub Credentials
+        username = "christoph.urlacher@protonmail.com";
+        passwordFile = "${config.sops.secrets.docker-password.path}";
+      };
+
+      dependsOn = [];
+
+      ports = [];
+
+      volumes = [
+        "/home/christoph/Movies:/media/movies"
+        "/home/christoph/Shows:/media/tvshows"
+
+        "fileflows_temp:/temp"
+
+        "/var/run/docker.sock:/var/run/docker.socl:ro"
+      ];
+
+      hostname = "Nixinator";
+
+      environment = {
+        PUID = "3000";
+        PGID = "3000";
+        TZ = "Europe/Berlin";
+
+        FFNODE = "1";
+        ServerUrl = "https://fileflows.local.chriphost.de";
+      };
+
+      extraOptions = [
+        "--privileged"
+        "--device=nvidia.com/gpu=all"
+        # "--net=behind-nginx"
+      ];
+    };
+  };
+}

system/services/fileflows.nix

@@ -0,0 +1,51 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  version = "25.10";
+in {
+  virtualisation.oci-containers.containers = {
+    fileflows = {
+      image = "revenz/fileflows:${version}";
+      autoStart = true;
+
+      login = {
+        # Uses DockerHub by default
+        # registry = "";
+
+        # DockerHub Credentials
+        username = "christoph.urlacher@protonmail.com";
+        passwordFile = "${config.sops.secrets.docker-password.path}";
+      };
+
+      dependsOn = [];
+
+      ports = [];
+
+      volumes = [
+        "fileflows_temp:/temp"
+        "fileflows_data:/app/Data"
+        "fileflows_logs:/app/Logs"
+
+        "/media/Movie:/media/movies"
+        "/media/Show:/media/tvshows"
+
+        "/var/run/docker.sock:/var/run/docker.sock:ro"
+      ];
+
+      environment = {
+        PUID = "3000";
+        PGID = "3000";
+        TZ = "Europe/Berlin";
+      };
+
+      extraOptions = [
+        "--privileged"
+        "--device=nvidia.com/gpu=all"
+        "--net=behind-nginx"
+      ];
+    };
+  };
+}

system/services/formula10.nix

@@ -14,7 +14,7 @@ in {
       dependsOn = [];
 
       ports = [
-        "55555:5000"
+        "55555:5000" # Bind for VPS
       ];
 
       volumes = [

system/services/formula11.nix

@@ -4,7 +4,7 @@
   pkgs,
   ...
 }: let
-  pocketbaseVersion = "0.25.0";
+  pocketbaseVersion = "0.33.0";
   f11Version = "latest";
 in {
   virtualisation.oci-containers.containers = {
@@ -12,12 +12,10 @@ in {
       image = "gitea.vps.chriphost.de/christoph/pocketbase:${pocketbaseVersion}";
       autoStart = true;
 
-      dependsOn = [
+      dependsOn = [];
-        # "pihole"
-      ];
 
       ports = [
-        "8090:8080"
+        "8090:8080" # Bind for VPS
       ];
 
       volumes = [

system/services/gitea-runner.nix

@@ -1,52 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}: let
-  runnerVersion = "0.2.12";
-in {
-  virtualisation.oci-containers.containers = {
-    gitea-runner = {
-      image = "gitea/act_runner:${runnerVersion}"; # NOTE: vegardit has other runner images
-      autoStart = true;
-
-      login = {
-        # Uses DockerHub by default
-        # registry = "";
-
-        # DockerHub Credentials
-        username = "christoph.urlacher@protonmail.com";
-        passwordFile = "${config.sops.secrets.docker-password.path}";
-      };
-
-      dependsOn = [];
-
-      ports = [];
-
-      volumes = [
-        "gitea-runner_data:/data"
-        "gitea-runner_config:/config" # Managed by env variables for vegardit image
-
-        "/var/run/docker.sock:/var/run/docker.sock" # Disable for dind
-      ];
-
-      environment = {
-        # gitlab.local.chriphost.de doesn't work, because it gets resolved to 192.168.86.25:443, which is nginx
-        GITEA_INSTANCE_URL = "http://192.168.86.25:3000";
-        GITEA_RUNNER_NAME = "servenix";
-
-        # Can be generated from inside the container using act_runner generate-config > /config/config.yaml
-        CONFIG_FILE = "/config/config.yaml";
-
-        # This token is invalid, when re-registering is needed it has to be refreshed
-        GITEA_RUNNER_REGISTRATION_TOKEN = "Mq6wr0dPthqDij3iaryP8s5VYZA5kPfOQbHA6wm6";
-      };
-
-      extraOptions = [
-        # "--privileged" # Enable for dind
-        "--net=behind-nginx"
-      ];
-    };
-  };
-}

system/services/gitea.nix

@@ -5,6 +5,7 @@
   ...
 }: let
   giteaVersion = "1.24.2";
+  runnerVersion = "0.2.12";
 in {
   users = {
     groups.git = {};
@@ -72,7 +73,7 @@ in {
       ];
 
       ports = [
-        "3000:3000"
+        "3000:3000" # Bind for VPS
 
         # NOTE: Set .git/config url to ssh://christoph@gitea.local.chriphost.de:222/christoph/<repo>.git
         "222:222" # Gitea SSH
@@ -101,5 +102,49 @@ in {
         "--net=behind-nginx"
       ];
     };
+
+    gitea-runner = {
+      image = "gitea/act_runner:${runnerVersion}"; # NOTE: vegardit has other runner images
+      autoStart = true;
+
+      login = {
+        # Uses DockerHub by default
+        # registry = "";
+
+        # DockerHub Credentials
+        username = "christoph.urlacher@protonmail.com";
+        passwordFile = "${config.sops.secrets.docker-password.path}";
+      };
+
+      dependsOn = [
+        "gitea"
+      ];
+
+      ports = [];
+
+      volumes = [
+        "gitea-runner_data:/data"
+        "gitea-runner_config:/config" # Managed by env variables for vegardit image
+
+        "/var/run/docker.sock:/var/run/docker.sock" # Disable for dind
+      ];
+
+      environment = {
+        # gitlab.local.chriphost.de doesn't work, because it gets resolved to 192.168.86.25:443, which is nginx
+        GITEA_INSTANCE_URL = "http://192.168.86.25:3000";
+        GITEA_RUNNER_NAME = "servenix";
+
+        # Can be generated from inside the container using act_runner generate-config > /config/config.yaml
+        CONFIG_FILE = "/config/config.yaml";
+
+        # This token is invalid, when re-registering is needed it has to be refreshed
+        GITEA_RUNNER_REGISTRATION_TOKEN = "Mq6wr0dPthqDij3iaryP8s5VYZA5kPfOQbHA6wm6";
+      };
+
+      extraOptions = [
+        # "--privileged" # Enable for dind
+        "--net=behind-nginx"
+      ];
+    };
   };
 }

system/services/immich.nix

@@ -6,7 +6,7 @@
 }: let
   vectorchordVersion = "0.4.2";
   pgvectorsVersion = "0.2.0";
-  immichVersion = "1.138.0";
+  immichVersion = "2.3.1";
 in {
   virtualisation.oci-containers.containers = {
     immich-database = {
@@ -73,7 +73,7 @@ in {
       ];
 
       ports = [
-        "2283:8080"
+        "2283:8080" # Bind for VPS
       ];
 
       volumes = [

system/services/jellyfin.nix

@@ -4,7 +4,7 @@
   pkgs,
   ...
 }: let
-  jellyfinVersion = "10.10.7";
+  jellyfinVersion = "10.11.2";
 in {
   virtualisation.oci-containers.containers = {
     jellyfin = {
@@ -25,7 +25,7 @@ in {
       ];
 
       ports = [
-        "8096:8096"
+        "8096:8096" # Bind for VPS
       ];
 
       volumes = [

system/services/nextcloud.nix

@@ -112,7 +112,7 @@ in {
       ];
 
       ports = [
-        "8080:80"
+        "8080:80" # Bind for VPS
       ];
 
       volumes = [

system/services/nginx-proxy-manager.nix

@@ -4,7 +4,7 @@
   pkgs,
   ...
 }: let
-  nginxVersion = "2.12.6";
+  nginxVersion = "2.13.1";
 in {
   virtualisation.oci-containers.containers = {
     nginx-proxy-manager = {

system/services/paperless.nix

@@ -125,7 +125,7 @@ in {
       ];
 
       ports = [
-        "8000:8000"
+        "8000:8000" # Bind for VPS
       ];
 
       volumes = [

system/services/plex.nix

@@ -0,0 +1,64 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  plexVersion = "1.42.2.10156-f737b826c";
+in {
+  virtualisation.oci-containers.containers = {
+    plex = {
+      image = "plexinc/pms-docker:${plexVersion}";
+      autoStart = true;
+
+      login = {
+        # Uses DockerHub by default
+        # registry = "";
+
+        # DockerHub Credentials
+        username = "christoph.urlacher@protonmail.com";
+        passwordFile = "${config.sops.secrets.docker-password.path}";
+      };
+
+      dependsOn = [
+        # "pihole"
+      ];
+
+      ports = [
+        "32400:32400" # Bind for VPS
+
+        # "8324:8324/tcp" # Controlling Plex for Roku via Plex Companion
+        # "32469:32469/tcp" # Plex DLNA server
+        # "1900:1900/udp" # Plex DLNA server
+        # "32410:32410/udp" # GDM network discovery
+        # "32412:32412/udp" # GDM network discovery
+        # "32413:32413/udp" # GDM network discovery
+        # "32414:32414/udp" # GDM network discovery
+      ];
+
+      volumes = [
+        "/media/Show:/data/tvshows"
+        "/media/Movie:/data/movies"
+        "/media/TV-Music:/data/music"
+
+        "plex_config:/config"
+        "plex_transcode:/transcode"
+      ];
+
+      environment = {
+        PLEX_UID = "3000";
+        PLEX_GID = "3000";
+        TZ = "Europe/Berlin";
+
+        # PLEX_CLAIM = "";
+        # ADVERTISE_IP = "https://plex.vps.chriphost.de:32400";
+      };
+
+      extraOptions = [
+        "--privileged"
+        "--device=nvidia.com/gpu=all"
+        "--net=behind-nginx"
+      ];
+    };
+  };
+}

system/services/portainer-agent.nix

@@ -5,7 +5,7 @@
   ...
 }: let
   # Match this with the portainer-ce version
-  portainerVersion = "2.31.3";
+  portainerVersion = "2.33.3";
 in {
   # Use the agent to connect clients to a main portainer instance
   virtualisation.oci-containers.containers = {

system/services/portainer.nix

@@ -5,7 +5,7 @@
   ...
 }: let
   # Match this with the portainer agent version
-  portainerVersion = "2.31.3";
+  portainerVersion = "2.33.3";
 in {
   virtualisation.oci-containers.containers = {
     portainer = {

system/services/prowlarr.nix

@@ -0,0 +1,46 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  prowlarrVersion = "2.1.5";
+in {
+  virtualisation.oci-containers.containers = {
+    prowlarr = {
+      image = "linuxserver/prowlarr:${prowlarrVersion}";
+      autoStart = true;
+
+      login = {
+        # Uses DockerHub by default
+        # registry = "";
+
+        # DockerHub Credentials
+        username = "christoph.urlacher@protonmail.com";
+        passwordFile = "${config.sops.secrets.docker-password.path}";
+      };
+
+      dependsOn = [];
+
+      ports = [
+        # "9696:9696"
+      ];
+
+      volumes = [
+        "prowlarr_config:/config"
+      ];
+
+      environment = {
+        PUID = "1000";
+        PGID = "1000";
+        TZ = "Europe/Berlin";
+      };
+
+      extraOptions = [
+        # "--privileged"
+        # "--device=nvidia.com/gpu=all"
+        "--net=behind-nginx"
+      ];
+    };
+  };
+}

system/services/pulse-agent-servenix.nix

@@ -0,0 +1,40 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  pulseAgentServenixVersion = "4.35.0";
+in {
+  virtualisation.oci-containers.containers = {
+    pulse-agent-servenix = {
+      image = "ghcr.io/rcourtman/pulse-docker-agent:${pulseAgentServenixVersion}";
+      autoStart = true;
+
+      dependsOn = [];
+
+      ports = [];
+
+      volumes = [
+        "/var/run/docker.sock:/var/run/docker.sock"
+      ];
+
+      environment = {
+        PUID = "1000";
+        PGID = "1000";
+        TZ = "Europe/Berlin";
+
+        PULSE_URL = "https://pulse.think.chriphost.de";
+        PULSE_TOKEN = "6a72f3951990d6724f09106d052302f6f60fc9e94f71720bf8e8a1fe4a27d4a2";
+      };
+
+      extraOptions = [
+        # "--privileged"
+        # "--device=nvidia.com/gpu=all"
+        "--net=behind-nginx"
+        "--pid=host"
+        "--uts=host"
+      ];
+    };
+  };
+}

system/services/pulse-agent-thinknix.nix

@@ -0,0 +1,42 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  pulseAgentThinknixVersion = "4.35.0";
+in {
+  virtualisation.oci-containers.containers = {
+    pulse-agent-thinknix = {
+      image = "ghcr.io/rcourtman/pulse-docker-agent:${pulseAgentThinknixVersion}";
+      autoStart = true;
+
+      dependsOn = [
+        "pulse"
+      ];
+
+      ports = [];
+
+      volumes = [
+        "/var/run/docker.sock:/var/run/docker.sock"
+      ];
+
+      environment = {
+        PUID = "1000";
+        PGID = "1000";
+        TZ = "Europe/Berlin";
+
+        PULSE_URL = "https://pulse.think.chriphost.de";
+        PULSE_TOKEN = "6ab80ff7336a0cd7e0edcf3cd270a72bf6e075bcff337235ab011d1f70231e2f";
+      };
+
+      extraOptions = [
+        # "--privileged"
+        # "--device=nvidia.com/gpu=all"
+        "--net=behind-nginx"
+        "--pid=host"
+        "--uts=host"
+      ];
+    };
+  };
+}

system/services/pulse.nix

@@ -0,0 +1,46 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  pulseVersion = "4.35.0";
+in {
+  virtualisation.oci-containers.containers = {
+    pulse = {
+      image = "rcourtman/pulse:${pulseVersion}";
+      autoStart = true;
+
+      login = {
+        # Uses DockerHub by default
+        # registry = "";
+
+        # DockerHub Credentials
+        username = "christoph.urlacher@protonmail.com";
+        passwordFile = "${config.sops.secrets.docker-password.path}";
+      };
+
+      dependsOn = [];
+
+      ports = [
+        # "7655:7655"
+      ];
+
+      volumes = [
+        "pulse_data:/data"
+      ];
+
+      environment = {
+        PUID = "1000";
+        PGID = "1000";
+        TZ = "Europe/Berlin";
+      };
+
+      extraOptions = [
+        # "--privileged"
+        # "--device=nvidia.com/gpu=all"
+        "--net=behind-nginx"
+      ];
+    };
+  };
+}

system/services/radarr.nix

@@ -0,0 +1,49 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  radarrVersion = "5.28.0";
+in {
+  virtualisation.oci-containers.containers = {
+    radarr = {
+      image = "linuxserver/radarr:${radarrVersion}";
+      autoStart = true;
+
+      login = {
+        # Uses DockerHub by default
+        # registry = "";
+
+        # DockerHub Credentials
+        username = "christoph.urlacher@protonmail.com";
+        passwordFile = "${config.sops.secrets.docker-password.path}";
+      };
+
+      dependsOn = [];
+
+      ports = [
+        # "7878:7878"
+      ];
+
+      volumes = [
+        "/media/Movie/.sabnzbd-complete:/media/downloads"
+        "/media/Movie:/media/movies"
+
+        "radarr_config:/config"
+      ];
+
+      environment = {
+        PUID = "3000";
+        PGID = "3000";
+        TZ = "Europe/Berlin";
+      };
+
+      extraOptions = [
+        # "--privileged"
+        # "--device=nvidia.com/gpu=all"
+        "--net=behind-nginx"
+      ];
+    };
+  };
+}

system/services/sabnzbd-movies.nix

@@ -0,0 +1,53 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  sabnzbdVersion = "4.5.5";
+in {
+  virtualisation.oci-containers.containers = {
+    sabnzbd-movies = {
+      image = "linuxserver/sabnzbd:${sabnzbdVersion}";
+      autoStart = true;
+
+      login = {
+        # Uses DockerHub by default
+        # registry = "";
+
+        # DockerHub Credentials
+        username = "christoph.urlacher@protonmail.com";
+        passwordFile = "${config.sops.secrets.docker-password.path}";
+      };
+
+      dependsOn = [];
+
+      ports = [
+        # NOTE: On initial start, the gui won't be reachable via reverse proxy,
+        #       because the hostname has to be whitelisted.
+        #       Edit the "sabnzbd.ini" in the docker volume and add the reverse-proxy address
+        #       to the host_whitelist variable.
+        # "8080:8080"
+      ];
+
+      volumes = [
+        "/media/Movie/.sabnzbd:/media/movies/incomplete"
+        "/media/Movie/.sabnzbd-complete:/media/movies/complete"
+
+        "sabnzbd-movies_config:/config"
+      ];
+
+      environment = {
+        PUID = "3000";
+        PGID = "3000";
+        TZ = "Europe/Berlin";
+      };
+
+      extraOptions = [
+        # "--privileged"
+        # "--device=nvidia.com/gpu=all"
+        "--net=behind-nginx"
+      ];
+    };
+  };
+}

system/services/sabnzbd-shows.nix

@@ -0,0 +1,53 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  sabnzbdVersion = "4.5.5";
+in {
+  virtualisation.oci-containers.containers = {
+    sabnzbd-shows = {
+      image = "linuxserver/sabnzbd:${sabnzbdVersion}";
+      autoStart = true;
+
+      login = {
+        # Uses DockerHub by default
+        # registry = "";
+
+        # DockerHub Credentials
+        username = "christoph.urlacher@protonmail.com";
+        passwordFile = "${config.sops.secrets.docker-password.path}";
+      };
+
+      dependsOn = [];
+
+      ports = [
+        # NOTE: On initial start, the gui won't be reachable via reverse proxy,
+        #       because the hostname has to be whitelisted.
+        #       Edit the "sabnzbd.ini" in the docker volume and add the reverse-proxy address
+        #       to the host_whitelist variable.
+        # "8080:8080"
+      ];
+
+      volumes = [
+        "/media/Show/.sabnzbd:/media/shows/incomplete"
+        "/media/Show/.sabnzbd-complete:/media/shows/complete"
+
+        "sabnzbd-shows_config:/config"
+      ];
+
+      environment = {
+        PUID = "3000";
+        PGID = "3000";
+        TZ = "Europe/Berlin";
+      };
+
+      extraOptions = [
+        # "--privileged"
+        # "--device=nvidia.com/gpu=all"
+        "--net=behind-nginx"
+      ];
+    };
+  };
+}

system/services/sonarr.nix

@@ -0,0 +1,49 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  sonarrVersion = "4.0.16";
+in {
+  virtualisation.oci-containers.containers = {
+    sonarr = {
+      image = "linuxserver/sonarr:${sonarrVersion}";
+      autoStart = true;
+
+      login = {
+        # Uses DockerHub by default
+        # registry = "";
+
+        # DockerHub Credentials
+        username = "christoph.urlacher@protonmail.com";
+        passwordFile = "${config.sops.secrets.docker-password.path}";
+      };
+
+      dependsOn = [];
+
+      ports = [
+        "8989:8989"
+      ];
+
+      volumes = [
+        "/media/Show/.sabnzbd-complete:/media/downloads"
+        "/media/Show:/media/shows"
+
+        "sonarr_config:/config"
+      ];
+
+      environment = {
+        PUID = "3000";
+        PGID = "3000";
+        TZ = "Europe/Berlin";
+      };
+
+      extraOptions = [
+        # "--privileged"
+        # "--device=nvidia.com/gpu=all"
+        "--net=behind-nginx"
+      ];
+    };
+  };
+}

system/services/statespaces.nix

@@ -0,0 +1,29 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  statespacesVersion = "latest";
+in {
+  virtualisation.oci-containers.containers = {
+    statespaces = {
+      image = "gitea.vps.chriphost.de/christoph/statespaces:${statespacesVersion}";
+      autoStart = true;
+
+      ports = [
+        # "8080:8090"
+        # "3111:5173"
+        "3111:8080" # Bind for VPS
+      ];
+
+      volumes = [];
+
+      environment = {};
+
+      extraOptions = [
+        "--net=behind-nginx"
+      ];
+    };
+  };
+}

system/services/teamspeak.nix

@@ -0,0 +1,51 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  teamspeakVersion = "v6.0.0-beta7";
+in {
+  virtualisation.oci-containers.containers = {
+    teamspeak = {
+      image = "teamspeaksystems/teamspeak6-server:${teamspeakVersion}";
+      autoStart = true;
+
+      login = {
+        # Uses DockerHub by default
+        # registry = "";
+
+        # DockerHub Credentials
+        username = "christoph.urlacher@protonmail.com";
+        passwordFile = "${config.sops.secrets.docker-password.path}";
+      };
+
+      dependsOn = [];
+
+      ports = [
+        # Bind for VPS
+        "9987:9987/udp" # Voice port
+        "30033:30033" # File transfer
+        "10080:10080/tcp" # Web query
+      ];
+
+      volumes = [
+        "teamspeak_data:/var/tsserver"
+      ];
+
+      environment = {
+        PUID = "1000";
+        PGID = "1000";
+        TZ = "Europe/Berlin";
+
+        TSSERVER_LICENSE_ACCEPTED = "accept";
+      };
+
+      extraOptions = [
+        # "--privileged"
+        # "--device=nvidia.com/gpu=all"
+        # "--net=behind-nginx"
+      ];
+    };
+  };
+}

system/services/tinymediamanager.nix

@@ -0,0 +1,54 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  version = "5.2.3";
+in {
+  virtualisation.oci-containers.containers = {
+    tinymediamanager = {
+      image = "tinymediamanager/tinymediamanager:${version}";
+      autoStart = true;
+
+      login = {
+        # Uses DockerHub by default
+        # registry = "";
+
+        # DockerHub Credentials
+        username = "christoph.urlacher@protonmail.com";
+        passwordFile = "${config.sops.secrets.docker-password.path}";
+      };
+
+      dependsOn = [];
+
+      ports = [];
+
+      volumes = [
+        "tinymediamanager_data:/data"
+
+        "/media/Show:/media/tvshows"
+        "/media/Movie:/media/movies"
+      ];
+
+      environment = {
+        PUID = "1000";
+        PGID = "1000";
+        TZ = "Europe/Berlin";
+
+        USER_ID = "1000";
+        GROUP_ID = "1000";
+        ALLOW_DIRECT_VNC = "true";
+        LC_ALL = "en_US.UTF-8"; # force UTF8
+        LANG = "en_US.UTF-8"; # force UTF8
+        PASSWORD = "<password>";
+      };
+
+      extraOptions = [
+        # "--privileged"
+        # "--device=nvidia.com/gpu=all"
+        "--net=behind-nginx"
+      ];
+    };
+  };
+}

system/thinknix/default.nix

@@ -20,6 +20,8 @@
     ../services/adguard.nix
     ../services/nginx-proxy-manager.nix
     ../services/portainer.nix
+    ../services/pulse.nix
+    ../services/pulse-agent-thinknix.nix
     ../services/whats-up-docker.nix
   ];
 

system/thinknix/hardware-configuration.nix

@@ -40,22 +40,22 @@
       options = ["defaults" "rw" "relatime" "_netdev" "bg" "soft"];
     };
 
-    # SG Exos Mirror Shares
+    # TrueNAS
 
     "/media/Movie" = {
-      device = "192.168.86.20:/mnt/SG Exos Mirror 18TB/Movie";
+      device = "192.168.86.20:/mnt/Seagate4TB/Movies";
       fsType = "nfs";
       options = ["defaults" "rw" "relatime" "_netdev" "bg" "soft"];
     };
 
     "/media/Show" = {
-      device = "192.168.86.20:/mnt/SG Exos Mirror 18TB/Show";
+      device = "192.168.86.20:/mnt/Seagate4TB/Shows";
       fsType = "nfs";
       options = ["defaults" "rw" "relatime" "_netdev" "bg" "soft"];
     };
 
     "/media/TV-Music" = {
-      device = "192.168.86.20:/mnt/SG Exos Mirror 18TB/Music";
+      device = "192.168.86.20:/mnt/Seagate4TB/Music";
       fsType = "nfs";
       options = ["defaults" "rw" "relatime" "_netdev" "bg" "soft"];
     };