From aec776d1cb85ef29ed7c9e226419686e5a0abeda Mon Sep 17 00:00:00 2001 From: Victor Date: Fri, 29 Apr 2022 22:24:44 +0200 Subject: [PATCH] add gitea --- .hosts.nix.swp | Bin 12288 -> 0 bytes flake.lock | 18 +++++----- flake.nix | 2 +- hosts.nix | 5 +++ nixos/hosts/bastion/configuration.nix | 6 ++-- nixos/hosts/gitea/configuration.nix | 43 ++++++++++++++++++++++++ nixos/hosts/minecraft/configuration.nix | 3 +- nixos/hosts/nginx/configuration.nix | 3 +- 8 files changed, 66 insertions(+), 14 deletions(-) delete mode 100644 .hosts.nix.swp create mode 100644 nixos/hosts/gitea/configuration.nix diff --git a/.hosts.nix.swp b/.hosts.nix.swp deleted file mode 100644 index f540e1361c8c021ffa2ce65a74b45ba30fc63191..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2O^Dr86vtCVs_l$ci*9t0jxH?nX7cs&aZ16L_W_EE_%U6SF7nw4zL!j2l3`|~ zip7l!7YYh?Au1>e3U*PkT?j68A-E9S2nudo6mcP16bs@%?b4)F)? zdiKWcuoX-JrT|lbDZmt93NQtj0!#s>z^+vwS>40Ei0E(1cd(IP_f)R=uk6AUUz%Eq4ayf3_EnqK#$N&F}zyJTegX8`IKY_2o8(3bKLjfJU9nF0k45g za2y;1PXh_u3ogxZ+&AC?I1kQ&x4;?jBoILh90v2?@BJM2Gx!pG3O)uOf>%KbmO&qM zz)|o3m;=Az4_!fK)-T^Ox(_jNw;4z?pyTP4c9$dZ++JP^?MerFo3(f!sJO!Qr zkAerm0r2~+@Chz~@4y9c7Q6{w2OGcwCJ;dj90mu$73A*+a1ne2-Usi3SHLOoFgOGb zfH^S9_b#kg7BW+SDZmu?{}njF@%(AP^LP!7Kg#>oF!qj221b^HfdyG1LnB`$Lnfm` zozBAacCe~uw);w=A{ybvXJ}|LMszF+ZREcDPbbaQhJ}^?G*^Dib%*M-+gsHQ`IBcCHjXay& zHhBX1?Rqbgl8=|YY>vEiY*ifP!iyd3i8=zA0;z2>i}k_kmgps+#%>x0eo$}L=#wFm zDw5nLT_JIhFRz#t>(VoQl`%lFl5ya~6$ecfq$58HX#x#8q$s2|c`OoG7HD;7rEy>n zt3{D(By>nnsokf(mKCSaZP<*KkC#o4f-s0GTgc6tDhUb+CUtux49IATSk29@jw3%9 zPAb?9r?T*T*%wAz)9Slg*SRkQKTt_lNsbFq~CLLU9K?N3M1ER&`|AAS0dfW_SGFwr>KFZ^H9~D zY`X80?_r7KTUS?XY2>rP z7mv|$^pgip%i5_YQ=x%LeTCZiQh@|s?@NWPP6C@Kn=NsQZm!f)p-VY5&pqjlqcrix JxeUj-{{YU4d8GgV diff --git a/flake.lock b/flake.lock index 25467e5..2711517 100644 --- a/flake.lock +++ b/flake.lock @@ -196,16 +196,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1650701402, - "narHash": "sha256-XKfstdtqDg+O+gNBx1yGVKWIhLgfEDg/e2lvJSsp9vU=", - "owner": "NixOS", + "lastModified": 1651233872, + "narHash": "sha256-87MbbcxR/lvRVFp+peNqWBcrbrGFmRlbnzskeZkvuNY=", + "owner": "NULLx76", "repo": "nixpkgs", - "rev": "bc41b01dd7a9fdffd32d9b03806798797532a5fe", + "rev": "85f977180abcb7a89bc9cc7c8f325026f3fb4b9e", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable", + "owner": "NULLx76", + "ref": "papermc-update-1.18.2-313", "repo": "nixpkgs", "type": "github" } @@ -285,11 +285,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1649618806, - "narHash": "sha256-yxgmHPk7EiAYfVytISvtQ5uuCWcnZRs3pFxXFbqUUD8=", + "lastModified": 1650983357, + "narHash": "sha256-gejH/rmDTcTvQeWrYzamFLvi0tXd2nDDBCA7/bHIhxE=", "owner": "serokell", "repo": "serokell.nix", - "rev": "8663c86146ada9b3169546bae6c5746e362ec86f", + "rev": "621f2698ec1c870c65a408a9470caa73adc3ca87", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 14efdd6..880c862 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,7 @@ inputs = { deploy-rs.url = "github:serokell/deploy-rs"; - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NULLx76/nixpkgs/papermc-update-1.18.2-313"; serokell-nix.url = "github:serokell/serokell.nix"; vault-secrets.url = "github:serokell/vault-secrets"; }; diff --git a/hosts.nix b/hosts.nix index 2f45c6b..9fd728d 100644 --- a/hosts.nix +++ b/hosts.nix @@ -103,6 +103,11 @@ ip = "10.42.42.21"; mac = "EA:30:73:E4:B6:69"; } + { + hostname = "gitea"; + ip = "10.42.42.22"; + mac = "DE:5F:B0:83:6F:34"; + } { hostname = "zmeura"; ip = "10.42.42.24"; diff --git a/nixos/hosts/bastion/configuration.nix b/nixos/hosts/bastion/configuration.nix index 8910d78..ee7cb34 100644 --- a/nixos/hosts/bastion/configuration.nix +++ b/nixos/hosts/bastion/configuration.nix @@ -9,7 +9,7 @@ let if [[ -d "$HOME/.vscode-server/bin" ]]; then for versiondir in "$HOME"/.vscode-server/bin/*; do rm "$versiondir/node" - ln -s "${pkgs.nodejs-14_x}/bin/node" "$versiondir/node" + ln -s "${pkgs.nodejs-16_x}/bin/node" "$versiondir/node" done fi ''; @@ -42,9 +42,11 @@ in { k9s kubectl kubectx - nixfmt nix-prefetch-git + nixpkgs-fmt + nixpkgs-review ripgrep + rnix-lsp rsync tmux vault diff --git a/nixos/hosts/gitea/configuration.nix b/nixos/hosts/gitea/configuration.nix new file mode 100644 index 0000000..5778860 --- /dev/null +++ b/nixos/hosts/gitea/configuration.nix @@ -0,0 +1,43 @@ +# Edit this configuration file to define what should be installed on +# your system. Help is available in the configuration.nix(5) man page +# and in the NixOS manual (accessible by running ‘nixos-help’). + +{ lib, config, pkgs, ... }: +{ + imports = [ ]; + + networking.hostName = "gitea"; + + # This value determines the NixOS release from which the default + # settings for stateful data, like file locations and database versions + # on your system were taken. It‘s perfectly fine and recommended to leave + # 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 = "21.11"; # Did you read the comment? + + # Additional packages + environment.systemPackages = with pkgs; [ ]; + + environment.noXlibs = lib.mkForce false; + + networking.firewall.allowedTCPPorts = [ config.services.gitea.httpPort ]; + + services.gitea = { + enable = true; + domain = "git.0x76.dev"; + rootUrl = "https://git.0x76.dev"; + lfs.enable = true; + dump.type = "tar.gz"; + database.type = "postgres"; + ssh.clonePort = 42; + disableRegistration = true; + + settings = { + ui = { + DEFAULT_THEME = "arc-green"; + USE_SERVICE_WORKER = true; + }; + }; + }; +} diff --git a/nixos/hosts/minecraft/configuration.nix b/nixos/hosts/minecraft/configuration.nix index 32b28fd..cdd60b4 100644 --- a/nixos/hosts/minecraft/configuration.nix +++ b/nixos/hosts/minecraft/configuration.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, ... }: +{ lib, config, pkgs, ... }: { imports = [ ]; @@ -33,6 +33,7 @@ }; whitelist = { "0x76" = "5513404a-81a2-4c84-b952-18661b1803e7"; + red_shifts = "e0afdee5-e776-49a9-a0cd-c8753faf4255"; }; package = pkgs.papermc; diff --git a/nixos/hosts/nginx/configuration.nix b/nixos/hosts/nginx/configuration.nix index 78676bc..3a462ef 100644 --- a/nixos/hosts/nginx/configuration.nix +++ b/nixos/hosts/nginx/configuration.nix @@ -31,9 +31,10 @@ in { recommendedTlsSettings = true; # Reverse Proxies - virtualHosts."ha.0x76.dev" = proxy "http://10.42.42.8:8123/"; + virtualHosts."ha.0x76.dev" = proxy "http://home-assistant.olympus:8123/"; virtualHosts."zookeeper-dev.0x76.dev" = proxy "http://eevee.olympus:8085/"; virtualHosts."analytics.0x76.dev" = proxy "http://plausible.olympus:8000/"; + virtualHosts."git.0x76.dev" = proxy "http://gitea.olympus:3000"; # Kubernetes endpoints virtualHosts."0x76.dev" = k8s_proxy;