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 <[email protected]>
tiiuae · Oct 14, 2024 · 171cbcf · 171cbcf
1 parent fd31a80
commit 171cbcf
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 1 deletion.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -156,6 +156,15 @@
         pre-commit-hooks-nix.follows = "git-hooks-nix";
       };
     };
+
+    ctrl-panel = {
+      url = "github:tiiuae/ghaf-ctrl-panel";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        flake-utils.follows = "flake-utils";
+        crane.follows = "givc/crane";
+      };
+    };
   };
 
   outputs =

diff --git a/modules/common/services/desktop.nix b/modules/common/services/desktop.nix
@@ -209,6 +209,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 [
             {

diff --git a/modules/hardware/flake-module.nix b/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

diff --git a/modules/microvm/virtualization/microvm/guivm.nix b/modules/microvm/virtualization/microvm/guivm.nix
@@ -127,6 +127,7 @@ let
                 pkgs.pamixer
                 pkgs.eww
               ]
+              ++ [ pkgs.ctrl-panel ]
               ++ (lib.optional (
                 config.ghaf.profiles.debug.enable && config.ghaf.virtualization.microvm.idsvm.mitmproxy.enable
               ) pkgs.mitmweb-ui)

diff --git a/packages/icon-pack/default.nix b/packages/icon-pack/default.nix
@@ -34,6 +34,7 @@ let
     "utilities-terminal.svg"
     "yast-vpn.svg"
     "system-file-manager.svg"
+    "utilities-tweak-tool.svg"
   ];
 in
 runCommand "icon-pack"