changed config

This commit is contained in:
Wekuz 2025-11-22 14:11:21 +02:00
parent 5c0d9b3f75
commit 51db5ee771
Signed by: Wekuz
GPG key ID: 2E502F2AABD32DF9
5 changed files with 101 additions and 59 deletions

1
TODO
View file

@ -1,2 +1,3 @@
- distributed build (https://nix.dev/tutorials/nixos/distributed-builds-setup)
- setup script (https://github.com/jakeb-grant/nix-configs/blob/main/setup.sh)
- swap

View file

@ -5,7 +5,7 @@
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
disko = {
url = "github:nix-community/disko";
url = "github:nix-community/disko/latest";
inputs.nixpkgs.follows = "nixpkgs";
};
};
@ -14,7 +14,57 @@
nixosConfigurations = {
opti = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [ disko.nixosModules.disko ./hosts/opti ];
modules = [
./hosts/opti
disko.nixosModules.disko
{
disko.devices = {
disk = {
main = {
type = "disk";
device =
"/dev/disk/by-id/nvme-eui.00000000000000000c82d58020000000";
content = {
type = "gpt";
partitions = {
boot = {
size = "500M";
type = "EF00";
content = {
type = "filesystem";
format = "vfat";
mountpoint = "/boot";
mountOptions = [ "umask=0077" ];
};
};
primary = {
size = "100%";
content = {
type = "btrfs";
extraArgs = [ "-f" ]; # Override existing partition
subvolumes = {
"/rootfs" = { mountpoint = "/"; };
"/home" = {
mountOptions = [ "compress=zstd" ];
mountpoint = "/home";
};
"/home/wekuz" = { };
"/nix" = {
mountOptions = [ "compress=zstd" "noatime" ];
mountpoint = "/nix";
};
};
mountpoint = "/partition-root";
};
};
};
};
};
};
};
}
];
};
};
};

View file

@ -1,7 +1,7 @@
{ config, lib, pkgs, ... }:
{
imports = [ ./hardware-configuration.nix ./disko.nix ./configuration.nix ];
imports = [ ./hardware-configuration.nix ];
nix = {
package = pkgs.nixFlakes;

View file

@ -0,0 +1,47 @@
{
disko.devices = {
disk = {
main = {
type = "disk";
device =
"/dev/disk/by-id/nvme-eui.00000000000000000c82d58020000000";
content = {
type = "gpt";
partitions = {
boot = {
size = "500M";
type = "EF00";
content = {
type = "filesystem";
format = "vfat";
mountpoint = "/boot";
mountOptions = [ "umask=0077" ];
};
};
primary = {
size = "100%";
content = {
type = "btrfs";
extraArgs = [ "-f" ]; # Override existing partition
subvolumes = {
"/rootfs" = { mountpoint = "/"; };
"/home" = {
mountOptions = [ "compress=zstd" ];
mountpoint = "/home";
};
"/home/wekuz" = { };
"/nix" = {
mountOptions = [ "compress=zstd" "noatime" ];
mountpoint = "/nix";
};
};
mountpoint = "/partition-root";
};
};
};
};
};
};
};
}

View file

@ -1,56 +0,0 @@
{
disko.devices = {
disk = {
one = {
type = "disk";
device = "/dev/disk/by-id/nvme-eui.00000000000000000c82d58020000000";
content = {
type = "gpt";
partitions = {
boot = {
size = "500M";
type = "EF00";
content = {
type = "filesystem";
format = "vfat";
mountpoint = "/boot";
mountOptions = [ "umask=0077" ];
};
};
primary = {
size = "100%";
content = {
type = "lvm_pv";
vg = "pool";
};
};
};
};
};
};
lvm_vg = {
pool = {
type = "lvm_vg";
lvs = {
root = {
size = "96G";
content = {
type = "filesystem";
format = "ext4";
mountpoint = "/";
mountOptions = [ "defaults" ];
};
};
home = {
size = "100%FREE";
content = {
type = "filesystem";
format = "ext4";
mountpoint = "/home";
};
};
};
};
};
};
}