Compare commits
	
		
			2 commits
		
	
	
		
			0de523fefb
			...
			45d660deb5
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
							 | 
						45d660deb5 | ||
| 
							 | 
						7d83f696dd | 
					 6 changed files with 13 additions and 93 deletions
				
			
		| 
						 | 
				
			
			@ -8,7 +8,6 @@ let
 | 
			
		|||
    nur
 | 
			
		||||
    colmena
 | 
			
		||||
    flake-registry
 | 
			
		||||
    nixos-hypervisor
 | 
			
		||||
    nixos-hardware
 | 
			
		||||
    nixpkgs-unstable
 | 
			
		||||
    srvos
 | 
			
		||||
| 
						 | 
				
			
			@ -45,8 +44,6 @@ let
 | 
			
		|||
    srvos.nixosModules.mixins-trusted-nix-caches
 | 
			
		||||
    srvos.nixosModules.mixins-terminfo
 | 
			
		||||
 | 
			
		||||
    nixos-hypervisor.nixosModules.host
 | 
			
		||||
 | 
			
		||||
    # srvos.nixosModules.mixins-telegraf
 | 
			
		||||
    # srvos.nixosModules.mixins-terminfo
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -108,9 +105,6 @@ in
 | 
			
		|||
  flake.colmena = {
 | 
			
		||||
    meta.nixpkgs = import nixpkgs {
 | 
			
		||||
      system = "x86_64-linux";
 | 
			
		||||
      overlays = [
 | 
			
		||||
        nixos-hypervisor.overlays.default
 | 
			
		||||
      ];
 | 
			
		||||
    };
 | 
			
		||||
    epyc = {
 | 
			
		||||
      imports =
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										78
									
								
								flake.lock
									
										
									
										generated
									
									
									
								
							
							
						
						
									
										78
									
								
								flake.lock
									
										
									
										generated
									
									
									
								
							| 
						 | 
				
			
			@ -183,27 +183,6 @@
 | 
			
		|||
        "type": "github"
 | 
			
		||||
      }
 | 
			
		||||
    },
 | 
			
		||||
    "flake-parts_2": {
 | 
			
		||||
      "inputs": {
 | 
			
		||||
        "nixpkgs-lib": [
 | 
			
		||||
          "nixos-hypervisor",
 | 
			
		||||
          "nixpkgs"
 | 
			
		||||
        ]
 | 
			
		||||
      },
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1687762428,
 | 
			
		||||
        "narHash": "sha256-DIf7mi45PKo+s8dOYF+UlXHzE0Wl/+k3tXUyAoAnoGE=",
 | 
			
		||||
        "owner": "hercules-ci",
 | 
			
		||||
        "repo": "flake-parts",
 | 
			
		||||
        "rev": "37dd7bb15791c86d55c5121740a1887ab55ee836",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
        "owner": "hercules-ci",
 | 
			
		||||
        "repo": "flake-parts",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      }
 | 
			
		||||
    },
 | 
			
		||||
    "flake-registry": {
 | 
			
		||||
      "flake": false,
 | 
			
		||||
      "locked": {
 | 
			
		||||
| 
						 | 
				
			
			@ -307,29 +286,6 @@
 | 
			
		|||
        "type": "github"
 | 
			
		||||
      }
 | 
			
		||||
    },
 | 
			
		||||
    "nixos-hypervisor": {
 | 
			
		||||
      "inputs": {
 | 
			
		||||
        "flake-parts": "flake-parts_2",
 | 
			
		||||
        "nixpkgs": [
 | 
			
		||||
          "nixpkgs"
 | 
			
		||||
        ],
 | 
			
		||||
        "treefmt-nix": "treefmt-nix"
 | 
			
		||||
      },
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1688428885,
 | 
			
		||||
        "narHash": "sha256-fVIbXKvHmxSUAKTMiXx799UasQwU2XT+op7bzvtfl8c=",
 | 
			
		||||
        "ref": "main",
 | 
			
		||||
        "rev": "9f32a304708fd9c91c081db05eee1b4f2e0226cc",
 | 
			
		||||
        "revCount": 2,
 | 
			
		||||
        "type": "git",
 | 
			
		||||
        "url": "ssh://gitea@git.newtype.fr/newtype/nixos-hypervisor"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
        "ref": "main",
 | 
			
		||||
        "type": "git",
 | 
			
		||||
        "url": "ssh://gitea@git.newtype.fr/newtype/nixos-hypervisor"
 | 
			
		||||
      }
 | 
			
		||||
    },
 | 
			
		||||
    "nixpkgs": {
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1702539185,
 | 
			
		||||
| 
						 | 
				
			
			@ -380,16 +336,16 @@
 | 
			
		|||
    },
 | 
			
		||||
    "nixpkgs_2": {
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1709428628,
 | 
			
		||||
        "narHash": "sha256-//ZCCnpVai/ShtO2vPjh3AWgo8riXCaret6V9s7Hew4=",
 | 
			
		||||
        "owner": "NixOS",
 | 
			
		||||
        "lastModified": 1716155578,
 | 
			
		||||
        "narHash": "sha256-+ocwkKmur5q8MJpm8ao0O2wdbMYBxPtFDrCvjqnkZYA=",
 | 
			
		||||
        "owner": "pennae",
 | 
			
		||||
        "repo": "nixpkgs",
 | 
			
		||||
        "rev": "66d65cb00b82ffa04ee03347595aa20e41fe3555",
 | 
			
		||||
        "rev": "093d16ae7a4c6b5f215152972a223b9fbcd3343a",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
        "owner": "NixOS",
 | 
			
		||||
        "ref": "release-23.11",
 | 
			
		||||
        "owner": "pennae",
 | 
			
		||||
        "ref": "stdenv-jobserver",
 | 
			
		||||
        "repo": "nixpkgs",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      }
 | 
			
		||||
