remove dev module and fix scripts

global/home/default.nix

@@ -43,6 +43,7 @@ in {
     libnotify
     dig
     jq
+    fx
     mosh
     ripgrep
     usbutils
@@ -54,6 +55,7 @@ in {
     playerctl
     neofetch
     tree
+    ansible
   ];
 
   programs.fish = {

global/home/graphical.nix

@@ -16,6 +16,8 @@
     libsForQt5.kasts
     libreoffice
     logseq
+    insomnia
+    dbeaver
   ];
 
   gtk = {

lib/mkconf.nix

@@ -39,7 +39,6 @@ nixpkgs.lib.nixosSystem {
         (import ./modules/mpd.nix {inherit user;})
         (import ./modules/git.nix {inherit user userName;})
         (import ./modules/laptop.nix {inherit user;})
-        (import ./modules/dev.nix {inherit user;})
         (import ./modules/personal.nix {inherit user;})
         (import ./modules/gamer.nix {inherit user;})
         (import ./programs/hyprland.nix {inherit user;})
@@ -50,9 +49,12 @@ nixpkgs.lib.nixosSystem {
 
       programs.menu.enable = true;
       roles.work.enable = work;
+      roles.git.enable = true;
+      programs.terminal.enable = true;
       roles.personal.enable = !work;
       roles.mpd.enable = true;
       programs.editor.neovim = true;
+      programs.editor.enable = true;
     }
   ];
 }

lib/modules/dev.nix

@@ -1,32 +0,0 @@
-{user, ...}: {
-  lib,
-  pkgs,
-  config,
-  ...
-}:
-with lib; let
-  cfg = config.roles.dev;
-in {
-  options.roles = {
-    dev = {
-      enable = mkEnableOption "editor";
-    };
-  };
-
-  config = mkIf cfg.enable {
-    programs.editor.enable = true;
-    roles.git.enable = true;
-    programs.terminal.enable = true;
-    home-manager.users.${user}.imports = [
-      {
-        home.packages = with pkgs; [
-          insomnia
-          dbeaver
-          ansible
-          tig
-          fx
-        ];
-      }
-    ];
-  };
-}

lib/modules/editor.nix

@@ -8,6 +8,7 @@ with lib; let
   editor = config.programs.editor;
   pkg = editor.package;
   menu = config.programs.menu.package + config.programs.menu.dmenuCommand;
+  editorCmd = "NIXOS_OZONE_WL= ${pkg}/bin/${pkg.executableName}";
 in {
   options.programs = {
     editor = {
@@ -44,8 +45,8 @@ in {
         text = ''
           code_dir=~/Documents/code
           cd $code_dir
-          repo=$({ ls && echo clone-repo; } | ${menu})
+          repo=$(ls | ${menu})
-          [ -e "$repo" ] && ${pkg}/bin/${pkg.executableName} $repo
+          [ -e "$repo" ] && ${editorCmd} $repo
         '';
         install = false;
         hotkeys = [{key = "C";}];

lib/modules/personal.nix

@@ -16,7 +16,6 @@ with lib; {
       terminal = true;
     };
 
-    roles.dev.enable = true;
     roles.gamer.enable = true;
 
     i18n.supportedLocales = [

lib/modules/scripts.nix

@@ -55,7 +55,7 @@ with lib; let
   installScripts = scripts: (map scriptToPackage (filter (s: s.install) scripts));
 
   bindScript = script:
-    concatStrings (
+    (
       map
       (
         hotkey: "${hotkey.modifier}, ${hotkey.key}, exec, ${scriptExec {inherit script hotkey;}}"
@@ -74,7 +74,7 @@ in {
     home-manager.users.${user}.imports = [
       {
         home.packages = installScripts scripts;
-        wayland.windowManager.hyprland.settings.bind = map bindScript scripts;
+        wayland.windowManager.hyprland.settings.bind = builtins.concatMap bindScript scripts ;
       }
     ];
   };

lib/modules/work.nix

@@ -16,8 +16,6 @@ with lib; {
       terminal = false;
     };
 
-    roles.dev.enable = true;
-
     programs.editor = {
       enable = true;
       package = pkgs.vscode;