From 96f5c16e42f6c2284687a1d2a20c9de27ed35930 Mon Sep 17 00:00:00 2001 From: William Date: Tue, 27 Aug 2024 16:10:49 -0300 Subject: [PATCH] Cleaned up the qubes reboot on rotterdam --- hosts/desktops/common/packages.nix | 1 - hosts/desktops/rotterdam.nix | 25 ++++++++++++++++++++++++- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/hosts/desktops/common/packages.nix b/hosts/desktops/common/packages.nix index 3dc73a1..740d870 100644 --- a/hosts/desktops/common/packages.nix +++ b/hosts/desktops/common/packages.nix @@ -57,7 +57,6 @@ in { unrar ventoy virt-manager - yad wezterm ] ++ kdepkgs; diff --git a/hosts/desktops/rotterdam.nix b/hosts/desktops/rotterdam.nix index a3360b1..0dc0fe8 100644 --- a/hosts/desktops/rotterdam.nix +++ b/hosts/desktops/rotterdam.nix @@ -5,6 +5,29 @@ let name = "qubes.nsh"; text = "HD1f65535a1:EFI\\qubes\\grubx64.efi"; }; + + reboot-into-qubes = pkgs.makeDesktopItem { + name = "reboot-into-qubes"; + icon = pkgs.fetchurl { + url = + "https://raw.githubusercontent.com/vinceliuice/Qogir-icon-theme/31f267e1f5fd4e9596bfd78dfb41a03d3a9f33ee/src/scalable/apps/distributor-logo-qubes.svg"; + sha256 = "sha256-QbHr7s5Wcs7uFtfqZctMyS0iDbMfiiZOKy2nHhDOfn0="; + }; + desktopName = "Qubes OS"; + genericName = "Reboot into Qubes OS"; + categories = [ "System" ]; + startupNotify = true; + exec = pkgs.writeShellScript "reboot-into-qubes" '' + ${pkgs.yad}/bin/yad --form \ + --title="Qubes OS" \ + --image distributor-logo-qubes \ + --text "Are you sure you want to reboot into Qubes OS?" \ + --button="Yes:0" --button="Cancel:1" + if [ $? -eq 0 ]; then + systemctl reboot --boot-loader-entry=qubes.conf + fi + ''; + }; in { imports = [ # Host-common imports @@ -34,7 +57,7 @@ in { }; }; - environment.systemPackages = with pkgs; [ ollama ]; + environment.systemPackages = with pkgs; [ reboot-into-qubes ]; hardware.graphics.extraPackages = with pkgs; [ rocmPackages.clr.icd ];