Skip to content

Commit 960ebf8

Browse files
committed
jsonfmt -> oxfmt
1 parent 49ff533 commit 960ebf8

File tree

10 files changed

+52
-65
lines changed

10 files changed

+52
-65
lines changed

.cirrus.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,3 @@ build_linux_task:
5353
echo "experimental-features = nix-command flakes" | tee -a /etc/nix/nix.conf
5454
echo "$NIX_INSTALLER_EXTRA_CONF" | tee -a /etc/nix/nix.conf
5555
<<: *BUILD_TEMPLATE
56-

.github/dependabot.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
version: 2
22
updates:
33
- package-ecosystem: github-actions
4-
directory: '/'
4+
directory: "/"
55
schedule:
66
interval: daily
7-
time: '10:00'
7+
time: "10:00"
88
open-pull-requests-limit: 10

.github/workflows/update.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Auto Update Flake Inputs
33
on:
44
schedule:
55
# run this daily at 8am UTC, or roughly 4am eastern
6-
- cron: '0 8 * * *'
6+
- cron: "0 8 * * *"
77
# Allows you to run this workflow manually from the Actions tab
88
workflow_dispatch:
99

.mise.toml

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

flake.nix

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -293,30 +293,28 @@
293293
no-lambda-pattern-names = true;
294294
};
295295
nixfmt.enable = true;
296-
jsonfmt.enable = true;
297-
mdformat.enable = true;
298-
stylua.enable = true;
296+
oxfmt.enable = true;
299297
ruff-check.enable = true;
300298
ruff-format.enable = true;
301299
shellcheck.enable = true;
302300
shfmt.enable = true;
301+
stylua.enable = true;
303302
};
304303

305304
settings.excludes = [
306305
".envrc"
307306
".env"
307+
".vscode/*.json"
308+
"**/Spoons/**/*.json"
309+
".zed/*.json"
310+
"**/zed/*.json"
308311
];
309312
settings.on-unmatched = "info";
310313
settings.formatter.ruff-check.options = [
311314
# sort imports
312315
"--extend-select"
313316
"I"
314317
];
315-
settings.formatter.jsonfmt.excludes = [
316-
".vscode/*.json"
317-
"**/Spoons/**/*.json"
318-
".zed/*.json"
319-
];
320318
};
321319
pre-commit = {
322320
settings.package = pkgs.prek;

garnix.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
builds:
22
exclude: []
33
include:
4-
- '*.x86_64-linux.*'
4+
- "*.x86_64-linux.*"
55
- packages.*.default
66
- devShells.*.default
77
- homeConfigurations.*

modules/home-manager/default.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,8 @@
142142
trivy
143143
usage
144144
uv
145+
worktrunk
146+
wrangler
145147
yadm
146148
yq-go
147149
zoxide

modules/home-manager/dotfiles/aerospace/aerospace.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ default-root-container-orientation = 'auto'
4242
# Monitor pattern is the same as for 'workspace-to-monitor-force-assignment'.
4343
# See: https://nikitabobko.github.io/AeroSpace/guide.html#assign-workspaces-to-monitors
4444
gaps.inner.horizontal = 4
45-
gaps.inner.vertical = 4
46-
gaps.outer.left = 4
47-
gaps.outer.bottom = 4
48-
gaps.outer.top = 4
49-
gaps.outer.right = 4
45+
gaps.inner.vertical = 4
46+
gaps.outer.left = 4
47+
gaps.outer.bottom = 4
48+
gaps.outer.top = 4
49+
gaps.outer.right = 4
5050

5151
# 'main' binding mode declaration
5252
# See: https://nikitabobko.github.io/AeroSpace/guide.html#binding-modes

pkgs/sysdo/pyproject.toml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@ name = "sysdo"
33
version = "0.1.0"
44
description = "A system configuration management CLI tool for NixOS, nix-darwin, and home-manager"
55
requires-python = ">=3.11,<3.14"
6-
dependencies = [
7-
"colorama>=0.4.6",
8-
"shellingham>=1.5.4",
9-
"typer>=0.19.0",
10-
]
6+
dependencies = ["colorama>=0.4.6", "shellingham>=1.5.4", "typer>=0.19.0"]
117

128
[project.scripts]
139
sysdo = "sysdo.main:app"
@@ -20,7 +16,4 @@ build-backend = "hatchling.build"
2016
packages = ["src/sysdo"]
2117

2218
[dependency-groups]
23-
dev = [
24-
"ruff>=0.14.10",
25-
"ty>=0.0.9",
26-
]
19+
dev = ["ruff>=0.14.10", "ty>=0.0.9"]

secrets/gateway.yaml

Lines changed: 33 additions & 33 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)