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

home/home.nix

@@ -35,6 +35,15 @@ in {
 	] ++ guiImports;
 
 
+	programs.tmux = {
+		enable = true;
+		keyMode = "vi";
+		shell = "${pkgs.xonsh}/bin/xonsh";
+		terminal = "xterm-256color";
+		customPaneNavigationAndResize = true;
+		extraConfig = "set-option -g default-command ${pkgs.xonsh}/bin/xonsh";
+	};
+
 	home.stateVersion = "22.05";
 	home.packages = with pkgs; [
 		bitwarden-cli

home/ssh.nix

@@ -20,6 +20,7 @@
 			"chronicles.thehellings.lan" = lib.hm.dag.entryBefore [ "*.thehellings.lan"] nas;
 
 			gh = { user = "git"; hostname = "github.com"; };
+			"src" = { user = "gitea"; hostname = "src.thehellings.com"; };
 
 			"*.thehellings.lan" = owned;
 			"10.42.*" = owned;

hosts/linode/default.nix

@@ -2,6 +2,7 @@
 
 {
 	imports = [
+		./git.nix
 		./hardware-configuration.nix
 		./nextcloud.nix
 		./nginx.nix

hosts/linode/git.nix

@@ -0,0 +1,42 @@
+{ config, ... }:
+
+{
+	services.gitea = rec {
+		enable = true;
+		appName = "Greg's Sources";
+		cookieSecure = true;
+		database = {
+			type = "postgres";
+			user = "gitea";
+		};
+		disableRegistration = true;
+		domain = "src.thehellings.com";
+		dump = {
+			enable = true;
+			type = "tar.xz";
+		};
+		rootUrl = "https://${domain}/";
+	};
+
+	greg.proxies."src.thehellings.com" = {
+		target = "http://localhost:${toString config.services.gitea.httpPort}";
+		ssl = true;
+		genAliases = false;
+	};
+
+	greg.backup.jobs.gitea = {
+		src = config.services.gitea.dump.backupDir;
+		dest = "gitea";
+		user = "gitea";
+	};
+
+	services.logrotate = {
+		enable = true;
+		settings = {
+			gitea = {
+				enable = true;
+				files = "${config.services.gitea.dump.backupDir}/*";
+			};
+		};
+	};
+}

hosts/linode/postgres.nix

@@ -4,7 +4,7 @@
 	services.postgresql = {
 		enable = true;
 		checkConfig = true;
-		ensureDatabases = [ "nextcloud" ];
+		ensureDatabases = [ "nextcloud" "gitea" ];
 		initialScript = pkgs.writeText "create-matrix-db.sql" ''
 			CREATE ROLE "matrix-synapse" WITH LOGIN;
 			CREATE DATABASE "synapse" WITH OWNER "matrix-synapse" TEMPLATE template0 LC_COLLATE = "C" LC_CTYPE = "C";
@@ -16,6 +16,9 @@
 		} {
 			name = "root";
 			ensurePermissions."ALL TABLES IN SCHEMA public" = "ALL PRIVILEGES";
+		} {
+			name = "gitea";
+			ensurePermissions."DATABASE gitea" = "ALL PRIVILEGES";
 		} ];
 		settings = {
 			log_connections = true;
@@ -30,6 +33,7 @@ root root postgres
 	services.postgresqlBackup = {
 		enable = true;
 		databases = [
+			"gitea"
 			"nextcloud"
 			"synapse"
 		];

modules-all/automatic/nix.nix

@@ -5,6 +5,14 @@
 	nix = {
 		package = pkgs.nixFlakes;
 
+		settings = {
+			substituters = [
+				"https://cache.garnix.io"
+			];
+			trusted-public-keys = [
+				"cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
+			];
+		};
 		# Keep freespace available, at a minimum, and enable Flakes
 		extraOptions = ''
 experimental-features = nix-command flakes

modules-linux/backup.nix

@@ -39,7 +39,7 @@ in with lib; {
 			key = mkOption {
 				type = types.path;
 				description = "SSH key to use";
-				default = ./ssh/id_ed25519;
+				default = ../ssh/id_ed25519;
 			};
 
 			jobs = mkOption {