comparing 74b1302aa5339542ca5559d506ed14962e9746cc and main on aylac.top/nixcfg-own-knot

+1 -3

homes/ayla/default.nix

···

       135
       135
        
             };

     

       136
       136
        
       

     

       137
       137
        
             myHome = {

     

       138
       138
       -
               desktop = {

     

       139
       139
       -
                 gnome.enable = true;

     

       140
       140
       -
               };

     

       138
       138
       +
               desktop.gnome.enable = true;

     

       141
       139
        
       

     

       142
       140
        
               programs = {

     

       143
       141
        
                 lutris.enable = true;

+51

modules/home/desktop/cosmic/default.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         config,

     

       4
       4
       +
         pkgs,

     

       5
       5
       +
         ...

     

       6
       6
       +
       }: {

     

       7
       7
       +
         options.myHome.desktop.cosmic = {

     

       8
       8
       +
           enable = lib.mkEnableOption "COSMIC desktop environment";

     

       9
       9
       +
         };

     

       10
       10
       +
       

     

       11
       11
       +
         config = lib.mkIf config.myHome.desktop.cosmic.enable {

     

       12
       12
       +
           dconf = {

     

       13
       13
       +
             enable = true;

     

       14
       14
       +
       

     

       15
       15
       +
             settings = {

     

       16
       16
       +
               "org/gnome/desktop/wm/preferences".button-layout = "appmenu:close";

     

       17
       17
       +
             };

     

       18
       18
       +
           };

     

       19
       19
       +
       

     

       20
       20
       +
           myHome.profiles.defaultApps = {

     

       21
       21
       +
             audioPlayer = {

     

       22
       22
       +
               package = lib.mkDefault config.programs.mpv.finalPackage;

     

       23
       23
       +
               icon = lib.mkDefault "mpv";

     

       24
       24
       +
             };

     

       25
       25
       +
             editor = {

     

       26
       26
       +
               package = lib.mkDefault pkgs.cosmic-edit;

     

       27
       27
       +
               icon = lib.mkDefault "com.system76.CosmicEdit";

     

       28
       28
       +
             };

     

       29
       29
       +
             fileManager = {

     

       30
       30
       +
               package = lib.mkDefault pkgs.cosmic-files;

     

       31
       31
       +
               icon = lib.mkDefault "com.system76.CosmicFiles";

     

       32
       32
       +
             };

     

       33
       33
       +
             imageViewer = {

     

       34
       34
       +
               package = lib.mkDefault pkgs.loupe;

     

       35
       35
       +
               icon = lib.mkDefault "org.gnome.Loupe";

     

       36
       36
       +
             };

     

       37
       37
       +
             pdfViewer = {

     

       38
       38
       +
               package = lib.mkDefault pkgs.papers;

     

       39
       39
       +
               icon = lib.mkDefault "org.gnome.Papers";

     

       40
       40
       +
             };

     

       41
       41
       +
             terminal = {

     

       42
       42
       +
               package = lib.mkDefault pkgs.cosmic-term;

     

       43
       43
       +
               icon = lib.mkDefault "com.system76.CosmicTerm";

     

       44
       44
       +
             };

     

       45
       45
       +
             videoPlayer = {

     

       46
       46
       +
               package = lib.mkDefault config.programs.mpv.finalPackage;

     

       47
       47
       +
               icon = lib.mkDefault "mpv";

     

       48
       48
       +
             };

     

       49
       49
       +
           };

     

       50
       50
       +
         };

     

       51
       51
       +
       }

modules/home/desktop/default.nix

···

       7
       7
        
         imports = [

     

       8
       8
        
           ./gnome

     

       9
       9
        
           ./plasma

     

       10
       10
       +
           ./cosmic

     

       10
       11
        
         ];

     

       11
       12
        
       

     

       12
       13
        
         options.myHome.desktop.enable = lib.mkOption {

modules/home/desktop/gnome/default.nix

···

       93
       93
        
                 switch-to-workspace-up = [];

     

       94
       94
        
                 toggle-fullscreen = ["<Super>w"];

     

       95
       95
        
               };

     

       96
       96
       +
       

     

       97
       97
       +
               "org/gnome/desktop/wm/preferences".button-layout = "appmenu:close";

     

       96
       98
        
             };

     

       97
       99
        
           };

     

       98
       100

+42 -1

modules/home/desktop/plasma/default.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
        
         config,

     

       4
       4
       +
         pkgs,

     

       4
       5
        
         ...

     

       5
       6
        
       }: {

     

       6
       7
        
         options.myHome.desktop.plasma = {

     

       7
       8
        
           enable = lib.mkEnableOption "KDE Plasma desktop environment";

     

       8
       9
        
         };

     

       9
       10
        
       

     

       10
       10
       -
         config = lib.mkIf config.myHome.desktop.plasma.enable {};

     

       11
       11
       +
         config = lib.mkIf config.myHome.desktop.plasma.enable {

     

       12
       12
       +
           dconf = {

     

       13
       13
       +
             enable = true;

     

       14
       14
       +
       

     

       15
       15
       +
             settings = {

     

       16
       16
       +
               "org/gnome/desktop/wm/preferences".button-layout = "appmenu:minimize,maximize,close";

     

       17
       17
       +
             };

     

       18
       18
       +
           };

     

       19
       19
       +
       

     

       20
       20
       +
           myHome.profiles.defaultApps = {

     

       21
       21
       +
             audioPlayer = {

     

       22
       22
       +
               package = lib.mkDefault config.programs.mpv.finalPackage;

     

       23
       23
       +
               icon = lib.mkDefault "mpv";

     

       24
       24
       +
             };

     

       25
       25
       +
             editor = {

     

       26
       26
       +
               package = lib.mkDefault pkgs.kdePackages.kate;

     

       27
       27
       +
               icon = lib.mkDefault "org.kde.kate";

     

       28
       28
       +
             };

     

       29
       29
       +
             fileManager = {

     

       30
       30
       +
               package = lib.mkDefault pkgs.kdePackages.dolphin;

     

       31
       31
       +
               exec = lib.mkDefault (lib.getExe config.myHome.profiles.defaultApps.fileManager.package);

     

       32
       32
       +
               icon = lib.mkDefault "org.kde.dolphin";

     

       33
       33
       +
             };

     

       34
       34
       +
             imageViewer = {

     

       35
       35
       +
               package = lib.mkDefault pkgs.kdePackages.gwenview;

     

       36
       36
       +
               icon = lib.mkDefault "org.kde.gwenview";

     

       37
       37
       +
             };

     

       38
       38
       +
             pdfViewer = {

     

       39
       39
       +
               package = lib.mkDefault pkgs.kdePackages.okular;

     

       40
       40
       +
               icon = lib.mkDefault "org.kde.okular";

     

       41
       41
       +
             };

     

       42
       42
       +
             terminal = {

     

       43
       43
       +
               package = lib.mkDefault pkgs.kdePackages.konsole;

     

       44
       44
       +
               icon = lib.mkDefault "org.kde.konsole";

     

       45
       45
       +
             };

     

       46
       46
       +
             videoPlayer = {

     

       47
       47
       +
               package = lib.mkDefault config.programs.mpv.finalPackage;

     

       48
       48
       +
               icon = lib.mkDefault "mpv";

     

       49
       49
       +
             };

     

       50
       50
       +
           };

     

       51
       51
       +
         };

     

       11
       52
        
       }

+27 -10

modules/home/profiles/defaultApps/mimeTypes.nix

