flake: update flake

.gitignore

@@ -0,0 +1,12 @@
+**/result
+
+# Devenv
+.devenv*
+devenv.local.nix
+devenv.local.yaml
+
+# direnv
+.direnv
+
+# pre-commit
+.pre-commit-config.yaml

assets/nix-snowflake-black.svg

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 535 535" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <g id="gradient-logo" transform="matrix(1.066667,0,0,1.066667,-166.915961,573.398766)">
+        <g id="g955" transform="matrix(0.090488,0,0,0.090488,142.32381,-419.8252)">
+            <g id="g869" transform="matrix(11.047619,0,0,11.047619,-1572.2888,9377.7107)">
+                <g id="g932" transform="matrix(0.5,-0.866025,0.866025,0.5,502.346329,-28.654615)">
+                    <path id="path3336-6" d="M449.719,-420.513L571.916,-208.838L515.759,-208.311L483.135,-265.18L450.278,-208.615L422.376,-208.626L408.085,-233.316L454.896,-313.806L421.666,-371.632L449.719,-420.513Z"/>
+                </g>
+                <path id="path4260-0" d="M309.549,-710.388L431.746,-498.713L375.589,-498.186L342.965,-555.056L310.109,-498.49L282.206,-498.501L267.915,-523.191L314.726,-603.681L281.496,-661.507L309.549,-710.388Z"/>
+                <g id="use3439-6" transform="matrix(0.5,0.866025,-0.866025,0.5,-235.379922,-976.790736)">
+                    <path d="M449.719,-420.513L571.916,-208.838L515.759,-208.311L483.135,-265.18L450.278,-208.615L422.376,-208.626L408.085,-233.316L454.896,-313.806L421.666,-371.632L449.719,-420.513Z"/>
+                </g>
+                <g id="use3449-5" transform="matrix(-1,-0,0,-1,955.0072,-1141.63796)">
+                    <path d="M449.719,-420.513L571.916,-208.838L515.759,-208.311L483.135,-265.18L450.278,-208.615L422.376,-208.626L408.085,-233.316L454.896,-313.806L421.666,-371.632L449.719,-420.513Z"/>
+                </g>
+                <g id="use4354-5" transform="matrix(-0.5,0.866025,-0.866025,-0.5,-9.137814,-1426.891401)">
+                    <path d="M309.549,-710.388L431.746,-498.713L375.589,-498.186L342.965,-555.056L310.109,-498.49L282.206,-498.501L267.915,-523.191L314.726,-603.681L281.496,-661.507L309.549,-710.388Z"/>
+                </g>
+                <g id="use4362-2" transform="matrix(-0.5,-0.866025,0.866025,-0.5,1230.893908,-721.082971)">
+                    <path d="M309.549,-710.388L431.746,-498.713L375.589,-498.186L342.965,-555.056L310.109,-498.49L282.206,-498.501L267.915,-523.191L314.726,-603.681L281.496,-661.507L309.549,-710.388Z"/>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

devenv.lock

