From 89e223ca232c6627db06e756a2d2f8b2509f7fd1 Mon Sep 17 00:00:00 2001 From: Yorick Barbanneau Date: Sat, 2 Sep 2023 21:29:17 +0200 Subject: [PATCH] Username become a variable --- flake.nix | 1 + nixos/default.nix | 4 ++-- nixos/includes/system/user.nix | 10 +++------- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/flake.nix b/flake.nix index 3948651..87c5b45 100644 --- a/flake.nix +++ b/flake.nix @@ -17,6 +17,7 @@ in rec { specialArgs = { inherit stateVersion; hostname = "mrmeeseeks"; + username = "ephase"; }; modules = [ ./nixos/default.nix diff --git a/nixos/default.nix b/nixos/default.nix index caa3fef..3bfcf83 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, stateVersion, hostname, ... }: +{ config, pkgs, lib, stateVersion, hostname, username, ... }: { imports = @@ -41,7 +41,7 @@ home-manager = { useGlobalPkgs = true; useUserPackages = true; - users.ephase = { + users.${username} = { home.stateVersion = stateVersion; programs.home-manager.enable = true; imports = [ diff --git a/nixos/includes/system/user.nix b/nixos/includes/system/user.nix index 10f97a1..b3f2970 100644 --- a/nixos/includes/system/user.nix +++ b/nixos/includes/system/user.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ config, pkgs, username, ... }: { # Services services.pcscd.enable = true; @@ -12,14 +12,10 @@ # Configs fonts.fontconfig.enable = true; - users.users.ephase = { + users.users.${username} = { shell = pkgs.zsh; isNormalUser = true; extraGroups = [ "video" "wheel" ]; - home = "/home/ephase"; - packages = with pkgs; [ - remmina - gcc - ]; + home = "/home/${username}"; }; }