home/kakoune/kakrc

@@ -1,10 +1,5 @@
 # Enable kak-tree-sitter
-eval %sh{ kak-tree-sitter --kakoune -d --server }
-## Set some color overrides
-set global kts_yellow "rgb:e2b75e"
-set global kts_teal "rgb:008080"
-set global kts_mauve "rgb:c264ff"
-set global kts_sky "rgb:6aa622"
+eval %sh{ kak-tree-sitter --kakoune -d }
 # Color scheme
 colorscheme catppuccin-latte
 set global background default

modules/common/linux/default.nix

@@ -26,16 +26,6 @@ let
       };
     };
 
-    accounts = { pkgs, ... }: mkIf config.common.linux.enable {
-      environment.systemPackages = with pkgs.gnome; [ pkgs.glib gnome-control-center ];
-      services.accounts-daemon.enable = true;
-      services.gnome.gnome-online-accounts.enable = true;
-      programs.evolution.enable = true;
-      programs.evolution.plugins = with pkgs; [ evolution-ews ];
-      services.gnome.evolution-data-server.enable = true;
-      services.gnome.evolution-data-server.plugins = with pkgs; [ evolution-ews ];
-    };
-
     wlr = { ... }: mkIf config.common.linux.enable {
       # swaync disable notifications on screencast
       xdg.portal.wlr.settings.screencast = {
@@ -64,7 +54,7 @@ let
   };
 in
 {
-  imports = with modules; [ adb ios wlr logitech virtualisation accounts ];
+  imports = with modules; [ adb ios wlr logitech virtualisation ];
 
   options.common.linux = {
     enable = mkOption {
@@ -179,11 +169,9 @@ in
 
     ## Network configuration
     systemd.network.enable = true;
-    networking.dhcpcd.enable = lib.mkForce false;
     systemd.network.wait-online.enable = false;
     networking.hostName = cfg.networking.hostname;
     networking.wireless.iwd.enable = true;
-    networking.wireless.iwd.settings.General.EnableNetworkConfiguration = true;
     systemd.network.networks = builtins.mapAttrs
       (name: cfg: {
         matchConfig.Name = cfg.match;

packages/common/kak-tree-sitter.nix

@@ -3,18 +3,31 @@ let
   src = fetchFromGitHub {
     owner = "phaazon";
     repo = "kak-tree-sitter";
-    rev = "3567f648bbf6a5d556c43bde5433dff45eabd693";
-    hash = "sha256-xr7CtOfMO4nRu2MOIQX3jR0wsKGsjYiF/TGXSAsidM4=";
+    rev = "facf55f77171ae0d33332c6d54b5492e544f9ca1";
+    hash = "sha256-XMHgP4SO2HT6NthQkKUwU1rOwVFXDp7FsM99zqM4Q04=";
   };
 
   kak-tree-sitter = rustPlatform.buildRustPackage rec {
     inherit src;
     pname = "kak-tree-sitter";
-    version = "0.4.6";
-    cargoHash = "sha256-6HJxJTr4P1/6Yy3/dtfiaCFoHA4iKvmuwg51jTYU2eo=";
-    cargoBuildOptions = [ "--package" "kak-tree-sitter" "--package" "ktsctl" ];
+    version = "0.4.3";
+    cargoHash = "sha256-JvMcwdllq0dacceZsI14cCnV7aW7wmU3h/Y9SAwHVtM=";
+    cargoBuildOptions = [ "--package" "kak-tree-sitter" ];
+  };
 
-    nativeBuildInputs = [ clang git ];
+  ktsctl = rustPlatform.buildRustPackage rec {
+    inherit src;
+    name = "ktsctl";
+    version = "0.3.1";
+    cargoHash = "sha256-pyCUiekj79euOtS43mu9Fti+HZizaV069068h61uOT8=";
+
+    cargoBuildOptions = [ "--package" "ktsctl" ];
+
+    buildInputs = [ clang git ];
   };
 in
-kak-tree-sitter
+symlinkJoin {
+  name = "kak-tree-sitter";
+  paths = [ kak-tree-sitter ktsctl ];
+}
+