From f35098696163990e811357c74b8ecac0c81e5f53 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Fri, 29 Mar 2024 01:33:25 +0000 Subject: [PATCH] Remove flake parts and update lock file --- flake.lock | 96 +++++++----------------------------------------------- flake.nix | 40 ++++++++++++----------- 2 files changed, 33 insertions(+), 103 deletions(-) diff --git a/flake.lock b/flake.lock index 1b03819..e107d8f 100644 --- a/flake.lock +++ b/flake.lock @@ -1,39 +1,5 @@ { "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": { "inputs": { "nixpkgs": [ @@ -41,11 +7,11 @@ ] }, "locked": { - "lastModified": 1711133180, - "narHash": "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=", + "lastModified": 1711625603, + "narHash": "sha256-W+9dfqA9bqUIBV5u7jaIARAzMe3kTq/Hp2SpSVXKRQw=", "owner": "nix-community", "repo": "home-manager", - "rev": "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb", + "rev": "c0ef0dab55611c676ad7539bf4e41b3ec6fa87d2", "type": "github" }, "original": { @@ -56,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1711163522, - "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=", + "lastModified": 1711523803, + "narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4", + "rev": "2726f127c15a4cc9810843b96cad73c7eb39e443", "type": "github" }, "original": { @@ -88,11 +54,11 @@ }, "nixpkgs-2311": { "locked": { - "lastModified": 1711124224, - "narHash": "sha256-l0zlN/3CiodvWDtfBOVxeTwYSRz93muVbXWSpaMjXxM=", + "lastModified": 1711460390, + "narHash": "sha256-akSgjDZL6pVHEfSE6sz1DNSXuYX6hq+P/1Z5IoYWs7E=", "owner": "nixos", "repo": "nixpkgs", - "rev": "56528ee42526794d413d6f244648aaee4a7b56c0", + "rev": "44733514b72e732bd49f5511bd0203dea9b9a434", "type": "github" }, "original": { @@ -102,56 +68,19 @@ "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": { "inputs": { - "flake-parts": "flake-parts_2", "nixpkgs": [ "nixpkgs" ], "nixpkgs-2305": "nixpkgs-2305" }, "locked": { - "lastModified": 1711496468, - "narHash": "sha256-xV7zu7LhVUl6S5ruwMqvYjvQ3Uv87stqBfPjAv/lGuY=", + "lastModified": 1711675616, + "narHash": "sha256-HycihSJFF0jXdEbZlDKQHu169HhxJYRwGMbRiZIfFPg=", "owner": "opdavies", "repo": "opdavies.nvim", - "rev": "e3ddc8cf772f5fb5b137a747463bdfa85568f895", + "rev": "b71e7d35d794bef90709bc8b5415771a7d61a122", "type": "github" }, "original": { @@ -162,7 +91,6 @@ }, "root": { "inputs": { - "flake-parts": "flake-parts", "home-manager": "home-manager", "nixpkgs": "nixpkgs", "nixpkgs-2311": "nixpkgs-2311", diff --git a/flake.nix b/flake.nix index 8f3d4d0..2ae96bd 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,9 @@ inputs = { home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.url = "github:nix-community/home-manager"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs-2311.url = "github:nixos/nixpkgs/nixos-23.11"; opdavies-nvim.inputs.nixpkgs.follows = "nixpkgs"; @@ -10,35 +12,35 @@ # opdavies-nvim.url = "path:/home/opdavies/Code/github.com/opdavies/opdavies.nvim"; }; - outputs = inputs@{ flake-parts, self, ... }: + outputs = { nixpkgs, self, ... }@inputs: let + system = "x86_64-linux"; + pkgs = nixpkgs.legacyPackages.${system}; + username = "opdavies"; mkNixos = import ./lib/nixos { 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', ... }: { - packages.default = - pkgs.mkShell { nativeBuildInputs = [ pkgs.nixfmt pkgs.just ]; }; + inherit (pkgs) mkShell; + in { + packages.${system}.default = + mkShell { buildInputs = with pkgs; [ just ]; }; - formatter = pkgs.nixfmt; - }; + formatter.${system} = pkgs.nixfmt; - flake = { - nixosConfigurations = { - apollo = mkNixos { - desktop = true; - hostname = "apollo"; - }; - nixedo = mkNixos { - desktop = true; - hostname = "nixedo"; - }; + nixosConfigurations = { + apollo = mkNixos { + desktop = true; + hostname = "apollo"; }; - homeConfigurations = { wsl2 = mkWsl { system = "x86_64-linux"; }; }; + nixedo = mkNixos { + desktop = true; + hostname = "nixedo"; + }; }; + + homeConfigurations = { wsl2 = mkWsl { system = "x86_64-linux"; }; }; }; }