authorgravatar for nmarks413@gmail.comNatalie Marks <nmarks413@gmail.com> 2025-10-17 14:26:24-07:00
committergravatar for nmarks413@gmail.comNatalie Marks <nmarks413@gmail.com> 2025-10-17 14:26:24-07:00
log091bca5c8f57bbdb3031ef1d5d748ea9331d3677
tree919a258bec0ea36762b750991071496dedb40b75
parent6685dd8e70c72853ef29acb217082ade33ab5ae0
signature Commit is signed but in an unrecognized format.

idk i had working changes

8 files changed, 108 insertions(+), 94 deletions(-)

flake.lock+56-90
......@@ -9,11 +9,11 @@
99 ]
1010 },
1111 "locked": {
12 "lastModified": 1755807717,
13 "narHash": "sha256-x/IcOa+p9VFYlwXmuNhbZ8ce9As24rqy6uABv+tKacU=",
12 "lastModified": 1759090813,
13 "narHash": "sha256-JSJmTtQdxhgcGYtY9VNxX3LyzW3rFs3v+4/V9i/OHmI=",
1414 "owner": "tadfisher",
1515 "repo": "android-nixpkgs",
16 "rev": "4316f29f7f3b34c41f2639ae190022fbed60b850",
16 "rev": "48b8763cc3d2a89c39539da72cc248f1f2450855",
1717 "type": "github"
1818 },
1919 "original": {
......@@ -38,11 +38,11 @@
3838 "sf-pro": "sf-pro"
3939 },
4040 "locked": {
41 "lastModified": 1752383772,
42 "narHash": "sha256-I5Y0gUJS85lGEuuKr+tKSRUpJWeKavE+WmiAHRcyBaU=",
41 "lastModified": 1758228441,
42 "narHash": "sha256-3mA9oFuhJ1EHyhPd17g/EuJi4jDYPGhyxkEitdh3Kmc=",
4343 "owner": "Lyndeno",
4444 "repo": "apple-fonts.nix",
45 "rev": "875c694d7f0ec2020d7511264907a1f0e3262931",
45 "rev": "aba9944f6606a69ebedf7bfb723316139eec3f72",
4646 "type": "github"
4747 },
4848 "original": {
......@@ -58,11 +58,11 @@
5858 ]
5959 },
6060 "locked": {
61 "lastModified": 1755825449,
62 "narHash": "sha256-XkiN4NM9Xdy59h69Pc+Vg4PxkSm9EWl6u7k6D5FZ5cM=",
61 "lastModified": 1758805352,
62 "narHash": "sha256-BHdc43Lkayd+72W/NXRKHzX5AZ+28F3xaUs3a88/Uew=",
6363 "owner": "lnl7",
6464 "repo": "nix-darwin",
65 "rev": "8df64f819698c1fee0c2969696f54a843b2231e8",
65 "rev": "c48e963a5558eb1c3827d59d21c5193622a1477c",
6666 "type": "github"
6767 },
6868 "original": {
......@@ -149,11 +149,11 @@
149149 ]
150150 },
151151 "locked": {
152 "lastModified": 1754487366,
153 "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=",
152 "lastModified": 1756770412,
153 "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=",
154154 "owner": "hercules-ci",
155155 "repo": "flake-parts",
156 "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18",
156 "rev": "4524271976b625a4a605beefd893f270620fd751",
157157 "type": "github"
158158 },
159159 "original": {
......@@ -184,24 +184,6 @@
184184 "inputs": {
185185 "systems": "systems_2"
186186 },
187 "locked": {
188 "lastModified": 1701680307,
189 "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
190 "owner": "numtide",
191 "repo": "flake-utils",
192 "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
193 "type": "github"
194 },
195 "original": {
196 "owner": "numtide",
197 "repo": "flake-utils",
198 "type": "github"
199 }
200 },
201 "flake-utils_3": {
202 "inputs": {
203 "systems": "systems_3"
204 },
205187 "locked": {
206188 "lastModified": 1731533236,
207189 "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
......@@ -216,9 +198,9 @@
216198 "type": "github"
217199 }
218200 },
219 "flake-utils_4": {
201 "flake-utils_3": {
220202 "inputs": {
221 "systems": "systems_5"
203 "systems": "systems_4"
222204 },
223205 "locked": {
224206 "lastModified": 1705309234,
......@@ -234,9 +216,9 @@
234216 "type": "github"
235217 }
236218 },
237 "flake-utils_5": {
219 "flake-utils_4": {
238220 "inputs": {
239 "systems": "systems_6"
221 "systems": "systems_5"
240222 },
241223 "locked": {
242224 "lastModified": 1710146030,
......@@ -252,9 +234,9 @@
252234 "type": "github"
253235 }
254236 },
255 "flake-utils_6": {
237 "flake-utils_5": {
256238 "inputs": {
257 "systems": "systems_7"
239 "systems": "systems_6"
258240 },
259241 "locked": {
260242 "lastModified": 1705309234,
......@@ -314,11 +296,11 @@
314296 ]
315297 },
316298 "locked": {
317 "lastModified": 1755810213,
318 "narHash": "sha256-QdenO8f0PTg+tC6HuSvngKcbRZA5oZKmjUT+MXKOLQg=",
299 "lastModified": 1759088654,
300 "narHash": "sha256-31Xc5bIeqqOJA0Kuk9s7TAMakuyggGHBluP3LqedQiE=",
319301 "owner": "nix-community",
320302 "repo": "home-manager",
321 "rev": "6911d3e7f475f7b3558b4f5a6aba90fa86099baa",
303 "rev": "a97df40c1966cc46b5f6817ac8d8e240da03de96",
322304 "type": "github"
323305 },
324306 "original": {
......@@ -342,11 +324,11 @@
342324 },
343325 "mnw": {
344326 "locked": {
345 "lastModified": 1748710831,
346 "narHash": "sha256-eZu2yH3Y2eA9DD3naKWy/sTxYS5rPK2hO7vj8tvUCSU=",
327 "lastModified": 1756659871,
328 "narHash": "sha256-v6Rh4aQ6RKjM2N02kK9Usn0Ix7+OY66vNpeklc1MnGE=",
347329 "owner": "Gerg-L",
348330 "repo": "mnw",
349 "rev": "cff958a4e050f8d917a6ff3a5624bc4681c6187d",
331 "rev": "ed6cc3e48557ba18266e598a5ebb6602499ada16",
350332 "type": "github"
351333 },
352334 "original": {
......@@ -357,17 +339,16 @@
357339 },
358340 "moonlight": {
359341 "inputs": {
360 "flake-utils": "flake-utils_2",
361342 "nixpkgs": [
362343 "nixpkgs"
363344 ]
364345 },
365346 "locked": {
366 "lastModified": 1754439168,
367 "narHash": "sha256-NcwRidwb/ask65LE86os4RkhyoPQo5sLu0sJs/NboK4=",
347 "lastModified": 1757448266,
348 "narHash": "sha256-aLjHKVWkb9XHyoMmDBxLG2Ycg4CJFeieLdEg3CWeIwk=",
368349 "owner": "moonlight-mod",
369350 "repo": "moonlight",
370 "rev": "66b81b113afd6654a88c9adb7edb7fe92839fe84",
351 "rev": "83debd7870e77e21694c9a76e3975baf842e435e",
371352 "type": "github"
372353 },
373354 "original": {
......@@ -383,11 +364,11 @@
383364 ]
384365 },
385366 "locked": {
386 "lastModified": 1755404379,
387 "narHash": "sha256-Q6ZxZDBmD/B988Jjbx7/NchxOKIpOKBBrx9Yb0zMzpQ=",
367 "lastModified": 1759032422,
368 "narHash": "sha256-WZf+FhebP2/1pK2np5xj/NuDjD6fXK2BHnq/tPUN18o=",
388369 "owner": "nix-community",
389370 "repo": "nix-index-database",
390 "rev": "ebbc1c05f786ae39bb5e04e57bf2c10c44a649e3",
371 "rev": "ec7a78cb0e098832d8acac091a4df393259c4839",
391372 "type": "github"
392373 },
393374 "original": {
......@@ -398,16 +379,16 @@
398379 },
399380 "nix-options-search": {
400381 "inputs": {
401 "flake-utils": "flake-utils_3",
382 "flake-utils": "flake-utils_2",
402383 "gitignore": "gitignore",
403384 "nixpkgs": "nixpkgs"
404385 },
405386 "locked": {
406 "lastModified": 1743876182,
407 "narHash": "sha256-qfiVewr5huupheLqStX60JSbjBEm9/PDncLQXE0dsXo=",
387 "lastModified": 1756245499,
388 "narHash": "sha256-clSqrE7JPhjGvnPqxLjN8AeadXQUFIGyakQyAywc1BY=",
408389 "owner": "madsbv",
409390 "repo": "nix-options-search",
410 "rev": "f52dc6986161570a2ffffdf337c88b503e9a58fb",
391 "rev": "37cb7d89d8965b53db71b3548c3224612b22c1a1",
411392 "type": "github"
412393 },
413394 "original": {
......@@ -434,16 +415,16 @@
434415 },
435416 "nixpkgs_2": {
436417 "locked": {
437 "lastModified": 1755615617,
438 "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=",
418 "lastModified": 1759036355,
419 "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=",
439420 "owner": "NixOS",
440421 "repo": "nixpkgs",
441 "rev": "20075955deac2583bb12f07151c2df830ef346b4",
422 "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127",
442423 "type": "github"
443424 },
444425 "original": {
445426 "id": "nixpkgs",
446 "ref": "nixos-unstable",
427 "ref": "nixpkgs-unstable",
447428 "type": "indirect"
448429 }
449430 },
......@@ -487,14 +468,14 @@
487468 "nixpkgs": [
488469 "nixpkgs"
489470 ],
490 "systems": "systems_4"
471 "systems": "systems_3"
491472 },
492473 "locked": {
493 "lastModified": 1755843058,
494 "narHash": "sha256-oAajTGcyTzuND7AAlaRXO+wF7ytAMOnrE4sYUjRonB8=",
474 "lastModified": 1758966217,
475 "narHash": "sha256-/XLi0+w/3ZbByofmRxTWlimBZbIjur3B56iYONffcv0=",
495476 "owner": "notashelf",
496477 "repo": "nvf",
497 "rev": "d36996c8ba5c8d68b5def1b660e06d281ef0a3a8",
478 "rev": "8e9186e4b88a6f87083b45e1cbea0833facec914",
498479 "type": "github"
499480 },
500481 "original": {
......@@ -540,11 +521,11 @@
540521 ]
541522 },
542523 "locked": {
543 "lastModified": 1755830208,
544 "narHash": "sha256-fMa/Hcg+4O2h+kl3gNPjtGSWPI8NtCl3LYMsejK6qGA=",
524 "lastModified": 1759027024,
525 "narHash": "sha256-LTgfljA/X8aGEXk/EUVoLL+0wfJjQAhF/rUQOFsx+/U=",
545526 "owner": "oxalica",
546527 "repo": "rust-overlay",
547 "rev": "802a7b97f8ff672ba2dec70c9e354f51f844e796",
528 "rev": "971d18658c83f3a6a434ac647798141fddce3175",
548529 "type": "github"
549530 },
550531 "original": {
......@@ -580,7 +561,7 @@
580561 "sf-compact": {
581562 "flake": false,
582563 "locked": {
583 "narHash": "sha256-VMCf2Mhmx/qhLRQxlTAsQWxtonS27kPW+oTYBBRWHMg=",
564 "narHash": "sha256-WeqT80cdK/XzTLSaJs5DHodzxoeAzwL/xTgdq0YwQbM=",
584565 "type": "file",
585566 "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Compact.dmg"
586567 },
......@@ -628,7 +609,7 @@
628609 "sf-pro": {
629610 "flake": false,
630611 "locked": {
631 "narHash": "sha256-RX6X2ltVE88Hp1g9tpSywMT3UfdLpRxgw92KRpiAues=",
612 "narHash": "sha256-vprahHpCUf9O8RualBrEuLEfuLfzI/2d8AQmwlCGPPk=",
632613 "type": "file",
633614 "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg"
634615 },
......@@ -727,21 +708,6 @@
727708 "type": "github"
728709 }
729710 },
730 "systems_7": {
731 "locked": {
732 "lastModified": 1681028828,
733 "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
734 "owner": "nix-systems",
735 "repo": "default",
736 "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
737 "type": "github"
738 },
739 "original": {
740 "owner": "nix-systems",
741 "repo": "default",
742 "type": "github"
743 }
744 },
745711 "zen-browser": {
746712 "inputs": {
747713 "nixpkgs": [
......@@ -749,11 +715,11 @@
749715 ]
750716 },
751717 "locked": {
752 "lastModified": 1754886070,
753 "narHash": "sha256-MZDmxOkVKL1HY72bliN8Gxh0SYkHUa3W/1fTU2ke36I=",
718 "lastModified": 1758859571,
719 "narHash": "sha256-/DPe2RNgIzTBHm1tLUF31YswssT7Uz+HJI6VIkmHN6w=",
754720 "owner": "youwen5",
755721 "repo": "zen-browser-flake",
756 "rev": "e37d2b326311320c8571111b3ef89b29d26d4b64",
722 "rev": "58e5a7b019aa1584ca46e909b011c1f6a91081f0",
757723 "type": "github"
758724 },
759725 "original": {
......@@ -765,15 +731,15 @@
765731 "zig": {
766732 "inputs": {
767733 "flake-compat": "flake-compat_2",
768 "flake-utils": "flake-utils_4",
734 "flake-utils": "flake-utils_3",
769735 "nixpkgs": "nixpkgs_3"
770736 },
771737 "locked": {
772 "lastModified": 1755605615,
773 "narHash": "sha256-J0Cxren2QLeI0ZvRZw4XGcMm4q3uPIZHM+eJnaZfXX8=",
738 "lastModified": 1759019783,
739 "narHash": "sha256-YMpnPm2HlGWo5bmgkhKGrdV+ZzPpbXX5+dmuQd8Ebn0=",
774740 "owner": "mitchellh",
775741 "repo": "zig-overlay",
776 "rev": "714fae26049a263ff2e4641ce7c973f371f4b005",
742 "rev": "ddda205a5f3188662118ee9a9f9bbf9e385f6681",
777743 "type": "github"
778744 },
779745 "original": {
......@@ -785,7 +751,7 @@
785751 "zig-overlay": {
786752 "inputs": {
787753 "flake-compat": "flake-compat_3",
788 "flake-utils": "flake-utils_6",
754 "flake-utils": "flake-utils_5",
789755 "nixpkgs": [
790756 "zls",
791757 "nixpkgs"
......@@ -807,7 +773,7 @@
807773 },
808774 "zls": {
809775 "inputs": {
810 "flake-utils": "flake-utils_5",
776 "flake-utils": "flake-utils_4",
811777 "gitignore": "gitignore_2",
812778 "langref": "langref",
813779 "nixpkgs": "nixpkgs_4",
flake.nix+2-1
......@@ -1,7 +1,7 @@
11{
22 description = "multi device configuration flake";
33 inputs = {
4 nixpkgs.url = "nixpkgs/nixos-unstable";
4 nixpkgs.url = "nixpkgs/nixpkgs-unstable";
55
66 home-manager.url = "github:nix-community/home-manager/master";
77 home-manager.inputs.nixpkgs.follows = "nixpkgs";
......@@ -70,6 +70,7 @@
7070 # custom packages
7171 (_: pkgs: {
7272 autofmt = pkgs.callPackage ./packages/autofmt { };
73 exiled_exchange_2 = pkgs.callPackage ./packages/exiled_exchange_2 { };
7374 })
7475 ];
7576
modules/nixos/ld.nix+1
......@@ -6,6 +6,7 @@
66 programs.nix-ld.libraries = with pkgs; [
77 # common requirement for several games
88 stdenv.cc.cc.lib
9 libxcrypt
910
1011 # from https://github.com/NixOS/nixpkgs/blob/nixos-23.05/pkgs/games/steam/fhsenv.nix#L72-L79
1112 xorg.libXcomposite
packages/exiled_exchange_2/default.nix created+34
......@@ -0,0 +1,34 @@
1{ pkgs, lib, ... }:
2
3let
4 pname = "exiled-exchange-2";
5 version = "0.12.6";
6 name = "${pname}-${version}";
7
8 src = pkgs.fetchurl {
9 url = "https://github.com/Kvan7/Exiled-Exchange-2/releases/download/v${version}/Exiled-Exchange-2-${version}.AppImage";
10 sha256 = "sha256-2CBdsLQ0EHTINd05ABv8NyCYt2ipYfwmkcpw0SLZRwc==";
11 };
12
13 appimageContents = pkgs.appimageTools.extract { inherit pname version src; };
14in
15pkgs.appimageTools.wrapType2 rec {
16 inherit pname version src;
17
18 extraInstallCommands = ''
19 install -m 444 -D ${appimageContents}/exiled-exchange-2.desktop $out/share/applications/${pname}.desktop
20
21 install -m 444 -D ${appimageContents}/${pname}.png $out/share/icons/hicolor/512x512/apps/${pname}.png
22
23 substituteInPlace $out/share/applications/${pname}.desktop \
24 --replace 'Exec=AppRun --no-sandbox %U' 'Exec=${pname} %U'
25 '';
26
27 meta = with lib; {
28 description = "Exiled Exchange 2";
29 homepage = "https://kvan7.github.io/Exiled-Exchange-2/";
30 license = licenses.mit;
31 maintainers = [ ];
32 platforms = [ "x86_64-linux" ];
33 };
34}
users/natalie/desktop/configuration.nix+2
......@@ -56,12 +56,14 @@
5656 };
5757
5858 hardware.bluetooth.enable = true;
59 hardware.graphics.enable = true;
5960
6061 xdg.portal = {
6162 enable = true;
6263 extraPortals = with pkgs; [ xdg-desktop-portal-gtk ];
6364 };
6465 virtualisation = {
66 waydroid.enable = true;
6567 containers.enable = true;
6668 podman = {
6769 enable = true;
users/natalie/desktop/home.nix+2-1
......@@ -15,7 +15,7 @@
1515 packages = with pkgs; [
1616 #building macos apps hard :(
1717 ghostty
18 stremio
18 #stremio broken qtwebengine
1919 julia
2020 qbittorrent
2121
......@@ -34,6 +34,7 @@
3434 limo
3535 nexusmods-app-unfree
3636 protontricks
37 (pkgs.callPackage ../../../packages/exiled_exchange_2 { })
3738
3839 #window manager stuff
3940 wofi
users/natalie/home.nix+7-2
......@@ -1,4 +1,9 @@
1{ lib, host, ... }@args:
1{
2 lib,
3 host,
4 pkgs,
5 ...
6}@args:
27{
38 programs = {
49 # sort-lines:start
......@@ -21,5 +26,5 @@
2126 };
2227 };
2328
24 home.packages = import ./packages.nix args;
29 home.packages = import ./packages.nix pkgs;
2530}
users/natalie/packages.nix+4
......@@ -18,6 +18,10 @@ with pkgs;
1818 typescript-language-server
1919 deno
2020
21 #desktop shit
22 gtk3
23 gtk4
24
2125 #ides
2226 zed-editor
2327 emacs