lib: remove icons.nix and use launcher in main lib

The functions in icon.nix are unused so removed. The `rmDesktopEntries`
function was being imported by file path where ever it was used. This
change now exports it as part of the lib for easier access.

Signed-off-by: Brian McGillion <bmg.avoin@gmail.com>

Author: brianmcgillion

flake.nix

@@ -201,7 +201,7 @@
     inputs@{ flake-parts, ... }:
     let
       # Create the extended lib
-      ghafLib = import ./lib.nix { inherit inputs; };
+      ghafLib = import ./lib { inherit inputs; };
       extendedLib = inputs.nixpkgs.lib.extend ghafLib;
     in
     flake-parts.lib.mkFlake

lib.nix lib/default.nixlib.nix renamed to lib/default.nix

@@ -4,7 +4,12 @@
 # SPDX-License-Identifier: MIT
 # FlattenTree and rakeLeaves originate from
 # https://github.com/divnix/digga
-_: lib: prev: {
+_: lib: prev:
+let
+  # Import launcher utilities
+  launcherLib = import ./launcher.nix { };
+in
+{
   /*
        *
        Filters Nix packages based on the target system platform.
@@ -97,4 +102,7 @@ _: lib: prev: {
     };
 
   };
+
+  # Launcher utilities
+  inherit (launcherLib) rmDesktopEntries;
 }

lib/icons.nix

@@ -14,9 +14,7 @@ let
   sysbench-fileio-test-script = pkgs.callPackage ./scripts/sysbench_fileio_test.nix { };
   nvpmodel-check = pkgs.callPackage ./scripts/nvpmodel_check.nix { };
 
-  inherit (lib) mkEnableOption mkIf;
-  #TODO; make sure that the lib is exported correctly and remove this cross file import
-  inherit (import ../../lib/launcher.nix { inherit pkgs lib; }) rmDesktopEntries;
+  inherit (lib) mkEnableOption mkIf rmDesktopEntries;
 in
 {
   options.ghaf.development.debug.tools = {

modules/development/debug-tools.nix

@@ -8,8 +8,7 @@
 }:
 let
   cfg = config.ghaf.development.debug.tools.gui;
-  #TODO; make sure that the lib is exported correctly and remove this cross file import
-  inherit (import ../../lib/launcher.nix { inherit pkgs lib; }) rmDesktopEntries;
+  inherit (lib) rmDesktopEntries;
 in
 {
   options.ghaf.development.debug.tools.gui = {

modules/development/dt-gui.nix

@@ -4,15 +4,13 @@
 {
   config,
   lib,
-  pkgs,
   ...
 }:
 let
   configHost = config;
   vmName = "gui-vm";
 
-  #TODO do not import from a path like this
-  inherit (import ../../../lib/launcher.nix { inherit pkgs lib; }) rmDesktopEntries;
+  inherit (lib) rmDesktopEntries;
   guivmBaseConfiguration = {
     imports = [
       inputs.self.nixosModules.profiles