Skip to content

Commit

Permalink
Auto lint/format
Browse files Browse the repository at this point in the history
  • Loading branch information
redyf authored and github-actions[bot] committed Feb 12, 2024
1 parent f21dab8 commit d300813
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 45 deletions.
22 changes: 11 additions & 11 deletions config/keymaps.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
keymaps = [
# Disable arrow keys
{
mode = ["n" "i"];
mode = [ "n" "i" ];
key = "<Up>";
action = "<Nop>";
options = {
Expand All @@ -16,7 +16,7 @@
};
}
{
mode = ["n" "i"];
mode = [ "n" "i" ];
key = "<Down>";
action = "<Nop>";
options = {
Expand All @@ -26,7 +26,7 @@
};
}
{
mode = ["n" "i"];
mode = [ "n" "i" ];
key = "<Right>";
action = "<Nop>";
options = {
Expand All @@ -36,7 +36,7 @@
};
}
{
mode = ["n" "i"];
mode = [ "n" "i" ];
key = "<Left>";
action = "<Nop>";
options = {
Expand Down Expand Up @@ -66,7 +66,7 @@
}

{
mode = ["n" "v"];
mode = [ "n" "v" ];
key = "<leader>g";
action = "+git";
}
Expand All @@ -90,19 +90,19 @@
}

{
mode = ["n" "v"];
mode = [ "n" "v" ];
key = "<leader>d";
action = "+debug";
}

{
mode = ["n" "v"];
mode = [ "n" "v" ];
key = "<leader>c";
action = "+code";
}

{
mode = ["n" "v"];
mode = [ "n" "v" ];
key = "<leader>t";
action = "+test";
}
Expand Down Expand Up @@ -434,7 +434,7 @@

# Copy stuff to system clipboard with <leader> + y or just y to have it just in vim
{
mode = ["n" "v"];
mode = [ "n" "v" ];
key = "<leader>y";
action = "\"+y";
options = {
Expand All @@ -443,7 +443,7 @@
}

{
mode = ["n" "v"];
mode = [ "n" "v" ];
key = "<leader>Y";
action = "\"+Y";
options = {
Expand All @@ -453,7 +453,7 @@

# Delete to void register
{
mode = ["n" "v"];
mode = [ "n" "v" ];
key = "<leader>D";
action = "\"_d";
options = {
Expand Down
26 changes: 13 additions & 13 deletions config/lsp/conform.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@
enable = true;
notifyOnError = true;
formattersByFt = {
html = [["prettierd" "prettier"]];
css = [["prettierd" "prettier"]];
javascript = [["prettierd" "prettier"]];
javascriptreact = [["prettierd" "prettier"]];
typescript = [["prettierd" "prettier"]];
typescriptreact = [["prettierd" "prettier"]];
java = ["google-java-format"];
python = ["black"];
lua = ["stylua"];
nix = ["alejandra"];
markdown = [["prettierd" "prettier"]];
rust = ["rustfmt"];
html = [ [ "prettierd" "prettier" ] ];
css = [ [ "prettierd" "prettier" ] ];
javascript = [ [ "prettierd" "prettier" ] ];
javascriptreact = [ [ "prettierd" "prettier" ] ];
typescript = [ [ "prettierd" "prettier" ] ];
typescriptreact = [ [ "prettierd" "prettier" ] ];
java = [ "google-java-format" ];
python = [ "black" ];
lua = [ "stylua" ];
nix = [ "alejandra" ];
markdown = [ [ "prettierd" "prettier" ] ];
rust = [ "rustfmt" ];
};
};

Expand All @@ -29,7 +29,7 @@
};
}
{
mode = ["n" "v"];
mode = [ "n" "v" ];
key = "<leader>cf";
action = "<cmd>lua require('conform').format()<cr>";
options = {
Expand Down
11 changes: 5 additions & 6 deletions config/sets.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
{
pkgs,
lib,
config,
...
{ pkgs
, lib
, config
, ...
}: {
config = {
options = {
Expand Down Expand Up @@ -47,7 +46,7 @@
updatetime = 50; # faster completion (4000ms default)

# Set completeopt to have a better completion experience
completeopt = ["menuone" "noselect" "noinsert"]; # mostly just for cmp
completeopt = [ "menuone" "noselect" "noinsert" ]; # mostly just for cmp

# Enable persistent undo history
swapfile = false;
Expand Down
30 changes: 15 additions & 15 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit d300813

Please sign in to comment.