[fugitive] system update

2024-10-22 18:57:41 +02:00
parent 78de53c0eb
commit 78c7db4bd3
6 changed files with 102 additions and 100 deletions
--- 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",
--- 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:
--- a/lib/modules/gitea/templates/base/head.tmpl
+++ b/lib/modules/gitea/templates/base/head.tmpl
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
-<html lang="{{.locale.Lang}}" class="theme-{{if .SignedUser.Theme}}{{.SignedUser.Theme}}{{else}}{{DefaultTheme}}{{end}}">
+<html lang="{{ctx.Locale.Lang}}" data-theme="{{UserThemeName .SignedUser}}">
 <head>
 	<meta name="viewport" content="width=device-width, initial-scale=1">
-	<title>{{if .Title}}{{.Title | RenderEmojiPlain}} - {{end}}{{if .Repository.Name}}{{.Repository.Name}} - {{end}}{{AppName}}</title>
+	<title>{{if .Title}}{{.Title}} - {{end}}{{if .Repository.Name}}{{.Repository.Name}} - {{end}}{{AppName}}</title>
 	{{if .ManifestData}}<link rel="manifest" href="data:{{.ManifestData}}">{{end}}
 	<meta name="author" content="{{if .Repository}}{{.Owner.Name}}{{else}}{{MetaAuthor}}{{end}}">
 	<meta name="description" content="{{if .Repository}}{{.Repository.Name}}{{if .Repository.Description}} - {{.Repository.Description}}{{end}}{{else}}{{MetaDescription}}{{end}}">
@@ -25,57 +25,18 @@
 			.ui.secondary.menu .dropdown.item > .menu { margin-top: 0; }
 		</style>
 	</noscript>
-{{if .PageIsUserProfile}}
-	<meta property="og:title" content="{{.ContextUser.DisplayName}}">
-	<meta property="og:type" content="profile">
-	<meta property="og:image" content="{{.ContextUser.AvatarLink $.Context}}">
-	<meta property="og:url" content="{{.ContextUser.HTMLURL}}">
-	{{if .ContextUser.Description}}
-		<meta property="og:description" content="{{.ContextUser.Description}}">
-	{{end}}
-{{else if .Repository}}
-	{{if .Issue}}
-		<meta property="og:title" content="{{.Issue.Title}}">
-		<meta property="og:url" content="{{.Issue.HTMLURL}}">
-		{{if .Issue.Content}}
-			<meta property="og:description" content="{{.Issue.Content}}">
-		{{end}}
-	{{else}}
-		<meta property="og:title" content="{{.Repository.Name}}">
-		<meta property="og:url" content="{{.Repository.HTMLURL}}">
-		{{if .Repository.Description}}
-			<meta property="og:description" content="{{.Repository.Description}}">
-		{{end}}
-	{{end}}
-	<meta property="og:type" content="object">
-	{{if (.Repository.AvatarLink $.Context)}}
-		<meta property="og:image" content="{{.Repository.AvatarLink $.Context}}">
-	{{else}}
-		<meta property="og:image" content="{{.Repository.Owner.AvatarLink $.Context}}">
-	{{end}}
-{{else}}
-	<meta property="og:title" content="{{AppName}}">
-	<meta property="og:type" content="website">
-	<meta property="og:image" content="{{AssetUrlPrefix}}/img/logo.png">
-	<meta property="og:url" content="{{AppUrl}}">
-	<meta property="og:description" content="{{MetaDescription}}">
-{{end}}
-	<meta property="og:site_name" content="{{AppName}}">
+	{{template "base/head_opengraph" .}}
 	{{template "base/head_style" .}}
 	{{template "custom/header" .}}
 </head>
-<body>
+<body hx-headers='{"x-csrf-token": "{{.CsrfToken}}"}' hx-swap="outerHTML" hx-ext="morph" hx-push-url="false">
 	{{template "custom/body_outer_pre" .}}

 	<div class="full height">
-		<noscript>{{.locale.Tr "enable_javascript"}}</noscript>
+		<noscript>{{ctx.Locale.Tr "enable_javascript"}}</noscript>

 		{{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 */}}
 	</div>
--- a/lib/modules/gitea/templates/explore/navbar.tmpl
+++ b/lib/modules/gitea/templates/explore/navbar.tmpl
@@ -1,18 +1,21 @@
-<div class="ui secondary pointing tabular top attached borderless menu new-menu navbar">
-	<a class="{{if .PageIsExploreRepositories}}active {{end}}item" href="{{AppSubUrl}}/explore/repos">
-		{{svg "octicon-repo"}} {{.locale.Tr "explore.repos"}}
-	</a>
-	{{if not .UsersIsDisabled}}
-		<a class="{{if .PageIsExploreUsers}}active {{end}}item" href="{{AppSubUrl}}/explore/users">
-			{{svg "octicon-person"}} {{.locale.Tr "explore.users"}}
+<overflow-menu class="ui secondary pointing tabular top attached borderless menu secondary-nav">
+	<div class="overflow-menu-items tw-justify-center">
+		<a class="{{if .PageIsExploreRepositories}}active {{end}}item" href="{{AppSubUrl}}/explore/repos">
+			{{svg "octicon-repo"}} {{ctx.Locale.Tr "explore.repos"}}
 		</a>
-		<a class="{{if .PageIsExploreOrganizations}}active {{end}}item" href="{{AppSubUrl}}/explore/organizations">
-			{{svg "octicon-organization"}} {{.locale.Tr "explore.organizations"}}
+		{{if not .UsersIsDisabled}}
+			<a class="{{if .PageIsExploreUsers}}active {{end}}item" href="{{AppSubUrl}}/explore/users">
+				{{svg "octicon-person"}} {{ctx.Locale.Tr "explore.users"}}
+			</a>
+			<a class="{{if .PageIsExploreOrganizations}}active {{end}}item" href="{{AppSubUrl}}/explore/organizations">
+				{{svg "octicon-organization"}} {{ctx.Locale.Tr "explore.organizations"}}
+			</a>
+		{{end}}
+
+		{{if and (not ctx.Consts.RepoUnitTypeCode.UnitGlobalDisabled) .IsRepoIndexerEnabled}}
+		<a class="{{if .PageIsExploreCode}}active {{end}}item" href="{{AppSubUrl}}/explore/code">
+			{{svg "octicon-code"}} {{ctx.Locale.Tr "explore.code"}}
 		</a>
-	{{end}}
-	{{if and (not $.UnitTypeCode.UnitGlobalDisabled) .IsRepoIndexerEnabled}}
-	<a class="{{if .PageIsExploreCode}}active {{end}}item" href="{{AppSubUrl}}/explore/code">
-		{{svg "octicon-code"}} {{.locale.Tr "explore.code"}}
-	</a>
-	{{end}}
-</div>
+		{{end}}
+	</div>
+</overflow-menu>
--- 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 ];

 }
--- 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";
      };
    };