@@ -0,0 +1,117 @@
+{
+  "nodes": {
+    "devenv": {
+      "locked": {
+        "dir": "src/modules",
+        "lastModified": 1787836922,
+        "narHash": "sha256-SeAM6TKoXxFLwHWgkaTIZi5L5doM6mMUT3WxshF+9Eg=",
+        "owner": "cachix",
+        "repo": "devenv",
+        "rev": "6cdf7c1e5845b4455d0c0e1461b4c4be4f43bd7d",
+        "type": "github"
+      },
+      "original": {
+        "dir": "src/modules",
+        "owner": "cachix",
+        "repo": "devenv",
+        "type": "github"
+      }
+    },
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1767039857,
+        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
+        "owner": "NixOS",
+        "repo": "flake-compat",
+        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "git-hooks": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1787424939,
+        "narHash": "sha256-O2tBn84NNuHrnqNVxx/XqsXwfYvS1YwBh+7CBnbCYsk=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "809414f0cdadf82cf11b06c2b29ba9b3168b3297",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1782918843,
+        "narHash": "sha256-ETYnV9U7Sr+A45dohzZdfCZKOss4qrTkO+wgNZNvEc0=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "e8273b29fe1390ec8d4603f2477357555291432e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1787394516,
+        "narHash": "sha256-pRGOQSClnXNI2iLUG6DYpsGvYcuw0drOutVZFTJNw90=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "c8f90650c15282fa8656a041bfbbd2403997a9a7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "inputs": {
+        "nixpkgs-src": "nixpkgs-src"
+      },
+      "locked": {
+        "lastModified": 1787753358,
+        "narHash": "sha256-Tl77VbWyAKrOfRNQhL6JbQtb/MLzbYa/1RG1gWWfICk=",
+        "owner": "cachix",
+        "repo": "devenv-nixpkgs",
+        "rev": "256551e45f6303e142ab4a98be1bf243feb77dc0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "ref": "rolling",
+        "repo": "devenv-nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "devenv": "devenv",
+        "git-hooks": "git-hooks",
+        "nixpkgs": "nixpkgs_2"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

devenv.nix

@@ -0,0 +1,57 @@
+{
+  pkgs,
+  ...
+}:
+
+{
+  languages = {
+    nix = {
+      enable = true;
+      lsp.package = pkgs.nil;
+    };
+  };
+
+  packages = with pkgs; [
+    nixfmt
+  ];
+
+  git-hooks.hooks = {
+    nixfmt.enable = true;
+
+    nix-flake-check = {
+      enable = true;
+      name = "Nix Flake Check";
+      entry = "nix flake check";
+      language = "system";
+      pass_filenames = false;
+      always_run = true;
+    };
+
+    build-pdw-frankiel = {
+      enable = true;
+      name = "Build pdw-frankiel";
+      entry = "nix build .#nixosConfigurations.pdw-frankiel.config.system.build.toplevel";
+      language = "system";
+      pass_filenames = false;
+      always_run = true;
+    };
+
+    build-nero = {
+      enable = true;
+      name = "Build nero";
+      entry = "nix build .#nixosConfigurations.nero.config.system.build.toplevel";
+      language = "system";
+      pass_filenames = false;
+      always_run = true;
+    };
+
+    build-vergil = {
+      enable = true;
+      name = "Build vergil";
+      entry = "nix build .#nixosConfigurations.vergil.config.system.build.toplevel";
+      language = "system";
+      pass_filenames = false;
+      always_run = true;
+    };
+  };
+}

devenv.yaml

@@ -0,0 +1,7 @@
+# yaml-language-server: $schema=https://devenv.sh/devenv.schema.json
+inputs:
+  nixpkgs:
+    url: github:cachix/devenv-nixpkgs/rolling
+  git-hooks:
+    url: github:cachix/git-hooks.nix
+

features/jmusicbot.nix

@@ -0,0 +1,100 @@
+{ pkgs, lib, ... }:
+
+let
+  jmusicbot = pkgs.stdenv.mkDerivation {
+    pname = "jmusicbot";
+    version = "0.7.1";
+
+    src = pkgs.fetchurl {
+      url = "https://github.com/mutedvector/MusicBot/releases/download/v0.7.1/JMusicBot-0.7.1.jar";
+      hash = "sha256-NNM6WUKS1pfHfQ4DVbb6/hx0hSpH3W5RjFdawKLpr2c=";
+    };
+
+    dontUnpack = true;
+
+    nativeBuildInputs = [ pkgs.makeBinaryWrapper ];
+
+    installPhase = ''
+      runHook preInstall
+
+      mkdir -p $out/lib
+      cp $src $out/lib/JMusicBot-0.7.1.jar
+
+      makeBinaryWrapper ${pkgs.jdk25_headless}/bin/java $out/bin/jmusicbot \
+        --prefix PATH : ${lib.makeBinPath [ pkgs.jdk25_headless ]} \
+        --add-flags "-Dfile.encoding=UTF-8" \
+        --add-flags "-Dnogui=true" \
+        --add-flags "--enable-native-access=ALL-UNNAMED" \
+        --add-flags "-XX:+UseZGC" \
+        --add-flags "-XX:+AlwaysPreTouch" \
+        --add-flags "-jar $out/lib/JMusicBot-0.7.1.jar"
+
+      runHook postInstall
+    '';
+
+    meta = with lib; {
+      description = "A Discord music bot that's easy to set up (arif-banai fork)";
+      homepage = "https://github.com/arif-banai/MusicBot";
+      license = licenses.mit;
+      mainProgram = "jmusicbot";
+    };
+  };
+in
+{
+  environment.systemPackages = [ jmusicbot ];
+
+  users.users.jmusicbot = {
+    isSystemUser = true;
+    group = "jmusicbot";
+    home = "/var/lib/jmusicbot";
+    createHome = true;
+    description = "JMusicBot service user";
+  };
+  users.groups.jmusicbot = { };
+
+  systemd.services.jmusicbot = {
+    description = "JMusicBot – Discord music bot (arif-banai fork)";
+    after = [ "network-online.target" ];
+    wants = [ "network-online.target" ];
+    wantedBy = [ "multi-user.target" ];
+
+    serviceConfig = {
+      Type = "simple";
+      User = "jmusicbot";
+      Group = "jmusicbot";
+      WorkingDirectory = "/var/lib/jmusicbot";
+
+      ExecStart = "${jmusicbot}/bin/jmusicbot";
+
+      NoNewPrivileges = true;
+      ProtectSystem = "strict";
+      ProtectHome = true;
+      PrivateTmp = true;
+      PrivateDevices = true;
+      ProtectKernelTunables = true;
+      ProtectKernelModules = true;
+      ProtectControlGroups = true;
+      RestrictAddressFamilies = [
+        "AF_INET"
+        "AF_INET6"
+        "AF_UNIX"
+      ];
+      RestrictNamespaces = true;
+      LockPersonality = true;
+      RestrictRealtime = true;
+      RestrictSUIDSGID = true;
+      RemoveIPC = true;
+      CapabilityBoundingSet = [ "" ];
+      SystemCallArchitectures = "native";
+      ReadWritePaths = [ "/var/lib/jmusicbot" ];
+
+      Restart = "on-failure";
+      RestartSec = 10;
+      StartLimitBurst = 5;
+      StartLimitIntervalSec = 60;
+
+      MemoryMax = "1G";
+      TasksMax = 512;
+    };
+  };
+}

flake.lock

@@ -4,7 +4,6 @@
       "inputs": {
         "corefonts": "corefonts",
         "crane": "crane",
-        "fenix": "fenix",
         "flake-compat": "flake-compat",
         "flake-parts": "flake-parts",
         "git-hooks": "git-hooks",
@@ -12,14 +11,16 @@
         "nixpkgs-wine": "nixpkgs-wine",
         "on-linux": "on-linux",
         "plugin-loader-src": "plugin-loader-src",
-        "treefmt-nix": "treefmt-nix"
+        "treefmt-nix": "treefmt-nix",
+        "windows-rs": "windows-rs",
+        "wintypes_shim": "wintypes_shim"
       },
       "locked": {
-        "lastModified": 1785468701,
+        "lastModified": 1788753201,
-        "narHash": "sha256-nw9ho7BM/qct4YG0lSpaeIyCXQKOqOr6A2ezfwocb3U=",
+        "narHash": "sha256-3QwUQIuF517e1TlkEu2Uned4B2ZUr/Eaj4qDVdRzjeI=",
         "owner": "mrshmllow",
         "repo": "affinity-nix",
-        "rev": "14fd628af2ce1fd56391cbf75ef48494f051e506",
+        "rev": "762d625545f67dfa49141936b733f9a18448478d",
         "type": "github"
       },
       "original": {
@@ -49,11 +50,11 @@
         "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-        "lastModified": 1785310673,
+        "lastModified": 1788378282,
-        "narHash": "sha256-RuYhBi/5S5SQafE373Udv8BKh0LLMwlNqTzobODABAc=",
+        "narHash": "sha256-8kp7fVQaP1isK7cn5pjjoQyhXo06CNGBWfcncFpsB8c=",
         "owner": "kem-a",
         "repo": "AppManager",
-        "rev": "8c3f44dcfcd1b070f344054faed8cbc23de19b4e",
+        "rev": "3a02f8081c168237b6c9903d5df69a6766d9c06c",
         "type": "github"
       },
       "original": {
@@ -67,11 +68,11 @@
         "nixpkgs": "nixpkgs_5"
       },
       "locked": {
-        "lastModified": 1785751000,
+        "lastModified": 1788782798,
-        "narHash": "sha256-CMJEPo2dWF9QWz7BsrQRBvq6e3YxnLbazFFBV/KjPgs=",
+        "narHash": "sha256-VgnGDq4jcAdjfVDoga+Y/Vy7+g4e/FjAHOTs0FtPTro=",
         "owner": "Hy4ri",
         "repo": "cheatengine-flake",
-        "rev": "a36d48526cacfb370115c47d5a0e4f736f077eda",
+        "rev": "268382cdfa26f34e7aaa682a944716017fd9ee2c",
         "type": "github"
       },
       "original": {
@@ -98,11 +99,11 @@
     },
     "crane": {
       "locked": {
-        "lastModified": 1785284101,
+        "lastModified": 1787326676,
-        "narHash": "sha256-ghcXEpYEM4a7pbEkoqbn8c0ptJJqgGzuFiG3T6W5g4I=",
+        "narHash": "sha256-lWhBbBvC05/xwivKBBiM2YNizpmgqCgyOIzomvRuwxs=",
         "owner": "ipetkov",
         "repo": "crane",
-        "rev": "756d6d07c3818ea95d1e2cdac63fa7d02fe3e61b",
+        "rev": "692f7e9ef2ece8125b466f66f2af532b3edaed0d",
         "type": "github"
       },
       "original": {
@@ -111,28 +112,6 @@
         "type": "github"
       }
     },
-    "fenix": {
-      "inputs": {
-        "nixpkgs": [
-          "affinity-nix",
-          "nixpkgs"
-        ],
-        "rust-analyzer-src": "rust-analyzer-src"
-      },
-      "locked": {
-        "lastModified": 1785314864,
-        "narHash": "sha256-imz9J5iMNersDeQ1ymenFg35N6C2R3MCaGg2i0XCIrE=",
-        "owner": "nix-community",
-        "repo": "fenix",
-        "rev": "594418b2c9ea0731bee6988236ef5bfd97e81dca",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "fenix",
-        "type": "github"
-      }
-    },
     "flake-compat": {
       "locked": {
         "lastModified": 1751685974,
@@ -213,11 +192,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1782949081,
+        "lastModified": 1787559586,
-        "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=",
+        "narHash": "sha256-onL0VLf9vPllmT0H/OlURIU5r5t5WIEl7t4tVNKT0Nw=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e",
+        "rev": "9d0d87172c374f89da73c1cfe6d81ae62feac1f1",
         "type": "github"
       },
       "original": {
@@ -231,11 +210,11 @@
         "nixpkgs-lib": "nixpkgs-lib_2"
       },
       "locked": {
-        "lastModified": 1785627969,
+        "lastModified": 1788450739,
-        "narHash": "sha256-4dtXQk/NMePegK/nWp5NSeuZKLATItOq61lpEvmXqGw=",
+        "narHash": "sha256-glZLQlzIn1fXH6PazR2iUmTo7kzzyYSshrWhLS9TqCU=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "427bf4bd9435fdf21321c8cc628c24efc14c0f7a",
+        "rev": "31729ca8cbdb4fa927b34e5f4353e6a83f39e993",
         "type": "github"
       },
       "original": {
@@ -249,11 +228,11 @@
         "nixpkgs-lib": "nixpkgs-lib_3"
       },
       "locked": {
-        "lastModified": 1785627969,
+        "lastModified": 1788450739,
-        "narHash": "sha256-4dtXQk/NMePegK/nWp5NSeuZKLATItOq61lpEvmXqGw=",
+        "narHash": "sha256-glZLQlzIn1fXH6PazR2iUmTo7kzzyYSshrWhLS9TqCU=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "427bf4bd9435fdf21321c8cc628c24efc14c0f7a",
+        "rev": "31729ca8cbdb4fa927b34e5f4353e6a83f39e993",
         "type": "github"
       },
       "original": {
@@ -301,17 +280,35 @@
         "type": "github"
       }
     },
+    "flake-utils_3": {
+      "inputs": {
+        "systems": "systems_3"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "git-hooks": {
       "inputs": {
         "flake-compat": "flake-compat_2",
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1784288435,
+        "lastModified": 1787770114,
-        "narHash": "sha256-ReRHaLgr/uVqdD8afFSn+myXIfpHeOhP0yYe0TJqAA8=",
+        "narHash": "sha256-wFwVQb1x5FAY4T5VRZtgh0PCD9nbgtlaV9ta8+ZE8zs=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "43b3c1ab9d40fb1dbb008f451988a91e375825e9",
+        "rev": "903a4c22c12860082f6a5e1b9a638d667883fcfd",
         "type": "github"
       },
       "original": {
@@ -332,11 +329,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1784288435,
+        "lastModified": 1788267358,
-        "narHash": "sha256-ReRHaLgr/uVqdD8afFSn+myXIfpHeOhP0yYe0TJqAA8=",
+        "narHash": "sha256-nt+lUqYVpc9Y6JeMd2WmXzCDojasdadKo0mWcluvY2Y=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "43b3c1ab9d40fb1dbb008f451988a91e375825e9",
+        "rev": "27555e2624241fb116b49095df4caaee85a25691",
         "type": "github"
       },
       "original": {
@@ -352,11 +349,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1785119570,
+        "lastModified": 1788642154,
-        "narHash": "sha256-Rgs2xKnGLFWQscxUaXX07oyZeuMDOHEbqDOsgliLFGM=",
+        "narHash": "sha256-sPpQFVaFTDqO/4vvCAhuAhqTgqN/ygu+9eJcs5eB0js=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d4fd24667c8cbef124bb70a20380cab75ec8474d",
+        "rev": "fd0956c99c41ae3c13a73a638f1f7e963aebc4ab",
         "type": "github"
       },
       "original": {
@@ -393,11 +390,11 @@
       },
       "locked": {
         "dir": "packages/nix",
-        "lastModified": 1785944047,
+        "lastModified": 1788565178,
-        "narHash": "sha256-5J7dUkGh2cxuAuwalNnNoX1NvuFGkqiGYDU5gg4tkHE=",
+        "narHash": "sha256-bjItIyGxVAUqaSpr2tdN/YTd8BP2DY+wAmun136LrZs=",
         "owner": "SteamClientHomebrew",
         "repo": "Millennium",
-        "rev": "1b61200b88b7479f8f9c1788364092f2cf270b20",
+        "rev": "5cbebb86628767f365de987c451a2839afe153bc",
         "type": "github"
       },
       "original": {
@@ -410,17 +407,17 @@
     "millennium-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1783268941,
+        "lastModified": 1787082953,
-        "narHash": "sha256-MJLJ0I48HXgfOpISTAbDMYMUdWj9A6M+jGQz4uAvwyw=",
+        "narHash": "sha256-zgr4cdJfye4qunpD3ClNnZ9D1WPGQAXV0CnYwEbB52s=",
         "owner": "SteamClientHomebrew",
         "repo": "Millennium",
-        "rev": "f37f05bdbd4727d873a1ad83ce72d062ef9a0c48",
+        "rev": "513b02e809b0eb120ecf0ae12e548798dd756323",
         "type": "github"
       },
       "original": {
         "owner": "SteamClientHomebrew",
         "repo": "Millennium",
-        "rev": "f37f05bdbd4727d873a1ad83ce72d062ef9a0c48",
+        "rev": "513b02e809b0eb120ecf0ae12e548798dd756323",
         "type": "github"
       }
     },
@@ -431,11 +428,11 @@
         "nixpkgs": "nixpkgs_8"
       },
       "locked": {
-        "lastModified": 1785956845,
+        "lastModified": 1788814080,
-        "narHash": "sha256-TsNjtAZpcOWiPV+qf1qO7kUoUQBrR2U/Trl2vAZtVKg=",
+        "narHash": "sha256-PL0CxqkAJxA9unWGaaAKI0IKV9kK6WUPVskRh7zpR4I=",
         "owner": "xddxdd",
         "repo": "nix-cachyos-kernel",
-        "rev": "c2034e4c5f878e038dece8c92afe8d1355edc1b9",
+        "rev": "a5587fa71706494266154d0104932f719ec98b20",
         "type": "github"
       },
       "original": {
@@ -489,11 +486,11 @@
         "nixpkgs": "nixpkgs_9"
       },
       "locked": {
-        "lastModified": 1785985024,
+        "lastModified": 1788667114,
-        "narHash": "sha256-0KG7KonSoFTqGSGE8lAED/LTiaT8FvfI1snPtgWFYcA=",
+        "narHash": "sha256-v+PsKNvmDW0gZDp7yo/fLa+ZLi4QRfHMlK8i3QNV0LA=",
         "owner": "fufexan",
         "repo": "nix-gaming",
-        "rev": "2ca1aa5a3f7bf09cbbaced70f4f744e31c70ed9e",
+        "rev": "efb84bed1287a9733d4b539f2913236d06f94c82",
         "type": "github"
       },
       "original": {
@@ -504,11 +501,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1782918843,
+        "lastModified": 1787631388,
-        "narHash": "sha256-ETYnV9U7Sr+A45dohzZdfCZKOss4qrTkO+wgNZNvEc0=",
+        "narHash": "sha256-vMiXptXarfSdJb1Gkc+FYVOAibuBRj7qxGa8z68q1Uw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e8273b29fe1390ec8d4603f2477357555291432e",
+        "rev": "ac6b2166e7a9375683b8e98f860f273222337b16",
         "type": "github"
       },
       "original": {
@@ -518,13 +515,29 @@
         "type": "github"
       }
     },
+    "nixpkgs-firmware": {
+      "locked": {
+        "lastModified": 1782201461,
+        "narHash": "sha256-41VI8i5RESlcU7+LdPQ9ibz+4HQWixlE6wat2IYPrE0=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "220e781eee89fa86f26d05c40a57eea1c691adec",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "220e781eee89fa86f26d05c40a57eea1c691adec",
+        "type": "github"
+      }
+    },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1782614948,
+        "lastModified": 1785031560,
-        "narHash": "sha256-ePjCwr1sNm9NYUqywL7QfK3JnlS015msC+eBu2zKlp8=",
+        "narHash": "sha256-OmshNvn2vupOFpYinLUu+1Dnpu4n7Q5N3ggGVNHpkUI=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "db3f255737b94216eb71cce308e2912cf6bc2d7c",
+        "rev": "0e79af5e3d4dcfcd676ab5ba3f95d2e3352e078c",
         "type": "github"
       },
       "original": {
@@ -535,11 +548,11 @@
     },
     "nixpkgs-lib_2": {
       "locked": {
-        "lastModified": 1785031560,
+        "lastModified": 1788057806,
-        "narHash": "sha256-OmshNvn2vupOFpYinLUu+1Dnpu4n7Q5N3ggGVNHpkUI=",
+        "narHash": "sha256-DTQSMxzDWmT0zhguthvegnVkn7CFqGCv4IHCzk5ZUpM=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "0e79af5e3d4dcfcd676ab5ba3f95d2e3352e078c",
+        "rev": "596e2e3940e09b2abbeb03f75fa1828c57fcd72c",
         "type": "github"
       },
       "original": {
@@ -550,11 +563,11 @@
     },
     "nixpkgs-lib_3": {
       "locked": {
-        "lastModified": 1785031560,
+        "lastModified": 1788057806,
-        "narHash": "sha256-OmshNvn2vupOFpYinLUu+1Dnpu4n7Q5N3ggGVNHpkUI=",
+        "narHash": "sha256-DTQSMxzDWmT0zhguthvegnVkn7CFqGCv4IHCzk5ZUpM=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "0e79af5e3d4dcfcd676ab5ba3f95d2e3352e078c",
+        "rev": "596e2e3940e09b2abbeb03f75fa1828c57fcd72c",
         "type": "github"
       },
       "original": {
@@ -565,11 +578,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1785967620,
+        "lastModified": 1788752844,
-        "narHash": "sha256-IItrdb7Puk05RqOBWZYFC5X6Wl1sJmCfh5MWVHw5iMM=",
+        "narHash": "sha256-VaWGJ6+cIYN2erfSecbRV+4ljI185Ty2wUrXyvQbgOw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b7c2ada94fe99c15b0dbcf4d11fd7850b957a436",
+        "rev": "dc5d91f840324650bac8c379428c7037a416959a",
         "type": "github"
       },
       "original": {
@@ -605,11 +618,11 @@
         "treefmt-nix": "treefmt-nix_2"
       },
       "locked": {
-        "lastModified": 1786070379,
+        "lastModified": 1788750301,
-        "narHash": "sha256-DD5bMnMHWCemn1A/mwBESGx+aZx2yciUbLE/Y78k6aU=",
+        "narHash": "sha256-PzqFBfN+05Nybpls59HpP+S4xgZrqq5ofRhrAJ1Ovdc=",
         "owner": "nix-community",
         "repo": "nixpkgs-xr",
-        "rev": "f7aa41736515e7cafc8605e54fa97b88f9f4f824",
+        "rev": "a23d4202dbe68cac5e18fd1b658ff5a5ed54c15f",
         "type": "github"
       },
       "original": {
@@ -620,11 +633,11 @@
     },
     "nixpkgs_10": {
       "locked": {
-        "lastModified": 1785989512,
+        "lastModified": 1788690626,
-        "narHash": "sha256-HFQhkQcl5D1hUNoen3SGHCSFCt2Bg6uP+HgbrnA3InQ=",
+        "narHash": "sha256-+v4I4LawmRD/mVxO7QIAerRrCkElp3YImzWkkUnvOTg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "445d861c6d31b4af0c79d8d4be2331f762a361d7",
+        "rev": "c25784012c9982bca5b3e0de87e90bbdac8927d3",
         "type": "github"
       },
       "original": {
@@ -636,11 +649,11 @@
     },
     "nixpkgs_11": {
       "locked": {
-        "lastModified": 1785967620,
+        "lastModified": 1788614874,
-        "narHash": "sha256-IItrdb7Puk05RqOBWZYFC5X6Wl1sJmCfh5MWVHw5iMM=",
+        "narHash": "sha256-7QYjT2vHLuX9Z1pdxHXDKCbh1CR3D/2rywB9Tx0MPRg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b7c2ada94fe99c15b0dbcf4d11fd7850b957a436",
+        "rev": "c043004d1c6985732bcc1cbc5a9c9aecbbb4e0f0",
         "type": "github"
       },
       "original": {
@@ -652,11 +665,11 @@
     },
     "nixpkgs_12": {
       "locked": {
-        "lastModified": 1785967620,
+        "lastModified": 1788752844,
-        "narHash": "sha256-IItrdb7Puk05RqOBWZYFC5X6Wl1sJmCfh5MWVHw5iMM=",
+        "narHash": "sha256-VaWGJ6+cIYN2erfSecbRV+4ljI185Ty2wUrXyvQbgOw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b7c2ada94fe99c15b0dbcf4d11fd7850b957a436",
+        "rev": "dc5d91f840324650bac8c379428c7037a416959a",
         "type": "github"
       },
       "original": {
@@ -666,13 +679,29 @@
         "type": "github"
       }
     },
+    "nixpkgs_13": {
+      "locked": {
+        "lastModified": 1780365719,
+        "narHash": "sha256-QfWfccTN+70ZQ4m2qlU9PiKfz2Yppq94058iJyARNwc=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "ffa10e26ae11d676b2db836259889f1f571cb14f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1785318670,
+        "lastModified": 1787135253,
-        "narHash": "sha256-dN6Ou5x/+23FZLEpYP3IffO+NyJFzUlGumt1uu3MMaY=",
+        "narHash": "sha256-RD2kNWCG+Bjo6h+JVjWVNntZs2GtRoeY2xHjts/FNkA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "0954f7ee2f6bb3dc7d4e3d0d8bcb8fd4bde4cfc5",
+        "rev": "ffb3c9b700e759be2ef13237c9d8f953b32a1e46",
         "type": "github"
       },
       "original": {
@@ -716,11 +745,11 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1785692966,
+        "lastModified": 1788614874,
-        "narHash": "sha256-vUfIeBEfpbAfZ5zjgIkYk7eHBeVfCYVjLbWnMkseYnk=",
+        "narHash": "sha256-7QYjT2vHLuX9Z1pdxHXDKCbh1CR3D/2rywB9Tx0MPRg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "643809054d65fdd466a63e3155b8c498cb483c04",
+        "rev": "c043004d1c6985732bcc1cbc5a9c9aecbbb4e0f0",
         "type": "github"
       },
       "original": {
@@ -764,11 +793,11 @@
     },
     "nixpkgs_8": {
       "locked": {
-        "lastModified": 1785925688,
+        "lastModified": 1788794787,
-        "narHash": "sha256-taRLhiPA3s8J5+b6BLzUugC/0T4mQuyhkPiqr+fai2w=",
+        "narHash": "sha256-kf4mdS6Wrp+0XqtcUqwH9tu4RzomEJMSAFgIn+VtxMQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "379e2fc6c7612f7341d941ae4d1ea38021c41d6e",
+        "rev": "aaea627de08c837efcab44ca1655bfd826109c3a",
         "type": "github"
       },
       "original": {
@@ -780,11 +809,11 @@
     },
     "nixpkgs_9": {
       "locked": {
-        "lastModified": 1785542685,
+        "lastModified": 1788549839,
-        "narHash": "sha256-sjfvXMbG5pCFgpvw2OZAFcZiTvrppCWvnB6cuGrSY08=",
+        "narHash": "sha256-kOrCcSIA6w9J1hX5DqHy2k9pDTJymExTsbV74U9UtCA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f8e81fc7eb063db454f563cdd596fb96a5ad1497",
+        "rev": "17de0b976395537756f30a3e78f2f06e5cec89ed",
         "type": "github"
       },
       "original": {
@@ -827,11 +856,11 @@
     "on-linux": {
       "flake": false,
       "locked": {
-        "lastModified": 1783797218,
+        "lastModified": 1787365621,
-        "narHash": "sha256-oNQ6gvcibxa7OKPSeAtd+I7BsVLrJbEr7l8DqvZu3pU=",
+        "narHash": "sha256-aRS0sZ6p7YJagjFaZFrS1zuvN3PVKNBJOze1Ek/bOi8=",
         "owner": "seapear",
         "repo": "AffinityOnLinux",
-        "rev": "794bb88175f9d43b23f1e023cf0f0bc534639e21",
+        "rev": "0fe210754999a2ace3039c11fbbd11b45b5ee399",
         "type": "github"
       },
       "original": {
@@ -871,26 +900,11 @@
         "nix-flatpak": "nix-flatpak",
         "nix-gaming": "nix-gaming",
         "nixpkgs": "nixpkgs_10",
+        "nixpkgs-firmware": "nixpkgs-firmware",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "nixpkgs-xr": "nixpkgs-xr",
-        "scopebuddy": "scopebuddy"
+        "scopebuddy": "scopebuddy",
-      }
+        "xivlauncher-rb": "xivlauncher-rb"
-    },
-    "rust-analyzer-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1785261141,
-        "narHash": "sha256-sA+DHPejWD68mLA7gtTiHGd5T41F6W+NKf0g+ibFCW4=",
-        "owner": "rust-lang",
-        "repo": "rust-analyzer",
-        "rev": "bec66814323579659ffd77c909b3d963af118ece",
-        "type": "github"
-      },
-      "original": {
-        "owner": "rust-lang",
-        "ref": "nightly",
-        "repo": "rust-analyzer",
-        "type": "github"
       }
     },
     "scopebuddy": {
@@ -898,11 +912,11 @@
         "nixpkgs": "nixpkgs_12"
       },
       "locked": {
-        "lastModified": 1785787215,
+        "lastModified": 1787088847,
-        "narHash": "sha256-Z4KE6Qs5dcNdoEra1sx69I8EsxztAeVNGgO0ltYz7r0=",
+        "narHash": "sha256-dimDUlRtDXZDCUUOjW2KX+1XiWjOiMUIudh6VClZlZ0=",
         "owner": "HikariKnight",
         "repo": "ScopeBuddy",
-        "rev": "8c517a4c1b2fb9ed3fe43a95e1c5630cdecc4678",
+        "rev": "0269fd2b3b5f0b2af191d52d1b8e4a8088a49fdc",
         "type": "github"
       },
       "original": {
@@ -941,16 +955,31 @@
         "type": "github"
       }
     },
+    "systems_3": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "treefmt-nix": {
       "inputs": {
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1785360170,
+        "lastModified": 1786901030,
-        "narHash": "sha256-XE1lKgQ3eIO3E7zWryqcRsax+mYXod/5RHBn4YaR9YE=",
+        "narHash": "sha256-WSFCsDSE5ffgD2MqzkM2CYjeFiKhRF/dJUN8uedb6YE=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "d1187f8bc71fb8aab02395869ec3f5c1920f75c0",
+        "rev": "27b3b12a8e6375f28ebe122f07d230ca5459bbfa",
         "type": "github"
       },
       "original": {
@@ -967,11 +996,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1785945821,
+        "lastModified": 1786901030,
-        "narHash": "sha256-NLSyTCW4K4ofhNBllt3omPasm6QpralXH1DBZOc91Dw=",
+        "narHash": "sha256-WSFCsDSE5ffgD2MqzkM2CYjeFiKhRF/dJUN8uedb6YE=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "ae7910970dddc408fe6ab1c8e4b277bb21d72dc0",
+        "rev": "27b3b12a8e6375f28ebe122f07d230ca5459bbfa",
         "type": "github"
       },
       "original": {
@@ -979,6 +1008,78 @@
         "repo": "treefmt-nix",
         "type": "github"
       }
+    },
+    "windows-rs": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1771531570,
+        "narHash": "sha256-UmhpbCd3+0We7JiXFXgcS8jWMnZI2NRqPOs+UOsjrUc=",
+        "owner": "microsoft",
+        "repo": "windows-rs",
+        "rev": "628f84c51645217c7a06a20774ea1275dc7270ca",
+        "type": "github"
+      },
+      "original": {
+        "owner": "microsoft",
+        "repo": "windows-rs",
+        "rev": "628f84c51645217c7a06a20774ea1275dc7270ca",
+        "type": "github"
+      }
+    },
+    "wintypes_shim": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1750396180,
+        "narHash": "sha256-E3go8SmUkAWrxQnr852WQB0huzdkO7CWiuB8Q2QyMZ4=",
+        "owner": "ElementalWarrior",
+        "repo": "wine-wintypes.dll-for-affinity",
+        "rev": "f8a2d42ba3abc5dcdc584daa6728a2fa019be72e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ElementalWarrior",
+        "repo": "wine-wintypes.dll-for-affinity",
+        "type": "github"
+      }
+    },
+    "xivlauncher-core-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1788584614,
+        "narHash": "sha256-nDcgHXjuIst8v8QD1oCl+Z5Fvi5M+WFv9RDd/kBSo6s=",
+        "ref": "refs/tags/rb-v1.4.0.12",
+        "rev": "67b57982e971c8e92ef34604728d45edf0ca9a6f",
+        "revCount": 700,
+        "submodules": true,
+        "type": "git",
+        "url": "https://github.com/rankynbass/XIVLauncher.Core.git"
+      },
+      "original": {
+        "ref": "refs/tags/rb-v1.4.0.7",
+        "submodules": true,
+        "type": "git",
+        "url": "https://github.com/rankynbass/XIVLauncher.Core.git"
+      }
+    },
+    "xivlauncher-rb": {
+      "inputs": {
+        "flake-utils": "flake-utils_3",
+        "nixpkgs": "nixpkgs_13",
+        "xivlauncher-core-src": "xivlauncher-core-src"
+      },
+      "locked": {
+        "lastModified": 1788793537,
+        "narHash": "sha256-FXBOeRPYrj0ZIxHKuKXm50d1WhfnkW5cEflfdsFbhzo=",
+        "owner": "dawei-nh",
+        "repo": "xivlauncher-rb-nix",
+        "rev": "0e25677618d4716553dd64c72d71b1c6190b7447",
+        "type": "github"
+      },
+      "original": {
+        "owner": "dawei-nh",
+        "repo": "xivlauncher-rb-nix",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -2,6 +2,7 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05";
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs-firmware.url = "github:NixOS/nixpkgs?rev=220e781eee89fa86f26d05c40a57eea1c691adec";
 
     home-manager = {
       url = "github:nix-community/home-manager/release-26.05";
@@ -19,12 +20,14 @@
     lazyvim.url = "github:pfassina/lazyvim-nix/v16.0.0";
 
     affinity-nix.url = "github:mrshmllow/affinity-nix";
+    #affinity-nix.url = "git+https://gitea.daguerro.net/floturcocantsee/affinity-nix";
 
     affinity-thumbnailer-kde = {
       url = "path:./packages/affinity-thumbnailer-kde";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    xivlauncher-rb.url = "github:dawei-nh/xivlauncher-rb-nix";
     cheatengine.url = "github:Hy4ri/cheatengine-flake";
     millennium.url = "github:SteamClientHomebrew/Millennium?dir=packages/nix";
     scopebuddy.url = "github:HikariKnight/ScopeBuddy";
@@ -39,6 +42,7 @@
       self,
       nixpkgs,
       nixpkgs-xr,
+      nixpkgs-firmware,
       home-manager,
       nix-darwin,
       nix-flatpak,
@@ -47,6 +51,7 @@
       millennium,
       nix-cachyos-kernel,
       cheatengine,
+      xivlauncher-rb,
       ...
     }:
     let
@@ -58,6 +63,9 @@
           users.frank = ./home/frank.nix;
         };
       };
+
+      nixos-system = "x86_64-linux";
+      nixos-pkgs = nixpkgs.legacyPackages.${nixos-system};
     in
     {
       nixosConfigurations = {
@@ -74,6 +82,32 @@
 
             ./hosts/nero/hardware.nix
             ./hosts/nero/configuration.nix
+
+            {
+              nixpkgs.overlays = [
+                (final: prev: {
+                  linux-firmware =
+                    nixpkgs-firmware.legacyPackages.${nixos-pkgs.stdenv.hostPlatform.system}.linux-firmware;
+                })
+              ];
+            }
+
+            {
+              nix.settings.substituters = [ "https://attic.xuyh0120.win/lantian" ];
+              nix.settings.trusted-public-keys = [ "lantian:EeAUQ+W+6r7EtwnmYjeVwx5kOGEBpjlBfPlzGlTNvHc=" ];
+            }
+          ];
+        };
+
+        vergil = nixpkgs.lib.nixosSystem {
+          specialArgs = { inherit inputs; };
+
+          modules = [
+            home-manager.nixosModules.home-manager
+            home-manager-configuration
+
+            ./hosts/vergil/hardware.nix
+            ./hosts/vergil/configuration.nix
           ];
         };
 
@@ -89,6 +123,11 @@
 
             ./hosts/pdw-frankiel/hardware.nix
             ./hosts/pdw-frankiel/configuration.nix
+
+            {
+              nix.settings.substituters = [ "https://attic.xuyh0120.win/lantian" ];
+              nix.settings.trusted-public-keys = [ "lantian:EeAUQ+W+6r7EtwnmYjeVwx5kOGEBpjlBfPlzGlTNvHc=" ];
+            }
           ];
         };
       };

