diff --git a/.gitattributes b/.gitattributes index 7838700..702b877 100644 --- a/.gitattributes +++ b/.gitattributes @@ -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 diff --git a/composes/hemw36.yaml b/composes/hemw36.yaml deleted file mode 100644 index 365326f..0000000 --- a/composes/hemw36.yaml +++ /dev/null @@ -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: diff --git a/composes/readme.rst b/composes/readme.rst deleted file mode 100644 index 2040758..0000000 --- a/composes/readme.rst +++ /dev/null @@ -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. diff --git a/composes/soziopolis.yaml b/composes/soziopolis.yaml deleted file mode 100644 index 6536a20..0000000 --- a/composes/soziopolis.yaml +++ /dev/null @@ -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: diff --git a/projects/readme.rst b/projects/readme.rst new file mode 100644 index 0000000..405a4e1 Binary files /dev/null and b/projects/readme.rst differ diff --git a/shells/reuter/monorepo.nix b/projects/reuter/monorepo-shell.nix similarity index 100% rename from shells/reuter/monorepo.nix rename to projects/reuter/monorepo-shell.nix diff --git a/shells/sac/hutnews-shell.nix b/projects/sac/hutnews-shell.nix similarity index 100% rename from shells/sac/hutnews-shell.nix rename to projects/sac/hutnews-shell.nix diff --git a/projects/sac/mailhog-shell.nix b/projects/sac/mailhog-shell.nix new file mode 100644 index 0000000..da504de Binary files /dev/null and b/projects/sac/mailhog-shell.nix differ diff --git a/projects/sac/sac-compose.yaml b/projects/sac/sac-compose.yaml new file mode 100644 index 0000000..4b12b3c Binary files /dev/null and b/projects/sac/sac-compose.yaml differ diff --git a/shells/sac/shell.nix b/projects/sac/sac-shell.nix similarity index 100% rename from shells/sac/shell.nix rename to projects/sac/sac-shell.nix diff --git a/shells/typo3/extensions/tea.nix b/projects/typo3/extensions/tea-shell.nix similarity index 100% rename from shells/typo3/extensions/tea.nix rename to projects/typo3/extensions/tea-shell.nix diff --git a/shells/werkraum-media/erftour-shell.nix b/projects/werkraum-media/erftour-shell.nix similarity index 100% rename from shells/werkraum-media/erftour-shell.nix rename to projects/werkraum-media/erftour-shell.nix diff --git a/projects/werkraum-media/hemw36-compose.yaml b/projects/werkraum-media/hemw36-compose.yaml new file mode 100644 index 0000000..6c21051 Binary files /dev/null and b/projects/werkraum-media/hemw36-compose.yaml differ diff --git a/shells/werkraum-media/htt-shell.nix b/projects/werkraum-media/htt-shell.nix similarity index 100% rename from shells/werkraum-media/htt-shell.nix rename to projects/werkraum-media/htt-shell.nix diff --git a/shells/werkraum-media/resbuch-shell.nix b/projects/werkraum-media/resbuch-shell.nix similarity index 100% rename from shells/werkraum-media/resbuch-shell.nix rename to projects/werkraum-media/resbuch-shell.nix diff --git a/shells/werkraum-media/schloss-shell.nix b/projects/werkraum-media/schloss-shell.nix similarity index 100% rename from shells/werkraum-media/schloss-shell.nix rename to projects/werkraum-media/schloss-shell.nix diff --git a/projects/werkraum-media/soziopolis-compose.yaml b/projects/werkraum-media/soziopolis-compose.yaml new file mode 100644 index 0000000..666c5fb Binary files /dev/null and b/projects/werkraum-media/soziopolis-compose.yaml differ diff --git a/shells/werkraum-media/soziopolis-shell.nix b/projects/werkraum-media/soziopolis-shell.nix similarity index 100% rename from shells/werkraum-media/soziopolis-shell.nix rename to projects/werkraum-media/soziopolis-shell.nix diff --git a/shells/werkraum-media/thueringer-staedte-shell.nix b/projects/werkraum-media/thueringer-staedte-shell.nix similarity index 100% rename from shells/werkraum-media/thueringer-staedte-shell.nix rename to projects/werkraum-media/thueringer-staedte-shell.nix diff --git a/shells/werkraum-media/weimar-shell.nix b/projects/werkraum-media/weimar-shell.nix similarity index 100% rename from shells/werkraum-media/weimar-shell.nix rename to projects/werkraum-media/weimar-shell.nix diff --git a/readme.rst b/readme.rst index 5d39cba..f6b69be 100644 --- a/readme.rst +++ b/readme.rst @@ -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 diff --git a/shells/fes/shell.nix b/shells/fes/shell.nix deleted file mode 100644 index 90e64c9..0000000 Binary files a/shells/fes/shell.nix and /dev/null differ