Home/Nixinator: Allow PrismLauncher to access ~/Downloads

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.

flake.nix

@@ -60,7 +60,7 @@
     # Noctalia shell
     noctalia.url = "github:noctalia-dev/noctalia-shell";
     noctalia.inputs.nixpkgs.follows = "nixpkgs";
-    # noctalia.inputs.quickshell.follows = "quickshell";
+    noctalia.inputs.quickshell.follows = "quickshell";
 
     # Lol
     waifu-cursors.url = "github:kagurazakei/waifu-cursors";
@@ -73,13 +73,13 @@
     # caelestia-cli.inputs.nixpkgs.follows = "nixpkgs";
 
     # DankMaterialShell
-    dgop.url = "github:AvengeMedia/dgop";
+    # dgop.url = "github:AvengeMedia/dgop";
-    dgop.inputs.nixpkgs.follows = "nixpkgs";
+    # dgop.inputs.nixpkgs.follows = "nixpkgs";
     # dms-cli.url = "github:AvengeMedia/danklinux";
     # dms-cli.inputs.nixpkgs.follows = "nixpkgs";
-    dankMaterialShell.url = "github:AvengeMedia/DankMaterialShell";
+    # dankMaterialShell.url = "github:AvengeMedia/DankMaterialShell";
-    dankMaterialShell.inputs.nixpkgs.follows = "nixpkgs";
+    # dankMaterialShell.inputs.nixpkgs.follows = "nixpkgs";
-    dankMaterialShell.inputs.dgop.follows = "dgop";
+    # dankMaterialShell.inputs.dgop.follows = "dgop";
 
     # Hyprland (use flake so plugins are not built from source)
     hyprland.url = "github:hyprwm/Hyprland";

home/christoph/default.nix

@@ -57,7 +57,7 @@ in
         extraPackages = with pkgs; [
           papirus-icon-theme
           bibata-cursors
-          inputs.waifu-cursors.packages.${pkgs.stdenv.hostPlatform.system}.all
+          inputs.waifu-cursors.packages.${pkgs.system}.all
         ];
 
         cursor = "Bibata-Modern-Classic";
@@ -98,7 +98,7 @@ in
       };
 
       hyprland = {
-        enable = false;
+        enable = !headless;
         dunst.enable = !config.modules.hyprpanel.enable; # Disable for hyprpanel
         bars.enable = false;
         dynamicCursor.enable = false;
@@ -225,8 +225,8 @@ in
 
         windowrules = [
           # Fix jetbrains tooltip flicker
-          "match:class ^(jetbrains-.*)$, match:title ^(win[0-9]+)$, float 1"
+          "float,class:^(jetbrains-.*)$,title:^(win[0-9]+)$"
-          "match:class ^(jetbrains-.*)$, match:title ^(win[0-9]+)$, no_initial_focus 1"
+          "nofocus,class:^(jetbrains-.*)$,title:^(win[0-9]+)$"
         ];
 
         workspacerules = {
@@ -537,10 +537,10 @@ in
             # Run unpatched binaries on NixOS
             # Sets NIX_LD_LIBRARY_PATH and NIX_LD variables for nix-ld.
             # Usage: "nix-alien-ld -- <Executable>".
-            inputs.nix-alien.packages.${pkgs.stdenv.hostPlatform.system}.nix-alien
+            inputs.nix-alien.packages.${system}.nix-alien
 
             # Search nixpkgs
-            inputs.nps.packages.${pkgs.stdenv.hostPlatform.system}.default
+            inputs.nps.packages.${system}.default
 
             # Use NixCommunity binary cache
             cachix
@@ -854,7 +854,7 @@ in
       nushell.enable = false;
 
       # spicetify = let
-      #   spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.stdenv.hostPlatform.system};
+      #   spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system};
       # in {
       #   enable = true;
       #

home/christoph/nixinator/default.nix

@@ -140,8 +140,6 @@
         makemkv
         lrcget
         msty
-        # jellyfin-media-player # CVE, can't install
-        jellyfin-mpv-shim
 
         steam-devices-udev-rules
       ];

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/default.nix

@@ -35,8 +35,8 @@
     # 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.default
-    inputs.dankMaterialShell.homeModules.dankMaterialShell.niri
+    # 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/hyprland/default.nix

@@ -142,8 +142,8 @@ in {
 
     wayland.windowManager.hyprland = {
       enable = true;
-      package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
+      package = inputs.hyprland.packages.${pkgs.system}.hyprland;
-      portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
+      portalPackage = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland;
 
       systemd.enable = true; # Enable hyprland-session.target
       systemd.variables = ["--all"]; # Import PATH into systemd
@@ -152,16 +152,16 @@ in {
       plugins = builtins.concatLists [
         (lib.optionals
           hyprland.bars.enable
-          [inputs.hyprland-plugins.packages.${pkgs.stdenv.hostPlatform.system}.hyprbars])
+          [inputs.hyprland-plugins.packages.${pkgs.system}.hyprbars])
         (lib.optionals
           hyprland.dynamicCursor.enable
-          [inputs.hypr-dynamic-cursors.packages.${pkgs.stdenv.hostPlatform.system}.hypr-dynamic-cursors])
+          [inputs.hypr-dynamic-cursors.packages.${pkgs.system}.hypr-dynamic-cursors])
         (lib.optionals
           hyprland.trails.enable
-          [inputs.hyprland-plugins.packages.${pkgs.stdenv.hostPlatform.system}.hyprtrails])
+          [inputs.hyprland-plugins.packages.${pkgs.system}.hyprtrails])
         (lib.optionals
           hyprland.hyprspace.enable
-          [inputs.hyprspace.packages.${pkgs.stdenv.hostPlatform.system}.Hyprspace])
+          [inputs.hyprspace.packages.${pkgs.system}.Hyprspace])
       ];
 
       settings = import ./settings.nix {

home/modules/hyprland/settings.nix

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

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
@@ -47,7 +52,6 @@ in {
             tailwindcss-language-server
             tex-fmt
             texlab
-            tinymist
             typescript
             vscode-langservers-extracted # includes nodejs
 
@@ -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
           ]
         ];
     };
