From 3c1b9bc7a9790ef9982c44961fdff46115fa7141 Mon Sep 17 00:00:00 2001 From: Andre Date: Fri, 3 May 2024 22:36:50 -0400 Subject: [PATCH] WIP: Auto-load modules --- flake.lock | 44 ++++++++++++++++--- flake.nix | 11 ++++- modules/services/duplicacy-web.nix | 2 +- .../packages => packages}/duplicacy-web.nix | 0 4 files changed, 49 insertions(+), 8 deletions(-) rename {modules/packages => packages}/duplicacy-web.nix (100%) diff --git a/flake.lock b/flake.lock index 976c7ba..d3b7414 100644 --- a/flake.lock +++ b/flake.lock @@ -174,16 +174,15 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1714465198, - "narHash": "sha256-ySkEJvS0gPz2UhXm0H3P181T8fUxvDVcoUyGn0Kc5AI=", + "lastModified": 1714746424, + "narHash": "sha256-Jdyw7VcM+jQ0uSXgjFj8UdXZ229yOvPNlYkKyKyHA4s=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "68d680c1b7c0e67a9b2144d6776583ee83664ef4", + "rev": "3f017311191fe6d501ca2496a835d012f656ee9c", "type": "github" }, "original": { "owner": "NixOS", - "ref": "master", "repo": "nixos-hardware", "type": "github" } @@ -236,6 +235,40 @@ "type": "github" } }, + "nixpkgs_3": { + "locked": { + "lastModified": 1714404219, + "narHash": "sha256-1YdyaIv7WM3snp3E5Ib4Fsr4Z6/IbR5aKqVo3VXkfEA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "aa30bcc07ba66e96bb6467e4a42f7845f11b6942", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "master", + "repo": "nixpkgs", + "type": "github" + } + }, + "nypkgs": { + "inputs": { + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1714404288, + "narHash": "sha256-CTGtSlkTtETcDbt61jtXqIIy89Fzf/+8aEClPO/bcAg=", + "owner": "yunfachi", + "repo": "nypkgs", + "rev": "27648b0d368a565ff415fcd240056b41a97c0e7b", + "type": "github" + }, + "original": { + "owner": "yunfachi", + "repo": "nypkgs", + "type": "github" + } + }, "pre-commit-hooks-nix": { "inputs": { "flake-compat": [ @@ -273,7 +306,8 @@ "lanzaboote": "lanzaboote", "nix-flatpak": "nix-flatpak", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_2", + "nypkgs": "nypkgs" } }, "rust-overlay": { diff --git a/flake.nix b/flake.nix index 72cd082..5f26ed8 100644 --- a/flake.nix +++ b/flake.nix @@ -14,7 +14,10 @@ nix-flatpak.url = "github:gmodena/nix-flatpak/v0.4.1"; # Hardware configurations - nixos-hardware.url = "github:NixOS/nixos-hardware/master"; + nixos-hardware.url = "github:NixOS/nixos-hardware"; + + # Auto-import modules + nypkgs.url = "github:yunfachi/nypkgs"; # Home-manager home-manager = { @@ -25,7 +28,7 @@ # TODO: Add Disko - https://github.com/nix-community/disko }; - outputs = inputs@{ self, nixpkgs, lanzaboote, nix-flatpak, home-manager, nixos-hardware, ... }: + outputs = inputs@{ self, nixpkgs, lanzaboote, nix-flatpak, home-manager, nixos-hardware, nypkgs,... }: let forAllSystems = function: nixpkgs.lib.genAttrs [ @@ -53,6 +56,10 @@ backupFileExtension = "home-manager-backup"; }; } + nypkgs.ylib.umport { + paths = [ ../modules ]; + recursive = true; + } ]; }; in { diff --git a/modules/services/duplicacy-web.nix b/modules/services/duplicacy-web.nix index 9241e40..57224b5 100644 --- a/modules/services/duplicacy-web.nix +++ b/modules/services/duplicacy-web.nix @@ -2,7 +2,7 @@ let cfg = config.host.services.duplicacy-web; - duplicacy-web = pkgs.callPackage ../packages/duplicacy-web.nix { inherit pkgs lib; }; + duplicacy-web = pkgs.callPackage ../../packages/duplicacy-web.nix { inherit pkgs lib; }; in with lib; rec { diff --git a/modules/packages/duplicacy-web.nix b/packages/duplicacy-web.nix similarity index 100% rename from modules/packages/duplicacy-web.nix rename to packages/duplicacy-web.nix