working on wofi

Droidnix/README.org

@@ -560,9 +560,9 @@ let
   hyprlandConfigDir = "${config.home-manager.users.${user.username}.xdg.configHome}/hypr";
   # Dynamically read all files in assets/hyprland/conf/
   hyprlandConfs =
-    lib.genAttrs (builtins.attrNames (builtins.readDir "${flakeRoot}/assets/hyprland/conf"))
+    lib.genAttrs (builtins.attrNames (builtins.readDir "${flakeRoot}/assets/hyprland/conf/hypr"))
       (name: {
-        text = builtins.readFile "${flakeRoot}/assets/hyprland/conf/${name}";
+        text = builtins.readFile "${flakeRoot}/assets/hyprland/conf/hypr/${name}";
       });
 in
 {
@@ -964,7 +964,7 @@ This is top file of this level which contains just an import statement for all r
   ...
 }:
 let
-  bindingsContent = builtins.readFile (flakeRoot + "/assets/hyprland/conf/bindings.conf");
+  bindingsContent = builtins.readFile (flakeRoot + "/assets/hyprland/conf/hypr/bindings.conf");
 in
 {
   home-manager.users.${user.username} = {
@@ -1015,19 +1015,22 @@ This is top file of this level which contains just an import statement for all r
 ** =generated/hyprland/task_launcher/wofi.nix=
 This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
 #+BEGIN_SRC nix :tangle generated/hyprland/task_launcher/wofi.nix :noweb tangle :mkdirp yes :eval never-html
-{ lib, config, pkgs, flakeRoot, ... }:
+{
+  lib,
+  config,
+  pkgs,
+  flakeRoot,
+  ...
+}:
 
 {
-  # Install Wofi and its dependencies
+  # Install Wofi
-  environment.systemPackages = with pkgs; [
+  environment.systemPackages = with pkgs; [ wofi ];
-    wofi
-  ];
 
   # Home Manager configuration for Wofi
   home-manager.users.henrov = {
-    # Ensure the config and theme directories exist
+    # Manage only the config and style files
     home.file = {
-      ".config/wofi".source = "${flakeRoot}/.assets/hyprland/conf/wofi";
       ".config/wofi/config".text = lib.readFile "${flakeRoot}/.assets/hyprland/conf/wofi/wofi.conf";
       ".config/wofi/style.css".source = "${flakeRoot}/.assets/hyprland/conf/wofi/theming.css";
     };
@@ -1038,14 +1041,6 @@ This is top file of this level which contains just an import statement for all r
       WOFI_STYLE = "$HOME/.config/wofi/style.css";
     };
   };
-
-  # Systemd service to ensure Wofi is available (optional)
-  systemd.user.services.wofi = {
-    description = "Wofi Application Launcher";
-    wantedBy = [ "default.target" ];
-    serviceConfig.Type = "oneshot";
-    serviceConfig.ExecStart = "${pkgs.wofi}/bin/wofi --show drun";
-  };
 }
 #+END_SRC
 
@@ -1101,30 +1096,7 @@ This is top file of this level which contains just an import statement for all r
 ** =generated/mangowc/keyboard_binds/top.nix=
 This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
 #+BEGIN_SRC nix :tangle generated/mangowc/keyboard_binds/top.nix :noweb tangle :mkdirp yes :eval never-html
-{
+  # Your code here...
-  config,
-  pkgs,
-  lib,
-  user,
-  inputs,
-  flakeRoot,
-  ...
-}:
-let
-  bindingsContent = builtins.readFile (flakeRoot + "/assets/hyprland/conf/bindings.conf");
-  userConfig = import (flakeRoot + "/assets/flake/users/henrov.nix");
-in
-{
-  home-manager.users.${user.username} = {
-    home.stateVersion = userConfig.stateVersion;
-    home.username = userConfig.username;
-    home.homeDirectory = userConfig.homeDirectory;
-    wayland.windowManager.hyprland = {
-      enable = true;
-      extraConfig = bindingsContent;
-    };
-  };
-}
 #+END_SRC
 
 ** =generated/mangowc/notifications/top.nix=

Droidnix/generated/hyprland/hyprland.nix

@@ -10,9 +10,9 @@ let
   hyprlandConfigDir = "${config.home-manager.users.${user.username}.xdg.configHome}/hypr";
   # Dynamically read all files in assets/hyprland/conf/
   hyprlandConfs =
-    lib.genAttrs (builtins.attrNames (builtins.readDir "${flakeRoot}/assets/hyprland/conf"))
+    lib.genAttrs (builtins.attrNames (builtins.readDir "${flakeRoot}/assets/hyprland/conf/hypr"))
       (name: {
-        text = builtins.readFile "${flakeRoot}/assets/hyprland/conf/${name}";
+        text = builtins.readFile "${flakeRoot}/assets/hyprland/conf/hypr/${name}";
       });
 in
 {

Droidnix/generated/hyprland/keyboard_binds/top.nix

@@ -8,7 +8,7 @@
   ...
 }:
 let
-  bindingsContent = builtins.readFile (flakeRoot + "/assets/hyprland/conf/bindings.conf");
+  bindingsContent = builtins.readFile (flakeRoot + "/assets/hyprland/conf/hypr/bindings.conf");
 in
 {
   home-manager.users.${user.username} = {

Droidnix/generated/mangowc/keyboard_binds/top.nix

@@ -1,24 +1 @@
-{
+# Your code here...
-  config,
-  pkgs,
-  lib,
-  user,
-  inputs,
-  flakeRoot,
-  ...
-}:
-let
-  bindingsContent = builtins.readFile (flakeRoot + "/assets/hyprland/conf/bindings.conf");
-  userConfig = import (flakeRoot + "/assets/flake/users/henrov.nix");
-in
-{
-  home-manager.users.${user.username} = {
-    home.stateVersion = userConfig.stateVersion;
-    home.username = userConfig.username;
-    home.homeDirectory = userConfig.homeDirectory;
-    wayland.windowManager.hyprland = {
-      enable = true;
-      extraConfig = bindingsContent;
-    };
-  };
-}