devenv: use shared config

Signed-off-by: Patrizio Bekerle <[email protected]>

Author: pbek

.envrc

@@ -1,7 +1,12 @@
+#!/usr/bin/env bash
+
 export DIRENV_WARN_TIMEOUT=20s
 
 eval "$(devenv direnvrc)"
 
-# The use_devenv function supports passing flags to the devenv command
-# For example: use devenv --impure --option services.postgres.enable:bool true
+# `use devenv` supports the same options as the `devenv shell` command.
+#
+# To silence all output, use `--quiet`.
+#
+# Example usage: use devenv --quiet --impure --option services.postgres.enable:bool true
 use devenv

.gitignore

@@ -2,6 +2,7 @@
 *.qmlc
 *.jsc
 .idea
+.shared
 
 # Devenv
 .devenv*

devenv.lock

@@ -3,10 +3,10 @@
     "devenv": {
       "locked": {
         "dir": "src/modules",
-        "lastModified": 1749054588,
+        "lastModified": 1767111144,
         "owner": "cachix",
         "repo": "devenv",
-        "rev": "b6be42d9e6f6053be1d180e4a4fb95e0aa9a8424",
+        "rev": "4dece0eb98c5ad9e1bda60711228228a023e1652",
         "type": "github"
       },
       "original": {
@@ -19,10 +19,10 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1747046372,
+        "lastModified": 1767039857,
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
+        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
         "type": "github"
       },
       "original": {
@@ -40,10 +40,10 @@
         ]
       },
       "locked": {
-        "lastModified": 1747372754,
+        "lastModified": 1765911976,
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46",
+        "rev": "b68b780b69702a090c8bb1b973bab13756cc7a27",
         "type": "github"
       },
       "original": {
@@ -60,10 +60,10 @@
         ]
       },
       "locked": {
-        "lastModified": 1709087332,
+        "lastModified": 1762808025,
         "owner": "hercules-ci",
         "repo": "gitignore.nix",
-        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+        "rev": "cb5e3fdca1de58ccbc3ef53de65bd372b48f567c",
         "type": "github"
       },
       "original": {
@@ -74,10 +74,10 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1746807397,
+        "lastModified": 1767052823,
         "owner": "cachix",
         "repo": "devenv-nixpkgs",
-        "rev": "c5208b594838ea8e6cca5997fbf784b7cca1ca90",
+        "rev": "538a5124359f0b3d466e1160378c87887e3b51a4",
         "type": "github"
       },
       "original": {
@@ -94,7 +94,23 @@
         "nixpkgs": "nixpkgs",
         "pre-commit-hooks": [
           "git-hooks"
-        ]
+        ],
+        "shared": "shared"
+      }
+    },
+    "shared": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1766581418,
+        "owner": "pbek",
+        "repo": "nix-shared",
+        "rev": "c6815e7f9959b7f4a0801697875775db75ae3bf3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "pbek",
+        "repo": "nix-shared",
+        "type": "github"
       }
     }
   },

devenv.nix

@@ -4,22 +4,19 @@
 }:
 
 {
-  # https://devenv.sh/packages/
-  packages = with pkgs; [
-    just
-    php
-
-    # Packages for treefmt
-    nodePackages.prettier
-    shfmt
-    nixfmt-rfc-style
-    statix
-    taplo
-    kdePackages.qtdeclarative
-  ];
-
   # https://devenv.sh/git-hooks/
-  git-hooks.hooks.treefmt.enable = true;
+  git-hooks.hooks = {
+    # Custom pre-commit hook to format justfile
+    qmlformat = {
+      enable = true;
+      name = "qmlformat";
+      entry = "${pkgs.qt6.qtdeclarative}/bin/qmlformat -i";
+      language = "system";
+      pass_filenames = true;
+      stages = [ "pre-commit" ];
+      files = "\\.qml$";
+    };
+  };
 
   enterShell = ''
     echo "🛠️ QOwnNotes scripts dev shell"

devenv.yaml

@@ -3,3 +3,10 @@ inputs:
   nixpkgs:
     url: github:cachix/devenv-nixpkgs/rolling
     # url: github:NixOS/nixpkgs/nixos-unstable
+  shared:
+    url: github:pbek/nix-shared
+    flake: false
+
+imports:
+  - shared/common
+  - shared/php

justfile

@@ -1,6 +1,8 @@
 # Use `just <recipe>` to run a recipe
 # https://just.systems/man/en/
 
+import ".shared/common.just"
+
 # By default, run the `--list` command
 default:
     @just --list
@@ -9,10 +11,6 @@ default:
 
 transferDir := `if [ -d "$HOME/NextcloudPrivate/Transfer" ]; then echo "$HOME/NextcloudPrivate/Transfer"; else echo "$HOME/Nextcloud/Transfer"; fi`
 
-# Aliases
-
-alias fmt := format
-
 # Apply the patch to the qownnotes-scripts repository
 [group('patch')]
 git-apply-patch:
@@ -29,15 +27,3 @@ git-apply-patch:
 [group('test')]
 @test:
     php ./.github/workflows/scripts/run-tests.php
-
-# Add git commit hashes to the .git-blame-ignore-revs file
-[group('linter')]
-add-git-blame-ignore-revs:
-    git log --pretty=format:"%H" --grep="^lint" >> .git-blame-ignore-revs
-    sort .git-blame-ignore-revs | uniq > .git-blame-ignore-revs.tmp
-    mv .git-blame-ignore-revs.tmp .git-blame-ignore-revs
-
-# Format all files
-[group('linter')]
-format args='':
-    treefmt {{ args }}