From 84c5dd7422af32623b68f3b14d981b8dfccd3cbe Mon Sep 17 00:00:00 2001 From: Leyla Becker Date: Thu, 13 Mar 2025 01:34:12 -0500 Subject: [PATCH] organized into folders --- example-module.nix => example/configuration.nix | 0 .../nixos-configuration.nix | 0 flake.nix | 14 +++++--------- base-module.nix => lib/base-module.nix | 0 .../configuration-type.nix | 0 eval-config.nix => lib/eval-config.nix | 0 nixos.nix => lib/nixos-module.nix | 0 7 files changed, 5 insertions(+), 9 deletions(-) rename example-module.nix => example/configuration.nix (100%) rename example-nixos-module.nix => example/nixos-configuration.nix (100%) rename base-module.nix => lib/base-module.nix (100%) rename configuration-type.nix => lib/configuration-type.nix (100%) rename eval-config.nix => lib/eval-config.nix (100%) rename nixos.nix => lib/nixos-module.nix (100%) diff --git a/example-module.nix b/example/configuration.nix similarity index 100% rename from example-module.nix rename to example/configuration.nix diff --git a/example-nixos-module.nix b/example/nixos-configuration.nix similarity index 100% rename from example-nixos-module.nix rename to example/nixos-configuration.nix diff --git a/flake.nix b/flake.nix index 29bc6cd..2b23bf9 100644 --- a/flake.nix +++ b/flake.nix @@ -32,14 +32,10 @@ }); nixosModules.default = self.nixosModules.syncthing; - nixosModules.syncthing = import ./nixos.nix; - - # TODO: figure out if I need modules for these projects - # homeManagerModules.syncthing = null; - # darwinModules.syncthing = null; + nixosModules.syncthing = import ./lib/nixos-module.nix; lib = { - evalConfig = import ./eval-config.nix; + evalConfig = import ./lib/eval-config.nix; syncthingConfiguration = {modules, ...}: self.lib.evalConfig ( {inherit (nixpkgs) lib;} @@ -47,7 +43,7 @@ modules = modules ++ [ - (import ./base-module.nix) + (import ./lib/base-module.nix) ]; } ); @@ -58,14 +54,14 @@ specialArgs = {inherit self;}; modules = [ self.nixosModules.syncthing - ./example-nixos-module.nix + ./example/nixos-configuration.nix ]; }; }; syncthingConfiguration = self.lib.syncthingConfiguration { modules = [ - (import ./example-module.nix) + (import ./example/configuration.nix) ]; }; }; diff --git a/base-module.nix b/lib/base-module.nix similarity index 100% rename from base-module.nix rename to lib/base-module.nix diff --git a/configuration-type.nix b/lib/configuration-type.nix similarity index 100% rename from configuration-type.nix rename to lib/configuration-type.nix diff --git a/eval-config.nix b/lib/eval-config.nix similarity index 100% rename from eval-config.nix rename to lib/eval-config.nix diff --git a/nixos.nix b/lib/nixos-module.nix similarity index 100% rename from nixos.nix rename to lib/nixos-module.nix