Skip to content

Commit 7f2819f

Browse files
paepckehhpaepckehh
committed
update
1 parent 580d145 commit 7f2819f

8 files changed

+378
-27
lines changed

‎.attic/flake.lock/2025-03-24--07-18.flake.lock

+258
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,258 @@
1+
{
2+
"nodes": {
3+
"disko": {
4+
"inputs": {
5+
"nixpkgs": [
6+
"nixpkgs"
7+
]
8+
},
9+
"locked": {
10+
"lastModified": 1741786315,
11+
"narHash": "sha256-VT65AE2syHVj6v/DGB496bqBnu1PXrrzwlw07/Zpllc=",
12+
"owner": "nix-community",
13+
"repo": "disko",
14+
"rev": "0d8c6ad4a43906d14abd5c60e0ffe7b587b213de",
15+
"type": "github"
16+
},
17+
"original": {
18+
"owner": "nix-community",
19+
"ref": "master",
20+
"repo": "disko",
21+
"type": "github"
22+
}
23+
},
24+
"flake-parts": {
25+
"inputs": {
26+
"nixpkgs-lib": "nixpkgs-lib"
27+
},
28+
"locked": {
29+
"lastModified": 1741352980,
30+
"narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=",
31+
"owner": "hercules-ci",
32+
"repo": "flake-parts",
33+
"rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9",
34+
"type": "github"
35+
},
36+
"original": {
37+
"owner": "hercules-ci",
38+
"repo": "flake-parts",
39+
"type": "github"
40+
}
41+
},
42+
"flake-utils": {
43+
"inputs": {
44+
"systems": "systems"
45+
},
46+
"locked": {
47+
"lastModified": 1731533236,
48+
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
49+
"owner": "numtide",
50+
"repo": "flake-utils",
51+
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
52+
"type": "github"
53+
},
54+
"original": {
55+
"owner": "numtide",
56+
"repo": "flake-utils",
57+
"type": "github"
58+
}
59+
},
60+
"home-manager": {
61+
"inputs": {
62+
"nixpkgs": [
63+
"nixpkgs"
64+
]
65+
},
66+
"locked": {
67+
"lastModified": 1742771635,
68+
"narHash": "sha256-HQHzQPrg+g22tb3/K/4tgJjPzM+/5jbaujCZd8s2Mls=",
69+
"owner": "nix-community",
70+
"repo": "home-manager",
71+
"rev": "ad0614a1ec9cce3b13169e20ceb7e55dfaf2a818",
72+
"type": "github"
73+
},
74+
"original": {
75+
"owner": "nix-community",
76+
"ref": "master",
77+
"repo": "home-manager",
78+
"type": "github"
79+
}
80+
},
81+
"mnw": {
82+
"locked": {
83+
"lastModified": 1742255973,
84+
"narHash": "sha256-XfEGVKatTgEMMOVb4SNp1LYLQOSzzrFTDMVDTZFyMVE=",
85+
"owner": "Gerg-L",
86+
"repo": "mnw",
87+
"rev": "b982dbd5e6d55d4438832b3567c09bc2a129649d",
88+
"type": "github"
89+
},
90+
"original": {
91+
"owner": "Gerg-L",
92+
"repo": "mnw",
93+
"type": "github"
94+
}
95+
},
96+
"nil": {
97+
"inputs": {
98+
"flake-utils": [
99+
"nvf",
100+
"flake-utils"
101+
],
102+
"nixpkgs": [
103+
"nvf",
104+
"nixpkgs"
105+
],
106+
"rust-overlay": "rust-overlay"
107+
},
108+
"locked": {
109+
"lastModified": 1741118843,
110+
"narHash": "sha256-ggXU3RHv6NgWw+vc+HO4/9n0GPufhTIUjVuLci8Za8c=",
111+
"owner": "oxalica",
112+
"repo": "nil",
113+
"rev": "577d160da311cc7f5042038456a0713e9863d09e",
114+
"type": "github"
115+
},
116+
"original": {
117+
"owner": "oxalica",
118+
"repo": "nil",
119+
"type": "github"
120+
}
121+
},
122+
"nixpkgs": {
123+
"locked": {
124+
"lastModified": 1742796693,
125+
"narHash": "sha256-9H7woEOL8MZl/BVc4wFEDxPIdsLJgSTA1965WweTMXQ=",
126+
"owner": "paepckehh",
127+
"repo": "nixpkgs",
128+
"rev": "00a39d3964625e18d1c36995c383f0648f314305",
129+
"type": "github"
130+
},
131+
"original": {
132+
"owner": "paepckehh",
133+
"ref": "blocky-improve",
134+
"repo": "nixpkgs",
135+
"type": "github"
136+
}
137+
},
138+
"nixpkgs-lib": {
139+
"locked": {
140+
"lastModified": 1740877520,
141+
"narHash": "sha256-oiwv/ZK/2FhGxrCkQkB83i7GnWXPPLzoqFHpDD3uYpk=",
142+
"owner": "nix-community",
143+
"repo": "nixpkgs.lib",
144+
"rev": "147dee35aab2193b174e4c0868bd80ead5ce755c",
145+
"type": "github"
146+
},
147+
"original": {
148+
"owner": "nix-community",
149+
"repo": "nixpkgs.lib",
150+
"type": "github"
151+
}
152+
},
153+
"nixpkgs-unstable": {
154+
"locked": {
155+
"lastModified": 1742669843,
156+
"narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=",
157+
"owner": "NixOS",
158+
"repo": "nixpkgs",
159+
"rev": "1e5b653dff12029333a6546c11e108ede13052eb",
160+
"type": "github"
161+
},
162+
"original": {
163+
"owner": "NixOS",
164+
"ref": "nixos-unstable",
165+
"repo": "nixpkgs",
166+
"type": "github"
167+
}
168+
},
169+
"nvf": {
170+
"inputs": {
171+
"flake-parts": "flake-parts",
172+
"flake-utils": "flake-utils",
173+
"mnw": "mnw",
174+
"nil": "nil",
175+
"nixpkgs": [
176+
"nixpkgs"
177+
],
178+
"systems": "systems_2"
179+
},
180+
"locked": {
181+
"lastModified": 1742795025,
182+
"narHash": "sha256-TJUQD4k9MP+Hj1DsZigXwx88epvclg01X1VqcRdtPnI=",
183+
"owner": "notashelf",
184+
"repo": "nvf",
185+
"rev": "ac59df1bc91b6e1f7f5c7847de73b2e4a8731557",
186+
"type": "github"
187+
},
188+
"original": {
189+
"owner": "notashelf",
190+
"repo": "nvf",
191+
"type": "github"
192+
}
193+
},
194+
"root": {
195+
"inputs": {
196+
"disko": "disko",
197+
"home-manager": "home-manager",
198+
"nixpkgs": "nixpkgs",
199+
"nixpkgs-unstable": "nixpkgs-unstable",
200+
"nvf": "nvf"
201+
}
202+
},
203+
"rust-overlay": {
204+
"inputs": {
205+
"nixpkgs": [
206+
"nvf",
207+
"nil",
208+
"nixpkgs"
209+
]
210+
},
211+
"locked": {
212+
"lastModified": 1741055476,
213+
"narHash": "sha256-52vwEV0oS2lCnx3c/alOFGglujZTLmObit7K8VblnS8=",
214+
"owner": "oxalica",
215+
"repo": "rust-overlay",
216+
"rev": "aefb7017d710f150970299685e8d8b549d653649",
217+
"type": "github"
218+
},
219+
"original": {
220+
"owner": "oxalica",
221+
"repo": "rust-overlay",
222+
"type": "github"
223+
}
224+
},
225+
"systems": {
226+
"locked": {
227+
"lastModified": 1681028828,
228+
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
229+
"owner": "nix-systems",
230+
"repo": "default",
231+
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
232+
"type": "github"
233+
},
234+
"original": {
235+
"owner": "nix-systems",
236+
"repo": "default",
237+
"type": "github"
238+
}
239+
},
240+
"systems_2": {
241+
"locked": {
242+
"lastModified": 1681028828,
243+
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
244+
"owner": "nix-systems",
245+
"repo": "default",
246+
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
247+
"type": "github"
248+
},
249+
"original": {
250+
"owner": "nix-systems",
251+
"repo": "default",
252+
"type": "github"
253+
}
254+
}
255+
},
256+
"root": "root",
257+
"version": 7
258+
}

