Compare commits
	
		
			3 Commits
		
	
	
		
			64c3e2d720
			...
			c14aebf4a3
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| c14aebf4a3 | |||
| 677f3f26ab | |||
| c55600c5af | 
@@ -80,6 +80,7 @@ in
 | 
			
		||||
 | 
			
		||||
        tmux = {
 | 
			
		||||
          enable = true;
 | 
			
		||||
          keyMode = "vi";
 | 
			
		||||
        };
 | 
			
		||||
 | 
			
		||||
        bash = {
 | 
			
		||||
 
 | 
			
		||||
@@ -4,7 +4,8 @@ let
 | 
			
		||||
  inherit (lib)
 | 
			
		||||
    genAttrs mapAttrsToList filterAttrsRecursive nameValuePair types
 | 
			
		||||
    mkOption mkOverride mkForce mkIf mergeEqualOption optional
 | 
			
		||||
    showWarnings concatStringsSep flatten unique optionalAttrs;
 | 
			
		||||
    showWarnings concatStringsSep flatten unique optionalAttrs
 | 
			
		||||
    mkBefore;
 | 
			
		||||
  inherit (lib.flake) defaultSystems;
 | 
			
		||||
in
 | 
			
		||||
rec {
 | 
			
		||||
@@ -166,7 +167,7 @@ rec {
 | 
			
		||||
 | 
			
		||||
  systemdAwaitPostgres = pkg: host: {
 | 
			
		||||
    after = [ "systemd-networkd-wait-online.service" ];
 | 
			
		||||
    preStart = ''
 | 
			
		||||
    preStart = mkBefore ''
 | 
			
		||||
      until ${pkg}/bin/pg_isready -h ${host}; do
 | 
			
		||||
        sleep 0.5
 | 
			
		||||
      done
 | 
			
		||||
 
 | 
			
		||||
@@ -66,10 +66,21 @@ in
 | 
			
		||||
            };
 | 
			
		||||
          });
 | 
			
		||||
          kernelModules = [ "kvm-amd" ];
 | 
			
		||||
          kernelParams = [ "amd_iommu=on" "console=ttyS0,115200n8" "console=ttyS1,115200n8" "console=tty0" ];
 | 
			
		||||
          kernelParams = [
 | 
			
		||||
            "amd_iommu=on"
 | 
			
		||||
            "console=ttyS0,115200n8" "console=ttyS1,115200n8" "console=tty0"
 | 
			
		||||
            "systemd.setenv=SYSTEMD_SULOGIN_FORCE=1"
 | 
			
		||||
          ];
 | 
			
		||||
          initrd = {
 | 
			
		||||
            kernelModules = [ "dm-raid" ];
 | 
			
		||||
            availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" "sr_mod" ];
 | 
			
		||||
            systemd = {
 | 
			
		||||
              enable = true;
 | 
			
		||||
              # Onlu activate volumes needed for boot to prevent thin check from getting killed while switching root
 | 
			
		||||
              contents."/etc/lvm/lvm.conf".text = ''
 | 
			
		||||
                activation/auto_activation_volume_list = [ "main/colony-nix" "main/colony-persist" ]
 | 
			
		||||
              '';
 | 
			
		||||
            };
 | 
			
		||||
          };
 | 
			
		||||
        };
 | 
			
		||||
 | 
			
		||||
@@ -137,6 +148,15 @@ in
 | 
			
		||||
          services = {
 | 
			
		||||
            "serial-getty@ttyS0".enable = true;
 | 
			
		||||
            "serial-getty@ttyS1".enable = true;
 | 
			
		||||
            lvm-activate-main = {
 | 
			
		||||
              description = "Activate remaining LVs";
 | 
			
		||||
              before = [ "local-fs-pre.target" ];
 | 
			
		||||
              serviceConfig = {
 | 
			
		||||
                Type = "oneshot";
 | 
			
		||||
                ExecStart = "${pkgs.lvm2.bin}/bin/vgchange -aay main";
 | 
			
		||||
              };
 | 
			
		||||
              wantedBy = [ "sysinit.target" ];
 | 
			
		||||
            };
 | 
			
		||||
 | 
			
		||||
            rsync-lvm-meta = {
 | 
			
		||||
              description = "rsync lvm metadata backups / archives to rsync.net";
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user