From 6fd034af757364735acbb7a324f82e5c636436be Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Fri, 26 Nov 2021 20:07:33 +0100
Subject: [PATCH] Fix kassandra calls

---
 home-manager/machines.nix            | 2 +-
 home-manager/roles/desktop-items.nix | 2 +-
 home-manager/roles/hotkeys.nix       | 2 +-
 home-manager/roles/kassandra.nix     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/home-manager/machines.nix b/home-manager/machines.nix
index 215aef58..2c396c3b 100644
--- a/home-manager/machines.nix
+++ b/home-manager/machines.nix
@@ -58,7 +58,7 @@ let
     let
       all = extra ++ on-my-machines ++ [
         (import ./roles/firefox.nix "http://localhost:8842")
-        (makeAutostart "kassandra")
+        (makeAutostart "kassandra2")
         (makeAutostart "unlock-ssh")
         ./roles/beets.nix
         ./roles/daily-driver-programs.nix
diff --git a/home-manager/roles/desktop-items.nix b/home-manager/roles/desktop-items.nix
index 98c61f80..d5355ae1 100644
--- a/home-manager/roles/desktop-items.nix
+++ b/home-manager/roles/desktop-items.nix
@@ -18,5 +18,5 @@ let
 
 in
 {
-  home.packages = map superSimpleDesktopItem [ "kassandra" ] ++ map terminalDesktopItem [ "unlock-ssh" ];
+  home.packages = map superSimpleDesktopItem [ "kassandra2" ] ++ map terminalDesktopItem [ "unlock-ssh" ];
 }
diff --git a/home-manager/roles/hotkeys.nix b/home-manager/roles/hotkeys.nix
index b1ca1089..c4633288 100644
--- a/home-manager/roles/hotkeys.nix
+++ b/home-manager/roles/hotkeys.nix
@@ -5,7 +5,7 @@ in
 [
   {
     Orga = [
-      { Kassandra = fork "kassandra"; }
+      { Kassandra = fork "kassandra2"; }
       { Kalendar = "ikhal"; }
       { Habitica = fork "firefox https://habitica.com"; }
       { Tasks = "tasksh"; }
diff --git a/home-manager/roles/kassandra.nix b/home-manager/roles/kassandra.nix
index 5cf169db..2ad68a09 100644
--- a/home-manager/roles/kassandra.nix
+++ b/home-manager/roles/kassandra.nix
@@ -2,7 +2,7 @@
 let
   dhallFiles = pkgs.runCommand "kassandra-config-src" { } ''
     mkdir $out
-    ${pkgs.kassandra}/bin/kassandra print-types > $out/types.dhall
+    ${pkgs.kassandra}/bin/kassandra2 print-types > $out/types.dhall
     ln -s ${./kassandra}/{config,backend}.dhall $out
     ln -s ${pkgs.privateFile "kassandra-uiConfig.dhall"} $out/uiConfig.dhall
   '';