diff --git a/flake.lock b/flake.lock index d569309..103c526 100644 --- a/flake.lock +++ b/flake.lock @@ -2,16 +2,17 @@ "nodes": { "agenix": { "inputs": { + "darwin": "darwin", "nixpkgs": [ "nixos" ] }, "locked": { - "lastModified": 1673301561, - "narHash": "sha256-gRUWHbBAtMuPDJQXotoI8u6+3DGBIUZHkyQWpIv7WpM=", + "lastModified": 1677969766, + "narHash": "sha256-AIp/ZYZMNLDZR/H7iiAlaGpu4lcXsVt9JQpBlf43HRY=", "owner": "ryantm", "repo": "agenix", - "rev": "42d371d861a227149dc9a7e03350c9ab8b8ddd68", + "rev": "03b51fe8e459a946c4b88dcfb6446e45efb2c24e", "type": "github" }, "original": { @@ -36,6 +37,28 @@ } }, "darwin": { + "inputs": { + "nixpkgs": [ + "agenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1673295039, + "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=", + "owner": "lnl7", + "repo": "nix-darwin", + "rev": "87b9d090ad39b25b2400029c64825fc2a8868943", + "type": "github" + }, + "original": { + "owner": "lnl7", + "ref": "master", + "repo": "nix-darwin", + "type": "github" + } + }, + "darwin_2": { "inputs": { "nixpkgs": [ "nixos" @@ -55,7 +78,7 @@ "type": "github" } }, - "darwin_2": { + "darwin_3": { "inputs": { "nixpkgs": [ "digga", @@ -126,7 +149,7 @@ "digga": { "inputs": { "blank": "blank", - "darwin": "darwin_2", + "darwin": "darwin_3", "deploy": [ "deploy" ], @@ -168,11 +191,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1674714173, - "narHash": "sha256-0JmvmzttdpE49XczoBSb/iQdVcpMe3NDXJDmUeBSGEw=", + "lastModified": 1679207026, + "narHash": "sha256-3BrBOSwYGlgTq69+OeHCQoFBGTzpDp9PkKjWkxpA108=", "owner": "nix-community", "repo": "fenix", - "rev": "baa5e0aa99e5381beb63f909e39d987202f78d59", + "rev": "efc838bd45cfdfd21836f239605f2082d7245464", "type": "github" }, "original": { @@ -296,11 +319,11 @@ }, "flake-utils_3": { "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1678901627, + "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", "type": "github" }, "original": { @@ -364,11 +387,11 @@ ] }, "locked": { - "lastModified": 1674556204, - "narHash": "sha256-HCRmkZsq01h2Evch08zpgE9jeHdMtGdT1okWotyvuhY=", + "lastModified": 1679067095, + "narHash": "sha256-G2dJQURL/CCi+8RP6jNJG8VqgtzEMCA+6mNodd3VR6E=", "owner": "nix-community", "repo": "home-manager", - "rev": "c59f0eac51da91c6989fd13a68e156f63c0e60b6", + "rev": "3239e0b40f242f47bf6c0c37b2fd35ab3e76e370", "type": "github" }, "original": { @@ -411,11 +434,11 @@ }, "latest_2": { "locked": { - "lastModified": 1674731659, - "narHash": "sha256-iGnBkl6MN70cddZMWRCADLX6DLp1dnIIA66KBCtDFbU=", + "lastModified": 1679231546, + "narHash": "sha256-Lp1UbxFkRCOtJKIG0FAxgGsvoxap1ADyqkCN8a5OzRw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4fca325432efde372a2d30cc0317a66c89844f99", + "rev": "eefe9c8bae9abcf7a0ec953f6e18f82d8d86e67a", "type": "github" }, "original": { @@ -451,11 +474,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1672992692, - "narHash": "sha256-/eLQLSNIa22ARTZbk+x8i0iE8khe1eiHWkuxgTVXZ7g=", + "lastModified": 1676383589, + "narHash": "sha256-KCkWZXCjH+C4Kn7fUGSrEl5btk+sERHhZueSsvVbPWc=", "owner": "guibou", "repo": "nixGL", - "rev": "643e730efb981ffaf8478f441ec9b9aeea1c89f5", + "rev": "c917918ab9ebeee27b0dd657263d3f57ba6bb8ad", "type": "github" }, "original": { @@ -466,11 +489,11 @@ }, "nixos": { "locked": { - "lastModified": 1674459583, - "narHash": "sha256-L0UZl/u2H3HGsrhN+by42c5kNYeKtdmJiPzIRvEVeiM=", + "lastModified": 1679081381, + "narHash": "sha256-n4+SbrVohxbgbmOTkodfxc3d8W38OfKowD6YNA8j27o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1b1f50645af2a70dc93eae18bfd88d330bfbcf7f", + "rev": "b573a7f69484a7d213680abb70b4f95bdc28eee5", "type": "github" }, "original": { @@ -482,11 +505,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1674550793, - "narHash": "sha256-ljJlIFQZwtBbzWqWTmmw2O5BFmQf1A/DspwMOQtGXHk=", + "lastModified": 1679224149, + "narHash": "sha256-TSY37Zv0icF/aijR3/KWGLVBlnKKHlG9QTj7vHbF/UU=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "b7ac0a56029e4f9e6743b9993037a5aaafd57103", + "rev": "a4bc66709604ab78abc575b60baa6d23ae027a59", "type": "github" }, "original": { @@ -497,11 +520,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1674459583, - "narHash": "sha256-L0UZl/u2H3HGsrhN+by42c5kNYeKtdmJiPzIRvEVeiM=", + "lastModified": 1679081381, + "narHash": "sha256-n4+SbrVohxbgbmOTkodfxc3d8W38OfKowD6YNA8j27o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1b1f50645af2a70dc93eae18bfd88d330bfbcf7f", + "rev": "b573a7f69484a7d213680abb70b4f95bdc28eee5", "type": "github" }, "original": { @@ -615,7 +638,7 @@ "root": { "inputs": { "agenix": "agenix", - "darwin": "darwin", + "darwin": "darwin_2", "deploy": "deploy", "digga": "digga", "fenix": "fenix", @@ -635,11 +658,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1674661381, - "narHash": "sha256-7A92LFbNJYi94Iio7HeDW1bT+tPTQ00zjNmsVfWLme8=", + "lastModified": 1679123187, + "narHash": "sha256-Jf9hN2BIHdZ2Of4A0zAyB0fhe1EFujLa9XjWRC9ZKiY=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "dd673eea33079a3bf194fad25a6aec2e824e9041", + "rev": "7c05f55f0c9e9bec28464b329194fe244ca2c7a9", "type": "github" }, "original": { @@ -651,11 +674,11 @@ }, "stable": { "locked": { - "lastModified": 1674407282, - "narHash": "sha256-2qwc8mrPINSFdWffPK+ji6nQ9aGnnZyHSItVcYDZDlk=", + "lastModified": 1679139072, + "narHash": "sha256-Gtw2Yj8DfETie3u7iHv1y5Wt+plGRmp6nTQ0EEfaPho=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ab1254087f4cdf4af74b552d7fc95175d9bdbb49", + "rev": "08ef7dc8334521605a5c8b7086cc248e74ee338b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index dc646ca..2ab5fd1 100644 --- a/flake.nix +++ b/flake.nix @@ -80,7 +80,7 @@ overlays = [ # fenix.overlay breaks the cache, because it uses the system nixpkgs (_: super: let pkgs = fenix.inputs.nixpkgs.legacyPackages.${super.system}; in fenix.overlays.default pkgs pkgs) - agenix.overlay + agenix.overlays.default ./pkgs/default.nix peerix.overlay diff --git a/profiles/game/default.nix b/profiles/game/default.nix index f2519e8..97a825a 100644 --- a/profiles/game/default.nix +++ b/profiles/game/default.nix @@ -8,6 +8,6 @@ mumble (retroarch.override { cores = [ libretro.snes9x ]; }) olympus - godot + godot_4 ]; } diff --git a/suites/default.nix b/suites/default.nix index 969c69b..c1421b8 100644 --- a/suites/default.nix +++ b/suites/default.nix @@ -1,7 +1,7 @@ { profiles, ... }: with profiles; rec { base = [ users.root core dns ]; - workstation = base ++ [ sway develop game profiles.workstation ssh flatpak torrents pwn tor rust virtualization java networkmanager pipewire flatpak peerix tailscale users.mae three_dee ]; + workstation = base ++ [ sway develop game profiles.workstation ssh flatpak torrents pwn tor rust virtualization java networkmanager pipewire flatpak peerix tailscale users.mae ]; desktop = workstation ++ [ amd ]; lap = workstation ++ [ laptop bluetooth print ]; }