hosts/nero/configuration.nix

@@ -12,7 +12,7 @@ let
 in
 {
   imports = [
-    ../shared/nixos.nix
+    ../shared/nixos-pc.nix
     ../../features/kde.nix
     ../../features/flatpak.nix
   ];
@@ -26,7 +26,8 @@ in
   boot = {
     kernelParams = [
       "vfio-pci.ids=10de:2782,10de:22bc"
-      "video=HDMI-A-1:896x672@100"
+      "video=DP=-3:1024x768@85"
+      "amdgpu.dcfeaturemask=2"
     ];
   };
 
@@ -35,6 +36,10 @@ in
   services = {
     flatpak = {
       packages = [
+        {
+          appId = "org.waywallen.waywallen";
+          origin = "flathub";
+        }
         {
           appId = "com.discordapp.Discord";
           origin = "flathub";
@@ -63,10 +68,6 @@ in
           appId = "io.github.ryubing.Ryujinx";
           origin = "flathub";
         }
-        {
-          appId = "org.gtk.Gtk3theme.Breeze";
-          origin = "flathub";
-        }
         {
           appId = "io.github.Amethyst.ModManager";
           origin = "amethyst-mod-manager";
@@ -79,6 +80,18 @@ in
       openFirewall = true;
       autoStart = true;
     };
+
+    sunshine = {
+      enable = true;
+      autoStart = true;
+      capSysAdmin = true;
+      openFirewall = true;
+
+      settings = {
+        encoder = "vulkan";
+        output_name = 3;
+      };
+    };
   };
 
   programs = {
@@ -92,9 +105,34 @@ in
     };
   };
 
+  nix = {
+    distributedBuilds = true;
+    settings.builders-use-substitutes = true;
+
+    buildMachines = [
+      {
+        hostName = "vergil.cfl.rr.com";
+        sshUser = "remotebuild";
+        sshKey = "/root/.ssh/id_rsa";
+        system = pkgs.stdenv.hostPlatform.system;
+        protocol = "ssh-ng";
+        maxJobs = 24;
+        speedFactor = 2;
+        mandatoryFeatures = [ ];
+
+        supportedFeatures = [
+          "nixos-test"
+          "benchmark"
+          "big-parallel"
+          "kvm"
+        ];
+      }
+    ];
+  };
+
   environment = {
     sessionVariables = {
-      AVALONIA_SCREEN_SCALE_FACTORS = "DP-2=1.3;HDMI-A-1=1.25;DP-1=1.25";
+      AVALONIA_SCREEN_SCALE_FACTORS = "HDMI-A-1=2.0;DP-1=2.0;DP-2=2.0;DP-3=2.0";
     };
 
     systemPackages = with pkgs; [
@@ -104,10 +142,14 @@ in
       gamescope
       gamescope-wsi
       cheatengine
+      lsfg-vk
+      lsfg-vk-ui
+
+      unstable.qbittorrent
 
       inputs.scopebuddy.packages.${pkgs.stdenv.hostPlatform.system}.default
+      inputs.xivlauncher-rb.packages.${pkgs.stdenv.hostPlatform.system}.default
 
-      (callPackage ../../packages/xivlauncher/package.nix { })
       (callPackage ../../packages/aseprite/package.nix { })
       (callPackage ../../packages/aseprite-thumbnailer-kde/package.nix { inherit unstable; })
       (callPackage ../../packages/undertale-mod-tool/package.nix { })

hosts/nero/hardware.nix

@@ -51,6 +51,22 @@
         "dmask=0077"
       ];
     };
+
+    "/mnt/fileshare" = {
+      device = "frank@192.168.1.181:/mnt/shares";
+      fsType = "sshfs";
+      options = [
+        "uid=1000"
+        "gid=1000"
+        "default_permissions"
+        "allow_other"
+        "_netdev"
+        "x-systemd.automount"
+        "reconnect"
+        "ServerAliveInterval=15"
+        "IdentityFile=/root/.ssh/id_rsa"
+      ];
+    };
   };
 
   swapDevices = [

hosts/pdw-frankiel/configuration.nix

@@ -8,7 +8,7 @@ let
 in
 {
   imports = [
-    ../shared/nixos.nix
+    ../shared/nixos-pc.nix
     ../../features/kde.nix
     ../../features/flatpak.nix
   ];
@@ -48,10 +48,6 @@ in
           appId = "com.dropbox.Client";
           origin = "flathub";
         }
-        {
-          appId = "io.mpv.Mpv";
-          origin = "flathub";
-        }
         {
           appId = "org.gnome.gitlab.YaLTeR.VideoTrimmer";
           origin = "flathub";
@@ -64,14 +60,6 @@ in
           appId = "org.remmina.Remmina";
           origin = "flathub";
         }
-        {
-          appId = "io.github.ungoogled_software.ungoogled_chromium";
-          origin = "flathub";
-        }
-        {
-          appId = "org.gtk.Gtk3theme.Breeze";
-          origin = "flathub";
-        }
       ];
     };
   };

