diff --git a/alejandra.toml b/alejandra.toml index 581a5c4..840c791 100644 --- a/alejandra.toml +++ b/alejandra.toml @@ -1 +1 @@ -indentation = "Tabs" +indentation = "TwoSpaces" diff --git a/flake.nix b/flake.nix index 6de5e41..b08756d 100644 --- a/flake.nix +++ b/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 = [ diff --git a/hosts/michael/default.nix b/hosts/michael/default.nix new file mode 100644 index 0000000..1a190ea --- /dev/null +++ b/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; +} diff --git a/hosts/michael/disk-config.nix b/hosts/michael/disk-config.nix new file mode 100644 index 0000000..c851874 --- /dev/null +++ b/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 = "/"; + }; + }; + }; + }; + }; + }; + }; +} diff --git a/hosts/michael/hardware-configuration.nix b/hosts/michael/hardware-configuration.nix new file mode 100644 index 0000000..e9ba45b --- /dev/null +++ b/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; +} diff --git a/modules/packages.sync-conflict-20251207-174329-6B7OZZF.nix b/modules/packages.sync-conflict-20251207-174329-6B7OZZF.nix index 43a0dcc..c87465c 100644 --- a/modules/packages.sync-conflict-20251207-174329-6B7OZZF.nix +++ b/modules/packages.sync-conflict-20251207-174329-6B7OZZF.nix @@ -1,43 +1,43 @@ { - pkgs, - inputs, - ... + pkgs, + inputs, + ... }: with pkgs; [ - inputs.beads.packages.${pkgs.system}.default - inputs.nix-ai-tools.packages.${pkgs.system}.amp - (callPackage ./bin/open-project.nix {}) - age - alejandra - ast-grep - bun - delta - devenv - dig - docker - docker-compose - hledger - fastfetch - fd - gh - git - gnumake - gnupg - htop - hyperfine - jq - killall - lsof - nurl - openssh - postgresql_17 - sd - sops - sqlite - tokei - tree - tree-sitter - unzip - vivid - zip + inputs.beads.packages.${pkgs.system}.default + inputs.nix-ai-tools.packages.${pkgs.system}.amp + (callPackage ./bin/open-project.nix {}) + age + alejandra + ast-grep + bun + delta + devenv + dig + docker + docker-compose + hledger + fastfetch + fd + gh + git + gnumake + gnupg + htop + hyperfine + jq + killall + lsof + nurl + openssh + postgresql_17 + sd + sops + sqlite + tokei + tree + tree-sitter + unzip + vivid + zip ]