lf3/server-conf
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix homes

Browse source
This commit is contained in:
jopejoe1 2024-04-27 16:45:52 +02:00
parent a12ae68a49
commit 58a5caa772
4 changed files with 55 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
users/default.nix
View file

@ -1,23 +1,20 @@
{ {
pkgs, pkgs,
config, config,
user, ...
home,
}: }:
{ {
home = { home = {
username = user.name;
homeDirectory = user.home;
stateVersion = config.system.stateVersion;
sessionVariables = { sessionVariables = {
XCOMPOSECACHE = "${home.xdg.cacheHome}/X11/xcompos"; XCOMPOSECACHE = "${config.xdg.cacheHome}/X11/xcompos";
XAUTHORITY = "$XDG_RUNTIME_DIR/Xauthority"; XAUTHORITY = "$XDG_RUNTIME_DIR/Xauthority";
ANDROID_HOME = "${home.xdg.dataHome}/android"; ANDROID_HOME = "${config.xdg.dataHome}/android";
CUDA_CACHE_PATH = "${home.xdg.cacheHome}/nv"; CUDA_CACHE_PATH = "${config.xdg.cacheHome}/nv";
GRADLE_USER_HOME = "${home.xdg.dataHome}/gradle"; GRADLE_USER_HOME = "${config.xdg.dataHome}/gradle";
KODI_DATA = "${home.xdg.dataHome}/kodi"; KODI_DATA = "${config.xdg.dataHome}/kodi";
_JAVA_OPTIONS = "-Djava.util.prefs.userRoot=${home.xdg.configHome}/java"; _JAVA_OPTIONS = "-Djava.util.prefs.userRoot=${config.xdg.configHome}/java";
WINEPREFIX = "${home.xdg.dataHome}/wine"; WINEPREFIX = "${config.xdg.dataHome}/wine";
}; };
}; };
@ -42,27 +39,27 @@
}; };
gpg = { gpg = {
enable = true; enable = true;
homedir = "${home.xdg.dataHome}/gnupg"; homedir = "${config.xdg.dataHome}/gnupg";
}; };
}; };
xdg = { xdg = {
enable = true; enable = true;
mime.enable = true; mime.enable = true;
cacheHome = "${home.home.homeDirectory}/.cache"; cacheHome = "${config.home.homeDirectory}/.cache";
configHome = "${home.home.homeDirectory}/.config"; configHome = "${config.home.homeDirectory}/.config";
dataHome = "${home.home.homeDirectory}/.local/share"; dataHome = "${config.home.homeDirectory}/.local/share";
stateHome = "${home.home.homeDirectory}/.local/state"; stateHome = "${config.home.homeDirectory}/.local/state";
userDirs = { userDirs = {
enable = true; enable = true;
createDirectories = true; createDirectories = true;
desktop = "${home.home.homeDirectory}/Desktop"; desktop = "${config.home.homeDirectory}/Desktop";
documents = "${home.home.homeDirectory}/Documents"; documents = "${config.home.homeDirectory}/Documents";
download = "${home.home.homeDirectory}/Downloads"; download = "${config.home.homeDirectory}/Downloads";
music = "${home.home.homeDirectory}/Music"; music = "${config.home.homeDirectory}/Music";
pictures = "${home.home.homeDirectory}/Pictures"; pictures = "${config.home.homeDirectory}/Pictures";
publicShare = "${home.home.homeDirectory}/Public"; publicShare = "${config.home.homeDirectory}/Public";
templates = "${home.home.homeDirectory}/Templates"; templates = "${config.home.homeDirectory}/Templates";
videos = "${home.home.homeDirectory}/Videos"; videos = "${config.home.homeDirectory}/Videos";
}; };
}; };
} }

11
users/fp/default.nix
View file

@ -10,9 +10,12 @@
isNormalUser = true; isNormalUser = true;
shell = pkgs.fish; shell = pkgs.fish;
}; };
home-manager.users.fp = import ../. { home-manager.users.fp = {
inherit pkgs config; imports = [ ../. ];
user = config.users.users.fp; home = {
home = config.home-manager.users.fp; username = config.users.users.fp.name;
homeDirectory = config.users.users.fp.home;
stateVersion = config.system.stateVersion;
};
}; };
} }

16
users/jopejoe1/default.nix
View file

@ -22,14 +22,14 @@
]; ];
uid = 1000; uid = 1000;
}; };
home-manager.users.jopejoe1 = home-manager.users.jopejoe1 = {
import ../. { imports = [ ../. ];
inherit pkgs config; home = {
user = config.users.users.jopejoe1; username = config.users.users.jopejoe1.name;
home = config.home-manager.users.jopejoe1; homeDirectory = config.users.users.jopejoe1.home;
} stateVersion = config.system.stateVersion;
// { };
programs = { programs =
nushell = { nushell = {
enable = true; enable = true;
extraConfig = '' extraConfig = ''

11
users/root/default.nix
View file

@ -7,9 +7,12 @@
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB8oyMpS2hK3gQXyHIIVS6oilgMpemLmfhKKJ6RBMwUh johannes@joens.email" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB8oyMpS2hK3gQXyHIIVS6oilgMpemLmfhKKJ6RBMwUh johannes@joens.email"
]; ];
}; };
home-manager.users.root = import ../. { home-manager.users.root = {
inherit pkgs config; imports = [ ../. ];
user = config.users.users.root; home = {
home = config.home-manager.users.root; username = config.users.users.jopejoe1.name;
homeDirectory = config.users.users.jopejoe1.home;
stateVersion = config.system.stateVersion;
};
}; };
} }