Update README.md

Signed-off-by: Flake Bot <41898282+github-actions[bot]@users.noreply.github.com>

README.md

@@ -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)
 - [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
-- [ ] 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] OCI container for common services
+- [X] Fix Home-Manager issues with immutable .config files during rebuild -> files kglobalshortcutsrc and kwinrc can't be overwritten because of plasma-manager

flake.nix

@@ -30,8 +30,7 @@
       ];
     externalUserModules = [ plasma-manager.homeManagerModules.plasma-manager ];
     # System Module groups
-    baseSystemModules = hostName:[
-        ./hosts/${hostName}
+    baseSystemModules = [
         ./modules/system/apps-shell
         ./modules/system/boot
         ./modules/system/devices
@@ -45,20 +44,18 @@
         ./modules/system/upgrades
         ./modules/system/users
     ];
-    desktopSystemModules = hostName:[
+    desktopSystemModules = [
         ./modules/system/ai
         ./modules/system/apps-misc
         ./modules/system/browser
         ./modules/system/flatpak
         ./modules/system/plasma
-        ./modules/system/syncthing-${hostName}
     ];
     displaySystemModules = [
         ./modules/system/sddm
     ];
-    gamingSystemModules = hostName:[
+    gamingSystemModules = [
         ./modules/system/controller
-        ./modules/system/jovian-${hostName}
         ./modules/system/lact
         ./modules/system/retrodeck
         ./modules/system/steam
@@ -90,7 +87,10 @@
         in
         lib.nixosSystem {
           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 ++ [
               ];
@@ -106,9 +106,12 @@
         in
         lib.nixosSystem {
           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.sharedModules =  externalUserModules;
@@ -122,7 +125,10 @@
         in
         lib.nixosSystem {
           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 ++ [
               ];
@@ -138,7 +144,9 @@
         in
         lib.nixosSystem {
           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 ++ [
               ];