hosts/shared/nixos-pc.nix

@@ -20,7 +20,11 @@ in
     consoleLogLevel = 3;
 
     # Use latest LTO optimized x86_64-v3 kernel from CachyOS.
-    kernelPackages = pkgs.cachyosKernels.linuxPackages-cachyos-bore-lto-x86_64-v3;
+    # Disabled temporarily due to HDMI bugs.
+    #kernelPackages = pkgs.cachyosKernels.linuxPackages-cachyos-bore-lto-x86_64-v3;
+
+    kernelPackages =
+      inputs.nix-cachyos-kernel.legacyPackages.x86_64-linux.linuxPackages-cachyos-bore-lto-x86_64-v3;
 
     extraModulePackages = [ config.boot.kernelPackages.kvmfr ];
 
@@ -74,6 +78,27 @@ in
       })
     ];
 
+    flatpak = {
+      packages = [
+        {
+          appId = "com.usebottles.bottles";
+          origin = "flathub";
+        }
+        {
+          appId = "io.github.ungoogled_software.ungoogled_chromium";
+          origin = "flathub";
+        }
+        {
+          appId = "org.gtk.Gtk3theme.Breeze";
+          origin = "flathub";
+        }
+        {
+          appId = "io.mpv.Mpv";
+          origin = "flathub";
+        }
+      ];
+    };
+
     # Configures snapshots for home subvolume.
     # Requires /home/.snapshots subvolume to function.
     snapper = {
@@ -252,6 +277,7 @@ in
   };
 
   virtualisation = {
+    docker.enable = true;
     spiceUSBRedirection.enable = true;
 
     libvirtd = {
@@ -283,9 +309,12 @@ in
     extraGroups = [
       "networkmanager"
       "wheel"
+      "moonshine"
       "libvirtd"
       "input"
       "video"
+      "docker"
+      "uinput"
     ];
   };
 
@@ -326,21 +355,33 @@ in
       dnsmasq
       guestfs-tools
       unrar
+      p7zip
       btrfs-assistant
       nil
       bash-language-server
       devenv
       nerd-fonts.hack
       jump
+      weather
       affinity-v3
       kdePackages.kfind
+      desktop-file-utils
+      openjdk
+      openjdk17
+      openjdk25
+      tmux
 
-      unstable.winetricks
       unstable.fastfetch
 
-      inputs.nix-gaming.packages.${pkgs.stdenv.hostPlatform.system}.wine-tkg
       inputs.appimage-manager.packages.${pkgs.stdenv.hostPlatform.system}.default
 
+      (python3.withPackages (
+        python-pkgs: with python-pkgs; [
+          requests
+          pandas
+        ]
+      ))
+
       (callPackage ../../packages/virtiofsd-looking-glass/package.nix { })
       (callPackage ../../packages/heidisql/package.nix { })
       (callPackage ../../packages/looking-glass-client/package.nix { })
@@ -351,6 +392,7 @@ in
       ll = "ls -l";
       ls = "ls --color=tty";
       ff = "clear;fastfetch --logo nixos2";
+      ffw = "clear;fastfetch --logo nixos2;printf '\n';weather kmco";
       wget = "wget --hsts-file=$XDG_DATA_HOME/wget-hsts";
       nb = "nix-build";
       nix-rebuild = "sudo nixos-rebuild switch";
@@ -367,12 +409,15 @@ in
         "${pkgs.gtk3}/share/gsettings-schemas/${pkgs.gtk3.name}"
       ];
 
