NixOS 24.05
This commit is contained in:
parent
26add438cf
commit
a470338c43
3 changed files with 18 additions and 17 deletions
16
flake.lock
generated
16
flake.lock
generated
|
@ -2,16 +2,16 @@
|
||||||
"nodes": {
|
"nodes": {
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1713995372,
|
"lastModified": 1717555607,
|
||||||
"narHash": "sha256-fFE3M0vCoiSwCX02z8VF58jXFRj9enYUSTqjyHAjrds=",
|
"narHash": "sha256-WZ1s48OODmRJ3DHC+I/DtM3tDRuRJlNqMvxvAPTD7ec=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "dd37924974b9202f8226ed5d74a252a9785aedf8",
|
"rev": "0b8e7a1ae5a94da2e1ee3f3030a32020f6254105",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"ref": "nixos-23.11",
|
"ref": "nixos-24.05",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
@ -25,16 +25,16 @@
|
||||||
},
|
},
|
||||||
"stable": {
|
"stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1713995372,
|
"lastModified": 1717555607,
|
||||||
"narHash": "sha256-fFE3M0vCoiSwCX02z8VF58jXFRj9enYUSTqjyHAjrds=",
|
"narHash": "sha256-WZ1s48OODmRJ3DHC+I/DtM3tDRuRJlNqMvxvAPTD7ec=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "dd37924974b9202f8226ed5d74a252a9785aedf8",
|
"rev": "0b8e7a1ae5a94da2e1ee3f3030a32020f6254105",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"ref": "nixos-23.11",
|
"ref": "nixos-24.05",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
{
|
{
|
||||||
inputs = {
|
inputs = {
|
||||||
#nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
|
#nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
|
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
|
||||||
stable.url = "github:NixOS/nixpkgs/nixos-23.11";
|
stable.url = "github:NixOS/nixpkgs/nixos-24.05";
|
||||||
unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
|
unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||||
};
|
};
|
||||||
outputs = { self, nixpkgs, stable, unstable }@attrs: {
|
outputs = { self, nixpkgs, stable, unstable }@attrs: {
|
||||||
|
|
|
@ -21,9 +21,10 @@
|
||||||
|
|
||||||
boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/7470830c-97b2-4cac-861f-aa92a721e5b6";
|
boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/7470830c-97b2-4cac-861f-aa92a721e5b6";
|
||||||
|
|
||||||
fileSystems."/boot" =
|
fileSystems."/nix" =
|
||||||
{ device = "/dev/disk/by-uuid/B712-0774";
|
{ device = "/dev/disk/by-uuid/b07bcc76-06cb-4d4c-ae8a-1608662aa436";
|
||||||
fsType = "vfat";
|
fsType = "btrfs";
|
||||||
|
options = [ "subvol=@nix" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/home" =
|
fileSystems."/home" =
|
||||||
|
@ -32,10 +33,10 @@
|
||||||
options = [ "subvol=@home" ];
|
options = [ "subvol=@home" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/nix" =
|
fileSystems."/boot" =
|
||||||
{ device = "/dev/disk/by-uuid/b07bcc76-06cb-4d4c-ae8a-1608662aa436";
|
{ device = "/dev/disk/by-uuid/B712-0774";
|
||||||
fsType = "btrfs";
|
fsType = "vfat";
|
||||||
options = [ "subvol=@nix" ];
|
options = [ "fmask=0022" "dmask=0022" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
swapDevices = [ ];
|
swapDevices = [ ];
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue