NixOS/FxNet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use back disko for fenixbook fs

Browse Source
This commit is contained in:
derFenix
2025-09-01 14:42:04 +03:00
parent 2197a6bc18
commit ba29dec8a3
2 changed files with 63 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
flake.nix
View File

@@ -12,10 +12,10 @@
url = "github:derfenix/photocatalog"; url = "github:derfenix/photocatalog";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
# disko = { disko = {
# url = "github:nix-community/disko/latest"; url = "github:nix-community/disko/latest";
# inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
# }; };
}; };
outputs = outputs =
@@ -23,6 +23,7 @@
self, self,
nixpkgs, nixpkgs,
nixpkgs-stable, nixpkgs-stable,
disko,
... ...
}@inputs: }@inputs:
let let
@@ -82,6 +83,7 @@
) )
inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
inputs.photocatalog.nixosModules.photocatalog inputs.photocatalog.nixosModules.photocatalog
disko.nixosModules.disko
./options.nix ./options.nix
./nix.nix ./nix.nix
] ]

99
hosts/fenixbook/hardware-configuration.nix
View File

@@ -41,49 +41,64 @@
]; ];
}; };
fileSystems = { disko.devices.disk.main = {
"/boot" = { type = "disk";
device = "/dev/disk/by-uuid/71AB-29E0"; device = "/dev/nvme0n1";
fsType = "vfat"; content = {
options = [ type = "gpt";
"fmask=0022" partitions = {
"dmask=0022" ESP = {
]; size = "512M";
}; type = "EF00";
"/" = { content = {
device = "/dev/disk/by-uuid/57df3204-a8c7-4842-957c-9752f996bc0f"; type = "filesystem";
fsType = "btrfs"; format = "vfat";
options = [ mountpoint = "/boot";
"compress=zstd" mountOptions = [ "umask=0077" ];
"subvol=/root" };
"noatime" };
]; luks = {
}; size = "100%";
"/home" = { content = {
device = "/dev/disk/by-uuid/57df3204-a8c7-4842-957c-9752f996bc0f"; type = "luks";
fsType = "btrfs"; name = "cryptedroot";
options = [ passwordFile = "/tmp/secret.key";
"compress=zstd" settings.allowDiscards = true;
"subvol=/home" content = {
"noatime" type = "btrfs";
]; extraArgs = [ "-f" ];
}; subvolumes = {
"/nix" = { "/root" = {
device = "/dev/disk/by-uuid/57df3204-a8c7-4842-957c-9752f996bc0f"; mountpoint = "/";
fsType = "btrfs"; mountOptions = [
options = [ "compress=zstd"
"compress=zstd" "noatime"
"subvol=/nix" ];
"noatime" };
]; "/home" = {
mountpoint = "/home";
mountOptions = [
"compress=zstd"
"noatime"
];
};
"/nix" = {
mountpoint = "/nix";
mountOptions = [
"compress=zstd"
"noatime"
];
};
"/swap" = {
mountpoint = "/.swapvol";
swap.swapfile.size = "16G";
};
};
};
};
};
};
}; };
}; };
swapDevices = [
{
device = "/dev/disk/by-uuid/56ad966f-3268-4b59-999a-48a082bb8052";
priority = 100;
}
];
} }