From cf9fd657b6465c30013fee329991e803edae9d94 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Thu, 2 May 2024 21:08:38 +0200
Subject: [PATCH] xdg term

---
 common/graphics/opengl.nix |  3 +++
 common/tooling/default.nix |  7 +++----
 common/xdg/mime.nix        | 10 ++++++++++
 flake.nix                  |  8 ++++++++
 sway/default.nix           |  8 +++-----
 5 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/common/graphics/opengl.nix b/common/graphics/opengl.nix
index de04855..59824d7 100644
--- a/common/graphics/opengl.nix
+++ b/common/graphics/opengl.nix
@@ -54,6 +54,9 @@ in
 
     environment.systemPackages = with pkgs; [
       glfw
+      glxinfo
+      vulkan-tools
+      mangohud
     ];
   };
 
diff --git a/common/tooling/default.nix b/common/tooling/default.nix
index 267c05f..84e3084 100644
--- a/common/tooling/default.nix
+++ b/common/tooling/default.nix
@@ -14,6 +14,7 @@ in
     environment.systemPackages = with pkgs; [
       (writeShellScriptBin "systemd-owner" "systemctl show -pUser,UID $@")
       (writeShellScriptBin "tree" "${lib.getExe pkgs.eza} -T --git -lh --no-permissions --no-user --no-filesize --no-time")
+      (writeShellScriptBin "spawn" ''exec "$@" &> /dev/null &'')
       urlencode
       pstree
       dos2unix
@@ -48,10 +49,6 @@ in
       wev
       qdirstat
       libva-utils
-      glxinfo
-      alacritty
-      vulkan-tools
-
       gparted
     ];
 
@@ -84,6 +81,8 @@ in
 
     # virtualisation.docker.enable = true;
 
+    services.dbus.implementation = "broker";
+
 
     grimmShared.tooling.nvim.plugins = with pkgs.vimPlugins; [
       vim-scala
diff --git a/common/xdg/mime.nix b/common/xdg/mime.nix
index b668911..46d4193 100644
--- a/common/xdg/mime.nix
+++ b/common/xdg/mime.nix
@@ -39,6 +39,7 @@ in
       (callPackage ../../custom/deskwhich/package.nix { })
 
       zathura
+      alacritty
       imhex
       libreoffice-qt
       filezilla
@@ -55,8 +56,17 @@ in
       vlc
       blender
       thunderbird
+      xdg-terminal-exec
+      xdg-utils
     ];
 
+    xdg.terminal-exec = {
+      enable = true;
+      settings = {
+        default = [ "Alacritty.desktop" "kitty.desktop" ];
+      };
+    };
+
     xdg.mime.enable = true;
     xdg.mime.addedAssociations = {
       "application/java-vm" = [
diff --git a/flake.nix b/flake.nix
index 1969a1b..1ea7214 100644
--- a/flake.nix
+++ b/flake.nix
@@ -35,17 +35,25 @@
     let
       patches = [
         {
+          # tlpui
           url = "https://patch-diff.githubusercontent.com/raw/NixOS/nixpkgs/pull/305278.patch";
           hash = "sha256-8RvPI8Id+Ttgv07IMBTAxkSc+K00WhiWgdgrCcULd7o=";
         }
         {
+          # rmenu 1.2.2
           url = "https://patch-diff.githubusercontent.com/raw/NixOS/nixpkgs/pull/307541.patch";
           hash = "sha256-cyxiWCxBOKrET710C8o9Cwksy64HRez6mB1qF+anHMI=";
         }
         {
+          # cpupower meta.mainProgram
           url = "https://patch-diff.githubusercontent.com/raw/NixOS/nixpkgs/pull/308476.patch";
           hash = "sha256-J/Bvz4RUn9lP7H4s/c6bZEX9dfWsxfG/dpXYF99U3Vs=";
         }
+        {
+          # xdg term
+          url = "https://patch-diff.githubusercontent.com/raw/NixOS/nixpkgs/pull/303225.patch";
+          hash = "sha256-XEwkHOY6Ye0IwEPXWHMH6kST/x6TOeLONfdDQymgw40=";
+        }
       ];
 
       customNixosSystem = system: definitions:
diff --git a/sway/default.nix b/sway/default.nix
index 6758747..b6ff1c4 100644
--- a/sway/default.nix
+++ b/sway/default.nix
@@ -8,7 +8,6 @@ let
 in
 {
   environment.systemPackages = with pkgs; [
-    alacritty
     rmenu
     grim
     slurp
@@ -40,7 +39,6 @@ in
         down = "j";
         up = "k";
         right = "l";
-        term = getExe pkgs.alacritty;
         menu = "${getExe rmenu} -r drun | xargs swaymsg exec --";
         menu_run = "${getExe rmenu} -r run | xargs swaymsg exec --";
 
@@ -56,8 +54,8 @@ in
         "$mod+d" = "exec $menu";
         "$mod+Shift+d" = "exec $menu_run";
         "$mod+Shift+s" = ''exec ${getExe grim} -g "$(${getExe slurp} -d)" - | wl-copy'';
-        "$mod+Return" = "exec $term --command xonsh";
-        "$mod+Shift+Return" = "exec $term";
+        "$mod+Return" = "exec ${getExe xdg-terminal-exec} xonsh";
+        "$mod+Shift+Return" = "exec ${getExe xdg-terminal-exec}";
         "$mod+Shift+q" = "kill";
         "$mod+Shift+c" = "reload";
         "$mod+Shift+e" = "exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -B 'Yes, exit sway' 'swaymsg exit'";
@@ -152,7 +150,7 @@ in
         "$mod+c" = "exec ${getExe swaymux}";
         XF86MonBrightnessUp = "exec ${getExe brightnessctl} s 10+%";
         XF86MonBrightnessDown = "exec ${getExe brightnessctl} s 10-%";
-        XF86Explorer = "exec $term --command ${getExe ranger}";
+        XF86Explorer = "exec ${getExe xdg-terminal-exec} ${getExe ranger}";
         XF86Search = "exec ${getExe searchclip}";
         XF86HomePage =
           let