From 98728ae9065b1ab75801067552530b68aaaca840 Mon Sep 17 00:00:00 2001 From: tdback Date: Thu, 16 Jan 2025 20:17:00 -0500 Subject: fix: remove flake-utils input --- flake.lock | 34 ---------------------------------- flake.nix | 60 +++++++++++++++++++++++++++++++++--------------------------- 2 files changed, 33 insertions(+), 61 deletions(-) diff --git a/flake.lock b/flake.lock index f3d280c..baa656b 100644 --- a/flake.lock +++ b/flake.lock @@ -1,23 +1,5 @@ { "nodes": { - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1733940404, @@ -36,24 +18,8 @@ }, "root": { "inputs": { - "flake-utils": "flake-utils", "nixpkgs": "nixpkgs" } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 570f9cc..d27f1de 100644 --- a/flake.nix +++ b/flake.nix @@ -1,33 +1,39 @@ { - inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - flake-utils.url = "github:numtide/flake-utils"; - }; + inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - outputs = { ... }@inputs: - inputs.flake-utils.lib.eachDefaultSystem (system: - let - pkgs = import inputs.nixpkgs { inherit system; }; - in - { - devShells.default = pkgs.mkShell { - buildInputs = with pkgs; [ - hugo - ]; + outputs = + { nixpkgs, ... }: + let + supportedSystems = [ "x86_64-linux" ]; + eachSystem = nixpkgs.lib.genAttrs supportedSystems; + in + { + devShells = eachSystem ( + system: + let + pkgs = import nixpkgs { inherit system; }; + in + { + default = pkgs.mkShell { + buildInputs = with pkgs; [ + hugo + ]; - shellHook = '' - SITE="$HOME/projects/tdback.net" + shellHook = '' + SITE="$HOME/projects/tdback.net" - new-post() { - hugo new "posts/$1/index.md" - $EDITOR "$SITE/content/posts/$1/index.md" - } + new-post() { + hugo new "posts/$1/index.md" + $EDITOR "$SITE/content/posts/$1/index.md" + } - del-post() { - POST="$SITE/content/posts/$1" - [ -d $POST ] && rm -r $POST - } - ''; - }; - }); + del-post() { + POST="$SITE/content/posts/$1" + [ -d $POST ] && rm -r $POST + } + ''; + }; + } + ); + }; } -- cgit v1.2.3