updates, strip out kak

nixos/configs/printing.nix

@@ -7,13 +7,12 @@
 {
   services.printing = {
 
-    # Run as a "stateless" service in which printing is 
+    # Run as a "stateless" service in which printing is
     # configrued via Nix.
     enable = true;
     stateless = true;
 
     drivers = [
-      pkgs.canon-cups-ufr2
     ];
   };
 

nixos/dotfiles/default.nix

@@ -11,8 +11,6 @@
 
   # Additional HM config modules.
   imports = [
-    (normalizeModule ./kakoune.hm.nix)
-    (normalizeModule ./kakoune-lsp.hm.nix)
     (normalizeModule ./git.hm.nix)
     (normalizeModule ./talon.hm.nix)
   ];

nixos/dotfiles/droid.nix

@@ -7,7 +7,5 @@
 
   # Additional HM config modules.
   imports = [
-    (normalizeModule ./kakoune.hm.nix)
-    (normalizeModule ./kakoune-lsp.hm.nix)
   ];
 }

nixos/packages/default.pkgs.nix

@@ -22,7 +22,6 @@ with pkgs;
   nix-index
   rsync
   tree-sitter
-  deprekages.kak-tree-sitter
   tmux
   deprekages._7zz
 
@@ -60,7 +59,7 @@ with pkgs;
   agenix.agenix
   atool
   bat
-  bitwarden-cli
+  #bitwarden-cli
   bzip2
   cardpeek
   cpio
@@ -155,7 +154,7 @@ with pkgs;
   ))
 
   # Reversing.
-  binwalk
+  #binwalk
 
   # Development.
   colmena
@@ -231,7 +230,7 @@ with pkgs;
       dig
       magic-wormhole
 
-      jadx
+      #jadx
 
       steam-run
       attic.attic
@@ -244,7 +243,6 @@ with pkgs;
 ++ (
   if (!is-hm-standalone && !is-droid) then
     [
-      kakoune
     ]
   else
     [ ]

packages/mergiraf.nix

@@ -6,7 +6,7 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "mergiraf";
-  version = "0.3.1";
+  version = "0.5.1";
 
   doCheck = false;
 
@@ -15,10 +15,10 @@ rustPlatform.buildRustPackage rec {
     owner = "mergiraf";
     repo = "mergiraf";
     rev = "v${version}";
-    hash = "sha256-ORCGGSODZnZH3Ukzmqrweth4KggWGt5YFYEqA4DbTls=";
+    hash = "sha256-CiZG0O5F2sidInSFUtB1q5GSfTIjX9xUr52y0TZ5tDs=";
   };
 
-  cargoHash = "sha256-Rr59x+/sDA0ttkVZh7hVhnvkNogQj9q9aXomNjHIXII=";
+  cargoHash = "sha256-ldgFCq2MaFmJhTcPx8zTLX7ErgNGlSqRaQRr9fWf1uU=";
 
   meta = {
     description = "A syntax-aware git merge driver for a growing collection of programming languages and file formats";