From 6cf8fae38280a91143822d8950b359e98e6748e6 Mon Sep 17 00:00:00 2001
From: maralorn <mail@maralorn.de>
Date: Wed, 8 Mar 2023 20:59:17 +0100
Subject: [PATCH] Improve hotkeys

---
 home-manager/roles/gnome.nix   |  8 +++++---
 home-manager/roles/hotkeys.nix | 11 +++++++----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/home-manager/roles/gnome.nix b/home-manager/roles/gnome.nix
index 9874ed28..59b04adb 100644
--- a/home-manager/roles/gnome.nix
+++ b/home-manager/roles/gnome.nix
@@ -4,7 +4,9 @@
   config,
   ...
 } @ args: let
-  hotkeys = import ./hotkeys.nix args;
+  hotkeys = pkgs.writeShellScriptBin "hotkeys" ''
+    ${pkgs.wizards-dialog}/bin/hotkeys ${pkgs.writeText "hotkeys.yaml" (builtins.toJSON (import ./hotkeys.nix args))}
+  '';
   extensions = builtins.attrValues {
     inherit
       (pkgs.gnomeExtensions)
@@ -37,7 +39,7 @@
   inherit (lib.hm.gvariant) mkTuple mkUint32;
   font = "Monospace 9";
 in {
-  home.packages = extensions;
+  home.packages = extensions ++ [hotkeys];
   services.gpg-agent.pinentryFlavor = "gnome3";
   dconf.settings = {
     "org/gnome/shell/extensions/notification-banner-reloaded" = {
@@ -212,7 +214,7 @@ in {
     };
     "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/hotkeys" = {
       binding = "<Super>space";
-      command = "${config.home.sessionVariables.TERMINAL} ${pkgs.wizards-dialog}/bin/hotkeys ${pkgs.writeText "hotkeys.yaml" (builtins.toJSON hotkeys)}";
+      command = "${config.home.sessionVariables.TERMINAL} ${lib.getExe hotkeys}";
       name = "Hotkeys";
     };
     "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/standby" = {
diff --git a/home-manager/roles/hotkeys.nix b/home-manager/roles/hotkeys.nix
index 8e1ee9cf..eafb55ee 100644
--- a/home-manager/roles/hotkeys.nix
+++ b/home-manager/roles/hotkeys.nix
@@ -22,8 +22,8 @@ in [
     Research = {
       Zotero = fork "zotero";
       Open = fork "evince ~/git/promotion/out/print.pdf";
-      Build = "sh -c 'cd ~/git/promotion; nix develop -c nix run'";
-      Directory = fork "${config.home.sessionVariables.TERMINAL} -d ~/git/promotion";
+      Build = "sh -c 'cd ~/git/promotion; nix run'";
+      Directory = fork "${config.home.sessionVariables.TERMINAL} -D ~/git/promotion";
       Edit = edit_dir "~/git/promotion";
     };
   }
@@ -40,13 +40,13 @@ in [
     in [
       {"hera via vpn" = ssh "hera.vpn.m-0.eu";}
       {"fluffy via vpn" = ssh "fluffy.vpn.m-0.eu";}
-      {remote-builder = ssh "phoibe.cased.de -i /etc/nixos/private/id_ed25519-nix-builder";}
+      {remote-builder = ssh "phoibe.cased.de";}
       {ag = ssh "ag-forward";}
       {mathe-gateway = ssh "gw";}
       {backup-server = ssh "borg.cysec.de";}
       {shells = ssh "shells";}
       {"bach (ved)" = ssh "bach.vocalensemble-darmstadt.de";}
-      {"nixbuild.net" = "${pkgs.rlwrap}/bin/rlwrap ssh eu.nixbuild.net -i /etc/nixos/private/id_ed25519-nix-builder shell";}
+      {"nixbuild.net" = "${pkgs.rlwrap}/bin/rlwrap ssh eu.nixbuild.net shell";}
       {"fluffy via local network" = ssh "fluffy.lo.m-0.eu";}
       {"hera via public v4" = ssh "hera-v4";}
       {"TU Tunnel" = "sshuttle --python python3.9 -r gw 130.83.0.0/16";}
@@ -133,6 +133,9 @@ in [
     "W17" = {
       "MPD Whisky" = "ncmpcpp -h whisky.w17.io";
       "MPD Burbon" = "ncmpcpp -h burbon.w17.io";
+      "MPD Kitchen" = "ncmpcpp -h kitchen.w17.io";
+      Strichliste = "firefox https://strichliste.w17.io";
+      Hub = "firefox https://hub.w17.io";
       Summer = "ssh door@burbon.w17.io buzzer";
       Open = "ssh door@burbon.w17.io open";
       Close = "ssh door@burbon.w17.io close";