hosts/sarien: split up
modules/stylix: change wallpaper Signed-off-by: unexplrd <unexplrd@linerds.us>
This commit is contained in:
@ -1,41 +0,0 @@
|
||||
{
|
||||
pkgs,
|
||||
config,
|
||||
inputs,
|
||||
...
|
||||
}: {
|
||||
imports = with inputs; [
|
||||
chaotic.nixosModules.default
|
||||
];
|
||||
boot = {
|
||||
# kernelPackages = pkgs.linuxPackages_latest;
|
||||
kernelPackages = pkgs.linuxPackages_cachyos;
|
||||
kernelModules = ["kvm-intel"];
|
||||
kernelParams = [
|
||||
"debugfs=off"
|
||||
"efi=disable_early_pci_dma"
|
||||
# "gather_data_sampling=force"
|
||||
"intel_iommu=on"
|
||||
"iommu.passthrough=0"
|
||||
"iommu.strict=1"
|
||||
"iommu=force"
|
||||
# "lockdown=confidentiality"
|
||||
# "module.sig_enforce=1"
|
||||
"page_alloc.shuffle=1"
|
||||
# "reg_file_data_sampling=on"
|
||||
# "spec_rstack_overflow=safe-ret"
|
||||
"vsyscall=none"
|
||||
];
|
||||
loader.efi.canTouchEfiVariables = true;
|
||||
loader.systemd-boot = {
|
||||
enable = true;
|
||||
consoleMode = "auto";
|
||||
};
|
||||
plymouth.enable = true;
|
||||
};
|
||||
console = {
|
||||
earlySetup = true;
|
||||
packages = [pkgs.terminus_font];
|
||||
font = "${pkgs.terminus_font}/share/consolefonts/ter-c18n.psf.gz";
|
||||
};
|
||||
}
|
39
hosts/sarien/boot/default.nix
Normal file
39
hosts/sarien/boot/default.nix
Normal file
@ -0,0 +1,39 @@
|
||||
{
|
||||
pkgs,
|
||||
inputs,
|
||||
...
|
||||
}: {
|
||||
imports = with inputs;
|
||||
[
|
||||
chaotic.nixosModules.default
|
||||
lanzaboote.nixosModules.lanzaboote
|
||||
]
|
||||
++ [
|
||||
./loader.nix
|
||||
];
|
||||
boot = {
|
||||
# kernelPackages = pkgs.linuxPackages_latest;
|
||||
plymouth.enable = true;
|
||||
consoleLogLevel = 0;
|
||||
kernelPackages = pkgs.linuxPackages_cachyos;
|
||||
kernelParams = [
|
||||
"amd_iommu=force_isolation"
|
||||
"debugfs=off"
|
||||
"efi=disable_early_pci_dma"
|
||||
"gather_data_sampling=force"
|
||||
"intel_iommu=on"
|
||||
"iommu.passthrough=0"
|
||||
"iommu.strict=1"
|
||||
"iommu=force"
|
||||
"page_alloc.shuffle=1"
|
||||
"vsyscall=none"
|
||||
# "ia32_emulation=0"
|
||||
# "lockdown=confidentiality"
|
||||
# "module.sig_enforce=1"
|
||||
];
|
||||
initrd = {
|
||||
systemd.enable = true; # needed for auto-unlocking with TPM
|
||||
systemd.tpm2.enable = false; # no TPM
|
||||
};
|
||||
};
|
||||
}
|
15
hosts/sarien/boot/loader.nix
Normal file
15
hosts/sarien/boot/loader.nix
Normal file
@ -0,0 +1,15 @@
|
||||
{config, ...}: {
|
||||
boot = {
|
||||
lanzaboote = {
|
||||
enable = false;
|
||||
pkiBundle = "/var/lib/sbctl";
|
||||
};
|
||||
loader = {
|
||||
efi.canTouchEfiVariables = true;
|
||||
systemd-boot = {
|
||||
enable = !config.boot.lanzaboote.enable;
|
||||
consoleMode = "auto";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
@ -1,12 +1,17 @@
|
||||
{inputs, ...}: {
|
||||
{
|
||||
inputs,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
imports = with inputs; [
|
||||
self.nixosModules.desktop
|
||||
self.nixosModules.system
|
||||
./boot.nix
|
||||
./disko.nix
|
||||
./boot
|
||||
./disko
|
||||
./facter
|
||||
./hardware.nix
|
||||
./networking.nix
|
||||
./nix.nix
|
||||
./nix
|
||||
./power-saving.nix
|
||||
../dunamis/programs.nix
|
||||
./services.nix
|
||||
@ -38,6 +43,10 @@
|
||||
wireless = {
|
||||
wifi.enable = true;
|
||||
bluetooth.enable = true;
|
||||
bluetooth.enableBlueman = true;
|
||||
};
|
||||
hardware.graphics.extraPackages = with pkgs; [
|
||||
intel-compute-runtime
|
||||
intel-media-driver
|
||||
vpl-gpu-rt
|
||||
];
|
||||
}
|
||||
|
@ -1,81 +0,0 @@
|
||||
{inputs, ...}: let
|
||||
disk = "/dev/disk/by-id/nvme-eui.0025385911b36714";
|
||||
in {
|
||||
imports = with inputs; [
|
||||
disko.nixosModules.disko
|
||||
];
|
||||
disko.devices.nodev = {
|
||||
"/tmp" = {
|
||||
fsType = "tmpfs";
|
||||
mountOptions = ["rw" "nosuid" "nodev"];
|
||||
};
|
||||
};
|
||||
disko.devices.disk.main = {
|
||||
type = "disk";
|
||||
device = disk;
|
||||
content = {
|
||||
type = "gpt";
|
||||
partitions = {
|
||||
ESP = {
|
||||
size = "2G";
|
||||
type = "EF00";
|
||||
content = {
|
||||
type = "filesystem";
|
||||
format = "vfat";
|
||||
mountpoint = "/boot";
|
||||
mountOptions = [
|
||||
"umask=0077"
|
||||
"fmask=0022"
|
||||
"dmask=0022"
|
||||
"noexec"
|
||||
];
|
||||
};
|
||||
};
|
||||
luks = {
|
||||
size = "100%";
|
||||
content = {
|
||||
type = "luks";
|
||||
name = "luks-main";
|
||||
initrdUnlock = true;
|
||||
settings.allowDiscards = true;
|
||||
content = {
|
||||
type = "btrfs";
|
||||
extraArgs = ["-f"];
|
||||
subvolumes = {
|
||||
"@nixos-root" = {
|
||||
mountpoint = "/";
|
||||
mountOptions = [
|
||||
"compress=zstd"
|
||||
"noatime"
|
||||
"noexec"
|
||||
];
|
||||
};
|
||||
"@home" = {
|
||||
mountpoint = "/home";
|
||||
mountOptions = [
|
||||
"compress=zstd"
|
||||
"noatime"
|
||||
];
|
||||
};
|
||||
"@nix" = {
|
||||
mountpoint = "/nix";
|
||||
mountOptions = [
|
||||
"compress=zstd"
|
||||
"noatime"
|
||||
];
|
||||
};
|
||||
"@storage" = {
|
||||
mountpoint = "/storage";
|
||||
mountOptions = [
|
||||
"compress=zstd"
|
||||
"noatime"
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
14
hosts/sarien/disko/default.nix
Normal file
14
hosts/sarien/disko/default.nix
Normal file
@ -0,0 +1,14 @@
|
||||
{inputs, ...}: let
|
||||
disk = "/dev/disk/by-id/nvme-eui.0025385911b36714";
|
||||
in {
|
||||
imports = with inputs; [
|
||||
disko.nixosModules.disko
|
||||
];
|
||||
disko.devices.nodev = {
|
||||
"/tmp" = {
|
||||
fsType = "tmpfs";
|
||||
mountOptions = ["rw" "nosuid" "nodev"];
|
||||
};
|
||||
};
|
||||
disko.devices.disk.main = import ./disk-main.nix {inherit disk;};
|
||||
}
|
70
hosts/sarien/disko/disk-main.nix
Normal file
70
hosts/sarien/disko/disk-main.nix
Normal file
@ -0,0 +1,70 @@
|
||||
{disk, ...}: {
|
||||
type = "disk";
|
||||
device = disk;
|
||||
content = {
|
||||
type = "gpt";
|
||||
partitions = {
|
||||
ESP = {
|
||||
size = "2G";
|
||||
type = "EF00";
|
||||
content = {
|
||||
type = "filesystem";
|
||||
format = "vfat";
|
||||
mountpoint = "/boot";
|
||||
mountOptions = [
|
||||
"umask=0077"
|
||||
"fmask=0022"
|
||||
"dmask=0022"
|
||||
"noexec"
|
||||
"nosuid"
|
||||
"nodev"
|
||||
];
|
||||
};
|
||||
};
|
||||
luks = {
|
||||
size = "100%";
|
||||
content = {
|
||||
type = "luks";
|
||||
name = "luks-main";
|
||||
initrdUnlock = true;
|
||||
settings.allowDiscards = true;
|
||||
content = {
|
||||
type = "btrfs";
|
||||
extraArgs = ["-f"];
|
||||
subvolumes = {
|
||||
"@nixos-root" = {
|
||||
mountpoint = "/";
|
||||
mountOptions = [
|
||||
"compress=zstd"
|
||||
"noatime"
|
||||
"noexec"
|
||||
];
|
||||
};
|
||||
"@home" = {
|
||||
mountpoint = "/home";
|
||||
mountOptions = [
|
||||
"compress=zstd"
|
||||
"noatime"
|
||||
];
|
||||
};
|
||||
"@storage" = {
|
||||
mountpoint = "/storage";
|
||||
mountOptions = [
|
||||
"compress=zstd"
|
||||
"noatime"
|
||||
];
|
||||
};
|
||||
"@nix" = {
|
||||
mountpoint = "/nix";
|
||||
mountOptions = [
|
||||
"compress-force=zstd"
|
||||
"noatime"
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
14
hosts/sarien/facter/default.nix
Normal file
14
hosts/sarien/facter/default.nix
Normal file
@ -0,0 +1,14 @@
|
||||
{
|
||||
config,
|
||||
inputs,
|
||||
...
|
||||
}: let
|
||||
inherit (inputs) mysecrets;
|
||||
inherit (config.networking) hostName;
|
||||
in {
|
||||
imports = with inputs; [
|
||||
nixos-facter-modules.nixosModules.facter
|
||||
];
|
||||
facter.reportPath = "${mysecrets}/facter/${hostName}.json";
|
||||
systemd.network.wait-online.enable = false;
|
||||
}
|
@ -4,15 +4,15 @@
|
||||
modulesPath,
|
||||
...
|
||||
}: {
|
||||
imports = with inputs.nixos-hardware.nixosModules; [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
common-cpu-intel
|
||||
common-gpu-intel-kaby-lake
|
||||
common-hidpi
|
||||
common-pc-laptop-ssd
|
||||
];
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.enableRedistributableFirmware = true;
|
||||
# imports = with inputs.nixos-hardware.nixosModules; [
|
||||
# (modulesPath + "/installer/scan/not-detected.nix")
|
||||
# common-cpu-intel
|
||||
# common-gpu-intel-kaby-lake
|
||||
# common-hidpi
|
||||
# common-pc-laptop-ssd
|
||||
# ];
|
||||
# nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
# hardware.enableRedistributableFirmware = true;
|
||||
|
||||
services = {
|
||||
logind = {
|
||||
|
@ -1,35 +0,0 @@
|
||||
# TODO: better file name
|
||||
{
|
||||
config,
|
||||
inputs,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
hostName =
|
||||
if (config.networking.hostName == "vylxae")
|
||||
then "sarien"
|
||||
else config.networking.hostName;
|
||||
inherit (config.sops) secrets;
|
||||
inherit (inputs) mysecrets;
|
||||
in {
|
||||
nix = {
|
||||
package = pkgs.lix;
|
||||
channel.enable = false;
|
||||
daemonCPUSchedPolicy = "idle";
|
||||
settings = {
|
||||
experimental-features = ["nix-command" "flakes"];
|
||||
builders-use-substitutes = true;
|
||||
};
|
||||
distributedBuilds = true;
|
||||
buildMachines = [
|
||||
{
|
||||
hostName = "dunamis";
|
||||
sshUser = "nix-ssh";
|
||||
system = "x86_64-linux";
|
||||
sshKey = secrets."ssh-${hostName}-user".path;
|
||||
supportedFeatures = ["nixos-test" "big-parallel" "kvm" "benchmark"];
|
||||
publicHostKey = builtins.readFile "${mysecrets}/ssh/ssh_host_ed25519_dunamis.base64";
|
||||
}
|
||||
];
|
||||
};
|
||||
}
|
11
hosts/sarien/nix/common.nix
Normal file
11
hosts/sarien/nix/common.nix
Normal file
@ -0,0 +1,11 @@
|
||||
{pkgs, ...}: {
|
||||
nix = {
|
||||
package = pkgs.lixPackageSets.latest.lix;
|
||||
channel.enable = false;
|
||||
daemonCPUSchedPolicy = "idle";
|
||||
settings = {
|
||||
experimental-features = ["nix-command" "flakes"];
|
||||
builders-use-substitutes = true;
|
||||
};
|
||||
};
|
||||
}
|
7
hosts/sarien/nix/default.nix
Normal file
7
hosts/sarien/nix/default.nix
Normal file
@ -0,0 +1,7 @@
|
||||
{
|
||||
imports = [
|
||||
./common.nix
|
||||
./substituters.nix
|
||||
./distributed-build.nix
|
||||
];
|
||||
}
|
30
hosts/sarien/nix/distributed-build.nix
Normal file
30
hosts/sarien/nix/distributed-build.nix
Normal file
@ -0,0 +1,30 @@
|
||||
{
|
||||
config,
|
||||
inputs,
|
||||
...
|
||||
}: let
|
||||
inherit (builtins) readFile;
|
||||
inherit (config.networking) hostName;
|
||||
inherit (config.sops) secrets;
|
||||
inherit (inputs) mysecrets;
|
||||
pubHost = readFile "${mysecrets}/ssh/ssh_host_ed25519_dunamis.base64";
|
||||
in {
|
||||
nix = {
|
||||
distributedBuilds = true;
|
||||
buildMachines = [
|
||||
{
|
||||
hostName = "dunamis";
|
||||
publicHostKey = pubHost;
|
||||
sshKey = secrets."ssh-${hostName}-user".path;
|
||||
sshUser = "nix-ssh";
|
||||
supportedFeatures = [
|
||||
"benchmark"
|
||||
"big-parallel"
|
||||
"kvm"
|
||||
"nixos-test"
|
||||
];
|
||||
system = "x86_64-linux";
|
||||
}
|
||||
];
|
||||
};
|
||||
}
|
10
hosts/sarien/nix/ssh-serve.nix
Normal file
10
hosts/sarien/nix/ssh-serve.nix
Normal file
@ -0,0 +1,10 @@
|
||||
{config, ...}: let
|
||||
inherit (builtins) readFile;
|
||||
inherit (config.users.users) user;
|
||||
in {
|
||||
nix.sshServe = {
|
||||
enable = true;
|
||||
write = true;
|
||||
keys = map (f: readFile f) user.openssh.authorizedKeys.keyFiles;
|
||||
};
|
||||
}
|
16
hosts/sarien/nix/substituters.nix
Normal file
16
hosts/sarien/nix/substituters.nix
Normal file
@ -0,0 +1,16 @@
|
||||
{
|
||||
nix.settings = {
|
||||
substituters = [
|
||||
"https://cache.nixos.org/"
|
||||
"https://chaotic-nyx.cachix.org/"
|
||||
"https://cosmic.cachix.org/"
|
||||
"https://nix-community.cachix.org/"
|
||||
];
|
||||
trusted-public-keys = [
|
||||
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
|
||||
"chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8="
|
||||
"cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE="
|
||||
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
||||
];
|
||||
};
|
||||
}
|
@ -87,9 +87,9 @@
|
||||
polarity = "dark";
|
||||
scheme = "${pkgs.base16-schemes}/share/themes/helios.yaml";
|
||||
wallpaper = builtins.fetchurl {
|
||||
url = "https://w.wallhaven.cc/full/we/wallhaven-wejkzx.jpg";
|
||||
name = "wallhaven-wejkzx.jpg";
|
||||
sha256 = "sha256:145q483q1yvs4pndh2r57gfvbd9jc15sry9qz31avqxyrn8ama52";
|
||||
url = "https://w.wallhaven.cc/full/lq/wallhaven-lqorw2.png";
|
||||
name = "wallhaven-lqorw2.png";
|
||||
sha256 = "sha256:1rjchjq4pc2jyq8dvpa17mmscv9qcm0h0zv468lsf8s51anpid6p";
|
||||
};
|
||||
|
||||
serif = {
|
||||
|
Reference in New Issue
Block a user