tristan/nix
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Enable disko hostConf & comment out current hardware filesystem stuff

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

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
```

2
flake.nix
View file

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

42
hardware.nix
View file

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