This commit is contained in:
serenity-F 2026-07-05 20:55:02 +10:00
parent 1a3cdb757d
commit 11962af1a0
No known key found for this signature in database
7 changed files with 46 additions and 90 deletions

View file

@ -1,9 +1,7 @@
{ { self, inputs, ... }: {
self,
inputs, flake.homeModules.baseHome = { config, pkgs, ... }: {
...
}:
{
imports = [ imports = [
./terminal ./terminal
self.modules.theme self.modules.theme
@ -12,7 +10,7 @@
home = { home = {
username = "serenity"; username = "serenity";
homeDirectory = "/home/serenity"; homeDirectory = "/home/serenity";
stateVersion = "24.11"; stateVersion = "26.05";
#extraOutputsToInstall = [ ]; #extraOutputsToInstall = [ ];
}; };
@ -25,4 +23,5 @@
# let HM manage itself when in standalone mode # let HM manage itself when in standalone mode
programs.home-manager.enable = true; programs.home-manager.enable = true;
};
} }

View file

@ -1,6 +1,6 @@
{ self, ... }: { self, ... }:
{ {
flake.nixosModules.coreConfiguration = flake.nixosModules.hadesConfig =
{ {
pkgs, pkgs,
... ...

View file

@ -3,7 +3,8 @@
flake.nixosConfigurations.hades = inputs.nixpkgs.lib.nixosSystem { flake.nixosConfigurations.hades = inputs.nixpkgs.lib.nixosSystem {
modules = [ modules = [
self.nixosModules.hadesHardware self.nixosModules.hadesHardware
self.nixosModules.coreConfiguration self.nixosModules.hadesConfig
self.nixosModules.coreConfig
inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
{ {

View file

@ -5,6 +5,7 @@
imports = [ imports = [
self.nixosModules.audioConfig self.nixosModules.audioConfig
self.nixosModules.nixConfig self.nixosModules.nixConfig
self.nixosModules.corePackages
]; ];
documentation.dev.enable = true; documentation.dev.enable = true;

View file

@ -1,24 +0,0 @@
let
desktop = [
./security.nix
./users.nix
./core.nix
#./core
./nix
./network
./hardware
./programs
./services
];
laptop = desktop ++ [
./services/backlight.nix
./services/power.nix
];
in
{
inherit desktop laptop;
}

View file

@ -1,17 +0,0 @@
{ pkgs, ... }:
{
users.users.serenity = {
isNormalUser = true;
shell = pkgs.fish;
extraGroups = [
"i2c"
"input"
"libvirtd"
"networkmanager"
"plugdev"
"transmission"
"video"
"wheel"
];
};
}

View file

@ -7,29 +7,25 @@ in
flake.nixosModules.u-serenity = flake.nixosModules.u-serenity =
{ pkgs, ... }: { pkgs, ... }:
{ {
imports = [ modules = [
self.homeModules.baseHome self.foo.bar
]; inputs.home-manager.nixosModules.home-manager
{
home-manager = { home-manager = {
verbose = true; verbose = true;
useUserPackages = true; useUserPackages = true;
useGlobalPkgs = true; useGlobalPkgs = true;
backupFileExtension = "backup"; backupFileExtension = "backup";
overwriteBackup = true; overwriteBackup = true;
users.${name} = { users.${name} = {
imports = with self.modules.homeManager; [ imports = [
{ self.flake.homeModules.baseHome
home = {
username = name;
homeDirectory = home;
stateVersion = "26.05";
};
}
]; ];
}; };
}; };
}
];
users.users.${name} = { users.users.${name} = {
isNormalUser = true; isNormalUser = true;