From e63132baf317d26cbe4a050caa0a3d308d652965 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Sat, 18 Nov 2023 16:17:14 +0100 Subject: [PATCH] remove ffxiv teamcraft setup --- config/desktop.nix | 1 - config/games/default.nix | 20 +++++++++++++- config/games/system.nix | 59 ---------------------------------------- 3 files changed, 19 insertions(+), 61 deletions(-) delete mode 100644 config/games/system.nix diff --git a/config/desktop.nix b/config/desktop.nix index 99c0dac8..3c3cdc1f 100644 --- a/config/desktop.nix +++ b/config/desktop.nix @@ -21,7 +21,6 @@ in { ./services/docker.nix ./services/cifs.nix ./services/kubo-local.nix - ./games/system.nix ./programs/virtualbox.nix ]; fonts = { diff --git a/config/games/default.nix b/config/games/default.nix index c71c4b5f..521e938a 100644 --- a/config/games/default.nix +++ b/config/games/default.nix @@ -3,11 +3,29 @@ args: { nixpkgs, nix-gaming, ... -}: { +}: +let + wine = nix-gaming.packages.x86_64-linux.wine-ge.overrideAttrs (super: { + patches = + super.patches + or [] + ++ [ + ./wine/server-default_integrity/0001-server-Create-processes-using-a-limited-administrato.patch + ./wine/server-default_integrity/0002-shell32-Implement-the-runas-verb.patch + ./wine/server-default_integrity/0003-wine.inf-Set-the-EnableLUA-value-to-1.patch + ./wine/server-default_integrity/0004-msi-Create-the-custom-action-server-as-an-elevated-p.patch + ./wine/server-default_integrity/0005-ntdll-Always-start-the-initial-process-through-start.patch + ./wine/server-default_integrity/0006-kernelbase-Elevate-processes-if-requested-in-CreateP.patch + ./wine/server-default_integrity/0007-ntdll-Elevate-processes-if-requested-in-RtlCreateUse.patch + ]; + }); +in +{ home.packages = [ pkgs.xivlauncher pkgs.prismlauncher pkgs.mgba pkgs.citra + wine ]; } diff --git a/config/games/system.nix b/config/games/system.nix deleted file mode 100644 index 5b8c8199..00000000 --- a/config/games/system.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ - pkgs, - nix-gaming, - ... -}: let - wine = nix-gaming.packages.x86_64-linux.wine-ge.overrideAttrs (super: { - patches = - super.patches - or [] - ++ [ - ./wine/server-default_integrity/0001-server-Create-processes-using-a-limited-administrato.patch - ./wine/server-default_integrity/0002-shell32-Implement-the-runas-verb.patch - ./wine/server-default_integrity/0003-wine.inf-Set-the-EnableLUA-value-to-1.patch - ./wine/server-default_integrity/0004-msi-Create-the-custom-action-server-as-an-elevated-p.patch - ./wine/server-default_integrity/0005-ntdll-Always-start-the-initial-process-through-start.patch - ./wine/server-default_integrity/0006-kernelbase-Elevate-processes-if-requested-in-CreateP.patch - ./wine/server-default_integrity/0007-ntdll-Elevate-processes-if-requested-in-RtlCreateUse.patch - ]; - }); -in { - environment.systemPackages = [ - wine - ]; - security.wrappers.wine = { - source = "${wine}/bin/wine"; - capabilities = "cap_net_raw,cap_net_admin,cap_sys_ptrace=eip"; - owner = "root"; - group = "dialout"; - permissions = "u+rx,g+x"; - }; - security.wrappers.wine64 = { - source = "${wine}/bin/wine64-preloader"; - capabilities = "cap_net_raw,cap_net_admin,cap_sys_ptrace=eip"; - owner = "root"; - group = "dialout"; - permissions = "u+rx,g+x"; - }; - security.wrappers.wine-preloader = { - source = "${wine}/bin/wine-preloader"; - capabilities = "cap_net_raw,cap_net_admin,cap_sys_ptrace=eip"; - owner = "root"; - group = "dialout"; - permissions = "u+rx,g+x"; - }; - security.wrappers.wine64-preloader = { - source = "${wine}/bin/wine64-preloader"; - capabilities = "cap_net_raw,cap_net_admin,cap_sys_ptrace=eip"; - owner = "root"; - group = "dialout"; - permissions = "u+rx,g+x"; - }; - security.wrappers.wineserver = { - source = "${wine}/bin/wineserver"; - capabilities = "cap_net_raw,cap_net_admin,cap_sys_ptrace=eip"; - owner = "root"; - group = "dialout"; - permissions = "u+rx,g+x"; - }; -}