‎flake.lock

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎flake.nix

+6-1
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,13 @@
8484
nvf.nixosModules.default
8585
disko.nixosModules.disko
8686
home-manager.nixosModules.home-manager
87-
./role/client-desktop.nix
87+
./alias/nixops.nix
88+
./configuration.nix
8889
./modules/disko-luks.nix
90+
./desktop/gnome.nix
91+
./server/unbound.nix
92+
./server/blocky.nix
93+
./server/chronyPublic.nix
8994
./person/desktop/mpaepcke.nix
9095
./packages/neovim-nvf.nix
9196
./packages/unstable-base.nix

‎server/blocky-add-local-prometheus.nix

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
{config, ...}: {
2+
# prometheus default web interface http://localhost:9090
3+
# grafana default web interface http://localhost:3000
4+
# grafana dashboards https://github.com/0xERR0R/blocky/tree/main/docs
25
##################
36
#-=# SERVICES #=-#
47
##################
@@ -14,21 +17,19 @@
1417
};
1518
};
1619
prometheus = {
17-
# defaults to http://localhost:9090
1820
enable = true;
1921
scrapeConfigs = [
2022
{
2123
job_name = "blocky";
2224
static_configs = [
2325
{
24-
targets = ["127.0.0.1:4000"];
26+
targets = ["${config.services.blocky.settings.ports.http}"];
2527
}
2628
];
2729
}
2830
];
2931
};
3032
grafana = {
31-
# defaults to http://localhost:3000
3233
enable = true;
3334
provision = {
3435
enable = true;

‎server/blocky.nix

+7-19
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
{
2-
pkgs,
3-
lib,
4-
...
5-
}: {
1+
{pkgs, ...}: {
62
#################
73
#-=# IMPORTS #=-#
84
#################
@@ -15,14 +11,6 @@
1511
####################
1612
networking.nameservers = ["127.0.0.1"];
1713

18-
################
19-
#-=# SYSTEM #=-#
20-
################
21-
system.activationScripts.makeBlockyDir = lib.stringAfter ["var"] ''
22-
mkdir -p /var/lib/blocky
23-
chown -R blocky /var/lib/blocky
24-
'';
25-
2614
##################
2715
#-=# SERVICES #=-#
2816
##################
@@ -99,12 +87,12 @@
9987
prefetchMaxItemsCount = 0; # unlimited
10088
};
10189
queryLog = {
102-
# type = "csv";
103-
# target = "/var/lib/blocky";
104-
# logRetentionDays = 180;
105-
# creationAttempts = 25;
106-
# creationCooldown = "5s";
107-
# flushInterval = "60s";
90+
type = "csv";
91+
target = "/var/lib/blocky";
92+
logRetentionDays = 180;
93+
creationAttempts = 25;
94+
creationCooldown = "5s";
95+
flushInterval = "60s";
10896
};
10997
};
11098
};

0 commit comments

Comments
 (0)