update sources, move to NixOS 22.05

3 files changed, 8 insertions, 6 deletions

diff --git a/flora/configuration.nix b/flora/configuration.nix
index 51fee59..07d1049 100644
--- a/flora/configuration.nix
+++ b/flora/configuration.nix
@@ -54,9 +54,11 @@
   
   services.logrotate = {
     enable = true;
-    paths.nginx = {
-      path = "/var/log/nginx";
-      frequency = "weekly";
+    # the nginx module does stuff here, which apparently no one tells anyone about
+    settings.nginx = {
+      rotate = 2;
+      nocompress = true;
+      compress = false;
     };
   };
 
@@ -67,9 +69,7 @@
   # this value at the release version of the first install of this system.
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system = {
-    stateVersion = "20.09"; # Did you read the comment?
-  };
+  system.stateVersion = "20.09"; # Did you read the comment?
 
 }
 
diff --git a/flora/services/cgit.nix b/flora/services/cgit.nix
index cc05d5c..f18fd69 100644
--- a/flora/services/cgit.nix
+++ b/flora/services/cgit.nix
@@ -18,6 +18,7 @@
     };
 
     config = {pkgs, config, ...}: {
+      system.stateVersion = "20.09";
       services.lighttpd.enable = true;
       services.lighttpd.extraConfig = ''server.use-ipv6 = "enable"'';
       services.lighttpd.cgit = {
diff --git a/flora/services/pleroma.nix b/flora/services/pleroma.nix
index 21e4228..12f4511 100644
--- a/flora/services/pleroma.nix
+++ b/flora/services/pleroma.nix
@@ -24,6 +24,7 @@ in
       
       # pleroma has a cli tool for configuration
       environment.systemPackages = [ pkgs.dnsutils ];
+      system.stateVersion = "20.09";
     
       services.pleroma = {
         enable = true;