Compare commits
2 commits
af1994d3d5
...
cda2fe7091
| Author | SHA1 | Date | |
|---|---|---|---|
| cda2fe7091 | |||
| ca479db8be |
4 changed files with 18 additions and 18 deletions
30
flake.lock
generated
30
flake.lock
generated
|
|
@ -179,11 +179,11 @@
|
||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1769086393,
|
"lastModified": 1769302137,
|
||||||
"narHash": "sha256-3ymIZ8s3+hu7sDl/Y48o6bwMxorfKrmn97KuWiw1vjY=",
|
"narHash": "sha256-QEDtctEkOsbx8nlFh4yqPEOtr4tif6KTqWwJ37IM2ds=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "9f7ba891ea5fc3ededd7804f1a23fafadbcb26ca",
|
"rev": "a351494b0e35fd7c0b7a1aae82f0afddf4907aa8",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -195,11 +195,11 @@
|
||||||
},
|
},
|
||||||
"nixos-unstable": {
|
"nixos-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1769018530,
|
"lastModified": 1769170682,
|
||||||
"narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=",
|
"narHash": "sha256-oMmN1lVQU0F0W2k6OI3bgdzp2YOHWYUAw79qzDSjenU=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "88d3861acdd3d2f0e361767018218e51810df8a1",
|
"rev": "c5296fdd05cfa2c187990dd909864da9658df755",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -227,11 +227,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1768940263,
|
"lastModified": 1769318308,
|
||||||
"narHash": "sha256-sJERJIYTKPFXkoz/gBaBtRKke82h4DkX3BBSsKbfbvI=",
|
"narHash": "sha256-Mjx6p96Pkefks3+aA+72lu1xVehb6mv2yTUUqmSet6Q=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "3ceaaa8bc963ced4d830e06ea2d0863b6490ff03",
|
"rev": "1cd347bf3355fce6c64ab37d3967b4a2cb4b878c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -243,11 +243,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_3": {
|
"nixpkgs_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1768305791,
|
"lastModified": 1769170682,
|
||||||
"narHash": "sha256-AIdl6WAn9aymeaH/NvBj0H9qM+XuAuYbGMZaP0zcXAQ=",
|
"narHash": "sha256-oMmN1lVQU0F0W2k6OI3bgdzp2YOHWYUAw79qzDSjenU=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "1412caf7bf9e660f2f962917c14b1ea1c3bc695e",
|
"rev": "c5296fdd05cfa2c187990dd909864da9658df755",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -263,11 +263,11 @@
|
||||||
"nixpkgs": "nixpkgs_3"
|
"nixpkgs": "nixpkgs_3"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1768451253,
|
"lastModified": 1769504998,
|
||||||
"narHash": "sha256-lrrqQuxIIlHn4TzOMDkhd/fhuDLtHJsXLuJ8x3SCn4o=",
|
"narHash": "sha256-KihFuBqPESgHyk0FKT43xrPqRM6ECCFX6ecQZDsH9Qo=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NUR",
|
"repo": "NUR",
|
||||||
"rev": "216f5786b653a68a7618296c8d54dde43644ab56",
|
"rev": "ba71e5e4a5652b27648ab7fae841d1d616f58fce",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
|
|
@ -51,7 +51,7 @@
|
||||||
merge.tool = "vimdiff";
|
merge.tool = "vimdiff";
|
||||||
# provide `git mergetool -t nixfmt`
|
# provide `git mergetool -t nixfmt`
|
||||||
mergetool.nixfmt = {
|
mergetool.nixfmt = {
|
||||||
cmd = "${lib.getExe pkgs.nixfmt-rfc-style} --mergetool \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"";
|
cmd = "${lib.getExe pkgs.nixfmt} --mergetool \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"";
|
||||||
trustExitCode = true;
|
trustExitCode = true;
|
||||||
};
|
};
|
||||||
core.excludesfile = toString (
|
core.excludesfile = toString (
|
||||||
|
|
|
||||||
|
|
@ -90,7 +90,7 @@ let
|
||||||
|
|
||||||
nixHelpers = [
|
nixHelpers = [
|
||||||
nixpkgs-review
|
nixpkgs-review
|
||||||
nixfmt-rfc-style
|
nixfmt
|
||||||
nix-top
|
nix-top
|
||||||
statix
|
statix
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -74,7 +74,7 @@
|
||||||
"editor.formatOnSave" = false;
|
"editor.formatOnSave" = false;
|
||||||
"editor.formatOnType" = false;
|
"editor.formatOnType" = false;
|
||||||
};
|
};
|
||||||
"nix.formatterPath" = lib.getExe pkgs.nixfmt-rfc-style;
|
"nix.formatterPath" = lib.getExe pkgs.nixfmt;
|
||||||
"nix.enableLanguageServer" = true;
|
"nix.enableLanguageServer" = true;
|
||||||
"nix.serverPath" = lib.getExe pkgs.nixd;
|
"nix.serverPath" = lib.getExe pkgs.nixd;
|
||||||
"nix.serverSettings" = { };
|
"nix.serverSettings" = { };
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue