From 8cf7db2cd5f642646309c6ae64e24d797f2e1b94 Mon Sep 17 00:00:00 2001
From: Sokhibjon Orzikulov <sakhib@orzklv.uz>
Date: Mon, 26 Aug 2024 14:12:33 +0500
Subject: [PATCH] refixed issue with sakhib & sardor

---
 home/sakhib.nix                | 6 ++++--
 home/sardor.nix                | 2 --
 modules/nixos/users/sakhib.nix | 8 ++++----
 modules/nixos/users/sardor.nix | 8 ++++----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/home/sakhib.nix b/home/sakhib.nix
index d5a2789..1cad58e 100644
--- a/home/sakhib.nix
+++ b/home/sakhib.nix
@@ -9,15 +9,17 @@
 }: {
   imports = [
     outputs.homeManagerModules.zsh
+    outputs.homeManagerModules.helix
     outputs.homeManagerModules.nixpkgs
+    outputs.homeManagerModules.topgrade
     outputs.homeManagerModules.packages
   ];
 
   # This is required information for home-manager to do its job
   home = {
     stateVersion = "24.05";
-    username = "sardor";
-    homeDirectory = "/home/sardor";
+    username = "sakhib";
+    homeDirectory = "/home/sakhib";
 
     # Tell it to map everything in the `config` directory in this
     # repository to the `.config` in my home-manager directory
diff --git a/home/sardor.nix b/home/sardor.nix
index 9895c75..d5a2789 100644
--- a/home/sardor.nix
+++ b/home/sardor.nix
@@ -9,9 +9,7 @@
 }: {
   imports = [
     outputs.homeManagerModules.zsh
-    outputs.homeManagerModules.helix
     outputs.homeManagerModules.nixpkgs
-    outputs.homeManagerModules.topgrade
     outputs.homeManagerModules.packages
   ];
 
diff --git a/modules/nixos/users/sakhib.nix b/modules/nixos/users/sakhib.nix
index 1d326e0..3a10686 100644
--- a/modules/nixos/users/sakhib.nix
+++ b/modules/nixos/users/sakhib.nix
@@ -8,12 +8,12 @@
 }: {
   config = {
     users.users = {
-      sardor = {
+      sakhib = {
         isNormalUser = true;
-        description = "Sardor Qodirjonov";
+        description = "Sokhibjon Orzikulov";
         initialPassword = "F1st1ng15300Buck$!?";
         openssh.authorizedKeys.keys = [
-          "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIATIYPqUdcP64tufjGii7LNncg5N2AzX7fj4JH3Vtdq2 mhw0@yahoo.com"
+          "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDAGqU+JleLM0T44P2quirtLPrhFExOi6EOe0GYXkTFcTSjhw9LqiuX1/FbqNdKTaP9k6CdV3xc/8Z5wxbNOhpcPi9XLoupv9oNyIew7QYl+ZoAck6/qPsM7uptGYCwo0/ErzPNLd3ERD3KT1axCqrI6rWJ+JFOMAPtGeAZZxIedksViZ5SuNhpzXCIzS2PACqDTxFj7JwXK/pQ200h9ZS0MSh7iLKggXQfRVDndJxRnVY69NmbRa4MqkjgyxqWSDbqrDAXuTHpqKJ5kpXJ6p2a82EIHcCwXXpEmLwKxatxWJWJb9nurm3aS74BYmT3pRVVSPC6n5a2LWN9GxzvVh3AXXZtWGvjXSqBxHdSyUoDPuZnDneycdRC5vs6I1jSGTyDFdc4Etq1M5uUYb6SqCjJIBvTNqVnOf8nzFwl/ENvc8sbIVtILgAbBdwDiiQSu8xppqWMZfkQJy+uI5Ok7TZ8o5rGIblzfKyTiljCQb7RO7Klg3TwysetREn8ZEykBx0= This world soon will cherish into my darkness of my madness"
         ];
         extraGroups = [ "networkmanager" "wheel" "docker" "admins" ];
       };
@@ -23,7 +23,7 @@
       extraSpecialArgs = { inherit inputs outputs; };
       users = {
         # Import your home-manager configuration
-        sardor = import ../../../home/sardor.nix;
+        sakhib = import ../../../home/sakhib.nix;
       };
     };
   };
diff --git a/modules/nixos/users/sardor.nix b/modules/nixos/users/sardor.nix
index 016dc08..1d326e0 100644
--- a/modules/nixos/users/sardor.nix
+++ b/modules/nixos/users/sardor.nix
@@ -8,12 +8,12 @@
 }: {
   config = {
     users.users = {
-      sakhib = {
+      sardor = {
         isNormalUser = true;
-        description = "Sokhibjon Orzikulov";
+        description = "Sardor Qodirjonov";
         initialPassword = "F1st1ng15300Buck$!?";
         openssh.authorizedKeys.keys = [
-          "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDAGqU+JleLM0T44P2quirtLPrhFExOi6EOe0GYXkTFcTSjhw9LqiuX1/FbqNdKTaP9k6CdV3xc/8Z5wxbNOhpcPi9XLoupv9oNyIew7QYl+ZoAck6/qPsM7uptGYCwo0/ErzPNLd3ERD3KT1axCqrI6rWJ+JFOMAPtGeAZZxIedksViZ5SuNhpzXCIzS2PACqDTxFj7JwXK/pQ200h9ZS0MSh7iLKggXQfRVDndJxRnVY69NmbRa4MqkjgyxqWSDbqrDAXuTHpqKJ5kpXJ6p2a82EIHcCwXXpEmLwKxatxWJWJb9nurm3aS74BYmT3pRVVSPC6n5a2LWN9GxzvVh3AXXZtWGvjXSqBxHdSyUoDPuZnDneycdRC5vs6I1jSGTyDFdc4Etq1M5uUYb6SqCjJIBvTNqVnOf8nzFwl/ENvc8sbIVtILgAbBdwDiiQSu8xppqWMZfkQJy+uI5Ok7TZ8o5rGIblzfKyTiljCQb7RO7Klg3TwysetREn8ZEykBx0= This world soon will cherish into my darkness of my madness"
+          "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIATIYPqUdcP64tufjGii7LNncg5N2AzX7fj4JH3Vtdq2 mhw0@yahoo.com"
         ];
         extraGroups = [ "networkmanager" "wheel" "docker" "admins" ];
       };
@@ -23,7 +23,7 @@
       extraSpecialArgs = { inherit inputs outputs; };
       users = {
         # Import your home-manager configuration
-        sakhib = import ../../../home/sardor.nix;
+        sardor = import ../../../home/sardor.nix;
       };
     };
   };