···

       82
       82
        
         ];

     

       83
       83
        
       

     

       84
       84
        
         browserFiles = [

     

       85
       85
       -
           "application/vnd.mozilla.xul+xml"

     

       86
       86
       -
           "application/x-extension-htm"

     

       87
       87
       -
           "application/x-extension-html"

     

       88
       88
       -
           "application/x-extension-shtml"

     

       89
       89
       -
           "application/x-extension-xht"

     

       90
       90
       -
           "application/x-extension-xhtml"

     

       91
       91
       -
           "application/xhtml+xml"

     

       92
       92
       -
           "text/html"

     

       93
       93
       -
           "text/xml"

     

       94
       85
        
           "x-scheme-handler/chrome"

     

       95
       86
        
           "x-scheme-handler/ftp"

     

       96
       87
        
           "x-scheme-handler/http"

     
···

       136
       127
        
         ];

     

       137
       128
        
       

     

       138
       129
        
         editorFiles = [

     

       130
       130
       +
           "application/vnd.mozilla.xul+xml"

     

       131
       131
       +
           "application/x-extension-htm"

     

       132
       132
       +
           "application/x-extension-html"

     

       133
       133
       +
           "application/x-extension-shtml"

     

       134
       134
       +
           "application/x-extension-xht"

     

       135
       135
       +
           "application/x-extension-xhtml"

     

       136
       136
       +
           "application/xhtml+xml"

     

       137
       137
       +
           "text/html"

     

       138
       138
       +
           "text/xml"

     

       139
       139
       +
       

     

       139
       140
        
           "application/json"

     

       140
       140
       -
           "application/x-shellscript"

     

       141
       141
        
           "application/x-shellscript"

     

       142
       142
        
           "text/markdown"

     

       143
       143
        
           "text/plain"

     
···

       145
       145
        
           "text/x-typescript"

     

       146
       146
        
           "text/x-javascript"

     

       147
       147
        
           "text/x-svelte"

     

       148
       148
       +
           "text/css"

     

       149
       149
       +
           "text/x-lua"

     

       150
       150
       +
           "text/x-nix"

     

       151
       151
       +
           "text/x-scss"

     

       152
       152
       +
           "application/toml"

     

       153
       153
       +
           "text/x-zig"

     

       154
       154
       +
           "text/x-gleam"

     

       155
       155
       +
           "text/x-glsl"

     

       156
       156
       +
           "text/x-gdscript"

     

       157
       157
       +
           "text/x-vue"

     

       158
       158
       +
           "text/x-go"

     

       159
       159
       +
           "text/x-rust"

     

       160
       160
       +
           "text/x-makefile"

     

       161
       161
       +
           "text/x-fish"

     

       162
       162
       +
           "text/x-elixir"

     

       163
       163
       +
           "text/html"

     

       164
       164
       +
           "application/x-yaml"

     

       148
       165
        
         ];

     

       149
       166
        
       

     

       150
       167
        
         imageFiles = [

+60 -293

modules/home/programs/helix/default.nix

···

       1
       1
        
       {

     

       2
       2
        
         config,

     

       3
       3
        
         lib,

     

       4
       4
       -
         pkgs,

     

       5
       4
        
         ...

     

       6
       6
       -
       }: {

     

       5
       5
       +
       }: let

     

       6
       6
       +
         editorCfg = config.mySnippets.editor;

     

       7
       7
       +
       

     

       8
       8
       +
         mkHelixServer = name: srv:

     

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

     

       10
       10
       +
             inherit name;

     

       11
       11
       +
             command =

     

       12
       12
       +
               if srv.helix-command != null

     

       13
       13
       +
               then srv.helix-command

     

       14
       14
       +
               else srv.command;

     

       15
       15
       +
             args = srv.args or null;

     

       16
       16
       +
             config = srv.config or null;

     

       17
       17
       +
           };

     

       18
       18
       +
       

     

       19
       19
       +
         mkHelixLanguage = name: lang: let

     

       20
       20
       +
           # this shit is so ugly

     

       21
       21
       +
           fmtName = lib.findFirst (x: x != null) null [

     

       22
       22
       +
             (lang.helix-formatter or null)

     

       23
       23
       +
             (lang.formatter or null)

     

       24
       24
       +
           ];

     

       25
       25
       +
       

     

       26
       26
       +
           fmt =

     

       27
       27
       +
             if fmtName != null

     

       28
       28
       +
             then editorCfg.formatters.${fmtName}

     

       29
       29
       +
             else null;

     

       30
       30
       +
       

     

       31
       31
       +
           usesLspFormatter = fmt == null || fmt.type == "lsp";

     

       32
       32
       +
       

     

       33
       33
       +
           formatter =

     

       34
       34
       +
             if fmt != null && fmt.type == "external"

     

       35
       35
       +
             then

     

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

     

       37
       37
       +
                 command = fmt.command;

     

       38
       38
       +
                 args = fmt.args;

     

       39
       39
       +
               }

     

       40
       40
       +
             else null;

     

       41
       41
       +
       

     

       42
       42
       +
           fullLspList = lang.language-servers ++ lang.helix-only-language-servers;

     

       43
       43
       +
       

     

       44
       44
       +
           languageServers = map (srvName:

     

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

     

       46
       46
       +
               name = srvName;

     

       47
       47
       +
               except-features =

     

       48
       48
       +
                 if (usesLspFormatter && fmtName != null && srvName != fmtName)

     

       49
       49
       +
                 then ["format"]

     

       50
       50
       +
                 else null;

     

       51
       51
       +
             })

     

       52
       52
       +
           fullLspList;

     

       53
       53
       +
         in

     

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

     

       55
       55
       +
             name = lang.name;

     

       56
       56
       +
             auto-format = lang.auto-format;

     

       57
       57
       +
             language-servers = languageServers;

     

       58
       58
       +
             file-types = lang.file-types;

     

       59
       59
       +
             inherit formatter;

     

       60
       60
       +
           };

     

       61
       61
       +
       in {

     

       7
       62
        
         options.myHome.programs.helix.enable = lib.mkEnableOption "helix";

     

       8
       63
        
       

     

       9
       64
        
         config = lib.mkIf config.myHome.programs.helix.enable {

     
···

       74
       129
        
                 };

     

       75
       130
        
               };

     

       76
       131
        
             };

     

       77
       77
       -
             languages = {

     

       78
       78
       -
               language-server = {

     

       79
       79
       -
                 bash-language-server = {

     

       80
       80
       -
                   command = lib.getExe pkgs.bash-language-server;

     

       81
       81
       -
                   args = ["start"];

     

       82
       82
       -
                 };

     

       83
       132
        
       

     

       84
       84
       -
                 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
       -
                   '';

     

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

     

       90
       90
       -
                 };

     

       91
       91
       -
       

     

       92
       92
       -
                 fish-lsp = {

     

       93
       93
       -
                   command = lib.getExe pkgs.fish-lsp;

     

       94
       94
       -
                   args = ["start"];

     

       95
       95
       -
                 };

     

       96
       96
       -
       

     

       97
       97
       -
                 lua-language-server = {

     

       98
       98
       -
                   command = lib.getExe pkgs.lua-language-server;

     

       99
       99
       -
                 };

     

       100
       100
       -
       

     

       101
       101
       -
                 marksman = {

     

       102
       102
       -
                   command = lib.getExe pkgs.marksman;

     

       103
       103
       -
                   args = ["server"];

     

       104
       104
       -
                 };

     

       105
       105
       -
       

     

       106
       106
       -
                 nixd = {

     

       107
       107
       -
                   command = lib.getExe pkgs.nixd;

     

       108
       108
       -
                 };

     

       109
       109
       -
       

     

       110
       110
       -
                 nil = {

     

       111
       111
       -
                   command = lib.getExe pkgs.nil;

     

       112
       112
       -
                 };

     

       113
       113
       -
       

     

       114
       114
       -
                 vscode-json-languageserver = {

     

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

     

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

     

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

     

       118
       118
       -
                   '';

     

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

     

       120
       120
       -
                 };

     

       121
       121
       -
       

     

       122
       122
       -
                 typescript-language-server = with pkgs.nodePackages; {

     

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

     

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

     

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

     

       126
       126
       -
                   '';

     

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

     

       128
       128
       -
                 };

     

       129
       129
       -
       

     

       130
       130
       -
                 superhtml = {

     

       131
       131
       -
                   command = lib.getExe pkgs.superhtml;

     

       132
       132
       -
                   args = ["lsp"];

     

       133
       133
       -
                 };

     

       134
       134
       -
       

     

       135
       135
       -
                 biome = {

     

       136
       136
       -
                   command = lib.getExe pkgs.biome;

     

       137
       137
       -
                   args = ["lsp-proxy"];

     

       138
       138
       -
                   config = {

     

       139
       139
       -
                     format = {"html.formatter.enabled" = true;};

     

       140
       140
       -
                   };

     

       141
       141
       -
                 };

     

       142
       142
       -
       

     

       143
       143
       -
                 vscode-html-language-server = {

     

       144
       144
       -
                   command = pkgs.writeScript "vscode-html-language-server-bun" ''

     

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

     

       146
       146
       -
                     exec ${lib.getExe pkgs.bun} ${pkgs.vscode-langservers-extracted}/lib/node_modules/vscode-langservers-extracted/bin/vscode-html-language-server "$@"

     

       147
       147
       -
                   '';

     

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

     

       149
       149
       -
                 };

     

       150
       150
       -
       

     

       151
       151
       -
                 gopls = {

     

       152
       152
       -
                   command = lib.getExe pkgs.gopls;

     

       153
       153
       -
                   args = ["serve"];

     

       154
       154
       -
                 };

     

       155
       155
       -
       

     

       156
       156
       -
                 rust-analyzer = {

     

       157
       157
       -
                   command = lib.getExe pkgs.rust-analyzer;

     

       158
       158
       -
                 };

     

       159
       159
       -
       

     

       160
       160
       -
                 zls = {

     

       161
       161
       -
                   command = lib.getExe pkgs.zls;

     

       162
       162
       -
                 };

     

       163
       163
       -
       

     

       164
       164
       -
                 gleam = {

     

       165
       165
       -
                   command = lib.getExe pkgs.gleam;

     

       166
       166
       -
                   args = ["lsp"];

     

       167
       167
       -
                 };

     

       168
       168
       -
       

     

       169
       169
       -
                 glsl_analyzer = {

     

       170
       170
       -
                   command = lib.getExe pkgs.glsl_analyzer;

     

       171
       171
       -
                 };

     

       172
       172
       -
       

     

       173
       173
       -
                 gdscript-language-server = {

     

       174
       174
       -
                   command = lib.getExe pkgs.netcat;

     

       175
       175
       -
                   args = ["127.0.0.1" "6005"];

     

       176
       176
       -
                   language-id = "gdscript";

     

       177
       177
       -
                 };

     

       178
       178
       -
       

     

       179
       179
       -
                 svelte-language-server = {

     

       180
       180
       -
                   command = pkgs.writeScript "svelte-language-server-bun" ''

     

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

     

       182
       182
       -
                     exec ${lib.getExe pkgs.bun} ${pkgs.svelte-language-server}/lib/node_modules/svelte-language-server/bin/server.js "$@"

     

       183
       183
       -
                   '';

     

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

     

       185
       185
       -
                 };

     

       186
       186
       -
               };

     

       187
       187
       -
       

     

       188
       188
       -
               language = [

     

       189
       189
       -
                 {

     

       190
       190
       -
                   name = "bash";

     

       191
       191
       -
                   auto-format = true;

     

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

     

       193
       193
       -
       

     

       194
       194
       -
                   formatter = {

     

       195
       195
       -
                     command = lib.getExe pkgs.shfmt;

     

       196
       196
       -
                     args = ["-i" "2"];

     

       197
       197
       -
                   };

     

       198
       198
       -
       

     

       199
       199
       -
                   language-servers = ["bash-language-server"];

     

       200
       200
       -
                 }

     

       201
       201
       -
                 {

     

       202
       202
       -
                   name = "css";

     

       203
       203
       -
                   auto-format = true;

     

       204
       204
       -
                   language-servers = [

     

       205
       205
       -
                     {

     

       206
       206
       -
                       name = "vscode-css-languageserver";

     

       207
       207
       -
                       except-features = ["format"];

     

       208
       208
       -
                     }

     

       209
       209
       -
                     "biome"

     

       210
       210
       -
                   ];

     

       211
       211
       -
                 }

     

       212
       212
       -
                 {

     

       213
       213
       -
                   name = "fish";

     

       214
       214
       -
                   auto-format = true;

     

       215
       215
       -
                   language-servers = ["fish-lsp"];

     

       216
       216
       -
                 }

     

       217
       217
       -
                 {

     

       218
       218
       -
                   name = "html";

     

       219
       219
       -
                   auto-format = true;

     

       220
       220
       -
                   language-servers = [

     

       221
       221
       -
                     {

     

       222
       222
       -
                       name = "vscode-html-language-server";

     

       223
       223
       -
                       except-features = ["format"];

     

       224
       224
       -
                     }

     

       225
       225
       -
                     {

     

       226
       226
       -
                       name = "superhtml";

     

       227
       227
       -
                       except-features = ["format"];

     

       228
       228
       -
                     }

     

       229
       229
       -
                     {

     

       230
       230
       -
                       name = "biome";

     

       231
       231
       -
                       except-features = ["format"];

     

       232
       232
       -
                     }

     

       233
       233
       -
                   ];

     

       234
       234
       -
                   formatter = {

     

       235
       235
       -
                     command = lib.getExe pkgs.biome;

     

       236
       236
       -
                     args = ["format" "--use-server" "--html-formatter-enabled=true" "--stdin-file-path=%{buffer_name}"];

     

       237
       237
       -
                   };

     

       238
       238
       -
                 }

     

       239
       239
       -
                 {

     

       240
       240
       -
                   name = "javascript";

     

       241
       241
       -
                   auto-format = true;

     

       242
       242
       -
                   language-servers = [

     

       243
       243
       -
                     {

     

       244
       244
       -
                       name = "typescript-language-server";

     

       245
       245
       -
                       except-features = ["format"];

     

       246
       246
       -
                     }

     

       247
       247
       -
                     "biome"

     

       248
       248
       -
                   ];

     

       249
       249
       -
                 }

     

       250
       250
       -
                 {

     

       251
       251
       -
                   name = "json";

     

       252
       252
       -
                   auto-format = true;

     

       253
       253
       -
                   language-servers = [

     

       254
       254
       -
                     {

     

       255
       255
       -
                       name = "vscode-json-languageserver";

     

       256
       256
       -
                       except-features = ["format"];

     

       257
       257
       -
                     }

     

       258
       258
       -
                     "biome"

     

       259
       259
       -
                   ];

     

       260
       260
       -
                 }

     

       261
       261
       -
                 {

     

       262
       262
       -
                   name = "jsonc";

     

       263
       263
       -
                   auto-format = true;

     

       264
       264
       -
                   language-servers = [

     

       265
       265
       -
                     {

     

       266
       266
       -
                       name = "vscode-json-languageserver";

     

       267
       267
       -
                       except-features = ["format"];

     

       268
       268
       -
                     }

     

       269
       269
       -
                     "biome"

     

       270
       270
       -
                   ];

     

       271
       271
       -
                 }

     

       272
       272
       -
                 {

     

       273
       273
       -
                   name = "lua";

     

       274
       274
       -
                   auto-format = true;

     

       275
       275
       -
                   formatter = {command = lib.getExe pkgs.stylua;};

     

       276
       276
       -
                   language-servers = ["lua-language-server"];

     

       277
       277
       -
                 }

     

       278
       278
       -
                 {

     

       279
       279
       -
                   name = "markdown";

     

       280
       280
       -
                   auto-format = true;

     

       281
       281
       -
                   formatter = {command = lib.getExe pkgs.mdformat;};

     

       282
       282
       -
                   language-servers = ["marksman"];

     

       283
       283
       -
                 }

     

       284
       284
       -
                 {

     

       285
       285
       -
                   name = "nix";

     

       286
       286
       -
                   auto-format = true;

     

       287
       287
       -
                   formatter = {command = lib.getExe pkgs.alejandra;};

     

       288
       288
       -
                   language-servers = [

     

       289
       289
       -
                     "nixd"

     

       290
       290
       -
                     "nil"

     

       291
       291
       -
                   ];

     

       292
       292
       -
                 }

     

       293
       293
       -
                 {

     

       294
       294
       -
                   name = "typescript";

     

       295
       295
       -
                   auto-format = true;

     

       296
       296
       -
                   language-servers = [

     

       297
       297
       -
                     {

     

       298
       298
       -
                       name = "typescript-language-server";

     

       299
       299
       -
                       except-features = ["format"];

     

       300
       300
       -
                     }

     

       301
       301
       -
                     "biome"

     

       302
       302
       -
                   ];

     

       303
       303
       -
                 }

     

       304
       304
       -
                 {

     

       305
       305
       -
                   name = "jsx";

     

       306
       306
       -
                   auto-format = true;

     

       307
       307
       -
                   language-servers = [

     

       308
       308
       -
                     {

     

       309
       309
       -
                       name = "typescript-language-server";

     

       310
       310
       -
                       except-features = ["format"];

     

       311
       311
       -
                     }

     

       312
       312
       -
                     "biome"

     

       313
       313
       -
                   ];

     

       314
       314
       -
                 }

     

       315
       315
       -
                 {

     

       316
       316
       -
                   name = "tsx";

     

       317
       317
       -
                   auto-format = true;

     

       318
       318
       -
                   language-servers = [

     

       319
       319
       -
                     {

     

       320
       320
       -
                       name = "typescript-language-server";

     

       321
       321
       -
                       except-features = ["format"];

     

       322
       322
       -
                     }

     

       323
       323
       -
                     "biome"

     

       324
       324
       -
                   ];

     

       325
       325
       -
                 }

     

       326
       326
       -
                 {

     

       327
       327
       -
                   name = "go";

     

       328
       328
       -
                   auto-format = true;

     

       329
       329
       -
                   language-servers = ["gopls"];

     

       330
       330
       -
                 }

     

       331
       331
       -
                 {

     

       332
       332
       -
                   name = "rust";

     

       333
       333
       -
                   auto-format = true;

     

       334
       334
       -
                   language-servers = ["rust-analyzer"];

     

       335
       335
       -
                 }

     

       336
       336
       -
                 {

     

       337
       337
       -
                   name = "zig";

     

       338
       338
       -
                   auto-format = true;

     

       339
       339
       -
                   language-servers = ["zls"];

     

       340
       340
       -
                 }

     

       341
       341
       -
                 {

     

       342
       342
       -
                   name = "gleam";

     

       343
       343
       -
                   auto-format = true;

     

       344
       344
       -
                   language-servers = ["gleam"];

     

       345
       345
       -
                 }

     

       346
       346
       -
                 {

     

       347
       347
       -
                   name = "glsl";

     

       348
       348
       -
                   auto-format = true;

     

       349
       349
       -
                   language-servers = ["glsl_analyzer"];

     

       350
       350
       -
                 }

     

       351
       351
       -
                 {

     

       352
       352
       -
                   name = "gdscript";

     

       353
       353
       -
                   auto-format = true;

     

       354
       354
       -
                   formatter = {command = lib.getExe pkgs.gdscript-formatter;};

     

       355
       355
       -
                   language-servers = ["gdscript-language-server"];

     

       356
       356
       -
                 }

     

       357
       357
       -
                 {

     

       358
       358
       -
                   name = "svelte";

     

       359
       359
       -
                   auto-format = true;

     

       360
       360
       -
                   language-servers = [

     

       361
       361
       -
                     {

     

       362
       362
       -
                       name = "svelte-language-server";

     

       363
       363
       -
                       except-features = ["format"];

     

       364
       364
       -
                     }

     

       365
       365
       -
                     "biome"

     

       366
       366
       -
                   ];

     

       367
       367
       -
                 }

     

       368
       368
       -
               ];

     

       133
       133
       +
             languages = {

     

       134
       134
       +
               language-server = lib.mapAttrs mkHelixServer editorCfg.languageServers;

     

       135
       135
       +
               language = lib.attrValues (lib.mapAttrs mkHelixLanguage editorCfg.languages);

     

       369
       136
        
             };

     

       370
       137
        
           };

     

       371
       138
        
         };

