Regenerated

Droidnix/README.org

@@ -280,33 +280,49 @@ in
 * Following are the imported modules
 
 * generated/modules/traveldroid/desktop
-** =generated/modules/traveldroid/desktop/wayland.nix=
-#+BEGIN_SRC nix :tangle generated/modules/traveldroid/desktop/wayland.nix  :noweb tangle :mkdirp yes :eval never-html
-{ lib, config, pkgs, ... }:
 
+** =generated/traveldroid/modules/desktop/hyprland.nix=
+Setting up Hyprland
+#+BEGIN_SRC nix :tangle generated/traveldroid/modules/desktop/hyprland.nix :noweb tangle :mkdirp yes :eval never-html
+{ lib, config, pkgs, flakeRoot, home-manager, inputs, ... }:
+
+let
+  username = config.defaultUser or "henrov";
+  assetPath = "${flakeRoot}/assets/hyprland/conf";
+
+  # Read all files in the asset directory
+  assetFiles = builtins.attrNames (builtins.readDir assetPath);
+
+  # Convert files to Home Manager xdg config entries
+  hyprFiles = lib.genAttrs assetFiles (f: {
+    # Destination path in home directory
+    name = ".config/hypr/${f}";
+    # Source file path
+    value = { source = "${assetPath}/${f}"; };
+  });
+
+  # Determine Hyprland package
+  hyprlandPkg =
+    pkgs.hyprland or
+    pkgs.hyprland-git or
+    inputs.hyprland.packages.${pkgs.system}.default;
+in
 {
-  #################################
-  # Core Wayland packages
-  #################################
-  environment.systemPackages = with pkgs; [
-    wayland
-    wl-clipboard      # optional but commonly used for copy/paste
-  ];
+  environment.systemPackages = [ hyprlandPkg ];
 
-  #################################
-  # Optional: enable graphics stack
-  #################################
-  hardware.opengl.enable = true;
+  _module.args.hmUsers = {
+    ${username} = {
+      home.packages = [ hyprlandPkg ];
 
-  #################################
-  # Optional session variables for Wayland
-  #################################
-  environment.sessionVariables = {
-    # Forces some apps to use Wayland
-    NIXOS_OZONE_WL = "1";
+      # Merge all files in the asset folder into ~/.config/hypr/
+      home.file = lib.mkMerge hyprFiles;
+
+      # Optional: Hyprland settings
+      settings.general."col.active_border" = "0xff97cbcd 0xff89b4fa";
+    };
   };
 }
-#+END_SRC
+#+END_SRC>
 
 ** =generated/modules/traveldroid/desktop/stylix.nix=
 #+BEGIN_SRC nix :tangle generated/modules/traveldroid/desktop/stylix.nix  :noweb tangle :mkdirp yes :eval never-html
@@ -373,6 +389,35 @@ in
 }
 #+END_SRC
 
+** =generated/modules/traveldroid/desktop/wayland.nix=
+#+BEGIN_SRC nix :tangle generated/modules/traveldroid/desktop/wayland.nix  :noweb tangle :mkdirp yes :eval never-html
+{ lib, config, pkgs, ... }:
+
+{
+  #################################
+  # Core Wayland packages
+  #################################
+  environment.systemPackages = with pkgs; [
+    wayland
+    wl-clipboard      # optional but commonly used for copy/paste
+  ];
+
+  #################################
+  # Optional: enable graphics stack
+  #################################
+  hardware.opengl.enable = true;
+
+  #################################
+  # Optional session variables for Wayland
+  #################################
+  environment.sessionVariables = {
+    # Forces some apps to use Wayland
+    NIXOS_OZONE_WL = "1";
+  };
+}
+#+END_SRC
+
+* generated/modules/traveldroid/system
 
 ** =generated/modules/traveldroid/system/nix.nix=
 #+BEGIN_SRC nix :tangle generated/modules/traveldroid/system/nix.nix  :noweb tangle :mkdirp yes :eval never-html
@@ -388,7 +433,49 @@ in
 }
 #+END_SRC
 
-** User stuff
+* generated/users
+
+** =generated/users/copy_2_home.nix=
+This copies stuff to the user home-folder
+#+BEGIN_SRC nix :tangle generated/users/copy_2_home.nix :noweb tangle :mkdirp yes :eval never-html
+{ config, pkgs, lib, flakeRoot, ... }:
+
+let
+  username  = config.users.users.defaultUser or "henrov";
+  homeDir   = "/home/${username}";
+  assetPath = "${flakeRoot}/assets/copy_2_home";
+in
+{
+  environment.systemPackages = [ pkgs.rsync ];
+
+  systemd.services.copyAssets = {
+    description = "Copy assets to ${username}'s home directory";
+    wantedBy = [ "multi-user.target" ];
+
+    # oneshot service runs once at boot
+    serviceConfig.Type = "oneshot";
+
+    # Always use /bin/sh -c for multi-line commands
+    serviceConfig.ExecStart = ''
+      /bin/sh -c '
+        echo "Copying assets from ${assetPath} to ${homeDir} ..."
+
+        if [ ! -d "${assetPath}" ]; then
+          echo "ERROR: ${assetPath} does not exist"
+          exit 1
+        fi
+
+        mkdir -p "${homeDir}"
+        chown ${username}:${username} "${homeDir}"
+
+        ${pkgs.rsync}/bin/rsync -a --no-owner --no-group "${assetPath}/" "${homeDir}/"
+
+        echo "Done copying assets."
+      '
+    '';
+  };
+}
+#+END_SRC
 
 ** =generated/users/henrov.nix=
 This is the default user, just search and replace henrov another name if you want to change
@@ -432,45 +519,3 @@ in
   };
 }
 #+END_SRC
-
-** =generated/users/copy_2_home.nix=
-This copies stuff to the user home-folder
-#+BEGIN_SRC nix :tangle generated/users/copy_2_home.nix :noweb tangle :mkdirp yes :eval never-html
-{ config, pkgs, lib, flakeRoot, ... }:
-
-let
-  username  = config.users.users.defaultUser or "henrov";
-  homeDir   = "/home/${username}";
-  assetPath = "${flakeRoot}/assets/copy_2_home";
-in
-{
-  environment.systemPackages = [ pkgs.rsync ];
-
-  systemd.services.copyAssets = {
-    description = "Copy assets to ${username}'s home directory";
-    wantedBy = [ "multi-user.target" ];
-
-    # oneshot service runs once at boot
-    serviceConfig.Type = "oneshot";
-
-    # Always use /bin/sh -c for multi-line commands
-    serviceConfig.ExecStart = ''
-      /bin/sh -c '
-        echo "Copying assets from ${assetPath} to ${homeDir} ..."
-
-        if [ ! -d "${assetPath}" ]; then
-          echo "ERROR: ${assetPath} does not exist"
-          exit 1
-        fi
-
-        mkdir -p "${homeDir}"
-        chown ${username}:${username} "${homeDir}"
-
-        ${pkgs.rsync}/bin/rsync -a --no-owner --no-group "${assetPath}/" "${homeDir}/"
-
-        echo "Done copying assets."
-      '
-    '';
-  };
-}
-#+END_SRC