commit 43396a1a8a36316332c3427027037857faae8d7a · aylac.top/nixcfg-own-knot

+24 -18

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

···

       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;

     

       39
       40
        
         in

     

       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
       -
           );

     

       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
       +
             );

     

       57
       61
        
       in {

     

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

     

       59
       63
        
       

     
···

       81
       85
        
               "svelte"

     

       82
       86
        
               "vue"

     

       83
       87
        
               "basher"

     

       88
       88
       +
               "sql"

     

       89
       89
       +
               #"ruby"

     

       84
       90
        
               #"elixir"

     

       85
       91
        
             ];

     

       86
       92
        
             userSettings = {

     
···

       127
       133
        
                   editorCfg.languages

     

       128
       134
        
                 )

     

       129
       135
        
               );

     

       130
       130
       -
               lsp = lib.mapAttrs mkZedLsp editorCfg.languageServers;

     

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

     

       131
       137
        
             };

     

       132
       138
        
             userTasks = [

     

       133
       139
        
               {

+25 -10

modules/home/snippets/editor/default.nix

···

       8
       8
        
           command,

     

       9
       9
        
           args ? [],

     

       10
       10
        
           config ? {},

     

       11
       11
       +
           helix-only ? false,

     

       11
       12
        
         }: {

     

       12
       12
       -
           inherit name command args config;

     

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

     

       13
       14
        
         };

     

       14
       15
        
       

     

       15
       16
        
         # Helper function to create formatter definitions

     
···

       72
       73
        
                 '';

     

       73
       74
        
               args = [];

     

       74
       75
        
               config = {provideFormatter = false;};

     

       76
       76
       +
               helix-only = true;

     

       75
       77
        
             };

     

       76
       78
        
       

     

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

     
···

       165
       167
        
               args = ["127.0.0.1" "6005"];

     

       166
       168
        
               config = {language-id = "gdscript";};

     

       167
       169
        
             };

     

       170
       170
       +
       

     

       171
       171
       +
             solargraph = mkLspServer "solargraph" {

     

       172
       172
       +
               command = lib.getExe pkgs.rubyPackages.solargraph;

     

       173
       173
       +
               args = ["stdio"];

     

       174
       174
       +
             };

     

       175
       175
       +
       

     

       176
       176
       +
             #rubocop = mkLspServer "rubocop" {

     

       177
       177
       +
             #  command = lib.getExe pkgs.rubocop;

     

       178
       178
       +
             #};

     

       168
       179
        
           };

     

       169
       180
        
       

     

       170
       181
        
           # Formatters

     
···

       217
       228
        
           languages = {

     

       218
       229
        
             html = mkLanguage "html" {

     

       219
       230
        
               full-name = "HTML";

     

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

     

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

     

       221
       232
        
               formatter = "biome";

     

       222
       233
        
               helix-formatter = "biomeHtml";

     

       223
       234
        
               code-actions-on-format = {

     
···

       228
       239
        
       

     

       229
       240
        
             css = mkLanguage "css" {

     

       230
       241
        
               full-name = "CSS";

     

       231
       231
       -
               language-servers = ["vscode-css-languageserver" "biome" "tailwindcss-language-server"];

     

       242
       242
       +
               language-servers = ["vscode-css-languageserver" "biome"];

     

       232
       243
        
               formatter = "biome";

     

       233
       244
        
               code-actions-on-format = {

     

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

     
···

       238
       249
        
       

     

       239
       250
        
             javascript = mkLanguage "javascript" {

     

       240
       251
        
               full-name = "JavaScript";

     

       241
       241
       -
               language-servers = ["typescript-language-server" "biome" "tailwindcss-language-server"];

     

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

     

       242
       253
        
               formatter = "biome";

     

       243
       254
        
               code-actions-on-format = {

     

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

     
···

       248
       259
        
       

     

       249
       260
        
             typescript = mkLanguage "typescript" {

     

       250
       261
        
               full-name = "TypeScript";

     

       251
       251
       -
               language-servers = ["typescript-language-server" "biome" "tailwindcss-language-server"];

     

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

     

       252
       263
        
               formatter = "biome";

     

       253
       264
        
               code-actions-on-format = {

     

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

     
···

       258
       269
        
       

     

       259
       270
        
             jsx = mkLanguage "jsx" {

     

       260
       271
        
               full-name = "JSX";

     

       261
       261
       -
               language-servers = ["typescript-language-server" "biome" "tailwindcss-language-server"];

     

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

     

       262
       273
        
               formatter = "biome";

     

       263
       274
        
               code-actions-on-format = {

     

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

     
···

       268
       279
        
       

     

       269
       280
        
             tsx = mkLanguage "tsx" {

     

       270
       281
        
               full-name = "TSX";

     

       271
       271
       -
               language-servers = ["typescript-language-server" "biome" "tailwindcss-language-server"];

     

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

     

       272
       283
        
               formatter = "biome";

     

       273
       284
        
               code-actions-on-format = {

     

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

     
···

       278
       289
        
       

     

       279
       290
        
             svelte = mkLanguage "svelte" {

     

       280
       291
        
               full-name = "Svelte";

     

       281
       281
       -
               language-servers = ["svelte-language-server" "biome" "tailwindcss-language-server"];

     

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

     

       282
       293
        
               formatter = "biome";

     

       283
       294
        
               code-actions-on-format = {

     

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

     
···

       288
       299
        
       

     

       289
       300
        
             vue = mkLanguage "vue" {

     

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

     

       291
       291
       -
               language-servers = ["vue-language-server" "biome" "tailwindcss-language-server"];

     

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

     

       292
       303
        
               formatter = "biome";

     

       293
       304
        
               code-actions-on-format = {

     

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

     
···

       302
       313
        
               formatter = "biome";

     

       303
       314
        
               code-actions-on-format = {

     

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

     

       305
       305
       -
                 "source.organizeImports.biome" = true;

     

       306
       316
        
               };

     

       307
       317
        
             };

     

       308
       318
        
       

     
···

       375
       385
        
               full-name = "GDScript";

     

       376
       386
        
               language-servers = ["gdscript-language-server"];

     

       377
       387
        
               formatter = "gdscript-formatter";

     

       388
       388
       +
             };

     

       389
       389
       +
       

     

       390
       390
       +
             ruby = mkLanguage "ruby" {

     

       391
       391
       +
               full-name = "Ruby";

     

       392
       392
       +
               language-servers = ["solargraph" "rubocop" "!ruby-lsp"];

     

       378
       393
        
             };

     

       379
       394
        
           };

     

       380
       395
        
         };