From 53ac199cfef2013870931efed1402e1fb186830e Mon Sep 17 00:00:00 2001
From: CherryKitten <sammy@cherrykitten.dev>
Date: Sun, 24 Mar 2024 19:03:25 +0100
Subject: [PATCH] nya

---
 flake.nix                                      | 2 +-
 modules/{ => home}/users/sammy.nix             | 2 +-
 modules/nixos/common.nix                       | 2 +-
 modules/{users/default.nix => nixos/users.nix} | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename modules/{ => home}/users/sammy.nix (92%)
 rename modules/{users/default.nix => nixos/users.nix} (95%)

diff --git a/flake.nix b/flake.nix
index ef32871..cb4c6e9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -73,7 +73,7 @@
           mkHome = { user ? "sammy", hostname ? null }:
             lib.homeManagerConfiguration {
               inherit pkgs;
-              modules = [ ./modules/users/${user}.nix ] ++ lib.optional (!isNull hostname) ./modules/home/hosts/${hostname}.nix;
+              modules = [ ./modules/home/users/${user}.nix ] ++ lib.optional (!isNull hostname) ./modules/home/hosts/${hostname}.nix;
               extraSpecialArgs = {
                 inherit inputs outputs;
                 pkgs-unstable = import nixpkgs-unstable { system = "x86_64-linux"; };
diff --git a/modules/users/sammy.nix b/modules/home/users/sammy.nix
similarity index 92%
rename from modules/users/sammy.nix
rename to modules/home/users/sammy.nix
index 391ded7..6864e93 100644
--- a/modules/users/sammy.nix
+++ b/modules/home/users/sammy.nix
@@ -1,5 +1,5 @@
 { ... }: {
-  imports = [ ../home ];
+  imports = [ ../default.nix ];
 
   programs.git = {
     userName = "CherryKitten";
diff --git a/modules/nixos/common.nix b/modules/nixos/common.nix
index 5ebcaa3..311a948 100644
--- a/modules/nixos/common.nix
+++ b/modules/nixos/common.nix
@@ -9,7 +9,7 @@
   imports = [
     ./graphical.nix
     ./security.nix
-    ../users
+    ./users.nix
     ./yubikey.nix
     ./virtualization.nix
   ];
diff --git a/modules/users/default.nix b/modules/nixos/users.nix
similarity index 95%
rename from modules/users/default.nix
rename to modules/nixos/users.nix
index 1aab895..912da2c 100644
--- a/modules/users/default.nix
+++ b/modules/nixos/users.nix
@@ -16,6 +16,6 @@ in
       openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJZyQSZw+pExsx2RXB+yxbaJGB9mtvudbQ/BP7E1yKvr openpgp:0x6068FEBB" ];
     };
 
-    home-manager.users.sammy = lib.mkIf cfg.sammy.enable (import ./sammy.nix);
+    home-manager.users.sammy = lib.mkIf cfg.sammy.enable (import ../home/users/sammy.nix);
   };
 }