Merge branch 'tsuki-amd-switch'

This commit is contained in:
notohh 2024-04-27 21:17:25 -04:00
commit dd83d61e55
Signed by: notohh
GPG key ID: BD47506D475EE86D
5 changed files with 80 additions and 17 deletions

View file

@ -83,6 +83,10 @@
url = "github:serokell/deploy-rs";
inputs.nixpkgs.follows = "nixpkgs";
};
disko = {
url = "github:nix-community/disko";
inputs.nixpkgs.follows = "nixpkgs";
};
sops-nix = {
url = "github:Mic92/sops-nix";
inputs.nixpkgs.follows = "nixpkgs";

View file

@ -0,0 +1,33 @@
{
disko.devices = {
disk = {
sda = {
device = "/dev/sda";
type = "disk";
content = {
type = "gpt";
partitions = {
ESP = {
end = "500M";
type = "EF00";
content = {
type = "filesystem";
format = "vfat";
mountpoint = "/boot";
};
};
root = {
name = "root";
end = "-0";
content = {
type = "filesystem";
format = "bcachefs";
mountpoint = "/";
};
};
};
};
};
};
};
}

View file

@ -1,11 +1,14 @@
{
inputs,
config,
lib,
modulesPath,
...
}: {
imports = [
./disko-config.nix
(modulesPath + "/installer/scan/not-detected.nix")
./disko-config.nix
];
boot = {
@ -18,7 +21,6 @@
};
efi = {
canTouchEfiVariables = true;
efiSysMountPoint = "/boot/efi";
};
};
initrd = {
@ -27,24 +29,12 @@
};
};
fileSystems = {
"/" = {
device = "/dev/disk/by-uuid/57411820-f154-497e-9c7e-dfcb1f21c5cf";
fsType = "ext4";
};
"/boot/efi" = {
device = "/dev/disk/by-uuid/4D09-1D57";
fsType = "vfat";
};
"/nas/restic" = {
device = "192.168.1.199:/mnt/Sutoreji/nix-restic-data/ame";
fsType = "nfs";
};
zramSwap = {
enable = true;
swapDevices = 1;
algorithm = "zstd";
};
swapDevices = [
{device = "/dev/disk/by-uuid/4f69ab31-f6a9-4799-92f1-5abbe0dc9180";}
];
networking.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";

View file

@ -0,0 +1,33 @@
{
disko.devices = {
disk = {
nvme0n1 = {
device = "/dev/nvme0n1";
type = "disk";
content = {
type = "gpt";
partitions = {
ESP = {
end = "500M";
type = "EF00";
content = {
type = "filesystem";
format = "vfat";
mountpoint = "/boot";
};
};
root = {
name = "root";
end = "-0";
content = {
type = "filesystem";
format = "bcachefs";
mountpoint = "/";
};
};
};
};
};
};
};
}

View file

@ -1,11 +1,14 @@
{
inputs,
config,
lib,
modulesPath,
...
}: {
imports = [
# ./disko-config.nix
(modulesPath + "/installer/scan/not-detected.nix")
# ./disko-config.nix
];
boot = {