From 816c04c2a47c8e72ec3cb676726f42873808c159 Mon Sep 17 00:00:00 2001 From: Aly Raffauf Date: Fri, 26 Apr 2024 22:55:43 -0400 Subject: [PATCH] users: added password option --- hosts/fallarbor/default.nix | 13 ++++++++----- hosts/lavaridge/default.nix | 7 ++++--- hosts/mauville/default.nix | 10 ++++++++-- hosts/mossdeep/default.nix | 7 ++++--- hosts/petalburg/default.nix | 7 ++++--- hosts/rustboro/default.nix | 7 ++++--- nixosModules/user/aly/default.nix | 5 +++++ nixosModules/user/dustin/default.nix | 7 ++++++- 8 files changed, 43 insertions(+), 20 deletions(-) diff --git a/hosts/fallarbor/default.nix b/hosts/fallarbor/default.nix index c8d06128..b587bfe9 100644 --- a/hosts/fallarbor/default.nix +++ b/hosts/fallarbor/default.nix @@ -34,8 +34,14 @@ zramSwap = {enable = true;}; }; user = { - aly.enable = false; - dustin.enable = true; + aly = { + enable = false; + password = "$y$j9T$Ug0ZLHQQuRciFJDgOI6r00$eHc.KyQY0oU4k0LKRiZiGWJ19jkKNWHpOoyCJbtJif8"; + }; + dustin = { + enable = true; + password = "$y$j9T$OXQYhj4IWjRJWWYsSwcqf.$lCcdq9S7m0EAdej9KMHWj9flH8K2pUb2gitNhLTlLG/"; + }; }; desktop = { enable = true; @@ -47,8 +53,5 @@ }; }; - users.users.dustin.hashedPassword = "$y$j9T$OXQYhj4IWjRJWWYsSwcqf.$lCcdq9S7m0EAdej9KMHWj9flH8K2pUb2gitNhLTlLG/"; - # users.users.aly.hashedPassword = "$y$j9T$Ug0ZLHQQuRciFJDgOI6r00$eHc.KyQY0oU4k0LKRiZiGWJ19jkKNWHpOoyCJbtJif8"; - system.stateVersion = "23.11"; } diff --git a/hosts/lavaridge/default.nix b/hosts/lavaridge/default.nix index 57b6feaa..0980ae56 100644 --- a/hosts/lavaridge/default.nix +++ b/hosts/lavaridge/default.nix @@ -32,7 +32,10 @@ zramSwap = {enable = true;}; }; user = { - aly.enable = true; + aly = { + enable = true; + password = "$y$j9T$O9NgTk6iRfh3mxiRDvfdm1$BjvsAKYEMB3C28652FF15cj/i.3TgQAObQvR0rN1E6C"; + }; dustin.enable = false; }; desktop = { @@ -50,7 +53,5 @@ }; }; - users.users.aly.hashedPassword = "$y$j9T$O9NgTk6iRfh3mxiRDvfdm1$BjvsAKYEMB3C28652FF15cj/i.3TgQAObQvR0rN1E6C"; - system.stateVersion = "23.11"; # Did you read the comment? } diff --git a/hosts/mauville/default.nix b/hosts/mauville/default.nix index 99b86f69..ab429b78 100644 --- a/hosts/mauville/default.nix +++ b/hosts/mauville/default.nix @@ -43,8 +43,14 @@ in { hyprland.enable = true; }; user = { - aly.enable = true; - dustin.enable = true; + aly = { + enable = true; + password = "$y$j9T$SHPShqI2IpRE101Ey2ry/0$0mhW1f9LbVY02ifhJlP9XVImge9HOpf23s9i1JFLIt9"; + }; + dustin = { + enable = true; + password = "$y$j9T$3mMCBnUQ.xjuPIbSof7w0.$fPtRGblPRSwRLj7TFqk1nzuNQk2oVlgvb/bE47sghl."; + }; }; services = { binaryCache.enable = true; diff --git a/hosts/mossdeep/default.nix b/hosts/mossdeep/default.nix index e5150e86..391aaa5b 100644 --- a/hosts/mossdeep/default.nix +++ b/hosts/mossdeep/default.nix @@ -33,7 +33,10 @@ zramSwap = {enable = true;}; }; user = { - aly.enable = true; + aly = { + enable = true; + password = "$y$j9T$koxhEzkA4pYLsyIqZBTWM0$N8VW.JTM.HZZgNm7XgTxTXRzvYd7veA7TojG0gKOzO2"; + }; dustin.enable = false; }; desktop = { @@ -64,7 +67,5 @@ steamos.useSteamOSConfig = true; }; - users.users.aly.hashedPassword = "$y$j9T$koxhEzkA4pYLsyIqZBTWM0$N8VW.JTM.HZZgNm7XgTxTXRzvYd7veA7TojG0gKOzO2"; - system.stateVersion = "23.11"; # Did you read the comment? } diff --git a/hosts/petalburg/default.nix b/hosts/petalburg/default.nix index 938fb43a..eb5c6a76 100644 --- a/hosts/petalburg/default.nix +++ b/hosts/petalburg/default.nix @@ -78,7 +78,10 @@ in { zramSwap = {enable = true;}; }; user = { - aly.enable = true; + aly = { + enable = true; + password = "$y$j9T$Ug0ZLHQQuRciFJDgOI6r00$eHc.KyQY0oU4k0LKRiZiGWJ19jkKNWHpOoyCJbtJif8"; + }; dustin.enable = false; }; desktop = { @@ -97,7 +100,5 @@ in { }; }; - users.users.aly.hashedPassword = "$y$j9T$Ug0ZLHQQuRciFJDgOI6r00$eHc.KyQY0oU4k0LKRiZiGWJ19jkKNWHpOoyCJbtJif8"; - system.stateVersion = "23.11"; } diff --git a/hosts/rustboro/default.nix b/hosts/rustboro/default.nix index 94f59baa..34a88fea 100644 --- a/hosts/rustboro/default.nix +++ b/hosts/rustboro/default.nix @@ -53,7 +53,10 @@ }; }; user = { - aly.enable = true; + aly = { + enable = true; + password = "$y$j9T$VdtiEyMOegHpcUwgmCVFD0$K8Ne6.zk//VJNq2zxVQ0xE0Wg3LohvAQd3Xm9aXdM15"; + }; dustin.enable = false; }; desktop = { @@ -72,8 +75,6 @@ }; }; - users.users.aly.hashedPassword = "$y$j9T$VdtiEyMOegHpcUwgmCVFD0$K8Ne6.zk//VJNq2zxVQ0xE0Wg3LohvAQd3Xm9aXdM15"; - # environment.persistence."/persist" = { # hideMounts = true; # directories = [ diff --git a/nixosModules/user/aly/default.nix b/nixosModules/user/aly/default.nix index afa3595d..5375da62 100644 --- a/nixosModules/user/aly/default.nix +++ b/nixosModules/user/aly/default.nix @@ -7,6 +7,10 @@ }: { options = { alyraffauf.user.aly.enable = lib.mkEnableOption "Enables Aly's user."; + alyraffauf.user.aly.password = lib.mkOption { + description = "Whether to sync music folder."; + type = lib.types.str; + }; }; config = lib.mkIf config.alyraffauf.user.aly.enable { @@ -14,6 +18,7 @@ isNormalUser = true; description = "Aly Raffauf"; extraGroups = ["networkmanager" "wheel" "docker" "libvirtd" "video"]; + hashedPassword = config.alyraffauf.user.aly.password; }; }; } diff --git a/nixosModules/user/dustin/default.nix b/nixosModules/user/dustin/default.nix index d22c06ee..55ca9a0f 100644 --- a/nixosModules/user/dustin/default.nix +++ b/nixosModules/user/dustin/default.nix @@ -1,4 +1,5 @@ { + inputs, pkgs, lib, config, @@ -6,14 +7,18 @@ }: { options = { alyraffauf.user.dustin.enable = lib.mkEnableOption "Enables Dustin's user."; + alyraffauf.user.dustin.password = lib.mkOption { + description = "Whether to sync music folder."; + type = lib.types.str; + }; }; config = lib.mkIf config.alyraffauf.user.dustin.enable { - # Define a user account. Don't forget to set a password with ‘passwd’. users.users.dustin = { isNormalUser = true; description = "Dustin Raffauf"; extraGroups = ["networkmanager" "wheel" "docker" "libvirtd" "video"]; + hashedPassword = config.alyraffauf.user.dustin.password; }; }; }