commit 7698c108499aafea212da58525d9ab03a853e7a8 · aylac.top/nixcfg-own-knot

+2 -1

modules/home/programs/helix/default.nix

···

       52
       52
        
                   }

     

       53
       53
        
                   else {name = srvName;}

     

       54
       54
        
               )

     

       55
       55
       -
               lang.language-servers

     

       55
       55
       +
               (lang.language-servers

     

       56
       56
       +
                 ++ lang.helix-only-language-servers)

     

       56
       57
        
             else map (srvName: {name = srvName;}) lang.language-servers;

     

       57
       58
        
         in

     

       58
       59
        
           lib.filterAttrs (_: v: v != null) (

+33 -23

modules/home/programs/zed-editor/default.nix

···

       27
       27
        
         mkZedLanguage = name: lang:

     

       28
       28
        
           lib.filterAttrs (_: v: v != null) {

     

       29
       29
        
             formatter = mkZedFormatter lang.formatter;

     

       30
       30
       -
             language_servers = lang.language-servers;

     

       30
       30
       +
             language_servers = lang.language-servers ++ lang.zed-only-language-servers;

     

       31
       31
        
             code_actions_on_format = lang.code-actions-on-format;

     

       32
       32
        
           };

     

       33
       33
        
       

     
···

       36
       36
        
           cfg = srv.config or {};

     

       37
       37
        
           hasArgs = args != [];

     

       38
       38
        
           hasSettings = lib.isAttrs cfg && (builtins.length (builtins.attrNames cfg) > 0);

     

       39
       39
       -
           isHelixOnly = srv.helix-only or false;

     

       40
       39
        
         in

     

       41
       41
       -
           if isHelixOnly

     

       42
       42
       -
           then null

     

       43
       43
       -
           else

     

       44
       44
       -
             lib.filterAttrs (_: v: v != null) (

     

       45
       45
       -
               {

     

       46
       46
       -
                 binary = lib.filterAttrs (_: v: v != null) (

     

       47
       47
       -
                   {path = srv.command;}

     

       48
       48
       -
                   // (

     

       49
       49
       -
                     if hasArgs

     

       50
       50
       -
                     then {arguments = args;}

     

       51
       51
       -
                     else {}

     

       52
       52
       -
                   )

     

       53
       53
       -
                 );

     

       54
       54
       -
               }

     

       55
       55
       -
               // (

     

       56
       56
       -
                 if hasSettings

     

       57
       57
       -
                 then {settings = cfg;}

     

       58
       58
       -
                 else {}

     

       59
       59
       -
               )

     

       60
       60
       -
             );

     

       40
       40
       +
           lib.filterAttrs (_: v: v != null) (

     

       41
       41
       +
             {

     

       42
       42
       +
               binary = lib.filterAttrs (_: v: v != null) (

     

       43
       43
       +
                 {path = srv.command;}

     

       44
       44
       +
                 // (

     

       45
       45
       +
                   if hasArgs

     

       46
       46
       +
                   then {arguments = args;}

     

       47
       47
       +
                   else {}

     

       48
       48
       +
                 )

     

       49
       49
       +
               );

     

       50
       50
       +
             }

     

       51
       51
       +
             // (

     

       52
       52
       +
               if hasSettings

     

       53
       53
       +
               then {settings = cfg;}

     

       54
       54
       +
               else {}

     

       55
       55
       +
             )

     

       56
       56
       +
           );

     

       61
       57
        
       in {

     

       62
       58
        
         options.myHome.programs.zed-editor.enable = lib.mkEnableOption "zed editor";

     

       63
       59
        
       

     
···

       133
       129
        
                   editorCfg.languages

     

       134
       130
        
                 )

     

       135
       131
        
               );

     

       136
       136
       -
               lsp = lib.filterAttrs (_: v: v != null) (lib.mapAttrs mkZedLsp editorCfg.languageServers);

     

       132
       132
       +
               lsp = lib.mapAttrs mkZedLsp editorCfg.languageServers;

     

       137
       133
        
             };

     

       138
       134
        
             userTasks = [

     

       139
       135
        
               {

     
···

       144
       140
        
                 allow_concurrent_runs = false;

     

       145
       141
        
                 shell = {

     

       146
       142
        
                   program = "fish";

     

       143
       143
       +
                 };

     

       144
       144
       +
               }

     

       145
       145
       +
             ];

     

       146
       146
       +
             userKeymaps = [

     

       147
       147
       +
               {

     

       148
       148
       +
                 context = "Workspace";

     

       149
       149
       +
                 bindings = {

     

       150
       150
       +
                   ctrl-g = [

     

       151
       151
       +
                     "task::Spawn"

     

       152
       152
       +
                     {

     

       153
       153
       +
                       task_name = "jjui";

     

       154
       154
       +
                       reveal_target = "center";

     

       155
       155
       +
                     }

     

       156
       156
       +
                   ];

     

       147
       157
        
                 };

     

       148
       158
        
               }

     

       149
       159
        
             ];

+38 -15

modules/home/snippets/editor/default.nix

