temp
This commit is contained in:
@@ -87,6 +87,11 @@
|
||||
};
|
||||
};
|
||||
|
||||
glance = {
|
||||
enable = true;
|
||||
port = 5555;
|
||||
};
|
||||
|
||||
free-games-claimer.enable = true;
|
||||
|
||||
manyfold.enable = true;
|
||||
@@ -181,12 +186,6 @@
|
||||
htpasswdFile = "/media/nas/main/backup/restic/.htpasswd";
|
||||
extraFlags = [ "--no-auth" ];
|
||||
};
|
||||
|
||||
tabby-web = {
|
||||
enable = false;
|
||||
port = 8050;
|
||||
openFirewall = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -4,10 +4,14 @@
|
||||
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
namespace,
|
||||
...
|
||||
}:
|
||||
let
|
||||
inherit (lib.${namespace}) enabled disabled;
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
./boot.nix
|
||||
@@ -26,13 +30,13 @@
|
||||
# # Boot # #
|
||||
# ###################################################
|
||||
|
||||
bootloader.lanzaboote.enable = true;
|
||||
bootloader.lanzaboote = enabled;
|
||||
|
||||
# ###################################################
|
||||
# # Desktop # #
|
||||
# ###################################################
|
||||
|
||||
desktop.cosmic.enable = false;
|
||||
desktop.cosmic = disabled;
|
||||
|
||||
# ###################################################
|
||||
# # Development # #
|
||||
@@ -92,12 +96,6 @@
|
||||
group = "traefik";
|
||||
mode = "u=rwx,g=rwx,o=rx";
|
||||
}
|
||||
{
|
||||
directory = "/media";
|
||||
user = "nas-apps";
|
||||
group = "jallen-nas";
|
||||
mode = "u=rwx,g=rx,o=rx";
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
@@ -105,7 +103,7 @@
|
||||
# # Monitoring # #
|
||||
# ###################################################
|
||||
|
||||
monitoring.enable = true;
|
||||
monitoring = enabled;
|
||||
|
||||
# ###################################################
|
||||
# # Network # #
|
||||
@@ -162,7 +160,7 @@
|
||||
# # Power # #
|
||||
# ###################################################
|
||||
|
||||
power.ups.enable = true;
|
||||
power.ups = enabled;
|
||||
|
||||
# ###################################################
|
||||
# # Samba # #
|
||||
@@ -212,14 +210,14 @@
|
||||
# # Security # #
|
||||
# ###################################################
|
||||
|
||||
security.tpm.enable = true;
|
||||
security.tpm = enabled;
|
||||
|
||||
# ###################################################
|
||||
# # Services # #
|
||||
# ###################################################
|
||||
|
||||
services = {
|
||||
grafana.enable = true;
|
||||
grafana = enabled;
|
||||
};
|
||||
|
||||
# ###################################################
|
||||
@@ -250,10 +248,10 @@
|
||||
fsType = "bcachefs";
|
||||
mountPoint = "/media/nas/main";
|
||||
options = [
|
||||
"noauto"
|
||||
"noauto"
|
||||
"nofail"
|
||||
"x-systemd.mount-timeout=0"
|
||||
"x-systemd.device-timeout=0"
|
||||
# "x-systemd.mount-timeout=0"
|
||||
# "x-systemd.device-timeout=0"
|
||||
];
|
||||
};
|
||||
|
||||
|
||||
@@ -1,79 +0,0 @@
|
||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
modulesPath,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [
|
||||
"xhci_pci"
|
||||
"nvme"
|
||||
"ahci"
|
||||
"usbhid"
|
||||
"uas"
|
||||
];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" = lib.mkForce {
|
||||
device = "none";
|
||||
fsType = "tmpfs";
|
||||
options = [ "mode=755" ];
|
||||
};
|
||||
|
||||
fileSystems."/boot" = lib.mkForce {
|
||||
device = "UUID=0FCB-EC63"; # "/dev/disk/by-partlabel/disk-main-ESP";
|
||||
fsType = "vfat";
|
||||
options = [
|
||||
"fmask=0022"
|
||||
"dmask=0022"
|
||||
];
|
||||
};
|
||||
|
||||
fileSystems."/var/log" = lib.mkForce {
|
||||
device = "UUID=88d9c058-757d-c06e-0fb7-a612f2db8a7a"; # "/dev/disk/by-partlabel/disk-main-root";
|
||||
fsType = "bcachefs";
|
||||
options = [ "X-mount.subdir=log" ];
|
||||
};
|
||||
|
||||
fileSystems."/root" = lib.mkForce {
|
||||
device = lib.mkDefault "UUID=88d9c058-757d-c06e-0fb7-a612f2db8a7a"; # "/dev/disk/by-partlabel/disk-main-root";
|
||||
fsType = "bcachefs";
|
||||
options = [ "X-mount.subdir=root" ];
|
||||
};
|
||||
|
||||
fileSystems."/etc" = lib.mkForce {
|
||||
device = lib.mkDefault "UUID=88d9c058-757d-c06e-0fb7-a612f2db8a7a"; # "/dev/disk/by-partlabel/disk-main-root";
|
||||
fsType = "bcachefs";
|
||||
options = [ "X-mount.subdir=etc" ];
|
||||
};
|
||||
|
||||
fileSystems."/nix" = lib.mkForce {
|
||||
device = lib.mkDefault "UUID=88d9c058-757d-c06e-0fb7-a612f2db8a7a"; # "/dev/disk/by-partlabel/disk-main-root";
|
||||
fsType = "bcachefs";
|
||||
options = [
|
||||
"X-mount.subdir=nix"
|
||||
"verbose"
|
||||
];
|
||||
};
|
||||
|
||||
fileSystems."/home" = lib.mkForce {
|
||||
device = lib.mkDefault "UUID=88d9c058-757d-c06e-0fb7-a612f2db8a7a"; # "/dev/disk/by-partlabel/disk-main-root";
|
||||
fsType = "bcachefs";
|
||||
options = [ "X-mount.subdir=home" ];
|
||||
};
|
||||
|
||||
swapDevices = [ ];
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
}
|
||||
Reference in New Issue
Block a user