+84 -277

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

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
        
         config,

     

       4
       4
       -
         pkgs,

     

       5
       4
        
         ...

     

       6
       5
        
       }: let

     

       7
       7
       -
         biome = {

     

       8
       8
       -
           formatter = {language_server = {name = "biome";};};

     

       9
       9
       -
           code_actions_on_format = {

     

       10
       10
       -
             "source.fixAll.biome" = true;

     

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

     

       6
       6
       +
         editorCfg = config.mySnippets.editor;

     

       7
       7
       +
       

     

       8
       8
       +
         mkZedFormatter = fmtName:

     

       9
       9
       +
           if fmtName == null

     

       10
       10
       +
           then "language_server"

     

       11
       11
       +
           else let

     

       12
       12
       +
             f = editorCfg.formatters.${fmtName};

     

       13
       13
       +
           in

     

       14
       14
       +
             if f.type == "external"

     

       15
       15
       +
             then {

     

       16
       16
       +
               external = {

     

       17
       17
       +
                 command = f.command;

     

       18
       18
       +
                 arguments = f.args or [];

     

       19
       19
       +
               };

     

       20
       20
       +
             }

     

       21
       21
       +
             else if f.type == "lsp"

     

       22
       22
       +
             then {language_server = {name = fmtName;};}

     

       23
       23
       +
             else null;

     

       24
       24
       +
       

     

       25
       25
       +
         mkZedLanguage = name: lang:

     

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

     

       27
       27
       +
             formatter = mkZedFormatter lang.formatter;

     

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

     

       29
       29
       +
             code_actions_on_format = lang.code-actions-on-format;

     

       12
       30
        
           };

     

       13
       13
       -
         };

     

       14
       14
       -
         prettier = {

     

       15
       15
       -
           external = {

     

       16
       16
       -
             command = pkgs.writeScript "prettier-bun" ''

     

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

     

       18
       18
       -
               exec ${lib.getExe pkgs.bun} ${pkgs.prettier}/bin/prettier.cjs "$@"

     

       19
       19
       -
             '';

     

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

     

       31
       31
       +
       

     

       32
       32
       +
         mkZedLsp = name: srv:

     

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

     

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

     

       35
       35
       +
               path = srv.command;

     

       36
       36
       +
               arguments = srv.args or null;

     

       37
       37
       +
             };

     

       38
       38
       +
             settings = srv.config or null;

     

       21
       39
        
           };

     

       22
       22
       -
         };

     

       23
       40
        
       in {

     

       24
       41
        
         options.myHome.programs.zed-editor.enable = lib.mkEnableOption "zed editor";

     

       25
       42
        
       

     
···

       37
       54
        
               "scss"

     

       38
       55
        
               "toml"

     

       39
       56
        
               "biome"

     

       40
       40
       -
               "superhtml"

     

       57
       57
       +
               #"superhtml"

     

       41
       58
        
               "marksman"

     

       42
       59
        
               "makefile"

     

       43
       60
        
               "zig"

     
···

       45
       62
        
               "glsl"

     

       46
       63
        
               "gdscript"

     

       47
       64
        
               "svelte"

     

       65
       65
       +
               "vue"

     

       66
       66
       +
               "basher"

     

       67
       67
       +
               "sql"

     

       68
       68
       +
               #"ruby"

     

       48
       69
        
               #"elixir"

     

       49
       70
        
             ];

     

       50
       71
        
             userSettings = {

     
···

       77
       98
        
                 default_profile = "ask";

     

       78
       99
        
               };

     

       79
       100
        
       

     

       80
       80
       -
               languages = {

     

       81
       81
       -
                 JavaScript =

     

       82
       82
       -
                   biome

     

       83
       83
       -
                   // {

     

       84
       84
       -
                     language_servers = [

     

       85
       85
       -
                       "typescript-language-server"

     

       86
       86
       -
                       "biome"

     

       87
       87
       -
                       "!vtsls"

     

       88
       88
       -
                       "!eslint"

     

       89
       89
       -
                     ];

     

       90
       90
       -
                   };

     

       91
       91
       -
                 TypeScript =

     

       92
       92
       -
                   biome

     

       93
       93
       -
                   // {

     

       94
       94
       -
                     language_servers = [

     

       95
       95
       -
                       "typescript-language-server"

     

       96
       96
       -
                       "biome"

     

       97
       97
       -
                       "!vtsls"

     

       98
       98
       -
                       "!eslint"

     

       99
       99
       -
                     ];

     

       100
       100
       -
                   };

     

       101
       101
       -
                 TSX =

     

       102
       102
       -
                   biome

     

       103
       103
       -
                   // {

     

       104
       104
       -
                     language_servers = [

     

       105
       105
       -
                       "typescript-language-server"

     

       106
       106
       -
                       "biome"

     

       107
       107
       -
                       "!vtsls"

     

       108
       108
       -
                       "!eslint"

     

       109
       109
       -
                     ];

     

       110
       110
       -
                   };

     

       111
       111
       -
                 JSON =

     

       112
       112
       -
                   biome

     

       113
       113
       -
                   // {

     

       114
       114
       -
                     language_servers = [

     

       115
       115
       -
                       "json-language-server"

     

       116
       116
       -
                       "biome"

     

       117
       117
       -
                     ];

     

       118
       118
       -
                   };

     

       119
       119
       -
                 JSONC =

     

       120
       120
       -
                   biome

     

       121
       121
       -
                   // {

     

       122
       122
       -
                     language_servers = [

     

       123
       123
       -
                       "json-language-server"

     

       124
       124
       -
                       "biome"

     

       125
       125
       -
                     ];

     

       126
       126
       -
                   };

     

       127
       127
       -
                 CSS =

     

       128
       128
       -
                   biome

     

       129
       129
       -
                   // {

     

       130
       130
       -
                     language_servers = [

     

       131
       131
       -
                       "css-language-server"

     

       132
       132
       -
                       "biome"

     

       133
       133
       -
                     ];

     

       134
       134
       -
                   };

     

       135
       135
       -
                 HTML = {

     

       136
       136
       -
                   formatter = {

     

       137
       137
       -
                     language_server = {

     

       138
       138
       -
                       name = "biome";

     

       139
       139
       -
                     };

     

       140
       140
       -
                   };

     

       141
       141
       -
                   code_actions_on_format = {

     

       142
       142
       -
                     "html.formatter.enabled.biome" = true;

     

       143
       143
       -
                   };

     

       144
       144
       -
                   language_servers = ["vscode-html-language-server" "superhtml" "biome"];

     

       145
       145
       -
                 };

     

       146
       146
       -
                 Nix = {

     

       147
       147
       -
                   formatter = "language_server";

     

       148
       148
       -
                   language_servers = [

     

       149
       149
       -
                     "nixd"

     

       150
       150
       -
                     "nil"

     

       151
       151
       -
                   ];

     

       152
       152
       -
                 };

     

       153
       153
       -
                 Markdown = {

     

       154
       154
       -
                   formatter = prettier;

     

       155
       155
       -
                   language_servers = ["marksman"];

     

       156
       156
       -
                 };

     

       157
       157
       -
                 Fish = {

     

       158
       158
       -
                   formatter = "language_server";

     

       159
       159
       -
                   language_servers = ["fish-lsp"];

     

       160
       160
       -
                 };

     

       161
       161
       -
                 Lua = {

     

       162
       162
       -
                   formatter = {

     

       163
       163
       -
                     external = {

     

       164
       164
       -
                       command = lib.getExe pkgs.stylua;

     

       165
       165
       -
                     };

     

       166
       166
       -
                   };

     

       167
       167
       -
                   language_servers = ["lua-language-server"];

     

       168
       168
       -
                 };

     

       169
       169
       -
                 Go = {

     

       170
       170
       -
                   formatter = "language_server";

     

       171
       171
       -
                   language_servers = ["gopls"];

     

       172
       172
       -
                 };

     

       173
       173
       -
                 Rust = {

     

       174
       174
       -
                   formatter = "language_server";

     

       175
       175
       -
                   language_servers = ["rust-analyzer"];

     

       176
       176
       -
                 };

     

       177
       177
       -
                 Gleam = {

     

       178
       178
       -
                   formatter = "language_server";

     

       179
       179
       -
                   language_servers = ["gleam"];

     

       180
       180
       -
                 };

     

       181
       181
       -
                 # Elixir = {

     

       182
       182
       -
                 #   format_on_save = "on";

     

       183
       183
       -
                 #   formatter = "language_server";

     

       184
       184
       -
                 #   language_servers = ["elixir-ls"];

     

       185
       185
       -
                 # };

     

       186
       186
       -
                 # HEEX = {

     

       187
       187
       -
                 #   format_on_save = "on";

     

       188
       188
       -
                 #   formatter = "language_server";

     

       189
       189
       -
                 #   language_servers = ["elixir-ls"];

     

       190
       190
       -
                 # };

     

       191
       191
       -
                 GLSL = {

     

       192
       192
       -
                   formatter = "language_server";

     

       193
       193
       -
                   language_servers = ["glsl_analyzer"];

     

       194
       194
       -
                 };

     

       195
       195
       -
                 GDScript = {

     

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

     

       197
       197
       -
                   language_servers = ["gdscript-language-server"];

     

       198
       198
       -
                 };

     

       199
       199
       -
                 Bash = {

     

       200
       200
       -
                   language_servers = ["bash-language-server"];

     

       201
       201
       -
                 };

     

       202
       202
       -
                 Svelte =

     

       203
       203
       -
                   biome

     

       204
       204
       -
                   // {

     

       205
       205
       -
                     language_servers = [

     

       206
       206
       -
                       "svelte-language-server"

     

       207
       207
       -
                       "biome"

     

       208
       208
       -
                     ];

     

       209
       209
       -
                   };

     

       210
       210
       -
               };

     

       211
       211
       -
               lsp = {

     

       212
       212
       -
                 nixd = {

     

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

     

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

     

       215
       215
       -
                 };

     

       216
       216
       -
                 nil = {

     

       217
       217
       -
                   binary = {

     

       218
       218
       -
                     path = lib.getExe pkgs.nil;

     

       219
       219
       -
                     arguments = ["--stdio"];

     

       220
       220
       -
                   };

     

       221
       221
       -
                 };

     

       222
       222
       -
                 typescript-language-server = with pkgs.nodePackages; {

     

       223
       223
       -
                   binary = {

     

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

     

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

     

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

     

       227
       227
       -
                     '';

     

       228
       228
       -
                     arguments = ["--stdio"];

     

       229
       229
       -
                   };

     

       230
       230
       -
                 };

     

       231
       231
       -
                 json-language-server = {

     

       232
       232
       -
                   binary = {

     

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

     

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

     

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

     

       236
       236
       -
                     '';

     

       237
       237
       -
                     arguments = ["--stdio"];

     

       238
       238
       -
                   };

     

       239
       239
       -
                 };

     

       240
       240
       -
                 css-language-server = {

     

       241
       241
       -
                   binary = {

     

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

     

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

     

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

     

       245
       245
       -
                     '';

     

       246
       246
       -
                     arguments = ["--stdio"];

     

       247
       247
       -
                   };

     

       248
       248
       -
                 };

     

       249
       249
       -
                 vscode-html-language-server = {

     

       250
       250
       -
                   binary = {

     

       251
       251
       -
                     path = pkgs.writeScript "vscode-html-language-server-bun" ''

     

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

     

       253
       253
       -
                       exec ${lib.getExe pkgs.bun} ${pkgs.vscode-langservers-extracted}/lib/node_modules/vscode-langservers-extracted/bin/vscode-html-language-server "$@"

     

       254
       254
       -
                     '';

     

       255
       255
       -
                     arguments = ["--stdio"];

     

       256
       256
       -
                   };

     

       257
       257
       -
                 };

     

       258
       258
       -
                 biome = {

     

       259
       259
       -
                   binary = {

     

       260
       260
       -
                     path = lib.getExe pkgs.biome;

     

       261
       261
       -
                     arguments = ["lsp-proxy"];

     

       262
       262
       -
                   };

     

       263
       263
       -
                 };

     

       264
       264
       -
                 superhtml = {

     

       265
       265
       -
                   binary = {

     

       266
       266
       -
                     path = lib.getExe pkgs.superhtml;

     

       267
       267
       -
                     arguments = ["lsp"];

     

       268
       268
       -
                   };

     

       269
       269
       -
                 };

     

       270
       270
       -
                 marksman = {

     

       271
       271
       -
                   binary = {

     

       272
       272
       -
                     path = lib.getExe pkgs.marksman;

     

       273
       273
       -
                     arguments = ["server"];

     

       274
       274
       -
                   };

     

       275
       275
       -
                 };

     

       276
       276
       -
                 fish-lsp = {

     

       277
       277
       -
                   binary = {

     

       278
       278
       -
                     path = lib.getExe pkgs.fish-lsp;

     

       279
       279
       -
                     arguments = ["start"];

     

       280
       280
       -
                   };

     

       281
       281
       -
                 };

     

       282
       282
       -
                 lua-language-server = {

     

       283
       283
       -
                   binary = {

     

       284
       284
       -
                     path = lib.getExe pkgs.lua-language-server;

     

       285
       285
       -
                   };

     

       286
       286
       -
                 };

     

       287
       287
       -
                 gopls = {

     

       288
       288
       -
                   binary = {

     

       289
       289
       -
                     path = lib.getExe pkgs.gopls;

     

       290
       290
       -
                     arguments = ["serve"];

     

       291
       291
       -
                   };

     

       292
       292
       -
                 };

     

       293
       293
       -
                 rust-analyzer = {

     

       294
       294
       -
                   binary = {

     

       295
       295
       -
                     path = lib.getExe pkgs.rust-analyzer;

     

       296
       296
       -
                   };

     

       297
       297
       -
                 };

     

       298
       298
       -
                 zls = {

     

       299
       299
       -
                   binary = {

     

       300
       300
       -
                     path = lib.getExe pkgs.zls;

     

       301
       301
       -
                   };

     

       302
       302
       -
                 };

     

       303
       303
       -
                 gleam = {

     

       304
       304
       -
                   binary = {

     

       305
       305
       -
                     path = lib.getExe pkgs.gleam;

     

       306
       306
       -
                     arguments = ["lsp"];

     

       307
       307
       -
                   };

     

       308
       308
       -
                 };

     

       309
       309
       -
                 glsl_analyzer = {

     

       310
       310
       -
                   binary = {

     

       311
       311
       -
                     path = lib.getExe pkgs.glsl_analyzer;

     

       312
       312
       -
                   };

     

       313
       313
       -
                 };

     

       314
       314
       -
                 #elixir-ls = {

     

       315
       315
       -
                 #  binary = {

     

       316
       316
       -
                 #    path = lib.getExe pkgs.elixir-ls;

     

       317
       317
       -
                 #  };

     

       318
       318
       -
                 #};

     

       319
       319
       -
                 gdscript-language-server = {

     

       320
       320
       -
                   binary = {

     

       321
       321
       -
                     path = lib.getExe pkgs.netcat;

     

       322
       322
       -
                     arguments = ["127.0.0.1" "6005"];

     

       323
       323
       -
                   };

     

       324
       324
       -
                 };

     

       325
       325
       -
                 bash-language-server = {

     

       326
       326
       -
                   binary = {

     

       327
       327
       -
                     path = lib.getExe pkgs.bash-language-server;

     

       328
       328
       -
                     arguments = ["start"];

     

       329
       329
       -
                   };

     

       330
       330
       -
                 };

     

       331
       331
       -
                 svelte-language-server = {

     

       332
       332
       -
                   binary = {

     

       333
       333
       -
                     path = pkgs.writeScript "svelte-language-server-bun" ''

     

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

     

       335
       335
       -
                       exec ${lib.getExe pkgs.bun} ${pkgs.svelte-language-server}/lib/node_modules/svelte-language-server/bin/server.js "$@"

     

       336
       336
       -
                     '';

     

       337
       337
       -
                     arguments = ["--stdio"];

     

       338
       338
       -
                   };

     

       339
       339
       -
                 };

     

       340
       340
       -
               };

     

       341
       101
        
               telemetry = {

     

       342
       102
        
                 diagnostics = false;

     

       343
       103
        
                 metrics = false;

     

       344
       104
        
               };

     

       105
       105
       +
       

     

       106
       106
       +
               languages = lib.listToAttrs (

     

       107
       107
       +
                 lib.attrValues (

     

       108
       108
       +
                   lib.mapAttrs (name: lang: {

     

       109
       109
       +
                     name = lang.full-name;

     

       110
       110
       +
                     value = mkZedLanguage name lang;

     

       111
       111
       +
                   })

     

       112
       112
       +
                   editorCfg.languages

     

       113
       113
       +
                 )

     

       114
       114
       +
               );

     

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

     

       345
       116
        
             };

     

       346
       117
        
             userTasks = [

     

       347
       118
        
               {

     
···

       352
       123
        
                 allow_concurrent_runs = false;

     

       353
       124
        
                 shell = {

     

       354
       125
        
                   program = "fish";

     

       126
       126
       +
                 };

     

       127
       127
       +
               }

     

       128
       128
       +
             ];

     

       129
       129
       +
             userKeymaps = [

     

       130
       130
       +
               {

     

       131
       131
       +
                 context = "(vim_mode == helix_normal || vim_mode == helix_select) && !menu";

     

       132
       132
       +
                 bindings = {

     

       133
       133
       +
                   n = "vim::WrappingLeft";

     

       134
       134
       +
                   e = "vim::Down";

     

       135
       135
       +
                   i = "vim::Up";

     

       136
       136
       +
                   o = "vim::WrappingRight";

     

       137
       137
       +
                 };

     

       138
       138
       +
               }

     

       139
       139
       +
               {

     

       140
       140
       +
                 context = "vim_mode == helix_normal && !menu";

     

       141
       141
       +
                 bindings = {

     

       142
       142
       +
                   j = "vim::NextWordEnd";

     

       143
       143
       +
                   J = ["vim::NextWordEnd" {ignore_punctuation = true;}];

     

       144
       144
       +
                   k = "vim::MoveToNextMatch";

     

       145
       145
       +
                   K = "vim::MoveToPreviousMatch";

     

       146
       146
       +
                   l = "vim::HelixInsert";

     

       147
       147
       +
                   L = "vim::InsertFirstNonWhitespace";

     

       148
       148
       +
                   h = "vim::InsertLineBelow";

     

       149
       149
       +
                   H = "vim::InsertLineAbove";

     

       150
       150
       +
                 };

     

       151
       151
       +
               }

     

       152
       152
       +
               {

     

       153
       153
       +
                 context = "Workspace";

     

       154
       154
       +
                 bindings = {

     

       155
       155
       +
                   ctrl-g = [

     

       156
       156
       +
                     "task::Spawn"

     

       157
       157
       +
                     {

     

       158
       158
       +
                       task_name = "jjui";

     

       159
       159
       +
                       reveal_target = "center";

     

       160
       160
       +
                     }

     

       161
       161
       +
                   ];

     

       355
       162
        
                 };

     

       356
       163
        
               }

     

       357
       164
        
             ];

