update and some gaming stuff

flake.lock

@@ -1,5 +1,26 @@
 {
   "nodes": {
+    "aagl": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1683991514,
+        "narHash": "sha256-VPQD1EbTCCr+fBjucjhDDVqVsT9VlDMVXTD4nUU7tKM=",
+        "owner": "ezKEa",
+        "repo": "aagl-gtk-on-nix",
+        "rev": "3cdbeeb2b40d2035aa1beb61c515c38a27265d5b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ezKEa",
+        "repo": "aagl-gtk-on-nix",
+        "type": "github"
+      }
+    },
     "arkenfox-userjs": {
       "flake": false,
       "locked": {
@@ -168,6 +189,22 @@
       }
     },
     "flake-compat_6": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1673956053,
+        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_7": {
       "flake": false,
       "locked": {
         "lastModified": 1668681692,
@@ -543,7 +580,7 @@
     },
     "nix": {
       "inputs": {
-        "flake-compat": "flake-compat",
+        "flake-compat": "flake-compat_2",
         "lowdown-src": "lowdown-src",
         "nixpkgs": "nixpkgs_3",
         "nixpkgs-regression": "nixpkgs-regression"
@@ -564,7 +601,7 @@
     },
     "nix-alien": {
       "inputs": {
-        "flake-compat": "flake-compat_2",
+        "flake-compat": "flake-compat_3",
         "flake-utils": "flake-utils_3",
         "nix-index-database": "nix-index-database",
         "nixpkgs": [
@@ -627,7 +664,7 @@
     },
     "nix-vscode-marketplace": {
       "inputs": {
-        "flake-compat": "flake-compat_3",
+        "flake-compat": "flake-compat_4",
         "flake-utils": "flake-utils_5",
         "nixpkgs": [
           "nixpkgs"
@@ -859,7 +896,7 @@
     },
     "pre-commit-hooks": {
       "inputs": {
-        "flake-compat": "flake-compat_5",
+        "flake-compat": "flake-compat_6",
         "flake-utils": [
           "prismlauncher",
           "flake-utils"
@@ -887,7 +924,7 @@
     },
     "prismlauncher": {
       "inputs": {
-        "flake-compat": "flake-compat_4",
+        "flake-compat": "flake-compat_5",
         "flake-utils": "flake-utils_6",
         "libnbtplusplus": "libnbtplusplus",
         "nixpkgs": "nixpkgs_6",
@@ -932,6 +969,7 @@
     },
     "root": {
       "inputs": {
+        "aagl": "aagl",
         "arkenfox-userjs": "arkenfox-userjs",
         "base16": "base16",
         "base16-tokyonight-scheme": "base16-tokyonight-scheme",
@@ -977,7 +1015,7 @@
     "simple-nixos-mailserver": {
       "inputs": {
         "blobs": "blobs",
-        "flake-compat": "flake-compat_6",
+        "flake-compat": "flake-compat_7",
         "nixpkgs": [
           "nixpkgs"
         ],

flake.nix

@@ -15,6 +15,10 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     impermanence.url = "github:AtaraxiaSjel/impermanence";
+    aagl = {
+      url = "github:ezKEa/aagl-gtk-on-nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     arkenfox-userjs = {
       url = "github:arkenfox/user.js";
       flake = false;
@@ -107,13 +111,14 @@
     nixosRoles = import ./roles;
 
     sharedPatches = patchesPath [
-      "mullvad-exclude-containers.patch"
-      "ydotoold.patch"
       "gitea-208605.patch"
-      "waydroid-1.4.0.patch"
       "ivpn-ui.patch"
+      "ivpn.patch"
+      "mullvad-exclude-containers.patch"
       "vaultwarden.patch"
+      "waydroid-1.4.0.patch"
       "webhooks.patch"
+      "ydotoold.patch"
     ];
     channelsConfig = { allowUnfree = true; };
     channels.unstable.input = nixpkgs;

machines/AMD-Workstation/default.nix

@@ -7,7 +7,8 @@
     # nixosProfiles.stable-diffusion
     nixosProfiles.a2ln-server
     nixosProfiles.cassowary
-    # nixosProfiles.sunshine
+    nixosProfiles.hoyo
+    nixosProfiles.sunshine
   ];
 
   virtualisation.libvirt.guests = {
@@ -47,7 +48,7 @@
 
   programs.nix-ld.enable = true;
 
-  secrets.files-veracrypt = {};
+  secrets.files-veracrypt = { };
   environment.etc.crypttab = {
     text = ''
       files-veracrypt /dev/disk/by-partuuid/15fa11a1-a6d8-4962-9c03-74b209d7c46a /var/secrets/files-veracrypt tcrypt-veracrypt

patches/ivpn-ui.patch

@@ -1,17 +1,6 @@
-From 0683c927678c97d998d9363b1a0b997db5cabae3 Mon Sep 17 00:00:00 2001
-From: Dmitriy Kholkin <ataraxiadev@ataraxiadev.com>
-Date: Sun, 16 Apr 2023 22:24:20 +0300
-Subject: [PATCH] ivpn-ui: init at 3.10.14
-
----
- pkgs/tools/networking/ivpn-ui/default.nix | 103 ++++++++++++++++++++++
- pkgs/top-level/all-packages.nix           |   2 +
- 2 files changed, 105 insertions(+)
- create mode 100644 pkgs/tools/networking/ivpn-ui/default.nix
-
 diff --git a/pkgs/tools/networking/ivpn-ui/default.nix b/pkgs/tools/networking/ivpn-ui/default.nix
 new file mode 100644
-index 0000000000000..fcaae31d3d584
+index 00000000000..7e787879e7c
 --- /dev/null
 +++ b/pkgs/tools/networking/ivpn-ui/default.nix
 @@ -0,0 +1,103 @@
@@ -46,13 +35,13 @@ index 0000000000000..fcaae31d3d584
 +  };
 +in buildNpmPackage' rec {
 +  pname = "ivpn-ui";
-+  version = "3.10.14";
++  version = "3.10.23";
 +
 +  src = fetchFromGitHub {
 +    owner = "ivpn";
 +    repo = "desktop-app";
 +    rev = "v${version}";
-+    hash = "sha256-zHBjAEVHjnHMuUutwQQCCcZ7+Fz3C4GCAV3/jgZgwhM=";
++    hash = "sha256-0XIATqidCQdERitYys7Gk0bENRZxdb/A9ieBNsWhbUM=";
 +  };
 +
 +  env = {
@@ -63,7 +52,7 @@ index 0000000000000..fcaae31d3d584
 +  };
 +
 +  npmBuildScript = "electron:build";
-+  npmDepsHash = "sha256-U7Jurq7Dv9oRZushf8yeHuqe3pKTBJ/9hpS/iQzIYkI=";
++  npmDepsHash = "sha256-DEXz/IsQG82f1PdlsabtaPKdj8XoweE121sZcqMZvPo=";
 +
 +  sourceRoot = "source/ui";
 +
@@ -119,10 +108,10 @@ index 0000000000000..fcaae31d3d584
 +  };
 +}
 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
-index 73594265adf1e..dae1f0318a7f4 100644
+index e42539e17f7..40f8c43bfa5 100644
 --- a/pkgs/top-level/all-packages.nix
 +++ b/pkgs/top-level/all-packages.nix
-@@ -1558,6 +1558,8 @@ with pkgs;
+@@ -1593,6 +1593,8 @@ with pkgs;
  
    inherit (callPackage ../tools/networking/ivpn/default.nix {}) ivpn ivpn-service;
  

patches/ivpn.patch

@@ -0,0 +1,46 @@
+From 13a0c99ff5bed75f1991169ff5757936f0e39747 Mon Sep 17 00:00:00 2001
+From: Dmitriy Kholkin <ataraxiadev@ataraxiadev.com>
+Date: Tue, 16 May 2023 17:59:58 +0300
+Subject: [PATCH] ivpn{,-service}: 3.10.15 -> 3.10.23
+
+---
+ pkgs/tools/networking/ivpn/default.nix | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/pkgs/tools/networking/ivpn/default.nix b/pkgs/tools/networking/ivpn/default.nix
+index e8e33f3bc73..fe5d673286e 100644
+--- a/pkgs/tools/networking/ivpn/default.nix
++++ b/pkgs/tools/networking/ivpn/default.nix
+@@ -15,13 +15,13 @@
+ 
+ builtins.mapAttrs (pname: attrs: buildGoModule (attrs // rec {
+   inherit pname;
+-  version = "3.10.15";
++  version = "3.10.23";
+ 
+   src = fetchFromGitHub {
+     owner = "ivpn";
+     repo = "desktop-app";
+     rev = "v${version}";
+-    hash = "sha256-3yVRVM98tVjot3gIkUb/CDwmwKdOOBjBjzGL6htDtpk=";
++    hash = "sha256-0XIATqidCQdERitYys7Gk0bENRZxdb/A9ieBNsWhbUM=";
+   };
+ 
+   ldflags = [
+@@ -45,11 +45,11 @@ builtins.mapAttrs (pname: attrs: buildGoModule (attrs // rec {
+ })) {
+   ivpn = {
+     modRoot = "cli";
+-    vendorHash = "sha256-T49AE3SUmdP3Tu9Sp5C/QryKDto/NzEqRuUQ3+aJFL0=";
++    vendorHash = "sha256-aD4QOudazSrsg10c1m6xZUfPkw/aCxYKPxBR46KUVAk=";
+   };
+   ivpn-service = {
+     modRoot = "daemon";
+-    vendorHash = "sha256-9Rk6ruMpyWtQe+90kw4F8OLq7/JcDSrG6ufkfcrS4W8=";
++    vendorHash = "sha256-1bGh3Yvou+xnQvhj5T3Z3yq0agvk8BCUX+M83f+5qOg=";
+     nativeBuildInputs = [ makeWrapper ];
+     buildInputs = [ wirelesstools ];
+ 
+-- 
+2.40.1
+

profiles/applications/games/hoyo.nix

@@ -0,0 +1,14 @@
+{ inputs, config, lib, pkgs, ... }: {
+  imports = [ inputs.aagl.nixosModules.default ];
+
+  # programs.honkers-railway-launcher.enable = true;
+  networking.mihoyo-telemetry.block = true;
+
+  home-manager.users.${config.mainuser}.home.packages = [
+    inputs.aagl.packages.${pkgs.hostPlatform.system}.honkers-railway-launcher
+  ];
+
+  persist.state.homeDirectories = [
+    ".local/share/honkers-railway-launcher"
+  ];
+}

profiles/applications/packages.nix

@@ -75,7 +75,7 @@ with config.deviceSpecific; {
       gamescope
       # goverlay
       lutris
-      # moonlight-qt
+      moonlight-qt
       # reshade-shaders
       # (retroarch.override { cores = [ libretro.genesis-plus-gx libretro.dosbox ]; })
       # parsec

profiles/applications/sunshine.nix

@@ -1,21 +1,31 @@
 { config, lib, pkgs, ... }: {
-  home-manager.users.${config.mainuser} = {
+  boot.kernelModules = [ "uinput" ];
-    home.packages = [ pkgs.sunshine ];
+
-    systemd.user.services.sunshine = {
+  services.udev.extraRules = ''
-      Unit.Description = "Sunshine is a Gamestream host for Moonlight.";
+    KERNEL=="uinput", GROUP="input", MODE="0660" OPTIONS+="static_node=uinput"
-      Service.ExecStart = "${pkgs.sunshine}/bin/sunshine";
+  '';
-      Install.WantedBy = [ "graphical-session.target" ];
+
-    };
+  environment.systemPackages = [ pkgs.sunshine ];
-  };
+
-  networking.firewall = {
+  security.wrappers.sunshine = {
-    allowedTCPPorts = [
+    owner = "root";
-      47984 47989 48010
+    group = "root";
-      47990
+    capabilities = "cap_sys_admin+p";
-    ];
+    source = "${pkgs.sunshine}/bin/sunshine";
-    allowedUDPPorts = [
-      47998 47999 48000 48002 48010
-    ];
   };
 
-  persist.state.homeDirectories = [ ".config/sunshine "];
+  systemd.user.services.sunshine = {
-}
+    description = "sunshine";
+    wantedBy = [ "graphical-session.target" ];
+    serviceConfig = {
+      ExecStart = "${config.security.wrapperDir}/sunshine";
+    };
+  };
+
+  networking.firewall = {
+    allowedTCPPorts = [ 47984 47989 48010 47990 ];
+    allowedUDPPorts = [ 47998 47999 48000 48002 48010 ];
+  };
+
+  persist.state.homeDirectories = [ ".config/sunshine" ];
+}