update stable version

This commit is contained in:
Kopatz
2024-12-01 12:35:36 +01:00
parent aa6b1d8cd2
commit ab1a8b98e0
3 changed files with 42 additions and 36 deletions

16
flake.lock generated
View File

@@ -420,16 +420,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726989464, "lastModified": 1732466619,
"narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", "narHash": "sha256-T1e5oceypZu3Q8vzICjv1X/sGs9XfJRMW5OuXHgpB3c=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", "rev": "f3111f62a23451114433888902a55cf0692b408d",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-24.05", "ref": "release-24.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@@ -622,16 +622,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1730883749, "lastModified": 1732981179,
"narHash": "sha256-mwrFF0vElHJP8X3pFCByJR365Q2463ATp2qGIrDUdlE=", "narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "dba414932936fde69f0606b4f1d87c5bc0003ede", "rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-24.05", "ref": "nixos-24.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

View File

@@ -6,9 +6,9 @@
# nix user repository # nix user repository
nur = { url = "github:nix-community/NUR"; }; nur = { url = "github:nix-community/NUR"; };
## stable ## stable
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-24.05"; url = "github:nix-community/home-manager/release-24.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nixos-generators = { nixos-generators = {
@@ -116,7 +116,29 @@
}; };
customPackages = flake-utils.lib.eachDefaultSystem (system: { customPackages = flake-utils.lib.eachDefaultSystem (system: {
packages = 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 { in {
overlays = import ./overlays.nix { inherit inputs; }; overlays = import ./overlays.nix { inherit inputs; };
@@ -198,30 +220,6 @@
}; };
}; };
packages = merge [ packages = customPackages.packages;
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;
}
];
};
}
];
}; };
} }

View File

@@ -82,6 +82,14 @@
acceleration = "cuda"; 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 #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; boot.kernelPackages = lib.mkForce pkgs.linuxKernel.packages.linux_6_11;
nixpkgs.config.permittedInsecurePackages = nixpkgs.config.permittedInsecurePackages =