update

diff --git a/configuration.nix b/configuration.nix
index 3015dc83d33b0a43af4f4e0401675e1ddda9f4c2..4c1a2bac6d1ef467da1c267f98126a0bfdac7d2d 100644 (file)
--- a/configuration.nix
+++ b/configuration.nix
@@ -19,6 +19,7 @@
   # boot.loader.grub.device = "/dev/sda"; # or "nodev" for efi only
 
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
   # boot.loader.grub.device = "/dev/sda"; # or "nodev" for efi only
 
   nix.settings.experimental-features = [ "nix-command" "flakes" ];

+  nix.package = pkgs.nixVersions.nix_2_28;

 
   networking.hostName = "nixos"; # Define your hostname.
   # Pick only one of the below networking options.
 
   networking.hostName = "nixos"; # Define your hostname.
   # Pick only one of the below networking options.


@@ -27,7 +28,7 @@
 
   networking.firewall = {
     enable = true;
 
   networking.firewall = {
     enable = true;

-    allowedTCPPorts = [ 80 443 ];
+    allowedTCPPorts = [ 80 443 9418 ];

   };
 
   # Set your time zone.
   };
 
   # Set your time zone.


@@ -48,9 +49,6 @@
   # Enable the X11 windowing system.
   # services.xserver.enable = true;
 
   # Enable the X11 windowing system.
   # services.xserver.enable = true;
 

-
-  
-

   # Configure keymap in X11
   # services.xserver.xkb.layout = "us";
   # services.xserver.xkb.options = "eurosign:e,caps:escape";
   # Configure keymap in X11
   # services.xserver.xkb.layout = "us";
   # services.xserver.xkb.options = "eurosign:e,caps:escape";


@@ -115,6 +113,8 @@
     enable = true;
     config = {
       init.defaultBranch = "main";
     enable = true;
     config = {
       init.defaultBranch = "main";

+      user.name = "Patrick";
+      user.email = "patrick.schoenberger@posteo.de";

     };
   };
 
     };
   };
 


@@ -145,17 +145,36 @@
 
   services.caddy = {
     enable = true;
 
   services.caddy = {
     enable = true;

+    virtualHosts."psch.dev".extraConfig = ''
+      respond hello :D
+    '';

     virtualHosts."chirp.psch.dev".extraConfig = ''
     virtualHosts."chirp.psch.dev".extraConfig = ''

-      reverse_proxy http://127.0.0.1:8080
+      reverse_proxy http://localhost:8080

       tls {
         protocols tls1.3 tls1.3
       }
     '';
       tls {
         protocols tls1.3 tls1.3
       }
     '';

-    virtualHosts."git.psch.dev".extraConfig = ''
-      reverse_proxy http://127.0.0.1:3000
-    '';

   };
 
   };
 

+  services.dbus.enable = true;
+
+    # virtualHosts."git.psch.dev".extraConfig = ''
+    #   reverse_proxy unix//run/fcgiwrap.socket {
+    #     transport fastcgi {
+    #       split .cgi
+    #     }
+    #   }
+    # '';
+
+  # services.chirp = {
+  #   enable = true;
+  # };
+
+  # services."cgit".cgit = {
+  #   enable = true;
+  #   scanPath = "/srv/git";
+  # };
+

   # Open ports in the firewall.
   # networking.firewall.allowedTCPPorts = [ ... ];
   # networking.firewall.allowedUDPPorts = [ ... ];
   # Open ports in the firewall.
   # networking.firewall.allowedTCPPorts = [ ... ];
   # networking.firewall.allowedUDPPorts = [ ... ];

diff --git a/flake.lock b/flake.lock
index 02ac3c124f4bdd4e50b071e10094957b3e1ac2e4..1c24d2e1acb77894b4c43dbebd7bd7d22dfad20e 100644 (file)
--- a/flake.lock
+++ b/flake.lock
@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
     },
     "nixpkgs": {
       "locked": {

-        "lastModified": 1744168086,
-        "narHash": "sha256-S9M4HddBCxbbX1CKSyDYgZ8NCVyHcbKnBfoUXeRu2jQ=",
+        "lastModified": 1744309437,
+        "narHash": "sha256-QZnNHM823am8apCqKSPdtnzPGTy2ZB4zIXOVoBp5+W0=",

         "owner": "NixOS",
         "repo": "nixpkgs",
         "owner": "NixOS",
         "repo": "nixpkgs",

-        "rev": "60e405b241edb6f0573f3d9f944617fe33ac4a73",
+        "rev": "f9ebe33a928b5d529c895202263a5ce46bdf12f7",

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

diff --git a/flake.nix b/flake.nix
index 41f9ecc473a8ff0a1b689cbf6237615c3a406d97..404062c6ca7aa9d59e72640c40952686e625237d 100644 (file)
--- a/flake.nix
+++ b/flake.nix
@@ -4,14 +4,17 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
     flake-utils.url = "github:numtide/flake-utils";
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
     flake-utils.url = "github:numtide/flake-utils";

+
+    # chirp.url = "path:/srv/git/chirp";

   };
 
   outputs = { self, nixpkgs, flake-utils, ... }: {
     nixosConfigurations = {
   };
 
   outputs = { self, nixpkgs, flake-utils, ... }: {
     nixosConfigurations = {

-      hostname = nixpkgs.lib.nixosSystem {
+      default = nixpkgs.lib.nixosSystem {

         system = "x86_64-linux";
         modules = [
           ./configuration.nix
         system = "x86_64-linux";
         modules = [
           ./configuration.nix

+          # chirp.nixosModules.default

         ];
       };
     };
         ];
       };
     };