Working on hyprland config

Droidnix/README.org

@@ -905,12 +905,11 @@ This is top file of this level which contains just an import statement for all r
     #./login-lightdm.nix
     ./gtk.nix
   ];
-  # .. put any code here
 }
 #+END_SRC
 
 ** =generated/system/core/fonts.nix=
-This file installs and configures eww
+This file installs and configures fonts
 #+BEGIN_SRC nix :tangle generated/system/core/fonts.nix :noweb tangle :mkdirp yes :eval never-html
 { config, pkgs, ... }:
 {
@@ -951,11 +950,6 @@ in
       exec-once = [ "eww daemon" ];
       exec = [ "eww open-many ${ewwConfigDir}/widgets" ]; # Adjust as needed
     };
-    # For MangoWC, use:
-    # wayland.windowManager.mangowc.config = {
-    #   exec = [ "eww daemon" ];
-    #   exec-once = [ "eww open-many ${ewwConfigDir}/widgets" ];
-    # };
   };
 }
 #+END_SRC

Droidnix/generated/hyprland/hyprland.nix

@@ -9,6 +9,8 @@
 
 let
   hyprlandFiles = builtins.attrNames (builtins.readDir "${flakeRoot}/assets/hyprland/conf/hypr");
+  # Filter out hyprland.conf from the list of files to copy directly
+  otherHyprlandFiles = lib.filter (name: name != "hyprland.conf") hyprlandFiles;
 in
 {
   programs.hyprland = {
@@ -25,12 +27,18 @@ in
       enable = true;
     };
 
-    # Create all files using home.file
+    # Copy all files except hyprland.conf
-    home.file = lib.genAttrs hyprlandFiles (name: {
+    home.file = lib.genAttrs otherHyprlandFiles (name: {
       target = "/.config/hypr/${name}";
       source = "${flakeRoot}/assets/hyprland/conf/hypr/${name}";
     });
 
+    # Append the base config to hyprland.conf, preserving manual changes
+    xdg.configFile."hypr/hyprland.conf".text = ''
+      ${builtins.readFile "${flakeRoot}/assets/hyprland/conf/hypr/hyprland.conf"}
+      # Your manual settings will go below this line and will not be overwritten
+    '';
+
     # Create the directory structure
     xdg.configFile = {
       "hypr/.keep" = {

Droidnix/generated/system/core/eww.nix

@@ -26,10 +26,5 @@ in
       exec-once = [ "eww daemon" ];
       exec = [ "eww open-many ${ewwConfigDir}/widgets" ]; # Adjust as needed
     };
-    # For MangoWC, use:
-    # wayland.windowManager.mangowc.config = {
-    #   exec = [ "eww daemon" ];
-    #   exec-once = [ "eww open-many ${ewwConfigDir}/widgets" ];
-    # };
   };
 }

Droidnix/generated/system/core/top.nix

@@ -8,5 +8,4 @@
     #./login-lightdm.nix
     ./gtk.nix
   ];
-  # .. put any code here
 }