From da15c937b93420f031184696907c0a038df82bba Mon Sep 17 00:00:00 2001
From: Daniel Siepmann <coding@daniel-siepmann.de>
Date: Wed, 1 Mar 2023 08:54:11 +0100
Subject: [PATCH] Add VPNs

I sync the configurations via NextCloud and move them to
/etc/NetworkManager/system-connections/ by hand.
---
 .gitattributes                   |   1 +
 systems/hikari/configuration.nix |   2 ++
 systems/hikari/files/hosts       | Bin 0 -> 900 bytes
 systems/hikari/readme.rst        |  14 +++++++-------
 4 files changed, 10 insertions(+), 7 deletions(-)
 create mode 100644 systems/hikari/files/hosts

diff --git a/.gitattributes b/.gitattributes
index 386dd5a..1d57dbe 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4,4 +4,5 @@ home/files/docker/config.json filter=git-crypt diff=git-crypt
 home/files/rclone.conf filter=git-crypt diff=git-crypt
 home/files/typo3-configuration/client-specific/** filter=git-crypt diff=git-crypt
 home/packages/custom/dmenu-scripts/customer-issue.sh filter=git-crypt diff=git-crypt
+systems/hikari/files/hosts filter=git-crypt diff=git-crypt
 shells/** filter=git-crypt diff=git-crypt
diff --git a/systems/hikari/configuration.nix b/systems/hikari/configuration.nix
index 2fb2804..b2bb8ef 100644
--- a/systems/hikari/configuration.nix
+++ b/systems/hikari/configuration.nix
@@ -50,6 +50,8 @@
 
     # Enable networking
     networkmanager.enable = true;
+
+    extraHosts = builtins.readFile ./files/hosts;
   };
 
   services.dnsmasq = {
diff --git a/systems/hikari/files/hosts b/systems/hikari/files/hosts
new file mode 100644
index 0000000000000000000000000000000000000000..1993b8386cc894273107df321023b1e3c1ace871
GIT binary patch
literal 900
zcmV-~1AF`cM@dveQdv+`0A)t^6nYZXu+S$L^mHOJR0D=v!27&)5IgrbdeRk~n|E&L
z>#Bd?mt=6E%hP^CzUd<+lCFjA)>!Uy=v>fC9t)uW;q`K*^-@kAQvG^@WitDE)Nc8I
zm`9d%5CF@@MxXsvWHSijzrFjH{?`oTsPw(SGj^2;OdB7P{PVGDM@VGgzY9)tcE1Il
z?47XNsgM7=m{n>Nwo9{OhmcWxIniDbNW(liA#kfV87DN49exh}?>-5weml+0yKlVE
zZ+ww>>ZM1<<a~?RD(W)HIsbqNpTq1#pDaX@DcG<}sd#FI!-2hWsGtfPqMrcQGT)Q;
z22zymkMGSLaRpf6fYh|tz%Nq=K$uJp4xLABGJ=3+DG!i*iL`h&?jC3=tBSJW>nbd`
zsEHKUleOCb)eniakHtq`nof|=rdOd5&4B6$Ed=udNQu0#T3GwB|84Gs_y9jrf;_sG
z1ke9P2UfeVb^bilZOI6huS7T*+8~vRtu<6Hf0VZp;{FW-FdPMrPOp5%rygTl1)Qt1
z3=Mj03(-2Ra7U~i_wYc>r>6(f`RC_J!!6D8p5DHwe(N!(VPNMsW>G$@DeNbn+0ss}
z3DM=7R^Ix_iRR`*H1^u00U!|57gPuFYJP5~eagIqq?9a`H=Y|w*5|$gp-q?wI1j(9
z*}fz48`757*2zNiKzw@_ZP)5TQ-z0^tbrUMdDZnNp0?nwLzoD^pTHSRAf!$lQS9bx
z`YgC1&hW0tylTK2eqN=GdpogJErp7c_Y42x2~b?CfXi%$0!Y^h;o|sbX|0=m_;>4H
zzj<X6B1ml@rGE-o3EA#|<$7xfN>ZijOAdV1@%xtmhD=+t_S3_Sdn+{e#Gc&5R><JA
z0^vv=@9cwNd@FX2<1=}7{n`%NedxLn4JJ?MvRHKL6c+;2%%BMb#9iSkqTI;RW^_V`
zT0>Y5RngmQPO!BqyfuqeBsnrEa@H;~u3-v;RC0iqHxTu2C+GMrA<*6W$fE};h>FAN
zxKaIi3>0C~kP0w(W?M%xh#VoH9t4;juR|`n1v;IK8zI*NL|fcB=Qel>v}hlYi$~7E
zn0sj(V#Q$gJ4-lmXa!+Iwy&8y@us8QtJl*_&-!3JN%L}w=?qlTjmf+8<CX5&<J4l(
a-abCNZ)AwD<TC&=DG~+lk5E>D>hjRh(!;v|

literal 0
HcmV?d00001

diff --git a/systems/hikari/readme.rst b/systems/hikari/readme.rst
index 884fa2e..8a80446 100644
--- a/systems/hikari/readme.rst
+++ b/systems/hikari/readme.rst
@@ -2,10 +2,10 @@ nixos for hikari
 ================
 
 Hikari is my old MacBook Air.
-It currently runs NixOS in Dual Boot.
+It runs NixOS.
 
-I'm using that machine to migrate my existing Ubuntu Setup to NixOS in order to
-replace Ubuntu in the future.
+I'm using that machine to migrate my existing Ubuntu Setup to NixOS in order to replace Ubuntu in the future.
+And I use this Setup for my personal use.
 
 Installation
 ------------
@@ -22,7 +22,7 @@ I also need older php versions:
         nix-channel --add https://github.com/fossar/nix-phps/archive/master.tar.gz phps
         nix-channel --update
 
-Ad hardware channel:
+Add hardware channel:
 
         nix-channel --add https://github.com/NixOS/nixos-hardware/archive/master.tar.gz nixos-hardware
         nix-channel --update
@@ -32,8 +32,8 @@ See: https://github.com/NixOS/nixos-hardware
 TODOs
 -----
 
-* Add first customer project with no longer supported PHP.
+* Auto generate permissions for all the databases.
 
-   * Auto generate permissions for all the databases.
+* Add docker-compose / podman-compose for Elasticsearch, proxy, solr.
 
-   * Add docker-compose / podman-compose for Elasticsearch.
+* Add xdebug setup for fpm.