This commit is contained in:
2025-07-23 15:39:18 +03:00
parent 14fc4ba5b3
commit a40d057cb9
3 changed files with 54 additions and 56 deletions
+15 -15
View File
@@ -7,21 +7,21 @@
content = { content = {
type = "gpt"; type = "gpt";
partitions = { partitions = {
ESP = { # ESP = {
type = "EF00"; # type = "EF00";
size = "512M"; # size = "512M";
content = { # content = {
type = "filesystem"; # type = "filesystem";
format = "vfat"; # format = "vfat";
mountpoint = "/boot"; # mountpoint = "/boot";
}; # };
}; # };
swap = { # swap = {
size = "2G"; # size = "2G";
content = { # content = {
type = "swap"; # type = "swap";
}; # };
}; # };
root = { root = {
size = "100%"; size = "100%";
content = { content = {
+26 -31
View File
@@ -9,41 +9,34 @@
imports = [ imports = [
(modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot = {
initrd = { # boot = {
availableKernelModules = [ # initrd = {
"ahci" # availableKernelModules = [
"xhci_pci" # "ahci"
"usbhid" # "xhci_pci"
"usb_storage" # "usbhid"
"sd_mod" # "usb_storage"
"sdhci_pci" # "sd_mod"
]; # "sdhci_pci"
}; # ];
kernel = { # };
sysctl = { # kernel = {
"fs.inotify.max_user_watches" = "204800"; # sysctl = {
}; # "fs.inotify.max_user_watches" = "204800";
}; # };
kernelModules = [ # };
"kvm-intel" # kernelModules = [
"coretemp" # "kvm-intel"
]; # "coretemp"
}; # ];
# };
fileSystems = { fileSystems = {
"/" = { "/" = {
device = "/dev/disk/by-partlabel/disk-main-root"; device = "/dev/vda1"; # "/dev/disk/by-partlabel/disk-main-root";
fsType = "ext4"; fsType = "ext4";
}; };
"/boot" = {
device = "/dev/disk/by-partlabel/disk-main-ESP";
fsType = "vfat";
options = [
"fmask=0022"
"dmask=0022"
];
};
}; };
# fileSystems."/" = # fileSystems."/" =
@@ -62,7 +55,9 @@
# fsType = "ext4"; # fsType = "ext4";
# }; # };
swapDevices = [ ]; # swapDevices = [
# { device = "/dev/disk/by-partlabel/disk-main-swap"; }
# ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's # (the default) this is the recommended approach. When using systemd-networkd it's
+13 -10
View File
@@ -13,12 +13,12 @@ let
(modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
(modulesPath + "/profiles/qemu-guest.nix") (modulesPath + "/profiles/qemu-guest.nix")
./disko/vds.nix #./disko/vds.nix
./hardware/vds.nix ./hardware/vds.nix
disko.nixosModules.disko #disko.nixosModules.disko
nixos-facter-modules.nixosModules.facter #nixos-facter-modules.nixosModules.facter
self.nixosModules.default self.nixosModules.default
#self.homeConfigurations.server.nixosModule # home-manager configuration module #self.homeConfigurations.server.nixosModule # home-manager configuration module
@@ -39,18 +39,21 @@ let
# efiInstallAsRemovable = true; # efiInstallAsRemovable = true;
# }; # };
boot = { boot = {
kernelPackages = pkgs.linuxPackages_xanmod_stable; #kernelPackages = pkgs.linuxPackages_xanmod_stable;
hardwareScan = true; hardwareScan = true;
loader = { loader = {
systemd-boot.enable = lib.mkDefault true; grub = {
efi.canTouchEfiVariables = lib.mkDefault true; enable = true;
device = "/dev/vda";
useOSProber = false;
efiSupport = false;
#efiInstallAsRemovable = true;
};
systemd-boot.enable = lib.mkDefault false;
#efi.canTouchEfiVariables = lib.mkDefault true;
}; };
}; };
swapDevices = [
{ device = "/dev/disk/by-partlabel/disk-main-swap"; }
];
users = { users = {
users = { users = {
root = { root = {