summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.lock60
-rw-r--r--flake.nix20
2 files changed, 44 insertions, 36 deletions
diff --git a/flake.lock b/flake.lock
index bb859f5..a95c1d5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -3,11 +3,11 @@
"flake-compat": {
"flake": false,
"locked": {
- "lastModified": 1673956053,
- "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+ "lastModified": 1696426674,
+ "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
- "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+ "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
@@ -24,11 +24,11 @@
]
},
"locked": {
- "lastModified": 1704152458,
- "narHash": "sha256-DS+dGw7SKygIWf9w4eNBUZsK+4Ug27NwEWmn2tnbycg=",
+ "lastModified": 1706830856,
+ "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "88a2cd8166694ba0b6cb374700799cec53aef527",
+ "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f",
"type": "github"
},
"original": {
@@ -42,11 +42,11 @@
"systems": "systems"
},
"locked": {
- "lastModified": 1685518550,
- "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
+ "lastModified": 1701680307,
+ "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
"owner": "numtide",
"repo": "flake-utils",
- "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
+ "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
"type": "github"
},
"original": {
@@ -64,11 +64,11 @@
]
},
"locked": {
- "lastModified": 1660459072,
- "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=",
+ "lastModified": 1703887061,
+ "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=",
"owner": "hercules-ci",
"repo": "gitignore.nix",
- "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73",
+ "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5",
"type": "github"
},
"original": {
@@ -85,11 +85,11 @@
]
},
"locked": {
- "lastModified": 1704498488,
- "narHash": "sha256-yINKdShHrtjdiJhov+q0s3Y3B830ujRoSbHduUNyKag=",
+ "lastModified": 1706955260,
+ "narHash": "sha256-W3y0j77IDVbmbajudHoUr46RpswujUCl+D5Vru53UsI=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "51e44a13acea71b36245e8bd8c7db53e0a3e61ee",
+ "rev": "880d9bc2110f7cae59698f715b8ca42cdc53670c",
"type": "github"
},
"original": {
@@ -106,11 +106,11 @@
]
},
"locked": {
- "lastModified": 1704277720,
- "narHash": "sha256-meAKNgmh3goankLGWqqpw73pm9IvXjEENJloF0coskE=",
+ "lastModified": 1706833576,
+ "narHash": "sha256-w7BL0EWRts+nD1lbLECIuz6fRzmmV+z8oWwoY7womR0=",
"owner": "lnl7",
"repo": "nix-darwin",
- "rev": "0dd382b70c351f528561f71a0a7df82c9d2be9a4",
+ "rev": "bdbae6ecff8fcc322bf6b9053c0b984912378af7",
"type": "github"
},
"original": {
@@ -121,11 +121,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1704722960,
- "narHash": "sha256-mKGJ3sPsT6//s+Knglai5YflJUF2DGj7Ai6Ynopz0kI=",
+ "lastModified": 1707268954,
+ "narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "317484b1ead87b9c1b8ac5261a8d2dd748a0492d",
+ "rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1",
"type": "github"
},
"original": {
@@ -137,11 +137,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1704538339,
- "narHash": "sha256-1734d3mQuux9ySvwf6axRWZRBhtcZA9Q8eftD6EZg6U=",
+ "lastModified": 1706732774,
+ "narHash": "sha256-hqJlyJk4MRpcItGYMF+3uHe8HvxNETWvlGtLuVpqLU0=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "46ae0210ce163b3cba6c7da08840c1d63de9c701",
+ "rev": "b8b232ae7b8b144397fdb12d20f592e5e7c1a64d",
"type": "github"
},
"original": {
@@ -160,11 +160,11 @@
"pre-commit-hooks": "pre-commit-hooks"
},
"locked": {
- "lastModified": 1704958333,
- "narHash": "sha256-yYgtaJnaDtUzd2X5jL+Zy38rtKPEu328oy5x7cOaH+I=",
+ "lastModified": 1707474531,
+ "narHash": "sha256-XoWqoTIdGpDYkHXTCmUNb7AxbBzDtpKmZIisnxt7nDQ=",
"owner": "nix-community",
"repo": "nixvim",
- "rev": "0379ab34cc7bc1b846bfdbb3d6707f5c8b03ce2c",
+ "rev": "3bbb3d5453e69f868da7549d19bbdb5a2a49efb2",
"type": "github"
},
"original": {
@@ -188,11 +188,11 @@
]
},
"locked": {
- "lastModified": 1704668415,
- "narHash": "sha256-BMzNHFod53iiU4lkR5WHwqQCFmaCLq85sUCskXneXlA=",
+ "lastModified": 1706424699,
+ "narHash": "sha256-Q3RBuOpZNH2eFA1e+IHgZLAOqDD9SKhJ/sszrL8bQD4=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
- "rev": "44493e2b3c3ebcd39a9947e9ed9f2c2af164ec4c",
+ "rev": "7c54e08a689b53c8a1e5d70169f2ec9e2a68ffaf",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index a74fd6e..bca4e90 100644
--- a/flake.nix
+++ b/flake.nix
@@ -16,12 +16,14 @@
module = {
config = {
extraPackages = [
- pkgs.black
pkgs.alejandra
- pkgs.shfmt
+ pkgs.black
pkgs.cargo
- pkgs.rustfmt
+ pkgs.cmake-format
pkgs.go
+ pkgs.rustfmt
+ pkgs.shfmt
+ pkgs.yamlfmt
];
options = {mouse = "";};
colorschemes.kanagawa = {
@@ -29,6 +31,7 @@
transparent = true;
};
plugins = {
+ ledger.enable = true;
lsp = {
enable = true;
servers = {
@@ -38,20 +41,25 @@
gopls.enable = true;
};
};
- rust-tools.enable = true;
+ rustaceanvim.enable = true;
conform-nvim = {
enable = true;
formatAfterSave.lspFallback = false;
formattersByFt = {
- python = ["black"];
+ cmake = ["cmake_format"];
+ go = ["gofmt"];
nix = ["alejandra"];
+ python = ["black"];
rust = ["rustfmt"];
- go = ["gofmt"];
+ yaml = ["yamlfmt"];
_ = ["shfmt"];
};
formatters.shfmt = {
prepend_args = ["-i" "4" "-s"];
};
+ formatters.rustfmt = {
+ prepend_args = ["--edition" "2021"];
+ };
};
luasnip.enable = true;
nvim-cmp = {