home dir updates

This commit is contained in:
John Lancaster
2024-12-29 13:47:27 -06:00
parent a8c4b75eb1
commit 321b5f7e3c
3 changed files with 6 additions and 7 deletions

View File

@@ -1,7 +1,7 @@
{ pkgs, userSettings, systemSettings, ... }: { pkgs, lib, userSettings, systemSettings, ... }:
{ {
imports = [ imports = [
(import ./home-manager/home.nix {inherit systemSettings userSettings;}) (import ./home-manager/home.nix {inherit systemSettings userSettings lib;})
./nixos ./nixos
./scripts ./scripts
]; ];

View File

@@ -31,12 +31,12 @@
nixosSystem = args.nixpkgs.lib.nixosSystem; nixosSystem = args.nixpkgs.lib.nixosSystem;
userSettings = { userSettings = {
userName = "appdaemon";
gitUserName = "John Lancaster"; gitUserName = "John Lancaster";
gitUserEmail = "32917998+jsl12@users.noreply.github.com"; gitUserEmail = "32917998+jsl12@users.noreply.github.com";
adRepo = "https://github.com/jsl12/appdaemon"; adRepo = "https://github.com/jsl12/appdaemon";
adBranch = "hass"; adBranch = "hass";
adHome = "/srv/appdaemon"; userName = "appdaemon";
adHome = "/home/appdaemon";
}; };
systemSettings = { systemSettings = {

View File

@@ -1,4 +1,4 @@
{ systemSettings, userSettings, ... }: { lib, systemSettings, userSettings, ... }:
{ {
security.sudo-rs = { security.sudo-rs = {
enable = true; enable = true;
@@ -10,14 +10,13 @@
isNormalUser = true; isNormalUser = true;
extraGroups = [ "wheel" "docker" ]; extraGroups = [ "wheel" "docker" ];
openssh.authorizedKeys.keyFiles = [ ../secrets/authorized_keys ]; openssh.authorizedKeys.keyFiles = [ ../secrets/authorized_keys ];
}; };
home-manager = { home-manager = {
useGlobalPkgs = true; useGlobalPkgs = true;
users.${userSettings.userName} = { ... }: { users.${userSettings.userName} = { ... }: {
home.stateVersion = systemSettings.stateVersion; 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 systemd.user.startServices = "sd-switch"; # helps with handling systemd services when switching
imports = [ (import ./git.nix {inherit userSettings;}) ]; imports = [ (import ./git.nix {inherit userSettings;}) ];
programs = { programs = {