diff options
| author | quentin@aristote.fr <quentin@aristote.fr> | 2023-09-17 17:28:19 +0200 |
|---|---|---|
| committer | quentin@aristote.fr <quentin@aristote.fr> | 2023-09-17 17:28:19 +0200 |
| commit | 11a054251e539475bb237a9b548b744e6627b255 (patch) | |
| tree | 7e51a9bf0ab3a2a82199e498d95a10b9fd2fbf87 | |
| parent | ee90b5afeb61f14eec0ec46938a91dd86fb9f184 (diff) | |
fix templates
| -rw-r--r-- | flake.lock | 18 | ||||
| -rw-r--r-- | flake.nix | 13 | ||||
| -rw-r--r-- | templates/devenv/flake-parts/flake.nix | 2 |
3 files changed, 13 insertions, 20 deletions
@@ -136,11 +136,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1694760568, - "narHash": "sha256-3G07BiXrp2YQKxdcdms22MUx6spc6A++MSePtatCYuI=", + "lastModified": 1694948089, + "narHash": "sha256-d2B282GmQ9o8klc22/Rbbbj6r99EnELQpOQjWMyv0rU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "46688f8eb5cd6f1298d873d4d2b9cf245e09e88e", + "rev": "5148520bfab61f99fd25fb9ff7bfbb50dad3c9db", "type": "github" }, "original": { @@ -202,11 +202,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1694760568, - "narHash": "sha256-3G07BiXrp2YQKxdcdms22MUx6spc6A++MSePtatCYuI=", + "lastModified": 1694948089, + "narHash": "sha256-d2B282GmQ9o8klc22/Rbbbj6r99EnELQpOQjWMyv0rU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "46688f8eb5cd6f1298d873d4d2b9cf245e09e88e", + "rev": "5148520bfab61f99fd25fb9ff7bfbb50dad3c9db", "type": "github" }, "original": { @@ -216,11 +216,11 @@ }, "nur": { "locked": { - "lastModified": 1694866994, - "narHash": "sha256-uo50mKCooOkNvJRBl/O4AOKa2QztMvda0aFppp2QrBE=", + "lastModified": 1694954496, + "narHash": "sha256-l9xsmZxZ0ISgbH6RRZdNbFfi3hKDdA8rHdSn2zJElJ0=", "owner": "nix-community", "repo": "NUR", - "rev": "5f8282ce5ce11225ae6cd5fff355685fef0c132e", + "rev": "926dfdc88dd64c4ec4ed1ba1c29bc198e9713bbb", "type": "github" }, "original": { @@ -45,18 +45,11 @@ lib = import ./lib; templates = let - welcomeText = '' - # `.devenv` should be added to `.gitignore` - ```sh - echo .devenv >> .gitignore - ``` - ''; - mkDevenvTemplate = path: {inherit welcomeText path;}; - devenv = mkDevenvTemplate ./templates/devenv/simple; - devenvModular = mkDevenvTemplate ./templates/devenv/flake-parts; + devenv = {path = ./templates/devenv/simple;}; in { - inherit devenv devenvModular; + inherit devenv; default = devenv; + devenvModular = {path = ./templates/devenv/flake-parts;}; }; }; diff --git a/templates/devenv/flake-parts/flake.nix b/templates/devenv/flake-parts/flake.nix index deca3e5..031a8d6 100644 --- a/templates/devenv/flake-parts/flake.nix +++ b/templates/devenv/flake-parts/flake.nix @@ -16,7 +16,7 @@ ... } @ inputs: flake-parts.lib.mkFlake {inherit inputs;} { - imports = with my-nixpkgs.flakeModules; [personal devenv]; + imports = builtins.attrValues {inherit (my-nixpkgs.flakeModules) personal devenv;}; perSystem = {...}: { devenv.shells.default = { ######################## PUT YOUR CONFIG HERE ######################## |