commit 0034b6b8c21b4c5d5cd1758258763851c10e303a · aylac.top/nixcfg-own-knot

+23 -19

modules/flake/files/zed.nix

···

       3
       3
        
           lib,

     

       4
       4
        
           pkgs,

     

       5
       5
        
           ...

     

       6
       6
       -
         }: {

     

       6
       6
       +
         }: let

     

       7
       7
       +
           prettier = {

     

       8
       8
       +
             external = {

     

       9
       9
       +
               command = pkgs.writeScript "prettier-bun" ''

     

       10
       10
       +
                 #! ${pkgs.bash}/bin/bash -e

     

       11
       11
       +
                 exec ${lib.getExe pkgs.bun} ${pkgs.prettier}/bin/prettier.cjs "$@"

     

       12
       12
       +
               '';

     

       13
       13
       +
               arguments = ["--stdin-filepath" "{buffer_path}"];

     

       14
       14
       +
             };

     

       15
       15
       +
           };

     

       16
       16
       +
           biome = {

     

       17
       17
       +
             format_on_save = "on";

     

       18
       18
       +
       

     

       19
       19
       +
             formatter = {language_server = {name = "biome";};};

     

       20
       20
       +
             code_actions_on_format = {

     

       21
       21
       +
               "source.fixAll.biome" = true;

     

       22
       22
       +
               "source.organizeImports.biome" = true;

     

       23
       23
       +
             };

     

       24
       24
       +
           };

     

       25
       25
       +
         in {

     

       7
       26
        
           files.files = [

     

       8
       27
        
             {

     

       9
       28
        
               checkFile = false;

     
···

       16
       35
        
                 };

     

       17
       36
        
       

     

       18
       37
        
                 languages = {

     

       19
       19
       -
                   JSON = {

     

       20
       20
       -
                     format_on_save = "on";

     

       21
       21
       -
       

     

       22
       22
       -
                     formatter = {

     

       23
       23
       -
                       external = {

     

       24
       24
       -
                         command = lib.getExe pkgs.prettier;

     

       25
       25
       -
                         arguments = ["--stdin-filepath" "{buffer_path}"];

     

       26
       26
       -
                       };

     

       27
       27
       -
                     };

     

       28
       28
       -
                   };

     

       38
       38
       +
                   JSON = biome;

     

       29
       39
        
       

     

       30
       40
        
                   Markdown = {

     

       31
       41
        
                     format_on_save = "on";

     

       32
       42
        
       

     

       33
       33
       -
                     formatter.external = {

     

       34
       34
       -
                       command = lib.getExe pkgs.prettier;

     

       35
       35
       -
                       arguments = ["--stdin-filepath" "{buffer_path}"];

     

       36
       36
       -
                     };

     

       43
       43
       +
                     formatter = prettier;

     

       37
       44
        
                   };

     

       38
       45
        
       

     

       39
       46
        
                   Nix = {

     
···

       58
       65
        
       

     

       59
       66
        
                   YAML = {

     

       60
       67
        
                     format_on_save = "on";

     

       61
       61
       -
                     formatter.external = {

     

       62
       62
       -
                       command = lib.getExe pkgs.prettier;

     

       63
       63
       -
                       arguments = ["--stdin-filepath" "{buffer_path}"];

     

       64
       64
       -
                     };

     

       68
       68
       +
                     formatter = prettier;

     

       65
       69
        
                   };

     

       66
       70
        
                 };

     

       67
       71

+62 -10

modules/home/programs/helix/default.nix

···

       128
       128
        
                   command = lib.getExe pkgs.superhtml;

     

       129
       129
        
                   args = ["--stdio"];

     

       130
       130
        
                 };

     

       131
       131
       +
       

     

       132
       132
       +
                 biome = {

     

       133
       133
       +
                   command = lib.getExe pkgs.biome;

     

       134
       134
       +
                   args = ["lsp-proxy"];

     

       135
       135
       +
                 };

     

       131
       136
        
               };

     

       132
       137
        
       

     

       133
       138
        
               language = [

     
···

       146
       151
        
                 {

     

       147
       152
        
                   name = "css";

     

       148
       153
        
                   auto-format = true;

     

       149
       149
       -
                   formatter = {command = lib.getExe pkgs.prettier;};

     

       150
       150
       -
                   language-servers = ["vscode-css-languageserver"];

     

       154
       154
       +
                   language-servers = [

     

       155
       155
       +
                     {

     

       156
       156
       +
                       name = "vscode-css-languageserver";

     

       157
       157
       +
                       except-features = ["format"];

     

       158
       158
       +
                     }

     

       159
       159
       +
                     "biome"

     

       160
       160
       +
                   ];

     

       151
       161
        
                 }

     

       152
       162
        
                 {

     

       153
       163
        
                   name = "fish";

     
···

       157
       167
        
                 {

     

       158
       168
        
                   name = "html";

     

       159
       169
        
                   auto-format = true;

     

       160
       160
       -
                   formatter = {command = lib.getExe pkgs.prettier;};

     

       161
       161
       -
                   language-servers = ["superhtml"];

     

       170
       170
       +
                   language-servers = [

     

       171
       171
       +
                     {

     

       172
       172
       +
                       name = "superhmtl";

     

       173
       173
       +
                       except-features = ["format"];

     

       174
       174
       +
                     }

     

       175
       175
       +
                     "biome"

     

       176
       176
       +
                   ];

     

       162
       177
        
                 }

     

       163
       178
        
                 {

     

       164
       179
        
                   name = "javascript";

     

       165
       180
        
                   auto-format = true;

     

       166
       166
       -
                   formatter = {command = lib.getExe pkgs.prettier;};

     

       167
       167
       -
                   language-servers = ["typescript-language-server"];

     

       181
       181
       +
                   language-servers = [

     

       182
       182
       +
                     {

     

       183
       183
       +
                       name = "typescript-language-server";

     

       184
       184
       +
                       except-features = ["format"];

     

       185
       185
       +
                     }

     

       186
       186
       +
                     "biome"

     

       187
       187
       +
                   ];

     

       168
       188
        
                 }

     

       169
       189
        
                 {

     

       170
       190
        
                   name = "json";

     

       171
       191
        
                   auto-format = true;

     

       172
       172
       -
                   formatter = {command = lib.getExe pkgs.prettier;};

     

       173
       173
       -
                   language-servers = ["vscode-json-languageserver"];

     

       192
       192
       +
                   language-servers = [

     

       193
       193
       +
                     {

     

       194
       194
       +
                       name = "vscode-json-languageserver";

     

       195
       195
       +
                       except-features = ["format"];

     

       196
       196
       +
                     }

     

       197
       197
       +
                     "biome"

     

       198
       198
       +
                   ];

     

       174
       199
        
                 }

     

       175
       200
        
                 {

     

       176
       201
        
                   name = "lua";

     
···

       193
       218
        
                 {

     

       194
       219
        
                   name = "typescript";

     

       195
       220
        
                   auto-format = true;

     

       196
       196
       -
                   formatter = {command = lib.getExe pkgs.prettier;};

     

       197
       197
       -
                   language-servers = ["typescript-language-server"];

     

       221
       221
       +
                   language-servers = [

     

       222
       222
       +
                     {

     

       223
       223
       +
                       name = "typescript-language-server";

     

       224
       224
       +
                       except-features = ["format"];

     

       225
       225
       +
                     }

     

       226
       226
       +
                     "biome"

     

       227
       227
       +
                   ];

     

       228
       228
       +
                 }

     

       229
       229
       +
                 {

     

       230
       230
       +
                   name = "jsx";

     

       231
       231
       +
                   auto-format = true;

     

       232
       232
       +
                   language-servers = [

     

       233
       233
       +
                     {

     

       234
       234
       +
                       name = "typescript-language-server";

     

       235
       235
       +
                       except-features = ["format"];

     

       236
       236
       +
                     }

     

       237
       237
       +
                     "biome"

     

       238
       238
       +
                   ];

     

       239
       239
       +
                 }

     

       240
       240
       +
                 {

     

       241
       241
       +
                   name = "tsx";

     

       242
       242
       +
                   auto-format = true;

     

       243
       243
       +
                   language-servers = [

     

       244
       244
       +
                     {

     

       245
       245
       +
                       name = "typescript-language-server";

     

       246
       246
       +
                       except-features = ["format"];

     

       247
       247
       +
                     }

     

       248
       248
       +
                     "biome"

     

       249
       249
       +
                   ];

     

       198
       250
        
                 }

     

       199
       251
        
               ];

     

       200
       252
        
             };

+37 -41

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

···

       4
       4
        
         pkgs,

     

       5
       5
        
         ...

     

       6
       6
        
       }: let

     

       7
       7
       -
         bunPrettier = {

     

       7
       7
       +
         biome = {

     

       8
       8
       +
           format_on_save = "on";

     

       9
       9
       +
       

     

       10
       10
       +
           formatter = {language_server = {name = "biome";};};

     

       11
       11
       +
           code_actions_on_format = {

     

       12
       12
       +
             "source.fixAll.biome" = true;

     

       13
       13
       +
             "source.organizeImports.biome" = true;

     

       14
       14
       +
           };

     

       15
       15
       +
         };

     

       16
       16
       +
         biomeTS =

     

       17
       17
       +
           biome

     

       18
       18
       +
           // {

     

       19
       19
       +
             language_servers = [

     

       20
       20
       +
               "typescript-language-server"

     

       21
       21
       +
               "biome"

     

       22
       22
       +
               "!vtsls"

     

       23
       23
       +
               "!eslint"

     

       24
       24
       +
             ];

     

       25
       25
       +
           };

     

       26
       26
       +
         prettier = {

     

       8
       27
        
           external = {

     

       9
       28
        
             command = pkgs.writeScript "prettier-bun" ''

     

       10
       29
        
               #! ${pkgs.bash}/bin/bash -e

     
···

       29
       48
        
               "nix"

     

       30
       49
        
               "scss"

     

       31
       50
        
               "toml"

     

       51
       51
       +
               "biome"

     

       32
       52
        
             ];

     

       33
       53
        
             userSettings = {

     

       34
       54
        
               auto_indent_on_paste = true;

     
···

       55
       75
        
               };

     

       56
       76
        
       

     

       57
       77
        
               languages = {

     

       58
       58
       -
                 JavaScript = {

     

       59
       59
       -
                   format_on_save = "on";

     

       60
       60
       -
       

     

       61
       61
       -
                   formatter = bunPrettier;

     

       62
       62
       -
                   language_servers = [

     

       63
       63
       -
                     "typescript-language-server"

     

       64
       64
       -
                     "!vtsls"

     

       65
       65
       -
                     "!eslint"

     

       66
       66
       -
                   ];

     

       67
       67
       -
                 };

     

       68
       68
       -
                 TypeScript = {

     

       69
       69
       -
                   format_on_save = "on";

     

       70
       70
       -
       

     

       71
       71
       -
                   formatter = bunPrettier;

     

       72
       72
       -
                   language_servers = [

     

       73
       73
       -
                     "typescript-language-server"

     

       74
       74
       -
                     "!vtsls"

     

       75
       75
       -
                     "!eslint"

     

       76
       76
       -
                   ];

     

       77
       77
       -
                 };

     

       78
       78
       -
                 TSX = {

     

       78
       78
       +
                 JavaScript = biomeTS;

     

       79
       79
       +
                 TypeScript = biomeTS;

     

       80
       80
       +
                 TSX = biomeTS;

     

       81
       81
       +
                 JSON = biome;

     

       82
       82
       +
                 CSS = biome;

     

       83
       83
       +
                 Nix = {

     

       79
       84
        
                   format_on_save = "on";

     

       80
       80
       -
       

     

       81
       81
       -
                   formatter = bunPrettier;

     

       85
       85
       +
                   formatter = "language_server";

     

       82
       86
        
                   language_servers = [

     

       83
       83
       -
                     "typescript-language-server"

     

       84
       84
       -
                     "!vtsls"

     

       85
       85
       -
                     "!eslint"

     

       87
       87
       +
                     "nixd"

     

       86
       88
        
                   ];

     

       87
       89
        
                 };

     

       88
       88
       -
                 JSON = {

     

       89
       89
       -
                   format_on_save = "on";

     

       90
       90
       -
       

     

       91
       91
       -
                   formatter = bunPrettier;

     

       92
       92
       -
                 };

     

       93
       93
       -
                 CSS = {

     

       90
       90
       +
                 Markdown = {

     

       94
       91
        
                   format_on_save = "on";

     

       95
       92
        
       

     

       96
       96
       -
                   formatter = bunPrettier;

     

       97
       97
       -
                 };

     

       98
       98
       -
                 Nix = {

     

       99
       99
       -
                   format_on_save = "on";

     

       100
       100
       -
                   formatter = "language_server";

     

       101
       101
       -
                   language_servers = [

     

       102
       102
       -
                     "nixd"

     

       103
       103
       -
                   ];

     

       93
       93
       +
                   formatter = prettier;

     

       104
       94
        
                 };

     

       105
       95
        
               };

     

       106
       96
        
               lsp = {

     
···

       133
       123
        
                       exec ${lib.getExe pkgs.bun} ${pkgs.vscode-css-languageserver}/lib/node_modules/vscode-css-languageserver/out/node/cssServerMain.js "$@"

     

       134
       124
        
                     '';

     

       135
       125
        
                     arguments = ["--stdio"];

     

       126
       126
       +
                   };

     

       127
       127
       +
                 };

     

       128
       128
       +
                 biome = {

     

       129
       129
       +
                   binary = {

     

       130
       130
       +
                     path = lib.getExe pkgs.biome;

     

       131
       131
       +
                     arguments = ["lsp-proxy"];

     

       136
       132
        
                   };

     

       137
       133
        
                 };

     

       138
       134
        
               };