modules/home/snippets/default.nix

···

       1
       1
        
       {...}: {

     

       2
       2
        
         imports = [

     

       3
       3
       +
           ./editor

     

       3
       4
        
           ./firefox-based

     

       4
       5
        
           ./git

     

       5
       6
        
         ];

+415

modules/home/snippets/editor/default.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         pkgs,

     

       4
       4
       +
         ...

     

       5
       5
       +
       }: let

     

       6
       6
       +
         # Helper function to create language server definitions

     

       7
       7
       +
         mkLspServer = name: {

     

       8
       8
       +
           command,

     

       9
       9
       +
           helix-command ? null,

     

       10
       10
       +
           args ? null,

     

       11
       11
       +
           config ? null,

     

       12
       12
       +
         }: {

     

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

     

       14
       14
       +
         };

     

       15
       15
       +
       

     

       16
       16
       +
         # Helper function to create formatter definitions

     

       17
       17
       +
         mkFormatter = name: {

     

       18
       18
       +
           type,

     

       19
       19
       +
           command ? null,

     

       20
       20
       +
           args ? null,

     

       21
       21
       +
           lspName ? null,

     

       22
       22
       +
           config ? null,

     

       23
       23
       +
         }: {

     

       24
       24
       +
           inherit name type command args lspName config;

     

       25
       25
       +
         };

     

       26
       26
       +
       

     

       27
       27
       +
         # Helper function to create language definitions

     

       28
       28
       +
         mkLanguage = name: {

     

       29
       29
       +
           full-name ? name,

     

       30
       30
       +
           auto-format ? true,

     

       31
       31
       +
           file-types ? null,

     

       32
       32
       +
           language-servers ? [],

     

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

     

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

     

       35
       35
       +
           formatter ? null,

     

       36
       36
       +
           helix-formatter ? null,

     

       37
       37
       +
           code-actions-on-format ? null,

     

       38
       38
       +
         }: {

     

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

     

       40
       40
       +
         };

     

       41
       41
       +
       in {

     

       42
       42
       +
         options.mySnippets.editor = lib.mkOption {

     

       43
       43
       +
           type = lib.types.attrs;

     

       44
       44
       +
           default = {};

     

       45
       45
       +
           description = "Editor configuration data";

     

       46
       46
       +
         };

     

       47
       47
       +
       

     

       48
       48
       +
         config.mySnippets.editor = {

     

       49
       49
       +
           # Language Servers

     

       50
       50
       +
           languageServers = {

     

       51
       51
       +
             biome = mkLspServer "biome" {

     

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

     

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

     

       54
       54
       +
             };

     

       55
       55
       +
       

     

       56
       56
       +
             tailwindcss-language-server = mkLspServer "tailwindcss-language-server" {

     

       57
       57
       +
               command = pkgs.writeScript "tailwindcss-language-server-bun" ''

     

       58
       58
       +
                 #!${lib.getExe pkgs.bash} -e

     

       59
       59
       +
                 exec ${lib.getExe pkgs.bun} ${lib.getExe pkgs.tailwindcss-language-server}

     

       60
       60
       +
               '';

     

       61
       61
       +
               helix-command = let

     

       62
       62
       +
                 fd = lib.getExe pkgs.fd;

     

       63
       63
       +
                 xargs = "${pkgs.uutils-findutils}/bin/xargs";

     

       64
       64
       +
                 grep = lib.getExe pkgs.gnugrep;

     

       65
       65
       +
                 bun = lib.getExe pkgs.bun;

     

       66
       66
       +
                 twls = lib.getExe pkgs.tailwindcss-language-server;

     

       67
       67
       +
               in

     

       68
       68
       +
                 pkgs.writeScript "tailwindcss-language-server-bun-helix" ''

     

       69
       69
       +
                   #!${lib.getExe pkgs.bash} -euo

     

       70
       70
       +
       

     

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

     

       72
       72
       +
                     ${xargs} ${grep} -q '"tailwindcss"'; then

     

       73
       73
       +
       

     

       74
       74
       +
                     exit 0

     

       75
       75
       +
                   fi

     

       76
       76
       +
       

     

       77
       77
       +
                   exec ${bun} ${twls}

     

       78
       78
       +
                 '';

     

       79
       79
       +
               args = [];

     

       80
       80
       +
               config = {provideFormatter = false;};

     

       81
       81
       +
             };

     

       82
       82
       +
       

     

       83
       83
       +
             vscode-html-language-server = mkLspServer "vscode-html-language-server" {

     

       84
       84
       +
               command = lib.getExe pkgs.bun;

     

       85
       85
       +
               args = ["${pkgs.vscode-langservers-extracted}/lib/node_modules/vscode-langservers-extracted/bin/vscode-html-language-server" "--stdio"];

     

       86
       86
       +
             };

     

       87
       87
       +
       

     

       88
       88
       +
             superhtml = mkLspServer "superhtml" {

     

       89
       89
       +
               command = lib.getExe pkgs.superhtml;

     

       90
       90
       +
               args = ["lsp"];

     

       91
       91
       +
             };

     

       92
       92
       +
       

     

       93
       93
       +
             css-language-server = mkLspServer "css-language-server" {

     

       94
       94
       +
               command = lib.getExe pkgs.bun;

     

       95
       95
       +
               args = ["${pkgs.vscode-css-languageserver}/lib/node_modules/vscode-css-languageserver/out/node/cssServerMain.js" "--stdio"];

     

       96
       96
       +
             };

     

       97
       97
       +
       

     

       98
       98
       +
             json-language-server = mkLspServer "json-language-server" {

     

       99
       99
       +
               command = lib.getExe pkgs.bun;

     

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

     

       101
       101
       +
             };

     

       102
       102
       +
       

     

       103
       103
       +
             vtsls = mkLspServer "vtsls" {

     

       104
       104
       +
               command = lib.getExe pkgs.bun;

     

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

     

       106
       106
       +
             };

     

       107
       107
       +
       

     

       108
       108
       +
             svelte-language-server = mkLspServer "svelte-language-server" {

     

       109
       109
       +
               command = lib.getExe pkgs.bun;

     

       110
       110
       +
               args = ["${pkgs.svelte-language-server}/lib/node_modules/svelte-language-server/bin/server.js" "--stdio"];

     

       111
       111
       +
             };

     

       112
       112
       +
       

     

       113
       113
       +
             vue-language-server = mkLspServer "vue-language-server" {

     

       114
       114
       +
               command = lib.getExe pkgs.bun;

     

       115
       115
       +
               args = ["${pkgs.vue-language-server}/lib/language-tools/packages/language-server/bin/vue-language-server.js" "--stdio"];

     

       116
       116
       +
             };

     

       117
       117
       +
       

     

       118
       118
       +
             bash-language-server = mkLspServer "bash-language-server" {

     

       119
       119
       +
               command = lib.getExe pkgs.bash-language-server;

     

       120
       120
       +
               args = ["start"];

     

       121
       121
       +
             };

     

       122
       122
       +
       

     

       123
       123
       +
             fish-lsp = mkLspServer "fish-lsp" {

     

       124
       124
       +
               command = lib.getExe pkgs.fish-lsp;

     

       125
       125
       +
               args = ["start"];

     

       126
       126
       +
             };

     

       127
       127
       +
       

     

       128
       128
       +
             nixd = mkLspServer "nixd" {

     

       129
       129
       +
               command = lib.getExe pkgs.nixd;

     

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

     

       131
       131
       +
             };

     

       132
       132
       +
       

     

       133
       133
       +
             nil = mkLspServer "nil" {

     

       134
       134
       +
               command = lib.getExe pkgs.nil;

     

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

     

       136
       136
       +
             };

     

       137
       137
       +
       

     

       138
       138
       +
             marksman = mkLspServer "marksman" {

     

       139
       139
       +
               command = lib.getExe pkgs.marksman;

     

       140
       140
       +
               args = ["server"];

     

       141
       141
       +
             };

     

       142
       142
       +
       

     

       143
       143
       +
             gopls = mkLspServer "gopls" {

     

       144
       144
       +
               command = lib.getExe pkgs.gopls;

     

       145
       145
       +
               args = ["serve"];

     

       146
       146
       +
             };

     

       147
       147
       +
       

     

       148
       148
       +
             rust-analyzer = mkLspServer "rust-analyzer" {

     

       149
       149
       +
               command = lib.getExe pkgs.rust-analyzer;

     

       150
       150
       +
             };

     

       151
       151
       +
       

     

       152
       152
       +
             zls = mkLspServer "zls" {

     

       153
       153
       +
               command = lib.getExe pkgs.zls;

     

       154
       154
       +
             };

     

       155
       155
       +
       

     

       156
       156
       +
             glsl_analyzer = mkLspServer "glsl_analyzer" {

     

       157
       157
       +
               command = lib.getExe pkgs.glsl_analyzer;

     

       158
       158
       +
             };

     

       159
       159
       +
       

     

       160
       160
       +
             lua-language-server = mkLspServer "lua-language-server" {

     

       161
       161
       +
               command = lib.getExe pkgs.lua-language-server;

     

       162
       162
       +
             };

     

       163
       163
       +
       

     

       164
       164
       +
             gleam = mkLspServer "gleam" {

     

       165
       165
       +
               command = lib.getExe pkgs.gleam;

     

       166
       166
       +
               args = ["lsp"];

     

       167
       167
       +
             };

     

       168
       168
       +
       

     

       169
       169
       +
             gdscript-language-server = mkLspServer "gdscript-language-server" {

     

       170
       170
       +
               command = lib.getExe pkgs.netcat;

     

       171
       171
       +
               args = ["127.0.0.1" "6005"];

     

       172
       172
       +
               config = {language-id = "gdscript";};

     

       173
       173
       +
             };

     

       174
       174
       +
       

     

       175
       175
       +
             solargraph = mkLspServer "solargraph" {

     

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

     

       177
       177
       +
               args = ["stdio"];

     

       178
       178
       +
             };

     

       179
       179
       +
       

     

       180
       180
       +
             #rubocop = mkLspServer "rubocop" {

     

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

     

       182
       182
       +
             #};

     

       183
       183
       +
           };

     

       184
       184
       +
       

     

       185
       185
       +
           # Formatters

     

       186
       186
       +
           formatters = {

     

       187
       187
       +
             biome = mkFormatter "biome" {

     

       188
       188
       +
               type = "lsp";

     

       189
       189
       +
             };

     

       190
       190
       +
       

     

       191
       191
       +
             biomeHtml = mkFormatter "biomeHtml" {

     

       192
       192
       +
               type = "external";

     

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

     

       194
       194
       +
               args = ["format" "--use-server" "--html-formatter-enabled=true" "--stdin-file-path" "{buffer_path}"];

     

       195
       195
       +
             };

     

       196
       196
       +
       

     

       197
       197
       +
             shfmt = mkFormatter "shfmt" {

     

       198
       198
       +
               type = "external";

     

       199
       199
       +
               command = lib.getExe pkgs.shfmt;

     

       200
       200
       +
               args = ["-i" "2"];

     

       201
       201
       +
             };

     

       202
       202
       +
       

     

       203
       203
       +
             alejandra = mkFormatter "alejandra" {

     

       204
       204
       +
               type = "external";

     

       205
       205
       +
               command = lib.getExe pkgs.alejandra;

     

       206
       206
       +
             };

     

       207
       207
       +
       

     

       208
       208
       +
             mdformat = mkFormatter "mdformat" {

     

       209
       209
       +
               type = "external";

     

       210
       210
       +
               command = lib.getExe pkgs.mdformat;

     

       211
       211
       +
             };

     

       212
       212
       +
       

     

       213
       213
       +
             stylua = mkFormatter "stylua" {

     

       214
       214
       +
               type = "external";

     

       215
       215
       +
               command = lib.getExe pkgs.stylua;

     

       216
       216
       +
             };

     

       217
       217
       +
       

     

       218
       218
       +
             gdscript-formatter = mkFormatter "gdscript-formatter" {

     

       219
       219
       +
               type = "external";

     

       220
       220
       +
               command = lib.getExe pkgs.gdscript-formatter;

     

       221
       221
       +
             };

     

       222
       222
       +
       

     

       223
       223
       +
             prettier = mkFormatter "prettier" {

     

       224
       224
       +
               type = "external";

     

       225
       225
       +
               command = lib.getExe pkgs.bun;

     

       226
       226
       +
               args = ["${pkgs.prettier}/bin/prettier.cjs" "--stdin-filepath" "{buffer_path}"];

     

       227
       227
       +
             };

     

       228
       228
       +
           };

     

       229
       229
       +
       

     

       230
       230
       +
           # Languages

     

       231
       231
       +
           languages = {

     

       232
       232
       +
             html = mkLanguage "html" {

     

       233
       233
       +
               full-name = "HTML";

     

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

     

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

     

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

     

       237
       237
       +
               formatter = "biome";

     

       238
       238
       +
               helix-formatter = "biomeHtml";

     

       239
       239
       +
               code-actions-on-format = {

     

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

     

       241
       241
       +
                 "html.formatter.enabled.biome" = true;

     

       242
       242
       +
               };

     

       243
       243
       +
             };

     

       244
       244
       +
       

     

       245
       245
       +
             css = mkLanguage "css" {

     

       246
       246
       +
               full-name = "CSS";

     

       247
       247
       +
               language-servers = ["css-language-server" "biome"];

     

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

     

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

     

       250
       250
       +
               formatter = "biome";

     

       251
       251
       +
               code-actions-on-format = {

     

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

     

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

     

       254
       254
       +
               };

     

       255
       255
       +
             };

     

       256
       256
       +
       

     

       257
       257
       +
             javascript = mkLanguage "javascript" {

     

       258
       258
       +
               full-name = "JavaScript";

     

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

     

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

     

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

     

       262
       262
       +
               formatter = "biome";

     

       263
       263
       +
               code-actions-on-format = {

     

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

     

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

     

       266
       266
       +
               };

     

       267
       267
       +
             };

     

       268
       268
       +
       

     

       269
       269
       +
             typescript = mkLanguage "typescript" {

     

       270
       270
       +
               full-name = "TypeScript";

     

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

     

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

     

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

     

       274
       274
       +
               formatter = "biome";

     

       275
       275
       +
               code-actions-on-format = {

     

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

     

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

     

       278
       278
       +
               };

     

       279
       279
       +
             };

     

       280
       280
       +
       

     

       281
       281
       +
             jsx = mkLanguage "jsx" {

     

       282
       282
       +
               full-name = "JSX";

     

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

     

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

     

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

     

       286
       286
       +
               formatter = "biome";

     

       287
       287
       +
               code-actions-on-format = {

     

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

     

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

     

       290
       290
       +
               };

     

       291
       291
       +
             };

     

       292
       292
       +
       

     

       293
       293
       +
             tsx = mkLanguage "tsx" {

     

       294
       294
       +
               full-name = "TSX";

     

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

     

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

     

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

     

       298
       298
       +
               formatter = "biome";

     

       299
       299
       +
               code-actions-on-format = {

     

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

     

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

     

       302
       302
       +
               };

     

       303
       303
       +
             };

     

       304
       304
       +
       

     

       305
       305
       +
             svelte = mkLanguage "svelte" {

     

       306
       306
       +
               full-name = "Svelte";

     

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

     

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

     

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

     

       310
       310
       +
               formatter = "biome";

     

       311
       311
       +
               code-actions-on-format = {

     

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

     

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

     

       314
       314
       +
               };

     

       315
       315
       +
             };

     

       316
       316
       +
       

     

       317
       317
       +
             vue = mkLanguage "vue" {

     

       318
       318
       +
               full-name = "Vue.js";

     

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

     

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

     

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

     

       322
       322
       +
               formatter = "biome";

     

       323
       323
       +
               code-actions-on-format = {

     

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

     

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

     

       326
       326
       +
               };

     

       327
       327
       +
             };

     

       328
       328
       +
       

     

       329
       329
       +
             json = mkLanguage "json" {

     

       330
       330
       +
               full-name = "JSON";

     

       331
       331
       +
               language-servers = ["json-language-server" "biome"];

     

       332
       332
       +
               formatter = "biome";

     

       333
       333
       +
               code-actions-on-format = {

     

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

     

       335
       335
       +
               };

     

       336
       336
       +
             };

     

       337
       337
       +
       

     

       338
       338
       +
             jsonc = mkLanguage "jsonc" {

     

       339
       339
       +
               full-name = "JSONC";

     

       340
       340
       +
               language-servers = ["json-language-server" "biome"];

     

       341
       341
       +
               formatter = "biome";

     

       342
       342
       +
               code-actions-on-format = {

     

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

     

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

     

       345
       345
       +
               };

     

       346
       346
       +
             };

     

       347
       347
       +
       

     

       348
       348
       +
             bash = mkLanguage "bash" {

     

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

     

       350
       350
       +
               file-types = ["sh" "bash" "dash" "ksh" "mksh"];

     

       351
       351
       +
               language-servers = ["bash-language-server"];

     

       352
       352
       +
               formatter = "shfmt";

     

       353
       353
       +
             };

     

       354
       354
       +
       

     

       355
       355
       +
             fish = mkLanguage "fish" {

     

       356
       356
       +
               full-name = "Fish";

     

       357
       357
       +
               language-servers = ["fish-lsp"];

     

       358
       358
       +
             };

     

       359
       359
       +
       

     

       360
       360
       +
             nix = mkLanguage "nix" {

     

       361
       361
       +
               full-name = "Nix";

     

       362
       362
       +
               language-servers = ["nixd" "nil"];

     

       363
       363
       +
               formatter = "alejandra";

     

       364
       364
       +
             };

     

       365
       365
       +
       

     

       366
       366
       +
             markdown = mkLanguage "markdown" {

     

       367
       367
       +
               full-name = "Markdown";

     

       368
       368
       +
               language-servers = ["marksman"];

     

       369
       369
       +
               formatter = "prettier";

     

       370
       370
       +
             };

     

       371
       371
       +
       

     

       372
       372
       +
             go = mkLanguage "go" {

     

       373
       373
       +
               full-name = "Go";

     

       374
       374
       +
               language-servers = ["gopls"];

     

       375
       375
       +
             };

     

       376
       376
       +
       

     

       377
       377
       +
             rust = mkLanguage "rust" {

     

       378
       378
       +
               full-name = "Rust";

     

       379
       379
       +
               language-servers = ["rust-analyzer"];

     

       380
       380
       +
             };

     

       381
       381
       +
       

     

       382
       382
       +
             zig = mkLanguage "zig" {

     

       383
       383
       +
               full-name = "Zig";

     

       384
       384
       +
               language-servers = ["zls"];

     

       385
       385
       +
             };

     

       386
       386
       +
       

     

       387
       387
       +
             glsl = mkLanguage "glsl" {

     

       388
       388
       +
               full-name = "GLSL";

     

       389
       389
       +
               language-servers = ["glsl_analyzer"];

     

       390
       390
       +
             };

     

       391
       391
       +
       

     

       392
       392
       +
             lua = mkLanguage "lua" {

     

       393
       393
       +
               full-name = "Lua";

     

       394
       394
       +
               language-servers = ["lua-language-server"];

     

       395
       395
       +
               formatter = "stylua";

     

       396
       396
       +
             };

     

       397
       397
       +
       

     

       398
       398
       +
             gleam = mkLanguage "gleam" {

     

       399
       399
       +
               full-name = "Gleam";

     

       400
       400
       +
               language-servers = ["gleam"];

     

       401
       401
       +
             };

     

       402
       402
       +
       

     

       403
       403
       +
             gdscript = mkLanguage "gdscript" {

     

       404
       404
       +
               full-name = "GDScript";

     

       405
       405
       +
               language-servers = ["gdscript-language-server"];

     

       406
       406
       +
               formatter = "gdscript-formatter";

     

       407
       407
       +
             };

     

       408
       408
       +
       

     

       409
       409
       +
             #ruby = mkLanguage "ruby" {

     

       410
       410
       +
             #  full-name = "Ruby";

     

       411
       411
       +
             #  language-servers = ["solargraph" "rubocop"];

     

       412
       412
       +
             #};

     

       413
       413
       +
           };

     

       414
       414
       +
         };

     

       415
       415
       +
       }

