forked from emily/nixfiles
fixes
This commit is contained in:
parent
33f7ef689c
commit
d8b97ed1ca
4 changed files with 20 additions and 19 deletions
|
@ -2,6 +2,7 @@
|
||||||
imports = [
|
imports = [
|
||||||
(modulesPath + "/installer/scan/not-detected.nix")
|
(modulesPath + "/installer/scan/not-detected.nix")
|
||||||
(modulesPath + "/profiles/qemu-guest.nix")
|
(modulesPath + "/profiles/qemu-guest.nix")
|
||||||
|
./config/common/users
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.loader = {
|
boot.loader = {
|
||||||
|
@ -11,7 +12,7 @@
|
||||||
|
|
||||||
services.openssh.enable = true;
|
services.openssh.enable = true;
|
||||||
|
|
||||||
environment.systemPackages = map lib.lowPrio [
|
environment.systemPackages = [
|
||||||
pkgs.curl
|
pkgs.curl
|
||||||
pkgs.gitMinimal
|
pkgs.gitMinimal
|
||||||
];
|
];
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
../../common
|
../../common
|
||||||
../../profiles/graphical
|
../../profiles/graphical
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
|
./disko.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.extraModprobeConfig = ''
|
boot.extraModprobeConfig = ''
|
||||||
|
@ -25,7 +26,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
deployment = {
|
deployment = {
|
||||||
targetHost = "192.168.122.159";
|
targetHost = "192.168.122.152";
|
||||||
targetUser = "emily";
|
targetUser = "emily";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -24,7 +24,6 @@
|
||||||
name = "nixos";
|
name = "nixos";
|
||||||
type = "luks";
|
type = "luks";
|
||||||
settings.allowDiscards = true;
|
settings.allowDiscards = true;
|
||||||
settings.keyFile = "/tmp/disk.key";
|
|
||||||
content = {
|
content = {
|
||||||
type = "btrfs";
|
type = "btrfs";
|
||||||
extraArgs = [ "-f" ];
|
extraArgs = [ "-f" ];
|
||||||
|
|
|
@ -10,22 +10,22 @@
|
||||||
boot.kernelModules = [ "kvm-intel" ];
|
boot.kernelModules = [ "kvm-intel" ];
|
||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
fileSystems."/" =
|
# fileSystems."/" =
|
||||||
{ device = "/dev/disk/by-uuid/92cdb49a-4f15-4880-bf25-2ff1de20119c";
|
# { device = "/dev/disk/by-uuid/92cdb49a-4f15-4880-bf25-2ff1de20119c";
|
||||||
fsType = "btrfs";
|
# fsType = "btrfs";
|
||||||
options = [ "subvol=nixos" ];
|
# options = [ "subvol=nixos" ];
|
||||||
};
|
# };
|
||||||
|
#
|
||||||
fileSystems."/home" =
|
# fileSystems."/home" =
|
||||||
{ device = "/dev/disk/by-uuid/92cdb49a-4f15-4880-bf25-2ff1de20119c";
|
# { device = "/dev/disk/by-uuid/92cdb49a-4f15-4880-bf25-2ff1de20119c";
|
||||||
fsType = "btrfs";
|
# fsType = "btrfs";
|
||||||
options = [ "subvol=home" ];
|
# options = [ "subvol=home" ];
|
||||||
};
|
# };
|
||||||
|
#
|
||||||
fileSystems."/boot" =
|
# fileSystems."/boot" =
|
||||||
{ device = "/dev/disk/by-uuid/DB0D-757F";
|
# { device = "/dev/disk/by-uuid/DB0D-757F";
|
||||||
fsType = "vfat";
|
# fsType = "vfat";
|
||||||
};
|
# };
|
||||||
|
|
||||||
swapDevices = [ ];
|
swapDevices = [ ];
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue