users: let user module handle home-manager init

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

View file

@ -19,45 +19,27 @@ topLevel: {
# TODO: dunno why I need this packge
environment.systemPackages = [ pkgs.dconf ];
imports =
with topLevel.config.flake.modules.nixos;
[
(modulesPath + "/profiles/qemu-guest.nix")
inputs.catppuccin.nixosModules.catppuccin
imports = with topLevel.config.flake.modules.nixos; [
(modulesPath + "/profiles/qemu-guest.nix")
inputs.catppuccin.nixosModules.catppuccin
# System modules
base
server
loptland-acme
hydra
forgejo
forgejo-runner
# System modules
base
server
loptland-acme
hydra
forgejo
forgejo-runner
# game server
minecraft-server
factorio-server
# game server
minecraft-server
factorio-server
# apps
# apps
# 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
];
};
}
];
# Users
cholli
];
services.tailscale = {
enable = true;

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 = {

View file

@ -12,31 +12,14 @@ topLevel: {
};
programs.dconf.enable = true;
imports =
with topLevel.config.flake.modules.nixos;
[
inputs.nixos-wsl.nixosModules.default
imports = with topLevel.config.flake.modules.nixos; [
inputs.nixos-wsl.nixosModules.default
base
server
cholli
]
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;

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,52 +40,34 @@ in
AddressFamily inet
'';
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
inputs.catppuccin.nixosModules.catppuccin
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
inputs.catppuccin.nixosModules.catppuccin
# System modules
base
dev
desktop
games
# System modules
base
dev
desktop
games
# hardware
audio
bluetooth
amdgpu
# hardware
audio
bluetooth
amdgpu
# desktops
# hyprland
niri
# desktops
# hyprland
niri
# apps
_1password
# apps
_1password
# 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
];
};
}
];
# Users
cholli
root
];
nix = {
distributedBuilds = true;