+24

modules/nixos/desktop/cosmic/default.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         config,

     

       3
       3
       +
         lib,

     

       4
       4
       +
         pkgs,

     

       5
       5
       +
         ...

     

       6
       6
       +
       }: {

     

       7
       7
       +
         options.myNixOS.desktop.cosmic.enable = lib.mkEnableOption "COSMIC desktop environment";

     

       8
       8
       +
       

     

       9
       9
       +
         config = lib.mkIf config.myNixOS.desktop.cosmic.enable {

     

       10
       10
       +
           home-manager.sharedModules = [

     

       11
       11
       +
             {

     

       12
       12
       +
               config.myHome.desktop.cosmic.enable = true;

     

       13
       13
       +
             }

     

       14
       14
       +
           ];

     

       15
       15
       +
       

     

       16
       16
       +
           environment.cosmic.excludePackages = with pkgs; [

     

       17
       17
       +
             cosmic-store

     

       18
       18
       +
           ];

     

       19
       19
       +
       

     

       20
       20
       +
           services.desktopManager.cosmic.enable = true;

     

       21
       21
       +
           system.nixos.tags = ["cosmic"];

     

       22
       22
       +
           myNixOS.desktop.enable = true;

     

       23
       23
       +
         };

     

       24
       24
       +
       }

