update

diff --git a/configuration.nix b/configuration.nix
index bc6863573229f2131c049bacb9092f1f98282811..3c0e603af71bcf8bb238f56a8ca266bff8184106 100644 (file)
--- a/configuration.nix
+++ b/configuration.nix
@@ -29,6 +29,10 @@
   system.autoUpgrade = {
     enable = true;
     allowReboot = true;
   system.autoUpgrade = {
     enable = true;
     allowReboot = true;

+    flake = inputs.self.outPath;
+    flags = [ "-L" ];
+    dates = "02:00";
+    randomizedDelaySec = "45min";

   };
 
   networking.hostName = "netcup"; # Define your hostname.
   };
 
   networking.hostName = "netcup"; # Define your hostname.


@@ -101,6 +105,7 @@
     tmux
     md4c
     highlight
     tmux
     md4c
     highlight

+    multimarkdown

     python312Packages.pygments
 
     pkg-config
     python312Packages.pygments
 
     pkg-config


@@ -221,6 +226,10 @@
 
     extraConfig = ''
     psch.dev ps.run pasch.cc {
 
     extraConfig = ''
     psch.dev ps.run pasch.cc {

+      rewrite /src /src/
+      handle_path /src/* {
+        reverse_proxy http://localhost:3000
+      }

       rewrite /git /git/
       handle_path /git/* {
         encode gzip zstd
       rewrite /git /git/
       handle_path /git/* {
         encode gzip zstd


@@ -337,6 +346,25 @@
     socket.group = "caddy";
   };
 
     socket.group = "caddy";
   };
 

+  services.forgejo = {
+    enable = true;
+    repositoryRoot = "/srv/git2";
+    settings = {
+      server = {
+        DOMAIN = "ps.run";
+        ROOT_URL = "https://ps.run/src";
+      };
+      repository = {
+        REQUIRE_SIGNIN_VIEW = false; 
+      };
+      service = {
+        REQUIRE_SIGNIN_VIEW = false; 
+        DISABLE_REGISTRATION = true;
+      };
+    };
+  };
+  users.users.forgejo.extraGroups = [ "git" ];
+

   users.users.chirp = {
     isSystemUser = true;
     group = "chirp";
   users.users.chirp = {
     isSystemUser = true;
     group = "chirp";

diff --git a/flake.lock b/flake.lock
index d5289a79e27156c441fe4569357c59b9d05542af..a4ea1c24b9153c0af6a8f2757f59e53125cad40d 100644 (file)
--- a/flake.lock
+++ b/flake.lock
@@ -199,11 +199,11 @@
         ]
       },
       "locked": {
         ]
       },
       "locked": {

-        "lastModified": 1764122622,
-        "narHash": "sha256-TcBFscZxMn9ZRe/bxDVG/pmvqdJGP/aXUUANDikU4NA=",
+        "lastModified": 1764208886,
+        "narHash": "sha256-voOx8RsK3miw3EHw05nwuOS4ltzeH8tKJnVr+mxtTPQ=",

         "owner": "Infinidoge",
         "repo": "nix-minecraft",
         "owner": "Infinidoge",
         "repo": "nix-minecraft",

-        "rev": "e6cfda9f65cb9bd38fa10efb4c43b09c9fe659eb",
+        "rev": "7da8a2d675f9cc56b3f6d654b4cccdca5016ac8e",

         "type": "github"
       },
       "original": {
         "type": "github"
       },
       "original": {


@@ -244,7 +244,7 @@
         "type": "github"
       }
     },
         "type": "github"
       }
     },

-    "psch-flakes": {
+    "ps-flakes": {

       "inputs": {
         "flake-utils": "flake-utils_4",
         "nixpkgs": [
       "inputs": {
         "flake-utils": "flake-utils_4",
         "nixpkgs": [


@@ -252,17 +252,17 @@
         ]
       },
       "locked": {
         ]
       },
       "locked": {

-        "lastModified": 1764149497,
-        "narHash": "sha256-JJhhMJEd86fsAAUzAKKHsyW5Hz1DWne8BZ9ffd/jI3U=",
+        "lastModified": 1764274965,
+        "narHash": "sha256-N2ok5ycRR8fTpBaJuvtpml1qDfgShk0/iOOwMoBLM2g=",

         "ref": "refs/heads/main",
         "ref": "refs/heads/main",

-        "rev": "9a1d0c514456752694e317bfef7b500fa7caeee2",
-        "revCount": 18,
+        "rev": "1998b16ee96c2f01e072f375e2d4e5ae528302ed",
+        "revCount": 22,

         "type": "git",
         "type": "git",

-        "url": "git://psch.dev/flakes"
+        "url": "git://ps.run/flakes"

       },
       "original": {
         "type": "git",
       },
       "original": {
         "type": "git",

-        "url": "git://psch.dev/flakes"
+        "url": "git://ps.run/flakes"

       }
     },
     "root": {
       }
     },
     "root": {


@@ -271,7 +271,7 @@
         "flake-utils": "flake-utils_2",
         "nix-minecraft": "nix-minecraft",
         "nixpkgs": "nixpkgs",
         "flake-utils": "flake-utils_2",
         "nix-minecraft": "nix-minecraft",
         "nixpkgs": "nixpkgs",

-        "psch-flakes": "psch-flakes",
+        "ps-flakes": "ps-flakes",

         "simple-nixos-mailserver": "simple-nixos-mailserver"
       }
     },
         "simple-nixos-mailserver": "simple-nixos-mailserver"
       }
     },