Migrate different project related folders into one

I now already have nix shells as well as compose.yaml files for
projects. Those were split and are now migrated into a common folder.
That should keep main directory clean and self document that those files
relate to projects, not home manager or systems.
This commit is contained in:
Daniel Siepmann 2023-07-19 07:53:46 +02:00
parent 4e57b535bb
commit 08bc0ee761
Signed by: Daniel Siepmann
GPG Key ID: 33D6629915560EF4
22 changed files with 14 additions and 49 deletions

2
.gitattributes vendored
View File

@ -9,4 +9,4 @@ home/files/typo3-configuration/client-specific/** filter=git-crypt diff=git-cryp
home/packages/custom/dmenu-scripts/customer-issue.sh filter=git-crypt diff=git-crypt
systems/hikari/files/hosts filter=git-crypt diff=git-crypt
systems/hikari/web-development/projects/customer.nix filter=git-crypt diff=git-crypt
shells/** filter=git-crypt diff=git-crypt
projects/** filter=git-crypt diff=git-crypt

View File

@ -1,13 +0,0 @@
---
# Do not use version 3 as we don't have mem_limit available
version: '2.2'
services:
solr:
image: docker.io/typo3solr/ext-solr:11.5.1
mem_limit: '2GB'
volumes:
- solr-hemw36:/var/solr/data/data
ports:
- "127.0.0.1:8983:8983"
volumes:
solr-hemw36:

View File

@ -1,8 +0,0 @@
Contains my own `compose.yaml` files for different projects.
Nothing fancy, but some of our customer projects include Solr or Elasticsearch.
TYPO3 Extension EXT:solr provides ready to use docker images for each version.
We can easily use them with compose and limit resource usage of Java, e.g. to 2 GB.
That's fine for local development.
I collect all the files here in the folder and symlink them to the projects,
just like the shell.nix files.

View File

@ -1,13 +0,0 @@
---
# Do not use version 3 as we don't have mem_limit available
version: '2.2'
services:
solr:
image: docker.io/typo3solr/ext-solr:11.5.1
mem_limit: '2GB'
volumes:
- solr-soziopolis:/var/solr/data/data
ports:
- "127.0.0.1:8983:8983"
volumes:
solr-soziopolis:

BIN
projects/readme.rst Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -29,11 +29,15 @@ Execute `home-manager switch`
Folder structure
----------------
The folder `overlays` contains overlays for nix itself.
E.g. alter packages like patching.
`assets/`
contains assets used within nix.
E.g. images used for search engines configured for Firefox.
The folder `home` is related to extras for home-manager.
It has the following sub folder:
`gpg/`
contains everything related to gpg, like public keys.
`home/`
is related to extras for home-manager.
`home/files`
Holds configuration files.
@ -64,18 +68,17 @@ It has the following sub folder:
Instead `home.nix` loads files from within here.
Each file name should correspond to the home sub option / module.
`overlays`
`overlays/`
Holds overlays for existing packages.
E.g. in order to patch them.
`shells/`
Holds shells for customer projects.
`projects/`
Holds shells and compose.yaml files for customer projects.
The customers are not aware of Nix and I don't want to stress them.
I use this folder to have them in version control and symlink them into the
project.
I use this folder to have them in version control and symlink them into the project.
`systems/`
Holds nix os configuration for different system.s
Holds nix os configuration for different systems.
Each system has its own subfolder.
Update
@ -108,10 +111,6 @@ List of manual needed changes for various reasons.
Todos
-----
Migration:
* Migrate home manager to use flake for better rollback support if update breaks something.
Additions:
* Check

Binary file not shown.