Merge branch 'disko' into 'main'

Move to disko

See merge request ahoneybun/nix-configs!4
This commit is contained in:
Aaron Honeycutt 2024-01-02 17:40:29 +00:00
commit 25c6ad0f08
4 changed files with 6 additions and 16 deletions

View file

@ -7,6 +7,8 @@
imports =
[
./hardware-configuration.nix
"${builtins.fetchTarball "https://github.com/nix-community/disko/archive/master.tar.gz"}/module.nix"
./disko-config.nix
# ./programs.nix
];
@ -18,13 +20,6 @@
systemd-boot.consoleMode = "0";
};
boot.initrd.luks.devices = {
root = {
device = "/dev/sda";
preLVM = true;
};
};
#nix.settings.auto-optimise-store = true;
nix.settings.experimental-features = [ "nix-command" "flakes" ];

View file

@ -3,7 +3,7 @@
disk = {
vdb = {
type = "disk";
device = "/dev/vdb";
device = "/dev/sda";
content = {
type = "gpt";
partitions = {

View file

@ -2,7 +2,7 @@
disko.devices = {
disk = {
vda = {
device = "/dev/vda";
device = "/dev/sda";
type = "disk";
content = {
type = "gpt";

View file

@ -7,6 +7,8 @@
imports =
[
./hardware-configuration.nix
"${builtins.fetchTarball "https://github.com/nix-community/disko/archive/master.tar.gz"}/module.nix"
./disko-config.nix
# ./programs.nix
];
@ -19,13 +21,6 @@
systemd-boot.consoleMode = "0";
};
boot.initrd.luks.devices = {
root = {
device = "/dev/sda";
preLVM = true;
};
};
#nix.settings.auto-optimise-store = true;
nix.settings.experimental-features = [ "nix-command" "flakes" ];