apply

alejandra.toml

@@ -1 +1 @@
-indentation = "Tabs"
+indentation = "TwoSpaces"

flake.nix

@@ -45,7 +45,7 @@
         constants = import ./lib/constants.nix;
         user = constants.user;
         darwinHosts = ["chidi" "jason"];
-        nixosHosts = ["tahani"];
+        nixosHosts = ["michael" "tahani"];
         overlays = import ./overlays {inherit inputs;};
       in {
         systems = [

hosts/michael/default.nix

@@ -0,0 +1,36 @@
+{
+	modulesPath,
+	hostname,
+	inputs,
+	...
+}: {
+	imports = [
+		(modulesPath + "/installer/scan/not-detected.nix")
+		(modulesPath + "/profiles/qemu-guest.nix")
+		./disk-config.nix
+		./hardware-configuration.nix
+		../../modules/nixos
+		inputs.disko.nixosModules.disko
+		inputs.tangled.nixosModules.knot
+	];
+
+	services.tangled.knot = {
+		enable = true;
+		server = {
+			hostname = "knot.schmatzler.com";
+			owner = "did:plc:yiapylv5gwzlyzesppjmukvj";
+		};
+	};
+
+	networking.firewall.allowedTCPPorts = [ 5444 5555 ];
+
+	services.openssh = {
+		enable = true;
+		settings = {
+			PermitRootLogin = "yes";
+			PasswordAuthentication = false;
+		};
+	};
+
+	networking.hostName = hostname;
+}

hosts/michael/disk-config.nix

@@ -0,0 +1,37 @@
+{
+	disko.devices = {
+		disk = {
+			main = {
+				type = "disk";
+				device = "/dev/sda";
+				content = {
+					type = "gpt";
+					partitions = {
+						boot = {
+							size = "1M";
+							type = "EF02";
+						};
+						ESP = {
+							size = "512M";
+							type = "EF00";
+							content = {
+								type = "filesystem";
+								format = "vfat";
+								mountpoint = "/boot";
+								mountOptions = ["umask=0077"];
+							};
+						};
+						root = {
+							size = "100%";
+							content = {
+								type = "filesystem";
+								format = "ext4";
+								mountpoint = "/";
+							};
+						};
+					};
+				};
+			};
+		};
+	};
+}

hosts/michael/hardware-configuration.nix

@@ -0,0 +1,18 @@
+{
+	lib,
+	modulesPath,
+	...
+}: {
+	imports = [
+		(modulesPath + "/profiles/qemu-guest.nix")
+	];
+
+	boot.initrd.availableKernelModules = ["ahci" "xhci_pci" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod"];
+	boot.initrd.kernelModules = [];
+	boot.kernelModules = [];
+	boot.extraModulePackages = [];
+
+	nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+
+	networking.useDHCP = lib.mkDefault true;
+}

modules/packages.sync-conflict-20251207-174329-6B7OZZF.nix

@@ -1,43 +1,43 @@
 {
-	pkgs,
+  pkgs,
-	inputs,
+  inputs,
-	...
+  ...
 }:
 with pkgs; [
-	inputs.beads.packages.${pkgs.system}.default
+  inputs.beads.packages.${pkgs.system}.default
-	inputs.nix-ai-tools.packages.${pkgs.system}.amp
+  inputs.nix-ai-tools.packages.${pkgs.system}.amp
-	(callPackage ./bin/open-project.nix {})
+  (callPackage ./bin/open-project.nix {})
-	age
+  age
-	alejandra
+  alejandra
-	ast-grep
+  ast-grep
-	bun
+  bun
-	delta
+  delta
-	devenv
+  devenv
-	dig
+  dig
-	docker
+  docker
-	docker-compose
+  docker-compose
-	hledger
+  hledger
-	fastfetch
+  fastfetch
-	fd
+  fd
-	gh
+  gh
-	git
+  git
-	gnumake
+  gnumake
-	gnupg
+  gnupg
-	htop
+  htop
-	hyperfine
+  hyperfine
-	jq
+  jq
-	killall
+  killall
-	lsof
+  lsof
-	nurl
+  nurl
-	openssh
+  openssh
-	postgresql_17
+  postgresql_17
-	sd
+  sd
-	sops
+  sops
-	sqlite
+  sqlite
-	tokei
+  tokei
-	tree
+  tree
-	tree-sitter
+  tree-sitter
-	unzip
+  unzip
-	vivid
+  vivid
-	zip
+  zip
 ]