Skip to content

Commit 3706a84

Browse files
committed
devenv: use shared tooling and add missing config from treefmt
Signed-off-by: Patrizio Bekerle <patrizio@bekerle.com>
1 parent 3767f9a commit 3706a84

File tree

4 files changed

+73
-102
lines changed

4 files changed

+73
-102
lines changed

devenv.lock

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,23 @@
142142
"nixpkgs-unstable": "nixpkgs-unstable",
143143
"pre-commit-hooks": [
144144
"git-hooks"
145-
]
145+
],
146+
"shared": "shared"
147+
}
148+
},
149+
"shared": {
150+
"flake": false,
151+
"locked": {
152+
"lastModified": 1760386695,
153+
"owner": "pbek",
154+
"repo": "nix-shared",
155+
"rev": "2ec09f9dfa65fd3a2343d0dff8155a3daa6835e4",
156+
"type": "github"
157+
},
158+
"original": {
159+
"owner": "pbek",
160+
"repo": "nix-shared",
161+
"type": "github"
146162
}
147163
}
148164
},

devenv.nix

Lines changed: 50 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ in
3838
just
3939
crowdin-cli
4040
cmake
41+
prettier # for formatting QSS files
4142

4243
# Packages for "just src-build"
4344
botan3
@@ -63,31 +64,56 @@ in
6364
++ unstableQtPkgs;
6465

6566
# https://devenv.sh/git-hooks/
66-
git-hooks.hooks = {
67-
# https://devenv.sh/reference/options/#git-hookshookstreefmt
68-
# https://github.com/numtide/treefmt
69-
# https://github.com/numtide/treefmt-nix
70-
treefmt = {
71-
enable = true;
72-
settings.formatters = with pkgs; [
73-
libclang
74-
nodePackages.prettier
75-
shfmt
76-
nixfmt-rfc-style
77-
statix
78-
taplo
79-
cmake-format
80-
];
81-
};
82-
83-
# https://devenv.sh/reference/options/#git-hookshooksdeadnix
84-
# https://github.com/astro/deadnix
85-
deadnix = {
86-
enable = true;
87-
settings = {
88-
edit = true; # Allow to edit the file if it is not formatted
67+
git-hooks = {
68+
hooks = {
69+
cmake-format.enable = true;
70+
taplo.enable = true;
71+
clang-format = {
72+
enable = true;
73+
files = "\\.(cpp|h)$";
74+
excludes = [
75+
"src/libraries/diff_match_patch/" # Library was broken by clang-format
76+
];
77+
};
78+
prettier-qss = {
79+
enable = true;
80+
name = "prettier-qss";
81+
description = "Format QSS files with prettier";
82+
files = "\\.(qss)$";
83+
entry = "${pkgs.prettier}/bin/prettier --write --parser css";
84+
language = "system";
85+
pass_filenames = true;
8986
};
9087
};
88+
excludes = [
89+
"build/.*"
90+
"build-.*/.*"
91+
"src/build/.*"
92+
"src/build-.*/.*"
93+
"src/cmake-build-debug/.*"
94+
"src/Qt5-Debug/.*"
95+
"bin/.*"
96+
"doc/build/.*"
97+
"stage/.*"
98+
"parts/.*"
99+
"secrets/.*"
100+
"src/libraries/build-.*/.*"
101+
"src/libraries/qkeysequencewidget/.*"
102+
"src/libraries/qttoolbareditor/.*"
103+
"src/libraries/qtcsv/.*"
104+
"src/libraries/md4c/.*"
105+
"src/libraries/qhotkey/.*"
106+
"webpage/src/ar/.*"
107+
"webpage/src/de/.*"
108+
"webpage/src/es/.*"
109+
"webpage/src/fa/.*"
110+
"webpage/src/fr/.*"
111+
"webpage/src/hu/.*"
112+
"webpage/src/it/.*"
113+
"webpage/src/ko/.*"
114+
"webpage/src/nl/.*"
115+
"webpage/src/pl/.*"
116+
];
91117
};
92118

93119
enterShell = ''
@@ -169,7 +195,7 @@ in
169195
# "app:build:qt5153-qmake" = {
170196
# description = "Builds the app with Qt 5.15.3 using qmake";
171197
# exec = ''
172-
# nix-build -E 'let pkgs = import ${inputs.nixpkgs-qt5153} {}; in pkgs.libsForQt5.callPackage (import ./build-systems/nix/default-qt5.nix) { }'
198+
# nix-build -E 'let pkgs = import ${inputs.nixpkgs-qt5153} {}; in pkgs.libsForQt5.callPackage (import ./build-systems/nix/default-qt5.nix) { }' -- $1
173199
# '';
174200
# };
175201
};

devenv.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,9 @@ inputs:
99
url: github:nixos/nixpkgs/85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054
1010
nixpkgs-qt5153:
1111
url: github:nixos/nixpkgs/72bbea9db7d727ed044e60b5f5febc60a3c5c955
12+
shared:
13+
url: github:pbek/nix-shared
14+
flake: false
15+
16+
imports:
17+
- shared/devenv/common.nix

treefmt.toml

Lines changed: 0 additions & 77 deletions
This file was deleted.

0 commit comments

Comments
 (0)