Compare commits

..

6 Commits

Author SHA1 Message Date
Mohamed C.
36e452dada
Update README.md
Some checks are pending
Flake.lock / build (push) Waiting to run
2024-09-07 21:56:32 +02:00
Flake Bot
38fddcf430 Bump flake.lock
Some checks are pending
Flake.lock / build (push) Waiting to run
Signed-off-by: Flake Bot <41898282+github-actions[bot]@users.noreply.github.com>
2024-09-07 17:18:26 +00:00
Flake Bot
4a1f060b77 Bump flake.lock
Some checks are pending
Flake.lock / build (push) Waiting to run
Signed-off-by: Flake Bot <41898282+github-actions[bot]@users.noreply.github.com>
2024-09-07 16:25:33 +00:00
Flake Bot
02f3d7f1d8 Bump flake.lock
Some checks are pending
Flake.lock / build (push) Waiting to run
Signed-off-by: Flake Bot <41898282+github-actions[bot]@users.noreply.github.com>
2024-09-07 15:21:09 +00:00
Flake Bot
9a13754657 Bump flake.lock
Some checks are pending
Flake.lock / build (push) Waiting to run
Signed-off-by: Flake Bot <41898282+github-actions[bot]@users.noreply.github.com>
2024-09-07 12:37:12 +00:00
Flake Bot
ea27819a6b Bump flake.lock
Some checks are pending
Flake.lock / build (push) Waiting to run
Signed-off-by: Flake Bot <41898282+github-actions[bot]@users.noreply.github.com>
2024-09-07 10:58:13 +00:00
2 changed files with 21 additions and 13 deletions

View File

@ -11,5 +11,5 @@ Mirrored on [gitea.chrayed.de](https://gitea.chrayed.de/moe1369/nixos-config)
- [ ] ssh key deployment with [agenix](https://github.com/ryantm/agenix) - [ ] ssh key deployment with [agenix](https://github.com/ryantm/agenix)
- [x] alternative way to declare .nix files instead of dumping them into configuration.nix -> now uses groups in flake.nix - [x] alternative way to declare .nix files instead of dumping them into configuration.nix -> now uses groups in flake.nix
- [x] Multi Host functionality for homelab - [x] Multi Host functionality for homelab
- [ ] OCI container for common services - [X] OCI container for common services
- [ ] Fix Home-Manager issues with immutable .config files during rebuild -> files kglobalshortcutsrc and kwinrc can't be overwritten because of plasma-manager - [X] Fix Home-Manager issues with immutable .config files during rebuild -> files kglobalshortcutsrc and kwinrc can't be overwritten because of plasma-manager

View File

@ -30,8 +30,7 @@
]; ];
externalUserModules = [ plasma-manager.homeManagerModules.plasma-manager ]; externalUserModules = [ plasma-manager.homeManagerModules.plasma-manager ];
# System Module groups # System Module groups
baseSystemModules = hostName:[ baseSystemModules = [
./hosts/${hostName}
./modules/system/apps-shell ./modules/system/apps-shell
./modules/system/boot ./modules/system/boot
./modules/system/devices ./modules/system/devices
@ -45,20 +44,18 @@
./modules/system/upgrades ./modules/system/upgrades
./modules/system/users ./modules/system/users
]; ];
desktopSystemModules = hostName:[ desktopSystemModules = [
./modules/system/ai ./modules/system/ai
./modules/system/apps-misc ./modules/system/apps-misc
./modules/system/browser ./modules/system/browser
./modules/system/flatpak ./modules/system/flatpak
./modules/system/plasma ./modules/system/plasma
./modules/system/syncthing-${hostName}
]; ];
displaySystemModules = [ displaySystemModules = [
./modules/system/sddm ./modules/system/sddm
]; ];
gamingSystemModules = hostName:[ gamingSystemModules = [
./modules/system/controller ./modules/system/controller
./modules/system/jovian-${hostName}
./modules/system/lact ./modules/system/lact
./modules/system/retrodeck ./modules/system/retrodeck
./modules/system/steam ./modules/system/steam
@ -90,7 +87,10 @@
in in
lib.nixosSystem { lib.nixosSystem {
specialArgs = {inherit user; inherit hostName; inherit system;}; specialArgs = {inherit user; inherit hostName; inherit system;};
modules = externalSystemModules ++ (baseSystemModules hostName) ++ (desktopSystemModules hostName) ++ displaySystemModules ++ (gamingSystemModules hostName) ++ [ modules = externalSystemModules ++ baseSystemModules ++ desktopSystemModules ++ displaySystemModules ++ gamingSystemModules ++ [
./hosts/${hostName}
./modules/system/jovian-${hostName}
./modules/system/syncthing-${hostName}
{ {
home-manager.users.${user}.imports = baseUserModules ++ desktopUserModules ++ gamingUserModules ++ [ home-manager.users.${user}.imports = baseUserModules ++ desktopUserModules ++ gamingUserModules ++ [
]; ];
@ -106,9 +106,12 @@
in in
lib.nixosSystem { lib.nixosSystem {
specialArgs = {inherit user; inherit hostName; inherit system;}; specialArgs = {inherit user; inherit hostName; inherit system;};
modules = externalSystemModules ++ (baseSystemModules hostName) ++ (desktopSystemModules hostName) ++ (gamingSystemModules hostName) ++ [ modules = externalSystemModules ++ baseSystemModules ++ desktopSystemModules ++ gamingSystemModules ++ [
./hosts/${hostName}
./modules/system/jovian-${hostName}
./modules/system/syncthing-${hostName}
{ {
home-manager.users.${user}.imports = baseUserModules ++ desktopUserModules ++ gamingSystemModules ++ [ home-manager.users.${user}.imports = baseUserModules ++ desktopUserModules ++ gamingUserModules ++ [
]; ];
home-manager.extraSpecialArgs = { inherit user; inherit hostName;}; home-manager.extraSpecialArgs = { inherit user; inherit hostName;};
home-manager.sharedModules = externalUserModules; home-manager.sharedModules = externalUserModules;
@ -122,7 +125,10 @@
in in
lib.nixosSystem { lib.nixosSystem {
specialArgs = {inherit user; inherit hostName; inherit system;}; specialArgs = {inherit user; inherit hostName; inherit system;};
modules = externalSystemModules ++ (baseSystemModules hostName) ++ (desktopSystemModules hostName) ++ (gamingSystemModules hostName) ++ [ modules = externalSystemModules ++ baseSystemModules ++ desktopSystemModules ++ gamingSystemModules ++ [
./hosts/${hostName}
./modules/system/jovian-${hostName}
./modules/system/syncthing-${hostName}
{ {
home-manager.users.${user}.imports = baseUserModules ++ desktopUserModules ++ gamingUserModules ++ [ home-manager.users.${user}.imports = baseUserModules ++ desktopUserModules ++ gamingUserModules ++ [
]; ];
@ -138,7 +144,9 @@
in in
lib.nixosSystem { lib.nixosSystem {
specialArgs = {inherit user; inherit hostName; inherit system;}; specialArgs = {inherit user; inherit hostName; inherit system;};
modules = externalSystemModules ++ (baseSystemModules hostName) ++ serverSystemModules ++ [ modules = externalSystemModules ++ baseSystemModules ++ serverSystemModules ++ [
./hosts/${hostName}
./modules/system/syncthing-${hostName}
{ {
home-manager.users.${user}.imports = baseUserModules ++ serverUserModules ++ [ home-manager.users.${user}.imports = baseUserModules ++ serverUserModules ++ [
]; ];