victor/nixos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: victor:3b6c8e83baf9dd20a385834ba8c0875d902dfac8
Branches Tags
victor:master
..
compare: victor:d93a98a9526af29322b0e6baf1d8cde61ea94de8
Branches Tags
victor:master

No commits in common. "3b6c8e83baf9dd20a385834ba8c0875d902dfac8" and "d93a98a9526af29322b0e6baf1d8cde61ea94de8" have entirely different histories.
3b6c8e83ba ... d93a98a952

4 changed files with 33 additions and 34 deletions
Show Stats Expand all files Collapse all files

60
disko/palantir/lvm.nix
View File

@ -2,8 +2,8 @@
let let
disks = [ disks = [
"/dev/disk/by-id/ata-KINGSTON_SA400S37960G_50026B7383515406" "/dev/disk/by-id/ata-WDC_WDS120G2G0A-00JH30_184377804456"
#"/dev/disk/by-id/ata-KINGSTON_SA400S37120G_50026B7783176055" "/dev/disk/by-id/ata-KINGSTON_SA400S37120G_50026B7783176055"
]; ];
in in
{ {
@ -15,18 +15,12 @@ in
content = { content = {
type = "gpt"; type = "gpt";
partitions = { partitions = {
esp = { bios_grub = {
size = "512M"; size = "2M";
type = "EF00"; type = "EF02";
content = {
type = "filesystem";
format = "vfat";
mountpoint = "/boot/efi";
mountOptions = [ "umask=0077" ];
};
}; };
lvm = { pv = {
size = "100%"; size = "100%";
content = { content = {
type = "lvm_pv"; type = "lvm_pv";
@ -37,22 +31,22 @@ in
}; };
}; };
#ssd1 = { ssd1 = {
# type = "disk"; type = "disk";
# device = builtins.elemAt disks 1; device = builtins.elemAt disks 1;
# content = { content = {
# type = "gpt"; type = "gpt";
# partitions = { partitions = {
# lvm = { pv = {
# size = "100%"; size = "100%";
# content = { content = {
# type = "lvm_pv"; type = "lvm_pv";
# vg = "mainpool"; vg = "mainpool";
# }; };
# }; };
# }; };
# }; };
#}; };
}; };
lvm_vg = { lvm_vg = {
@ -61,28 +55,34 @@ in
lvs = { lvs = {
root = { root = {
size = "30G"; size = "30G";
lvm_type = "raid0";
content = { content = {
type = "filesystem"; type = "filesystem";
format = "ext4"; format = "ext4";
mountpoint = "/"; mountpoint = "/";
mountOptions = [ "noatime" ];
}; };
}; };
nix = { nix = {
size = "100G"; size = "50G";
lvm_type = "raid0";
content = { content = {
type = "filesystem"; type = "filesystem";
format = "ext4"; format = "ext4";
mountpoint = "/nix"; mountpoint = "/nix";
mountOptions = [ "noatime" ];
}; };
}; };
games = { games = {
size = "200G"; size = "100%FREE";
lvm_type = "raid0";
content = { content = {
type = "filesystem"; type = "filesystem";
format = "ext4"; format = "ext4";
mountpoint = "/games"; mountpoint = "/games";
mountOptions = [ "noatime" ];
}; };
}; };
}; };

4
flake.nix
View File

@ -24,16 +24,16 @@
inherit system; inherit system;
specialArgs = { inherit release myUser disko; }; specialArgs = { inherit release myUser disko; };
modules = [ modules = [
./modules/base.nix
./hosts/isengard.nix ./hosts/isengard.nix
./modules/base.nix
]; ];
}; };
palantir = lib.nixosSystem { palantir = lib.nixosSystem {
inherit system; inherit system;
specialArgs = { inherit release myUser disko; }; specialArgs = { inherit release myUser disko; };
modules = [ modules = [
./modules/base.nix
./hosts/palantir.nix ./hosts/palantir.nix
./modules/base.nix
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
./modules/home.nix ./modules/home.nix

1
hosts/palantir.nix
View File

@ -14,7 +14,6 @@
boot.loader = { boot.loader = {
systemd-boot.enable = true; systemd-boot.enable = true;
efi.canTouchEfiVariables = true; efi.canTouchEfiVariables = true;
efi.efiSysMountPoint = "/boot/efi";
}; };
# Networking # Networking

2
modules/containers/ntfy.nix
View File

@ -15,7 +15,7 @@ in
image = "binwiederhier/ntfy:latest"; image = "binwiederhier/ntfy:latest";
ports = [ ports = [
"0.0.0.0:10000:80" "127.0.0.1:10000:80"
]; ];
volumes = [ volumes = [