diff --git a/etcnixos/common.nix b/etcnixos/common.nix index 70f49ec..531dc93 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -14,9 +14,19 @@ ./distrobox.nix ./vm.nix + inputs.agenix.nixosModules.default inputs.nixos-hardware.nixosModules.common-pc-ssd ]; + nixpkgs.config.allowUnfreePredicate = + pkg: + builtins.elem (lib.getName pkg) [ + "steam" + "steam-original" + "steam-unwrapped" + "steam-run" + ]; + nix = { # optimize the store optimise.automatic = true; @@ -59,6 +69,7 @@ kernelModules = [ "ip_tables" "iptable_nat" + "msr" ]; }; diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index dda74e8..cbc1b5f 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -167,11 +167,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1737751639, - "narHash": "sha256-ZEbOJ9iT72iwqXsiEMbEa8wWjyFvRA9Ugx8utmYbpz4=", + "lastModified": 1738391520, + "narHash": "sha256-6HI58PKjddsC0RA0gBQlt6ox47oH//jLUHwx05RO8g0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "dfad538f751a5aa5d4436d9781ab27a6128ec9d4", + "rev": "34b64e4e1ddb14e3ffc7db8d4a781396dbbab773", "type": "github" }, "original": { @@ -183,11 +183,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1737672001, - "narHash": "sha256-YnHJJ19wqmibLQdUeq9xzE6CjrMA568KN/lFPuSVs4I=", + "lastModified": 1738277201, + "narHash": "sha256-6L+WXKCw5mqnUIExvqkD99pJQ41xgyCk6z/H9snClwk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "035f8c0853c2977b24ffc4d0a42c74f00b182cd8", + "rev": "666e1b3f09c267afd66addebe80fb05a5ef2b554", "type": "github" }, "original": { diff --git a/etcnixos/flake.nix b/etcnixos/flake.nix index 91c57ec..9dbee29 100644 --- a/etcnixos/flake.nix +++ b/etcnixos/flake.nix @@ -29,32 +29,29 @@ }@inputs: let username = "primary"; - hostname = nixpkgs.lib.strings.removeSuffix "\n" (builtins.readFile /etc/hostname); system = "x86_64-linux"; - pkgs = import nixpkgs { - # config.allowUnfreePredicate = - # pkg: - # builtins.elem (nixpkgs.lib.getName pkg) [ - # "steam-unwrapped" - # "steam" - # ]; - - # idk pkgs.wivrn pulls a bunch of cuda stuff even though cudaSupport is disabled? - config.allowUnfree = true; - - config.cudaSupport = false; - }; in { - nixosConfigurations.${hostname} = nixpkgs.lib.nixosSystem { + # desktop + nixosConfigurations.yarn = nixpkgs.lib.nixosSystem { specialArgs = { - inherit inputs username hostname; + hostname = "yarn"; + inherit inputs username; }; - inherit pkgs; modules = [ - ./system-${hostname}.nix - agenix.nixosModules.default + ./system-yarn.nix + ]; + }; + + # laptop + nixosConfigurations.mreow = nixpkgs.lib.nixosSystem { + specialArgs = { + hostname = "mreow"; + inherit inputs username; + }; + modules = [ + ./system-mreow.nix ]; }; }; diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 1c05ef5..d1ea531 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -54,11 +54,11 @@ ] }, "locked": { - "lastModified": 1737762889, - "narHash": "sha256-5HGG09bh/Yx0JA8wtBMAzt0HMCL1bYZ93x4IqzVExio=", + "lastModified": 1738415006, + "narHash": "sha256-ZlLTnqIQQ8OE6AtT+fluB642j2R9tnvxHHtpnmLjSxQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "daf04c5950b676f47a794300657f1d3d14c1a120", + "rev": "8544cd092047a7e92d0dce011108a563de7fc0f2", "type": "github" }, "original": { @@ -79,11 +79,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1737840481, - "narHash": "sha256-WjW3cdrmh1sGMT3CBqCFzT9BOktTa1u9ldoWEqTj7xk=", + "lastModified": 1738410471, + "narHash": "sha256-j0XZIViI4ZEFwhrEzVKz696/4DZ9pRiWtGfxJogA+MM=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "8fc9dba8df75d9d004d9369b513b81180788ec15", + "rev": "16f8e14385163479aca7231d8fab0091adac2e56", "type": "github" }, "original": { @@ -112,11 +112,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1737795105, - "narHash": "sha256-zQSNUKj671I9M4DdMD4iMUnIIWN5oiaWdqDHUSVcaVE=", + "lastModified": 1738404307, + "narHash": "sha256-BFtfL5kZbIsDAMgbVP5E0HbqDapYWw4NBw1xS0AOCCc=", "owner": "YaLTeR", "repo": "niri", - "rev": "78697d1cea20e6b53013e820999b0403c45d9f00", + "rev": "32ad545f842f4c176548e30d183d10e0a2bab752", "type": "github" }, "original": { @@ -127,11 +127,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1737672001, - "narHash": "sha256-YnHJJ19wqmibLQdUeq9xzE6CjrMA568KN/lFPuSVs4I=", + "lastModified": 1738277201, + "narHash": "sha256-6L+WXKCw5mqnUIExvqkD99pJQ41xgyCk6z/H9snClwk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "035f8c0853c2977b24ffc4d0a42c74f00b182cd8", + "rev": "666e1b3f09c267afd66addebe80fb05a5ef2b554", "type": "github" }, "original": { @@ -143,11 +143,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1737672001, - "narHash": "sha256-YnHJJ19wqmibLQdUeq9xzE6CjrMA568KN/lFPuSVs4I=", + "lastModified": 1738277201, + "narHash": "sha256-6L+WXKCw5mqnUIExvqkD99pJQ41xgyCk6z/H9snClwk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "035f8c0853c2977b24ffc4d0a42c74f00b182cd8", + "rev": "666e1b3f09c267afd66addebe80fb05a5ef2b554", "type": "github" }, "original": { @@ -174,11 +174,11 @@ ] }, "locked": { - "lastModified": 1737858462, - "narHash": "sha256-rohhmT/b8QNaIL3nY01jFtCyZu2dGTufef5YieECWZM=", + "lastModified": 1738376888, + "narHash": "sha256-S6ErHxkSm0iA7ZMsjjDaASWxbELYcdfv8BhOkkj1rHw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "dd236609a6c272d00ceaa042b1a81a31968e7f4d", + "rev": "83284068670d5ae4a43641c4afb150f3446be70d", "type": "github" }, "original": { @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1737869730, - "narHash": "sha256-4u/VS7fiqAtnEnm2z7DSNzNyM7sUB+nq3aGKcKBwodg=", + "lastModified": 1738421728, + "narHash": "sha256-+4w7zluaVoM1WrbhuBkWUF5hiXVCmXORlVT/p0Dm4vQ=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "39c4c603ee641aed350dce31562ad6dd6f0044d8", + "rev": "d0022d9a6c2a18ea8da0ecaa6482b4607f3d7591", "type": "github" }, "original": {