From d05e6e08638ba7c83e48c38447cb82740cf23b10 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 18 Oct 2025 19:11:34 +0300 Subject: [PATCH] beautifuru --- flake.nix | 12 ++++++------ .../darwinHosts}/prometheus/configuration.nix | 0 .../darwinHosts}/prometheus/dummy-module.nix | 0 .../nixOnDroidHosts}/atreus/configuration.nix | 0 hosts/{ => nixos}/apollo/configuration.nix | 8 ++++---- hosts/{ => nixos}/apollo/hardware-configuration.nix | 0 hosts/{ => nixos}/harmonica-sd/configuration.nix | 2 +- .../harmonica-sd/hardware-configuration.nix | 0 hosts/{ => nixos}/harmonica-sd/sd-image.nix | 0 hosts/{ => nixos}/harmonica/configuration.nix | 2 +- .../{ => nixos}/harmonica/hardware-configuration.nix | 0 hosts/{ => nixos}/iso/configuration.nix | 0 hosts/{ => nixos}/pochita-sd/configuration.nix | 0 hosts/{ => nixos}/pochita/configuration.nix | 2 +- hosts/{ => nixos}/pochita/hardware-configuration.nix | 0 hosts/{ => nixos}/tartarus/configuration.nix | 2 +- .../{ => nixos}/tartarus/hardware-configuration.nix | 0 hosts/{ => nixos}/wallfacer/configuration.nix | 2 +- .../{ => nixos}/wallfacer/hardware-configuration.nix | 0 hosts/{ => nixos}/ymir/configuration.nix | 2 +- hosts/{ => nixos}/ymir/hardware-configuration.nix | 0 21 files changed, 16 insertions(+), 16 deletions(-) rename {darwinHosts => hosts/darwinHosts}/prometheus/configuration.nix (100%) rename {darwinHosts => hosts/darwinHosts}/prometheus/dummy-module.nix (100%) rename {nixOnDroidHosts => hosts/nixOnDroidHosts}/atreus/configuration.nix (100%) rename hosts/{ => nixos}/apollo/configuration.nix (96%) rename hosts/{ => nixos}/apollo/hardware-configuration.nix (100%) rename hosts/{ => nixos}/harmonica-sd/configuration.nix (97%) rename hosts/{ => nixos}/harmonica-sd/hardware-configuration.nix (100%) rename hosts/{ => nixos}/harmonica-sd/sd-image.nix (100%) rename hosts/{ => nixos}/harmonica/configuration.nix (96%) rename hosts/{ => nixos}/harmonica/hardware-configuration.nix (100%) rename hosts/{ => nixos}/iso/configuration.nix (100%) rename hosts/{ => nixos}/pochita-sd/configuration.nix (100%) rename hosts/{ => nixos}/pochita/configuration.nix (98%) rename hosts/{ => nixos}/pochita/hardware-configuration.nix (100%) rename hosts/{ => nixos}/tartarus/configuration.nix (96%) rename hosts/{ => nixos}/tartarus/hardware-configuration.nix (100%) rename hosts/{ => nixos}/wallfacer/configuration.nix (95%) rename hosts/{ => nixos}/wallfacer/hardware-configuration.nix (100%) rename hosts/{ => nixos}/ymir/configuration.nix (99%) rename hosts/{ => nixos}/ymir/hardware-configuration.nix (100%) diff --git a/flake.nix b/flake.nix index a639fc2..7947330 100644 --- a/flake.nix +++ b/flake.nix @@ -75,20 +75,20 @@ configName: nixpkgs.lib.nixosSystem { specialArgs = { inherit inputs outputs; }; - modules = [ ./hosts/${configName}/configuration.nix ]; + modules = [ ./hosts/nixos/${configName}/configuration.nix ]; }; - configNames = builtins.attrNames (builtins.readDir ./hosts); + nixosConfigNames = builtins.attrNames (builtins.readDir ./hosts/nixos); in { - nixosConfigurations = nixpkgs.lib.genAttrs configNames (name: makeNixosConfig name); + nixosConfigurations = nixpkgs.lib.genAttrs nixosConfigNames (name: makeNixosConfig name); nixOnDroidConfigurations.default = nix-on-droid.lib.nixOnDroidConfiguration { extraSpecialArgs = { inherit inputs outputs; }; pkgs = import nixpkgs { system = "aarch64-linux"; }; - modules = [ ./nixOnDroidHosts/atreus/configuration.nix ]; + modules = [ ./hosts/nixOnDroidHosts/atreus/configuration.nix ]; }; darwinConfigurations.prometheus = nix-darwin.lib.darwinSystem { system = "x86_64-darwin"; - modules = [ ./darwinHosts/prometheus/configuration.nix ]; + modules = [ ./hosts/darwinHosts/prometheus/configuration.nix ]; specialArgs = { inherit inputs outputs; }; }; lib = import ./lib { inherit (nixpkgs) lib; }; @@ -108,7 +108,7 @@ nixpkgs.lib.nixosSystem { specialArgs = { inherit inputs outputs; }; modules = [ - ./hosts/${configName}/configuration.nix + ./hosts/nixos/${configName}/configuration.nix { nixpkgs.hostPlatform = nixpkgs.lib.mkForce system; } ]; }; diff --git a/darwinHosts/prometheus/configuration.nix b/hosts/darwinHosts/prometheus/configuration.nix similarity index 100% rename from darwinHosts/prometheus/configuration.nix rename to hosts/darwinHosts/prometheus/configuration.nix diff --git a/darwinHosts/prometheus/dummy-module.nix b/hosts/darwinHosts/prometheus/dummy-module.nix similarity index 100% rename from darwinHosts/prometheus/dummy-module.nix rename to hosts/darwinHosts/prometheus/dummy-module.nix diff --git a/nixOnDroidHosts/atreus/configuration.nix b/hosts/nixOnDroidHosts/atreus/configuration.nix similarity index 100% rename from nixOnDroidHosts/atreus/configuration.nix rename to hosts/nixOnDroidHosts/atreus/configuration.nix diff --git a/hosts/apollo/configuration.nix b/hosts/nixos/apollo/configuration.nix similarity index 96% rename from hosts/apollo/configuration.nix rename to hosts/nixos/apollo/configuration.nix index 9d2d8af..aca6bc4 100644 --- a/hosts/apollo/configuration.nix +++ b/hosts/nixos/apollo/configuration.nix @@ -6,10 +6,10 @@ { imports = [ ./hardware-configuration.nix - ../../modules/common-packages.nix + ../../../modules/common-packages.nix # ../../modules/services/tailscale.nix # ../../modules/services/openssh.nix - ../../modules/nix-settings.nix + ../../../modules/nix-settings.nix inputs.disko.nixosModules.disko inputs.impermanence.nixosModules.impermanence ]; @@ -56,7 +56,7 @@ # Network driver for initrd - change to match your hardware # Common options: "virtio_pci" (VMs), "e1000e", "igb", "r8169" availableKernelModules = [ "virtio_pci" ]; - + network = { enable = true; ssh = { @@ -65,7 +65,7 @@ # Generate with: ssh-keygen -t ed25519 -N "" -f /persist/etc/ssh/ssh_host_ed25519_key_initrd hostKeys = [ "/persist/etc/ssh/ssh_host_ed25519_key_initrd" ]; # Add your SSH public key here - authorizedKeys = [ + authorizedKeys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPfnV+qqUCJf92npNW4Jy0hIiepCJFBDJHXBHnUlNX0k" ]; }; diff --git a/hosts/apollo/hardware-configuration.nix b/hosts/nixos/apollo/hardware-configuration.nix similarity index 100% rename from hosts/apollo/hardware-configuration.nix rename to hosts/nixos/apollo/hardware-configuration.nix diff --git a/hosts/harmonica-sd/configuration.nix b/hosts/nixos/harmonica-sd/configuration.nix similarity index 97% rename from hosts/harmonica-sd/configuration.nix rename to hosts/nixos/harmonica-sd/configuration.nix index a8f9874..413cd46 100644 --- a/hosts/harmonica-sd/configuration.nix +++ b/hosts/nixos/harmonica-sd/configuration.nix @@ -8,7 +8,7 @@ ./sd-image.nix "${inputs.nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix" ./hardware-configuration.nix - ../../modules + ../../../modules ]; myModules = { diff --git a/hosts/harmonica-sd/hardware-configuration.nix b/hosts/nixos/harmonica-sd/hardware-configuration.nix similarity index 100% rename from hosts/harmonica-sd/hardware-configuration.nix rename to hosts/nixos/harmonica-sd/hardware-configuration.nix diff --git a/hosts/harmonica-sd/sd-image.nix b/hosts/nixos/harmonica-sd/sd-image.nix similarity index 100% rename from hosts/harmonica-sd/sd-image.nix rename to hosts/nixos/harmonica-sd/sd-image.nix diff --git a/hosts/harmonica/configuration.nix b/hosts/nixos/harmonica/configuration.nix similarity index 96% rename from hosts/harmonica/configuration.nix rename to hosts/nixos/harmonica/configuration.nix index 928a786..78f2607 100644 --- a/hosts/harmonica/configuration.nix +++ b/hosts/nixos/harmonica/configuration.nix @@ -6,7 +6,7 @@ { imports = [ ./hardware-configuration.nix - ../../modules + ../../../modules ]; myModules = { diff --git a/hosts/harmonica/hardware-configuration.nix b/hosts/nixos/harmonica/hardware-configuration.nix similarity index 100% rename from hosts/harmonica/hardware-configuration.nix rename to hosts/nixos/harmonica/hardware-configuration.nix diff --git a/hosts/iso/configuration.nix b/hosts/nixos/iso/configuration.nix similarity index 100% rename from hosts/iso/configuration.nix rename to hosts/nixos/iso/configuration.nix diff --git a/hosts/pochita-sd/configuration.nix b/hosts/nixos/pochita-sd/configuration.nix similarity index 100% rename from hosts/pochita-sd/configuration.nix rename to hosts/nixos/pochita-sd/configuration.nix diff --git a/hosts/pochita/configuration.nix b/hosts/nixos/pochita/configuration.nix similarity index 98% rename from hosts/pochita/configuration.nix rename to hosts/nixos/pochita/configuration.nix index 30149a6..0bc7a14 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/nixos/pochita/configuration.nix @@ -7,7 +7,7 @@ { imports = [ ./hardware-configuration.nix - ../../modules + ../../../modules inputs.raspberry-pi-nix.nixosModules.raspberry-pi inputs.nixos-hardware.nixosModules.raspberry-pi-5 ]; diff --git a/hosts/pochita/hardware-configuration.nix b/hosts/nixos/pochita/hardware-configuration.nix similarity index 100% rename from hosts/pochita/hardware-configuration.nix rename to hosts/nixos/pochita/hardware-configuration.nix diff --git a/hosts/tartarus/configuration.nix b/hosts/nixos/tartarus/configuration.nix similarity index 96% rename from hosts/tartarus/configuration.nix rename to hosts/nixos/tartarus/configuration.nix index c3dad62..01c9c37 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/nixos/tartarus/configuration.nix @@ -7,7 +7,7 @@ { imports = [ ./hardware-configuration.nix - ../../modules + ../../../modules ]; myModules = { diff --git a/hosts/tartarus/hardware-configuration.nix b/hosts/nixos/tartarus/hardware-configuration.nix similarity index 100% rename from hosts/tartarus/hardware-configuration.nix rename to hosts/nixos/tartarus/hardware-configuration.nix diff --git a/hosts/wallfacer/configuration.nix b/hosts/nixos/wallfacer/configuration.nix similarity index 95% rename from hosts/wallfacer/configuration.nix rename to hosts/nixos/wallfacer/configuration.nix index 7ec82c1..47a2214 100644 --- a/hosts/wallfacer/configuration.nix +++ b/hosts/nixos/wallfacer/configuration.nix @@ -2,7 +2,7 @@ { imports = [ ./hardware-configuration.nix - ../../modules + ../../../modules ]; myModules = { enableKDE = false; diff --git a/hosts/wallfacer/hardware-configuration.nix b/hosts/nixos/wallfacer/hardware-configuration.nix similarity index 100% rename from hosts/wallfacer/hardware-configuration.nix rename to hosts/nixos/wallfacer/hardware-configuration.nix diff --git a/hosts/ymir/configuration.nix b/hosts/nixos/ymir/configuration.nix similarity index 99% rename from hosts/ymir/configuration.nix rename to hosts/nixos/ymir/configuration.nix index 5fea0d7..f02eb90 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/nixos/ymir/configuration.nix @@ -6,7 +6,7 @@ { imports = [ ./hardware-configuration.nix - ../../modules + ../../../modules ]; myModules = { diff --git a/hosts/ymir/hardware-configuration.nix b/hosts/nixos/ymir/hardware-configuration.nix similarity index 100% rename from hosts/ymir/hardware-configuration.nix rename to hosts/nixos/ymir/hardware-configuration.nix