Compare commits

..

No commits in common. "5de8f66088c40bcb5e9ec45a6abb932e35549af7" and "a506e0470d8df6fd562b4236d4933d2d5149eaa4" have entirely different histories.

4 changed files with 4 additions and 54 deletions

41
flake.lock generated
View file

@ -626,22 +626,6 @@
}
},
"nixpkgs_6": {
"locked": {
"lastModified": 1735554305,
"narHash": "sha256-zExSA1i/b+1NMRhGGLtNfFGXgLtgo+dcuzHzaWA6w3Q=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "0e82ab234249d8eee3e8c91437802b32c74bb3fd",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_7": {
"locked": {
"lastModified": 1719010183,
"narHash": "sha256-8HMWaqpyjbVeEsmy/A2H6VFtW/Wr71vkPLnpTiAXu+8=",
@ -657,7 +641,7 @@
"type": "github"
}
},
"nixpkgs_8": {
"nixpkgs_7": {
"locked": {
"lastModified": 1714091391,
"narHash": "sha256-68n3GBvlm1MIeJXadPzQ3v8Y9sIW3zmv8gI5w5sliC8=",
@ -724,7 +708,6 @@
"ranger-icons": "ranger-icons",
"tlauncher": "tlauncher",
"tomater": "tomater",
"treefmt-nix": "treefmt-nix",
"vpsadminos": "vpsadminos",
"warthunder-leak-counter": "warthunder-leak-counter",
"wl-crosshair": "wl-crosshair",
@ -917,24 +900,6 @@
"url": "https://git.lelgenio.com/lelgenio/tomater"
}
},
"treefmt-nix": {
"inputs": {
"nixpkgs": "nixpkgs_6"
},
"locked": {
"lastModified": 1737483750,
"narHash": "sha256-5An1wq5U8sNycOBBg3nsDDgpwBmR9liOpDGlhliA6Xo=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "f2cc121df15418d028a59c9737d38e3a90fbaf8f",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"vpsadminos": {
"locked": {
"lastModified": 1737136524,
@ -954,7 +919,7 @@
"inputs": {
"crane": "crane_3",
"flake-utils": "flake-utils_6",
"nixpkgs": "nixpkgs_7"
"nixpkgs": "nixpkgs_6"
},
"locked": {
"lastModified": 1719076817,
@ -973,7 +938,7 @@
"wl-crosshair": {
"inputs": {
"flake-utils": "flake-utils_7",
"nixpkgs": "nixpkgs_8"
"nixpkgs": "nixpkgs_7"
},
"locked": {
"lastModified": 1715216838,

View file

@ -43,8 +43,6 @@
inputs.nixpkgs.follows = "nixpkgs";
};
treefmt-nix.url = "github:numtide/treefmt-nix";
# my stuff
dhist.url = "github:lelgenio/dhist";
demoji.url = "github:lelgenio/demoji";
@ -178,7 +176,6 @@
packages.${system} = pkgs // packages;
# formatter.${system} = pkgs.nixfmt-rfc-style;
formatter.${system} = (inputs.treefmt-nix.lib.evalModule pkgs ./treefmt.nix).config.build.wrapper;
formatter.${system} = pkgs.nixfmt-rfc-style;
};
}

View file

@ -1,8 +0,0 @@
{ pkgs, ... }:
{
projectRootFile = "flake.nix";
programs.nixfmt.enable = true;
programs.nixfmt.package = pkgs.nixfmt-rfc-style;
settings.on-unmatched = "debug";
}

View file

@ -104,10 +104,6 @@ files.exclude = [
"**/bower_components/**",
"**/resources/views/**"
]
stubs = [
"imagick",
]
[language_server.rust-analyzer]
filetypes = ["rust"]