From c470c271cf9996d9bc592c7786fa4d3c03fd5dfe Mon Sep 17 00:00:00 2001 From: Kat Inskip Date: Wed, 8 Oct 2025 05:46:34 -0700 Subject: [PATCH] feat(wine): clean up env vars --- flake.lock | 194 +++++++++++++-------------- home/profiles/graphical/obsidian.nix | 6 - nixos/profiles/gaming/wine.nix | 43 +++--- 3 files changed, 112 insertions(+), 131 deletions(-) diff --git a/flake.lock b/flake.lock index e09edd50..dc9dc201 100644 --- a/flake.lock +++ b/flake.lock @@ -150,11 +150,11 @@ ] }, "locked": { - "lastModified": 1758886919, - "narHash": "sha256-4y+Z3EIIFw61+uGVgsNpWx3STmNbex8rTyHJPsPwyjE=", + "lastModified": 1759745865, + "narHash": "sha256-zpCNJykHhWZQmwXe37XlT+gnYL/ME9ynwzRbi04UP04=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "39a646acc74e720d337edb57cf8473e96f6164ef", + "rev": "5c7bb56b67db86460e96b4da7bee8304383d88a9", "type": "github" }, "original": { @@ -188,11 +188,11 @@ ] }, "locked": { - "lastModified": 1731355357, - "narHash": "sha256-kTXsO+hskCfX36+Ez1fHu9SO54uUY2lofkrbMKE3Vrk=", + "lastModified": 1759253700, + "narHash": "sha256-pDsDzWEBaZlT9lHsBZMGm8aBJGncMxqerKwkzjEM/EI=", "owner": "dnut", "repo": "clipboard-sync", - "rev": "943e49e0a9a16b54bbab3704e99b6cf6ad4ea19f", + "rev": "138a59b8f3044dd9e7dcccd9607bbbb48c14bae6", "type": "github" }, "original": { @@ -304,11 +304,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1756083905, - "narHash": "sha256-UqYGTBgI5ypGh0Kf6zZjom/vABg7HQocB4gmxzl12uo=", + "lastModified": 1758112371, + "narHash": "sha256-lizRM2pj6PHrR25yimjyFn04OS4wcdbc38DCdBVa2rk=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "b655eaf16d4cbec9c3472f62eee285d4b419a808", + "rev": "0909cfe4a2af8d358ad13b20246a350e14c2473d", "type": "github" }, "original": { @@ -355,11 +355,11 @@ ] }, "locked": { - "lastModified": 1756770412, - "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", + "lastModified": 1759362264, + "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4524271976b625a4a605beefd893f270620fd751", + "rev": "758cf7296bee11f1706a574c77d072b8a7baa881", "type": "github" }, "original": { @@ -487,11 +487,11 @@ ] }, "locked": { - "lastModified": 1758108966, - "narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=", + "lastModified": 1759523803, + "narHash": "sha256-PTod9NG+i3XbbnBKMl/e5uHDBYpwIWivQ3gOWSEuIEM=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b", + "rev": "cfc9f7bb163ad8542029d303e599c0f7eee09835", "type": "github" }, "original": { @@ -584,11 +584,11 @@ ] }, "locked": { - "lastModified": 1758899649, - "narHash": "sha256-Z6IxPlvIS83lKbTIliP2xFj4hJ699/eM7Ubte4iytgQ=", + "lastModified": 1759853171, + "narHash": "sha256-uqbhyXtqMbYIiMqVqUhNdSuh9AEEkiasoK3mIPIVRhk=", "owner": "nix-community", "repo": "home-manager", - "rev": "6238bbc0ae04951b64a3ad1b69d3e03b8b329e51", + "rev": "1a09eb84fa9e33748432a5253102d01251f72d6d", "type": "github" }, "original": { @@ -686,11 +686,11 @@ ] }, "locked": { - "lastModified": 1758838296, - "narHash": "sha256-/9nsPuRF/2wQjElYVM4b7q7hTynNa27kvqGr/2JuQ1k=", + "lastModified": 1758994668, + "narHash": "sha256-whpwTFG/wj7nnjryDNgFrfGSd/LwRFr9AcFo1hINlKo=", "owner": "gensokyo-zone", "repo": "infrastructure", - "rev": "8595762c7bccc904f1549c89b6d5b6569f4b8d87", + "rev": "ceeb079b58024b6d8f6f9e0364fcbcbdc4aea047", "type": "github" }, "original": { @@ -709,11 +709,11 @@ ] }, "locked": { - "lastModified": 1757230583, - "narHash": "sha256-4uqu7sFPOaVTCogsxaGMgbzZ2vK40GVGMfUmrvK3/LY=", + "lastModified": 1759387127, + "narHash": "sha256-uuwJAP92SkHmnI1zo7rrK/gEuHtb97vFZcMa5w+0SZA=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "fc3960e6c32c9d4f95fff2ef84444284d24d3bea", + "rev": "0cc290e05882745060fccfe6d7d073f913e0cce7", "type": "github" }, "original": { @@ -805,11 +805,11 @@ "spectrum": "spectrum" }, "locked": { - "lastModified": 1758113222, - "narHash": "sha256-Q5i/qaj6v6F4N1Q5gI/4aL0IEEUE/LjQuwcA8L5IOMc=", + "lastModified": 1759708185, + "narHash": "sha256-s8bRMSQVILQlhbBqCKBFtIcsxbcuH2oX35JJ7FHw4BI=", "owner": "microvm-nix", "repo": "microvm.nix", - "rev": "b9206e245c07c0782beff58e1e94bb48b2531d15", + "rev": "901c80e256d41f63d8036b042d1675c745c1a617", "type": "github" }, "original": { @@ -900,11 +900,11 @@ ] }, "locked": { - "lastModified": 1758838444, - "narHash": "sha256-r+lgeW52Xnoj9h8kO3SH1L0Vx3nBPs+LT3LHDL1Zrsc=", + "lastModified": 1759904835, + "narHash": "sha256-s2zh2FwMWYHYQC3crc1TwqL3zE6me61atTGGAgu1/jE=", "owner": "nvim-neorg", "repo": "nixpkgs-neorg-overlay", - "rev": "5c6198c38b308c2de94b9fe04b90609752903382", + "rev": "c717f344bdf48bac457d1158061767739ac64a13", "type": "github" }, "original": { @@ -936,11 +936,11 @@ ] }, "locked": { - "lastModified": 1757846222, - "narHash": "sha256-papocgox6HOM+BJrWmWZuRnuDXi625diuC3sajCXd9A=", + "lastModified": 1759921758, + "narHash": "sha256-kCrvJGFkx4IX9Vn01jET3Tk0es9mOMWV32AeTE5jO6c=", "owner": "nix-community", "repo": "nh", - "rev": "8bf323483166797a204579a43ed8810113eb128c", + "rev": "df21b11dc5f8928e8c9ce25b3a4f546d599233da", "type": "github" }, "original": { @@ -963,11 +963,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1758901074, - "narHash": "sha256-R7XQL6ixYywDsGkorX05KnTlsIeQr9DzQ3geD9Ba6kU=", + "lastModified": 1759909257, + "narHash": "sha256-ZGEBkK8ZQ370ifJO+1TOQ87m9Gmj52uzqcqysd/lolI=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "397234705a9fa05464107c58286a8308be0c50c2", + "rev": "0d12957ebc8e272e3fc3830549edbb1ad63c34d4", "type": "github" }, "original": { @@ -996,11 +996,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1758691861, - "narHash": "sha256-CYgoGrY/Fx+hjzp8graTxJw1M7mn1f2jBkK26M04T0s=", + "lastModified": 1759395653, + "narHash": "sha256-sv9J1z6CrTPf9lRJLyCN90fZVdQz7LFeX7pIlInH8BQ=", "owner": "YaLTeR", "repo": "niri", - "rev": "e837e39623457dc5ad29c34a5ce4d4616e5fbf1e", + "rev": "ba6e5e082a79901dc89b0d49c5da1b769d652aec", "type": "github" }, "original": { @@ -1033,11 +1033,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1758851551, - "narHash": "sha256-7tKDTarLl/WSktFUDBRwLEOE0UV/OV0r3nEMzKXI8jY=", + "lastModified": 1759801625, + "narHash": "sha256-hf6YIe5E0RDTe76dJuJGWHdrJXOxOu07KeSo5K6XjqY=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "b08fc1a88b61430a48761e5e6d3e977886391a54", + "rev": "789f074c93425294989766a75fb0efe27f78a171", "type": "github" }, "original": { @@ -1076,11 +1076,11 @@ ] }, "locked": { - "lastModified": 1758427679, - "narHash": "sha256-xwjWRJTKDCjQ0iwfh7WhDhgcS0Wt3d1Yscg83mKBCn4=", + "lastModified": 1759637156, + "narHash": "sha256-8NI1SqntLfKl6Q0Luemc3aIboezSJElofUrqipF5g78=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "fd2569ca2ef7d69f244cd9ffcb66a0540772ff85", + "rev": "0ca69684091aa3a6b1fe994c4afeff305b15e915", "type": "github" }, "original": { @@ -1132,11 +1132,11 @@ ] }, "locked": { - "lastModified": 1758151193, - "narHash": "sha256-G2OEzk56papp9ff6xYgs75sTS11HhaH7/0LC+SNNxMI=", + "lastModified": 1759846470, + "narHash": "sha256-cFA87F149mDeogKjty5Kbk6Qy/RhMBr1fM3qEFbdTIg=", "owner": "nix-community", "repo": "nixos-cli", - "rev": "3e55bf23928fcaa0f426ec2cb3f509c62f7ca7e7", + "rev": "437b586743c3d06b0a72893097395b10e70a2b7b", "type": "github" }, "original": { @@ -1147,11 +1147,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1758663926, - "narHash": "sha256-6CFdj7Xs616t1W4jLDH7IohAAvl5Dyib3qEv/Uqw1rk=", + "lastModified": 1759582739, + "narHash": "sha256-spZegilADH0q5OngM86u6NmXxduCNv5eX9vCiUPhOYc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "170ff93c860b2a9868ed1e1102d4e52cb3d934e1", + "rev": "3441b5242af7577230a78ffb03542add264179ab", "type": "github" }, "original": { @@ -1222,11 +1222,11 @@ ] }, "locked": { - "lastModified": 1758504570, - "narHash": "sha256-Ip1FZU7t84E1vFVFUyIGiNyMD5MYjJWZegrDDL6duwA=", + "lastModified": 1759887103, + "narHash": "sha256-sMeJhqKF+twawGHCJ6aL/EVuJQ3V2xNvDFiA0p1Ih9w=", "owner": "nix-community", "repo": "nixpkgs-xr", - "rev": "cc5ab1f8e3edfbb7b8a0d41a86a7b38ccea933a0", + "rev": "c7452173516921921ca31b123920adf21e3526ad", "type": "github" }, "original": { @@ -1237,11 +1237,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1758815401, - "narHash": "sha256-Nj4iA2Msx0qfHPFDc0biubSsaChuZQlJrS3aNIaQ/T8=", + "lastModified": 1759147044, + "narHash": "sha256-3ZPFytJOcLjTChljeaGgoaNj+tOqzgEpqZAvRe3bU90=", "owner": "PedroHLC", "repo": "nixpkgs", - "rev": "0cc09391d851ec12e1dcbb8d105a75ab6344432b", + "rev": "18e83bbe13aa50992777832b52bd0e0d8585fb3b", "type": "github" }, "original": { @@ -1253,11 +1253,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1758262103, - "narHash": "sha256-aBGl3XEOsjWw6W3AHiKibN7FeoG73dutQQEqnd/etR8=", + "lastModified": 1759536663, + "narHash": "sha256-hhM8SUI6kQMei5TImFdNQy9EDT8g2hAD161DUtbfAy0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "12bd230118a1901a4a5d393f9f56b6ad7e571d01", + "rev": "27ac93958969b5f3dccd654b402599cf3de633ac", "type": "github" }, "original": { @@ -1330,11 +1330,11 @@ ] }, "locked": { - "lastModified": 1758905102, - "narHash": "sha256-AG0VmMkLMkFDC4SedMVTcPy3I+vXtSa1KoHXOmaT77A=", + "lastModified": 1759921619, + "narHash": "sha256-pPV5sLXlEAGwyyj51B5RCXhySYvKocf79I+ug1dKPXI=", "owner": "nix-community", "repo": "NUR", - "rev": "04411e57c6bb84f5c2250d9571d12d4bdd47c249", + "rev": "7100dfe6826fffc198a21b96244fa24bedd8ad97", "type": "github" }, "original": { @@ -1500,11 +1500,11 @@ ] }, "locked": { - "lastModified": 1758854041, - "narHash": "sha256-kZ+24pbf4FiHlYlcvts64BhpxpHkPKIQXBmx1OmBAIo=", + "lastModified": 1759890791, + "narHash": "sha256-KN1xkrQ4x6u8plgg43ZiYbQmESxeCKKOzALKjqbn4LM=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "02227ca8c229c968dbb5de95584cfb12b4313104", + "rev": "74fcbc183aa6685f86008606bb7824bf2f40adbd", "type": "github" }, "original": { @@ -1572,11 +1572,11 @@ ] }, "locked": { - "lastModified": 1758425756, - "narHash": "sha256-L3N8zV6wsViXiD8i3WFyrvjDdz76g3tXKEdZ4FkgQ+Y=", + "lastModified": 1759635238, + "narHash": "sha256-UvzKi02LMFP74csFfwLPAZ0mrE7k6EiYaKecplyX9Qk=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e0fdaea3c31646e252a60b42d0ed8eafdb289762", + "rev": "6e5a38e08a2c31ae687504196a230ae00ea95133", "type": "github" }, "original": { @@ -1588,11 +1588,11 @@ "spectrum": { "flake": false, "locked": { - "lastModified": 1754675037, - "narHash": "sha256-afS08F7lfMUBR4qrBxinN1kuxu+DoHQ5TPNVp9VS/OA=", + "lastModified": 1759482047, + "narHash": "sha256-H1wiXRQHxxPyMMlP39ce3ROKCwI5/tUn36P8x6dFiiQ=", "ref": "refs/heads/main", - "rev": "586577f3015397afacd83bc185454f4cc3c8028f", - "revCount": 955, + "rev": "c5d5786d3dc938af0b279c542d1e43bce381b4b9", + "revCount": 996, "type": "git", "url": "https://spectrum-os.org/git/spectrum" }, @@ -1611,11 +1611,11 @@ ] }, "locked": { - "lastModified": 1758584568, - "narHash": "sha256-FDxTheW6ynpbro/8eTZHhAY7J+HOf0jXeXq3jrJDcS8=", + "lastModified": 1759638324, + "narHash": "sha256-bj0L3n2UWE/DjqFjsydWsSzO74+dqUA4tiOX4At6LbM=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "9e9e48ca16628bf09a02bc5449d4b0761e15eebd", + "rev": "c39a58510e55c4970e57176ab14b722a978e5f01", "type": "github" }, "original": { @@ -1689,11 +1689,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1758905463, - "narHash": "sha256-8ANQ3MxULwolfkJEdUYlL5usISAxtysWctqqeSiJ/OE=", + "lastModified": 1759690047, + "narHash": "sha256-Vlpa0d1xOgPO9waHwxJNi6LcD2PYqB3EjwLRtSxXlHc=", "owner": "nix-community", "repo": "stylix", - "rev": "4aae0ebc2b0d37d4f90ace2c8bbadffadb2e2a97", + "rev": "09022804b2bcd217f3a41a644d26b23d30375d12", "type": "github" }, "original": { @@ -1768,11 +1768,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1754779259, - "narHash": "sha256-8KG2lXGaXLUE0F/JVwLQe7kOVm21IDfNEo0gfga5P4M=", + "lastModified": 1757716333, + "narHash": "sha256-d4km8W7w2zCUEmPAPUoLk1NlYrGODuVa3P7St+UrqkM=", "owner": "tinted-theming", "repo": "schemes", - "rev": "097d751b9e3c8b97ce158e7d141e5a292545b502", + "rev": "317a5e10c35825a6c905d912e480dfe8e71c7559", "type": "github" }, "original": { @@ -1784,11 +1784,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1754788770, - "narHash": "sha256-LAu5nBr7pM/jD9jwFc6/kyFY4h7Us4bZz7dvVvehuwo=", + "lastModified": 1757811970, + "narHash": "sha256-n5ZJgmzGZXOD9pZdAl1OnBu3PIqD+X3vEBUGbTi4JiI=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "fb2175accef8935f6955503ec9dd3c973eec385c", + "rev": "d217ba31c846006e9e0ae70775b0ee0f00aa6b1e", "type": "github" }, "original": { @@ -1800,11 +1800,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1755613540, - "narHash": "sha256-zBFrrTxHLDMDX/OYxkCwGGbAhPXLi8FrnLhYLsSOKeY=", + "lastModified": 1757811247, + "narHash": "sha256-4EFOUyLj85NRL3OacHoLGEo0wjiRJzfsXtR4CZWAn6w=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "937bada16cd3200bdbd3a2f5776fc3b686d5cba0", + "rev": "824fe0aacf82b3c26690d14e8d2cedd56e18404e", "type": "github" }, "original": { @@ -1877,11 +1877,11 @@ }, "locked": { "dir": "nix", - "lastModified": 1757426712, - "narHash": "sha256-z+jxV8FrUqmCS+aa3R38frr5dOVdA85P8SPIM7AkuMs=", + "lastModified": 1759658437, + "narHash": "sha256-tojIm0cI0QRic7PpQ4y0hvyF4wxoAh5QMmtZp26btVg=", "owner": "wez", "repo": "wezterm", - "rev": "bf9a2aeebacec19fd07b55234d626f006b22d369", + "rev": "db5d7437389eac5f63ad32e3b50d95b2b86065d1", "type": "github" }, "original": { @@ -1912,11 +1912,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1758577423, - "narHash": "sha256-sB2GAOjhjoWnjU6A/uHNJiY6O3UeztV5pJAN2g1FkXU=", + "lastModified": 1759707084, + "narHash": "sha256-0pkftKs6/LReNvxw7DVTN2AJEheZVgyeK0Aarbagi70=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "03368548ba745e17a85bd631613a59cb2d8469a4", + "rev": "a9188e70bd748118b4d56a529871b9de5adb9988", "type": "github" }, "original": { @@ -1933,11 +1933,11 @@ ] }, "locked": { - "lastModified": 1758860615, - "narHash": "sha256-ZNzHF498lMfv1N/tlfD/Oaanu+REnIhJdreo2rSzU1w=", + "lastModified": 1759900726, + "narHash": "sha256-DXgznNT8CA50WUIlQkI5BsEqNcbPDFF+26PPRYeB3sA=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "a5f59feaf757aecb12e2fa2490e8a7c1eed12173", + "rev": "8ce7d926dbec820ab5686d599bc6a1bd19ed1273", "type": "github" }, "original": { diff --git a/home/profiles/graphical/obsidian.nix b/home/profiles/graphical/obsidian.nix index afca9cf6..779a4f76 100644 --- a/home/profiles/graphical/obsidian.nix +++ b/home/profiles/graphical/obsidian.nix @@ -12,12 +12,6 @@ _: { livePreview = false; readableLineLength = true; }; - appearance = { - monospaceFontFamily = "Iosevka,Consolas"; - textFontFamily = "Ubuntu Sans"; - interfaceFontFamily = "Monaspace Krypton"; - baseFontSize = 16; - }; }; }; } diff --git a/nixos/profiles/gaming/wine.nix b/nixos/profiles/gaming/wine.nix index 65742970..3377ded7 100644 --- a/nixos/profiles/gaming/wine.nix +++ b/nixos/profiles/gaming/wine.nix @@ -2,17 +2,22 @@ pkgs, inputs, ... -}: { +}: let + environment = { + PROTON_CACHYOS = "${inputs.chaotic.packages.${pkgs.system}.proton-cachyos_x86_64_v3.out}/bin"; + PROTON_GE = "${inputs.chaotic.packages.${pkgs.system}.proton-ge-custom.out}/bin"; + #PROTON_WC3 = "/home/kat/.local/share/Steam/compatibilitytools.d/GE-Proton10-1"; + #PROTON_WC3 = "/home/kat/.local/share/Steam/compatibilitytools.d/Proton-Tkg-2367"; + #PROTON_WC3 = "/home/kat/.local/share/Steam/steamapps/common/Proton - Experimental"; + }; +in { systemd.user.services.gw = { description = "Guild Wars"; serviceConfig = { ExecStart = "${pkgs.katwine}/bin/katwine gw"; Type = "simple"; }; - environment = { - PROTON_CACHYOS = "${inputs.chaotic.packages.${pkgs.system}.proton-cachyos_x86_64_v3.out}/bin"; - PROTON_GE = "${inputs.chaotic.packages.${pkgs.system}.proton-ge-custom.out}/bin"; - }; + inherit environment; }; systemd.user.services.gw2 = { description = "Guild Wars 2"; @@ -20,10 +25,7 @@ ExecStart = "${pkgs.katwine}/bin/katwine gw2"; Type = "simple"; }; - environment = { - PROTON_CACHYOS = "${inputs.chaotic.packages.${pkgs.system}.proton-cachyos_x86_64_v3.out}/bin"; - PROTON_GE = "${inputs.chaotic.packages.${pkgs.system}.proton-ge-custom.out}/bin"; - }; + inherit environment; }; systemd.user.services.battlenet = { description = "Battle.net"; @@ -31,10 +33,7 @@ ExecStart = "${pkgs.katwine}/bin/katwine bnet"; Type = "simple"; }; - environment = { - PROTON_CACHYOS = "${inputs.chaotic.packages.${pkgs.system}.proton-cachyos_x86_64_v3.out}/bin"; - PROTON_GE = "${inputs.chaotic.packages.${pkgs.system}.proton-ge-custom.out}/bin"; - }; + inherit environment; }; systemd.user.services.sc = { description = "Starcraft"; @@ -42,10 +41,7 @@ ExecStart = "${pkgs.katwine}/bin/katwine sc"; Type = "simple"; }; - environment = { - PROTON_CACHYOS = "${inputs.chaotic.packages.${pkgs.system}.proton-cachyos_x86_64_v3.out}/bin"; - PROTON_GE = "${inputs.chaotic.packages.${pkgs.system}.proton-ge-custom.out}/bin"; - }; + inherit environment; }; systemd.user.services.sc2 = { description = "Starcraft 2"; @@ -53,10 +49,7 @@ ExecStart = "${pkgs.katwine}/bin/katwine sc2"; Type = "simple"; }; - environment = { - PROTON_CACHYOS = "${inputs.chaotic.packages.${pkgs.system}.proton-cachyos_x86_64_v3.out}/bin"; - PROTON_GE = "${inputs.chaotic.packages.${pkgs.system}.proton-ge-custom.out}/bin"; - }; + inherit environment; }; # https://lutris.net/games/install/25450/view # Dissection: @@ -68,13 +61,7 @@ ExecStart = "${pkgs.katwine}/bin/katwine wc3"; Type = "simple"; }; - environment = { - PROTON_CACHYOS = "${inputs.chaotic.packages.${pkgs.system}.proton-cachyos_x86_64_v3.out}/bin"; - PROTON_GE = "${inputs.chaotic.packages.${pkgs.system}.proton-ge-custom.out}/bin"; - #PROTON_WC3 = "/home/kat/.local/share/Steam/compatibilitytools.d/GE-Proton10-1"; - #PROTON_WC3 = "/home/kat/.local/share/Steam/compatibilitytools.d/Proton-Tkg-2367"; - #PROTON_WC3 = "/home/kat/.local/share/Steam/steamapps/common/Proton - Experimental"; - }; + inherit environment; }; systemd.user.services.kanon = { description = "Kanon";