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 0000000..1993b83 Binary files /dev/null and b/systems/hikari/files/hosts differ 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.