Home: Slightly decrease transparent windows opacity

README.md

@@ -1,6 +1,6 @@
 # NixOS Configuration
 
-Modular NixOS configuration, using Hyprland (yikes) or Niri for a tiling/scrolling desktop.
+Modular NixOS configuration, using Hyprland for a lightweight desktop.
 
 ![](FastFetch.png)
 
@@ -10,10 +10,7 @@ Modular NixOS configuration, using Hyprland (yikes) or Niri for a tiling/scrolli
   <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
 
@@ -22,7 +19,6 @@ 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.
@@ -45,6 +41,6 @@ Each derivation is loaded into `NixFlake/derivations/default.nix`.
 
 ## NixFlake/overlays
 
-Contains all overlays, e.g. package version overrides.
+Contains (not at the moment) all overlays.
-The `NixFlake/overlays/default.nix` imports all overlays and all derivations.
+The `NixFlake/overlays/default.nix` imports all of the overlays and all of the derivations.
-It is then imported by the top-level `NixFlake/flake.nix`, to make everything available to the system/home configurations.
+It is then imported by the toplevel `NixFlake/flake.nix`, to make everything available to the system/home configurations.

config/flake.nix

@@ -34,28 +34,11 @@ rec {
       # Define custom dependencies
       # ===========================================================================================
 
-      # Python package example
-      # typed-ffmpeg = pkgs.python313Packages.buildPythonPackage rec {
-      #   pname = "typed_ffmpeg";
-      #   version = "3.6";
-      #
-      #   src = pkgs.python313Packages.fetchPypi {
-      #     inherit pname version;
-      #     hash = "sha256-YPspq/lqI/jx/9FCQntmQPw4lrPIsdxtHTUg0F0QbrM=";
-      #   };
-      #
-      #   pyproject = true;
-      #   build-system = [
-      #     pkgs.python313Packages.setuptools
-      #     pkgs.python313Packages.setuptools-scm
-      #   ];
-      # };
-
       # python = pkgs.python313.withPackages (p:
       #   with p; [
       #     # numpy
       #     # matplotlib
-      #     # typed-ffmpeg
+      #     # ffmpeg-python
       #     # pyside6
       #   ]);
 
@@ -227,9 +210,6 @@ rec {
         # Set PYTHONPATH
         # PYTHONPATH = ".";
 
-        # Set matplotlib backend
-        # MPLBACKEND = "TkAgg";
-
         # =========================================================================================
         # Define shell environment
         # =========================================================================================

config/navi/christoph.cheat

@@ -200,16 +200,6 @@ $ 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/1_deprecated/unityhub_3_13/default.nix

@@ -1,3 +1,4 @@
+# Taken from pull/422785
 {
   lib,
   stdenv,
@@ -46,15 +47,7 @@ stdenv.mkDerivation rec {
         ++ extraPkgs pkgs;
 
     multiPkgs = pkgs:
-      with pkgs; let
+      with pkgs;
-        libxml2-legacy = libxml2.overrideAttrs (previousAttrs: rec {
-          version = "2.13.8";
-          src = fetchurl {
-            url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor version}/libxml2-${version}.tar.xz";
-            hash = "sha256-J3KUyzMRmrcbK8gfL0Rem8lDW4k60VuyzSsOhZoO6Eo=";
-          };
-        });
-      in
         [
           # Unity Hub ldd dependencies
           cups
@@ -101,7 +94,7 @@ stdenv.mkDerivation rec {
           xorg.libXcursor
           glib
           gdk-pixbuf
-          libxml2-legacy
+          libxml2
           zlib
           clang
           git # for git-based packages in unity package manager

derivations/default.nix

@@ -7,6 +7,5 @@
 
   monolisa = pkgs.callPackage ./monolisa {};
   msty = pkgs.callPackage ./msty {};
-  unityhub = pkgs.callPackage ./unityhub {};
   tidal-dl-ng = pkgs.callPackage ./tidal-dl-ng {};
 }

derivations/tidal-dl-ng/default.nix

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

flake.nix

@@ -12,9 +12,6 @@
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     hardware.url = "github:nixos/nixos-hardware";
 
-    # NOTE: Update this after May and November
-    nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.05";
-
     # Home Manager
     home-manager.url = "github:nix-community/home-manager";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
@@ -31,70 +28,21 @@
     sops-nix.url = "github:Mic92/sops-nix";
     sops-nix.inputs.nixpkgs.follows = "nixpkgs";
 
-    # Secure boot
-    lanzaboote.url = "github:nix-community/lanzaboote/v0.4.3";
-    lanzaboote.inputs.nixpkgs.follows = "nixpkgs";
-
     # Nix User Repository (e.g. Firefox addons)
     nur.url = "github:nix-community/NUR";
     nur.inputs.nixpkgs.follows = "nixpkgs";
 
+    # Firefox theme
+    textfox.url = "github:adriankarlen/textfox";
+    textfox.inputs.nixpkgs.follows = "nixpkgs";
+
     # Nix Package Search - nps
     nps.url = "github:OleMussmann/nps";
     nps.inputs.nixpkgs.follows = "nixpkgs";
 
     # Run unpatched binaries on NixOS
     nix-alien.url = "github:thiagokokada/nix-alien";
-    # Don't follow nixpkgs:
+    nix-alien.inputs.nixpkgs.follows = "nixpkgs";
-    # 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";
-
-    # HyprPlugins
-    hyprland-plugins.url = "github:hyprwm/hyprland-plugins";
-    hyprland-plugins.inputs.nixpkgs.follows = "nixpkgs";
-    hyprland-plugins.inputs.hyprland.follows = "hyprland";
-    hypr-dynamic-cursors.url = "github:VirtCode/hypr-dynamic-cursors";
-    hypr-dynamic-cursors.inputs.nixpkgs.follows = "nixpkgs";
-    hypr-dynamic-cursors.inputs.hyprland.follows = "hyprland";
-    hyprspace.url = "github:KZDKM/Hyprspace";
-    # hyprspace.inputs.nixpkgs.follows = "nixpkgs";
-    hyprspace.inputs.hyprland.follows = "hyprland";
 
     # NeoVim <3
     nixvim.url = "github:nix-community/nixvim";
@@ -104,10 +52,6 @@
     # emacs-overlay.url = "github:nix-community/emacs-overlay";
     # emacs-overlay.inputs.nixpkgs.follows = "nixpkgs";
 
-    # Firefox theme
-    textfox.url = "github:adriankarlen/textfox";
-    textfox.inputs.nixpkgs.follows = "nixpkgs";
-
     # Declarative Flatpak
     nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest";
     # nix-flatpak.inputs.nixpkgs.follows = "nixpkgs"; # nix-flatpak doesn't have this
@@ -115,6 +59,16 @@
     # Realtime audio
     # musnix.url = "github:musnix/musnix";
     # musnix.inputs.nixpkgs.follows = "nixpkgs";
+
+    # HyprPlugins
+    # hyprland-plugins.url = "github:hyprwm/hyprland-plugins";
+    # hyprland-plugins.inputs.nixpkgs.follows = "nixpkgs";
+    # hypr-dynamic-cursors.url = "github:VirtCode/hypr-dynamic-cursors";
+    # hypr-dynamic-cursors.inputs.nixpkgs.follows = "nixpkgs";
+
+    # Pinned versions
+    # v4l2loopback-pinned.url = "github:nixos/nixpkgs/4684fd6b0c01e4b7d99027a34c93c2e09ecafee2";
+    # unityhub-pinned.url = "github:huantianad/nixpkgs/9542b0bc7701e173a10e6977e57bbba68bb3051f";
   };
 
   # Outputs is a function that takes the inputs as arguments.
@@ -148,25 +102,41 @@
       #   firefox = prev.firefox.override { ... };
       #   myBrowser = final.firefox;
       # }
-      overlays = let
+      overlays = [
-        # Maintain additional stable pkgs.
-        # This is supposed to provide a backup for packages in case they
-        # stop building on the unstable branch.
-        # It should otherwise not be mixed with this configuration,
-        # so don't even pass it to the modules.
-        pkgs-stable = import inputs.nixpkgs-stable {
-          inherit system;
-          config.allowUnfree = true;
-          config.allowUnfreePredicate = pkg: true;
-        };
-      in [
         inputs.devshell.overlays.default
         inputs.nur.overlays.default
-        inputs.niri.overlays.niri
         # inputs.emacs-overlay.overlay
 
-        # All my own overlays (derivations + modifications)
+        # Overriding specific packages from a different nixpkgs (e.g. a pull request)
-        (import ./overlays {inherit inputs nixpkgs pkgs-stable;})
+        # can be done like this. Note that this creates an additional nixpkgs instance.
+        # https://github.com/NixOS/nixpkgs/issues/418451
+        # (final: prev: {
+        #   unityhub_pinned_3_13 = import inputs.unityhub-pinned {
+        #     config.allowUnfree = true;
+        #     localSystem = {inherit (prev) system;};
+        #   };
+        # })
+
+        # TODO: Remove this after 0.15.1 hit nixpkgs
+        (final: prev: {
+          neovide = prev.neovide.overrideAttrs (finalAttrs: prevAttrs: {
+            version = "0.15.1";
+            src = prev.fetchFromGitHub {
+              owner = "neovide";
+              repo = "neovide";
+              tag = finalAttrs.version;
+              hash = "sha256-2iV3g6tcCkMF7sFG/GZDz3czPZNIDi6YLfrVzYO9jYI=";
+            };
+            cargoHash = "sha256-YlHAcUCRk6ROg5yXIumHfsiR/2TrsSzbuXz/IQK7sEo=";
+            cargoDeps = prev.rustPlatform.fetchCargoVendor {
+              inherit (finalAttrs) pname src version;
+              hash = finalAttrs.cargoHash;
+            };
+          });
+        })
+
+        # All my own overlays
+        (import ./overlays {inherit nixpkgs inputs;})
       ];
     };
 
@@ -198,12 +168,8 @@
     # HM modules are passed through home/modules/default.nix instead.
     commonModules = [
       inputs.sops-nix.nixosModules.sops
+      inputs.disko.nixosModules.disko
       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
@@ -229,9 +195,7 @@
         username = "christoph";
         headless = false;
         extraModules =
-          [
+          []
-            inputs.disko.nixosModules.disko
-          ]
           ++ commonModules;
       };
       nixtop = mylib.nixos.mkNixosConfigWithHomeManagerModule {
@@ -239,7 +203,9 @@
         hostname = "nixtop";
         username = "christoph";
         headless = false;
-        extraModules = [] ++ commonModules;
+        extraModules =
+          []
+          ++ commonModules;
       };
       servenix = mylib.nixos.mkNixosConfigWithHomeManagerModule {
         inherit system mylib publicKeys;

home/christoph/nixinator/default.nix

@@ -28,16 +28,16 @@
         };
 
         monitors = {
-          "DP-1" = {
+          "HDMI-A-1" = {
-            width = 3440;
+            width = 2560;
             height = 1440;
-            rate = 165;
+            rate = 144;
             x = 1920;
             y = 0;
             scale = 1;
           };
 
-          "DP-2" = {
+          "DP-1" = {
             width = 1920;
             height = 1080;
             rate = 60;
@@ -48,8 +48,8 @@
         };
 
         workspaces = {
-          "DP-1" = [1 2 3 4 5 6 7 8 9];
+          "HDMI-A-1" = [1 2 3 4 5 6 7 8 9];
-          "DP-2" = [10];
+          "DP-1" = [10];
         };
 
         autostart = {
@@ -65,7 +65,7 @@
         ];
       };
 
-      waybar.monitor = "DP-1";
+      waybar.monitor = "HDMI-A-1";
     };
 
     home = let
@@ -91,7 +91,8 @@
         # Add any extra libraries you want accessible to Rider here
       ];
 
-      rider-unity = pkgs.jetbrains.rider.overrideAttrs (attrs: {
+      # TODO: Broken, jetbrains.jdk doesn't build (see nixpkgs #425328)
+      unity-rider = pkgs.jetbrains.rider.overrideAttrs (attrs: {
         postInstall =
           ''
             # Wrap rider with extra tools and libraries
@@ -114,55 +115,49 @@
       });
     in {
       packages = with pkgs; [
-        # Intel FPGA design software
+        # quartus-prime-lite # Intel FPGA design software
-        # quartus-prime-lite
 
+        # Don't want heavy IDE's on the laptop
         # jetbrains.clion
         # jetbrains.rust-rover
         # jetbrains.pycharm-professional
         # jetbrains.idea-ultimate
         # jetbrains.webstorm
-        # jetbrains.rider
 
         # Unity Stuff
         # TODO: Unity module
-        # unityhub
+        # unityhub # TODO: Wait for https://nixpk.gs/pr-tracker.html?pr=422785
-        # rider-unity
+        # unity-rider
         # dotnetCore
         # mono
-        # steam-run-free # nix-alien doesn't seem to run unity apps, this does...
 
-        (blender.override {cudaSupport = true;})
+        blender
         godot_4
-        (obs-studio.override {cudaSupport = true;})
+        obs-studio
         kdePackages.kdenlive
         krita
         makemkv
-        lrcget
         msty
-        # jellyfin-media-player # CVE, can't install
-        jellyfin-mpv-shim
 
         steam-devices-udev-rules
       ];
 
       file = lib.mkMerge [
-        # {
+        {
-        #   ".local/share/applications/jetbrains-rider.desktop".source = let
+          # ".local/share/applications/jetbrains-rider.desktop".source = let
-        #     desktopFile = pkgs.makeDesktopItem {
+          #   desktopFile = pkgs.makeDesktopItem {
-        #       name = "jetbrains-rider";
+          #     name = "jetbrains-rider";
-        #       desktopName = "Rider";
+          #     desktopName = "Rider";
-        #       exec = "\"${rider-unity}/bin/rider\"";
+          #     exec = "\"${unity-rider}/bin/rider\"";
-        #       icon = "rider";
+          #     icon = "rider";
-        #       type = "Application";
+          #     type = "Application";
-        #       # Don't show desktop icon in search or run launcher
+          #     # Don't show desktop icon in search or run launcher
-        #       extraConfig.NoDisplay = "true";
+          #     extraConfig.NoDisplay = "true";
-        #     };
+          #   };
-        #   in "${desktopFile}/share/applications/jetbrains-rider.desktop";
+          # in "${desktopFile}/share/applications/jetbrains-rider.desktop";
-        #
+
-        #   ".var/app/com.valvesoftware.Steam/config/MangoHud/MangoHud.conf".source =
+          ".var/app/com.valvesoftware.Steam/config/MangoHud/MangoHud.conf".source = ../../../config/mangohud/MangoHud.conf;
-        #     ../../../config/mangohud/MangoHud.conf;
+        }
-        # }
         (lib.optionalAttrs (mylib.modules.contains config.home.packages pkgs.makemkv) {
           ".MakeMKV/settings.conf".source =
             config.lib.file.mkOutOfStoreSymlink
@@ -207,28 +202,21 @@
 
       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.MangoHud/x86_64/24.08"
+          "org.freedesktop.Platform.VulkanLayer.gamescope/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"
+          "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.stdenv.hostPlatform.system}.apps
+        inputs.ags.packages.${pkgs.system}.apps
-        inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.auth
+        inputs.ags.packages.${pkgs.system}.auth
-        inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.battery
+        inputs.ags.packages.${pkgs.system}.battery
-        inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.bluetooth
+        inputs.ags.packages.${pkgs.system}.bluetooth
-        inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.cava
+        inputs.ags.packages.${pkgs.system}.cava
-        # inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.greet
+        # inputs.ags.packages.${pkgs.system}.greet
-        inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.hyprland
+        inputs.ags.packages.${pkgs.system}.hyprland
-        inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.mpris
+        inputs.ags.packages.${pkgs.system}.mpris
-        inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.network
+        inputs.ags.packages.${pkgs.system}.network
-        inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.notifd
+        inputs.ags.packages.${pkgs.system}.notifd
-        # inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.powerprofiles
+        # inputs.ags.packages.${pkgs.system}.powerprofiles
-        # inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.river
+        # inputs.ags.packages.${pkgs.system}.river
-        inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.tray
+        inputs.ags.packages.${pkgs.system}.tray
-        inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.wireplumber
+        inputs.ags.packages.${pkgs.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.stdenv.hostPlatform.system}.io
+        inputs.ags.packages.${pkgs.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-color-emoji}/share/fonts/noto/NotoColorEmoji.ttf ${config.home.homeDirectory}/.local/share/fonts/
+            cp -f ${pkgs.noto-fonts-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,8 +50,7 @@ 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
         ];
 
@@ -60,10 +59,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/btop/default.nix

@@ -34,10 +34,10 @@ in {
           theme[hi_fg]=${color.hexS.accent}
 
           # Background color of selected item in processes box
-          theme[selected_bg]=${color.hexS.accentDim}
+          theme[selected_bg]=${color.hexS.surface1}
 
           # Foreground color of selected item in processes box
-          theme[selected_fg]=${color.hexS.accentText}
+          theme[selected_fg]=${color.hexS.accent}
 
           # Color of inactive/disabled text
           theme[inactive_fg]=${color.hexS.overlay0}

home/modules/color/default.nix

@@ -7,7 +7,7 @@
 }: let
   inherit (config.modules) color;
 in {
-  options.modules.color = import ./options.nix {inherit lib mylib pkgs;};
+  options.modules.color = import ./options.nix {inherit lib mylib;};
 
   config = {
     home.packages = let
@@ -50,13 +50,10 @@ in {
             |> builtins.concatStringsSep "\n")
           ''echo ${lib.concatStrings (lib.replicate 20 "=")}''
         ]);
-    in
+    in [
-      [
+      applyColors
-        applyColors
+      printNixColors
-        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,7 +1,6 @@
 {
   lib,
   mylib,
-  pkgs,
   ...
 }: let
   colorKeys = [
@@ -51,54 +50,6 @@ 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,7 +18,6 @@
     ./lazygit
     ./mpd
     ./neovim
-    ./niri
     ./nnn
     ./paths
     ./qutebrowser
@@ -30,13 +29,8 @@
 
     # HM modules imported from the flake inputs
     inputs.nix-flatpak.homeManagerModules.nix-flatpak
-    inputs.nixvim.homeModules.nixvim
+    inputs.nixvim.homeManagerModules.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,11 +12,8 @@ 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
 
-          kdePackages.fcitx5-qt # QT5
+          libsForQt5.fcitx5-qt # QT5
-          kdePackages.fcitx5-chinese-addons
+          libsForQt5.fcitx5-chinese-addons
 
           qt6Packages.fcitx5-qt # QT6
           qt6Packages.fcitx5-chinese-addons

home/modules/firefox/bookmarks.nix

@@ -78,7 +78,6 @@ in [
           (mkBm "DeepSeek Chat" "https://chat.deepseek.com/")
           (mkBm "Claude Chat" "https://claude.ai/new")
           (mkBm "ChatGPT" "https://chatgpt.com/")
-          (mkBm "DeepWiki" "https://deepwiki.com/")
           "separator"
           (mkBm "Mistral API" "https://console.mistral.ai/usage")
           (mkBm "DeepSeek API" "https://platform.deepseek.com/usage")

home/modules/firefox/default.nix

@@ -204,13 +204,6 @@ in {
                 definedAliases = ["@aw"];
               };
 
-              nixpkgs-issues = {
-                name = "Nixpkgs Issues";
-                urls = [{template = "https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue%20{searchTerms}";}];
-                iconMapObj."16" = "https://github.com/favicon.ico";
-                definedAliases = ["@i"];
-              };
-
               github = {
                 name = "GitHub";
                 urls = [{template = "https://github.com/search?q={searchTerms}&type=repositories";}];
@@ -242,11 +235,11 @@ in {
               catppuccin-mocha-mauve
               # catppuccin-web-file-icons
               clearurls
-              # cookie-autodelete
+              cookie-autodelete
               dark-background-light-text
               display-_anchors # Easier linking to specific website parts
               don-t-fuck-with-paste
-              # enhancer-for-youtube # Discontinued, use tweaks-for-youtube
+              enhancer-for-youtube
               fastforwardteam # skip URL shorteners
               # faststream # replace video players with a faster one
               frankerfacez # twitch emotes
@@ -254,11 +247,11 @@ in {
               keepassxc-browser
               localcdn
               lovely-forks # Display notable forks on GitHub repos
-              # move-unloaded-tabs-for-tst # move tst tabs without them becoming active
+              move-unloaded-tabs-for-tst # move tst tabs without them becoming active
               native-mathml # native MathML instead of MathJax/MediaWiki
               no-pdf-download # open pdf in browser without downloading
               open-in-freedium
-              # plasma-integration
+              # plasma-integration # TODO: Only when Plasma is used
               privacy-badger
               privacy-settings
               protondb-for-steam
@@ -274,12 +267,11 @@ in {
               # sourcegraph # Code intelligence for GitHub/GitLap for 20+ languages
               sponsorblock
               steam-database
-              # tab-session-manager
+              tab-session-manager
               # to-deepl
               transparent-standalone-image
-              # tree-style-tab
+              tree-style-tab
-              # tst-fade-old-tabs
+              tst-fade-old-tabs
-              tweaks-for-youtube
               twitch-auto-points
               ublacklist
               ublock-origin

home/modules/git/default.nix

@@ -11,29 +11,30 @@ in {
   options.modules.git = import ./options.nix {inherit lib mylib;};
 
   config = lib.mkIf git.enable {
-    programs.diff-so-fancy = {
+    programs.git = {
       enable = true;
-      enableGitIntegration = true;
 
-      settings = {
+      # userEmail = "christoph.urlacher@protonmail.com";
+      # 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";
@@ -110,14 +111,6 @@ in {
           };
         };
       };
-
-      signing = {
-        signByDefault = git.signCommits;
-        format = "ssh";
-        key = "~/.ssh/id_ed25519.pub";
-      };
-
-      lfs.enable = true;
     };
   };
 }

home/modules/hyprland/autostart.nix

@@ -1,31 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  hyprland,
-}:
-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"
-    "wl-paste -p -t text --watch clipman store -P --histpath=\"~/.local/share/clipman-primary.json\""
-
-    "hyprctl setcursor ${config.home.pointerCursor.name} ${builtins.toString config.home.pointerCursor.size}"
-    "hyprsunset --identity"
-
-    # HACK: Hyprland doesn't set the xwayland/x11 keymap correctly
-    "setxkbmap -layout ${hyprland.keyboard.layout} -variant ${hyprland.keyboard.variant} -option ${hyprland.keyboard.option} -model pc104"
-
-    # HACK: Flatpak doesn't find applications in the system PATH
-    "systemctl --user import-environment PATH && systemctl --user restart xdg-desktop-portal.service"
-
-    # Provide a polkit authentication UI.
-    # This is used for example when running systemd commands without root.
-    # "systemctl --user start hyprpolkitagent.service"
-    # "${pkgs.kdePackages.polkit-kde-agent-1}/libexec/polkit-kde-authentication-agent-1"
-    "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1"
-  ]
-]

home/modules/hyprland/caelestia.nix

@@ -1,516 +0,0 @@
-{
-  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

@@ -10,21 +10,116 @@
 }: let
   inherit (config.modules) hyprland color;
 
-  # Autostart programs
+  always-bind = lib.mergeAttrsList [
-  always-exec = import ./autostart.nix {inherit lib pkgs config hyprland;};
+    {
+      # 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"];
 
-  # Keybindings
+      # Move focus with mainMod + arrow keys
-  always-bind = import ./mappings.nix {inherit lib config hyprland;};
+      "$mainMod, h" = ["movefocus, l"];
+      "$mainMod, l" = ["movefocus, r"];
+      "$mainMod, k" = ["movefocus, u"];
+      "$mainMod, j" = ["movefocus, d"];
+
+      # Swap windows
+      "$mainMod CTRL, h" = ["movewindow, l"];
+      "$mainMod CTRL, l" = ["movewindow, r"];
+      "$mainMod CTRL, k" = ["movewindow, u"];
+      "$mainMod CTRL, d" = ["movewindow, d"];
+
+      # Reset workspaces to the defined configuration in hyprland.workspaces:
+      "CTRL ALT, r" = let
+        mkWBinding = m: w:
+          "moveworkspacetomonitor, "
+          + "${builtins.toString w} ${builtins.toString m}";
+        mkWsBindings = m: ws: builtins.map (mkWBinding m) ws;
+      in
+        hyprland.workspaces
+        |> builtins.mapAttrs mkWsBindings
+        |> builtins.attrValues
+        |> builtins.concatLists;
+    }
+
+    # Switch to WS: "$mainMod, 1" = ["workspace, 1"];
+    (let
+      mkWBinding = w: k: {"$mainMod, ${k}" = ["workspace, ${w}"];};
+    in
+      hyprland.keybindings.ws-bindings
+      |> builtins.mapAttrs mkWBinding
+      |> builtins.attrValues
+      |> lib.mergeAttrsList)
+
+    # Toggle special WS: "$mainMod, x" = ["togglespecialworkspace, ferdium"];
+    (let
+      mkSpecialWBinding = w: k: {"$mainMod, ${k}" = ["togglespecialworkspace, ${w}"];};
+    in
+      hyprland.keybindings.special-ws-bindings
+      |> builtins.mapAttrs mkSpecialWBinding
+      |> builtins.attrValues
+      |> lib.mergeAttrsList)
+
+    # Move to WS: "$mainMod SHIFT, 1" = ["movetoworkspace, 1"];
+    (let
+      mkMoveWBinding = w: k: {"$mainMod SHIFT, ${k}" = ["movetoworkspace, ${w}"];};
+    in
+      (hyprland.keybindings.ws-bindings)
+      |> builtins.mapAttrs mkMoveWBinding
+      |> builtins.attrValues
+      |> lib.mergeAttrsList)
+
+    # Move to special WS: "$mainMod SHIFT, x" = ["movetoworkspace, special:ferdium"];
+    (let
+      mkSpecialMoveWBinding = w: k: {"$mainMod SHIFT, ${k}" = ["movetoworkspace, special:${w}"];};
+    in
+      (hyprland.keybindings.special-ws-bindings)
+      |> builtins.mapAttrs mkSpecialMoveWBinding
+      |> builtins.attrValues
+      |> lib.mergeAttrsList)
+  ];
 
-  # Mousebindings
   always-bindm = {
     "$mainMod, mouse:272" = ["movewindow"];
     "$mainMod, mouse:273" = ["resizewindow"];
   };
+
+  always-exec = builtins.concatLists [
+    (lib.optionals hyprland.dunst.enable ["dunst"]) # Notifications
+    [
+      # Start clipboard management
+      "wl-paste -t text --watch clipman store --no-persist"
+      "wl-paste -p -t text --watch clipman store -P --histpath=\"~/.local/share/clipman-primary.json\""
+
+      "hyprctl setcursor Bibata-Modern-Classic 16"
+      "hyprsunset --identity"
+
+      # HACK: Hyprland doesn't set the xwayland/x11 keymap correctly
+      "setxkbmap -layout ${hyprland.keyboard.layout} -variant ${hyprland.keyboard.variant} -option ${hyprland.keyboard.option} -model pc104"
+
+      # HACK: Flatpak doesn't find applications in the system PATH
+      "systemctl --user import-environment PATH && systemctl --user restart xdg-desktop-portal.service"
+
+      # Provide a polkit authentication UI.
+      # This is used for example when running systemd commands without root.
+      # "systemctl --user start hyprpolkitagent.service"
+      # "${pkgs.kdePackages.polkit-kde-agent-1}/libexec/polkit-kde-authentication-agent-1"
+      "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1"
+    ]
+  ];
 in {
   options.modules.hyprland = import ./options.nix {inherit lib mylib;};
 
   config = lib.mkIf hyprland.enable {
+    # Some assertion is not possible if HM is used standalone,
+    # because nixosConfig won't be available.
     assertions = [
       {
         assertion = nixosConfig.programs.hyprland.enable;
@@ -34,29 +129,21 @@ 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 = lib.mkDefault color.iconPackage;
+      iconTheme.package = pkgs.papirus-icon-theme;
-      iconTheme.name = color.iconTheme;
+      iconTheme.name = "Papirus";
-    };
-
-    modules = {
-      hyprpanel.enable = hyprland.hyprpanel.enable;
     };
 
     home = {
       pointerCursor = {
-        gtk.enable = lib.mkDefault true;
+        gtk.enable = true;
-        x11.enable = lib.mkDefault true;
+        x11.enable = true;
-        package = lib.mkDefault color.cursorPackage;
+        package = pkgs.bibata-cursors;
-        name = color.cursor;
+        name = "Bibata-Modern-Classic";
-        size = color.cursorSize;
+        size = 16;
       };
 
       packages = with pkgs; [
@@ -69,7 +156,7 @@ in {
         wl-clipboard
         clipman # Clipboard manager (wl-paste)
         libnotify
-        inotify-tools # Includes inotifywait
+        inotifyTools # Includes inotifywait
 
         ncpamixer # Audio control
         slurp # Region selector for screensharing
@@ -120,60 +207,389 @@ in {
     };
 
     programs = {
-      hyprlock = import ./hyprlock.nix {inherit config hyprland color;};
+      imv = {
-      caelestia = import ./caelestia.nix {inherit config hyprland color;};
+        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}";
+          };
+        };
+      };
+
+      hyprlock = {
+        enable = true;
+
+        settings = {
+          general = {
+            disable_loading_bar = true;
+            grace = 0; # Immediately lock
+            hide_cursor = true;
+            no_fade_in = false;
+          };
+
+          # The widgets start here.
+
+          background = [
+            {
+              path = "${config.paths.nixflake}/wallpapers/${color.wallpaper}.jpg";
+              blur_passes = 3;
+              blur_size = 10;
+              monitor = "";
+            }
+          ];
+
+          input-field = [
+            # Password input
+            {
+              size = "200, 50";
+              position = "0, 0";
+              monitor = "";
+              dots_center = true;
+              fade_on_empty = false;
+              font_color = "rgb(${color.hex.accentText})";
+              font_family = "${color.font}";
+              inner_color = "rgb(${color.hex.accent})";
+              outer_color = "rgb(${color.hex.accent})";
+              outline_thickness = 2;
+              placeholder_text = "<span foreground='\#\#${color.hex.accentText}'>Password...</span>";
+              shadow_passes = 0;
+              rounding = 4;
+              halign = "center";
+              valign = "center";
+            }
+          ];
+
+          label = [
+            # Date
+            {
+              position = "0, 300";
+              monitor = "";
+              text = ''cmd[update:1000] date -I'';
+              color = "rgba(${color.hex.text}AA)";
+              font_size = 22;
+              font_family = "${color.font}";
+              halign = "center";
+              valign = "center";
+            }
+
+            # Time
+            {
+              position = "0, 200";
+              monitor = "";
+              text = ''cmd[update:1000] date +"%-H:%M"'';
+              color = "rgba(${color.hex.text}AA)";
+              font_size = 95;
+              font_family = "${color.font} Extrabold";
+              halign = "center";
+              valign = "center";
+            }
+          ];
+        };
+      };
     };
 
     services = {
-      dunst = import ./dunst.nix {inherit pkgs config hyprland color;};
+      hyprpaper = {
-      hypridle = import ./hypridle.nix {inherit config hyprland color;};
+        enable = true;
-      hyprpaper = import ./hyprpaper.nix {inherit config hyprland color;};
-    };
 
-    # Make sure the units only start when using Hyprland
+        settings = {
-    systemd.user.services.dunst.Unit.After = lib.mkIf hyprland.dunst.enable (lib.mkForce ["hyprland-session.target"]);
+          ipc = "on";
-    systemd.user.services.dunst.Unit.PartOf = lib.mkIf hyprland.dunst.enable (lib.mkForce ["hyprland-session.target"]);
+          splash = false;
-    systemd.user.services.hypridle.Install.WantedBy = lib.mkIf (!hyprland.caelestia.enable) (lib.mkForce ["hyprland-session.target"]);
+          splash_offset = 2.0;
-    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"]);
+          # Wallpapers have to be preloaded to be displayed
-    systemd.user.services.hyprpaper.Install.WantedBy = lib.mkIf (!hyprland.caelestia.enable) (lib.mkForce ["hyprland-session.target"]);
+          preload = let
-    systemd.user.services.hyprpaper.Unit.After = lib.mkIf (!hyprland.caelestia.enable) (lib.mkForce ["hyprland-session.target"]);
+            mkPreload = name: "${config.paths.nixflake}/wallpapers/${name}.jpg";
-    systemd.user.services.hyprpaper.Unit.PartOf = lib.mkIf (!hyprland.caelestia.enable) (lib.mkForce ["hyprland-session.target"]);
+          in
+            color.wallpapers |> builtins.map mkPreload;
+
+          wallpaper = let
+            mkWallpaper = monitor:
+              "${monitor}, "
+              + "${config.paths.nixflake}/wallpapers/${color.wallpaper}.jpg";
+          in
+            hyprland.monitors
+            |> builtins.attrNames
+            |> builtins.map mkWallpaper;
+        };
+      };
+
+      hypridle = {
+        enable = true;
+
+        settings = {
+          general = {
+            # DPMS - Display Powermanagement Signaling. "On" means the monitor is on.
+            after_sleep_cmd = "hyprctl dispatch dpms on";
+            ignore_dbus_inhibit = false;
+            lock_cmd = "hyprlock";
+          };
+
+          listener = [
+            {
+              timeout = 900;
+              on-timeout = "hyprlock";
+            }
+            {
+              timeout = 1200;
+              on-timeout = "hyprctl dispatch dpms off";
+              on-resume = "hyprctl dispatch dpms on";
+            }
+          ];
+        };
+      };
+
+      # Notification service
+      dunst = {
+        enable = hyprland.dunst.enable;
+
+        iconTheme.package = pkgs.papirus-icon-theme;
+        iconTheme.name = "Papirus";
+
+        settings = {
+          global = {
+            monitor = config.modules.waybar.monitor;
+            font = "${color.font} 11";
+            offset = "10x10";
+            background = color.hexS.base;
+            foreground = color.hexS.text;
+            frame_width = 2;
+            corner_radius = 6;
+            separator_color = "frame";
+          };
+
+          urgency_low = {
+            frame_color = color.hexS.green;
+          };
+
+          urgency_normal = {
+            frame_color = color.hexS.green;
+          };
+
+          urgency_critical = {
+            frame_color = color.hexS.red;
+          };
+        };
+      };
+    };
 
     wayland.windowManager.hyprland = {
       enable = true;
-      package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.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
       xwayland.enable = true;
 
-      plugins = builtins.concatLists [
+      plugins = [
-        (lib.optionals
+        # TODO: Takes ages (compiles all hyprland dependencies locally...)
-          hyprland.bars.enable
+        #       Probably have to use hyprland flake to follow...
-          [inputs.hyprland-plugins.packages.${pkgs.stdenv.hostPlatform.system}.hyprbars])
+
-        (lib.optionals
+        # inputs.hypr-dynamic-cursors.packages.${pkgs.system}.hypr-dynamic-cursors
-          hyprland.dynamicCursor.enable
+        # inputs.hyprland-plugins.packages.${pkgs.system}.hyprbars
-          [inputs.hypr-dynamic-cursors.packages.${pkgs.stdenv.hostPlatform.system}.hypr-dynamic-cursors])
-        (lib.optionals
-          hyprland.trails.enable
-          [inputs.hyprland-plugins.packages.${pkgs.stdenv.hostPlatform.system}.hyprtrails])
-        (lib.optionals
-          hyprland.hyprspace.enable
-          [inputs.hyprspace.packages.${pkgs.stdenv.hostPlatform.system}.Hyprspace])
       ];
 
-      settings = import ./settings.nix {
+      settings = {
-        inherit
+        "$mainMod" = "${hyprland.keybindings.main-mod}";
-          lib
+
-          config
+        general = {
-          hyprland
+          gaps_in = 5;
-          color
+          gaps_out = 10;
-          always-exec
+          border_size = 2;
-          always-bind
+
+          "col.active_border" = "rgb(${color.hex.accent})";
+          "col.inactive_border" = "rgb(${color.hex.base})";
+        };
+
+        group = {
+          groupbar = {
+            enabled = true;
+            render_titles = false;
+            font_size = 10;
+            gradients = false;
+
+            "col.active" = "rgb(${color.hex.accent})";
+            "col.inactive" = "rgb(${color.hex.base})";
+          };
+
+          "col.border_active" = "rgb(${color.hex.accent})";
+          "col.border_inactive" = "rgb(${color.hex.base})";
+        };
+
+        input = {
+          kb_layout = hyprland.keyboard.layout;
+          kb_variant = hyprland.keyboard.variant;
+          kb_options = hyprland.keyboard.option;
+          kb_model = "pc104";
+          kb_rules = "";
+
+          follow_mouse = true;
+
+          touchpad = {
+            natural_scroll = "no";
+          };
+
+          sensitivity = 0; # -1.0 - 1.0, 0 means no modification.
+        };
+
+        monitor = let
+          mkMonitor = name: conf:
+            "${name}, "
+            + "${builtins.toString conf.width}x${builtins.toString conf.height}@"
+            + "${builtins.toString conf.rate}, "
+            + "${builtins.toString conf.x}x${builtins.toString conf.y}, "
+            + "${builtins.toString conf.scale}";
+        in
+          hyprland.monitors
+          |> builtins.mapAttrs mkMonitor
+          |> builtins.attrValues;
+
+        workspace = let
+          mkWorkspace = monitor: workspace:
+            "${builtins.toString workspace}, "
+            + "monitor:${builtins.toString monitor}";
+
+          mkWorkspaces = monitor: workspace-list:
+            builtins.map (mkWorkspace monitor) workspace-list;
+        in
+          hyprland.workspaces
+          |> builtins.mapAttrs mkWorkspaces
+          |> builtins.attrValues
+          |> builtins.concatLists;
+
+        bind = let
+          mkBind = key: action: "${key}, ${action}";
+          mkBinds = key: actions: builtins.map (mkBind key) actions;
+        in
+          (hyprland.keybindings.bindings // always-bind)
+          |> builtins.mapAttrs mkBinds
+          |> builtins.attrValues
+          |> builtins.concatLists;
+
+        bindm = let
+          mkBind = key: action: "${key}, ${action}";
+          mkBinds = key: actions: builtins.map (mkBind key) actions;
+        in
           always-bindm
-          ;
+          |> builtins.mapAttrs mkBinds
+          |> builtins.attrValues
+          |> builtins.concatLists;
+
+        exec-once = let
+          mkDelayedStart = str: ''hyprctl dispatch exec "sleep 5s && ${str}"'';
+
+          mkSpecialSilentStart = w: str: "[workspace special:${w} silent] ${str}";
+          mkSpecialSilentStarts = w: strs: builtins.map (mkSpecialSilentStart w) strs;
+        in
+          lib.mkMerge [
+            always-exec
+            hyprland.autostart.immediate
+            (hyprland.autostart.special-silent
+              |> builtins.mapAttrs mkSpecialSilentStarts
+              |> builtins.attrValues
+              |> builtins.concatLists)
+            (hyprland.autostart.delayed
+              |> builtins.map mkDelayedStart)
+          ];
+
+        windowrule = let
+          mkWorkspaceRule = workspace: class:
+            "workspace ${workspace}, "
+            + "class:^(${class})$";
+          mkWorkspaceRules = workspace: class-list:
+            builtins.map (mkWorkspaceRule workspace) class-list;
+
+          mkFloatingRule = attrs:
+            "float"
+            + (lib.optionalString (builtins.hasAttr "class" attrs) ", class:^(${attrs.class})$")
+            + (lib.optionalString (builtins.hasAttr "title" attrs) ", title:^(${attrs.title})$");
+
+          mkTranslucentRule = class:
+            "opacity ${hyprland.transparent-opacity} ${hyprland.transparent-opacity}, "
+            + "class:^(${class})$";
+        in
+          lib.mkMerge [
+            (hyprland.workspacerules
+              |> builtins.mapAttrs mkWorkspaceRules
+              |> builtins.attrValues
+              |> builtins.concatLists)
+            (hyprland.floating
+              |> builtins.map mkFloatingRule)
+            (hyprland.transparent
+              |> builtins.map mkTranslucentRule)
+            hyprland.windowrules
+          ];
+
+        dwindle = {
+          pseudotile = true;
+          preserve_split = true;
+        };
+
+        master = {
+          new_status = "master";
+        };
+
+        gestures = {
+          workspace_swipe = false;
+        };
+
+        misc = {
+          # Say no to the anime girl
+          disable_hyprland_logo = true;
+          force_default_wallpaper = 0;
+
+          # Say no to the "Application not responding" window
+          enable_anr_dialog = false;
+
+          disable_splash_rendering = true;
+          font_family = "${color.font}";
+        };
+
+        # Because those are not windows, but layers,
+        # we have to blur them explicitly
+        layerrule = [
+          "blur,rofi"
+          "ignorealpha 0.001,rofi" # Fix pixelated corners
+          "xray 0,rofi" # Render on top of other windows
+          "dimaround,rofi"
+
+          "blur,waybar"
+          "blur,gtk4-layer-shell"
+          "blur,bar-0"
+          "blur,bar-1"
+        ];
+
+        decoration = {
+          rounding = 4;
+
+          shadow = {
+            enabled = false;
+          };
+
+          blur = {
+            enabled = true;
+            size = 10;
+            passes = 3;
+            new_optimizations = true;
+            ignore_opacity = true;
+            xray = true;
+          };
+        };
+
+        animations = {
+          enabled = true;
+          bezier = "myBezier, 0.05, 0.9, 0.1, 1.05";
+          animation = [
+            "windows, 1, 7, myBezier"
+            "windowsOut, 1, 7, default,popin 80%"
+            "border, 1, 10, default"
+            "borderangle, 1, 8, default"
+            "fade, 1, 7, default"
+            "workspaces, 1, 6, default"
+          ];
+        };
       };
     };
   };

home/modules/hyprland/dunst.nix

@@ -1,36 +0,0 @@
-{
-  pkgs,
-  config,
-  hyprland,
-  color,
-}: {
-  enable = hyprland.dunst.enable;
-
-  iconTheme.package = color.iconPackage;
-  iconTheme.name = color.iconTheme;
-
-  settings = {
-    global = {
-      monitor = config.modules.waybar.monitor;
-      font = "${color.font} 11";
-      offset = "10x10";
-      background = color.hexS.base;
-      foreground = color.hexS.text;
-      frame_width = 2;
-      corner_radius = 6;
-      separator_color = "frame";
-    };
-
-    urgency_low = {
-      frame_color = color.hexS.green;
-    };
-
-    urgency_normal = {
-      frame_color = color.hexS.green;
-    };
-
-    urgency_critical = {
-      frame_color = color.hexS.red;
-    };
-  };
-}

home/modules/hyprland/hypridle.nix

@@ -1,28 +0,0 @@
-{
-  config,
-  hyprland,
-  color,
-}: {
-  enable = !hyprland.caelestia.enable;
-
-  settings = {
-    general = {
-      # DPMS - Display Powermanagement Signaling. "On" means the monitor is on.
-      after_sleep_cmd = "hyprctl dispatch dpms on";
-      ignore_dbus_inhibit = false;
-      lock_cmd = "hyprlock";
-    };
-
-    listener = [
-      {
-        timeout = 900;
-        on-timeout = "hyprlock";
-      }
-      {
-        timeout = 1200;
-        on-timeout = "hyprctl dispatch dpms off";
-        on-resume = "hyprctl dispatch dpms on";
-      }
-    ];
-  };
-}

home/modules/hyprland/hyprlock.nix

@@ -1,74 +0,0 @@
-{
-  config,
-  hyprland,
-  color,
-}: {
-  enable = true;
-
-  settings = {
-    general = {
-      disable_loading_bar = true;
-      grace = 0; # Immediately lock
-      hide_cursor = true;
-      no_fade_in = false;
-    };
-
-    # The widgets start here.
-
-    background = [
-      {
-        path = "${config.paths.nixflake}/wallpapers/${color.wallpaper}.jpg";
-        blur_passes = 3;
-        blur_size = 10;
-        monitor = "";
-      }
-    ];
-
-    input-field = [
-      # Password input
-      {
-        size = "200, 50";
-        position = "0, 0";
-        monitor = "";
-        dots_center = true;
-        fade_on_empty = false;
-        font_color = "rgb(${color.hex.accentText})";
-        font_family = "${color.font}";
-        inner_color = "rgb(${color.hex.accent})";
-        outer_color = "rgb(${color.hex.accent})";
-        outline_thickness = 2;
-        placeholder_text = "<span foreground='\#\#${color.hex.accentText}'>Password...</span>";
-        shadow_passes = 0;
-        rounding = 4;
-        halign = "center";
-        valign = "center";
-      }
-    ];
-
-    label = [
-      # Date
-      {
-        position = "0, 300";
-        monitor = "";
-        text = ''cmd[update:1000] date -I'';
-        color = "rgba(${color.hex.text}AA)";
-        font_size = 22;
-        font_family = "${color.font}";
-        halign = "center";
-        valign = "center";
-      }
-
-      # Time
-      {
-        position = "0, 200";
-        monitor = "";
-        text = ''cmd[update:1000] date +"%-H:%M"'';
-        color = "rgba(${color.hex.text}AA)";
-        font_size = 95;
-        font_family = "${color.font} Extrabold";
-        halign = "center";
-        valign = "center";
-      }
-    ];
-  };
-}

home/modules/hyprland/hyprpaper.nix

@@ -1,28 +0,0 @@
-{
-  config,
-  hyprland,
-  color,
-}: {
-  enable = !hyprland.caelestia.enable;
-
-  settings = {
-    ipc = "on";
-    splash = false;
-    splash_offset = 2.0;
-
-    # Wallpapers have to be preloaded to be displayed
-    preload = let
-      mkPreload = name: "${config.paths.nixflake}/wallpapers/${name}.jpg";
-    in
-      color.wallpapers |> builtins.map mkPreload;
-
-    wallpaper = let
-      mkWallpaper = monitor:
-        "${monitor}, "
-        + "${config.paths.nixflake}/wallpapers/${color.wallpaper}.jpg";
-    in
-      hyprland.monitors
-      |> builtins.attrNames
-      |> builtins.map mkWallpaper;
-  };
-}

home/modules/hyprland/mappings.nix

@@ -1,77 +0,0 @@
-{
-  lib,
-  config,
-  hyprland,
-}:
-lib.mergeAttrsList [
-  {
-    # Hyprland control
-    "$mainMod, q" = ["killactive"];
-    "$mainMod, v" = ["togglefloating"];
-    "$mainMod, f" = ["fullscreen"];
-    "$mainMod, tab" = ["workspace, previous"];
-    # "$mainMod, g" = ["togglegroup"];
-    # "ALT, tab" = ["changegroupactive"];
-
-    # Move focus with mainMod + arrow keys
-    "$mainMod, h" = ["movefocus, l"];
-    "$mainMod, l" = ["movefocus, r"];
-    "$mainMod, k" = ["movefocus, u"];
-    "$mainMod, j" = ["movefocus, d"];
-
-    # Swap windows
-    "$mainMod CTRL, h" = ["movewindow, l"];
-    "$mainMod CTRL, l" = ["movewindow, r"];
-    "$mainMod CTRL, k" = ["movewindow, u"];
-    "$mainMod CTRL, d" = ["movewindow, d"];
-
-    # Reset workspaces to the defined configuration in hyprland.workspaces:
-    "CTRL ALT, r" = let
-      mkWBinding = m: w:
-        "moveworkspacetomonitor, "
-        + "${builtins.toString w} ${builtins.toString m}";
-
-      mkWsBindings = m: ws: builtins.map (mkWBinding m) ws;
-    in
-      hyprland.workspaces
-      |> builtins.mapAttrs mkWsBindings
-      |> builtins.attrValues
-      |> builtins.concatLists;
-  }
-
-  # Switch to WS: "$mainMod, 1" = ["workspace, 1"];
-  (let
-    mkWBinding = w: k: {"$mainMod, ${k}" = ["workspace, ${w}"];};
-  in
-    hyprland.keybindings.ws-bindings
-    |> builtins.mapAttrs mkWBinding
-    |> builtins.attrValues
-    |> lib.mergeAttrsList)
-
-  # Toggle special WS: "$mainMod, x" = ["togglespecialworkspace, ferdium"];
-  (let
-    mkSpecialWBinding = w: k: {"$mainMod, ${k}" = ["togglespecialworkspace, ${w}"];};
-  in
-    hyprland.keybindings.special-ws-bindings
-    |> builtins.mapAttrs mkSpecialWBinding
-    |> builtins.attrValues
-    |> lib.mergeAttrsList)
-
-  # Move to WS: "$mainMod SHIFT, 1" = ["movetoworkspace, 1"];
-  (let
-    mkMoveWBinding = w: k: {"$mainMod SHIFT, ${k}" = ["movetoworkspace, ${w}"];};
-  in
-    (hyprland.keybindings.ws-bindings)
-    |> builtins.mapAttrs mkMoveWBinding
-    |> builtins.attrValues
-    |> lib.mergeAttrsList)
-
-  # Move to special WS: "$mainMod SHIFT, x" = ["movetoworkspace, special:ferdium"];
-  (let
-    mkSpecialMoveWBinding = w: k: {"$mainMod SHIFT, ${k}" = ["movetoworkspace, special:${w}"];};
-  in
-    hyprland.keybindings.special-ws-bindings
-    |> builtins.mapAttrs mkSpecialMoveWBinding
-    |> builtins.attrValues
-    |> lib.mergeAttrsList)
-]

home/modules/hyprland/options.nix

@@ -2,17 +2,9 @@
   lib,
   mylib,
   ...
-}: {
+}: rec {
   enable = lib.mkEnableOption "Hyprland Window Manager + Compositor";
 
-  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";
-  hyprpanel.enable = lib.mkEnableOption "Enable Hyprpanel";
-  caelestia.enable = lib.mkEnableOption "Enable Caelestia";
-
   keyboard = {
     layout = lib.mkOption {
       type = lib.types.str;
@@ -33,6 +25,128 @@
     };
   };
 
+  dunst.enable = lib.mkEnableOption "Enable dunst notification daemon";
+
+  monitors = lib.mkOption {
+    type = lib.types.attrs;
+    description = "Hyprland Monitor Configurations";
+    example = ''
+      {
+        "HDMI-A-1" = {
+          width = 2560;
+          height = 1440;
+          rate = 144;
+          x = 1920;
+          y = 0;
+          scale = 1;
+        }
+      }
+    '';
+  };
+
+  workspaces = lib.mkOption {
+    type = lib.types.attrs;
+    description = "How workspaces are distributed to monitors. These monitors will also receive a wallpaper.";
+    example = ''
+      {
+        "HDMI-A-1" = [1 2 3 4 5 6 7 8 9];
+        "HDMI-A-2" = [0];
+      }
+    '';
+  };
+
+  autostart = {
+    immediate = lib.mkOption {
+      type = lib.types.listOf lib.types.str;
+      description = "Programs to launch when Hyprland starts";
+      example = ''
+        [
+          "kitty"
+        ]
+      '';
+      default = [];
+    };
+
+    delayed = lib.mkOption {
+      type = lib.types.listOf lib.types.str;
+      description = "Programs to launch with a delay when Hyprland starts (e.g. to wait for the waybar tray)";
+      example = ''
+        [
+          "keepassxc"
+          "nextcloud --background"
+        ]
+      '';
+      default = [];
+    };
+
+    special-silent = lib.mkOption {
+      type = lib.types.attrsOf (lib.types.listOf lib.types.str);
+      description = "Programs to silently launch on special workspaces";
+      example = ''
+        {
+          "ferdium" = ["ferdium"];
+          "btop" = ["kitty --title=Btop btop"];
+        }
+      '';
+      default = {};
+    };
+  };
+
+  workspacerules = lib.mkOption {
+    type = lib.types.attrs;
+    description = "Launch programs on specified workspaces, accepts window class.";
+    example = ''
+      {
+        "2" = [
+          "jetbrains-clion"
+          "code-url-handler"
+        ];
+      }
+    '';
+  };
+
+  windowrules = lib.mkOption {
+    type = lib.types.listOf lib.types.str;
+    description = "Specify specific window rules.";
+    example = ''
+      [
+        "suppressevent activate, class: Unity"
+      ]
+    '';
+  };
+
+  transparent-opacity = lib.mkOption {
+    type = lib.types.str;
+    description = "The opacity transparent windows should have.";
+    example = "0.8";
+  };
+
+  floating = lib.mkOption {
+    type = lib.types.listOf lib.types.attrs;
+    description = "What programs are floating down here?";
+    example = ''
+      [
+        {
+          class = "thunar";
+          title = "File Operation Progress";
+        }
+        {
+          class = "org.kde.polkit-kde-authentication-agent-1";
+        }
+      ]
+    '';
+  };
+
+  transparent = lib.mkOption {
+    type = lib.types.listOf lib.types.str;
+    description = "What programs should be transparent? Accepts window class.";
+    example = ''
+      [
+        "kitty"
+      ]
+    '';
+  };
+
   keybindings = {
     main-mod = lib.mkOption {
       type = lib.types.str;
@@ -83,124 +197,4 @@
       '';
     };
   };
-
-  monitors = lib.mkOption {
-    type = lib.types.attrs;
-    description = "Hyprland Monitor Configurations";
-    example = ''
-      {
-        "HDMI-A-1" = {
-          width = 2560;
-          height = 1440;
-          rate = 144;
-          x = 1920;
-          y = 0;
-          scale = 1;
-        }
-      }
-    '';
-  };
-
-  workspaces = lib.mkOption {
-    type = lib.types.attrs;
-    description = "How workspaces are distributed to monitors. These monitors will also receive a wallpaper.";
-    example = ''
-      {
-        "HDMI-A-1" = [1 2 3 4 5 6 7 8 9];
-        "HDMI-A-2" = [0];
-      }
-    '';
-  };
-
-  workspacerules = lib.mkOption {
-    type = lib.types.attrs;
-    description = "Launch programs on specified workspaces, accepts window class.";
-    example = ''
-      {
-        "2" = [
-          "jetbrains-clion"
-          "code-url-handler"
-        ];
-      }
-    '';
-  };
-
-  windowrules = lib.mkOption {
-    type = lib.types.listOf lib.types.str;
-    description = "Specify specific window rules.";
-    example = ''
-      [
-        "suppressevent activate, class: Unity"
-      ]
-    '';
-  };
-
-  transparent-opacity = lib.mkOption {
-    type = lib.types.str;
-    description = "The opacity transparent windows should have.";
-    example = "0.8";
-  };
-
-  transparent = lib.mkOption {
-    type = lib.types.listOf lib.types.str;
-    description = "What programs should be transparent? Accepts window class.";
-    example = ''
-      [
-        "kitty"
-      ]
-    '';
-  };
-
-  floating = lib.mkOption {
-    type = lib.types.listOf lib.types.attrs;
-    description = "What programs are floating down here?";
-    example = ''
-      [
-        {
-          class = "thunar";
-          title = "File Operation Progress";
-        }
-        {
-          class = "org.kde.polkit-kde-authentication-agent-1";
-        }
-      ]
-    '';
-  };
-
-  autostart = {
-    immediate = lib.mkOption {
-      type = lib.types.listOf lib.types.str;
-      description = "Programs to launch when Hyprland starts";
-      example = ''
-        [
-          "kitty"
-        ]
-      '';
-      default = [];
-    };
-
-    delayed = lib.mkOption {
-      type = lib.types.listOf lib.types.str;
-      description = "Programs to launch with a delay when Hyprland starts (e.g. to wait for the waybar tray)";
-      example = ''
-        [
-          "keepassxc"
-          "nextcloud --background"
-        ]
-      '';
-      default = [];
-    };
-
-    special-silent = lib.mkOption {
-      type = lib.types.attrsOf (lib.types.listOf lib.types.str);
-      description = "Programs to silently launch on special workspaces";
-      example = ''
-        {
-          "ferdium" = ["ferdium"];
-          "btop" = ["kitty --title=Btop btop"];
-        }
-      '';
-      default = {};
-    };
-  };
 }

home/modules/hyprland/settings.nix

@@ -1,359 +0,0 @@
-{
-  lib,
-  config,
-  hyprland,
-  color,
-  always-exec,
-  always-bind,
-  always-bindm,
-}: {
-  "$mainMod" = "${hyprland.keybindings.main-mod}";
-
-  general = {
-    gaps_in = 5;
-    gaps_out = 10;
-    border_size = 2;
-
-    "col.active_border" = "rgb(${color.hex.accent})";
-    "col.inactive_border" = "rgb(${color.hex.base})";
-  };
-
-  group = {
-    groupbar = {
-      enabled = true;
-      render_titles = false;
-      font_size = 10;
-      gradients = false;
-
-      "col.active" = "rgb(${color.hex.accent})";
-      "col.inactive" = "rgb(${color.hex.base})";
-    };
-
-    "col.border_active" = "rgb(${color.hex.accent})";
-    "col.border_inactive" = "rgb(${color.hex.base})";
-  };
-
-  input = {
-    kb_layout = hyprland.keyboard.layout;
-    kb_variant = hyprland.keyboard.variant;
-    kb_options = hyprland.keyboard.option;
-    kb_model = "pc104";
-    kb_rules = "";
-
-    follow_mouse = true;
-
-    touchpad = {
-      natural_scroll = "no";
-    };
-
-    sensitivity = 0; # -1.0 - 1.0, 0 means no modification.
-  };
-
-  monitor = let
-    mkMonitor = name: conf:
-      "${name}, "
-      + "${builtins.toString conf.width}x${builtins.toString conf.height}@"
-      + "${builtins.toString conf.rate}, "
-      + "${builtins.toString conf.x}x${builtins.toString conf.y}, "
-      + "${builtins.toString conf.scale}";
-  in
-    hyprland.monitors
-    |> builtins.mapAttrs mkMonitor
-    |> builtins.attrValues;
-
-  workspace = let
-    mkWorkspace = monitor: workspace:
-      "${builtins.toString workspace}, "
-      + "monitor:${builtins.toString monitor}";
-
-    mkWorkspaces = monitor: workspace-list:
-      builtins.map (mkWorkspace monitor) workspace-list;
-  in
-    hyprland.workspaces
-    |> builtins.mapAttrs mkWorkspaces
-    |> builtins.attrValues
-    |> builtins.concatLists;
-
-  bind = let
-    mkBind = key: action: "${key}, ${action}";
-    mkBinds = key: actions: builtins.map (mkBind key) actions;
-  in
-    (hyprland.keybindings.bindings // always-bind)
-    |> builtins.mapAttrs mkBinds
-    |> builtins.attrValues
-    |> builtins.concatLists;
-
-  bindm = let
-    mkBind = key: action: "${key}, ${action}";
-    mkBinds = key: actions: builtins.map (mkBind key) actions;
-  in
-    always-bindm
-    |> builtins.mapAttrs mkBinds
-    |> builtins.attrValues
-    |> builtins.concatLists;
-
-  exec-once = let
-    mkDelayedStart = str: ''hyprctl dispatch exec "sleep 5s && ${str}"'';
-
-    mkSpecialSilentStart = w: str: "[workspace special:${w} silent] ${str}";
-    mkSpecialSilentStarts = w: strs: builtins.map (mkSpecialSilentStart w) strs;
-  in
-    lib.mkMerge [
-      always-exec
-      hyprland.autostart.immediate
-      (hyprland.autostart.special-silent
-        |> builtins.mapAttrs mkSpecialSilentStarts
-        |> builtins.attrValues
-        |> builtins.concatLists)
-      (hyprland.autostart.delayed
-        |> builtins.map mkDelayedStart)
-    ];
-
-  windowrule = let
-    mkWorkspaceRule = workspace: class:
-      "match:class ^(${class})$, "
-      + "workspace ${workspace}";
-    mkWorkspaceRules = workspace: class-list:
-      builtins.map (mkWorkspaceRule workspace) class-list;
-
-    mkFloatingRule = attrs:
-      (lib.optionalString (builtins.hasAttr "class" attrs) "match:class ^(${attrs.class})$, ")
-      + (lib.optionalString (builtins.hasAttr "title" attrs) "match:title ^(${attrs.title})$, ")
-      + "float 1";
-
-    mkTranslucentRule = class:
-      "match:class ^(${class})$, "
-      + "opacity ${hyprland.transparent-opacity} ${hyprland.transparent-opacity}";
-  in
-    lib.mkMerge [
-      (hyprland.workspacerules
-        |> builtins.mapAttrs mkWorkspaceRules
-        |> builtins.attrValues
-        |> builtins.concatLists)
-      (hyprland.floating
-        |> builtins.map mkFloatingRule)
-      (hyprland.transparent
-        |> builtins.map mkTranslucentRule)
-      hyprland.windowrules
-    ];
-
-  dwindle = {
-    pseudotile = true;
-    preserve_split = true;
-  };
-
-  master = {
-    new_status = "master";
-  };
-
-  gesture = [
-    "3, horizontal, workspace" # 3 Fingers, horizontal, workspace swipe
-  ];
-
-  misc = {
-    # Say no to the anime girl
-    disable_hyprland_logo = true;
-    force_default_wallpaper = 0;
-
-    # Say no to the "Application not responding" window
-    enable_anr_dialog = false;
-
-    disable_splash_rendering = true;
-    font_family = "${color.font}";
-  };
-
-  # Because those are not windows, but layers,
-  # we have to blur them explicitly
-  layerrule = [
-    "match:class rofi, blur 1"
-    # "match:class rofi, ignore_alpha 0.001" # Fix pixelated corners
-    # "match:class rofi, xray 0" # Render on top of other windows
-    # "match:class rofi, dim_around 1"
-
-    "match:class waybar, blur 1"
-    "match:class gtk4-layer-shell, blur 1"
-    "match:class bar-0, blur 1"
-    "match:class bar-1, blur 1"
-  ];
-
-  decoration = {
-    rounding = 4;
-
-    shadow = {
-      enabled = false;
-    };
-
-    blur = {
-      enabled = true;
-      size = 10;
-      passes = 3;
-      new_optimizations = true;
-      ignore_opacity = true;
-      xray = true;
-    };
-  };
-
-  animations = {
-    enabled = true;
-    bezier = "myBezier, 0.05, 0.9, 0.1, 1.05";
-    animation = [
-      "windows, 1, 7, myBezier"
-      "windowsOut, 1, 7, default,popin 80%"
-      "border, 1, 10, default"
-      "borderangle, 1, 8, default"
-      "fade, 1, 7, default"
-      "workspaces, 1, 6, default"
-    ];
-  };
-
-  plugin = lib.mergeAttrsList [
-    (lib.optionalAttrs hyprland.bars.enable {
-      hyprbars = {
-        enabled = true;
-
-        bar_height = 25;
-        bar_blur = true;
-        bar_color = "rgb(${color.hex.base})";
-        col.text = "rgb(${color.hex.text})";
-
-        bar_title_enabled = true;
-        bar_text_size = 12;
-        bar_text_font = color.font;
-
-        bar_text_align = "center";
-        bar_buttons_alignment = "left";
-
-        bar_part_of_window = true;
-        bar_precedence_over_border = false;
-
-        # example buttons (R -> L)
-        # hyprbars-button = color, size, on-click
-        hyprbars-button = [
-          "rgb(${color.hex.red}), 10, 󰖭, hyprctl dispatch killactive"
-          "rgb(${color.hex.green}), 10, , hyprctl dispatch fullscreen 1"
-        ];
-
-        # cmd to run on double click of the bar
-        on_double_click = "hyprctl dispatch fullscreen 1";
-      };
-    })
-
-    (lib.optionalAttrs hyprland.dynamicCursor.enable {
-      dynamic-cursors = {
-        # enables the plugin
-        enabled = true;
-
-        # sets the cursor behaviour, supports these values:
-        # tilt    - tilt the cursor based on x-velocity
-        # rotate  - rotate the cursor based on movement direction
-        # stretch - stretch the cursor shape based on direction and velocity
-        # none    - do not change the cursors behaviour
-        mode = "rotate";
-
-        # minimum angle difference in degrees after which the shape is changed
-        # smaller values are smoother, but more expensive for hw cursors
-        threshold = 2;
-
-        # for mode = rotate
-        rotate = {
-          # length in px of the simulated stick used to rotate the cursor
-          # most realistic if this is your actual cursor size
-          length = 20;
-
-          # clockwise offset applied to the angle in degrees
-          # this will apply to ALL shapes
-          offset = 0.0;
-        };
-
-        # for mode = tilt
-        tilt = {
-          # controls how powerful the tilt is, the lower, the more power
-          # this value controls at which speed (px/s) the full tilt is reached
-          # the full tilt being 60° in both directions
-          limit = 1000;
-
-          # relationship between speed and tilt, supports these values:
-          # linear             - a linear function is used
-          # quadratic          - a quadratic function is used (most realistic to actual air drag)
-          # negative_quadratic - negative version of the quadratic one, feels more aggressive
-          # see `activation` in `src/mode/utils.cpp` for how exactly the calculation is done
-          function = "negative_quadratic";
-
-          # time window (ms) over which the speed is calculated
-          # higher values will make slow motions smoother but more delayed
-          window = 100;
-        };
-
-        # configure shake to find
-        # magnifies the cursor if its is being shaken
-        shake = {
-          # enables shake to find
-          enabled = false;
-
-          # use nearest-neighbour (pixelated) scaling when shaking
-          # may look weird when effects are enabled
-          nearest = true;
-
-          # controls how soon a shake is detected
-          # lower values mean sooner
-          threshold = 3.0;
-
-          # magnification level immediately after shake start
-          base = 1.5;
-          # magnification increase per second when continuing to shake
-          speed = 0.0;
-          # how much the speed is influenced by the current shake intensitiy
-          influence = 0.0;
-
-          # maximal magnification the cursor can reach
-          # values below 1 disable the limit (e.g. 0)
-          limit = 0.0;
-
-          # time in millseconds the cursor will stay magnified after a shake has ended
-          timeout = 1000;
-
-          # show cursor behaviour `tilt`, `rotate`, etc. while shaking
-          effects = true;
-
-          # enable ipc events for shake
-          # see the `ipc` section below
-          ipc = false;
-        };
-
-        # use hyprcursor to get a higher resolution texture when the cursor is magnified
-        # see the `hyprcursor` section below
-        hyprcursor = {
-          # use nearest-neighbour (pixelated) scaling when magnifing beyond texture size
-          # this will also have effect without hyprcursor support being enabled
-          # 0 / false - never use pixelated scaling
-          # 1 / true  - use pixelated when no highres image
-          # 2         - always use pixleated scaling
-          nearest = true;
-
-          # enable dedicated hyprcursor support
-          enabled = true;
-
-          # resolution in pixels to load the magnified shapes at
-          # be warned that loading a very high-resolution image will take a long time and might impact memory consumption
-          # -1 means we use [normal cursor size] * [shake:base option]
-          resolution = -1;
-
-          # shape to use when clientside cursors are being magnified
-          # see the shape-name property of shape rules for possible names
-          # specifying clientside will use the actual shape, but will be pixelated
-          fallback = "clientside";
-        };
-      };
-    })
-
-    (lib.optionalAttrs hyprland.trails.enable {
-      hyprtrails = {
-        color = "rgb(${color.hex.accent})";
-      };
-    })
-
-    (lib.optionalAttrs hyprland.hyprspace.enable {
-      overview = {};
-    })
-  ];
-}

home/modules/hyprpanel/default.nix

@@ -13,7 +13,7 @@ in {
   config = lib.mkIf hyprpanel.enable {
     programs.hyprpanel = {
       enable = true;
-      systemd.enable = hyprpanel.systemd.enable;
+      systemd.enable = true;
 
       settings = {
         #
@@ -28,15 +28,14 @@ in {
         "bar.autoHide" = "never";
 
         # https://github.com/Jas-SinghFSU/HyprPanel/blob/master/src/configuration/modules/config/bar/layouts/index.ts
-        # TODO: To module option
         # TODO: This should contain battery etc. for laptop
         "bar.layouts" = {
-          "DP-1" = {
+          "HDMI-A-1" = {
             "left" = ["workspaces" "windowtitle"];
             "middle" = ["media"]; # "cava"
-            "right" = ["volume" "network" "cpu" "ram" "storage" "clock" "systray" "notifications"]; # "bluetooth"
+            "right" = ["volume" "network" "bluetooth" "cpu" "ram" "storage" "clock" "systray" "notifications"];
           };
-          "DP-2" = {
+          "DP-1" = {
             "left" = ["workspaces" "windowtitle"];
             "middle" = ["media"]; # "cava"
             "right" = ["volume" "clock" "notifications"];
@@ -283,12 +282,7 @@ in {
         "theme.bar.buttons.clock.spacing" = "6px";
         "theme.bar.buttons.clock.text" = "#${color.hex.accentText}";
 
-        # TODO: To module option
         # https://github.com/Jas-SinghFSU/HyprPanel/blob/master/src/configuration/modules/config/bar/systray/index.ts
-        "bar.systray.ignore" = [
-          "Fcitx" # Keyboard indicator
-        ]; # Middle click the tray icon to show a notification with the app name :)
-        "bar.systray.customIcons" = {};
 
         # https://github.com/Jas-SinghFSU/HyprPanel/blob/master/src/configuration/modules/theme/bar/buttons/systray.ts
         "theme.bar.buttons.systray.background" = "#${color.hex.blue}";

home/modules/hyprpanel/options.nix

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

home/modules/mpd/default.nix

@@ -74,9 +74,7 @@ in {
       };
 
       mpd-discord-rpc = {
-        # NOTE: Creates a new thread for each IPC request but don't cleans them up?
+        enable = true;
-        #       They just keep accumulating when discord is not running lol
-        enable = false;
 
         # NOTE: Bitch wants to create a default config file inside a
         #       read-only filesystem when changing settings here...

home/modules/neovim/default.nix

@@ -1,7 +1,6 @@
 {
   inputs,
   system,
-  headless,
   username,
   hostname,
   config,
@@ -28,7 +27,13 @@ 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
@@ -37,7 +42,7 @@ in {
             jdt-language-server
             ltex-ls # TODO: Only enable on-demand
             lua-language-server
-            # nil
+            nil
             nixd
             basedpyright
             pyrefly
@@ -47,9 +52,8 @@ in {
             tailwindcss-language-server
             tex-fmt
             texlab
-            tinymist
             typescript
-            vscode-langservers-extracted # includes nodejs
+            # vscode-langservers-extracted # includes nodejs
 
             # Linters
             checkstyle # java
@@ -74,15 +78,6 @@ 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
           ]
         ];
     };
@@ -411,7 +406,7 @@ in {
               };
 
               fuzzy = {
-                frecency.enabled = true;
+                use_frecency = true;
                 use_proximity = true;
               };
 
@@ -517,10 +512,9 @@ in {
                 nix = ["alejandra"];
                 python = ["black"];
                 qml = ["qmlformat"];
-                rust = ["rustfmt"];
                 svelte = ["prettierd" "prettier"];
                 typescript = ["prettierd" "prettier"];
-                typst = ["typstyle"];
+                rust = ["rustfmt"];
               };
 
               default_format_opts = {
@@ -587,89 +581,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";
@@ -826,11 +820,10 @@ 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 = false;
+            lazy = true;
             cmd = ["LspInfo"];
             event = ["BufReadPost" "BufNewFile"];
             dependencies = [_lazydev];
@@ -844,17 +837,14 @@ 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
                     '';
 
@@ -882,7 +872,7 @@ in {
                 {name = "clojure_lsp";}
                 {name = "cmake";}
                 {name = "cssls";}
-                {name = "html";} # vscode-langservers-extracted
+                # {name = "html";} # vscode-langservers-extracted
                 {name = "lua_ls";}
                 {
                   name = "ltex";
@@ -893,7 +883,7 @@ in {
                     };
                   };
                 }
-                # {name = "nil_ls";}
+                {name = "nil_ls";}
                 {
                   name = "nixd";
                   extraOptions.cmd = [
@@ -944,14 +934,6 @@ 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
@@ -959,6 +941,9 @@ 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.
@@ -1000,12 +985,9 @@ 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
 
@@ -1015,9 +997,7 @@ 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
@@ -1515,8 +1495,6 @@ in {
                 line_length = 1000;
               };
 
-              bufdelete.enabled = false;
-
               dashboard = {
                 enabled = true;
 
@@ -1578,24 +1556,11 @@ 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;
               };
@@ -1609,7 +1574,6 @@ in {
                 '';
               in {
                 enabled = true;
-
                 layout = {
                   cycle = true;
                   preset.__raw = defaultLayout;
@@ -1620,28 +1584,7 @@ in {
                     layout.__raw = defaultLayout;
                   };
                 };
-
-                formatters = {
-                  file = {
-                    filename_first = true;
-                    truncate = 80;
-                  };
-                };
               };
-
-              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;
             };
           };
 
@@ -1933,24 +1876,6 @@ 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;
@@ -2124,9 +2049,7 @@ 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
@@ -2167,7 +2090,6 @@ 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
@@ -2176,8 +2098,7 @@ 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 = 165
+	g.neovide_refresh_rate = 144
 	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 = "/";
@@ -301,15 +301,10 @@ _: let
     {
       mode = "n";
       key = "<leader>e";
+      # action = "<cmd>lua Snacks.explorer.open({ enter = false, on_show = function() vim.cmd('wincmd =') end })<cr>";
       action = "<cmd>Neotree action=show toggle=true<cr><C-w>=";
       options.desc = "Toggle Explorer";
     }
-    {
-      mode = "n";
-      key = "<leader>E";
-      action = "<cmd>Neotree<cr>";
-      options.desc = "Focus Explorer";
-    }
     {
       mode = "n";
       key = "<leader>n";
@@ -834,19 +829,19 @@ _: let
     {
       mode = "n";
       key = "<leader>tt";
-      action = "<cmd>Trouble diagnostics toggle focus=false win.position=left<cr>";
+      action = "<cmd>Trouble diagnostics toggle focus=false win.position=bottom<cr>";
       options.desc = "Trouble Diagnostics";
     }
     {
       mode = "n";
       key = "<leader>tD";
-      action = "<cmd>Trouble todo toggle focus=false win.position=left<cr>";
+      action = "<cmd>Trouble todo toggle focus=false win.position=bottom<cr>";
       options.desc = "Toggle TODOs";
     }
     {
       mode = "n";
       key = "<leader>ts";
-      action = "<cmd>Trouble symbols toggle focus=false win.position=left<cr>";
+      action = "<cmd>Trouble symbols toggle focus=false win.position=right<cr>";
       options.desc = "Trouble Symbols";
     }
     {

home/modules/neovim/vim_opts.nix

@@ -10,7 +10,6 @@ _: {
   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

@@ -1,482 +0,0 @@
-{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

@@ -1,580 +0,0 @@
-{
-  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

@@ -1,265 +0,0 @@
-{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

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

home/modules/qutebrowser/default.nix

@@ -68,7 +68,6 @@ in {
           (mkBm "DeepSeek Chat" "https://chat.deepseek.com/")
           (mkBm "Claude Chat" "https://claude.ai/new")
           (mkBm "ChatGPT" "https://chatgpt.com/")
-          (mkBm "DeepWiki" "https://deepwiki.com/")
           (mkBm "Mistral API" "https://console.mistral.ai/usage")
           (mkBm "DeepSeek API" "https://platform.deepseek.com/usage")
           (mkBm "Claude API" "https://console.anthropic.com/usage")
@@ -104,7 +103,6 @@ in {
         nf = "https://noogle.dev/q?term={}";
         nw = "https://wiki.nixos.org/index.php?search={}";
         aw = "https://wiki.archlinux.org/?search={}";
-        i = "https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue%20{}";
         gh = "https://github.com/search?q={}&type=repositories";
         g = "https://www.google.com/search?hl=en&q={}";
       };

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_dir: "${config.home.homeDirectory}/Music/.lyrics",
 
             // 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;
+      package = pkgs.rofi-wayland;
       terminal = "kitty";
       font = "${color.font} 14";
       location = "center";
@@ -24,7 +24,7 @@ in {
       extraConfig = {
         modi = "run,drun,ssh,filebrowser";
         show-icons = true;
-        icon-theme = color.iconTheme;
+        icon-theme = "Papirus";
         drun-display-format = "{icon} {name}";
         disable-history = false;
         hide-scrollbar = true;
@@ -62,7 +62,21 @@ in {
           background-color = mkLiteral trans;
         };
 
-        # TOP INPUT BAR START
+        "message" = {
+          background-color = mkLiteral trans;
+        };
+
+        "error-message" = {
+          background-color = mkLiteral trans;
+          margin = mkLiteral "0px 0px 10px 0px";
+        };
+
+        "textbox" = {
+          background-color = mkLiteral trans;
+          padding = 6;
+          margin = mkLiteral "10px 10px 0px 10px";
+          border-radius = 3;
+        };
 
         "inputbar" = {
           children = builtins.map mkLiteral ["prompt" "entry"];
@@ -87,26 +101,6 @@ in {
           border-color = mkLiteral color.hexS.accentHl;
         };
 
-        # MESSAGEBOX (usually not visible)
-
-        "message" = {
-          background-color = mkLiteral trans;
-        };
-
-        "error-message" = {
-          background-color = mkLiteral trans;
-          margin = mkLiteral "0px 0px 10px 0px";
-        };
-
-        "textbox" = {
-          background-color = mkLiteral trans;
-          padding = 6;
-          margin = mkLiteral "10px 10px 0px 10px";
-          border-radius = 3;
-        };
-
-        # LISTVIEW
-
         "listview" = {
           # border = mkLiteral "0px 0px 0px";
           padding = 0;
@@ -115,7 +109,7 @@ in {
           background-color = mkLiteral trans;
           border = mkLiteral "2 solid 2 solid 2 solid 2 solid";
           border-radius = 3;
-          border-color = mkLiteral color.hexS.accentDim;
+          border-color = mkLiteral color.hexS.accentHl;
         };
 
         "element" = {
@@ -131,7 +125,7 @@ in {
         };
 
         "element selected" = {
-          background-color = mkLiteral color.hexS.accentDim;
+          background-color = mkLiteral color.hexS.accentHl;
           text-color = mkLiteral color.hexS.accentText;
         };
       };
@@ -184,19 +178,18 @@ in {
         (color.wallpapers
           |> builtins.map (setWallpaperOnMonitors monitors)
           |> lib.mergeAttrsList);
-    in
+    in {
-      lib.mkIf (!config.modules.hyprland.caelestia.enable) {
+      bindings = lib.mergeAttrsList [
-        bindings = lib.mergeAttrsList [
+        {
-          {
+          "$mainMod, escape" = ["exec, \"${power-menu}/bin/rofi-menu-power\""];
-            "$mainMod, escape" = ["exec, \"${power-menu}/bin/rofi-menu-power\""];
+          "$mainMod, m" = ["exec, \"${keybinds-menu}/bin/rofi-menu-keybinds\""];
-            "$mainMod, m" = ["exec, \"${keybinds-menu}/bin/rofi-menu-keybinds\""];
+          "$mainMod, w" = ["exec, \"${wallpaper-menu}/bin/rofi-menu-wall\""];
-            "$mainMod, w" = ["exec, \"${wallpaper-menu}/bin/rofi-menu-wall\""];
+          # "$mainMod, o" = ["exec, \"${lectures-menu}\""];
-            # "$mainMod, o" = ["exec, \"${lectures-menu}\""];
+        }
-          }
+        (lib.optionalAttrs (!nixosConfig.modules.network.useNetworkManager) {
-          (lib.optionalAttrs (!nixosConfig.modules.network.useNetworkManager) {
+          "$mainMod, U" = ["exec, \"${vpn-menu}/rofi-menu-vpn\""];
-            "$mainMod, U" = ["exec, \"${vpn-menu}/rofi-menu-vpn\""];
+        })
-          })
+      ];
-        ];
+    };
-      };
   };
 }

home/modules/yazi/default.nix

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

overlays/default.nix

@@ -1,7 +1,6 @@
 {
   inputs,
   nixpkgs,
-  pkgs-stable,
   ...
 }: let
   # Taken from https://github.com/Misterio77/nix-config/blob/main/overlay/default.nix
@@ -12,55 +11,14 @@
       pkgs = final;
     };
 
-  modifications = final: prev: {
+  modifications = final: prev: rec {
     # Only kept as an example, has nothing to do with current dconf-editor-wrapped derivation
     # dconf-editor-wrapped = import ./dconf-editor.nix { inherit final prev; };
     # Use dconf-editor.nix: { final, prev }: final.<package>.overrideAttrs (oldAttrs: { ... }) or sth similar
-
-    # Overriding specific packages from a different nixpkgs (e.g. a pull request)
-    # can be done like this. Note that this creates an additional nixpkgs instance.
-    # https://github.com/NixOS/nixpkgs/issues/418451
-    # unityhub_3_13 =
-    #   (import inputs.unityhub-pinned {
-    #     config.allowUnfree = true;
-    #     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 {
-    #     owner = "neovide";
-    #     repo = "neovide";
-    #     tag = finalAttrs.version;
-    #     hash = "sha256-2iV3g6tcCkMF7sFG/GZDz3czPZNIDi6YLfrVzYO9jYI=";
-    #   };
-    #   cargoHash = "sha256-YlHAcUCRk6ROg5yXIumHfsiR/2TrsSzbuXz/IQK7sEo=";
-    #   cargoDeps = prev.rustPlatform.fetchCargoVendor {
-    #     inherit (finalAttrs) pname src version;
-    #     hash = finalAttrs.cargoHash;
-    #   };
-    # });
-
-    # Now in Nixpkgs
-    # 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.
+  # TODO: I have absolutely no clue what happens here lol
+  # Basically we need some sort of list of all overlays that can be imported from the flake
+  # in the overlays = [ ... ] section of the pkgs = import nixpkgs { ... } configuration
+  # Somehow this library function turns additions/modifications into that
   nixpkgs.lib.composeManyExtensions [additions modifications]

system/default.nix

@@ -26,12 +26,9 @@ with mylib.networking; {
       enable = true;
 
       loader =
-        lib.mkDefault
+        if headless
-        (
+        then "grub"
-          if headless
+        else "systemd-boot";
-          then "grub"
-          else "systemd-boot"
-        );
       systemd-boot.bootDevice = "/boot";
       grub.bootDevice = "/dev/sda";
     };
@@ -41,7 +38,6 @@ with mylib.networking; {
 
       termfilechooser.enable = true;
       hyprland.enable = config.programs.hyprland.enable;
-      niri.enable = config.programs.niri.enable;
     };
 
     docker = {
@@ -70,8 +66,8 @@ with mylib.networking; {
       defaultWebBrowser = "firefox.desktop";
       defaultPdfViewer = "org.pwmt.zathura.desktop";
       defaultImageViewer = "imv-dir.desktop";
-      defaultAudioPlayer = "mpv.desktop";
+      defaultAudioPlayer = "vlc.desktop";
-      defaultVideoPlayer = "mpv.desktop";
+      defaultVideoPlayer = "vlc.desktop";
     };
 
     network = {
@@ -144,7 +140,7 @@ with mylib.networking; {
 
   # Bootloader/Kernel stuff
   boot = {
-    kernelPackages = lib.mkDefault pkgs.linuxPackages;
+    kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
     kernelParams = ["mitigations=off"]; # I don't care
 
     # Make /tmp volatile
@@ -217,47 +213,33 @@ with mylib.networking; {
     };
 
     # https://github.com/NixOS/nixpkgs/issues/179486
-    supportedLocales = ["${en}/UTF-8" "${de}/UTF-8"];
+    supportedLocales = ["en_US.UTF-8/UTF-8" "de_DE.UTF-8/UTF-8"];
   };
 
   console = {
     earlySetup = true;
     useXkbConfig = true;
     packages = [pkgs.terminus_font];
-    font = "ter-220b";
+    font = "Lat2-Terminus16";
-
-    # Normal      Bright
-    # --------    -------
-    # 0 Black      8 Black
-    # 1 Red        9 Red
-    # 2 Yellow    10 Yellow
-    # 3 Green     11 Green
-    # 4 Blue      12 Blue
-    # 5 Magenta   13 Magenta
-    # 6 Cyan      14 Cyan
-    # 7 White     15 White
     colors = let
       color = config.home-manager.users.${username}.modules.color;
     in [
-      # 0 - 7
+      color.hex.subtext1
-      "000000" # Dark black
       color.hex.red
       color.hex.green
-      color.hex.yellow # Swapped with green for kitty consistency
+      color.hex.yellow
       color.hex.blue
       color.hex.pink
       color.hex.teal
-      color.hex.text # Dark white
+      color.hex.subtext0
-
+      color.hex.surface2
-      # 8 - 15
-      color.hex.surface2 # Light black
       color.hex.red
       color.hex.green
-      color.hex.yellow # Swapped with green for kitty consistency
+      color.hex.yellow
       color.hex.blue
       color.hex.pink
       color.hex.teal
-      "ffffff" # Light white
+      color.hex.surface1
     ];
   };
 
@@ -325,7 +307,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
 
@@ -341,14 +323,8 @@ with mylib.networking; {
       enableSSHSupport = true;
     };
 
-    gpu-screen-recorder.enable = !headless;
-
     hyprland = {
       enable = !headless;
-
-      package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
-      portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
-
       xwayland.enable = true;
       withUWSM = true;
     };
@@ -360,7 +336,6 @@ with mylib.networking; {
       flake = "/home/${username}/NixFlake";
     };
 
-    niri.enable = !headless;
     ssh.startAgent = true; # Use gnupg
     starship.enable = true;
     xwayland.enable = !headless;
@@ -389,21 +364,6 @@ 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;
 
@@ -463,7 +423,6 @@ 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}";
@@ -471,7 +430,7 @@ with mylib.networking; {
       script = ''
         set -eu
         echo "Start refreshing nps cache..."
-        ${inputs.nps.packages.${pkgs.stdenv.hostPlatform.system}.default}/bin/nps -dddd -e -r
+        ${inputs.nps.packages.${system}.default}/bin/nps -dddd -e -r
         echo "... finished nps cache with exit code $?."
       '';
     };

system/modules/bootloader/default.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   mylib,
@@ -32,20 +31,5 @@ in {
         device = bootloader.grub.bootDevice;
       };
     })
-    (lib.mkIf (bootloader.loader == "lanzaboote") {
-      environment.systemPackages = with pkgs; [
-        sbctl
-      ];
-
-      # Lanzaboote replaces systemd-boot
-      boot.loader.systemd-boot.enable = lib.mkForce false;
-
-      boot.lanzaboote = {
-        enable = true;
-
-        # WARN: Make sure to persist this if using impermanence!
-        pkiBundle = "/var/lib/sbctl";
-      };
-    })
   ]);
 }

system/modules/bootloader/options.nix

@@ -9,7 +9,6 @@
     type = lib.types.enum [
       "grub"
       "systemd-boot"
-      "lanzaboote"
     ];
     description = "What boot loader to use";
     example = "systemd-boot";

system/modules/desktopportal/default.nix

@@ -14,7 +14,7 @@ in {
       portal = {
         enable = true;
         xdgOpenUsePortal = true;
-        wlr.enable = true;
+        wlr.enable = false;
 
         # TODO: Replace lib.optional(s) throughout the config with mkMerge
         config = lib.mkMerge [
@@ -35,14 +35,6 @@ 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;
@@ -51,10 +43,9 @@ in {
               xdg-desktop-portal-gtk # Fallback
             ]
 
-            # We don't need to install that explicitly
+            (lib.mkIf desktopportal.hyprland.enable [
-            # (lib.mkIf desktopportal.hyprland.enable [
+              xdg-desktop-portal-hyprland
-            #   xdg-desktop-portal-hyprland
+            ])
-            # ])
 
             (lib.mkIf desktopportal.termfilechooser.enable [
               xdg-desktop-portal-termfilechooser # Filechooser using yazi

system/modules/desktopportal/options.nix

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

system/modules/fonts/default.nix

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

system/modules/impermanence/default.nix

@@ -43,12 +43,6 @@ in {
     mkRFile = mkFile "root";
     mkUDir = mkDir "${username}";
     mkUFile = mkFile "${username}";
-    # TODO: sth. like this, make options for configdirs/sharedirs/statedirs/homedirs
-    #       populate options from respective modules, not here...
-    # mkConfigDirs = dirs:
-    #   dirs
-    #   |> builtins.map (dir: ".config/${dir}")
-    #   |> builtins.map mkUDir # NOTE: mkUDir has wrong arg order
   in
     lib.mkIf impermanence.enable {
       # TODO: Create options to allow host-specific impermanence setup
@@ -69,18 +63,14 @@ 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)
           (mkRDir "/var/lib/NetworkManager" m755)
           (mkRDir "/var/lib/nixos" m755)
-          (mkRDir "/var/lib/sbctl" m755)
           (mkRDir "/var/lib/systemd" m755)
 
           (mkRDir "/var/tmp" m777)
@@ -90,13 +80,13 @@ in {
           files = [
             # NOTE: Don't put files generated/linked by HM here (they're already managed)
 
-            # TODO: Specifying files here (e.g. .config/QtProject.conf) doesn't seem to work
+            # TODO: These files are not mounted?
-            #       They won't get mounted, also they can't be unmounted (because they're not mounted),
+            (mkUFile ".config/.tidal-dl.json" m755)
-            #       which leads to /home not being unmounted correctly during shutdown...
+            (mkUFile ".config/.tidal-dl.token.json" m755)
+            (mkUFile ".config/QtProject.conf" m755) # KeePassXC
           ];
 
           directories = [
-            # Home directory
             (mkUDir "Downloads" m755)
             (mkUDir "Documents" m755)
             (mkUDir "GitRepos" m755)
@@ -105,82 +95,61 @@ in {
             (mkUDir "Pictures" m755)
             (mkUDir "Projects" m755)
             (mkUDir "Public" m755)
-            # (mkUDir "Unity" m755)
+            (mkUDir "Unity" m755)
             (mkUDir "Videos" m755)
 
-            # Secrets
             (mkUDir ".gnupg" m755) # m600
             (mkUDir ".secrets" m755) # m644
             (mkUDir ".ssh" m755) # m644
 
-            # The shit some applications add to ~/ without asking
+            (mkUDir ".android" m755) # Unity
-            # (mkUDir ".android" m755) # Unity
+            (mkUDir ".java" m755) # Unity/Rider
-            # (mkUDir ".gradle" m755) # Unity
-            # (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 ".ollama" m755)
-            # (mkUDir ".plastic4" m755) # Unity
             (mkUDir ".var/app" m755)
             (mkUDir ".vim/undo" m755)
             (mkUDir ".zotero" m755)
 
-            # Cache that's actually useful
             (mkUDir ".cache/fish/generated_completions" m755)
             (mkUDir ".cache/nix-index" m755)
             (mkUDir ".cache/nix-search-tv" m755)
             (mkUDir ".cache/nvim" m755)
 
-            # Config
-            # (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/jellyfin-mpv-shim" m755)
+            (mkUDir ".config/JetBrains" m755) # Unity/Rider
-            (mkUDir ".config/JetBrains" m755)
             (mkUDir ".config/kdeconnect" m755)
             (mkUDir ".config/keepassxc" m755)
             (mkUDir ".config/Msty" m755)
             (mkUDir ".config/Nextcloud" m755)
             (mkUDir ".config/obsidian" m755)
-            (mkUDir ".config/obs-studio" m755)
             (mkUDir ".config/Signal" m755)
-            # (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/vlc" m755)
             (mkUDir ".config/Zeal" m755)
 
-            # Share
             (mkUDir ".local/share/direnv" m755)
             (mkUDir ".local/share/docker" m755)
             (mkUDir ".local/share/fish" m755)
             (mkUDir ".local/share/flatpak" m755)
-            (mkUDir ".local/share/JetBrains" m755) # Unity
+            (mkUDir ".local/share/JetBrains" m755) # Unity/Rider
             (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/zoxide" m755)
 
-            # State
             (mkUDir ".local/state/astal/notifd" m755)
-            (mkUDir ".local/state/home-manager/gc-roots" m755) # nix-flatpak stores its state there
             (mkUDir ".local/state/lazygit" m755)
             (mkUDir ".local/state/nix" m755)
             (mkUDir ".local/state/nvim" m755)

system/modules/sops-nix/default.nix

@@ -26,7 +26,9 @@ in {
       defaultSopsFile = ./secrets.yaml;
 
       age = {
-        keyFile = lib.mkDefault "/home/${username}/.secrets/age/age.key";
+        # NOTE: Sops needs the keys before impermanence kicks in
+        #       so we have to link to /persist directly...
+        keyFile = "/persist/home/${username}/.secrets/age/age.key";
         generateKey = false;
         sshKeyPaths = [];
       };

system/nixinator/default.nix

@@ -1,5 +1,4 @@
 {
-  lib,
   mylib,
   pkgs,
   username,
@@ -12,17 +11,9 @@
     ./disks.nix
 
     ../modules
-
-    # General services
-    ../services/fileflows-node.nix
   ];
 
   modules = {
-    bootloader = {
-      # Secure boot
-      loader = "lanzaboote";
-    };
-
     impermanence.enable = true;
 
     network = {
@@ -70,8 +61,8 @@
       };
 
       allowedTCPPorts = [
-        7777 # AvaTalk
+        # 7777 # AvaTalk
-        12777 # AvaTalk
+        # 12777 # AvaTalk
         # 31431 # Parsec
         5173 # SvelteKit
         8090 # PocketBase
@@ -79,8 +70,8 @@
       ];
 
       allowedUDPPorts = [
-        7777 # AvaTalk
+        # 7777 # AvaTalk
-        12777 # AvaTalk
+        # 12777 # AvaTalk
         # 31431 # Parsec
         5173 # SvelteKit
         8090 # PocketBase
@@ -94,10 +85,6 @@
     ];
   };
 
-  # NOTE: Sops needs the keys before impermanence kicks in
-  #       so we have to link to /persist directly...
-  sops.age.keyFile = "/persist/home/${username}/.secrets/age/age.key";
-
   sops.templates."makemkv-settings.conf" = {
     owner = config.users.users.${username}.name;
     content = ''
@@ -108,9 +95,8 @@
 
   boot = {
     kernelPackages = pkgs.linuxPackages_zen;
-    # kernelPackages = pkgs.linuxPackages_latest;
 
-    # kernelParams = [ "quiet" ];
+    # kernelParams = ["quiet"];
     # plymouth.enable = true;
   };
 

system/nixinator/hardware-configuration.nix

@@ -12,22 +12,12 @@
   imports = [(modulesPath + "/installer/scan/not-detected.nix")];
 
   boot = {
-    initrd.availableKernelModules = [
+    initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"];
-      "xhci_pci"
-      "ahci"
-      "nvme"
-      "usbhid"
-      "usb_storage"
-      "sd_mod"
-    ];
 
-    initrd.kernelModules = [
+    # Enable early Nvidia kernel modesetting
-      # Enable Nvidia early KMS
+    # https://wiki.archlinux.org/title/GDM#GDM_ignores_Wayland_and_uses_X.Org_by_default (not fixed by this)
-      "nvidia"
+    # https://wiki.archlinux.org/title/Kernel_mode_setting#Early_KMS_start
-      "nvidia_modeset"
+    initrd.kernelModules = ["nvidia" "nvidia_modeset" "nvidia_uvm" "nvidia_drm"]; # NVIDIA
-      "nvidia_uvm"
-      "nvidia_drm"
-    ];
 
     initrd.supportedFilesystems = [
       "ext4"
@@ -35,10 +25,6 @@
       "vfat"
     ];
 
-    supportedFilesystems = [
-      # "zfs" # Probably requires LTS kernel + networking.hostId
-    ];
-
     kernelModules = [
       "kvm-amd"
       "sg" # Blu-Ray drive
@@ -47,11 +33,9 @@
 
     blacklistedKernelModules = ["k10temp"]; # Disable in favor of zenpower
 
-    kernelParams = [
+    # Enable AMD pstate
-      # Enable AMD pstate
+    # https://github.com/NixOS/nixos-hardware/blob/master/common/cpu/amd/pstate.nix
-      # https://github.com/NixOS/nixos-hardware/blob/master/common/cpu/amd/pstate.nix
+    kernelParams = ["amd_pstate=active"];
-      "amd_pstate=active"
-    ];
 
     # extraModprobeConfig = ''
     #   options iwlwifi 11n_disable=1 wd_disable=0
@@ -64,9 +48,6 @@
     ];
   };
 
-  # 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)
 
@@ -89,38 +70,28 @@
     # Using  NFS over TCP or increasing the value of the retrans option may mitigate
     # some of the risks of using the soft option.
 
-    # Synology DS223j
-
-    "/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";
+      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/Seagate4TB/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/Seagate4TB/Music";
+      device = "192.168.86.20:/mnt/SG Exos Mirror 18TB/Music";
       fsType = "nfs";
       options = ["defaults" "rw" "noatime" "_netdev" "bg" "soft"];
     };
 
-    "/media/Box" = {
+    "/home/${username}/Restic" = {
-      device = "192.168.86.20:/mnt/Seagate4TB/Box";
+      device = "192.168.86.15:/volume1/NixinatorPersistence";
       fsType = "nfs";
-      options = ["defaults" "rw" "relatime" "_netdev" "bg" "soft"];
+      options = ["defaults" "rw" "noatime" "_netdev" "bg" "soft"];
     };
   };
 
@@ -133,12 +104,12 @@
     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;
 
+      modesetting.enable = true; # Not officially supported by NVidia but needed for wayland
       open = true;
       nvidiaSettings = false; # Those are for x-server
-      modesetting.enable = true; # Required for wayland
     };
 
     # video.hidpi.enable = lib.mkDefault true; # No longer has any effect
@@ -148,7 +119,7 @@
 
       # https://nixos.wiki/wiki/Accelerated_Video_Playback
       extraPackages = with pkgs; [
-        libva-vdpau-driver # Taken from wiki, this is also part of nixos-hardware/common/gpu/nvidia
+        vaapiVdpau # 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

@@ -13,21 +13,10 @@
   ];
 
   boot = {
-    initrd.availableKernelModules = [
+    initrd.availableKernelModules = ["xhci_pci" "ehci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"];
-      "xhci_pci"
-      "ehci_pci"
-      "ahci"
-      "usb_storage"
-      "sd_mod"
-      "rtsx_pci_sdmmc"
-    ];
-
     initrd.kernelModules = [];
-
     kernelModules = ["kvm-intel"];
-
     extraModulePackages = with config.boot.kernelPackages; [];
-
     # NOTE: Didn't work with Zen, switched to regular kernel instead
     # kernelPatches = [
     #   {
@@ -71,8 +60,8 @@
       # driSupport = true; # NOTE: Deprecated
       extraPackages = with pkgs; [
         intel-media-driver
-        intel-vaapi-driver
+        vaapiIntel
-        libva-vdpau-driver
+        vaapiVdpau
         libvdpau-va-gl
       ];
     };

system/servenix/default.nix

@@ -20,30 +20,18 @@
     ../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
   ];
 
@@ -69,30 +57,16 @@
         };
       };
 
-      # NOTE: Streams: Ports have to be opened in the VPS firewall + VPS UFW and bound in the VPS Nginx compose file.
-
       allowedTCPPorts = [
-        53 # DNS (Adguard Home)
+        53 # DNS
-        67 # DHCP
+        80 # HTTP
-        80 # HTTP (Nginx Proxy Manager)
+        3000 # Gitea runner needs to reach local gitea instance
-        443 # HTTPS (Nginx Proxy Manager)
-
-        3000 # Gitea (runner needs to reach local gitea instance)
-
-        30033 # Teamspeak
-        10080 # Teamspeak
       ];
 
       allowedUDPPorts = [
-        53 # DNS (Adguard Home)
+        53 # DNS
         67 # DHCP
-        80 # HTTP (Nginx Proxy Manager)
+        3000 # Gitea runner needs to reach local gitea instance
-        443 # HTTPS (Nginx Proxy Manager)
-
-        3000 # Gitea (runner needs to reach local gitea instance)
-
-        30033 # Teamspeak
-        9987 # Teamspeak
       ];
     };
 

system/servenix/hardware-configuration.nix

@@ -10,14 +10,7 @@
   ];
 
   boot = {
-    initrd.availableKernelModules = [
+    initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod"];
-      "ata_piix"
-      "uhci_hcd"
-      "virtio_pci"
-      "virtio_scsi"
-      "sd_mod"
-      "sr_mod"
-    ];
     initrd.kernelModules = [];
     kernelModules = ["kvm-intel"];
     extraModulePackages = [];
@@ -44,28 +37,22 @@
       options = ["defaults" "rw" "relatime" "_netdev" "bg" "soft"];
     };
 
-    # TrueNAS
+    # SG Exos Mirror Shares
 
     "/media/Movie" = {
-      device = "192.168.86.20:/mnt/Seagate4TB/Movies";
+      device = "192.168.86.20:/mnt/SG Exos Mirror 18TB/Movie";
       fsType = "nfs";
       options = ["defaults" "rw" "relatime" "_netdev" "bg" "soft"];
     };
 
     "/media/Show" = {
-      device = "192.168.86.20:/mnt/Seagate4TB/Shows";
+      device = "192.168.86.20:/mnt/SG Exos Mirror 18TB/Show";
       fsType = "nfs";
       options = ["defaults" "rw" "relatime" "_netdev" "bg" "soft"];
     };
 
     "/media/TV-Music" = {
-      device = "192.168.86.20:/mnt/Seagate4TB/Music";
+      device = "192.168.86.20:/mnt/SG Exos Mirror 18TB/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"];
     };
@@ -98,7 +85,7 @@
       enable32Bit = true;
 
       extraPackages = with pkgs; [
-        libva-vdpau-driver
+        vaapiVdpau
         libvdpau-va-gl
 
         nvidia-vaapi-driver

system/services/authelia.nix

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

system/services/bazarr.nix

@@ -1,49 +0,0 @@
-{
-  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

@@ -1,59 +0,0 @@
-{
-  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

@@ -1,54 +0,0 @@
-{
-  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

@@ -1,51 +0,0 @@
-{
-  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" # Bind for VPS
+        "55555:5000"
       ];
 
       volumes = [

system/services/formula11.nix

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

system/services/gitea-runner.nix

@@ -0,0 +1,52 @@
+{
+  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,7 +5,6 @@
   ...
 }: let
   giteaVersion = "1.24.2";
-  runnerVersion = "0.2.12";
 in {
   users = {
     groups.git = {};
@@ -73,7 +72,7 @@ in {
       ];
 
       ports = [
-        "3000:3000" # Bind for VPS
+        "3000:3000"
 
         # NOTE: Set .git/config url to ssh://christoph@gitea.local.chriphost.de:222/christoph/<repo>.git
         "222:222" # Gitea SSH
@@ -102,49 +101,5 @@ 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 = "2.3.1";
+  immichVersion = "1.135.3";
 in {
   virtualisation.oci-containers.containers = {
     immich-database = {
@@ -73,7 +73,7 @@ in {
       ];
 
       ports = [
-        "2283:8080" # Bind for VPS
+        "2283:8080"
       ];
 
       volumes = [
@@ -103,7 +103,7 @@ in {
       };
 
       extraOptions = [
-        "--privileged"
+        # "--privileged"
         "--device=nvidia.com/gpu=all"
         "--net=behind-nginx"
       ];

system/services/jellyfin.nix

@@ -4,7 +4,7 @@
   pkgs,
   ...
 }: let
-  jellyfinVersion = "10.11.2";
+  jellyfinVersion = "10.10.7";
 in {
   virtualisation.oci-containers.containers = {
     jellyfin = {
@@ -25,7 +25,7 @@ in {
       ];
 
       ports = [
-        "8096:8096" # Bind for VPS
+        "8096:8096"
       ];
 
       volumes = [
@@ -43,7 +43,7 @@ in {
       };
 
       extraOptions = [
-        "--privileged"
+        # "--privileged"
         "--device=nvidia.com/gpu=all"
         "--net=behind-nginx"
       ];

system/services/nextcloud.nix

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

system/services/nginx-proxy-manager.nix

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

system/services/paperless.nix

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

system/services/plex.nix

@@ -1,64 +0,0 @@
-{
-  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.33.3";
+  portainerVersion = "2.31.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.33.3";
+  portainerVersion = "2.31.3";
 in {
   virtualisation.oci-containers.containers = {
     portainer = {

system/services/prowlarr.nix

@@ -1,46 +0,0 @@
-{
-  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

@@ -1,40 +0,0 @@
-{
-  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

@@ -1,42 +0,0 @@
-{
-  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

@@ -1,46 +0,0 @@
-{
-  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

@@ -1,49 +0,0 @@
-{
-  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

@@ -1,53 +0,0 @@
-{
-  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

@@ -1,53 +0,0 @@
-{
-  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

@@ -1,49 +0,0 @@
-{
-  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

@@ -1,29 +0,0 @@
-{
-  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

@@ -1,51 +0,0 @@
-{
-  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

@@ -1,54 +0,0 @@
-{
-  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,8 +20,6 @@
     ../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

@@ -10,13 +10,7 @@
   ];
 
   boot = {
-    initrd.availableKernelModules = [
+    initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod"];
-      "ata_piix"
-      "uhci_hcd"
-      "virtio_pci"
-      "virtio_scsi"
-      "sd_mod"
-    ];
     initrd.kernelModules = [];
     kernelModules = [
       "kvm-intel"
@@ -40,22 +34,22 @@
       options = ["defaults" "rw" "relatime" "_netdev" "bg" "soft"];
     };
 
-    # TrueNAS
+    # SG Exos Mirror Shares
 
     "/media/Movie" = {
-      device = "192.168.86.20:/mnt/Seagate4TB/Movies";
+      device = "192.168.86.20:/mnt/SG Exos Mirror 18TB/Movie";
       fsType = "nfs";
       options = ["defaults" "rw" "relatime" "_netdev" "bg" "soft"];
     };
 
     "/media/Show" = {
-      device = "192.168.86.20:/mnt/Seagate4TB/Shows";
+      device = "192.168.86.20:/mnt/SG Exos Mirror 18TB/Show";
       fsType = "nfs";
       options = ["defaults" "rw" "relatime" "_netdev" "bg" "soft"];
     };
 
     "/media/TV-Music" = {
-      device = "192.168.86.20:/mnt/Seagate4TB/Music";
+      device = "192.168.86.20:/mnt/SG Exos Mirror 18TB/Music";
       fsType = "nfs";
       options = ["defaults" "rw" "relatime" "_netdev" "bg" "soft"];
     };