Control panel integration

Control panel was added as input to flake.nix and as overlay
to common modules. The desktop item were added along with
appropriate icon.

Signed-off-by: dmitry-erin <dmitry.erin@unikie.com>

flake.nix

@@ -155,6 +155,15 @@
  pre-commit-hooks-nix.follows = "pre-commit-hooks-nix";
  };
  };
+
+ ctrl-panel = {
+ url = "github:tiiuae/ghaf-ctrl-panel";
+ inputs = {
+ nixpkgs.follows = "nixpkgs";
+ flake-utils.follows = "flake-utils";
+ crane.follows = "givc/crane";
+ };
+ };
  };
 
  outputs =

modules/common/services/desktop.nix

@@ -160,6 +160,12 @@ in
  path = "${pkgs.givc-cli}/bin/givc-cli ${cliArgs} reboot";
  icon = "${pkgs.icon-pack}/system-reboot.svg";
  }
+
+ {
+ name = "Control panel";
+ path = "${pkgs.ctrl-panel}/bin/ctrl-panel";
+ icon = "${pkgs.icon-pack}/utilities-tweak-tool.svg";
+ }
  ]
  ++ optionals config.ghaf.reference.programs.windows-launcher.enable [
  {

modules/flake-module.nix

@@ -20,7 +20,13 @@
  nixpkgs.overlays = [ inputs.ghafpkgs.overlays.default ];
  }
  ];
-
+ laptop.imports = [
+ ./hardware/definition.nix
+ ./hardware/x86_64-generic
+ ./reference/hardware/laptop.nix
+ ./hardware/common
+ { nixpkgs.overlays = [ inputs.ghafpkgs.overlays.default ]; }
+ ];
  desktop.imports = [ ./desktop ];
  host.imports = [ ./host ];
  lanzaboote.imports = [ ./lanzaboote ];

modules/hardware/flake-module.nix

@@ -9,7 +9,14 @@
  ./x86_64-generic
  ./laptop.nix
  ./common
- { nixpkgs.overlays = [ inputs.ghafpkgs.overlays.default ]; }
+ {
+ nixpkgs.overlays = [
+ inputs.ghafpkgs.overlays.default
+ (_final: prev: {
+ ctrl-panel = inputs.ctrl-panel.packages.${prev.stdenv.hostPlatform.system}.default;
+ })
+ ];
+ }
  ];
  hw-x86_64-generic.imports = [
  ./definition.nix

modules/microvm/virtualization/microvm/guivm.nix

@@ -113,6 +113,7 @@ let
  pkgs.nm-launcher
  pkgs.pamixer
  ]
+ ++ [ inputs.ctrl-panel.packages.${pkgs.system}.default ]
  ++ (lib.optional (
  config.ghaf.profiles.debug.enable && config.ghaf.virtualization.microvm.idsvm.mitmproxy.enable
  ) pkgs.mitmweb-ui)

packages/icon-pack/default.nix

@@ -30,6 +30,7 @@ let
  "thorium-browser.svg"
  "utilities-terminal.svg"
  "yast-vpn.svg"
+ "utilities-tweak-tool.svg"
  ];
 in
 runCommand "icon-pack"