diff --git a/configuration.nix b/configuration.nix index f0ab95f..bfb7c5b 100644 --- a/configuration.nix +++ b/configuration.nix @@ -1,7 +1,7 @@ -{ pkgs, userSettings, systemSettings, ... }: +{ pkgs, lib, userSettings, systemSettings, ... }: { imports = [ - (import ./home-manager/home.nix {inherit systemSettings userSettings;}) + (import ./home-manager/home.nix {inherit systemSettings userSettings lib;}) ./nixos ./scripts ]; diff --git a/flake.nix b/flake.nix index 8418558..2f59822 100644 --- a/flake.nix +++ b/flake.nix @@ -31,12 +31,12 @@ nixosSystem = args.nixpkgs.lib.nixosSystem; userSettings = { - userName = "appdaemon"; gitUserName = "John Lancaster"; gitUserEmail = "32917998+jsl12@users.noreply.github.com"; adRepo = "https://github.com/jsl12/appdaemon"; adBranch = "hass"; - adHome = "/srv/appdaemon"; + userName = "appdaemon"; + adHome = "/home/appdaemon"; }; systemSettings = { diff --git a/home-manager/home.nix b/home-manager/home.nix index cd6d89e..62503d0 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -1,4 +1,4 @@ -{ systemSettings, userSettings, ... }: +{ lib, systemSettings, userSettings, ... }: { security.sudo-rs = { enable = true; @@ -10,14 +10,13 @@ isNormalUser = true; extraGroups = [ "wheel" "docker" ]; openssh.authorizedKeys.keyFiles = [ ../secrets/authorized_keys ]; - }; home-manager = { useGlobalPkgs = true; users.${userSettings.userName} = { ... }: { home.stateVersion = systemSettings.stateVersion; - home.homeDirectory = "${userSettings.adHome}"; + home.homeDirectory = lib.mkForce "${userSettings.adHome}"; systemd.user.startServices = "sd-switch"; # helps with handling systemd services when switching imports = [ (import ./git.nix {inherit userSettings;}) ]; programs = {