| 
						 | 
				
			
			@ -419,7 +375,6 @@
 | 
			
		|||
        "flake-registry": "flake-registry",
 | 
			
		||||
        "home-manager": "home-manager_2",
 | 
			
		||||
        "nixos-hardware": "nixos-hardware",
 | 
			
		||||
        "nixos-hypervisor": "nixos-hypervisor",
 | 
			
		||||
        "nixpkgs": "nixpkgs_2",
 | 
			
		||||
        "nixpkgs-unstable": "nixpkgs-unstable",
 | 
			
		||||
        "nur": "nur",
 | 
			
		||||
| 
						 | 
				
			
			@ -476,27 +431,6 @@
 | 
			
		|||
        "repo": "default",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      }
 | 
			
		||||
    },
 | 
			
		||||
    "treefmt-nix": {
 | 
			
		||||
      "inputs": {
 | 
			
		||||
        "nixpkgs": [
 | 
			
		||||
          "nixos-hypervisor",
 | 
			
		||||
          "nixpkgs"
 | 
			
		||||
        ]
 | 
			
		||||
      },
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1688026376,
 | 
			
		||||
        "narHash": "sha256-qJmkr9BWDpqblk4E9/rCsAEl39y2n4Ycw6KRopvpUcY=",
 | 
			
		||||
        "owner": "numtide",
 | 
			
		||||
        "repo": "treefmt-nix",
 | 
			
		||||
        "rev": "df3f32b0cc253dfc7009b7317e8f0e7ccd70b1cf",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
        "owner": "numtide",
 | 
			
		||||
        "repo": "treefmt-nix",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      }
 | 
			
		||||
    }
 | 
			
		||||
  },
 | 
			
		||||
  "root": "root",
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -10,7 +10,7 @@
 | 
			
		|||
    flake-parts.url = "github:hercules-ci/flake-parts";
 | 
			
		||||
    flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs";
 | 
			
		||||
 | 
			
		||||
    nixpkgs.url = "github:NixOS/nixpkgs/release-23.11";
 | 
			
		||||
    nixpkgs.url = "github:pennae/nixpkgs/stdenv-jobserver";
 | 
			
		||||
    nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
 | 
			
		||||
 | 
			
		||||
    nixos-hardware.url = "github:NixOS/nixos-hardware";
 | 
			
		||||
| 
						 | 
				
			
			@ -33,8 +33,8 @@
 | 
			
		|||
 | 
			
		||||
    # Ryan's experimental hypervisor based on cloud-hypervisor
 | 
			
		||||
    # Private repository, you need a valid SSH key to access it
 | 
			
		||||
    nixos-hypervisor.url = "git+ssh://gitea@git.newtype.fr/newtype/nixos-hypervisor?ref=main";
 | 
			
		||||
    nixos-hypervisor.inputs.nixpkgs.follows = "nixpkgs";
 | 
			
		||||
    # nixos-hypervisor.url = "git+ssh://gitea@git.newtype.fr/newtype/nixos-hypervisor?ref=main";
 | 
			
		||||
    # nixos-hypervisor.inputs.nixpkgs.follows = "nixpkgs";
 | 
			
		||||
 | 
			
		||||
    flake-registry.url = "github:NixOS/flake-registry";
 | 
			
		||||
    flake-registry.flake = false;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -36,14 +36,6 @@ in
 | 
			
		|||
  '';
 | 
			
		||||
  networking.firewall.allowedTCPPorts = [ 5432 ];
 | 
			
		||||
 | 
			
		||||
  virtualisation.nvisor.vms = {
 | 
			
		||||
    vm01 = {
 | 
			
		||||
      config = { pkgs, ... }: {
 | 
			
		||||
        environment.systemPackages = [ pkgs.hello ];
 | 
			
		||||
      };
 | 
			
		||||
    };
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
  nix.buildMachines = [
 | 
			
		||||
    { hostName = "localhost";
 | 
			
		||||
      systems = [
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,5 +1,2 @@
 | 
			
		|||
{ ... }: {
 | 
			
		||||
  virtualisation.nvisor = {
 | 
			
		||||
    enable = true;
 | 
			
		||||
  };
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -30,6 +30,9 @@ in
 | 
			
		|||
      { domain = "*"; item = "nofile"; type = "-"; value = "20480"; }
 | 
			
		||||
    ];
 | 
			
		||||
 | 
			
		||||
    # Makes the computer go faster.
 | 
			
		||||
    nixos.jobserver.enable = true;
 | 
			
		||||
 | 
			
		||||
    # Memory accounting techniques
 | 
			
		||||
    systemd.services.nix-daemon.serviceConfig = {
 | 
			
		||||
      MemoryAccounting = true;
 | 
			
		||||
| 
						 | 
				
			
			@ -63,7 +66,7 @@ in
 | 
			
		|||
        use-cgroups = true;
 | 
			
		||||
        http-connections = 0;
 | 
			
		||||
        auto-allocate-uids = true;
 | 
			
		||||
        cores = 64; # 128 is too much, it will explode the RAM for now. Let's keep it serious.
 | 
			
		||||
        cores = 0;
 | 
			
		||||
        max-jobs = 2; # Do not build more than 2 derivations at once in the event, both of them are too big, yes this is stupid, fix it in Nix.
 | 
			
		||||
        fsync-metadata = true;
 | 
			
		||||
        substituters = [
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Reference in a new issue