yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request 'move out non-toplevel flake modules from flake.nix' (#96) from Mic92-mic92 into main

Browse Source
This commit is contained in:
clan-bot
2023-08-08 12:04:46 +00:00
parent a21e768142 6d1de943e1
commit 6934b0a056
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
flake.nix
View File

@@ -25,14 +25,9 @@
./devShell.nix ./devShell.nix
./formatter.nix ./formatter.nix
./templates/flake-module.nix ./templates/flake-module.nix
./templates/python-project/flake-module.nix
./pkgs/flake-module.nix ./pkgs/flake-module.nix
./pkgs/clan-cli/flake-module.nix
./pkgs/installer/flake-module.nix
./pkgs/ui/flake-module.nix
./lib/flake-module.nix ./lib/flake-module.nix
({ self, lib, ... }: { ({ self, lib, ... }: {
flake.nixosModules = lib.mapAttrs (_: nix: { imports = [ nix ]; }) (self.lib.findNixFiles ./nixosModules); flake.nixosModules = lib.mapAttrs (_: nix: { imports = [ nix ]; }) (self.lib.findNixFiles ./nixosModules);

6
pkgs/flake-module.nix
View File

@@ -1,4 +1,10 @@
{ ... }: { { ... }: {
imports = [
./clan-cli/flake-module.nix
./installer/flake-module.nix
./ui/flake-module.nix
];
perSystem = { pkgs, config, ... }: { perSystem = { pkgs, config, ... }: {
packages = { packages = {
tea-create-pr = pkgs.callPackage ./tea-create-pr { }; tea-create-pr = pkgs.callPackage ./tea-create-pr { };

5
templates/flake-module.nix
View File

@@ -1,4 +1,7 @@
{ ... }: { {
imports = [
./python-project/flake-module.nix
];
flake.templates = { flake.templates = {
new-clan = { new-clan = {
description = "Initialize a new clan flake"; description = "Initialize a new clan flake";