From 5391938b649359136449b519084cf22c2a852f6a Mon Sep 17 00:00:00 2001 From: Alexander Kobjolke Date: Wed, 5 Apr 2023 20:52:55 +0200 Subject: [PATCH 1/4] thrall: Enable gitea service --- flake.nix | 3 ++- hosts/thrall/default.nix | 20 +++++++++++++++++--- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 9234096..c1bf290 100644 --- a/flake.nix +++ b/flake.nix @@ -65,7 +65,8 @@ nixOnDroidConfigurations.default = inputs.nix-on-droid.lib.nixOnDroidConfiguration { modules = [ ./hosts/redmi - { nix.registry.nixpkgs.flake = nixpkgs; } { nix.nixPath = [ "nixpkgs=${nixpkgs}" ]; } + { nix.registry.nixpkgs.flake = nixpkgs; } + { nix.nixPath = [ "nixpkgs=${nixpkgs}" ]; } ]; }; }; diff --git a/hosts/thrall/default.nix b/hosts/thrall/default.nix index 9e898ce..b770c94 100644 --- a/hosts/thrall/default.nix +++ b/hosts/thrall/default.nix @@ -189,6 +189,20 @@ in { root = "/srv/www/failco.de"; serverAliases = [ "www.failco.de" "mail.failco.de" ]; }; +# "jakalx.net" = { +# forceSSL = true; +# enableACME = true; +# root = "/srv/www/jakalx.net"; +# serverAliases = [ "www.jakalx.net" ]; +# }; + }; + + services.gitea = { + enable = true; + database.type = "sqlite3"; + lfs.enable = true; + httpAddress = "127.0.0.1"; + httpPort = 3000; }; services.fail2ban = { @@ -226,15 +240,15 @@ in { mailserver = { enable = true; fqdn = "thrall.failco.de"; - domains = [ "failco.de" ]; + domains = [ "failco.de" "jakalx.net" ]; loginAccounts = { "me@failco.de" = { hashedPasswordFile = config.age.secrets.mailPass.path; - aliases = [ "jakalx@failco.de" ]; + aliases = [ "lx@failco.de" "alex@failco.de" ]; - catchAll = [ "failco.de" ]; + catchAll = [ "failco.de" "jakalx.net" ]; }; }; From eb0c6fc3b0713f9c57736d75b264975febd529a6 Mon Sep 17 00:00:00 2001 From: Alexander Kobjolke Date: Wed, 5 Apr 2023 20:53:52 +0200 Subject: [PATCH 2/4] dregil: Add discord, lutris and mosh --- modules/common-system.nix | 2 ++ outputs/homeConfigurations/default.nix | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/modules/common-system.nix b/modules/common-system.nix index fb4273f..2210474 100644 --- a/modules/common-system.nix +++ b/modules/common-system.nix @@ -14,6 +14,8 @@ fd fzf bat + lshw + pciutils ]; networking.firewall.enable = true; diff --git a/outputs/homeConfigurations/default.nix b/outputs/homeConfigurations/default.nix index 4fe9a2a..5c8a4f9 100644 --- a/outputs/homeConfigurations/default.nix +++ b/outputs/homeConfigurations/default.nix @@ -17,12 +17,19 @@ in username = "alex"; homeDirectory = "/home/alex"; stateVersion = "22.11"; - packages = with pkgs; [ lutris + discord + mosh ]; }; + programs.git = { + enable = true; + userName = "Alexander Kobjolke"; + userEmail = "me@failco.de"; + }; + # do not show home-manager notifications news.display = "silent"; } From dc34117014930e277e4ec4742c677a3557f85613 Mon Sep 17 00:00:00 2001 From: Alexander Kobjolke Date: Wed, 5 Apr 2023 20:52:55 +0200 Subject: [PATCH 3/4] thrall: Enable gitea service --- flake.nix | 3 ++- hosts/thrall/default.nix | 24 +++++++++++++++++++++--- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 9234096..c1bf290 100644 --- a/flake.nix +++ b/flake.nix @@ -65,7 +65,8 @@ nixOnDroidConfigurations.default = inputs.nix-on-droid.lib.nixOnDroidConfiguration { modules = [ ./hosts/redmi - { nix.registry.nixpkgs.flake = nixpkgs; } { nix.nixPath = [ "nixpkgs=${nixpkgs}" ]; } + { nix.registry.nixpkgs.flake = nixpkgs; } + { nix.nixPath = [ "nixpkgs=${nixpkgs}" ]; } ]; }; }; diff --git a/hosts/thrall/default.nix b/hosts/thrall/default.nix index 9e898ce..9631cb7 100644 --- a/hosts/thrall/default.nix +++ b/hosts/thrall/default.nix @@ -189,6 +189,24 @@ in { root = "/srv/www/failco.de"; serverAliases = [ "www.failco.de" "mail.failco.de" ]; }; + + "git.failco.de" = { + forceSSL = true; + enableACME = true; + locations."/" = { proxyPass = "http://127.0.0.1:3001/"; }; + }; + }; + + services.gitea = { + enable = true; + database.type = "sqlite3"; + lfs.enable = true; + domain = "git.failco.de"; + rootUrl = "https://git.failco.de"; + httpAddress = "127.0.0.1"; + httpPort = 3001; + + settings.service.DISABLE_REGISTRATION = true; }; services.fail2ban = { @@ -226,15 +244,15 @@ in { mailserver = { enable = true; fqdn = "thrall.failco.de"; - domains = [ "failco.de" ]; + domains = [ "failco.de" "jakalx.net" ]; loginAccounts = { "me@failco.de" = { hashedPasswordFile = config.age.secrets.mailPass.path; - aliases = [ "jakalx@failco.de" ]; + aliases = [ "lx@failco.de" "alex@failco.de" ]; - catchAll = [ "failco.de" ]; + catchAll = [ "failco.de" "jakalx.net" ]; }; }; From c72baa173c49a28248b9262b13e411802f583890 Mon Sep 17 00:00:00 2001 From: Alexander Kobjolke Date: Wed, 5 Apr 2023 20:53:52 +0200 Subject: [PATCH 4/4] dregil: Add discord, lutris and mosh --- modules/common-system.nix | 2 ++ outputs/homeConfigurations/default.nix | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/modules/common-system.nix b/modules/common-system.nix index fb4273f..2210474 100644 --- a/modules/common-system.nix +++ b/modules/common-system.nix @@ -14,6 +14,8 @@ fd fzf bat + lshw + pciutils ]; networking.firewall.enable = true; diff --git a/outputs/homeConfigurations/default.nix b/outputs/homeConfigurations/default.nix index 4fe9a2a..5c8a4f9 100644 --- a/outputs/homeConfigurations/default.nix +++ b/outputs/homeConfigurations/default.nix @@ -17,12 +17,19 @@ in username = "alex"; homeDirectory = "/home/alex"; stateVersion = "22.11"; - packages = with pkgs; [ lutris + discord + mosh ]; }; + programs.git = { + enable = true; + userName = "Alexander Kobjolke"; + userEmail = "me@failco.de"; + }; + # do not show home-manager notifications news.display = "silent"; }