+      ANDROID_USER_HOME = "$XDG_DATA_HOME/android";
+      AZURE_CONFIG_DIR = "$XDG_DATA_HOME/azure";
+      NPM_CONFIG_INIT_MODULE = "$XDG_CONFIG_HOME/npm/config/npm-init.js";
+      NPM_CONFIG_CACHE = "$XDG_CACHE_HOME/npm";
+      NPM_CONFIG_TMP = "$XDG_RUNTIME_DIR/npm";
+      _JAVA_OPTIONS = "-Djava.util.prefs.userRoot=$XDG_CONFIG_HOME/java";
+      PYTHON_HISTORY = "$XDG_STATE_HOME/python_history";
       HISTFILE = "$XDG_STATE_HOME/bash/history";
-      DOTNET_ROOT = "${pkgs.dotnet-sdk}/share/dotnet";
-      DOTNET_CLI_HOME = "$XDG_DATA_HOME/dotnet";
       GTK2_RC_FILES = "$XDG_CONFIG_HOME/gtk-2.0/gtkrc";
-      WINE_BIN = "${inputs.nix-gaming.packages.${pkgs.stdenv.hostPlatform.system}.wine-tkg}/bin/.wine";
-      WINEPREFIX = "$XDG_DATA_HOME/wine";
     };
   };
 

