diff --git a/flake.lock b/flake.lock index f0dbb9d1b89b326a865764b2c31c27cf9f18ecfb..c42a8bbac6984eea9419cfdb7a6cf97018cb192f 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ ] }, "locked": { - "lastModified": 1755807717, - "narHash": "sha256-x/IcOa+p9VFYlwXmuNhbZ8ce9As24rqy6uABv+tKacU=", + "lastModified": 1759090813, + "narHash": "sha256-JSJmTtQdxhgcGYtY9VNxX3LyzW3rFs3v+4/V9i/OHmI=", "owner": "tadfisher", "repo": "android-nixpkgs", - "rev": "4316f29f7f3b34c41f2639ae190022fbed60b850", + "rev": "48b8763cc3d2a89c39539da72cc248f1f2450855", "type": "github" }, "original": { @@ -38,11 +38,11 @@ "sf-pro": "sf-pro" }, "locked": { - "lastModified": 1752383772, - "narHash": "sha256-I5Y0gUJS85lGEuuKr+tKSRUpJWeKavE+WmiAHRcyBaU=", + "lastModified": 1758228441, + "narHash": "sha256-3mA9oFuhJ1EHyhPd17g/EuJi4jDYPGhyxkEitdh3Kmc=", "owner": "Lyndeno", "repo": "apple-fonts.nix", - "rev": "875c694d7f0ec2020d7511264907a1f0e3262931", + "rev": "aba9944f6606a69ebedf7bfb723316139eec3f72", "type": "github" }, "original": { @@ -58,11 +58,11 @@ ] }, "locked": { - "lastModified": 1755825449, - "narHash": "sha256-XkiN4NM9Xdy59h69Pc+Vg4PxkSm9EWl6u7k6D5FZ5cM=", + "lastModified": 1758805352, + "narHash": "sha256-BHdc43Lkayd+72W/NXRKHzX5AZ+28F3xaUs3a88/Uew=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "8df64f819698c1fee0c2969696f54a843b2231e8", + "rev": "c48e963a5558eb1c3827d59d21c5193622a1477c", "type": "github" }, "original": { @@ -149,11 +149,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": { @@ -185,11 +185,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -200,14 +200,14 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_3" + "systems": "systems_4" }, "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "owner": "numtide", "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "type": "github" }, "original": { @@ -220,24 +220,6 @@ "inputs": { "systems": "systems_5" }, - "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_5": { - "inputs": { - "systems": "systems_6" - }, "locked": { "lastModified": 1710146030, "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", @@ -252,9 +234,9 @@ "type": "github" } }, - "flake-utils_6": { + "flake-utils_5": { "inputs": { - "systems": "systems_7" + "systems": "systems_6" }, "locked": { "lastModified": 1705309234, @@ -314,11 +296,11 @@ ] }, "locked": { - "lastModified": 1755810213, - "narHash": "sha256-QdenO8f0PTg+tC6HuSvngKcbRZA5oZKmjUT+MXKOLQg=", + "lastModified": 1759088654, + "narHash": "sha256-31Xc5bIeqqOJA0Kuk9s7TAMakuyggGHBluP3LqedQiE=", "owner": "nix-community", "repo": "home-manager", - "rev": "6911d3e7f475f7b3558b4f5a6aba90fa86099baa", + "rev": "a97df40c1966cc46b5f6817ac8d8e240da03de96", "type": "github" }, "original": { @@ -342,11 +324,11 @@ }, "mnw": { "locked": { - "lastModified": 1748710831, - "narHash": "sha256-eZu2yH3Y2eA9DD3naKWy/sTxYS5rPK2hO7vj8tvUCSU=", + "lastModified": 1756659871, + "narHash": "sha256-v6Rh4aQ6RKjM2N02kK9Usn0Ix7+OY66vNpeklc1MnGE=", "owner": "Gerg-L", "repo": "mnw", - "rev": "cff958a4e050f8d917a6ff3a5624bc4681c6187d", + "rev": "ed6cc3e48557ba18266e598a5ebb6602499ada16", "type": "github" }, "original": { @@ -357,17 +339,16 @@ }, "moonlight": { "inputs": { - "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1754439168, - "narHash": "sha256-NcwRidwb/ask65LE86os4RkhyoPQo5sLu0sJs/NboK4=", + "lastModified": 1757448266, + "narHash": "sha256-aLjHKVWkb9XHyoMmDBxLG2Ycg4CJFeieLdEg3CWeIwk=", "owner": "moonlight-mod", "repo": "moonlight", - "rev": "66b81b113afd6654a88c9adb7edb7fe92839fe84", + "rev": "83debd7870e77e21694c9a76e3975baf842e435e", "type": "github" }, "original": { @@ -383,11 +364,11 @@ ] }, "locked": { - "lastModified": 1755404379, - "narHash": "sha256-Q6ZxZDBmD/B988Jjbx7/NchxOKIpOKBBrx9Yb0zMzpQ=", + "lastModified": 1759032422, + "narHash": "sha256-WZf+FhebP2/1pK2np5xj/NuDjD6fXK2BHnq/tPUN18o=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "ebbc1c05f786ae39bb5e04e57bf2c10c44a649e3", + "rev": "ec7a78cb0e098832d8acac091a4df393259c4839", "type": "github" }, "original": { @@ -398,16 +379,16 @@ }, "nix-options-search": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "gitignore": "gitignore", "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1743876182, - "narHash": "sha256-qfiVewr5huupheLqStX60JSbjBEm9/PDncLQXE0dsXo=", + "lastModified": 1756245499, + "narHash": "sha256-clSqrE7JPhjGvnPqxLjN8AeadXQUFIGyakQyAywc1BY=", "owner": "madsbv", "repo": "nix-options-search", - "rev": "f52dc6986161570a2ffffdf337c88b503e9a58fb", + "rev": "37cb7d89d8965b53db71b3548c3224612b22c1a1", "type": "github" }, "original": { @@ -434,16 +415,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1755615617, - "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", + "lastModified": 1759036355, + "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "20075955deac2583bb12f07151c2df830ef346b4", + "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "type": "indirect" } }, @@ -487,14 +468,14 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_4" + "systems": "systems_3" }, "locked": { - "lastModified": 1755843058, - "narHash": "sha256-oAajTGcyTzuND7AAlaRXO+wF7ytAMOnrE4sYUjRonB8=", + "lastModified": 1758966217, + "narHash": "sha256-/XLi0+w/3ZbByofmRxTWlimBZbIjur3B56iYONffcv0=", "owner": "notashelf", "repo": "nvf", - "rev": "d36996c8ba5c8d68b5def1b660e06d281ef0a3a8", + "rev": "8e9186e4b88a6f87083b45e1cbea0833facec914", "type": "github" }, "original": { @@ -540,11 +521,11 @@ ] }, "locked": { - "lastModified": 1755830208, - "narHash": "sha256-fMa/Hcg+4O2h+kl3gNPjtGSWPI8NtCl3LYMsejK6qGA=", + "lastModified": 1759027024, + "narHash": "sha256-LTgfljA/X8aGEXk/EUVoLL+0wfJjQAhF/rUQOFsx+/U=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "802a7b97f8ff672ba2dec70c9e354f51f844e796", + "rev": "971d18658c83f3a6a434ac647798141fddce3175", "type": "github" }, "original": { @@ -580,7 +561,7 @@ "sf-compact": { "flake": false, "locked": { - "narHash": "sha256-VMCf2Mhmx/qhLRQxlTAsQWxtonS27kPW+oTYBBRWHMg=", + "narHash": "sha256-WeqT80cdK/XzTLSaJs5DHodzxoeAzwL/xTgdq0YwQbM=", "type": "file", "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Compact.dmg" }, @@ -628,7 +609,7 @@ "sf-pro": { "flake": false, "locked": { - "narHash": "sha256-RX6X2ltVE88Hp1g9tpSywMT3UfdLpRxgw92KRpiAues=", + "narHash": "sha256-vprahHpCUf9O8RualBrEuLEfuLfzI/2d8AQmwlCGPPk=", "type": "file", "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg" }, @@ -727,21 +708,6 @@ "type": "github" } }, - "systems_7": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "zen-browser": { "inputs": { "nixpkgs": [ @@ -749,11 +715,11 @@ ] }, "locked": { - "lastModified": 1754886070, - "narHash": "sha256-MZDmxOkVKL1HY72bliN8Gxh0SYkHUa3W/1fTU2ke36I=", + "lastModified": 1758859571, + "narHash": "sha256-/DPe2RNgIzTBHm1tLUF31YswssT7Uz+HJI6VIkmHN6w=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "e37d2b326311320c8571111b3ef89b29d26d4b64", + "rev": "58e5a7b019aa1584ca46e909b011c1f6a91081f0", "type": "github" }, "original": { @@ -765,15 +731,15 @@ "zig": { "inputs": { "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1755605615, - "narHash": "sha256-J0Cxren2QLeI0ZvRZw4XGcMm4q3uPIZHM+eJnaZfXX8=", + "lastModified": 1759019783, + "narHash": "sha256-YMpnPm2HlGWo5bmgkhKGrdV+ZzPpbXX5+dmuQd8Ebn0=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "714fae26049a263ff2e4641ce7c973f371f4b005", + "rev": "ddda205a5f3188662118ee9a9f9bbf9e385f6681", "type": "github" }, "original": { @@ -785,7 +751,7 @@ "zig-overlay": { "inputs": { "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_5", "nixpkgs": [ "zls", "nixpkgs" @@ -807,7 +773,7 @@ }, "zls": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_4", "gitignore": "gitignore_2", "langref": "langref", "nixpkgs": "nixpkgs_4", diff --git a/flake.nix b/flake.nix index 28101b0755d19ad6d382be93307cd255f30fc903..ed6d6e80d91b15e238205cedf6087c8fcf5d23ca 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { description = "multi device configuration flake"; inputs = { - nixpkgs.url = "nixpkgs/nixos-unstable"; + nixpkgs.url = "nixpkgs/nixpkgs-unstable"; home-manager.url = "github:nix-community/home-manager/master"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; @@ -70,6 +70,7 @@ # custom packages (_: pkgs: { autofmt = pkgs.callPackage ./packages/autofmt { }; + exiled_exchange_2 = pkgs.callPackage ./packages/exiled_exchange_2 { }; }) ]; diff --git a/modules/nixos/ld.nix b/modules/nixos/ld.nix index fc09f687d9e8284eefec1395ab68b70c318597a9..cfbf4e05fed55f65b714cd31efa6fe21a2bcd3fb 100644 --- a/modules/nixos/ld.nix +++ b/modules/nixos/ld.nix @@ -6,6 +6,7 @@ programs.nix-ld.libraries = with pkgs; [ # common requirement for several games stdenv.cc.cc.lib + libxcrypt # from https://github.com/NixOS/nixpkgs/blob/nixos-23.05/pkgs/games/steam/fhsenv.nix#L72-L79 xorg.libXcomposite diff --git a/packages/exiled_exchange_2/default.nix b/packages/exiled_exchange_2/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..8413c3bbd97e364a1382defd7d06af914e58e5cd --- /dev/null +++ b/packages/exiled_exchange_2/default.nix @@ -0,0 +1,34 @@ +{ pkgs, lib, ... }: + +let + pname = "exiled-exchange-2"; + version = "0.12.6"; + name = "${pname}-${version}"; + + src = pkgs.fetchurl { + url = "https://github.com/Kvan7/Exiled-Exchange-2/releases/download/v${version}/Exiled-Exchange-2-${version}.AppImage"; + sha256 = "sha256-2CBdsLQ0EHTINd05ABv8NyCYt2ipYfwmkcpw0SLZRwc=="; + }; + + appimageContents = pkgs.appimageTools.extract { inherit pname version src; }; +in +pkgs.appimageTools.wrapType2 rec { + inherit pname version src; + + extraInstallCommands = '' + install -m 444 -D ${appimageContents}/exiled-exchange-2.desktop $out/share/applications/${pname}.desktop + + install -m 444 -D ${appimageContents}/${pname}.png $out/share/icons/hicolor/512x512/apps/${pname}.png + + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Exec=AppRun --no-sandbox %U' 'Exec=${pname} %U' + ''; + + meta = with lib; { + description = "Exiled Exchange 2"; + homepage = "https://kvan7.github.io/Exiled-Exchange-2/"; + license = licenses.mit; + maintainers = [ ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/users/natalie/desktop/configuration.nix b/users/natalie/desktop/configuration.nix index ade64ee3abc72adf0e5e2918d0dfeb9ff90c28e6..baeb2a2011ffae05de7c5565794024c184dc0d27 100644 --- a/users/natalie/desktop/configuration.nix +++ b/users/natalie/desktop/configuration.nix @@ -56,12 +56,14 @@ }; hardware.bluetooth.enable = true; + hardware.graphics.enable = true; xdg.portal = { enable = true; extraPortals = with pkgs; [ xdg-desktop-portal-gtk ]; }; virtualisation = { + waydroid.enable = true; containers.enable = true; podman = { enable = true; diff --git a/users/natalie/desktop/home.nix b/users/natalie/desktop/home.nix index 6b220f0b2bc58d2861e9dc5588ff4c6576b147cc..ac05dc489181a0bfba24f9161640dc3e34368f26 100644 --- a/users/natalie/desktop/home.nix +++ b/users/natalie/desktop/home.nix @@ -15,7 +15,7 @@ packages = with pkgs; [ #building macos apps hard :( ghostty - stremio + #stremio broken qtwebengine julia qbittorrent @@ -34,6 +34,7 @@ limo nexusmods-app-unfree protontricks + (pkgs.callPackage ../../../packages/exiled_exchange_2 { }) #window manager stuff wofi diff --git a/users/natalie/home.nix b/users/natalie/home.nix index 9ebe9cb33bcbb2f273c69d43cf1c6feb7313b207..448e7018660df48df450d25ef9ad9bafbdb090af 100644 --- a/users/natalie/home.nix +++ b/users/natalie/home.nix @@ -1,4 +1,9 @@ -{ lib, host, ... }@args: +{ + lib, + host, + pkgs, + ... +}@args: { programs = { # sort-lines:start @@ -21,5 +26,5 @@ }; }; - home.packages = import ./packages.nix args; + home.packages = import ./packages.nix pkgs; } diff --git a/users/natalie/packages.nix b/users/natalie/packages.nix index d10b03e4466f2d4cd97cce17651f866daaa0cff0..cbfbf8a7eaff528e761f7742129f0325d54cc61f 100644 --- a/users/natalie/packages.nix +++ b/users/natalie/packages.nix @@ -18,6 +18,10 @@ with pkgs; typescript-language-server deno + #desktop shit + gtk3 + gtk4 + #ides zed-editor emacs