From 94733181ba32cc27410ecebe07d8e6ee284bc56e Mon Sep 17 00:00:00 2001 From: Nikolaos Karaolidis Date: Tue, 5 Aug 2025 22:48:30 +0200 Subject: [PATCH] Add flake Signed-off-by: Nikolaos Karaolidis --- .envrc | 1 + .gitattributes | 5 +++ .gitignore | 3 ++ Makefile | 10 ++++++ README.md | 2 +- flake.lock | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++ flake.nix | 33 ++++++++++++++++++++ treefmt.nix | 36 ++++++++++++++++++++++ 8 files changed, 171 insertions(+), 1 deletion(-) create mode 100644 .envrc create mode 100644 .gitattributes create mode 100644 Makefile create mode 100644 flake.lock create mode 100755 flake.nix create mode 100755 treefmt.nix diff --git a/.envrc b/.envrc new file mode 100644 index 0000000..3550a30 --- /dev/null +++ b/.envrc @@ -0,0 +1 @@ +use flake diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..31c24ae --- /dev/null +++ b/.gitattributes @@ -0,0 +1,5 @@ +*.jpeg filter=lfs diff=lfs merge=lfs -text +*.jpg filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.gif filter=lfs diff=lfs merge=lfs -text +*.ico filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore index 0299c7e..ca94588 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,6 @@ hugo.linux # Temporary lock file while building /.hugo_build.lock +# Generated CSS/JS files +**/*.min.css +**/*.min.js diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..0f6674b --- /dev/null +++ b/Makefile @@ -0,0 +1,10 @@ +.PHONY: all css js reset-submodules + +all: css js reset-submodules + +css: + +js: + +reset-submodules: + git submodule foreach --recursive 'git reset --hard' diff --git a/README.md b/README.md index c961f66..6bbbd49 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # caldwell -A minimal Hugo theme \ No newline at end of file +A minimal Hugo theme diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..fa660e8 --- /dev/null +++ b/flake.lock @@ -0,0 +1,82 @@ +{ + "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": 1753939845, + "narHash": "sha256-K2ViRJfdVGE8tpJejs8Qpvvejks1+A4GQej/lBk5y7I=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "94def634a20494ee057c76998843c015909d6311", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs", + "treefmt-nix": "treefmt-nix" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1754061284, + "narHash": "sha256-ONcNxdSiPyJ9qavMPJYAXDNBzYobHRxw0WbT38lKbwU=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "58bd4da459f0a39e506847109a2a5cfceb837796", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100755 index 0000000..f5f9848 --- /dev/null +++ b/flake.nix @@ -0,0 +1,33 @@ +{ + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + + flake-utils.url = "github:numtide/flake-utils"; + + treefmt-nix = { + url = "github:numtide/treefmt-nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + }; + + outputs = + inputs: + ( + let + system = "x86_64-linux"; + + pkgs = import inputs.nixpkgs { + inherit system; + config.allowUnfree = true; + }; + + treefmt = inputs.treefmt-nix.lib.evalModule pkgs ./treefmt.nix; + in + { + devShells.${system}.default = pkgs.mkShell { packages = with pkgs; [ hugo ]; }; + + formatter.${system} = treefmt.config.build.wrapper; + checks.formatting.${system} = treefmt.config.build.check inputs.self; + } + ); +} diff --git a/treefmt.nix b/treefmt.nix new file mode 100755 index 0000000..a4ce36e --- /dev/null +++ b/treefmt.nix @@ -0,0 +1,36 @@ +{ pkgs, ... }: +{ + projectRootFile = "flake.nix"; + + programs = { + nixfmt = { + enable = true; + strict = true; + }; + + taplo.enable = true; + + prettier = { + enable = true; + + settings = { + plugins = [ + "${pkgs.prettier-plugin-go-template}/lib/node_modules/prettier-plugin-go-template/lib/index.js" + ]; + + overrides = [ + { + files = [ "*.html" ]; + options.parser = "go-template"; + } + ]; + }; + }; + }; + + settings.global.excludes = [ + ".envrc" + "public/**" + "static/**" + ]; +}