From 9130316c24e3fb021c8c94e597403fe5ea3f925b Mon Sep 17 00:00:00 2001 From: Kat Inskip Date: Thu, 18 Sep 2025 05:12:14 -0700 Subject: [PATCH] feat: teheheheee --- common/nix.nix | 4 +- flake.lock | 294 +++++++++++++++----------- flake.nix | 7 +- home/profiles/graphical/packages.nix | 1 + meep.patch | 122 ----------- nixos/common/locale.nix | 2 +- nixos/profiles/gaming/bottles.nix | 8 - nixos/profiles/gaming/heroic.nix | 3 - nixos/profiles/gaming/wine.nix | 16 ++ nixos/profiles/graphical/kernel.nix | 2 +- nixos/profiles/graphical/packages.nix | 12 ++ overlays.nix | 2 + packages/katwine/default.nix | 17 ++ packages/katwine/script.sh | 32 +++ 14 files changed, 261 insertions(+), 261 deletions(-) delete mode 100644 meep.patch delete mode 100644 nixos/profiles/gaming/bottles.nix delete mode 100644 nixos/profiles/gaming/heroic.nix create mode 100644 nixos/profiles/gaming/wine.nix create mode 100644 packages/katwine/default.nix create mode 100755 packages/katwine/script.sh diff --git a/common/nix.nix b/common/nix.nix index b0c35948..b9bc933d 100644 --- a/common/nix.nix +++ b/common/nix.nix @@ -15,8 +15,8 @@ in { settings = { experimental-features = list.optional (versionAtLeast config.nix.package.version "2.4") "nix-command flakes"; - substituters = ["https://arc.cachix.org" "https://kittywitch.cachix.org" "https://nix-community.cachix.org"]; - trusted-public-keys = ["arc.cachix.org-1:DZmhclLkB6UO0rc0rBzNpwFbbaeLfyn+fYccuAy7YVY=" "kittywitch.cachix.org-1:KIzX/G5cuPw5WgrXad6UnrRZ8UDr7jhXzRTK/lmqyK0=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="]; + substituters = ["https://arc.cachix.org" "https://kittywitch.cachix.org" "https://nix-gaming.cachix.org" "https://nix-community.cachix.org"]; + trusted-public-keys = ["arc.cachix.org-1:DZmhclLkB6UO0rc0rBzNpwFbbaeLfyn+fYccuAy7YVY=" "kittywitch.cachix.org-1:KIzX/G5cuPw5WgrXad6UnrRZ8UDr7jhXzRTK/lmqyK0=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4="]; auto-optimise-store = true; trusted-users = ["root" "@wheel"]; }; diff --git a/flake.lock b/flake.lock index 4bb1a2d5..92c425d7 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1756437736, - "narHash": "sha256-ph2EiF6mVdl3LKqnMhGIEkbHzQQxMYfSHuIV0u6afYw=", + "lastModified": 1757028967, + "narHash": "sha256-a+2FuBo4l8rH+V1D/5nSq0JBg8Gm52sI+7TnToPkZSo=", "owner": "arcnmx", "repo": "nixexprs", - "rev": "aae2391ff35114a820999e1718f86e2a39607eb4", + "rev": "59eb541d6f1d26527d2cb6c3b4e5345d5f41f8c6", "type": "github" }, "original": { @@ -124,11 +124,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1746562888, - "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=", + "lastModified": 1755819240, + "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89", + "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6", "type": "github" }, "original": { @@ -150,11 +150,11 @@ ] }, "locked": { - "lastModified": 1756471819, - "narHash": "sha256-vKcFkgjcQaxja/B5Q9fk4xwn1AB0Fa1S/uUbnSvVAPM=", + "lastModified": 1757182941, + "narHash": "sha256-81TKa5U84gRc6krwhVOwb5gpgXgYxIeS1kkwOTw1GN4=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "a65b368d67e78606f89241259eca6b67eaf70f99", + "rev": "11bfa4c0dc07da1e7e49c5111cc9bfa1260ba98f", "type": "github" }, "original": { @@ -167,11 +167,11 @@ "ci": { "flake": false, "locked": { - "lastModified": 1752719221, - "narHash": "sha256-jUmXg9P/2dVGjrKxhVJ/3dzFJZ969QrfpHDPe+f6cLU=", + "lastModified": 1756937251, + "narHash": "sha256-VIqMPRwLI2eCJFi8f3CqUk7jrTJ2AcWlI9z4d/H9+Do=", "owner": "arcnmx", "repo": "ci", - "rev": "ada9995f7539a7d22d71b6f04227fd34a54d2ac0", + "rev": "6ea24db22eb6735ed616d69de6dc435fce60d322", "type": "github" }, "original": { @@ -223,11 +223,11 @@ ] }, "locked": { - "lastModified": 1755825449, - "narHash": "sha256-XkiN4NM9Xdy59h69Pc+Vg4PxkSm9EWl6u7k6D5FZ5cM=", + "lastModified": 1757130842, + "narHash": "sha256-4i7KKuXesSZGUv0cLPLfxbmF1S72Gf/3aSypgvVkwuA=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "8df64f819698c1fee0c2969696f54a843b2231e8", + "rev": "15f067638e2887c58c4b6ba1bdb65a0b61dc58c5", "type": "github" }, "original": { @@ -250,11 +250,11 @@ ] }, "locked": { - "lastModified": 1749105467, - "narHash": "sha256-hXh76y/wDl15almBcqvjryB50B0BaiXJKk20f314RoE=", + "lastModified": 1756719547, + "narHash": "sha256-N9gBKUmjwRKPxAafXEk1EGadfk2qDZPBQp4vXWPHINQ=", "owner": "serokell", "repo": "deploy-rs", - "rev": "6bc76b872374845ba9d645a2f012b764fecd765f", + "rev": "125ae9e3ecf62fb2c0fd4f2d894eb971f1ecaed2", "type": "github" }, "original": { @@ -304,11 +304,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1748383148, - "narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=", + "lastModified": 1756083905, + "narHash": "sha256-UqYGTBgI5ypGh0Kf6zZjom/vABg7HQocB4gmxzl12uo=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf", + "rev": "b655eaf16d4cbec9c3472f62eee285d4b419a808", "type": "github" }, "original": { @@ -355,11 +355,11 @@ ] }, "locked": { - "lastModified": 1754487366, - "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=", + "lastModified": 1756770412, + "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18", + "rev": "4524271976b625a4a605beefd893f270620fd751", "type": "github" }, "original": { @@ -617,11 +617,11 @@ ] }, "locked": { - "lastModified": 1756496801, - "narHash": "sha256-IYIsnPy+cJxe8RbDHBrCtfJY0ry2bG2H7WvMcewiGS8=", + "lastModified": 1757075491, + "narHash": "sha256-a+NMGl5tcvm+hyfSG2DlVPa8nZLpsumuRj1FfcKb2mQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "77a71380c38fb2a440b4b5881bbc839f6230e1cb", + "rev": "f56bf065f9abedc7bc15e1f2454aa5c8edabaacf", "type": "github" }, "original": { @@ -652,6 +652,23 @@ "type": "github" } }, + "ida-pro-overlay": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1758196882, + "narHash": "sha256-TbYNkdSo5j0d5ODWVoh6ZIziIKNGpLQckZWr0SeTwmQ=", + "path": "/home/kat/src/ida-pro-overlay", + "type": "path" + }, + "original": { + "path": "/home/kat/src/ida-pro-overlay", + "type": "path" + } + }, "infrastructure": { "inputs": { "arcexprs": [ @@ -699,11 +716,11 @@ ] }, "locked": { - "lastModified": 1744097560, - "narHash": "sha256-Z50unSprCnaUnkhYE20JwTBzStHleBAyoqHhbWvsbBk=", + "lastModified": 1757228245, + "narHash": "sha256-mJS5AlKjPOjh3cEqlCLtpt/8pQI6J6VruSAkQhAkIeY=", "owner": "gensokyo-zone", "repo": "infrastructure", - "rev": "678fee13614c684f0cd5a4bd675ce3eef0fd79ef", + "rev": "ad6da1d8d45bd9a48de66e1516449391579f2c6f", "type": "github" }, "original": { @@ -722,11 +739,11 @@ ] }, "locked": { - "lastModified": 1756201372, - "narHash": "sha256-bK5j5cwJgO5AZXlDl5AgISzpOv9YV1Fcv2nDr9RW/5o=", + "lastModified": 1757052778, + "narHash": "sha256-rYszJwY0EArAqK6q0i5bB1zxNCNRk6gVmD9SIvnoXW8=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "9f6745bd704ab7f2617d41c2b02f4fd5f9ed0e89", + "rev": "ceaa413a68f28bbf6731464594fdb2c3513e9110", "type": "github" }, "original": { @@ -856,11 +873,11 @@ "spectrum": "spectrum" }, "locked": { - "lastModified": 1755911232, - "narHash": "sha256-ujvJhZ175zzmsVVE75MQUkviS4FIJU1YjbnXfZ08W9c=", + "lastModified": 1756913421, + "narHash": "sha256-bApi+D4wQJe4tG03VySlb4lJOBWqpl8DK8niSfKT87U=", "owner": "microvm-nix", "repo": "microvm.nix", - "rev": "4fe0a520d929aa462e6d874573e601e7568f184c", + "rev": "2ba6697616834ff8c58ebc6180e4833c6d781b82", "type": "github" }, "original": { @@ -883,11 +900,11 @@ ] }, "locked": { - "lastModified": 1756432557, - "narHash": "sha256-kSrp0L5JFa94qG3rTZaYjLMhkifmeqmFz3rbRnvY9WY=", + "lastModified": 1757210363, + "narHash": "sha256-9HMbjEk+/BOsJorm6GWyDYUAnbmCOjiUormYNexjSZU=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "3bad7922c749fe4bc26c34452cd83f3818158855", + "rev": "a5aca63fe1d54a6b2ac4adf11a019d9d064ae98f", "type": "github" }, "original": { @@ -920,11 +937,11 @@ "neorg": { "flake": false, "locked": { - "lastModified": 1751646203, - "narHash": "sha256-uQSrXTngyRSWRyPN7v7uVQOHw+8rLm8+KXxls4nT2K4=", + "lastModified": 1757182962, + "narHash": "sha256-lVpk98h5q+yux4+TeNJHG11m1fb23337ynHqUbTC0dY=", "owner": "nvim-neorg", "repo": "neorg", - "rev": "790b0444c0c654131a722817dc893332e06c72b9", + "rev": "c429af26352fc5194b24a4aa88fc5ecc406e23f9", "type": "github" }, "original": { @@ -951,11 +968,11 @@ ] }, "locked": { - "lastModified": 1756430430, - "narHash": "sha256-+kJK5tCok/+3/SQkJJQaTFTlzdMMw/ztC+vG1FZjkd0=", + "lastModified": 1757189806, + "narHash": "sha256-fnng5M7emGytCFZ8+mh8MEnbBA/YpT9m5UlVywedvaM=", "owner": "nvim-neorg", "repo": "nixpkgs-neorg-overlay", - "rev": "8c9e1bead4ef207e8d5b14cd13acc5791dbb4b53", + "rev": "b90b37d343654a6c34c270f5f92805976b6cb956", "type": "github" }, "original": { @@ -987,11 +1004,11 @@ ] }, "locked": { - "lastModified": 1755960929, - "narHash": "sha256-28NHVSsYAp4vdSApAmbbdkG4bjhBODPDiyx/E4uMGpc=", + "lastModified": 1757153783, + "narHash": "sha256-HtnGRQX7BCze1eNlcc5ejAMExPk4DSqBPh6j2Byov7E=", "owner": "nix-community", "repo": "nh", - "rev": "6cd62b00023932effbf57f21879f4d2deae4b256", + "rev": "036c141e2f14fb481f12c4d1498bc5d03d9e1865", "type": "github" }, "original": { @@ -1014,11 +1031,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1756451209, - "narHash": "sha256-zrFKbXArvNjUKYYd1I48cnvlgB6cGA/mFoRvgp/wRHc=", + "lastModified": 1757215047, + "narHash": "sha256-WV0+7nvxnUDaLqDO3UpUQcpz7najlwMin7otgDnB+EI=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "cdfffe0b009582f5161dcd030a5549236287767b", + "rev": "298efb7f882c6e4496f6c770a8fe45dc68b5970c", "type": "github" }, "original": { @@ -1030,16 +1047,16 @@ "niri-stable": { "flake": false, "locked": { - "lastModified": 1748151941, - "narHash": "sha256-z4viQZLgC2bIJ3VrzQnR+q2F3gAOEQpU1H5xHtX/2fs=", + "lastModified": 1756556321, + "narHash": "sha256-RLD89dfjN0RVO86C/Mot0T7aduCygPGaYbog566F0Qo=", "owner": "YaLTeR", "repo": "niri", - "rev": "8ba57fcf25d2fc9565131684a839d58703f1dae7", + "rev": "01be0e65f4eb91a9cd624ac0b76aaeab765c7294", "type": "github" }, "original": { "owner": "YaLTeR", - "ref": "v25.05.1", + "ref": "v25.08", "repo": "niri", "type": "github" } @@ -1047,11 +1064,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1756448032, - "narHash": "sha256-ZIRj8dt8FmJdQeJjNvyK1RirYBmun+e/K3TMG8Qdodc=", + "lastModified": 1756926064, + "narHash": "sha256-5/1vyFRLvJWxhBgpPaV2orC0pjSgIny6JM6+joLyZok=", "owner": "YaLTeR", "repo": "niri", - "rev": "dfe463ed7dcf36cc706f5540c5d0804775b5c86b", + "rev": "c69464c1288789020d9a086f86c970a7dc49b8c7", "type": "github" }, "original": { @@ -1081,16 +1098,14 @@ "flake-parts": [ "flake-parts" ], - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1756432252, - "narHash": "sha256-jOBNNFSQg+PDT1TYzvyKjsy9OYkTmKhKFmqyIyXyA2U=", + "lastModified": 1757641478, + "narHash": "sha256-PZp0uvF6++tVln91cX8t0ZALMZHHoX++eeG7ysKgt1c=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "80cf8e61fa8d7760eb45da43beba7bf2aabe1395", + "rev": "5cba556b6c1a6fa4ea9c28d2e4cf946eff45ac07", "type": "github" }, "original": { @@ -1129,11 +1144,11 @@ ] }, "locked": { - "lastModified": 1756008611, - "narHash": "sha256-rfTBWuTXi9/X7GhtF562FKNXKh2kvKb6dwI5lV1SjPE=", + "lastModified": 1757218147, + "narHash": "sha256-IwOwN70HvoBNB2ckaROxcaCvj5NudNc52taPsv5wtLk=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "52dec1cb33a614accb9e01307e17816be974d24d", + "rev": "9b144dc3ef6e42b888c4190e02746aab13b0e97f", "type": "github" }, "original": { @@ -1144,11 +1159,11 @@ }, "nix-std": { "locked": { - "lastModified": 1701658249, - "narHash": "sha256-KIt1TUuBvldhaVRta010MI5FeQlB8WadjqljybjesN0=", + "lastModified": 1710870712, + "narHash": "sha256-e+7MJF2gsgTBuOWv4mCimSP0D9+naeFSw9a7N3yEmv4=", "owner": "chessai", "repo": "nix-std", - "rev": "715db541ffff4194620e48d210b76f73a74b5b5d", + "rev": "31bbc925750cc9d8f828fe55cee1a2bd985e0c00", "type": "github" }, "original": { @@ -1185,11 +1200,11 @@ ] }, "locked": { - "lastModified": 1755531224, - "narHash": "sha256-gy3E/WgenQbZUWH/DRgnDvAb//fr6iiG6PPnL7OFtZg=", + "lastModified": 1756766840, + "narHash": "sha256-02fYcmMTFNtoZz1vr1L29PcTGNzOi7TTBpa9R7Vt5KE=", "owner": "nix-community", "repo": "nixos-cli", - "rev": "f1d16001cb2f32d61cd49e527d111c43c457e629", + "rev": "d0e936af647599dafe2abea5054a9fa5136b5ad6", "type": "github" }, "original": { @@ -1200,11 +1215,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1756245047, - "narHash": "sha256-9bHzrVbjAudbO8q4vYFBWlEkDam31fsz0J7GB8k4AsI=", + "lastModified": 1757103352, + "narHash": "sha256-PtT7ix43ss8PONJ1VJw3f6t2yAoGH+q462Sn8lrmWmk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a65b650d6981e23edd1afa1f01eb942f19cdcbb7", + "rev": "11b2a10c7be726321bb854403fdeec391e798bf0", "type": "github" }, "original": { @@ -1215,11 +1230,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733205999, - "narHash": "sha256-ospvtfltUSDx1N/Sb2sx+ztyrag9urXZjUXUT/K3sl0=", + "lastModified": 1756487429, + "narHash": "sha256-dKmUp2Z5JS8exaYq4+2TnjzzLSyYMpCvCGaCxMAnD1I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fcc6fd8761d9979517225721b2d4b6e672ff4da3", + "rev": "84fddb6f4ccf28d904b0d82d1878c36f94c6b629", "type": "github" }, "original": { @@ -1269,16 +1284,17 @@ "nixpkgs": [ "nixpkgs" ], + "systems": "systems_2", "treefmt-nix": [ "treefmt-nix" ] }, "locked": { - "lastModified": 1756499981, - "narHash": "sha256-zN8ob0PGuQp9vkPrr7bLt6V0n5kajEjCKFwCJHmJq0Q=", + "lastModified": 1757121626, + "narHash": "sha256-hSv9cR2IYOUPGnOEim5+LdmlOaEwaETZPNDZCfyOcws=", "owner": "nix-community", "repo": "nixpkgs-xr", - "rev": "e90636270fd0aa5105c8bef398a43bc7f6230189", + "rev": "24d4fd0386d5b5e26807aa4996ab0f97903e5055", "type": "github" }, "original": { @@ -1289,11 +1305,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1756266583, - "narHash": "sha256-cr748nSmpfvnhqSXPiCfUPxRz2FJnvf/RjJGvFfaCsM=", - "owner": "NixOS", + "lastModified": 1756989294, + "narHash": "sha256-vh3F0p7pGvj9tItYjlqiZ3zTJCuw9+d74RhYCYLuaBQ=", + "owner": "PedroHLC", "repo": "nixpkgs", - "rev": "8a6d5427d99ec71c64f0b93d45778c889005d9c2", + "rev": "f04ea9d87566cfe950cf45d7311a9964dcf3bf38", "type": "github" }, "original": { @@ -1303,6 +1319,22 @@ "type": "github" } }, + "nixpkgs_3": { + "locked": { + "lastModified": 1756911493, + "narHash": "sha256-6n/n1GZQ/vi+LhFXMSyoseKdNfc2QQaSBXJdgamrbkE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c6a788f552b7b7af703b1a29802a7233c0067908", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "norg": { "inputs": { "flake-compat": [ @@ -1366,11 +1398,11 @@ ] }, "locked": { - "lastModified": 1756507985, - "narHash": "sha256-CkgOkYB/DPAZD4YHbpz64AgWA+unWiR06eGLDzhtYGo=", + "lastModified": 1757237279, + "narHash": "sha256-u0cJc2Thq0QF8fzTSy3617E83aAPsGKjnIKgaZBXW+I=", "owner": "nix-community", "repo": "NUR", - "rev": "ef21027c9847f69026ee1d83885dc416593422c8", + "rev": "4dcb0b2bddd4456fc10d7f29862a1f1b1fd304e9", "type": "github" }, "original": { @@ -1451,6 +1483,7 @@ "flakelib": "flakelib", "git-hooks": "git-hooks", "home-manager": "home-manager", + "ida-pro-overlay": "ida-pro-overlay", "infrastructure": "infrastructure", "konawall-py": "konawall-py", "lanzaboote": "lanzaboote", @@ -1485,7 +1518,7 @@ "spicetify-nix": "spicetify-nix", "std": "std", "stylix": "stylix", - "systems": "systems_2", + "systems": "systems_3", "tree": "tree", "treefmt-nix": "treefmt-nix", "wezterm": "wezterm", @@ -1499,11 +1532,11 @@ ] }, "locked": { - "lastModified": 1756075077, - "narHash": "sha256-2VamQFxS9T0+daQgz6qaUIxcR8kc66/JDRkmkFM/uuU=", + "lastModified": 1757209244, + "narHash": "sha256-MODh6R3NU8YSqAnvz/fSj/PS8CHneydI+zan0oLm7g4=", "owner": "arcnmx", "repo": "nixexprs-rust", - "rev": "f231b0016984ee50b132cd4bf592a065ed4b73fe", + "rev": "00d5d106b3e8253549fcb65b5c0d61362015973c", "type": "github" }, "original": { @@ -1536,11 +1569,11 @@ ] }, "locked": { - "lastModified": 1756434910, - "narHash": "sha256-5UJRyxZ8QCm+pgh5pNHXFJMmopMqHVraUhRA1g2AmA0=", + "lastModified": 1757212513, + "narHash": "sha256-ZTHwY7u8BQF1JUazhGk+ftCjsS57Ht6KSnnkxQoUBA8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "86e5140961c91a9ee1dde1c17d18a787d44ceef8", + "rev": "a8c2f9348abb14647d8a4899d1b3acd0155ce2cd", "type": "github" }, "original": { @@ -1647,11 +1680,11 @@ ] }, "locked": { - "lastModified": 1756009939, - "narHash": "sha256-lD4Zn37DWEx0X1DqM3npH68b7oh81H8BaaO3c6Ol/DQ=", + "lastModified": 1757219159, + "narHash": "sha256-bpiaovTLPeScpnOdqfgq3oy4B/sD2Wnb5EdQZZM2tCY=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "2bedaf52261ef2adbe71af70820aeb41dfe9a5ef", + "rev": "404130798716449bbd02e5f1b54272be55218644", "type": "github" }, "original": { @@ -1685,11 +1718,11 @@ "nix-std": "nix-std" }, "locked": { - "lastModified": 1706552916, - "narHash": "sha256-Dh7qUXNTjmvwMOikm8EAarcmxCCiLaXHAFEeWKsNsHk=", + "lastModified": 1755319302, + "narHash": "sha256-RlRbcRXRgvt/gCVb3FnhLzARRiFNNangaw2GMaXhKsQ=", "owner": "flakelib", "repo": "std", - "rev": "c5cffcaff4b82b353462cf49c1ae950b7c87bf78", + "rev": "53aa63f4aaac4a4939ae132ee17f42a10a02dad0", "type": "github" }, "original": { @@ -1725,11 +1758,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1755997543, - "narHash": "sha256-/fejmCQ7AWa655YxyPxRDbhdU7c5+wYsFSjmEMXoBCM=", + "lastModified": 1757172691, + "narHash": "sha256-VOn/s24rb+iO6auhmGfT5kyr0ixRK6weBsNCKkGo2yY=", "owner": "nix-community", "repo": "stylix", - "rev": "f47c0edcf71e802378b1b7725fa57bb44fe85ee8", + "rev": "9991299fe9aad330fb6b96bb58def37033271177", "type": "github" }, "original": { @@ -1754,6 +1787,21 @@ } }, "systems_2": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_3": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1804,11 +1852,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1750770351, - "narHash": "sha256-LI+BnRoFNRa2ffbe3dcuIRYAUcGklBx0+EcFxlHj0SY=", + "lastModified": 1754779259, + "narHash": "sha256-8KG2lXGaXLUE0F/JVwLQe7kOVm21IDfNEo0gfga5P4M=", "owner": "tinted-theming", "repo": "schemes", - "rev": "5a775c6ffd6e6125947b393872cde95867d85a2a", + "rev": "097d751b9e3c8b97ce158e7d141e5a292545b502", "type": "github" }, "original": { @@ -1820,11 +1868,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1751159871, - "narHash": "sha256-UOHBN1fgHIEzvPmdNMHaDvdRMgLmEJh2hNmDrp3d3LE=", + "lastModified": 1754788770, + "narHash": "sha256-LAu5nBr7pM/jD9jwFc6/kyFY4h7Us4bZz7dvVvehuwo=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "bded5e24407cec9d01bd47a317d15b9223a1546c", + "rev": "fb2175accef8935f6955503ec9dd3c973eec385c", "type": "github" }, "original": { @@ -1836,11 +1884,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1751158968, - "narHash": "sha256-ksOyv7D3SRRtebpXxgpG4TK8gZSKFc4TIZpR+C98jX8=", + "lastModified": 1755613540, + "narHash": "sha256-zBFrrTxHLDMDX/OYxkCwGGbAhPXLi8FrnLhYLsSOKeY=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "86a470d94204f7652b906ab0d378e4231a5b3384", + "rev": "937bada16cd3200bdbd3a2f5776fc3b686d5cba0", "type": "github" }, "original": { @@ -1882,11 +1930,11 @@ ] }, "locked": { - "lastModified": 1755934250, - "narHash": "sha256-CsDojnMgYsfshQw3t4zjRUkmMmUdZGthl16bXVWgRYU=", + "lastModified": 1756662192, + "narHash": "sha256-F1oFfV51AE259I85av+MAia221XwMHCOtZCMcZLK2Jk=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "74e1a52d5bd9430312f8d1b8b0354c92c17453e5", + "rev": "1aabc6c05ccbcbf4a635fb7a90400e44282f61c4", "type": "github" }, "original": { @@ -1948,11 +1996,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1756260173, - "narHash": "sha256-wcf04fl5ncbOqAK7OCWIgILERIbMfL/eeM3UThqgErI=", + "lastModified": 1757179758, + "narHash": "sha256-TIvyWzRt1miQj6Cf5Wy8Qz43XIZX7c4vTVwRLAT5S4Y=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "af33f7eb124b51ff6d9cdf9b428643e2246c8cbb", + "rev": "970728d0d9d1eada342bb8860af214b601139e58", "type": "github" }, "original": { @@ -1969,11 +2017,11 @@ ] }, "locked": { - "lastModified": 1756455934, - "narHash": "sha256-Mf9G8l2GcMpBBxnR7DXnBzlyI8aaxWR02FTyddybiys=", + "lastModified": 1757218898, + "narHash": "sha256-mB3z1ssPry/wHgLd8gFOaltwQ9kIRTqrzikkcnxG720=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "de77ec882dce3dd60e9e5431d375e64fd58bdc74", + "rev": "2255b29eece0757827b9911ef685c963996542b6", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 8045d718..f16abce5 100644 --- a/flake.nix +++ b/flake.nix @@ -76,10 +76,15 @@ nix-std = { url = "github:chessai/nix-std"; }; + ida-pro-overlay = { + #url = "github:msanft/ida-pro-overlay"; + url = "path:/home/kat/src/ida-pro-overlay"; + inputs.nixpkgs.follows = "nixpkgs"; + }; nix-gaming = { url = "github:fufexan/nix-gaming"; inputs = { - nixpkgs.follows = "nixpkgs"; + #nixpkgs.follows = "nixpkgs"; flake-parts.follows = "flake-parts"; }; }; diff --git a/home/profiles/graphical/packages.nix b/home/profiles/graphical/packages.nix index a119153c..a52e45a6 100644 --- a/home/profiles/graphical/packages.nix +++ b/home/profiles/graphical/packages.nix @@ -1,5 +1,6 @@ {pkgs, ...}: { home.packages = with pkgs; [ + anki # Password manager bitwarden diff --git a/meep.patch b/meep.patch deleted file mode 100644 index 45f35ce7..00000000 --- a/meep.patch +++ /dev/null @@ -1,122 +0,0 @@ -diff --git a/flake.lock b/flake.lock -index b7b8e97c..200d0fbd 100644 ---- a/flake.lock -+++ b/flake.lock -@@ -931,9 +931,7 @@ - }, - "niri": { - "inputs": { -- "niri-stable": [ -- "empty" -- ], -+ "niri-stable": "niri-stable", - "niri-unstable": "niri-unstable", - "nixpkgs": [ - "nixpkgs" -@@ -941,9 +939,7 @@ - "nixpkgs-stable": [ - "nixpkgs" - ], -- "xwayland-satellite-stable": [ -- "empty" -- ], -+ "xwayland-satellite-stable": "xwayland-satellite-stable", - "xwayland-satellite-unstable": "xwayland-satellite-unstable" - }, - "locked": { -@@ -960,6 +956,23 @@ - "type": "github" - } - }, -+ "niri-stable": { -+ "flake": false, -+ "locked": { -+ "lastModified": 1748151941, -+ "narHash": "sha256-z4viQZLgC2bIJ3VrzQnR+q2F3gAOEQpU1H5xHtX/2fs=", -+ "owner": "YaLTeR", -+ "repo": "niri", -+ "rev": "8ba57fcf25d2fc9565131684a839d58703f1dae7", -+ "type": "github" -+ }, -+ "original": { -+ "owner": "YaLTeR", -+ "ref": "v25.05.1", -+ "repo": "niri", -+ "type": "github" -+ } -+ }, - "niri-unstable": { - "flake": false, - "locked": { -@@ -1854,6 +1867,23 @@ - "type": "github" - } - }, -+ "xwayland-satellite-stable": { -+ "flake": false, -+ "locked": { -+ "lastModified": 1748488455, -+ "narHash": "sha256-IiLr1alzKFIy5tGGpDlabQbe6LV1c9ABvkH6T5WmyRI=", -+ "owner": "Supreeeme", -+ "repo": "xwayland-satellite", -+ "rev": "3ba30b149f9eb2bbf42cf4758d2158ca8cceef73", -+ "type": "github" -+ }, -+ "original": { -+ "owner": "Supreeeme", -+ "ref": "v0.6", -+ "repo": "xwayland-satellite", -+ "type": "github" -+ } -+ }, - "xwayland-satellite-unstable": { - "flake": false, - "locked": { -diff --git a/nixos/profiles/gaming/lutris.nix b/nixos/profiles/gaming/lutris.nix -index 6176dd69..4d6ea927 100644 ---- a/nixos/profiles/gaming/lutris.nix -+++ b/nixos/profiles/gaming/lutris.nix -@@ -11,6 +11,7 @@ - }; - environment.systemPackages = with pkgs; [ - protonplus -+ gamescope-wsi - (lutris.override { - extraPkgs = pkgs: [ - #pkgs.gamescope -diff --git a/systems/goliath.nix b/systems/goliath.nix -index 0f50296f..b77690de 100644 ---- a/systems/goliath.nix -+++ b/systems/goliath.nix -@@ -97,7 +97,7 @@ _: let - "-model_sheet" - ]; - }; -- programs.waybar.settings.main = { -+ waybar.settings.main = { - modules-center = [ - "custom/nvidia-vram" - ]; -@@ -105,7 +105,7 @@ _: let - tooltip = false; - format = "nvidia {}"; - interval = 1; -- exec = "${getExe' pkgs.nvidia-smi "nvidia-smi"} --query-gpu=memory.used,memory.total,pstate --format=csv,noheader,nounits"; -+ exec = "${getExe' config.hardware.nvidia.package "nvidia-smi"} --query-gpu=memory.used,memory.total,pstate --format=csv,noheader,nounits"; - return-type = ""; - }; - }; -@@ -114,6 +114,13 @@ _: let - "LG Electronics LG Ultra HD 0x0001AC91" = { - scale = 1.0; - }; -+ "PNP(XXX) Beyond TV 0x00010000" = { -+ mode = { -+ width = 2560; -+ height = 1440; -+ refresh = 119.998; -+ }; -+ }; - }; - environment = { - NVD_BACKEND = "direct"; diff --git a/nixos/common/locale.nix b/nixos/common/locale.nix index a1e8cc72..c6dd239c 100644 --- a/nixos/common/locale.nix +++ b/nixos/common/locale.nix @@ -8,7 +8,7 @@ "en_CA.UTF-8/UTF-8" "en_GB.UTF-8/UTF-8" "en_US.UTF-8/UTF-8" - "en_DK.UTF-8/UTF-8" + "ja_JP.UTF-8/UTF-8" ]; }; console = { diff --git a/nixos/profiles/gaming/bottles.nix b/nixos/profiles/gaming/bottles.nix deleted file mode 100644 index 260e29bc..00000000 --- a/nixos/profiles/gaming/bottles.nix +++ /dev/null @@ -1,8 +0,0 @@ -_: { - services.flatpak.packages = [ - { - appId = "com.usebottles.bottles"; - origin = "flathub"; - } - ]; -} diff --git a/nixos/profiles/gaming/heroic.nix b/nixos/profiles/gaming/heroic.nix deleted file mode 100644 index f46dadb3..00000000 --- a/nixos/profiles/gaming/heroic.nix +++ /dev/null @@ -1,3 +0,0 @@ -{pkgs, ...}: { - environment.systemPackages = [pkgs.heroic]; -} diff --git a/nixos/profiles/gaming/wine.nix b/nixos/profiles/gaming/wine.nix new file mode 100644 index 00000000..50daac40 --- /dev/null +++ b/nixos/profiles/gaming/wine.nix @@ -0,0 +1,16 @@ +{pkgs, ...}: { + systemd.user.services.kanon = { + description = "Kanon"; + serviceConfig = { + ExecStart = "${pkgs.katwine}/bin/katwine kanon"; + Type = "forking"; + }; + }; + systemd.user.services.hanahira = { + description = "Hanahira"; + serviceConfig = { + ExecStart = "${pkgs.katwine}/bin/katwine hanahira"; + Type = "forking"; + }; + }; +} diff --git a/nixos/profiles/graphical/kernel.nix b/nixos/profiles/graphical/kernel.nix index 1d07b03e..93316c63 100644 --- a/nixos/profiles/graphical/kernel.nix +++ b/nixos/profiles/graphical/kernel.nix @@ -1,4 +1,4 @@ {pkgs, ...}: { boot.zfs.package = pkgs.zfs_cachyos; - boot.kernelPackages = pkgs.linuxPackages_cachyos; + boot.kernelPackages = pkgs.linuxPackages_cachyos-lto; } diff --git a/nixos/profiles/graphical/packages.nix b/nixos/profiles/graphical/packages.nix index 4a2be8ca..8ca70f42 100644 --- a/nixos/profiles/graphical/packages.nix +++ b/nixos/profiles/graphical/packages.nix @@ -3,6 +3,18 @@ jmtpfs dnsutils usbutils + (callPackage ida-pro { + runfile = pkgs.requireFile { + name = "ida-pro_92_x64linux.run"; + message = "Don't copy that floppy~!"; + hash = "sha256-qt0PiulyuE+U8ql0g0q/FhnzvZM7O02CdfnFAAjQWuE="; + }; + normalScript = pkgs.requireFile { + name = "ida-normalScript.py"; + message = "Floppy; copied."; + hash = "sha256-8UWf1RKsRNWJ8CC6ceDeIOv4eY3ybxZ9tv5MCHx80NY="; + }; + }) ]; services.udev.packages = [ pkgs.android-udev-rules diff --git a/overlays.nix b/overlays.nix index b7c08da4..5d512805 100644 --- a/overlays.nix +++ b/overlays.nix @@ -8,6 +8,8 @@ inputs.darwin.overlays.default inputs.deploy-rs.overlays.default inputs.neorg-overlay.overlays.default + inputs.nix-gaming.overlays.default + inputs.ida-pro-overlay.overlays.default inputs.niri.overlays.niri (import tree.packages.default {inherit inputs tree;}) (_final: prev: { diff --git a/packages/katwine/default.nix b/packages/katwine/default.nix new file mode 100644 index 00000000..efe00d91 --- /dev/null +++ b/packages/katwine/default.nix @@ -0,0 +1,17 @@ +{ + lib, + writeShellScriptBin, + coreutils, + wine-tkg-ntsync, + wine-discord-ipc-bridge, +}: let + inherit (lib) makeBinPath; +in + writeShellScriptBin "katwine" '' + export PATH="$PATH:${lib.makeBinPath [ + coreutils + wine-tkg-ntsync + ]}" + export DISCORDINTEGRATION="${wine-discord-ipc-bridge}"; + exec ${./script.sh} "$@" + '' diff --git a/packages/katwine/script.sh b/packages/katwine/script.sh new file mode 100755 index 00000000..5620d2af --- /dev/null +++ b/packages/katwine/script.sh @@ -0,0 +1,32 @@ +#!/usr/bin/env bash +set -eoux pipefail +WINEARCH="win64" +GAME="$1" + +runner() { + env TZ="$TZ_JP" LC_ALL="$LC_JP" WINEARCH="$WINEARCH" WINEPREFIX="$WINEPREFIX" wine "$@" +} + +vn() { + WINEPREFIX="/home/kat/Games/VNs" + cd "$WINEPREFIX" + LC_JP="ja_JP.UTF-8" + TZ_JP="Asia/Tokyo" + runner "./drive_c/cmd.exe" /k "C:/script.bat" "$@" +} + +main() { + if [[ "$GAME" == "kanon" ]]; then + VN_DIR="C:/KEY/KANON_SE_ALL" + VN_EXE="./REALLIVE.exe" + VN_ARCH="x86" + vn "$VN_DIR" "$VN_EXE" "$VN_ARCH" + elif [[ "$GAME" == "hanahira" ]]; then + VN_DIR="C:/hanahira" + VN_EXE="./HANA9.exe" + VN_ARCH="x86" + vn "$VN_DIR" "$VN_EXE" "$VN_ARCH" + fi +} + +main