From 78c7db4bd34e65bac03e9dcbe6973b650bcb2f3c Mon Sep 17 00:00:00 2001
From: ctsk <9384305+ctsk@users.noreply.github.com>
Date: Tue, 22 Oct 2024 18:57:41 +0200
Subject: [PATCH] [fugitive] system update
---
flake.lock | 54 ++++++++++++-------
flake.nix | 11 ++++
lib/modules/gitea/templates/base/head.tmpl | 51 +++---------------
.../gitea/templates/explore/navbar.tmpl | 35 ++++++------
lib/modules/headscale/default.nix | 3 +-
lib/modules/observatory/default.nix | 48 ++++++++++-------
6 files changed, 102 insertions(+), 100 deletions(-)
diff --git a/flake.lock b/flake.lock
index a3b25cf..47b8863 100644
--- a/flake.lock
+++ b/flake.lock
@@ -4,14 +4,15 @@
"inputs": {
"darwin": "darwin",
"home-manager": "home-manager",
- "nixpkgs": "nixpkgs"
+ "nixpkgs": "nixpkgs",
+ "systems": "systems"
},
"locked": {
- "lastModified": 1695384796,
- "narHash": "sha256-TYlE4B0ktPtlJJF9IFxTWrEeq+XKG8Ny0gc2FGEAdj0=",
+ "lastModified": 1723293904,
+ "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=",
"owner": "ryantm",
"repo": "agenix",
- "rev": "1f677b3e161d3bdbfd08a939e8f25de2568e0ef4",
+ "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41",
"type": "github"
},
"original": {
@@ -28,11 +29,11 @@
]
},
"locked": {
- "lastModified": 1673295039,
- "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=",
+ "lastModified": 1700795494,
+ "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=",
"owner": "lnl7",
"repo": "nix-darwin",
- "rev": "87b9d090ad39b25b2400029c64825fc2a8868943",
+ "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d",
"type": "github"
},
"original": {
@@ -50,11 +51,11 @@
]
},
"locked": {
- "lastModified": 1682203081,
- "narHash": "sha256-kRL4ejWDhi0zph/FpebFYhzqlOBrk0Pl3dzGEKSAlEw=",
+ "lastModified": 1703113217,
+ "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "32d3e39c491e2f91152c84f8ad8b003420eab0a1",
+ "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1",
"type": "github"
},
"original": {
@@ -65,11 +66,11 @@
},
"impermanence": {
"locked": {
- "lastModified": 1690797372,
- "narHash": "sha256-GImz19e33SeVcIvBB7NnhbJSbTpFFmNtWLh7Z85Y188=",
+ "lastModified": 1729068498,
+ "narHash": "sha256-C2sGRJl1EmBq0nO98TNd4cbUy20ABSgnHWXLIJQWRFA=",
"owner": "nix-community",
"repo": "impermanence",
- "rev": "e3a7acd113903269a1b5c8b527e84ce7ee859851",
+ "rev": "e337457502571b23e449bf42153d7faa10c0a562",
"type": "github"
},
"original": {
@@ -80,11 +81,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1677676435,
- "narHash": "sha256-6FxdcmQr5JeZqsQvfinIMr0XcTyTuR7EXX0H3ANShpQ=",
+ "lastModified": 1703013332,
+ "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "a08d6979dd7c82c4cef0dcc6ac45ab16051c1169",
+ "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6",
"type": "github"
},
"original": {
@@ -96,11 +97,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1695830400,
- "narHash": "sha256-gToZXQVr0G/1WriO83olnqrLSHF2Jb8BPcmCt497ro0=",
+ "lastModified": 1729413321,
+ "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "8a86b98f0ba1c405358f1b71ff8b5e1d317f5db2",
+ "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26",
"type": "github"
},
"original": {
@@ -115,6 +116,21 @@
"impermanence": "impermanence",
"nixpkgs": "nixpkgs_2"
}
+ },
+ "systems": {
+ "locked": {
+ "lastModified": 1681028828,
+ "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+ "owner": "nix-systems",
+ "repo": "default",
+ "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-systems",
+ "repo": "default",
+ "type": "github"
+ }
}
},
"root": "root",
diff --git a/flake.nix b/flake.nix
index 390d5de..4c63e89 100644
--- a/flake.nix
+++ b/flake.nix
@@ -46,6 +46,17 @@
./lib/systems/outpost
];
};
+
+ monument = nixpkgs.lib.nixosSystem {
+ system = "aarch64-linux";
+ modules = [
+ {
+ system.image.version = "1";
+ }
+ ./lib/modules/raspberry.nix
+ ./lib/systems/monument
+ ];
+ };
};
packages = forAllSystems (system:
diff --git a/lib/modules/gitea/templates/base/head.tmpl b/lib/modules/gitea/templates/base/head.tmpl
index 89e658c..8212201 100644
--- a/lib/modules/gitea/templates/base/head.tmpl
+++ b/lib/modules/gitea/templates/base/head.tmpl
@@ -1,8 +1,8 @@
-
+
- {{if .Title}}{{.Title | RenderEmojiPlain}} - {{end}}{{if .Repository.Name}}{{.Repository.Name}} - {{end}}{{AppName}}
+ {{if .Title}}{{.Title}} - {{end}}{{if .Repository.Name}}{{.Repository.Name}} - {{end}}{{AppName}}
{{if .ManifestData}}{{end}}
@@ -25,57 +25,18 @@
.ui.secondary.menu .dropdown.item > .menu { margin-top: 0; }
-{{if .PageIsUserProfile}}
-
-
-
-
- {{if .ContextUser.Description}}
-
- {{end}}
-{{else if .Repository}}
- {{if .Issue}}
-
-
- {{if .Issue.Content}}
-
- {{end}}
- {{else}}
-
-
- {{if .Repository.Description}}
-
- {{end}}
- {{end}}
-
- {{if (.Repository.AvatarLink $.Context)}}
-
- {{else}}
-
- {{end}}
-{{else}}
-
-
-
-
-
-{{end}}
-
+ {{template "base/head_opengraph" .}}
{{template "base/head_style" .}}
{{template "custom/header" .}}
-
+
{{template "custom/body_outer_pre" .}}
-
+
{{template "custom/body_inner_pre" .}}
-
- {{if and (not .PageIsInstall) .IsSigned}}
- {{template "base/head_navbar" .}}
- {{end}}
-
+
{{if false}}
{{/* to make html structure "likely" complete to prevent IDE warnings */}}
diff --git a/lib/modules/gitea/templates/explore/navbar.tmpl b/lib/modules/gitea/templates/explore/navbar.tmpl
index 6c95d19..646fb35 100644
--- a/lib/modules/gitea/templates/explore/navbar.tmpl
+++ b/lib/modules/gitea/templates/explore/navbar.tmpl
@@ -1,18 +1,21 @@
-
+
\ No newline at end of file
diff --git a/lib/modules/headscale/default.nix b/lib/modules/headscale/default.nix
index 7e74ba8..50acea0 100644
--- a/lib/modules/headscale/default.nix
+++ b/lib/modules/headscale/default.nix
@@ -12,6 +12,7 @@ in {
port = port;
settings = {
server_url = "https://${domain}";
+ dns.base_domain = "m.${domain}";
};
};
@@ -21,7 +22,7 @@ in {
locations."/".proxyPass = "http://127.0.0.1:${toString port}";
locations."/".proxyWebsockets = true;
};
-
+
environment.systemPackages = [ pkgs.headscale ];
}
diff --git a/lib/modules/observatory/default.nix b/lib/modules/observatory/default.nix
index d6ae08c..a3b54b1 100644
--- a/lib/modules/observatory/default.nix
+++ b/lib/modules/observatory/default.nix
@@ -106,20 +106,31 @@ in {
max_chunk_age = "1h";
chunk_target_size = 1048576;
chunk_retain_period = "30s";
- max_transfer_retries = 0;
};
schema_config = {
- configs = [{
- from = "2023-01-01";
- store = "boltdb-shipper";
- object_store = "filesystem";
- schema = "v12";
- index = {
- prefix = "index_";
- period = "24h";
- };
- }];
+ configs = [
+ {
+ from = "2023-01-01";
+ store = "boltdb-shipper";
+ object_store = "filesystem";
+ schema = "v12";
+ index = {
+ prefix = "index_";
+ period = "24h";
+ };
+ }
+ {
+ from = "2024-10-21";
+ store = "tsdb";
+ object_store = "filesystem";
+ schema = "v13";
+ index = {
+ prefix = "index_";
+ period = "24h";
+ };
+ }
+ ];
};
storage_config = {
@@ -127,9 +138,13 @@ in {
active_index_directory = "/var/lib/loki/boltdb-shipper-active";
cache_location = "/var/lib/loki/boltdb-shipper-cache";
cache_ttl = "24h";
- shared_store = "filesystem";
};
-
+ tsdb_shipper = {
+ active_index_directory = "/var/lib/loki/tsdb-shipper-active";
+ cache_location = "/var/lib/loki/tsdb-shipper-cache";
+ cache_ttl = "24h";
+ };
+
filesystem.directory = "/var/lib/loki/chunks";
};
@@ -137,11 +152,7 @@ in {
reject_old_samples = true;
reject_old_samples_max_age = "168h";
};
-
- chunk_store_config = {
- max_look_back_period = "0s";
- };
-
+
table_manager = {
retention_deletes_enabled = false;
retention_period = "0s";
@@ -149,7 +160,6 @@ in {
compactor = {
working_directory = "/var/lib/loki";
- shared_store = "filesystem";
compactor_ring.kvstore.store = "inmemory";
};
};