File tree Expand file tree Collapse file tree 2 files changed +50
-2
lines changed Expand file tree Collapse file tree 2 files changed +50
-2
lines changed Original file line number Diff line number Diff line change 32
32
'' ;
33
33
} ;
34
34
} ;
35
+
36
+ defaultFormat = "prettier" ;
37
+ formats = {
38
+ prettier = {
39
+ package = pkgs . nodePackages . prettier ;
40
+ nullConfig = ''
41
+ table.insert(
42
+ ls_sources,
43
+ null_ls.builtins.formatting.prettier.with({
44
+ command = "${ cfg . format . package } /bin/prettier",
45
+ })
46
+ )
47
+ '' ;
48
+ } ;
49
+
50
+ prettierd = {
51
+ package = pkgs . prettierd ;
52
+ nullConfig = ''
53
+ table.insert(
54
+ ls_sources,
55
+ null_ls.builtins.formatting.prettier.with({
56
+ command = "${ cfg . format . package } /bin/prettierd",
57
+ })
58
+ )
59
+ '' ;
60
+ } ;
61
+ } ;
35
62
in {
36
63
options . vim . languages . css = {
37
64
enable = mkEnableOption "CSS language support" ;
58
85
default = servers . ${ cfg. lsp . server } . package ;
59
86
} ;
60
87
} ;
88
+
89
+ format = {
90
+ enable = mkEnableOption "CSS formatting" // { default = config . vim . languages . enableFormat ; } ;
91
+
92
+ type = mkOption {
93
+ description = "CSS formatter to use" ;
94
+ type = with types ; enum ( attrNames formats ) ;
95
+ default = defaultFormat ;
96
+ } ;
97
+
98
+ package = mkOption {
99
+ description = "CSS formatter package" ;
100
+ type = types . package ;
101
+ default = formats . ${ cfg. format . type } . package ;
102
+ } ;
103
+ } ;
61
104
} ;
62
105
63
106
config = mkIf cfg . enable ( mkMerge [
68
111
69
112
( mkIf cfg . lsp . enable {
70
113
vim . lsp . lspconfig . enable = true ;
71
- vim . lsp . lspconfig . sources . tailwindcss-lsp = servers . ${ cfg. lsp . server } . lspConfig ;
114
+ vim . lsp . lspconfig . sources . css-lsp = servers . ${ cfg. lsp . server } . lspConfig ;
115
+ } )
116
+
117
+ ( mkIf cfg . format . enable {
118
+ vim . lsp . null-ls . enable = true ;
119
+ vim . lsp . null-ls . sources . css-format = formats . ${ cfg. format . type } . nullConfig ;
72
120
} )
73
121
] ) ;
74
122
}
Original file line number Diff line number Diff line change 51
51
config = mkIf cfg . enable ( mkMerge [
52
52
( mkIf cfg . lsp . enable {
53
53
vim . lsp . lspconfig . enable = true ;
54
- vim . lsp . lspconfig . sources . css -lsp = servers . ${ cfg. lsp . server } . lspConfig ;
54
+ vim . lsp . lspconfig . sources . tailwindcss -lsp = servers . ${ cfg. lsp . server } . lspConfig ;
55
55
} )
56
56
] ) ;
57
57
}
You can’t perform that action at this time.
0 commit comments