commit 7710027322aa7da9f924ed33f33f85462ca61092 · dunkirk.sh/dots

+4 -1

machines/atalanta/home/default.nix

···

       33
       33
        
             halloy.enable = true;

     

       34
       34
        
             spotify.enable = true;

     

       35
       35
        
             crush.enable = true;

     

       36
       36
       -
             helix.enable = true;

     

       36
       36
       +
             helix = {

     

       37
       37
       +
               enable = true;

     

       38
       38
       +
               swift = true;

     

       39
       39
       +
             };

     

       37
       40
        
           };

     

       38
       41
        
         };

     

       39
       42

+40 -32

modules/home/apps/helix.nix

···

       6
       6
        
         ...

     

       7
       7
        
       }:

     

       8
       8
        
       {

     

       9
       9
       -
         options.atelier.apps.helix.enable = lib.mkEnableOption "Enable helix config";

     

       9
       9
       +
         options.atelier.apps.helix = {

     

       10
       10
       +
           enable = lib.mkEnableOption "Enable helix config";

     

       11
       11
       +
           swift = lib.mkEnableOption "Enable Swift support";

     

       12
       12
       +
         };

     

       10
       13
        
       

     

       11
       14
        
         config = lib.mkIf config.atelier.apps.helix.enable {

     

       12
       15
        
           programs.helix = {

     

       13
       16
        
             enable = true;

     

       14
       17
        
             package = pkgs.evil-helix;

     

       15
       15
       -
             extraPackages = with pkgs; [

     

       16
       16
       -
               clang-tools # clangd

     

       17
       17
       -
               cmake-language-server # neocmakelsp

     

       18
       18
       -
               omnisharp-roslyn # OmniSharp

     

       19
       19
       -
               gopls

     

       20
       20
       -
               jdt-language-server # jdtls

     

       21
       21
       -
               typescript-language-server

     

       22
       22
       -
               unstable.biome

     

       23
       23
       -
               lua-language-server

     

       24
       24
       -
               nil # nix

     

       25
       25
       -
               nodePackages.intelephense

     

       26
       26
       -
               python313Packages.python-lsp-server # pylsp

     

       27
       27
       -
               ruby-lsp

     

       28
       28
       -
               rust-analyzer

     

       29
       29
       -
               nodePackages.bash-language-server

     

       30
       30
       -
               sourcekit-lsp

     

       31
       31
       -
               taplo

     

       32
       32
       -
               vscode-langservers-extracted

     

       33
       33
       -
               kotlin-language-server

     

       34
       34
       -
               harper

     

       35
       35
       -
               inputs.wakatime-ls.packages.${pkgs.system}.default

     

       36
       36
       -
               unstable.sourcekit-lsp

     

       37
       37
       -
             ];

     

       18
       18
       +
             extraPackages =

     

       19
       19
       +
               with pkgs;

     

       20
       20
       +
               [

     

       21
       21
       +
                 clang-tools # clangd

     

       22
       22
       +
                 cmake-language-server # neocmakelsp

     

       23
       23
       +
                 omnisharp-roslyn # OmniSharp

     

       24
       24
       +
                 gopls

     

       25
       25
       +
                 jdt-language-server # jdtls

     

       26
       26
       +
                 typescript-language-server

     

       27
       27
       +
                 unstable.biome

     

       28
       28
       +
                 lua-language-server

     

       29
       29
       +
                 nil # nix

     

       30
       30
       +
                 nodePackages.intelephense

     

       31
       31
       +
                 python313Packages.python-lsp-server # pylsp

     

       32
       32
       +
                 ruby-lsp

     

       33
       33
       +
                 rust-analyzer

     

       34
       34
       +
                 nodePackages.bash-language-server

     

       35
       35
       +
                 taplo

     

       36
       36
       +
                 vscode-langservers-extracted

     

       37
       37
       +
                 kotlin-language-server

     

       38
       38
       +
                 harper

     

       39
       39
       +
                 inputs.wakatime-ls.packages.${pkgs.system}.default

     

       40
       40
       +
               ]

     

       41
       41
       +
               ++ lib.optionals config.atelier.apps.helix.swift [

     

       42
       42
       +
                 sourcekit-lsp

     

       43
       43
       +
                 unstable.sourcekit-lsp

     

       44
       44
       +
               ];

     

       38
       45
        
             settings = {

     

       39
       46
        
               theme = "catppuccin_macchiato";

     

       40
       47
        
               editor = {

     
···

       235
       242
        
                   ];

     

       236
       243
        
                 }

     

       237
       244
        
                 {

     

       238
       238
       -
                   name = "swift";

     

       239
       239
       -
                   language-servers = [

     

       240
       240
       -
                     "sourcekit-lsp"

     

       241
       241
       -
                     "harper-ls"

     

       242
       242
       -
                     "wakatime"

     

       243
       243
       -
                   ];

     

       244
       244
       -
                 }

     

       245
       245
       -
                 {

     

       246
       245
        
                   name = "toml";

     

       247
       246
        
                   language-servers = [

     

       248
       247
        
                     "taplo"

     
···

       291
       290
        
                   name = "kotlin";

     

       292
       291
        
                   language-servers = [

     

       293
       292
        
                     "kotlin-language-server"

     

       293
       293
       +
                     "harper-ls"

     

       294
       294
       +
                     "wakatime"

     

       295
       295
       +
                   ];

     

       296
       296
       +
                 }

     

       297
       297
       +
               ] ++ lib.optionals config.atelier.apps.helix.swift [

     

       298
       298
       +
                 {

     

       299
       299
       +
                   name = "swift";

     

       300
       300
       +
                   language-servers = [

     

       301
       301
       +
                     "sourcekit-lsp"

     

       294
       302
        
                     "harper-ls"

     

       295
       303
        
                     "wakatime"

     

       296
       304
        
                   ];