flake.nix

@@ -114,7 +114,6 @@
           sops-nix.nixosModules.sops
           inputs.lix-module.nixosModules.default
         ];
-        config.nix.settings.extra-deprecated-features = [ "url-literals" ]; # So lix won't complain
       };
       common-nixos = stable: { ... }: {
         imports = [

home/nki-framework.nix

@@ -29,8 +29,7 @@
   # Graphical set up
   linux.graphical.type = "wayland";
   linux.graphical.wallpaper = ./images/wallpaper_0.png;
-  linux.graphical.defaults.webBrowser.package = pkgs.zen-browser-bin;
+  linux.graphical.defaults.webBrowser.package = pkgs.librewolf;
-  linux.graphical.defaults.webBrowser.desktopFile = "zen.desktop";
   # Enable sway
   programs.my-sway.enable = true;
   programs.my-sway.fontSize = 14.0;

overlay.nix

@@ -100,24 +100,19 @@ let
   overlay-packages = final: prev: {
     kak-tree-sitter = final.callPackage ./packages/common/kak-tree-sitter { rustPlatform = final.unstable.rustPlatform; };
 
-    kak-lsp = final.rustPlatform.buildRustPackage {
+    kak-lsp =
-      name = "kak-lsp";
+      let
         src = inputs.kak-lsp;
-      cargoHash = "sha256-U9KxTHzIDtdJ3A62rcdvWlxJfnhbFnS6KDRaV0HJOHE=";
+        cargoArtifacts = final.libs.crane.buildDepsOnly { inherit src; };
-      buildInputs = [ final.libiconv ];
+      in
+      final.libs.crane.buildPackage {
+        inherit src cargoArtifacts;
+        buildInputs = (with final;
+          lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration CoreServices ])
+        ) ++ (with final; [ libiconv ]);
 
         meta.mainProgram = "kak-lsp";
       };
-    #   cargoArtifacts = final.libs.crane.buildDepsOnly { inherit src; };
-    # in
-    # final.libs.crane.buildPackage {
-    #   inherit src cargoArtifacts;
-    #   buildInputs = (with final;
-    #     lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration CoreServices ])
-    #   ) ++ (with final; [ libiconv ]);
-
-    #   meta.mainProgram = "kak-lsp";
-    # };
 
     zen-browser-bin = inputs.zen-browser.packages.${final.stdenv.system}.zen-browser.override {
       inherit (inputs.zen-browser.packages.${final.stdenv.system}) zen-browser-unwrapped;

packages/common/kak-tree-sitter/default.nix

@@ -3,15 +3,15 @@ let
   src = fetchFromSourcehut {
     owner = "~hadronized";
     repo = "kak-tree-sitter";
-    rev = "kak-tree-sitter-v1.1.3";
+    rev = "kak-tree-sitter-v1.1.2";
-    hash = "sha256-vQZ+zQgwIw5ZBdIuMDD37rIdhe+WpNBmq0TciXBNiSU=";
+    hash = "sha256-wBWfSyR8LGtug/mCD0bJ4lbdN3trIA/03AnCxZoEOSA=";
   };
 
   kak-tree-sitter = rustPlatform.buildRustPackage {
     inherit src;
     pname = "kak-tree-sitter";
-    version = "1.1.3";
+    version = "1.1.2";
-    cargoHash = "sha256-1OwPfl1446SYt1556jwR9mvWOWEv+ab+wH7GZQeS4/E=";
+    cargoHash = "sha256-ruHklps7NZzsI1ub1trRKyufrP9tufWWrQ+urvEsIdA=";
     cargoBuildOptions = [ "--package" "kak-tree-sitter" "--package" "ktsctl" ];
 
     nativeBuildInputs = [ clang git ];