Skip to content

Commit b0512b8

Browse files
committed
refactor!: move to flake-parts
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
1 parent edb68da commit b0512b8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+578
-580
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
.envrc.local
44
.direnv/
55

6+
result*
7+
repl-result*
8+
69
# Local .terraform directories
710
**/.terraform/*
811

development.nix

Lines changed: 0 additions & 28 deletions
This file was deleted.

flake.lock

Lines changed: 40 additions & 31 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 21 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -11,50 +11,29 @@
1111
};
1212

1313
inputs = {
14-
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
15-
flake-utils.url = "github:numtide/flake-utils";
16-
treefmt-nix = {
17-
url = "github:numtide/treefmt-nix";
18-
inputs.nixpkgs.follows = "nixpkgs";
19-
};
20-
agenix = {
21-
url = "github:ryantm/agenix";
22-
inputs.nixpkgs.follows = "nixpkgs";
23-
inputs.systems.follows = "flake-utils/systems";
24-
};
25-
srvos = {
26-
url = "github:nix-community/srvos";
27-
inputs.nixpkgs.follows = "nixpkgs";
28-
};
29-
disko = {
30-
url = "github:nix-community/disko";
31-
inputs.nixpkgs.follows = "nixpkgs";
32-
};
14+
agenix.inputs.nixpkgs.follows = "nixpkgs";
15+
agenix.url = "github:ryantm/agenix";
16+
blockgame-meta.inputs.flake-parts.follows = "flake-parts";
17+
blockgame-meta.inputs.nixpkgs.follows = "nixpkgs";
18+
blockgame-meta.url = "github:PrismLauncher/meta";
19+
comin.inputs.nixpkgs.follows = "nixpkgs";
20+
comin.url = "github:nlewo/comin";
21+
disko.inputs.nixpkgs.follows = "nixpkgs";
22+
disko.url = "github:nix-community/disko";
23+
flake-parts.url = "github:hercules-ci/flake-parts";
3324
impermanence.url = "github:nix-community/impermanence";
25+
import-tree.url = "github:vic/import-tree";
26+
letterbox.inputs.nixpkgs.follows = "nixpkgs";
27+
letterbox.url = "github:TheKodeToad/Letterbox";
3428
nixos-facter-modules.url = "github:numtide/nixos-facter-modules";
35-
comin = {
36-
url = "github:nlewo/comin";
37-
inputs.nixpkgs.follows = "nixpkgs";
38-
};
39-
blockgame-meta = {
40-
url = "github:PrismLauncher/meta";
41-
inputs.nixpkgs.follows = "nixpkgs";
42-
};
43-
refraction = {
44-
url = "github:PrismLauncher/refraction";
45-
inputs.nixpkgs.follows = "nixpkgs";
46-
};
47-
letterbox = {
48-
url = "github:TheKodeToad/Letterbox";
49-
inputs.nixpkgs.follows = "nixpkgs";
50-
};
29+
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
30+
refraction.inputs.nixpkgs.follows = "nixpkgs";
31+
refraction.url = "github:PrismLauncher/refraction";
32+
srvos.inputs.nixpkgs.follows = "nixpkgs";
33+
srvos.url = "github:nix-community/srvos";
34+
treefmt-nix.inputs.nixpkgs.follows = "nixpkgs";
35+
treefmt-nix.url = "github:numtide/treefmt-nix";
5136
};
5237

53-
outputs =
54-
{ flake-utils, ... }@inputs:
55-
flake-utils.lib.meld inputs [
56-
./machines/andesite
57-
./modules
58-
./development.nix
59-
];
38+
outputs = inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; } (inputs.import-tree ./nix);
6039
}

machines/andesite/blockgame-meta.nix

Lines changed: 0 additions & 31 deletions
This file was deleted.

machines/andesite/caddy.nix

Lines changed: 0 additions & 14 deletions
This file was deleted.

machines/andesite/comin.nix

Lines changed: 0 additions & 27 deletions
This file was deleted.

machines/andesite/configuration.nix

Lines changed: 0 additions & 56 deletions
This file was deleted.

machines/andesite/default.nix

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)