From b4788457f4eab59959cd84c96c75cf5317d1cc90 Mon Sep 17 00:00:00 2001 From: sekun Date: Sun, 31 May 2026 18:28:10 +0200 Subject: [PATCH] chore: Add djlint and other stuff --- .djlintrc | 7 +++++++ flake.lock | 48 +++++++++++++++++++++++----------------------- flake.nix | 8 ++++++-- nix/shells/dev.nix | 18 +++++++++++++---- 4 files changed, 51 insertions(+), 30 deletions(-) create mode 100644 .djlintrc diff --git a/.djlintrc b/.djlintrc new file mode 100644 index 0000000..b61313a --- /dev/null +++ b/.djlintrc @@ -0,0 +1,7 @@ +{ + "profile": "jinja", + "indent": 4, + "max_line_length": 120, + "format_js": false, + "format_css": false +} diff --git a/flake.lock b/flake.lock index f3c47b2..31de1e2 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "advisory-db": { "flake": false, "locked": { - "lastModified": 1757099341, - "narHash": "sha256-pNcLWCi1XNN7OnIRXd53YIzDibe33sEt1tIotJuWYV4=", + "lastModified": 1780080926, + "narHash": "sha256-WMmi1qorE6Rh98iA1KgWsPMEi3vA2V4G4l6/88uEdng=", "owner": "rustsec", "repo": "advisory-db", - "rev": "d6c6489daf1d2216b0bf99f6f6b66e53aa3b31cd", + "rev": "eaf48e749baa3d5e27d304107d8abf175fd756bb", "type": "github" }, "original": { @@ -18,11 +18,11 @@ }, "crane": { "locked": { - "lastModified": 1778106249, - "narHash": "sha256-cM/AuKy5tMhwOOQIbha8ZRRMHVfNf7cv2aljIw+qoCg=", + "lastModified": 1780099841, + "narHash": "sha256-EVZd2RsbpreRUDSi9rBwPY+ZxoyMaiEBbZxxhljbaS4=", "owner": "ipetkov", "repo": "crane", - "rev": "6d015ea29630b7ad2402841386da2cb617a470a7", + "rev": "0532eb17955225173906d671fb36306bdeb1e2dc", "type": "github" }, "original": { @@ -54,11 +54,11 @@ "rust-analyzer-src": [] }, "locked": { - "lastModified": 1778226750, - "narHash": "sha256-YBuQBXEGvF9y2tYihpRYLBC/6Vg7VTtbJMnVtimTal0=", + "lastModified": 1780218205, + "narHash": "sha256-c4MSlBQw5MIDRkad9UNUUnBaOHAHnhuCXrDt90FDVrg=", "owner": "nix-community", "repo": "fenix", - "rev": "44ce6bd38819de82302b99ac8d2eaa4d492b4f21", + "rev": "96e0fc9f1a9b37f6477fa11c3fd48575354773ed", "type": "github" }, "original": { @@ -112,11 +112,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1777988971, - "narHash": "sha256-qIoWPDs+0/8JecyYgE3gpKQxW/4bLW/gp45vow9ioCQ=", + "lastModified": 1778716662, + "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "0678d8986be1661af6bb555f3489f2fdfc31f6ff", + "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", "type": "github" }, "original": { @@ -150,11 +150,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1776796298, - "narHash": "sha256-PcRvlWayisPSjd0UcRQbhG8Oqw78AcPE6x872cPRHN8=", + "lastModified": 1778507602, + "narHash": "sha256-kTwur1wV+01SdqskVMSo6JMEpg71ps3HpbFY2GsflKs=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "3cfd774b0a530725a077e17354fbdb87ea1c4aad", + "rev": "61ab0e80d9c7ab14c256b5b453d8b3fb0189ba0a", "type": "github" }, "original": { @@ -253,11 +253,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1777954456, - "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=", + "lastModified": 1779560665, + "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1", + "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786", "type": "github" }, "original": { @@ -269,11 +269,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1767051569, - "narHash": "sha256-0MnuWoN+n1UYaGBIpqpPs9I9ZHW4kynits4mrnh1Pk4=", + "lastModified": 1761468971, + "narHash": "sha256-vY2OLVg5ZTobdroQKQQSipSIkHlxOTrIF1fsMzPh8w8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "40ee5e1944bebdd128f9fbada44faefddfde29bd", + "rev": "78e34d1667d32d8a0ffc3eba4591ff256e80576e", "type": "github" }, "original": { @@ -285,11 +285,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1778003029, - "narHash": "sha256-q/nkKLDtHIyLjZpKhWk3cSK5IYsFqtMd6UtXF3ddjgA=", + "lastModified": 1779796641, + "narHash": "sha256-ZsIrKmhp4vbBXoXXmR/tBXA/UCsAQiJL9vsgZEduhVY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0c88e1f2bdb93d5999019e99cb0e61e1fe2af4c5", + "rev": "25f538306313eae3927264466c70d7001dcea1df", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 560f0d3..eb83d99 100644 --- a/flake.nix +++ b/flake.nix @@ -61,8 +61,7 @@ perSystem = { config, system, ... }: let - version = "0.0.1-alpha"; - server_port = "3000"; + version = "0.0.2-alpha"; overlays = [ ]; pkgs = import nixpkgs { inherit system overlays; config.allowUnfree = true; }; pkgs-unstable = import nixpkgs-unstable { inherit system overlays; }; @@ -245,6 +244,10 @@ remotehiro-static = import ./nix/packages/remotehiro-static.nix { inherit self pkgs asset-builder version; }; + + some-sass-language-server = import ./nix/packages/some-sass-language-server.nix { + inherit pkgs; + }; }; devShells = { @@ -252,6 +255,7 @@ default = import ./nix/shells/dev.nix { inherit pkgs pkgs-unstable craneLib; inherit (moneyman-flake.packages.${system}) moneyman; + inherit (self.packages.${system}) some-sass-language-server; }; }; }; diff --git a/nix/shells/dev.nix b/nix/shells/dev.nix index 76eb308..735ae0e 100644 --- a/nix/shells/dev.nix +++ b/nix/shells/dev.nix @@ -1,4 +1,4 @@ -{ pkgs, pkgs-unstable, craneLib, moneyman }: craneLib.devShell { +{ pkgs, pkgs-unstable, craneLib, moneyman, some-sass-language-server }: craneLib.devShell { # inputsFrom = [ (mkRemoteHiro "dev") self.packages.${system}.remotehiro-static ]; # checks = self.checks.${system}; @@ -16,6 +16,7 @@ REMOTEHIRO_SERVER_TEMPLATES_PATH = "templates"; REMOTEHIRO_SERVER_STATIC_ASSETS_PATH = "public"; REMOTEHIRO_SERVER_VERSION="dev"; + REMOTEHIRO_SERVER_PORT = "8080"; SQLITE3_LIB_DIR = "${pkgs-unstable.lib.makeLibraryPath [ pkgs-unstable.sqlite ]}"; SQLITE3_INCLUDE_DIR = "${pkgs-unstable.sqlite.dev}/include"; @@ -23,6 +24,8 @@ LIBCLANG_PATH = "${pkgs.llvmPackages.libclang.lib}/lib"; BINDGEN_EXTRA_CLANG_ARGS = "-isystem ${pkgs.llvmPackages.libclang.lib}/lib/clang/19/include"; + RUST_LOG="info"; + packages = with pkgs; [ cargo-audit cargo-watch @@ -48,8 +51,10 @@ just + # LSPs nil - nixpkgs-fmt + some-sass-language-server + pkgs-unstable.sqlite pkgs-unstable.sqlite.dev @@ -60,8 +65,6 @@ sqlfluff - yamlfmt - yamllint taplo graphicsmagick shellcheck @@ -69,5 +72,12 @@ watchexec moneyman + + djlint + prettier + stylelint + nixpkgs-fmt + yamlfmt + yamllint ]; } -- 2.51.2