modules/nixos/desktop/default.nix

···

       7
       7
        
         imports = [

     

       8
       8
        
           ./gnome

     

       9
       9
        
           ./plasma

     

       10
       10
       +
           ./cosmic

     

       10
       11
        
         ];

     

       11
       12
        
       

     

       12
       13
        
         options.myNixOS.desktop.enable = lib.mkOption {

+4 -5

modules/nixos/desktop/gnome/default.nix

···

       38
       38
        
       

     

       39
       39
        
           programs = {

     

       40
       40
        
             kdeconnect = {

     

       41
       41
       -
               enable = true;

     

       42
       42
       -
               package = pkgs.gnomeExtensions.gsconnect;

     

       41
       41
       +
               enable = lib.mkDefault true;

     

       42
       42
       +
               package = lib.mkDefault pkgs.gnomeExtensions.gsconnect;

     

       43
       43
        
             };

     

       44
       44
        
           };

     

       45
       45
        
       

     
···

       51
       51
        
             ];

     

       52
       52
        
           };

     

       53
       53
        
       

     

       54
       54
       -
           myNixOS = {

     

       55
       55
       -
             desktop.enable = true;

     

       56
       56
       -
           };

     

       54
       54
       +
           myNixOS.desktop.enable = true;

     

       55
       55
       +
           system.nixos.tags = ["gnome"];

     

       57
       56
        
       

     

       58
       57
        
           #qt = {

     

       59
       58
        
           #  enable = true;

modules/nixos/desktop/plasma/default.nix

···

       21
       21
        
           ];

     

       22
       22
        
       

     

       23
       23
        
           services.desktopManager.plasma6.enable = true;

     

       24
       24
       +
           system.nixos.tags = ["plasma"];

     

       25
       25
       +
           myNixOS.desktop.enable = true;

     

       24
       26
        
         };

     

       25
       27
        
       }

-2

modules/nixos/profiles/workstation/default.nix

···

       111
       111
        
               enableSystemSlice = true;

     

       112
       112
        
               enableUserSlices = true;

     

       113
       113
        
             };

     

       114
       114
       -
             # i hate these guys

     

       115
       115
       -
             coredump.enable = false;

     

       116
       114
        
           };

     

       117
       115
        
       

     

       118
       116
        
           zramSwap = {

Compare changes