From f97f1eb48f7f93060c5953c5c2d4c1369f08baff Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 19 May 2023 23:39:53 +1000
Subject: [PATCH] dev/shell: flatten
---
dev/shell.nix | 23 +++++++++++------------
flake.nix | 2 +-
2 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/dev/shell.nix b/dev/shell.nix
index 92eecc6..2efa02b 100644
--- a/dev/shell.nix
+++ b/dev/shell.nix
@@ -1,16 +1,15 @@
+{ pkgs, ... }:
{
- perSystem = { pkgs, ... }: {
- devShells = {
- default = with pkgs; mkShellNoCC {
- packages = [
- jq
- python3.pkgs.deploykit
- python3.pkgs.invoke
- rsync
- sops
- ssh-to-age
- ];
- };
+ devShells = {
+ default = with pkgs; mkShellNoCC {
+ packages = [
+ jq
+ python3.pkgs.deploykit
+ python3.pkgs.invoke
+ rsync
+ sops
+ ssh-to-age
+ ];
};
};
}
diff --git a/flake.nix b/flake.nix
index f092a30..b665009 100644
--- a/flake.nix
+++ b/flake.nix
@@ -70,12 +70,12 @@
inputs.hercules-ci-effects.flakeModule
inputs.treefmt-nix.flakeModule
./effect.nix
- ./dev/shell.nix
];
hercules-ci.github-pages.branch = "master";
perSystem = { config, pkgs, ... }: {
+ imports = [ ./dev/shell.nix ];
treefmt.imports = [ ./dev/treefmt.nix ];
packages.pages = pkgs.runCommand "pages"