diff options
author | Alan Pearce | 2024-04-11 19:53:07 +0200 |
---|---|---|
committer | Alan Pearce | 2024-04-11 19:53:07 +0200 |
commit | e2241b8c0d1a0e5bd48d27f6ac98b3a54143da4a (patch) | |
tree | 7dc79b67d8bb2de7802c992236b14e8688e736d0 | |
parent | 8141685a940a33873ae6684a3aa07809c515dfc8 (diff) | |
download | website-e2241b8c0d1a0e5bd48d27f6ac98b3a54143da4a.tar.lz website-e2241b8c0d1a0e5bd48d27f6ac98b3a54143da4a.tar.zst website-e2241b8c0d1a0e5bd48d27f6ac98b3a54143da4a.zip |
Simplify flake
-rw-r--r-- | flake.lock | 16 | ||||
-rw-r--r-- | flake.nix | 24 |
2 files changed, 2 insertions, 38 deletions
diff --git a/flake.lock b/flake.lock index 81cdb7b..34ed9ad 100644 --- a/flake.lock +++ b/flake.lock @@ -34,21 +34,6 @@ "type": "github" } }, - "flockenzeit": { - "locked": { - "lastModified": 1671185345, - "narHash": "sha256-+5IWi+iJAYcRxvLN15hKO2hVwNokfN3U+lvWf/zFtCg=", - "owner": "balsoft", - "repo": "Flockenzeit", - "rev": "90abba65671690d95b5d28ce6dd8de7959aa1339", - "type": "github" - }, - "original": { - "owner": "balsoft", - "repo": "Flockenzeit", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1712757991, @@ -69,7 +54,6 @@ "inputs": { "flake-compat": "flake-compat", "flake-utils": "flake-utils", - "flockenzeit": "flockenzeit", "nixpkgs": "nixpkgs" } }, diff --git a/flake.nix b/flake.nix index dec5e4d..67bcc1f 100644 --- a/flake.nix +++ b/flake.nix @@ -1,14 +1,13 @@ { description = "My website, alanpearce.eu"; inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - inputs.flockenzeit.url = "github:balsoft/Flockenzeit"; inputs.flake-utils.url = "github:numtide/flake-utils"; inputs.flake-compat = { url = "github:edolstra/flake-compat"; flake = false; }; - outputs = { self, nixpkgs, flockenzeit, flake-utils, ... }: + outputs = { nixpkgs, flake-utils, ... }: flake-utils.lib.eachDefaultSystem (system: let @@ -23,31 +22,12 @@ ]; in rec { - packages = { - default = pkgs.stdenv.mkDerivation { - name = "alanpearce.eu"; - src = self; - - enableParallelBuilding = true; - makeFlags = [ "PREFIX=$(out)/public" ]; - - inherit nativeBuildInputs; - - dontFixup = true; - }; - docker = import ./docker.nix { - inherit self pkgs flockenzeit; - website = packages.default; - }; - }; devShells = { default = pkgs.mkShell { packages = with pkgs; [ bun flyctl - ] ++ nativeBuildInputs ++ (with pkgs.nodePackages; [ - prettier - ]); + ] ++ nativeBuildInputs; }; }; }); |