Daholli/nixos-config
1
0
Fork 0
Code Issues 2 Pull requests Releases Packages Activity Actions

users: let user module handle home-manager init

Browse source
This commit is contained in:
Christoph Hollizeck 2025-12-02 13:54:41 +01:00
parent 56da328707
commit cc2a9e991b
Signed by: Daholli
GPG key ID: 249300664F2AF2C7
6 changed files with 90 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

20
modules/hosts/loptland/default.nix
View file

@ -19,9 +19,7 @@ topLevel: {
# TODO: dunno why I need this packge
environment.systemPackages = [ pkgs.dconf ];
imports =
with topLevel.config.flake.modules.nixos;
[
imports = with topLevel.config.flake.modules.nixos; [
(modulesPath + "/profiles/qemu-guest.nix")
inputs.catppuccin.nixosModules.catppuccin
@ -41,22 +39,6 @@ topLevel: {
# Users
cholli
]
++ [
{
home-manager.users.cholli = {
imports = with topLevel.config.flake.modules.homeManager; [
inputs.catppuccin.homeModules.catppuccin
# components
base
# Activate all user based config
cholli
];
};
}
];
services.tailscale = {

18
modules/hosts/nixberry/default.nix
View file

@ -52,24 +52,6 @@ topLevel: {
server
cholli
]
++ [
{
home-manager.users.cholli = {
imports = with topLevel.config.flake.modules.homeManager; [
inputs.catppuccin.homeModules.catppuccin
# components
base
# Activate all user based config
cholli
];
# https://github.com/NixOS/nixpkgs/pull/398456
home.enableNixpkgsReleaseCheck = false;
};
}
];
services.tailscale = {

21
modules/hosts/wsl/default.nix
View file

@ -12,31 +12,14 @@ topLevel: {
};
programs.dconf.enable = true;
imports =
with topLevel.config.flake.modules.nixos;
[
imports = with topLevel.config.flake.modules.nixos; [
inputs.nixos-wsl.nixosModules.default
base
server
cholli
]
++ [
{
home-manager.users.cholli = {
imports = with topLevel.config.flake.modules.homeManager; [
inputs.catppuccin.homeModules.catppuccin
# components
base
# Activate all user based config
cholli
];
};
}
];
wsl = {
enable = true;
defaultUser = topLevel.config.flake.meta.users.cholli.username;

23
modules/hosts/yggdrasil/default.nix
View file

@ -31,7 +31,6 @@ in
termscp
nixpkgs-review
# inputs.nix-gaming.packages.${pkgs.stdenv.hostPlatform.system}.star-citizen
];
services.teamviewer.enable = true;
@ -41,9 +40,7 @@ in
AddressFamily inet
'';
imports =
with config.flake.modules.nixos;
[
imports = with config.flake.modules.nixos; [
inputs.nixos-hardware.nixosModules.common-cpu-amd
inputs.nixos-hardware.nixosModules.common-pc
inputs.nixos-hardware.nixosModules.common-pc-ssd
@ -69,23 +66,7 @@ in
# Users
cholli
]
++ [
{
home-manager.users.cholli = {
imports = with config.flake.modules.homeManager; [
inputs.catppuccin.homeModules.catppuccin
# components
base
dev
# Activate all user based config
cholli
];
};
}
root
];
nix = {

24
modules/users/cholli/default.nix
View file

@ -18,8 +18,30 @@ topLevel: {
modules = {
nixos.cholli =
{ config, pkgs, ... }:
{
config,
inputs,
pkgs,
...
}:
{
imports = [
{
home-manager.users.cholli = {
imports = with topLevel.config.flake.modules.homeManager; [
inputs.catppuccin.homeModules.catppuccin
# components
base
dev
# Activate all user based config
cholli
];
};
}
];
programs.fish.enable = true;
sops.secrets.passwordHash.neededForUsers = true;

22
modules/users/root/default.nix
View file

@ -1,8 +1,28 @@
topLevel: {
flake = {
modules.nixos.root =
{ config, pkgs, ... }:
{
config,
inputs,
pkgs,
...
}:
{
imports = [
{
home-manager.users.root = {
imports = with topLevel.config.flake.modules.homeManager; [
inputs.catppuccin.homeModules.catppuccin
# components
base
# Activate all user based config
cholli # TODO: make root based config that makes it clear I am root user right now
];
};
}
];
programs.fish.enable = true;
sops.secrets.passwordHash.neededForUsers = true;