From 6f7f172d23cfcc5b077819a839d4a6b1da0ca697 Mon Sep 17 00:00:00 2001 From: Sokhibjon Orzikulov Date: Mon, 26 Aug 2024 14:07:33 +0500 Subject: [PATCH] adding sardor to kolyma-3 --- home/sakhib.nix | 6 ++--- home/sardor.nix | 42 ++++++++++++++++++++++++++++++++ modules/nixos/users/default.nix | 1 + modules/nixos/users/sakhib.nix | 8 +++--- modules/nixos/users/sardor.nix | 30 +++++++++++++++++++++++ nixos/kolyma-3/configuration.nix | 1 + 6 files changed, 80 insertions(+), 8 deletions(-) create mode 100644 home/sardor.nix create mode 100644 modules/nixos/users/sardor.nix diff --git a/home/sakhib.nix b/home/sakhib.nix index 1cad58e..d5a2789 100644 --- a/home/sakhib.nix +++ b/home/sakhib.nix @@ -9,17 +9,15 @@ }: { 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 = "sakhib"; - homeDirectory = "/home/sakhib"; + username = "sardor"; + homeDirectory = "/home/sardor"; # 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 new file mode 100644 index 0000000..9895c75 --- /dev/null +++ b/home/sardor.nix @@ -0,0 +1,42 @@ +{ inputs +, lib +, pkgs +, config +, outputs +, packages +, self +, ... +}: { + 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"; + + # Tell it to map everything in the `config` directory in this + # repository to the `.config` in my home-manager directory + file.".config" = { + source = ../.github/configs/config; + recursive = true; + }; + + file.".local/share" = { + source = ../.github/configs/share; + recursive = true; + }; + + # Don't check if home manager is same as nixpkgs + enableNixpkgsReleaseCheck = false; + }; + + # Let's enable home-manager + programs.home-manager.enable = true; +} diff --git a/modules/nixos/users/default.nix b/modules/nixos/users/default.nix index 03a1091..8c49586 100644 --- a/modules/nixos/users/default.nix +++ b/modules/nixos/users/default.nix @@ -2,6 +2,7 @@ { # List your users here sakhib = import ./sakhib.nix; + sardor = import ./sardor.nix; shakhzod = import ./shakhzod.nix; muzaffar = import ./muzaffar.nix; } diff --git a/modules/nixos/users/sakhib.nix b/modules/nixos/users/sakhib.nix index 3a10686..1d326e0 100644 --- a/modules/nixos/users/sakhib.nix +++ b/modules/nixos/users/sakhib.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/sakhib.nix; + sardor = import ../../../home/sardor.nix; }; }; }; diff --git a/modules/nixos/users/sardor.nix b/modules/nixos/users/sardor.nix new file mode 100644 index 0000000..3a10686 --- /dev/null +++ b/modules/nixos/users/sardor.nix @@ -0,0 +1,30 @@ +{ pkgs +, inputs +, outputs +, lib +, config +, packages +, ... +}: { + config = { + users.users = { + sakhib = { + isNormalUser = true; + description = "Sokhibjon Orzikulov"; + 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" + ]; + extraGroups = [ "networkmanager" "wheel" "docker" "admins" ]; + }; + }; + + home-manager = { + extraSpecialArgs = { inherit inputs outputs; }; + users = { + # Import your home-manager configuration + sakhib = import ../../../home/sakhib.nix; + }; + }; + }; +} diff --git a/nixos/kolyma-3/configuration.nix b/nixos/kolyma-3/configuration.nix index 8d10a28..7adee98 100644 --- a/nixos/kolyma-3/configuration.nix +++ b/nixos/kolyma-3/configuration.nix @@ -18,6 +18,7 @@ # User configs outputs.nixosModules.users.sakhib + outputs.nixosModules.users.sardor outputs.nixosModules.users.shakhzod outputs.nixosModules.users.muzaffar