hosts/shared/nixos-server.nix

@@ -0,0 +1,259 @@
+{
+  config,
+  pkgs,
+  lib,
+  inputs,
+  ...
+}:
+let
+  unstable = inputs.nixpkgs-unstable.legacyPackages.${pkgs.stdenv.hostPlatform.system};
+in
+{
+  boot.loader = {
+    systemd-boot.enable = true;
+    systemd-boot.configurationLimit = 10;
+    efi.canTouchEfiVariables = true;
+    timeout = 0;
+  };
+
+  services = {
+    avahi = {
+      enable = true;
+      nssmdns4 = true;
+      openFirewall = true;
+    };
+
+    openssh.enable = true;
+  };
+
+  networking = {
+    useNetworkd = true;
+
+    firewall = {
+      trustedInterfaces = [ "br0" ];
+      allowedTCPPorts = [ 22 ];
+    };
+  };
+
+  systemd.network = {
+    enable = true;
+
+    netdevs = {
+      "30-br0" = {
+        netdevConfig = {
+          Kind = "bridge";
+          Name = "br0";
+          MACAddress = "none";
+        };
+      };
+    };
+
+    networks = {
+      "30-eno1" = {
+        name = "eno1";
+        bridge = [ "br0" ];
+      };
+
+      "30-br0" = {
+        name = "br0";
+        DHCP = "yes";
+      };
+    };
+
+    links = {
+      "30-br0" = {
+        matchConfig = {
+          OriginalName = "br0";
+        };
+
+        linkConfig = {
+          MACAddressPolicy = "none";
+        };
+      };
+    };
+  };
+
+  time.timeZone = "America/New_York";
+
+  i18n = {
+    defaultLocale = "en_US.UTF-8";
+
+    extraLocales = [
+      "ja_JP.UTF-8/UTF-8"
+    ];
+
+    extraLocaleSettings = {
+      LC_ADDRESS = "en_US.UTF-8";
+      LC_IDENTIFICATION = "en_US.UTF-8";
+      LC_MEASUREMENT = "en_US.UTF-8";
+      LC_MONETARY = "en_US.UTF-8";
+      LC_NAME = "en_US.UTF-8";
+      LC_NUMERIC = "en_US.UTF-8";
+      LC_PAPER = "en_US.UTF-8";
+      LC_TELEPHONE = "en_US.UTF-8";
+      LC_TIME = "en_US.UTF-8";
+    };
+  };
+
+  programs = {
+    bash = {
+      enable = true;
+
+      interactiveShellInit = ''
+        eval "$(jump shell)"
+        bind -x '"\eOQ": clear;fastfetch'
+      '';
+    };
+
+    starship = {
+      enable = true;
+
+      settings = {
+        character = {
+          success_symbol = "[λ](bold green)";
+          error_symbol = "[λ](bold red)";
+        };
+      };
+    };
+
+    neovim = {
+      enable = true;
+      defaultEditor = true;
+      vimAlias = true;
+
+      configure = {
+        customRC = ''
+          set nocompatible
+          set backspace=indent,eol,start
+          set tabstop=2
+          set shiftwidth=2
+          set expandtab
+        '';
+
+        packages.myPlugins = with pkgs.vimPlugins; {
+          start = [
+            vim-lastplace
+            vim-nix
+          ];
+
+          opt = [ ];
+        };
+      };
+    };
+
+    ssh.startAgent = true;
+  };
+
+  virtualisation = {
+    docker.enable = true;
+    spiceUSBRedirection.enable = true;
+
+    libvirtd = {
+      enable = true;
+
+      qemu = {
+        package = pkgs.qemu_kvm;
+        runAsRoot = true;
+        swtpm.enable = true;
+      };
+    };
+  };
+
+  users.users.frank = {
+    isNormalUser = true;
+    description = "Frank LoTurco";
+
+    extraGroups = [
+      "wheel"
+      "libvirtd"
+      "docker"
+    ];
+  };
+
+  environment = {
+    systemPackages = with pkgs; [
+      wget
+      dnsmasq
+      guestfs-tools
+      unrar
+      nil
+      bash-language-server
+      devenv
+      jump
+      weather
+      borgbackup
+      openjdk
+      openjdk17
+      openjdk25
+      tmux
+
+      unstable.fastfetch
+
+      (python3.withPackages (
+        python-pkgs: with python-pkgs; [
+          requests
+          pandas
+        ]
+      ))
+    ];
+
+    shellAliases = {
+      l = "ls -alh";
+      ll = "ls -l";
+      ls = "ls --color=tty";
+      ff = "clear;fastfetch --logo nixos2";
+      ffw = "clear;fastfetch --logo nixos2;printf '\n';weather kmco";
+      wget = "wget --hsts-file=$XDG_DATA_HOME/wget-hsts";
+      nb = "nix-build";
+      nix-rebuild = "sudo nixos-rebuild switch";
+    };
+
+    sessionVariables = rec {
+      XDG_CACHE_HOME = "$HOME/.cache";
+      XDG_CONFIG_HOME = "$HOME/.config";
+      XDG_DATA_HOME = "$HOME/.local/share";
+      XDG_STATE_HOME = "$HOME/.local/state";
+
+      XDG_DATA_DIRS = [
+        "${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}"
+        "${pkgs.gtk3}/share/gsettings-schemas/${pkgs.gtk3.name}"
+      ];
+
+      AZURE_CONFIG_DIR = "$XDG_DATA_HOME/azure";
+      NPM_CONFIG_INIT_MODULE = "$XDG_CONFIG_HOME/npm/config/npm-init.js";
+      NPM_CONFIG_CACHE = "$XDG_CACHE_HOME/npm";
+      NPM_CONFIG_TMP = "$XDG_RUNTIME_DIR/npm";
+      _JAVA_OPTIONS = "-Djava.util.prefs.userRoot=$XDG_CONFIG_HOME/java";
+      PYTHON_HISTORY = "$XDG_STATE_HOME/python_history";
+      HISTFILE = "$XDG_STATE_HOME/bash/history";
+      DOTNET_ROOT = "${pkgs.dotnet-sdk}/share/dotnet";
+      DOTNET_CLI_HOME = "$XDG_DATA_HOME/dotnet";
+      GTK2_RC_FILES = "$XDG_CONFIG_HOME/gtk-2.0/gtkrc";
+    };
+  };
+
+  nix = {
+    gc = {
+      automatic = true;
+      dates = "weekly";
+      options = "--delete-older-than 30d";
+    };
+
+    optimise = {
+      automatic = true;
+      dates = "weekly";
+    };
+
+    settings = {
+      experimental-features = [
+        "nix-command"
+        "flakes"
+      ];
+
+      use-xdg-base-directories = true;
+    };
+  };
+
+  nixpkgs.config.allowUnfree = true;
+  system.stateVersion = "26.05";
+}

