Update kassandra

home-manager/machines.nix

@@ -58,7 +58,7 @@ let
     let
       all = extra ++ on-my-machines ++ [
         (import ./roles/firefox.nix "http://localhost:8842")
-        (makeAutostart "kassandra2")
+        (makeAutostart "kassandra")
         (makeAutostart "unlock-ssh")
         ./roles/beets.nix
         ./roles/daily-driver-programs.nix

home-manager/roles/desktop-items.nix

@@ -18,14 +18,5 @@ let
 
 in
 {
-  home.packages = map superSimpleDesktopItem [ "kassandra2" "gw2" "chat" ]
-    ++ map terminalDesktopItem [
-    "maintenance"
-    "ncmpcpp"
-    "kassandra"
-    "hotkeys"
-    "vim"
-    "select-mode"
-    "unlock-ssh"
-  ];
+  home.packages = map superSimpleDesktopItem [ "kassandra" ] ++ map terminalDesktopItem [ "unlock-ssh" ];
 }

home-manager/roles/hotkeys.nix

@@ -5,7 +5,7 @@ in
 [
   {
     Orga = [
-      { Kassandra = fork "kassandra2"; }
+      { Kassandra = fork "kassandra"; }
       { Kalendar = "ikhal"; }
       { Habitica = fork "firefox https://habitica.com"; }
       { Tasks = "tasksh"; }

home-manager/roles/kassandra.nix

@@ -2,7 +2,7 @@
 let
   dhallFiles = pkgs.runCommand "kassandra-config-src" { } ''
     mkdir $out
-    ${pkgs.kassandra2}/bin/kassandra2 print-types > $out/types.dhall
+    ${pkgs.kassandra}/bin/kassandra print-types > $out/types.dhall
     ln -s ${./kassandra}/{config,backend}.dhall $out
     ln -s ${pkgs.privateFile "kassandra-uiConfig.dhall"} $out/uiConfig.dhall
   '';

nix/sources.json

@@ -42,13 +42,6 @@
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "kassandra": {
-        "branch": "main",
-        "ref": "main",
-        "repo": "git@hera.m-0.eu:kassandra",
-        "rev": "62231410301e4735c28c0dcde877fe288430e7cd",
-        "type": "git"
-    },
-    "kassandra2": {
         "branch": "master",
         "ref": "master",
         "repo": "git@hera.m-0.eu:kassandra2",

overlays/kassandra/default.nix

@@ -1,8 +1,8 @@
 final: prev:
 let
   haskellPackages = prev.haskellPackages.extend (self: super: {
-    kassandra = self.callCabal2nix "kassandra" (prev.sources.kassandra2 + "/kassandra") { };
-    standalone = self.callCabal2nix "standalone" (prev.sources.kassandra2 + "/standalone") { };
+    kassandra = self.callCabal2nix "kassandra" (prev.sources.kassandra + "/kassandra") { };
+    standalone = self.callCabal2nix "standalone" (prev.sources.kassandra + "/standalone") { };
     taskwarrior = self.callHackageDirect { pkg = "taskwarrior"; ver = "0.3.1.0"; sha256 = "sha256-XUoa+xWUHfr080za07/4Xxcic6jgfljrTIXbLaXzoqQ="; } { };
   });
 in