Enable disko hostConf & comment out current hardware filesystem stuff

Signed-off-by: Tristan Druyen <tristan@vault81.de>
This commit is contained in:
Tristan D. 2023-09-18 17:14:44 +02:00
parent ff0a31871c
commit c736134ccd
Signed by: tristan
SSH key fingerprint: SHA256:U7y6eMb7CQDaTHv9XoX6/BaQnPqyxxKc+Xnfcefi6rY
3 changed files with 38 additions and 21 deletions

15
README.md Normal file
View file

@ -0,0 +1,15 @@
# My nix conf
## Apply disko partitioning from local filesystem
```
sudo nix run github:nix-community/disko -- --mode disko --flake path:$PWD#nixos-pulse
```
## Apply nixos conf
```
sudo nixos-rebuild --flake .#nixos-pulse switch
```

View file

@ -51,6 +51,8 @@
modules = [ modules = [
./configuration.nix ./configuration.nix
./home.nix ./home.nix
./disko.nix
disko.nixosModules.disko
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
tuxedo-nixos.nixosModules.default tuxedo-nixos.nixosModules.default
{ {

View file

@ -23,18 +23,18 @@
}; };
# modules # modules
availableKernelModules = ["xhci_pci" "uas" "sd_mod"]; availableKernelModules = ["nvme" "xhci_pci" "uas" "usbhid" "usb_storage" "sd_mod"];
kernelModules = []; kernelModules = [];
# Enable swap on luks # Enable swap on luks
luks = { # luks = {
# Root # # Root
devices."luks-0ebc7402-5f50-4549-a407-b1f859285102".device = "/dev/disk/by-uuid/0ebc7402-5f50-4549-a407-b1f859285102"; # devices."luks-0ebc7402-5f50-4549-a407-b1f859285102".device = "/dev/disk/by-uuid/0ebc7402-5f50-4549-a407-b1f859285102";
# Swap # # Swap
devices."luks-fa1e760a-71a3-4a79-a791-684cd82d9c3c".device = "/dev/disk/by-uuid/fa1e760a-71a3-4a79-a791-684cd82d9c3c"; # devices."luks-fa1e760a-71a3-4a79-a791-684cd82d9c3c".device = "/dev/disk/by-uuid/fa1e760a-71a3-4a79-a791-684cd82d9c3c";
devices."luks-fa1e760a-71a3-4a79-a791-684cd82d9c3c".keyFile = "/crypto_keyfile.bin"; # devices."luks-fa1e760a-71a3-4a79-a791-684cd82d9c3c".keyFile = "/crypto_keyfile.bin";
}; # };
}; };
kernelModules = ["kvm-amd" "amdgpu"]; kernelModules = ["kvm-amd" "amdgpu"];
@ -43,20 +43,20 @@
services.xserver.videoDrivers = ["amdgpu"]; services.xserver.videoDrivers = ["amdgpu"];
fileSystems = { # fileSystems = {
"/" = { # "/" = {
device = "/dev/disk/by-uuid/6ae6ea01-72d5-4cee-a512-7aab551577a0"; # device = "/dev/disk/by-uuid/6ae6ea01-72d5-4cee-a512-7aab551577a0";
fsType = "ext4"; # fsType = "ext4";
}; # };
"/boot" = { # "/boot" = {
device = "/dev/disk/by-uuid/B471-B193"; # device = "/dev/disk/by-uuid/B471-B193";
fsType = "vfat"; # fsType = "vfat";
}; # };
}; # };
swapDevices = [ # swapDevices = [
{device = "/dev/disk/by-uuid/5b3a6fa6-bdec-4bfb-914d-48d870776a53";} # {device = "/dev/disk/by-uuid/5b3a6fa6-bdec-4bfb-914d-48d870776a53";}
]; # ];
networking = { networking = {
useDHCP = lib.mkDefault true; useDHCP = lib.mkDefault true;