hosts/vergil/configuration.nix

@@ -0,0 +1,111 @@
+{
+  pkgs,
+  inputs,
+  ...
+}:
+let
+  unstable = inputs.nixpkgs-unstable.legacyPackages.${pkgs.stdenv.hostPlatform.system};
+in
+{
+  imports = [
+    ../shared/nixos-server.nix
+    ../../features/jmusicbot.nix
+  ];
+
+  systemd.services.mount-vm-disk = {
+    description = "Mount Proxmox VM disk via kpartx";
+    after = [ "storage-vm--100--disk--0.device" ];
+    wants = [ "storage-vm--100--disk--0.device" ];
+
+    serviceConfig = {
+      Type = "oneshot";
+      RemainAfterExit = true;
+      ExecStart = "${pkgs.multipath-tools}/sbin/kpartx -av /dev/storage/vm-100-disk-0";
+      ExecStop = "${pkgs.multipath-tools}/sbin/kpartx -dv /dev/storage/vm-100-disk-0";
+    };
+
+    wantedBy = [ "multi-user.target" ];
+  };
+
+  systemd.network = {
+    networks."30-br0" = {
+      address = [
+        "fd09:dead:beef::181/64"
+      ];
+    };
+  };
+
+  users.users."remotebuild" = {
+    isSystemUser = true;
+    group = "remotebuild";
+    useDefaultShell = true;
+    openssh.authorizedKeys.keyFiles = [ ./remotebuild.pub ];
+  };
+
+  users.groups.remotebuild = { };
+  nix.settings.trusted-users = [ "remotebuild" ];
+
+  services = {
+    nginx = {
+      enable = true;
+      recommendedGzipSettings = true;
+      recommendedOptimisation = true;
+      recommendedProxySettings = true;
+      recommendedTlsSettings = true;
+
+      virtualHosts = {
+        "jellyfin.cfl.rr.com" = {
+          locations."/" = {
+            proxyPass = "http://localhost:8096";
+          };
+        };
+      };
+    };
+
+    pihole-ftl = {
+      enable = true;
+      openFirewallDNS = true;
+
+      settings = {
+        dns = {
+          domain = "cfl.rr.com";
+
+          upstreams = [
+            "1.1.1.1"
+            "1.0.0.1"
+          ];
+
+          hosts = [
+            "192.168.1.181 vergil.cfl.rr.com"
+            "fd09:dead:beef::181 vergil.cfl.rr.com"
+            "192.168.1.181 jellyfin.cfl.rr.com"
+            "fd09:dead:beef::181 jellyfin.cfl.rr.com"
+            "192.168.1.181 pihole.cfl.rr.com"
+            "fd09:dead:beef::181 pihole.cfl.rr.com"
+          ];
+        };
+      };
+    };
+
+    jellyfin = {
+      enable = true;
+      openFirewall = true;
+      user = "frank";
+    };
+  };
+
+  environment.systemPackages = with pkgs; [
+    multipath-tools
+  ];
+
+  networking = {
+    hostName = "vergil";
+
+    firewall = {
+      allowedTCPPorts = [
+        80
+        443
+      ];
+    };
+  };
+}

