commit c253a447b7f75b306e6afca02c0815c34967c75e · aylac.top/nixcfg-own-knot

+2 -1

homes/ayla/default.nix

···

       19
       19
        
                 ffmpeg-full

     

       20
       20
        
                 love

     

       21
       21
        
                 luajit

     

       22
       22
       -
                 nodejs

     

       22
       22
       +
                 #nodejs

     

       23
       23
       +
                 bun

     

       23
       24
        
                 typescript

     

       24
       25
        
       

     

       25
       26
        
                 # applications

+13 -4

modules/home/programs/helix/default.nix

···

       82
       82
        
                 };

     

       83
       83
        
       

     

       84
       84
        
                 vscode-css-languageserver = {

     

       85
       85
       -
                   command = lib.getExe pkgs.vscode-css-languageserver;

     

       85
       85
       +
                   command = pkgs.writeScript "vscode-css-languageserver-bun" ''

     

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

     

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

     

       88
       88
       +
                   '';

     

       86
       89
        
                   args = ["--stdio"];

     

       87
       90
        
                 };

     

       88
       91
        
       

     
···

       106
       109
        
                 };

     

       107
       110
        
       

     

       108
       111
        
                 vscode-json-languageserver = {

     

       109
       109
       -
                   command = lib.getExe pkgs.vscode-json-languageserver;

     

       112
       112
       +
                   command = pkgs.writeScript "vscode-json-languageserver-bun" ''

     

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

     

       114
       114
       +
                     exec ${lib.getExe pkgs.bun} ${pkgs.vscode-json-languageserver}/lib/node_modules/vscode-json-languageserver/./bin/vscode-json-languageserver "$@"

     

       115
       115
       +
                   '';

     

       110
       116
        
                   args = ["--stdio"];

     

       111
       117
        
                 };

     

       112
       118
        
       

     

       113
       119
        
                 typescript-language-server = with pkgs.nodePackages; {

     

       114
       114
       -
                   command = "${typescript-language-server}/bin/typescript-language-server";

     

       115
       115
       -
                   args = ["--stdio" "--tsserver-path=${typescript}/lib/node_modules/typescript/lib"];

     

       120
       120
       +
                   command = pkgs.writeScript "typescript-language-server-bun" ''

     

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

     

       122
       122
       +
                     exec ${lib.getExe pkgs.bun} ${typescript-language-server}/lib/node_modules/typescript-language-server/lib/cli.mjs "$@"

     

       123
       123
       +
                   '';

     

       124
       124
       +
                   args = ["--stdio"];

     

       116
       125
        
                 };

     

       117
       126
        
       

     

       118
       127
        
                 superhtml = {

+68 -39

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

···

       3
       3
        
         config,

     

       4
       4
        
         pkgs,

     

       5
       5
        
         ...

     

       6
       6
       -
       }: {

     

       6
       6
       +
       }: let

     

       7
       7
       +
         bunPrettier = {

     

       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
       +
       in {

     

       7
       17
        
         options.myHome.programs.zed-editor.enable = lib.mkEnableOption "zed editor";

     

       8
       18
        
       

     

       9
       19
        
         config = lib.mkIf config.myHome.programs.zed-editor.enable {

     
···

       48
       58
        
                 JavaScript = {

     

       49
       59
        
                   format_on_save = "on";

     

       50
       60
        
       

     

       51
       51
       -
                   formatter = {

     

       52
       52
       -
                     external = {

     

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

     

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

     

       55
       55
       -
                     };

     

       56
       56
       -
                   };

     

       61
       61
       +
                   formatter = bunPrettier;

     

       62
       62
       +
                   language_servers = [

     

       63
       63
       +
                     "typescript-language-server"

     

       64
       64
       +
                     "!vtsls"

     

       65
       65
       +
                     "!eslint"

     

       66
       66
       +
                   ];

     

       57
       67
        
                 };

     

       58
       68
        
                 TypeScript = {

     

       59
       69
        
                   format_on_save = "on";

     

       60
       70
        
       

     

       61
       61
       -
                   formatter = {

     

       62
       62
       -
                     external = {

     

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

     

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

     

       65
       65
       -
                     };

     

       66
       66
       -
                   };

     

       71
       71
       +
                   formatter = bunPrettier;

     

       72
       72
       +
                   language_servers = [

     

       73
       73
       +
                     "typescript-language-server"

     

       74
       74
       +
                     "!vtsls"

     

       75
       75
       +
                     "!eslint"

     

       76
       76
       +
                   ];

     

       67
       77
        
                 };

     

       68
       78
        
                 TSX = {

     

       69
       79
        
                   format_on_save = "on";

     

       70
       80
        
       

     

       71
       71
       -
                   formatter = {

     

       72
       72
       -
                     external = {

     

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

     

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

     

       75
       75
       -
                     };

     

       76
       76
       -
                   };

     

       81
       81
       +
                   formatter = bunPrettier;

     

       82
       82
       +
                   language_servers = [

     

       83
       83
       +
                     "typescript-language-server"

     

       84
       84
       +
                     "!vtsls"

     

       85
       85
       +
                     "!eslint"

     

       86
       86
       +
                   ];

     

       87
       87
       +
                 };

     

       88
       88
       +
                 JSON = {

     

       89
       89
       +
                   format_on_save = "on";

     

       90
       90
       +
       

     

       91
       91
       +
                   formatter = bunPrettier;

     

       92
       92
       +
                 };

     

       93
       93
       +
                 CSS = {

     

       94
       94
       +
                   format_on_save = "on";

     

       95
       95
       +
       

     

       96
       96
       +
                   formatter = bunPrettier;

     

       77
       97
        
                 };

     

       78
       98
        
                 Nix = {

     

       79
       99
        
                   format_on_save = "on";

     
···

       82
       102
        
                     "nixd"

     

       83
       103
        
                   ];

     

       84
       104
        
                 };

     

       85
       85
       -
                 JSON = {

     

       86
       86
       -
                   format_on_save = "on";

     

       87
       87
       -
       

     

       88
       88
       -
                   formatter = {

     

       89
       89
       -
                     external = {

     

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

     

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

     

       92
       92
       -
                     };

     

       105
       105
       +
               };

     

       106
       106
       +
               lsp = {

     

       107
       107
       +
                 nixd = {

     

       108
       108
       +
                   binary.path = lib.getExe pkgs.nixd;

     

       109
       109
       +
                   settings.formatting.command = [(lib.getExe pkgs.alejandra) "--quiet" "--"];

     

       110
       110
       +
                 };

     

       111
       111
       +
                 typescript-language-server = with pkgs.nodePackages; {

     

       112
       112
       +
                   binary = {

     

       113
       113
       +
                     path = pkgs.writeScript "typescript-language-server-bun" ''

     

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

     

       115
       115
       +
                       exec ${lib.getExe pkgs.bun} ${typescript-language-server}/lib/node_modules/typescript-language-server/lib/cli.mjs "$@"

     

       116
       116
       +
                     '';

     

       117
       117
       +
                     arguments = ["--stdio"];

     

       118
       118
       +
                   };

     

       119
       119
       +
                 };

     

       120
       120
       +
                 json-language-server = {

     

       121
       121
       +
                   binary = {

     

       122
       122
       +
                     path = pkgs.writeScript "vscode-json-languageserver-bun" ''

     

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

     

       124
       124
       +
                       exec ${lib.getExe pkgs.bun} ${pkgs.vscode-json-languageserver}/lib/node_modules/vscode-json-languageserver/./bin/vscode-json-languageserver "$@"

     

       125
       125
       +
                     '';

     

       126
       126
       +
                     arguments = ["--stdio"];

     

       93
       127
        
                   };

     

       94
       128
        
                 };

     

       95
       95
       -
                 CSS = {

     

       96
       96
       -
                   format_on_save = "on";

     

       97
       97
       -
       

     

       98
       98
       -
                   formatter = {

     

       99
       99
       -
                     external = {

     

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

     

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

     

       102
       102
       -
                     };

     

       129
       129
       +
                 css-language-server = {

     

       130
       130
       +
                   binary = {

     

       131
       131
       +
                     path = pkgs.writeScript "vscode-css-languageserver-bun" ''

     

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

     

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

     

       134
       134
       +
                     '';

     

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

     

       103
       136
        
                   };

     

       104
       137
        
                 };

     

       105
       105
       -
               };

     

       106
       106
       -
               lsp.nixd = {

     

       107
       107
       -
                 binary.path = lib.getExe pkgs.nixd;

     

       108
       108
       -
                 settings.formatting.command = [(lib.getExe pkgs.alejandra) "--quiet" "--"];

     

       109
       138
        
               };

     

       110
       139
        
               telemetry = {

     

       111
       140
        
                 diagnostics = false;