ahoneybun/nix-configs
1
0
Fork 0
mirror of https://gitlab.com/ahoneybun/nix-configs.git synced 2025-05-12 11:14:02 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'disko' into 'main'

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

9
configuration.nix
View file

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

2
partitions/luks-btrfs-subvolumes.nix
View file

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

2
partitions/simple-efi.nix
View file

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

9
systems/vm.nix
View file

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