mirror of
https://github.com/Nickiel12/nicks-nix-config.git
synced 2024-11-22 20:59:32 -08:00
fixed user not being passed around
This commit is contained in:
parent
4a4ba6d04a
commit
be437725c7
3 changed files with 4 additions and 37 deletions
|
@ -27,7 +27,7 @@
|
||||||
|
|
||||||
NicksNixLaptop = lib.nixosSystem {
|
NicksNixLaptop = lib.nixosSystem {
|
||||||
inherit system;
|
inherit system;
|
||||||
specialArgs = inputs;
|
specialArgs = { inherit user; };
|
||||||
|
|
||||||
modules = [
|
modules = [
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,33 +0,0 @@
|
||||||
{ lib, inputs, nixpkgs, home-manager, user, kmonad, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
home-manager.nixosModules.home-manager = {
|
|
||||||
useGlobalPkgs = true;
|
|
||||||
useUserPackages = true;
|
|
||||||
extraSpecialArgs = { inherit user; };
|
|
||||||
users.${user} = {
|
|
||||||
imports = [
|
|
||||||
../../users/${user}.nix
|
|
||||||
../../modules/emacs.nix
|
|
||||||
../../../modules/git.nix
|
|
||||||
../../modules/fusuma.nix
|
|
||||||
../../modules/vim.nix
|
|
||||||
../../modules/wezterm.nix
|
|
||||||
../../modules/xdg.nix
|
|
||||||
../../modules/zsh.nix
|
|
||||||
];
|
|
||||||
};
|
|
||||||
users.nicholix = {
|
|
||||||
imports = [
|
|
||||||
../../users/nicholix.nix
|
|
||||||
../../modules/emacs.nix
|
|
||||||
../../modules/git.nix
|
|
||||||
../../modules/fusuma.nix
|
|
||||||
../../modules/vim.nix
|
|
||||||
../../modules/wezterm.nix
|
|
||||||
../../modules/xdg.nix
|
|
||||||
../../modules/zsh.nix
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -9,7 +9,7 @@ let
|
||||||
extensions = [ "rust-src" "rust-analysis" ];}
|
extensions = [ "rust-src" "rust-analysis" ];}
|
||||||
);
|
);
|
||||||
|
|
||||||
user = "nicholix";
|
local_user = "nicholix";
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
|
@ -31,8 +31,8 @@ in
|
||||||
home = {
|
home = {
|
||||||
# Home Manager needs a bit of information about you and the
|
# Home Manager needs a bit of information about you and the
|
||||||
# paths it should manage.
|
# paths it should manage.
|
||||||
username = user;
|
username = local_user;
|
||||||
homeDirectory = "/home/${user}";
|
homeDirectory = "/home/${local_user}";
|
||||||
|
|
||||||
# This value determines the Home Manager release that your
|
# This value determines the Home Manager release that your
|
||||||
# configuration is compatible with. This helps avoid breakage
|
# configuration is compatible with. This helps avoid breakage
|
||||||
|
|
Loading…
Reference in a new issue