diff --git a/flake.lock b/flake.lock index 1ed4288..5680244 100644 --- a/flake.lock +++ b/flake.lock @@ -420,16 +420,16 @@ ] }, "locked": { - "lastModified": 1726989464, - "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", + "lastModified": 1732466619, + "narHash": "sha256-T1e5oceypZu3Q8vzICjv1X/sGs9XfJRMW5OuXHgpB3c=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", + "rev": "f3111f62a23451114433888902a55cf0692b408d", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.05", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -622,16 +622,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1730883749, - "narHash": "sha256-mwrFF0vElHJP8X3pFCByJR365Q2463ATp2qGIrDUdlE=", + "lastModified": 1732981179, + "narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dba414932936fde69f0606b4f1d87c5bc0003ede", + "rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index a00b402..c98fc8a 100644 --- a/flake.nix +++ b/flake.nix @@ -6,9 +6,9 @@ # nix user repository nur = { url = "github:nix-community/NUR"; }; ## stable - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; home-manager = { - url = "github:nix-community/home-manager/release-24.05"; + url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; }; nixos-generators = { @@ -116,7 +116,29 @@ }; customPackages = flake-utils.lib.eachDefaultSystem (system: { packages = - import ./pkgs { pkgs = nixpkgs-unstable.legacyPackages.${system}; }; + import ./pkgs { pkgs = nixpkgs-unstable.legacyPackages.${system}; } + // { + "server-vm" = nixos-generators.nixosGenerate { + format = "vmware"; + inherit system; + #pkgs = nixpkgs-unstable.legacyPackages.x86_64-linux; + specialArgs = { + pkgsVersion = nixpkgs-unstable; + } // { + inherit inputs outputs; + }; + lib = nixpkgs-unstable.legacyPackages.x86_64-linux.lib; + modules = defaultModules ++ [ + home-manager-unstable.nixosModules.home-manager + ./users/anon + ./systems/amd-server-vm/configuration.nix + { + # 100G disk; + virtualisation.diskSize = 100 * 1024; + } + ]; + }; + }; }); in { overlays = import ./overlays.nix { inherit inputs; }; @@ -198,30 +220,6 @@ }; }; - packages = merge [ - customPackages.packages - { - x86_64-linux."server-vm" = nixos-generators.nixosGenerate { - format = "vmware"; - system = "x86_64-linux"; - #pkgs = nixpkgs-unstable.legacyPackages.x86_64-linux; - specialArgs = { - pkgsVersion = nixpkgs-unstable; - } // { - inherit inputs outputs; - }; - lib = nixpkgs-unstable.legacyPackages.x86_64-linux.lib; - modules = defaultModules ++ [ - home-manager-unstable.nixosModules.home-manager - ./users/anon - ./systems/amd-server-vm/configuration.nix - { - # 100G disk; - virtualisation.diskSize = 100 * 1024; - } - ]; - }; - } - ]; + packages = customPackages.packages; }; } diff --git a/systems/pc/configuration.nix b/systems/pc/configuration.nix index 076a0ba..8f52835 100644 --- a/systems/pc/configuration.nix +++ b/systems/pc/configuration.nix @@ -82,6 +82,14 @@ acceleration = "cuda"; }; + + # apple shit + services.usbmuxd.enable = true; + environment.systemPackages = with pkgs; [ + libimobiledevice + ifuse # optional, to mount using 'ifuse' + ]; + #nvidida drivers fail to build on new kernel https://github.com/NixOS/nixpkgs/issues/357643 boot.kernelPackages = lib.mkForce pkgs.linuxKernel.packages.linux_6_11; nixpkgs.config.permittedInsecurePackages =