Remove flake parts and update lock file
This commit is contained in:
parent
dda29957a9
commit
f350986961
2 changed files with 33 additions and 103 deletions
40
flake.nix
40
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"; }; };
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue