Merge branch 'main' of gh:greg-hellings/nixos-config

flake.lock

@@ -158,16 +158,16 @@
     },
     "nixstable": {
       "locked": {
-        "lastModified": 1682600000,
+        "lastModified": 1685094109,
-        "narHash": "sha256-ha4BehR1dh8EnXSoE1m/wyyYVvHI9txjW4w5/oxsW5Y=",
+        "narHash": "sha256-u+awry81RAVV+fJBCZt+GKWsISSLJKUNbVwKccHeaPU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "50fc86b75d2744e1ab3837ef74b53f103a9b55a0",
+        "rev": "551a52bfdd02e7b75be5faf9b42f864112d88654",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-22.05",
+        "ref": "nixos-23.05",
         "repo": "nixpkgs",
         "type": "github"
       }

flake.nix

@@ -5,7 +5,7 @@
 	description = "Greg's machines!";
 
 	inputs = {
-		nixstable.url = "github:nixos/nixpkgs/nixos-22.05";
+		nixstable.url = "github:nixos/nixpkgs/nixos-23.05";
 		nixunstable.url = "github:nixos/nixpkgs/nixos-unstable";
 		agenix.url = "github:ryantm/agenix";
 		flake-utils.url = "github:numtide/flake-utils";

hosts/linode/default.nix

@@ -8,6 +8,7 @@
 		./nextcloud.nix
 		./nginx.nix
 		./postgres.nix
+		./rei.nix
 		./synapse.nix
 	];
 	greg.home = false;

hosts/linode/git.nix

@@ -23,26 +23,27 @@ in {
 	services.gitea = rec {
 		enable = true;
 		appName = "Greg's Sources";
-		cookieSecure = true;
 		database = {
 			type = "postgres";
 			user = "gitea";
 		};
-		disableRegistration = true;
-		domain = srcDomain;
 		dump = {
 			enable = true;
 			type = "tar.xz";
 		};
-		httpPort = 3001;
+		settings = {
-		log = {
+			server = rec {
-			level = "Info";
+				ROOT_URL = "https://${DOMAIN}/";
+				DOMAIN = srcDomain;
+			};
+			service.DISABLE_REGISTRATION = pkgs.lib.mkForce true;
+			session.COOKIE_SECURE = pkgs.lib.mkForce true;
+			log.level = "Info";
 		};
-		rootUrl = "https://${domain}/";
 	};
 
 	greg.proxies."${srcDomain}" = {
-		target = "http://localhost:${toString config.services.gitea.httpPort}";
+		target = "http://localhost:${toString config.services.gitea.settings.server.HTTP_PORT}";
 		ssl = true;
 		genAliases = false;
 	};

hosts/linode/nextcloud.nix

@@ -6,9 +6,10 @@
 
 	services.nextcloud = {
 		enable = true;
-		package = pkgs.nextcloud24;
+		package = pkgs.nextcloud26;
 		appstoreEnable = true;
 		hostName = "next.${config.networking.domain}";
+		enableBrokenCiphersForSSE = false;
 		https = true;
 		config = {
 			adminpassFile = config.age.secrets.nextcloudadmin.path;

hosts/linode/postgres.nix

@@ -53,10 +53,8 @@ root root postgres
 			postgresLog = {
 				enable = true;
 				files = "/var/lib/postgresql/*/log/*.log";
-				extraConfig = (lib.strings.concatStringsSep "\n" [
+				compress = true;
-					"compress"
+				compresscmd = "${pkgs.xz}/bin/xz";
-					"compresscmd=${pkgs.xz}/bin/xz"
-				]);
 			};
 		};
 	};

hosts/linode/rei.nix

@@ -0,0 +1,15 @@
+{ ... }:
+{
+	services = {
+		odoo = {
+			enable = true;
+			domain = "doublel.thehellings.com";
+			settings.options = {
+				db_host = "localhost";
+				db_port = "5432";
+				db_user = "odoo";
+				dbfilter = "^doublel.*$";
+			};
+		};
+	};
+}

modules-all/default.nix

@@ -32,7 +32,12 @@
 		};
 	};
 
-	nixpkgs.config.allowUnfree = true;
+	nixpkgs.config = {
+		allowUnfree = true;
+		permittedInsecurePackages = [
+			"qtwebkit-5.212.0-alpha4"
+		];
+	};
 
 	# Base packages that need to be in all my hosts
 	environment.systemPackages = with pkgs; [

overlays/default.nix

@@ -50,8 +50,7 @@ let
 	});
 
 in rec {
-	#gitea = super.unstable.gitea;
+	#python3 = self.unstable.python3;
-
 	gregpy = myPython;
 
 	my-py-addons = rec {