Skip to content

Commit 2421ff8

Browse files
t14 to flakes
1 parent b3b2e7f commit 2421ff8

19 files changed

+1667
-507
lines changed

laptops/t/configuration.nix.before

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,9 @@
195195
systemd.services.modem-manager.enable = false;
196196
systemd.services."dbus-org.freedesktop.ModemManager1".enable = false;
197197

198+
# https://discourse.nixos.org/t/unable-to-fix-too-many-open-files-error/27094/6
199+
systemd.extraConfig = "DefaultLimitNOFILE=2048"; # defaults to 1024 if unset
200+
198201
# Enable touchpad support (enabled default in most desktopManager).
199202
services.libinput.enable = true;
200203

laptops/t/flake.lock

Lines changed: 27 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

laptops/t/prometheus.nix

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,32 @@
3333
targets = [ "localhost:19363" ];
3434
}];
3535
}
36+
{
37+
job_name = "hp1";
38+
static_configs = [{
39+
targets = [ "hp1:${toString config.services.prometheus.exporters.node.port}" ];
40+
}];
41+
}
3642
{
3743
job_name = "hp1_clickhouse";
3844
static_configs = [{
3945
#targets = [ "localhost:9363" ];
4046
targets = [ "hp1:19363" ];
4147
}];
4248
}
49+
{
50+
job_name = "hp2";
51+
static_configs = [{
52+
targets = [ "hp2:${toString config.services.prometheus.exporters.node.port}" ];
53+
}];
54+
}
55+
{
56+
job_name = "hp2_clickhouse";
57+
static_configs = [{
58+
#targets = [ "localhost:9363" ];
59+
targets = [ "hp2:19363" ];
60+
}];
61+
}
4362
#{
4463
# job_name = "chromebox1";
4564
# static_configs = [{

laptops/t14/Makefile

Lines changed: 42 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,49 @@
11
#
2-
# nixos/t14/Makefile
2+
# nixos/laptops/t14/Makefile
33
#
4-
all:
5-
sudo cp ../modules/* /etc/nixos/
6-
sudo cp ./configuration.nix /etc/nixos/
7-
sudo cp ./home-manager.nix /etc/nixos/
8-
sudo cp ./prometheus.nix /etc/nixos/
9-
sudo nixos-rebuild switch
4+
EXPECTED_HOSTNAME := t14
5+
6+
ACTUAL_HOSTNAME := $(shell hostname)
7+
8+
all: check_hostname rebuild
9+
10+
check_hostname:
11+
ifeq ($(ACTUAL_HOSTNAME),$(EXPECTED_HOSTNAME))
12+
@echo "Hostnames match: $(ACTUAL_HOSTNAME)"
13+
else
14+
@echo "Error: Hostname does not match. Expected: $(EXPECTED_HOSTNAME), Got: $(ACTUAL_HOSTNAME)"
15+
@exit 1
16+
endif
17+
18+
rebuild:
19+
sudo nixos-rebuild switch --flake .
20+
21+
impure:
22+
sudo nixos-rebuild switch --impure --flake .
23+
24+
rebuild_trace:
25+
sudo nixos-rebuild switch --show-trace --flake .
1026

1127
update:
28+
sudo nix flake update;
29+
30+
rebuild_old:
31+
# sudo cp ./flake.nix /etc/nixos/
32+
# sudo cp ./flake.lock /etc/nixos/
33+
# sudo cp ../../modules/* /etc/nixos/
34+
# sudo cp ./configuration.nix /etc/nixos/
35+
# #sudo cp ./home-manager.nix /etc/nixos/
36+
# sudo cp ./home.nix /etc/nixos/
37+
# sudo cp ./prometheus.nix /etc/nixos/
38+
# sudo cp ./*.nix /etc/nixos/
39+
# sudo nix-channel --update
40+
# sudo nixos-rebuild switch
41+
#sudo cp ./* /etc/nixos/
42+
sudo nix flake update;
43+
#sudo nix-channel --update;
44+
sudo nixos-rebuild switch --flake .
45+
46+
update_oldm.:
1247
sudo nix-channel --update
1348
sudo nixos-rebuild switch
1449
#nix-shell -p vim

0 commit comments

Comments
 (0)