Skip to content

Commit

Permalink
refactor: removes plugins and adds nixago-extensions
Browse files Browse the repository at this point in the history
  • Loading branch information
jmgilman committed Jun 17, 2022
1 parent 3f2ee2c commit 1289064
Show file tree
Hide file tree
Showing 18 changed files with 88 additions and 621 deletions.
14 changes: 7 additions & 7 deletions .config.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ plugins, tools }:
{ exts, system, tools }:
let
colors = {
black = "#000000";
Expand Down Expand Up @@ -246,11 +246,11 @@ let

in
[
(plugins.ghsettings github)
(plugins.conform conform)
(plugins.just just)
(plugins.lefthook lefthook)
(plugins.prettier prettier)
(plugins.prettier prettier-ignore)
(exts.ghsettings.${system} github)
(exts.conform.${system} conform)
(exts.just.${system} just)
(exts.lefthook.${system} lefthook)
(exts.prettier.${system} prettier)
(exts.prettier.${system} prettier-ignore)
]

75 changes: 75 additions & 0 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 6 additions & 4 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@
inputs = {
nixpkgs.url = "github:nixos/nixpkgs";
flake-utils.url = "github:numtide/flake-utils";
nixago-exts.url = "github:nix-community/nixago-extensions";
nixago-exts.inputs.nixpkgs.follows = "nixpkgs";
};

outputs = { self, nixpkgs, flake-utils }:
outputs = { self, nixpkgs, flake-utils, nixago-exts }:
rec {
# Only run CI on Linux
herculesCI.ciSystems = [ "x86_64-linux" "aarch64-linux" ];
Expand All @@ -26,7 +28,6 @@

engines = import ./engines { inherit pkgs lib; };
lib = (import ./lib { inherit pkgs lib engines; });
plugins = import ./plugins { inherit pkgs lib engines; };

# Setup pkgs
pkgs = import nixpkgs {
Expand Down Expand Up @@ -59,11 +60,12 @@
];

# Define development tool configuration (with Nixago!)
configs = import ./.config.nix { inherit plugins tools; };
configs =
import ./.config.nix { inherit system tools; exts = nixago-exts; };
in
rec {
# Expose external API
inherit engines lib plugins;
inherit engines lib;

# Add local tests
checks = import ./tests { inherit pkgs lib engines runTests; };
Expand Down
29 changes: 0 additions & 29 deletions plugins/conform/default.nix

This file was deleted.

56 changes: 0 additions & 56 deletions plugins/conform/templates/default.cue

This file was deleted.

20 changes: 0 additions & 20 deletions plugins/default.nix

This file was deleted.

11 changes: 0 additions & 11 deletions plugins/ghsettings/default.nix

This file was deleted.

85 changes: 0 additions & 85 deletions plugins/ghsettings/templates/default.cue

This file was deleted.

31 changes: 0 additions & 31 deletions plugins/just/default.nix

This file was deleted.

Loading

0 comments on commit 1289064

Please sign in to comment.