From ff1bb7617e20c92874a8920b422765e675110ca1 Mon Sep 17 00:00:00 2001
From: "Mohamed C." <mohamed@chrayed.de>
Date: Sat, 10 Aug 2024 16:42:17 +0200
Subject: [PATCH] refractor

---
 flake.nix                                     | 22 +++++++++++++------
 global/system-imports.nix                     |  1 -
 hosts/computer-mo/system-imports.nix          |  1 +
 .../system-settings/sys.set-desktop.nix       |  4 ++--
 .../system-settings/sys.set-steam.nix         |  4 ++--
 .../system-settings/sys.set-users.nix         |  4 ++--
 6 files changed, 22 insertions(+), 14 deletions(-)
 rename {global => hosts/computer-mo}/system-settings/sys.set-users.nix (66%)

diff --git a/flake.nix b/flake.nix
index 7538eb8..1235b94 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,17 +15,25 @@
   };
   outputs = { self, nixpkgs, home-manager, jovian, plasma-manager,  ...}:
    let
+    host-computer = "computer-mo";
+    host-deck = "steamdeck";
+    host-konsole = "konsole";
+    host-server = "server";
+
+    user-computer = "mo";
+    user-deck = "deck";
+    user-konsole = "deck";
+    user-server = "administrator";
+
     lib = nixpkgs.lib;
-    host = "computer-mo";
-    user = "mo";
     system = "x86_64-linux";
     pkgs = import nixpkgs {inherit system;};
     in {
     nixosConfigurations = {
-      ${host} = lib.nixosSystem {
-       specialArgs = {inherit user host;};
+      ${host-computer} = lib.nixosSystem {
+       specialArgs = {inherit user-computer host-computer;};
        modules = [
-          ./hosts/${host}/system-imports.nix
+          ./hosts/${host-computer}/system-imports.nix
           ./global/system-imports.nix
           jovian.nixosModules.jovian
           home-manager.nixosModules.home-manager
@@ -34,8 +42,8 @@
             home-manager.useUserPackages = true;
             home-manager.backupFileExtension = "backup";
             home-manager.extraSpecialArgs = {inherit pkgs;};
-            home-manager.users.${user}.imports = [
-                                  ./hosts/${host}/user-imports.nix
+            home-manager.users.${user-computer}.imports = [
+                                  ./hosts/${host-computer}/user-imports.nix
                                   ./global/user-imports.nix
                                   ];
             home-manager.sharedModules = [ plasma-manager.homeManagerModules.plasma-manager];
diff --git a/global/system-imports.nix b/global/system-imports.nix
index 27bfa91..107ba10 100644
--- a/global/system-imports.nix
+++ b/global/system-imports.nix
@@ -11,6 +11,5 @@
       ./system-settings/sys.set-networking.nix
       ./system-settings/sys.set-system.nix
       ./system-settings/sys.set-updates.nix
-      ./system-settings/sys.set-users.nix
     ];
 }
diff --git a/hosts/computer-mo/system-imports.nix b/hosts/computer-mo/system-imports.nix
index 5b86536..406179a 100644
--- a/hosts/computer-mo/system-imports.nix
+++ b/hosts/computer-mo/system-imports.nix
@@ -21,5 +21,6 @@
       ./system-settings/sys.set-hardware.nix
       ./system-settings/sys.set-steam.nix
       ./system-settings/sys.set-systemd.nix
+      ./system-settings/sys.set-users.nix
     ];
 }
diff --git a/hosts/computer-mo/system-settings/sys.set-desktop.nix b/hosts/computer-mo/system-settings/sys.set-desktop.nix
index 0815327..4c0d6b6 100644
--- a/hosts/computer-mo/system-settings/sys.set-desktop.nix
+++ b/hosts/computer-mo/system-settings/sys.set-desktop.nix
@@ -1,5 +1,5 @@
-{ user, ... }:
+{ user-computer, ... }:
 {
   services.displayManager.autoLogin.enable = true;
-  services.displayManager.autoLogin.user = user;
+  services.displayManager.autoLogin.user = user-computer;
 }
diff --git a/hosts/computer-mo/system-settings/sys.set-steam.nix b/hosts/computer-mo/system-settings/sys.set-steam.nix
index 86d6b2f..48df2a9 100644
--- a/hosts/computer-mo/system-settings/sys.set-steam.nix
+++ b/hosts/computer-mo/system-settings/sys.set-steam.nix
@@ -1,8 +1,8 @@
-{ user, ... }:
+{ user-computer, ... }:
 {
   jovian.steam = {
     autoStart = false;
-    user = user;
+    user = user-computer;
     desktopSession = "plasma";
   };
 
diff --git a/global/system-settings/sys.set-users.nix b/hosts/computer-mo/system-settings/sys.set-users.nix
similarity index 66%
rename from global/system-settings/sys.set-users.nix
rename to hosts/computer-mo/system-settings/sys.set-users.nix
index 71da534..0e574ce 100644
--- a/global/system-settings/sys.set-users.nix
+++ b/hosts/computer-mo/system-settings/sys.set-users.nix
@@ -1,6 +1,6 @@
-{ user, ... }:
+{ user-computer, ... }:
 {
-  users.users.${user} = {
+  users.users.${user-computer} = {
     isNormalUser = true;
     description = "Mohamed Chrayed";
     extraGroups = [ "networkmanager" "wheel" ];