hosts/vergil/hardware.nix

@@ -0,0 +1,61 @@
+{
+  config,
+  lib,
+  modulesPath,
+  ...
+}:
+
+{
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
+
+  boot = {
+    initrd = {
+      availableKernelModules = [
+        "uhci_hcd"
+        "ehci_pci"
+        "ata_piix"
+        "megaraid_sas"
+        "usb_storage"
+        "usbhid"
+        "sd_mod"
+        "sr_mod"
+      ];
+      kernelModules = [ ];
+    };
+
+    kernelModules = [ "kvm-intel" ];
+    extraModulePackages = [ ];
+  };
+
+  fileSystems = {
+    "/" = {
+      device = "/dev/disk/by-uuid/05376a0d-18d1-4e7b-8f75-fe052a5636ac";
+      fsType = "xfs";
+    };
+
+    "/boot" = {
+      device = "/dev/disk/by-uuid/631D-23D2";
+      fsType = "vfat";
+      options = [
+        "fmask=0077"
+        "dmask=0077"
+      ];
+    };
+
+    "/mnt" = {
+      device = "/dev/disk/by-uuid/1432aeae-71e9-4f34-97dc-cf0fe74a4e00";
+      fsType = "xfs";
+      options = [
+        "noauto"
+        "x-systemd.automount"
+        "x-systemd.after=mount-vm-disk.service"
+      ];
+    };
+  };
+
+  swapDevices = [ ];
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}

hosts/vergil/remotebuild.pub

@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDTEO/x11KsI4qm30RE9gBNGU8dwFxSCLEMkYyCcmNKbk/59XLV/XnJt3v/485J2lFVhHUqh6K7wWsXcYty5ndd/T2qjUinRokUaNTHz8RV0NM70X0afbObGK+D/zjrKd6Cd5jjlBb7bsEaYzG41Nex4O/6GYdgHK1iVzn3yBfZEzQK1jNfF5tB/ZJnwzf74P+zVKjwh/u7yJNqQHISOA1q3qVK497pp9mTx/x1+WIIb4ovkdvHG1haN0JsQaCa78ih0d5y/3p58p2JVRUzYz0volVBZn8KGuvx6G0Y5dnJmWsJa6rmCvpGmRQNZoPkvbdluT4zJsZWYc7m5EFobfvWQj5PYWwURXA1fwpaprCZAOEnxmc0DEyMSdaelvEYVlo3c0jLGClrl5m3Zi7eW4Tqn/srLUR4AN+gGze3MKUtGFVYimxoO+bQmwBAl9mstvwJkQTJQGxTlibHPE7tODuY7O1aDcgGDUejbwP8RFIBPzt6AgfsdnwkjzEE8Opnr9U= frank@nero

packages/aseprite/package.nix

@@ -32,30 +32,29 @@
   zlib,
 }:
 
-let
-  asepriteStrings = fetchFromGitHub {
-    owner = "aseprite";
-    repo = "strings";
-    rev = "417074f649f359f98511fc87a707c276d87f5739";
-    hash = "sha256-5bB7yK4eJHhkUwGYtIFYdFXpRrBt69VBbTh7EmPFI08=";
-  };
-in
 clangStdenv.mkDerivation (finalAttrs: {
   pname = "aseprite";
-  version = "44cd42d29dbc047ec9d341f05c0a8ff584ede151";
+  version = "1.3.18.3";
 
   src = fetchFromGitHub {
     owner = "aseprite";
     repo = "aseprite";
-    rev = "${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
-    hash = "sha256-swXk8wwFgao2rpF4ntCjOMnV+yk0gi+wbWoWl/wv7e8=";
     fetchSubmodules = true;
+    hash = "sha256-pMjBFJ1nhSNLITDS4oliD2DPMey6JBWplIqdcOtZfqM=";
   };
 
-  # Translation files are copied without overwriting existing ones to preserve the
+  asepriteStrings = fetchFromGitHub {
-  # potentially more up-to-date English file from the main source.
+    owner = "aseprite";
+    repo = "strings";
+    rev = "b43be33343efa40c1c4bda00f985b8cd83bddf2a";
+    hash = "sha256-JxNEtWnP3RtntXM3CmJLXyByW6dri98COp2O0A6ZwBA=";
+  };
+
+  # Translation files are copied without overwriting existing ones to preserve
+  # the potentially more up-to-date English file from the main source.
   postUnpack = ''
-    cp --no-clobber ${asepriteStrings}/* "$sourceRoot/data/strings"
+    cp --no-clobber ${finalAttrs.asepriteStrings}/* "$sourceRoot/data/strings"
   '';
 
   nativeBuildInputs = [
@@ -105,8 +104,12 @@ clangStdenv.mkDerivation (finalAttrs: {
     substituteInPlace src/ver/CMakeLists.txt \
       --replace-fail '"1.x-dev"' '"${finalAttrs.version}"'
 
-    # Fix build on Darwin with `-Werror=format-security`.
+    # fmt 12.2 no longer exposes fmt::format through fmt/core.h.
-    # (NSLog requires a string-literal format).
+    substituteInPlace src/app/i18n/strings.h \
+      --replace-fail '"fmt/core.h"' '"fmt/format.h"'
+
+    # Fix build on Darwin with `-Werror=format-security`
+    # (NSLog requires a string-literal format)
     substituteInPlace laf/os/osx/logger.mm \
       --replace-fail 'NSLog([NSString stringWithUTF8String:error]);' 'NSLog(@"%@", [NSString stringWithUTF8String:error]);'
   '';
@@ -176,11 +179,12 @@ clangStdenv.mkDerivation (finalAttrs: {
     rmdir "$out/bin" 2>/dev/null || true
   '';
 
+  passthru.updateScript = ./update.sh;
+
   meta = {
     homepage = "https://www.aseprite.org/";
     description = "Animated sprite editor & pixel art tool";
     license = lib.licenses.unfree;
-
     longDescription = ''
       Aseprite is a program to create animated sprites. Its main features are:
         - Sprites are composed by layers & frames (as separated concepts).
@@ -194,7 +198,6 @@ clangStdenv.mkDerivation (finalAttrs: {
         - Pixel-art specific tools like filled Contour, Polygon, Shading mode, etc.
         - Onion skinning.
     '';
-
     maintainers = [ lib.maintainers.iamanaws ];
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
     mainProgram = "aseprite";

packages/looking-glass-client/package.nix

@@ -13,6 +13,7 @@
   expat,
   libGL,
   nanosvg,
+  fuse3,
 
   libx11,
   libxkbcommon,
@@ -43,16 +44,16 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "looking-glass-client";
-  version = "B7-544-d3fff4eb";
+  version = "B7-782-7b059ad6";
 
   src = fetchurl {
-    url = "https://looking-glass.io/artifact/B7-544-d3fff4eb/source";
+    url = "https://looking-glass.io/artifact/bleeding/source";
-    sha256 = "sha256-fQLt4LcucLrHUBHSZJtWzkw+WWLZGzLHXFtIeI2G8oA=";
+    sha256 = "sha256-45bZIxcv8+boihxpBqDl6HopjdtaGKpNjLTaN+eM4lA=";
     name = "looking-glass-bleeding.tar.gz";
   };
 
   patches = [
-    ./patches/nanosvg-unvendor.diff
+    #./patches/nanosvg-unvendor.diff
   ];
 
   nativeBuildInputs = [
@@ -74,6 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
     nanosvg
     libunwind
     elfutils
+    fuse3
   ]
   ++ lib.optionals xorgSupport [
     libxkbcommon