Merge branch 'rpi'

modules/kakoune.nix

@@ -73,7 +73,6 @@ let
       aspellDicts.it
     ]
   );
-
   plugins = with pkgs; [
     kakounePlugins.prelude-kak
     kakounePlugins.kak-lsp
@@ -86,9 +85,7 @@ in
   home.sessionVariables = { EDITOR = "kak"; VISUAL = "kak"; };
   programs.bash.shellAliases = { k = "kak"; };
   programs.zsh.shellAliases = { k = "kak"; };
-
   home.packages = packages;
-
   programs.kakoune = {
     enable = true;
     config = {
@@ -156,8 +153,6 @@ in
       "add-highlighter global/ regex \\h+$ 0:Error                   # Highlight trailing spaces"
       "eval %sh{kak-lsp --kakoune -s $kak_session}"
       "lsp-enable"
-
-      # Kak-lsp snippet support
       ''
         def -hidden insert-c-n %{
          try %{
@@ -168,7 +163,6 @@ in
          }
         }
       ''
-
       "powerline-start"
       "require-module connect-broot"
       "require-module connect-lf"
@@ -176,7 +170,6 @@ in
     ];
     plugins = plugins;
   };
-
   xdg.configFile."kak/colors/nord.kak".text = with strPalette; ''
     set-face global value rgb:${normal.magenta},default
     set-face global type rgb:${bright.white},default
@@ -205,13 +198,11 @@ in
     set-face global Prompt rgb:${normal.cyan},rgb:${normal.black}
     set-face global BufferPadding default,default
   '';
-
   xdg.configFile."kak-lsp/kak-lsp.toml".text = with pkgs; builtins.concatStringsSep "\n" (
     [
       ''
         snippet_support = false
         verbosity = 2
-
         [server]
         timeout = 1800 # seconds = 30 minutes
       ''
@@ -231,7 +222,6 @@ in
         roots = ["package.json"]
         command = "${nodePackages.vscode-langservers-extracted}/bin/vscode-json-language-server"
         args = ["--stdio"]
-
         [language.yaml]
         filetypes = ["yaml"]
         roots = [".git"]
@@ -262,19 +252,16 @@ in
         roots = ["package.json"]
         command = "${nodePackages.vscode-langservers-extracted}/bin/vscode-html-language-server"
         args = ["--stdio"]
-
         [language.css]
         filetypes = ["css"]
         roots = ["package.json", ".git"]
         command = "${nodePackages.vscode-langservers-extracted}/bin/vscode-css-language-server"
         args = ["--stdio"]
-
         [language.less]
         filetypes = ["less"]
         roots = ["package.json", ".git"]
         command = "${nodePackages.vscode-langservers-extracted}/bin/vscode-css-language-server"
         args = ["--stdio"]
-
         [language.scss]
         filetypes = ["scss"]
         roots = ["package.json", ".git"]