@@ -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 = {
@@ -827,10 +821,11 @@ in {
 
           # NOTE: This entire thing is rough, I should rewrite...
           # TODO: Need to rewrite this once lspconfig 3.0 comes around
+          # TODO: LSP servers don't autostart anymore...
           lspconfig = {
             name = "lspconfig";
             pkg = pkgs.vimPlugins.nvim-lspconfig;
-            lazy = false;
+            lazy = true;
             cmd = ["LspInfo"];
             event = ["BufReadPost" "BufNewFile"];
             dependencies = [_lazydev];
@@ -944,14 +939,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
@@ -1000,12 +987,10 @@ in {
                   capabilities = __lspCapabilities(),
                 }
 
-                -- Enable configured servers
                 for i, server in ipairs(${servers}) do
                   if type(server) == "string" then
                     -- require("lspconfig")[server].setup(__setup)
                     vim.lsp.config(server, __setup)
-                    vim.lsp.enable(server)
                   else
                     local options = server.extraOptions
 
@@ -1017,7 +1002,6 @@ in {
 
                     -- require("lspconfig")[server.name].setup(options)
                     vim.lsp.config(server.name, options)
-                    vim.lsp.enable(server.name)
                   end
                 end
               end
@@ -1515,8 +1499,6 @@ in {
                 line_length = 1000;
               };
 
-              bufdelete.enabled = false;
-
               dashboard = {
                 enabled = true;
 
@@ -1578,24 +1560,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;
               };
@@ -1628,20 +1597,6 @@ in {
                   };
                 };
               };
-
-              profiler.enabled = false;
-              quickfile.enabled = false;
-              rename.enabled = false;
-              scope.enabled = false;
-              scratch.enabled = false;
-              scroll.enabled = false;
-              statuscolumn.enabled = false;
-              terminal.enabled = false;
-              toggle.enabled = false;
-              util.enabled = false;
-              win.enabled = false;
-              words.enabled = false;
-              zen.enabled = false;
             };
           };
 
@@ -1933,24 +1888,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;
@@ -2167,7 +2104,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

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

