Skip to content

Commit

Permalink
move ci packages to overlay
Browse files Browse the repository at this point in the history
  • Loading branch information
gvolpe committed Sep 24, 2023
1 parent 7cddf75 commit 0f2a1bc
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 12 deletions.
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ Here is an overview of the directories' structure:
│ ├── overlays.nix
├── notes
├── outputs
│ ├── ci.nix
│ ├── home-conf.nix
│ ├── home-module.nix
│ └── nixos-conf.nix
Expand All @@ -86,7 +85,7 @@ Here is an overview of the directories' structure:
- `imgs`: screenshots and other images.
- `lib`: custom nix library functions and overlays used to instantiate pkgs.
- `notes`: cheat-sheets, docs, etc.
- `outputs`: the CI, Home Manager and NixOS flake outputs.
- `outputs`: the Home Manager and NixOS flake outputs.
- `system`: the NixOS configuration, settings for different laptops and window managers.

## Install
Expand All @@ -95,7 +94,7 @@ You can have a look at the available flake outputs before getting started.

```console
$ nix flake show github:gvolpe/nix-config
github:gvolpe/nix-config/0161ea3bd15e0cd06696f27bd60c588991305b20
github:gvolpe/nix-config/7cddf7540c3e1eff34ee52eddd5416e972902d6b
├───homeConfigurations: unknown
├───nixosConfigurations
│ ├───dell-xps: NixOS configuration
Expand Down
4 changes: 1 addition & 3 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,6 @@
overlays = import ./lib/overlays.nix { inherit inputs system; };
};

ci = import ./outputs/ci.nix { inherit pkgs; };

extraArgs = { hidpi ? false }: {
inherit hidpi;
inherit (inputs) gh-md-toc;
Expand All @@ -89,7 +87,7 @@
import ./outputs/nixos-conf.nix { inherit inputs system pkgs extraArgs; };

packages.${system} = {
inherit (ci) metals metals-updater;
inherit (pkgs) metals metals-updater;
};
};
}
6 changes: 6 additions & 0 deletions lib/overlays.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ let
inherit fish-bobthefish-theme fish-keytool-completions;
};

metalsOverlay = f: p: {
metals = p.callPackage ../home/programs/neovim-ide/metals.nix { };
metals-updater = p.callPackage ../home/programs/neovim-ide/update-metals.nix { };
};

nautilusOverlay = f: p: {
nautilus-gtk3 = nixpkgs-nautilus-gtk3.legacyPackages.${system}.gnome.nautilus;
};
Expand All @@ -31,6 +36,7 @@ in
cowsayOverlay
fishOverlay
libOverlay
metalsOverlay
nautilusOverlay
nurpkgs.overlay
neovim-flake.overlays.${system}.default
Expand Down
6 changes: 0 additions & 6 deletions outputs/ci.nix

This file was deleted.

0 comments on commit 0f2a1bc

Please sign in to comment.