diff --git a/flake.nix b/flake.nix index da5dfc4..d7fbb47 100644 --- a/flake.nix +++ b/flake.nix @@ -15,11 +15,13 @@ outputs = { self, nixpkgs, home-manager, ... }: let lib = nixpkgs.lib; + userVars = import ./vars.nix; in { nixosConfigurations = { nabro = lib.nixosSystem { system = "x86_64-linux"; + specialArgs = { inherit userVars; }; modules = [ ./hosts/nabro/configuration.nix @@ -28,9 +30,7 @@ home-manager = { useGlobalPkgs = true; useUserPackages = true; - - - + extraSpecialArgs = { inherit userVars; }; backupFileExtension = "backup"; }; } diff --git a/modules/desktop.nix b/modules/desktop.nix index 5045153..9ecf1d5 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, userVars, ... }: let cfg = config.dotfiles.desktop; @@ -39,7 +39,7 @@ in tor-browser ]; - home-manager.users.semere = { + home-manager.users."${userVars.username}" = { programs.foot = { enable = true; settings = { diff --git a/modules/shell.nix b/modules/shell.nix index 890be70..9f72b0d 100644 --- a/modules/shell.nix +++ b/modules/shell.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, userVars, ... }: let cfg = config.dotfiles.shell; @@ -22,19 +22,19 @@ in opencode ]; - home-manager.users.semere = { + home-manager.users."${userVars.username}" = { programs.git = { enable = true; settings = { user = { - name = "Semere M. Mebrahtom"; - email = "semere.meharena1@gmail.com"; + name = userVars.fullName; + email = userVars.email; }; commit.gpgsign = true; gpg.program = "gpg"; }; signing = { - key = "451054EEC0D2AFD1741D4E6A7FC937214DF30488"; + key = userVars.gpgKey; signByDefault = true; }; }; diff --git a/modules/user.nix b/modules/user.nix index a1d3907..a59a6af 100644 --- a/modules/user.nix +++ b/modules/user.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, userVars, ... }: let cfg = config.dotfiles.user; @@ -9,7 +9,7 @@ in }; config = lib.mkIf cfg.enable { - users.users.semere = { + users.users."${userVars.username}" = { isNormalUser = true; extraGroups = [ "wheel" @@ -17,9 +17,9 @@ in ]; }; - home-manager.users.semere = { - home.username = "semere"; - home.homeDirectory = "/home/semere"; + home-manager.users."${userVars.username}" = { + home.username = userVars.username; + home.homeDirectory = "/home/${userVars.username}"; home.stateVersion = "26.05"; }; }; diff --git a/vars.nix b/vars.nix new file mode 100644 index 0000000..3e886b5 --- /dev/null +++ b/vars.nix @@ -0,0 +1,6 @@ +{ + username = "semere"; + email = "semere.meharena1@gmail.com"; + fullName = "Semere M. Mebrahtom"; + gpgKey = "451054EEC0D2AFD1741D4E6A7FC937214DF30488"; +}