···

       8
       8
        
           command,

     

       9
       9
        
           args ? [],

     

       10
       10
        
           config ? {},

     

       11
       11
       -
           helix-only ? false,

     

       12
       11
        
         }: {

     

       13
       13
       -
           inherit name command args config helix-only;

     

       12
       12
       +
           inherit name command args config;

     

       14
       13
        
         };

     

       15
       14
        
       

     

       16
       15
        
         # Helper function to create formatter definitions

     
···

       30
       29
        
           auto-format ? true,

     

       31
       30
        
           file-types ? [],

     

       32
       31
        
           language-servers ? [],

     

       32
       32
       +
           zed-only-language-servers ? [],

     

       33
       33
       +
           helix-only-language-servers ? [],

     

       33
       34
        
           formatter ? null,

     

       34
       35
        
           helix-formatter ? null,

     

       35
       36
        
           code-actions-on-format ? {},

     

       36
       37
        
         }: {

     

       37
       37
       -
           inherit name full-name auto-format file-types language-servers formatter helix-formatter code-actions-on-format;

     

       38
       38
       +
           inherit name full-name auto-format file-types language-servers zed-only-language-servers helix-only-language-servers formatter helix-formatter code-actions-on-format;

     

       38
       39
        
         };

     

       39
       40
        
       in {

     

       40
       41
        
         options.mySnippets.editor = lib.mkOption {

     
···

       59
       60
        
                 echo = "${pkgs.uutils-coreutils-noprefix}/bin/echo";

     

       60
       61
        
                 bun = lib.getExe pkgs.bun;

     

       61
       62
        
                 twls = lib.getExe pkgs.tailwindcss-language-server;

     

       63
       63
       +
                 printf = "${pkgs.uutils-coreutils-noprefix}/bin/printf";

     

       62
       64
        
               in

     

       63
       65
        
                 pkgs.writeScript "tailwindcss-language-server-bun" ''

     

       64
       66
        
                   #!${lib.getExe pkgs.bash} -e

     

       65
       67
        
       

     

       66
       68
        
                   if ! ${fd} -H -I -E "node_modules" "package\\.json$" . | \

     

       67
       69
        
                     ${xargs} ${grep} -q '"tailwindcss"'; then

     

       68
       68
       -
                     ${echo} "No tailwindcss found in project; skipping tailwindcss-language-server." >&2

     

       69
       69
       -
                     exec tail -f /dev/null

     

       70
       70
       +
                     ${echo} "No tailwindcss found in project; faking clean LSP exit." >&2

     

       71
       71
       +
       

     

       72
       72
       +
                     # Send a fake LSP shutdown + exit sequence to stdout.

     

       73
       73
       +
                     ${printf} 'Content-Length: 47\r\n\r\n{"jsonrpc":"2.0","id":1,"method":"shutdown"}'

     

       74
       74
       +
                     ${printf} 'Content-Length: 41\r\n\r\n{"jsonrpc":"2.0","method":"exit"}'

     

       75
       75
       +
       

     

       76
       76
       +
                     # Exit with success so the client treats this as a normal termination.

     

       77
       77
       +
                     exit 0

     

       70
       78
        
                   fi

     

       71
       79
        
       

     

       72
       80
        
                   exec ${bun} ${twls}

     

       73
       81
        
                 '';

     

       74
       82
        
               args = [];

     

       75
       83
        
               config = {provideFormatter = false;};

     

       76
       76
       -
               helix-only = true;

     

       77
       84
        
             };

     

       78
       85
        
       

     

       79
       86
        
             vscode-html-language-server = mkLspServer "vscode-html-language-server" {

     
···

       96
       103
        
               args = ["${pkgs.vscode-json-languageserver}/lib/node_modules/vscode-json-languageserver/bin/vscode-json-languageserver" "--stdio"];

     

       97
       104
        
             };

     

       98
       105
        
       

     

       99
       99
       -
             typescript-language-server = mkLspServer "typescript-language-server" {

     

       106
       106
       +
             vtsls = mkLspServer "vtsls" {

     

       100
       107
        
               command = lib.getExe pkgs.bun;

     

       101
       101
       -
               args = ["${pkgs.nodePackages.typescript-language-server}/lib/node_modules/typescript-language-server/lib/cli.mjs" "--stdio"];

     

       108
       108
       +
               args = ["${pkgs.vtsls}/bin/vtsls" "--stdio"];

     

       102
       109
        
             };

     

       103
       110
        
       

     

       104
       111
        
             svelte-language-server = mkLspServer "svelte-language-server" {

     
···

       228
       235
        
           languages = {

     

       229
       236
        
             html = mkLanguage "html" {

     

       230
       237
        
               full-name = "HTML";

     

       231
       231
       -
               language-servers = ["vscode-html-language-server" "superhtml" "biome"];

     

       238
       238
       +
               language-servers = ["vscode-html-language-server" "biome"];

     

       239
       239
       +
               zed-only-language-servers = ["!eslint" "..."];

     

       240
       240
       +
               helix-only-language-servers = ["tailwindcss-language-server"];

     

       232
       241
        
               formatter = "biome";

     

       233
       242
        
               helix-formatter = "biomeHtml";

     

       234
       243
        
               code-actions-on-format = {

     
···

       240
       249
        
             css = mkLanguage "css" {

     

       241
       250
        
               full-name = "CSS";

     

       242
       251
        
               language-servers = ["css-language-server" "biome"];

     

       252
       252
       +
               zed-only-language-servers = ["..."];

     

       253
       253
       +
               helix-only-language-servers = ["tailwindcss-language-server"];

     

       243
       254
        
               formatter = "biome";

     

       244
       255
        
               code-actions-on-format = {

     

       245
       256
        
                 "source.fixAll.biome" = true;

     
···

       249
       260
        
       

     

       250
       261
        
             javascript = mkLanguage "javascript" {

     

       251
       262
        
               full-name = "JavaScript";

     

       252
       252
       -
               language-servers = ["typescript-language-server" "biome"];

     

       263
       263
       +
               language-servers = ["vtsls" "biome"];

     

       264
       264
       +
               zed-only-language-servers = ["!eslint" "!typescript-language-server" "..."];

     

       265
       265
       +
               helix-only-language-servers = ["tailwindcss-language-server"];

     

       253
       266
        
               formatter = "biome";

     

       254
       267
        
               code-actions-on-format = {

     

       255
       268
        
                 "source.fixAll.biome" = true;

     
···

       259
       272
        
       

     

       260
       273
        
             typescript = mkLanguage "typescript" {

     

       261
       274
        
               full-name = "TypeScript";

     

       262
       262
       -
               language-servers = ["typescript-language-server" "biome"];

     

       275
       275
       +
               language-servers = ["vtsls" "biome"];

     

       276
       276
       +
               zed-only-language-servers = ["!eslint" "!typescript-language-server" "..."];

     

       277
       277
       +
               helix-only-language-servers = ["tailwindcss-language-server"];

     

       263
       278
        
               formatter = "biome";

     

       264
       279
        
               code-actions-on-format = {

     

       265
       280
        
                 "source.fixAll.biome" = true;

     
···

       269
       284
        
       

     

       270
       285
        
             jsx = mkLanguage "jsx" {

     

       271
       286
        
               full-name = "JSX";

     

       272
       272
       -
               language-servers = ["typescript-language-server" "biome"];

     

       287
       287
       +
               language-servers = ["vtsls" "biome"];

     

       288
       288
       +
               zed-only-language-servers = ["!eslint" "!typescript-language-server" "..."];

     

       289
       289
       +
               helix-only-language-servers = ["tailwindcss-language-server"];

     

       273
       290
        
               formatter = "biome";

     

       274
       291
        
               code-actions-on-format = {

     

       275
       292
        
                 "source.fixAll.biome" = true;

     
···

       279
       296
        
       

     

       280
       297
        
             tsx = mkLanguage "tsx" {

     

       281
       298
        
               full-name = "TSX";

     

       282
       282
       -
               language-servers = ["typescript-language-server" "biome"];

     

       299
       299
       +
               language-servers = ["vtsls" "biome"];

     

       300
       300
       +
               zed-only-language-servers = ["!eslint" "!typescript-language-server" "..."];

     

       301
       301
       +
               helix-only-language-servers = ["tailwindcss-language-server"];

     

       283
       302
        
               formatter = "biome";

     

       284
       303
        
               code-actions-on-format = {

     

       285
       304
        
                 "source.fixAll.biome" = true;

     
···

       289
       308
        
       

     

       290
       309
        
             svelte = mkLanguage "svelte" {

     

       291
       310
        
               full-name = "Svelte";

     

       292
       292
       -
               language-servers = ["svelte-language-server" "typescript-language-server" "biome"];

     

       311
       311
       +
               language-servers = ["svelte-language-server" "vtsls" "biome"];

     

       312
       312
       +
               zed-only-language-servers = ["!eslint" "!typescript-language-server" "..."];

     

       313
       313
       +
               helix-only-language-servers = ["tailwindcss-language-server"];

     

       293
       314
        
               formatter = "biome";

     

       294
       315
        
               code-actions-on-format = {

     

       295
       316
        
                 "source.fixAll.biome" = true;

     
···

       300
       321
        
             vue = mkLanguage "vue" {

     

       301
       322
        
               full-name = "Vue.js";

     

       302
       323
        
               language-servers = ["vue-language-server" "biome"];

     

       324
       324
       +
               zed-only-language-servers = ["!eslint" "!typescript-language-server" "..."];

     

       325
       325
       +
               helix-only-language-servers = ["tailwindcss-language-server"];

     

       303
       326
        
               formatter = "biome";

     

       304
       327
        
               code-actions-on-format = {

     

       305
       328
        
                 "source.fixAll.biome" = true;

     
···

       327
       350
        
             };

     

       328
       351
        
       

     

       329
       352
        
             bash = mkLanguage "bash" {

     

       330
       330
       -
               full-name = "Bash";

     

       353
       353
       +
               full-name = "Shell Script";

     

       331
       354
        
               file-types = ["sh" "bash" "dash" "ksh" "mksh"];

     

       332
       355
        
               language-servers = ["bash-language-server"];

     

       333
       356
        
               formatter = "shfmt";