update system

This commit is contained in:
2024-08-28 00:05:51 +02:00
parent c6082902a4
commit 78a04e80b5
11 changed files with 119 additions and 51 deletions

View File

@@ -144,15 +144,15 @@
gnome-keyring
nautilus
gnome-calendar
gnome.gnome-characters
gnome.gnome-contacts
gnome.gnome-clocks
gnome-characters
gnome-contacts
gnome-clocks
gnome-calculator
simple-scan
eog
geary
ghex
gnome.gnome-weather
gnome-weather
gnome-keyring
gnome-disk-utility
# fixes

View File

@@ -65,7 +65,7 @@ in
}
];
conform-nvim.formatAfterSave = # lua
conform-nvim.settings.format_after_save = # lua
''
function(bufnr)
if vim.g.${cfg.varName} or vim.b[bufnr].${cfg.varName} then

View File

@@ -16,7 +16,7 @@ in
config = lib.mkIf cfg.enable {
plugins.conform-nvim = {
enable = true;
formattersByFt = lib.mkIf cfg.prettier {
settings.formatters_by_ft = lib.mkIf cfg.prettier {
javascript = [ "prettierd" ];
markdown = [ "prettierd" ];
typescript = [ "prettierd" ];

View File

@@ -9,7 +9,7 @@ in
config = lib.mkIf cfg.enable {
plugins = {
conform-nvim.formattersByFt = {
conform-nvim.settings.formatters_by_ft = {
c = [ "clang-format" ];
cpp = [ "clang-format" ];
};

View File

@@ -9,7 +9,7 @@ in
config = lib.mkIf cfg.enable {
plugins = {
conform-nvim.formattersByFt.dart = [ "dart_format" ];
conform-nvim.settings.formatters_by_ft.dart = [ "dart_format" ];
lsp.servers.dartls.enable = true;
};
};

View File

@@ -14,7 +14,7 @@ in
config = lib.mkIf cfg.enable {
plugins = {
conform-nvim.formattersByFt.lua = [ "stylua" ];
conform-nvim.settings.formatters_by_ft.lua = [ "stylua" ];
lsp.servers.lua-ls.enable = true;
};
extraPackages = [ pkgs.stylua ];

View File

@@ -14,7 +14,7 @@ in
config = lib.mkIf cfg.enable {
plugins = {
conform-nvim.formattersByFt.nix = [ "nixfmt" ];
conform-nvim.settings.formatters_by_ft.nix = [ "nixfmt" ];
lsp.servers.nil-ls.enable = true;
nix.enable = true;
};

View File

@@ -14,7 +14,7 @@ in
config = lib.mkIf cfg.enable {
plugins = {
conform-nvim.formattersByFt.python = [ "black" ];
conform-nvim.settings.formatters_by_ft.python = [ "black" ];
lsp.servers.pylsp.enable = true;
};
extraPackages = [ pkgs.black ];

View File

@@ -9,7 +9,7 @@ in
config = lib.mkIf cfg.enable {
plugins = {
conform-nvim.formattersByFt.rust = [ "rustfmt" ];
conform-nvim.settings.formattters_by_ft.rust = [ "rustfmt" ];
lsp.servers.rust-analyzer = {
enable = true;
installCargo = false;

View File

@@ -14,7 +14,7 @@ in
config = lib.mkIf cfg.enable {
plugins = {
conform-nvim.formattersByFt.sh = [ "shfmt" ];
conform-nvim.settings.formatters_by_ft.sh = [ "shfmt" ];
lsp.servers.bashls.enable = true;
};
extraPackages = [ pkgs.shfmt ];