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:
parent
4e57b535bb
commit
08bc0ee761
2
.gitattributes
vendored
2
.gitattributes
vendored
|
@ -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
|
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/files/hosts filter=git-crypt diff=git-crypt
|
||||||
systems/hikari/web-development/projects/customer.nix 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
|
||||||
|
|
|
@ -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:
|
|
|
@ -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.
|
|
|
@ -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
BIN
projects/readme.rst
Normal file
Binary file not shown.
BIN
projects/sac/mailhog-shell.nix
Normal file
BIN
projects/sac/mailhog-shell.nix
Normal file
Binary file not shown.
BIN
projects/sac/sac-compose.yaml
Normal file
BIN
projects/sac/sac-compose.yaml
Normal file
Binary file not shown.
BIN
projects/werkraum-media/hemw36-compose.yaml
Normal file
BIN
projects/werkraum-media/hemw36-compose.yaml
Normal file
Binary file not shown.
BIN
projects/werkraum-media/soziopolis-compose.yaml
Normal file
BIN
projects/werkraum-media/soziopolis-compose.yaml
Normal file
Binary file not shown.
27
readme.rst
27
readme.rst
|
@ -29,11 +29,15 @@ Execute `home-manager switch`
|
||||||
Folder structure
|
Folder structure
|
||||||
----------------
|
----------------
|
||||||
|
|
||||||
The folder `overlays` contains overlays for nix itself.
|
`assets/`
|
||||||
E.g. alter packages like patching.
|
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.
|
`gpg/`
|
||||||
It has the following sub folder:
|
contains everything related to gpg, like public keys.
|
||||||
|
|
||||||
|
`home/`
|
||||||
|
is related to extras for home-manager.
|
||||||
|
|
||||||
`home/files`
|
`home/files`
|
||||||
Holds configuration files.
|
Holds configuration files.
|
||||||
|
@ -64,18 +68,17 @@ It has the following sub folder:
|
||||||
Instead `home.nix` loads files from within here.
|
Instead `home.nix` loads files from within here.
|
||||||
Each file name should correspond to the home sub option / module.
|
Each file name should correspond to the home sub option / module.
|
||||||
|
|
||||||
`overlays`
|
`overlays/`
|
||||||
Holds overlays for existing packages.
|
Holds overlays for existing packages.
|
||||||
E.g. in order to patch them.
|
E.g. in order to patch them.
|
||||||
|
|
||||||
`shells/`
|
`projects/`
|
||||||
Holds shells for customer 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.
|
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
|
I use this folder to have them in version control and symlink them into the project.
|
||||||
project.
|
|
||||||
|
|
||||||
`systems/`
|
`systems/`
|
||||||
Holds nix os configuration for different system.s
|
Holds nix os configuration for different systems.
|
||||||
Each system has its own subfolder.
|
Each system has its own subfolder.
|
||||||
|
|
||||||
Update
|
Update
|
||||||
|
@ -108,10 +111,6 @@ List of manual needed changes for various reasons.
|
||||||
Todos
|
Todos
|
||||||
-----
|
-----
|
||||||
|
|
||||||
Migration:
|
|
||||||
|
|
||||||
* Migrate home manager to use flake for better rollback support if update breaks something.
|
|
||||||
|
|
||||||
Additions:
|
Additions:
|
||||||
|
|
||||||
* Check
|
* Check
|
||||||
|
|
Binary file not shown.
Loading…
Reference in a new issue