@@ -11,15 +11,11 @@
 in {
   options.modules.niri = import ./options.nix {inherit lib mylib;};
 
-  config = lib.mkIf niri.enable rec {
+  config = lib.mkIf niri.enable {
     assertions = [
       {
         assertion = nixosConfig.programs.niri.enable;
-        message = "Can't enable Niri config with Niri disabled!";
+        message = "Can't enable Niri module with Niri disabled!";
-      }
-      {
-        assertion = !(programs.noctalia-shell.enable && programs.dankMaterialShell.enable);
-        message = "Can't enable Noctalia and DankMaterialShell at the same time!";
       }
     ];
 
@@ -29,9 +25,6 @@ in {
       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
@@ -59,11 +52,8 @@ in {
     };
 
     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
 
@@ -100,18 +90,18 @@ in {
           prefer-no-csd = true; # Disable client-side decorations (e.g. window titlebars)
 
           spawn-at-startup = [
-            # TODO: Depend on options
+            {argv = ["noctalia-shell"];}
-            # {argv = ["noctalia-shell"];}
-            {argv = ["dms" "run"];}
-
             {argv = ["kitty" "--hold" "fastfetch"];}
             {argv = ["zeal"];}
+            {argv = ["sleep" "5s" "&&" "nextcloud" "--background"];}
             {argv = ["protonvpn-app"];}
+            {argv = ["sleep" "5s" "&&" "keepassxc"];} # TODO: Delay startup
             {argv = ["fcitx5"];}
-            {argv = ["jellyfin-mpv-shim"];}
 
-            {sh = "sleep 5s && nextcloud --background";}
+            # TODO: On certain workspaces
-            {sh = "sleep 5s && keepassxc";}
+            # {argv = ["ferdium"];}
+            # {argv = ["kitty --title=Btop btop"];}
+            # {argv = ["kitty --title=Rmpc rmpc"];}
           ];
 
           workspaces = {
@@ -133,7 +123,7 @@ in {
               mode = {
                 width = 3440;
                 height = 1440;
-                refresh = 164.999;
+                refresh = 165.0;
               };
               position = {
                 x = 1920;
@@ -180,7 +170,7 @@ in {
               display = {color = color.hex.accentDim;};
             };
 
-            always-center-single-column = true;
+            always-center-single-column = false;
 
             # Gaps between windows
             gaps = 8;
@@ -201,10 +191,6 @@ in {
           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;
@@ -212,19 +198,9 @@ in {
                 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
+            # Assign to workspaces
             {
               matches = [{app-id = "Zotero";}];
               open-on-workspace = "2";
@@ -232,12 +208,10 @@ in {
             {
               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";}];
@@ -246,7 +220,6 @@ in {
             {
               matches = [{app-id = "firefox";}];
               open-on-workspace = "4";
-              open-maximized = true;
             }
             {
               matches = [{app-id = "Google-chrome";}];
@@ -267,18 +240,14 @@ in {
             {
               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;
             }
           ];
 
@@ -333,42 +302,22 @@ in {
               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";
+              action = spawn "noctalia-shell" "ipc" "call" "launcher" "toggle";
               hotkey-overlay = {title = "Toggle the application launcher.";};
             };
             "Mod+Ctrl+L" = {
-              action = spawn "dms" "ipc" "call" "lock" "lock";
+              action = spawn "noctalia-shell" "ipc" "call" "lockScreen" "lock";
               hotkey-overlay = {title = "Lock the screen.";};
             };
-            "Mod+Escape" = {
+            "Mod+W" = {
-              action = spawn "dms" "ipc" "call" "powermenu" "toggle";
+              action = spawn "noctalia-shell" "ipc" "call" "wallpaper" "toggle";
-              hotkey-overlay = {title = "Toggle the session menu.";};
+              hotkey-overlay = {title = "Toggle the wallpaper chooser.";};
             };
-            "Mod+C" = {
+            "Mod+Escape" = {
-              action = spawn "dms" "ipc" "call" "clipboard" "toggle";
+              action = spawn "noctalia-shell" "ipc" "call" "sessionMenu" "toggle";
-              hotkey-overlay = {title = "Show clipboard history.";};
+              hotkey-overlay = {title = "Toggle the session menu.";};
             };
 
             # Screenshots
@@ -381,12 +330,6 @@ in {
               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%+";
@@ -409,6 +352,12 @@ in {
               hotkey-overlay = {hidden = true;};
             };
 
+            # Niri
+            "Mod+Shift+Slash" = {
+              action = show-hotkey-overlay;
+              hotkey-overlay = {hidden = true;};
+            };
+
             # Niri windows
             "Mod+Q" = {
               action = close-window;
@@ -475,7 +424,7 @@ in {
               hotkey-overlay = {hidden = true;};
             };
             "Mod+Shift+H" = {
-              action = move-column-left-or-to-monitor-left;
+              action = move-column-left;
               hotkey-overlay = {title = "Move column to the left. Equivalent bindings for other directions.";};
             };
             "Mod+Shift+J" = {
@@ -487,7 +436,7 @@ in {
               hotkey-overlay = {hidden = true;};
             };
             "Mod+Shift+L" = {
-              action = move-column-right-or-to-monitor-right;
+              action = move-column-right;
               hotkey-overlay = {hidden = true;};
             };
 

home/modules/niri/noctalia.nix

@@ -1,6 +1,5 @@
 {color}: {
-  enable = false;
+  enable = true;
-
   settings = {
     # configure noctalia here; defaults will
     # be deep merged with these attributes.
@@ -130,7 +129,6 @@
       visualizerQuality = "high";
       mprisBlacklist = [];
       preferredPlayer = "";
-      externalMixer = "kitty --title=Ncpamixer ncpamixer";
     };
 
     nightLight = {
@@ -213,36 +211,17 @@
           }
         ];
         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";
+            id = "Bluetooth";
-            # displayMode = "alwaysShow";
           }
           {
             id = "Tray";

overlays/default.nix

@@ -29,7 +29,6 @@
     # 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 {
@@ -45,21 +44,20 @@
     #   };
     # });
 
-    # Now in Nixpkgs
+    rmpc = prev.rmpc.overrideAttrs (finalAttrs: prevAttrs: {
-    # rmpc = prev.rmpc.overrideAttrs (finalAttrs: prevAttrs: {
+      version = "0.10.0";
-    #   version = "0.10.0";
+      src = prev.fetchFromGitHub {
-    #   src = prev.fetchFromGitHub {
+        owner = "mierak";
-    #     owner = "mierak";
+        repo = "rmpc";
-    #     repo = "rmpc";
+        rev = "v0.10.0";
-    #     rev = "v0.10.0";
+        hash = "sha256-NU8T26oPhm8L7wdO4p65cpNa0pax7/oqHGs98QDoEc0=";
-    #     hash = "sha256-NU8T26oPhm8L7wdO4p65cpNa0pax7/oqHGs98QDoEc0=";
+      };
-    #   };
+      cargoHash = "sha256-d2/4q2s/11HNE18D8d8Y2yWidhT+XsUS4J9ahnxToI0=";
-    #   cargoHash = "sha256-d2/4q2s/11HNE18D8d8Y2yWidhT+XsUS4J9ahnxToI0=";
+      cargoDeps = prev.rustPlatform.fetchCargoVendor {
-    #   cargoDeps = prev.rustPlatform.fetchCargoVendor {
+        inherit (finalAttrs) pname src version;
-    #     inherit (finalAttrs) pname src version;
+        hash = finalAttrs.cargoHash;
-    #     hash = finalAttrs.cargoHash;
+      };
-    #   };
+    });
-    # });
   };
 in
   # Composes a list of overlays and returns a single overlay function that combines them.

system/default.nix

@@ -346,8 +346,8 @@ with mylib.networking; {
     hyprland = {
       enable = !headless;
 
-      package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
+      package = inputs.hyprland.packages.${system}.hyprland;
-      portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
+      portalPackage = inputs.hyprland.packages.${system}.xdg-desktop-portal-hyprland;
 
       xwayland.enable = true;
       withUWSM = true;
@@ -463,7 +463,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 +470,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/impermanence/default.nix

@@ -142,7 +142,6 @@ in {
             (mkUDir ".config/Ferdium" m755)
             (mkUDir ".config/fish/completions" m755)
             (mkUDir ".config/impermanence" m755)
-            (mkUDir ".config/jellyfin-mpv-shim" m755)
             (mkUDir ".config/JetBrains" m755)
             (mkUDir ".config/kdeconnect" m755)
             (mkUDir ".config/keepassxc" m755)

system/nixinator/default.nix

@@ -108,7 +108,7 @@
 
   boot = {
     kernelPackages = pkgs.linuxPackages_zen;
-    # kernelPackages = pkgs.linuxPackages_latest;
+    # kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
 
     # kernelParams = [ "quiet" ];
     # plymouth.enable = true;

system/nixinator/hardware-configuration.nix

@@ -116,12 +116,6 @@
       fsType = "nfs";
       options = ["defaults" "rw" "noatime" "_netdev" "bg" "soft"];
     };
-
-    "/media/Box" = {
-      device = "192.168.86.20:/mnt/Seagate4TB/Box";
-      fsType = "nfs";
-      options = ["defaults" "rw" "relatime" "_netdev" "bg" "soft"];
-    };
   };
 
   hardware = {
@@ -133,8 +127,8 @@
     nvidia-container-toolkit.enable = true;
 
     nvidia = {
-      # package = config.boot.kernelPackages.nvidiaPackages.stable;
+      package = config.boot.kernelPackages.nvidiaPackages.stable;
-      package = config.boot.kernelPackages.nvidiaPackages.beta;
+      # package = config.boot.kernelPackages.nvidiaPackages.beta;
 
       open = true;
       nvidiaSettings = false; # Those are for x-server

system/servenix/default.nix

@@ -25,18 +25,16 @@
     # 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

system/servenix/hardware-configuration.nix

@@ -63,12 +63,6 @@
       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"];
-    };
   };
 
   swapDevices = [

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/formula11.nix

@@ -4,7 +4,7 @@
   pkgs,
   ...
 }: let
-  pocketbaseVersion = "0.33.0";
+  pocketbaseVersion = "0.25.0";
   f11Version = "latest";
 in {
   virtualisation.oci-containers.containers = {

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 = {};
@@ -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 = "2.2.1";
 in {
   virtualisation.oci-containers.containers = {
     immich-database = {

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/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/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
   ];