diff --git a/.gitignore b/.gitignore index 4261652..25fe42c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -secrets -Timeline.org \ No newline at end of file +Timeline.org diff --git a/configuration.nix b/configuration.nix index aa709a8..4a62523 100644 --- a/configuration.nix +++ b/configuration.nix @@ -50,7 +50,7 @@ services.timesyncd.enable = true; # Enable ZFS support - networking.hostId = "dca632d297f1"; + networking.hostId = "4e74ea68"; boot = { supportedFilesystems = [ "zfs" ]; zfs.extraPools = [ "vault" ]; diff --git a/modules/hardware-configuration.nix b/modules/hardware-configuration.nix index 51d46c5..1b5bc67 100644 --- a/modules/hardware-configuration.nix +++ b/modules/hardware-configuration.nix @@ -1,12 +1,12 @@ # 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, pkgs, ... }: +{ config, lib, pkgs, modulesPath, ... }: { - imports = [ ]; + imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "usb_storage" ]; + boot.initrd.availableKernelModules = [ ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ ]; boot.extraModulePackages = [ ]; @@ -16,13 +16,13 @@ fsType = "ext4"; }; - fileSystems."/vault" = { - device = "vault"; - fsType = "zfs"; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/2178-694E"; + fsType = "vfat"; }; - fileSystems."/vault/backups" = { - device = "vault/backups"; + fileSystems."/vault" = { + device = "vault"; fsType = "zfs"; }; @@ -31,13 +31,18 @@ fsType = "zfs"; }; + fileSystems."/vault/nextcloud" = { + device = "vault/nextcloud"; + fsType = "zfs"; + }; + fileSystems."/vault/syncthing" = { device = "vault/syncthing"; fsType = "zfs"; }; - fileSystems."/vault/nextcloud" = { - device = "vault/nextcloud"; + fileSystems."/vault/backups" = { + device = "vault/backups"; fsType = "zfs"; }; @@ -46,13 +51,13 @@ fsType = "zfs"; }; - fileSystems."/vault/backups/monolith" = { - device = "vault/backups/monolith"; + fileSystems."/vault/backups/zion/databases" = { + device = "vault/backups/zion/databases"; fsType = "zfs"; }; - fileSystems."/vault/backups/zion/databases" = { - device = "vault/backups/zion/databases"; + fileSystems."/vault/backups/monolith" = { + device = "vault/backups/monolith"; fsType = "zfs"; }; @@ -63,6 +68,5 @@ swapDevices = [ ]; - nix.maxJobs = lib.mkDefault 4; powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand"; }