Inherit just and nixfmt and update lock file

This commit is contained in:
Oliver Davies 2024-03-30 22:14:48 +00:00
parent e67424baa5
commit 1418a2333f
2 changed files with 6 additions and 7 deletions

View file

@ -76,11 +76,11 @@
"nixpkgs-2305": "nixpkgs-2305" "nixpkgs-2305": "nixpkgs-2305"
}, },
"locked": { "locked": {
"lastModified": 1711675616, "lastModified": 1711835319,
"narHash": "sha256-HycihSJFF0jXdEbZlDKQHu169HhxJYRwGMbRiZIfFPg=", "narHash": "sha256-UgKCMk0cfo+9+KI7PZcllFPcmSj9yygf6qSEOXMCh3w=",
"owner": "opdavies", "owner": "opdavies",
"repo": "opdavies.nvim", "repo": "opdavies.nvim",
"rev": "b71e7d35d794bef90709bc8b5415771a7d61a122", "rev": "8a74f333444d6a4a4bdc33f6cbcdc2d3f6faeca4",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -22,12 +22,11 @@
mkNixos = import ./lib/nixos { inherit inputs self username; }; mkNixos = import ./lib/nixos { inherit inputs self username; };
mkWsl = import ./lib/wsl2 { inherit inputs self username; }; mkWsl = import ./lib/wsl2 { inherit inputs self username; };
inherit (pkgs) mkShell; inherit (pkgs) just mkShell nixfmt;
in { in {
packages.${system}.default = packages.${system}.default = mkShell { buildInputs = [ just ]; };
mkShell { buildInputs = with pkgs; [ just ]; };
formatter.${system} = pkgs.nixfmt; formatter.${system} = nixfmt;
nixosConfigurations = { nixosConfigurations = {
apollo = mkNixos { apollo = mkNixos {