opdavies/dotfiles
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Remove flake parts and update lock file

Browse source
This commit is contained in:
Oliver Davies 2024-03-29 01:33:25 +00:00
parent dda29957a9
commit f350986961
2 changed files with 33 additions and 103 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

96
flake.lock
View file

@ -1,39 +1,5 @@
{ {
"nodes": { "nodes": {
"flake-parts": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1709336216,
"narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2",
"type": "github"
},
"original": {
"id": "flake-parts",
"type": "indirect"
}
},
"flake-parts_2": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib_2"
},
"locked": {
"lastModified": 1709336216,
"narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2",
"type": "github"
},
"original": {
"id": "flake-parts",
"type": "indirect"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -41,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1711133180, "lastModified": 1711625603,
"narHash": "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=", "narHash": "sha256-W+9dfqA9bqUIBV5u7jaIARAzMe3kTq/Hp2SpSVXKRQw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb", "rev": "c0ef0dab55611c676ad7539bf4e41b3ec6fa87d2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -56,11 +22,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1711163522, "lastModified": 1711523803,
"narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=", "narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4", "rev": "2726f127c15a4cc9810843b96cad73c7eb39e443",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -88,11 +54,11 @@
}, },
"nixpkgs-2311": { "nixpkgs-2311": {
"locked": { "locked": {
"lastModified": 1711124224, "lastModified": 1711460390,
"narHash": "sha256-l0zlN/3CiodvWDtfBOVxeTwYSRz93muVbXWSpaMjXxM=", "narHash": "sha256-akSgjDZL6pVHEfSE6sz1DNSXuYX6hq+P/1Z5IoYWs7E=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "56528ee42526794d413d6f244648aaee4a7b56c0", "rev": "44733514b72e732bd49f5511bd0203dea9b9a434",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -102,56 +68,19 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-lib": {
"locked": {
"dir": "lib",
"lastModified": 1709237383,
"narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8",
"type": "github"
},
"original": {
"dir": "lib",
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-lib_2": {
"locked": {
"dir": "lib",
"lastModified": 1709237383,
"narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8",
"type": "github"
},
"original": {
"dir": "lib",
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"opdavies-nvim": { "opdavies-nvim": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_2",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"nixpkgs-2305": "nixpkgs-2305" "nixpkgs-2305": "nixpkgs-2305"
}, },
"locked": { "locked": {
"lastModified": 1711496468, "lastModified": 1711675616,
"narHash": "sha256-xV7zu7LhVUl6S5ruwMqvYjvQ3Uv87stqBfPjAv/lGuY=", "narHash": "sha256-HycihSJFF0jXdEbZlDKQHu169HhxJYRwGMbRiZIfFPg=",
"owner": "opdavies", "owner": "opdavies",
"repo": "opdavies.nvim", "repo": "opdavies.nvim",
"rev": "e3ddc8cf772f5fb5b137a747463bdfa85568f895", "rev": "b71e7d35d794bef90709bc8b5415771a7d61a122",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -162,7 +91,6 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"flake-parts": "flake-parts",
"home-manager": "home-manager", "home-manager": "home-manager",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-2311": "nixpkgs-2311", "nixpkgs-2311": "nixpkgs-2311",

22
flake.nix
View file

@ -2,7 +2,9 @@
inputs = { inputs = {
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
home-manager.url = "github:nix-community/home-manager"; home-manager.url = "github:nix-community/home-manager";
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-2311.url = "github:nixos/nixpkgs/nixos-23.11"; nixpkgs-2311.url = "github:nixos/nixpkgs/nixos-23.11";
opdavies-nvim.inputs.nixpkgs.follows = "nixpkgs"; opdavies-nvim.inputs.nixpkgs.follows = "nixpkgs";
@ -10,28 +12,29 @@
# opdavies-nvim.url = "path:/home/opdavies/Code/github.com/opdavies/opdavies.nvim"; # opdavies-nvim.url = "path:/home/opdavies/Code/github.com/opdavies/opdavies.nvim";
}; };
outputs = inputs@{ flake-parts, self, ... }: outputs = { nixpkgs, self, ... }@inputs:
let let
system = "x86_64-linux";
pkgs = nixpkgs.legacyPackages.${system};
username = "opdavies"; username = "opdavies";
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; };
in flake-parts.lib.mkFlake { inherit inputs; } {
systems = [ "x86_64-linux" ];
perSystem = { pkgs, self', ... }: { inherit (pkgs) mkShell;
packages.default = in {
pkgs.mkShell { nativeBuildInputs = [ pkgs.nixfmt pkgs.just ]; }; packages.${system}.default =
mkShell { buildInputs = with pkgs; [ just ]; };
formatter = pkgs.nixfmt; formatter.${system} = pkgs.nixfmt;
};
flake = {
nixosConfigurations = { nixosConfigurations = {
apollo = mkNixos { apollo = mkNixos {
desktop = true; desktop = true;
hostname = "apollo"; hostname = "apollo";
}; };
nixedo = mkNixos { nixedo = mkNixos {
desktop = true; desktop = true;
hostname = "nixedo"; hostname = "nixedo";
@ -40,5 +43,4 @@
homeConfigurations = { wsl2 = mkWsl { system = "x86_64-linux"; }; }; homeConfigurations = { wsl2 = mkWsl { system = "x86_64-linux"; }; };
}; };
};
} }