From 99e9229b096d747afe2e7fad7ba3fc5640dd5a3b Mon Sep 17 00:00:00 2001
From: Johannes Rothe <mail@johannes-rothe.de>
Date: Sun, 22 Dec 2024 23:49:58 +0100
Subject: [PATCH] Move hosts to subfolders

---
 flake.nix                                                | 9 ++++-----
 configuration.nix => hosts/lift/configuration.nix        | 8 ++------
 .../lift/hardware-configuration.nix                      | 0
 vps-configuration.nix => hosts/tien/configuration.nix    | 4 ++--
 vps-disk-config.nix => hosts/tien/disk-config.nix        | 0
 .../tien/hardware-configuration.nix                      | 0
 sway.nix                                                 | 7 -------
 7 files changed, 8 insertions(+), 20 deletions(-)
 rename configuration.nix => hosts/lift/configuration.nix (95%)
 rename hardware-configuration.nix => hosts/lift/hardware-configuration.nix (100%)
 rename vps-configuration.nix => hosts/tien/configuration.nix (96%)
 rename vps-disk-config.nix => hosts/tien/disk-config.nix (100%)
 rename vps-hardware-configuration.nix => hosts/tien/hardware-configuration.nix (100%)
 delete mode 100644 sway.nix

diff --git a/flake.nix b/flake.nix
index 208c21f..435b612 100644
--- a/flake.nix
+++ b/flake.nix
@@ -32,17 +32,16 @@
         lift = nixpkgs.lib.nixosSystem {
           inherit system;
           modules = [
-            ./configuration.nix
-            ./sway.nix
-            ./hardware-configuration.nix
+            ./hosts/lift/configuration.nix
+            ./hosts/lift/hardware-configuration.nix
           ];
         };
         tien = nixpkgs.lib.nixosSystem {
           inherit system;
           modules = [
             disko.nixosModules.disko
-            ./vps-configuration.nix
-            ./vps-hardware-configuration.nix
+            ./hosts/tien/configuration.nix
+            ./hosts/tien/hardware-configuration.nix
           ];
         };
       };
diff --git a/configuration.nix b/hosts/lift/configuration.nix
similarity index 95%
rename from configuration.nix
rename to hosts/lift/configuration.nix
index 490cd99..2e84f67 100644
--- a/configuration.nix
+++ b/hosts/lift/configuration.nix
@@ -1,12 +1,8 @@
-# Edit this configuration file to define what should be installed on
-# your system.  Help is available in the configuration.nix(5) man page
-# and in the NixOS manual (accessible by running ‘nixos-help’).
-
-{ config, pkgs, lib, ... }:
+{ pkgs, ... }:
 
 {
   imports = [
-    nixos/desktop/printing
+    ../../nixos/desktop/printing
   ];
 
   # Bootloader.
diff --git a/hardware-configuration.nix b/hosts/lift/hardware-configuration.nix
similarity index 100%
rename from hardware-configuration.nix
rename to hosts/lift/hardware-configuration.nix
diff --git a/vps-configuration.nix b/hosts/tien/configuration.nix
similarity index 96%
rename from vps-configuration.nix
rename to hosts/tien/configuration.nix
index 1f24ddf..e158e91 100644
--- a/vps-configuration.nix
+++ b/hosts/tien/configuration.nix
@@ -1,9 +1,9 @@
-{  config, modulesPath, lib, pkgs, ... }:
+{  modulesPath, lib, pkgs, ... }:
 {
   imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
     (modulesPath + "/profiles/qemu-guest.nix")
-    ./vps-disk-config.nix
+    ./disk-config.nix
   ];
   boot.loader.grub = {
     # no need to set devices, disko will add all devices that have a EF02 partition to the list already
diff --git a/vps-disk-config.nix b/hosts/tien/disk-config.nix
similarity index 100%
rename from vps-disk-config.nix
rename to hosts/tien/disk-config.nix
diff --git a/vps-hardware-configuration.nix b/hosts/tien/hardware-configuration.nix
similarity index 100%
rename from vps-hardware-configuration.nix
rename to hosts/tien/hardware-configuration.nix
diff --git a/sway.nix b/sway.nix
deleted file mode 100644
index ecf7269..0000000
--- a/sway.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  programs.sway = {
-    enable = true;
-  };
-}