From 08bc0ee7614cc899573afe996900325a0244cacc Mon Sep 17 00:00:00 2001 From: Daniel Siepmann Date: Wed, 19 Jul 2023 07:53:46 +0200 Subject: [PATCH] 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. --- .gitattributes | 2 +- composes/hemw36.yaml | 13 --------- composes/readme.rst | 8 ------ composes/soziopolis.yaml | 13 --------- projects/readme.rst | Bin 0 -> 455 bytes .../reuter/monorepo-shell.nix | Bin {shells => projects}/sac/hutnews-shell.nix | Bin projects/sac/mailhog-shell.nix | Bin 0 -> 1591 bytes projects/sac/sac-compose.yaml | Bin 0 -> 299 bytes .../shell.nix => projects/sac/sac-shell.nix | Bin .../typo3/extensions/tea-shell.nix | Bin .../werkraum-media/erftour-shell.nix | Bin projects/werkraum-media/hemw36-compose.yaml | Bin 0 -> 305 bytes .../werkraum-media/htt-shell.nix | Bin .../werkraum-media/resbuch-shell.nix | Bin .../werkraum-media/schloss-shell.nix | Bin .../werkraum-media/soziopolis-compose.yaml | Bin 0 -> 313 bytes .../werkraum-media/soziopolis-shell.nix | Bin .../thueringer-staedte-shell.nix | Bin .../werkraum-media/weimar-shell.nix | Bin readme.rst | 27 +++++++++--------- shells/fes/shell.nix | Bin 1262 -> 0 bytes 22 files changed, 14 insertions(+), 49 deletions(-) delete mode 100644 composes/hemw36.yaml delete mode 100644 composes/readme.rst delete mode 100644 composes/soziopolis.yaml create mode 100644 projects/readme.rst rename shells/reuter/monorepo.nix => projects/reuter/monorepo-shell.nix (100%) rename {shells => projects}/sac/hutnews-shell.nix (100%) create mode 100644 projects/sac/mailhog-shell.nix create mode 100644 projects/sac/sac-compose.yaml rename shells/sac/shell.nix => projects/sac/sac-shell.nix (100%) rename shells/typo3/extensions/tea.nix => projects/typo3/extensions/tea-shell.nix (100%) rename {shells => projects}/werkraum-media/erftour-shell.nix (100%) create mode 100644 projects/werkraum-media/hemw36-compose.yaml rename {shells => projects}/werkraum-media/htt-shell.nix (100%) rename {shells => projects}/werkraum-media/resbuch-shell.nix (100%) rename {shells => projects}/werkraum-media/schloss-shell.nix (100%) create mode 100644 projects/werkraum-media/soziopolis-compose.yaml rename {shells => projects}/werkraum-media/soziopolis-shell.nix (100%) rename {shells => projects}/werkraum-media/thueringer-staedte-shell.nix (100%) rename {shells => projects}/werkraum-media/weimar-shell.nix (100%) delete mode 100644 shells/fes/shell.nix 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 0000000000000000000000000000000000000000..405a4e1604d155b0287f475740826c3d967a02bf GIT binary patch literal 455 zcmV;&0XY5uM@dveQdv+`0CkyWI(yQONtuXizyMrZ;_i*4Hq5w{QP{K4n1hJp@`x=s zEx^SB3QiP}XoJUo8}y?ae0YE%E!nklO>Y<`?F{a{b~!uAj}Wh?L>A}hFQ4u~CeL(u z&+*s&2QL`<=^g=Bz*8XRJNiTn3pM|mce^1IqXFzCeeV8;so@yV((g&&DM5yMUy?4@ zQLRNXpvaUja3yAzG!lr7RWU3?LP&o$Q<^*Jixq&tcV?woNSmbVQx;A7ACyj+XoS)u zG2X!Jh@S&YA{T$AazO^gcvkwvCTSq}(Pu3$0}5|L1bhsSKPF55N1`t_1!7!um0YJS zm53q${<8LVx?HMQJ_wBO3QqEF))}j;8?#rP;=d8u5(?G1x9L7e+e`oQ9WJDAGgWG^ z>fYm4TAv%6>y4b)=>uu9!J1iB<4CBjCY-;)_VO9OfnRg_NL(WCt|c>5yA(;EtP`_b zzk3a#!}Mh9D9%syyIF>0bQ*hVX9Djj?!Msf5(ZywNC~PSrdv1brWTsS1OuJDpcWc$ xIjyEqazNNszm9EllM&lJ?5^bGy-ikkS=n><7JoH5*ii&S$)42uk#A84M!b5r*%kl* literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..da504de0c63ec9810708ceee85d77cbe4526fefe GIT binary patch literal 1591 zcmV-72FUpUM@dveQdv+`0FK6Q&0^*8gIE=uyxIAsDZ;tUTr7bC_KtlSazCE!!i?N- zV3FQJC4O?g#>!tO?VAhZ$4WV(VgYGlKlfZSEr5zm73~jw>v1MOYy4BP-6I;Rqzb%m zU6^%l-?f}Ar(L)XiDr=^(K#Lb>_6 zUz)|ms3{Y-G8LQhk`0WTob3cIr2~F0BDiB)J9DjSTFX~n$QgS4eQSwC%~o~(6=$7W z(ap(uE?oCTG@>vYIK2gPOg~s>s?wlApS_YWVRpEMTzl5z9P58@$?ouhf6YJ{;8$#^ zJDLTtbb4EUv1I($QAl=y*>Vq5VTPG6u?`JI!E?F=;+?2YDF5MFF+f0-(%%YTAA)X` zcJ_Wbim?zqB<0WW8k@_e^)NG(0L@iiGCv@?S3sT(QaX%^J@9{BGF}ZgjZGFK)!Jzd zm#v^u+4bY{Bzb#*-g%)k?f zuFxL=@cjg+qgTigIjklVgOjNARrD<0v$Yxj$n#5<=%G3GcTX^Pn;yP1N|WRH84cNk z>?Cv=XR1@5#1|(wQvUh~F$q|L=St`ltS#X2qu>}|u)`EmB8g4+p6cL#04-m`PaWNw zO5J0ahas&y1lo?c;F#$!dwT@t7iHuFb(Tv>?%BC|aw8s8XRI`44aA>AU9L;Cjz7wT zhaR>j8|x@#bBz%;ic&zd*zaEh4v@8KyRY=^aG7#@6|=?Q0u9e&0cv?N-een~d+y=^ z!>l^HmI!=2^=c$7jGs>Qx5bjMHktZu3_wn$osvI3AFO8#^? zL{5P|#P(3@7a5LDs+Pqs!}5EJAP-`ytR=+a3OMk%vjY}rH?1CY+!RErDF`4%f}`?@ zRkAdG=iY)i7DLN%pKV%fjbVxhF7i@|BjA`-ciA}Wc>J#`9vr8@xTRZQx+cqGn0$oG zaJG_46q-o+*K{eNWw`r7s#{xxOLZdC+Owxd0DM!oI9;VOH*Agg5ETdZ%|pg^q;>pp zGV;47`dOr5B`}9*rP^gn=VOre%u!V~7QCl_vm5*xaDOnZo7%#!d#O6$$8q9*Y#7U9k!f z05zziNkHp#C};Bd)t*pl%?$!P zyfrc$9-L)((q%0GF%I>S%&SQZwY6G$V~n?Y-MLP8MVqg@ej?O-UOTr*qcx#MC8NIX zJ{jmruiIqp;?09?DkwNlP{1x!Gw%PM>UfD+!Zt>^<|7LuzVo#l6;q`pu{2kv?~y6o zS@z=$0ttXA{N!PF-gJ?|DQ(xA4kGgh5P9Yts=V0BN3WjCs)z$7g>nGna|xf;T`5dM pVPQ&OW$Jq7E-%@5m)Er9}9j{2+Ch=pV$4gXbIffJVOXwNy2jTz# literal 0 HcmV?d00001 diff --git a/projects/sac/sac-compose.yaml b/projects/sac/sac-compose.yaml new file mode 100644 index 0000000000000000000000000000000000000000..4b12b3c852b7dfaf80d333b6d32b3edae2c96917 GIT binary patch literal 299 zcmV+`0o48gM@dveQdv+`0D8#G^9_NSOQCfjKy&czk0#yP-DA{W#Zo6=I_{}t-XlV@ zJ8Dp{_bl_|z9j8z&0uWMaP1u?rffk*gqt8_4Zaw@ywic|YuS6^bbdn0Yv%Y^bVJzk zYXT&vmk!CVv2DQ7pdid)0hKG#p=Q%;Oj(6*-sD7c5T(Y~x+=_nBud|O*YX0v`}A5n zR7aWcLJ*N4H67C9$Ugc+8#mnpNVymtLj-&JNXc11wJgY=8{XlSRRew% zS9W(0Fu1u)+|39z41759fIeTC7R*F|KA7St31ed6@x!)Md#*?C1j~A>@ya(NdRdw3 x#_r;a?=<>;eD`)93BQcBegkA0r_{8&jgXX4F5FVVS>H(se%T3%K|?|F!uOX;lwtq? literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..6c210519f5612c7ea0c4f7e5ef3f2b0727db9924 GIT binary patch literal 305 zcmV-10nYvaM@dveQdv+`0QfA$)vwT*SFA>&2--`76?;O@Mkj;8v>a4HwkBGxlskb zS;M6?oO+W=(iYyRU>9&yqg~k`)|++)NxO=00$`8$Qr1m(mp||A;XXEWE**?*NJ#6t zX|4RIfH7bmjZ$oKEC9 zfroFc8QMJd&TZ*lWEk*doi3H4A{S3aQybY0^qYs|!k|G7IKiszMcG|kmUSOjqES&P DG!>AF literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..666c5fb056803fec8569abbe3fbbc22fe6edd45e GIT binary patch literal 313 zcmV-90ml9SM@dveQdv+`04xdZ>Rzgb^X8FeD8~n^RJE}&9=0|S{_>D6&7Ihu)BKv1 zv;;lm-mKg$;dhoOzJx=*mY{8#*_bX(g9ko7>yqPFa6kt zUHUI;(F#9UV9t7m)ObNjpBH@U@y`H5Y40@k*qZ_#s{Q~JfI#<{IQ3g&$o`?h_ zkIE-o@6#nm0PqMP`auc+CQPFQlAJf}`Y^_tTjw?wBW@4;aK}buG(nb1j_CE|+cSzt z>LW$3U)C~wf?R4KFQagUblCgxr`gFNvbZA9qyc#B^H4r%%-tl<>!$-Y-PID{7AMfO z!+i%vJV10Zdh4MPHW5-r^WTnZPhJZ!uArfU6eMKYxghV1aW{owWo!J+u#g{*zQ^m% Li0zAJ_K&asW-pgs literal 0 HcmV?d00001 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 90e64c938a27b8986324d2ad9d791590e35724d3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1262 zcmVqoS4aO- z@Ctzd=xg%Ovsb`1+DQLVg+hC5H!QC{(=hwlS6T&qaP+p8=ztkGU_ND*jJfRJFqB9% zb4hg1P~Bp&pOE;ayyH+p-wo-w`KYqvd*l33H^N93Fw@vF0D4bVz9|EO=E>#FSw+1i z(!yUEb`%>8;Or)i*tGT5&;O@tS-g?XJ8@W(wVAZ?)@R&j; z!6szq#}Z1`?B=ccs%?}p1o$M>ST4ZW~5hgqlxVBG(uVYL)BMaW^7LB?w%8odzANEtAGt1 zpg*-tVxsNTpeI`8dBup}Xrb2M5!t5&O_)XbS~VHYEDDEKQBv)~Z<4jX>uRP+zGzM> zTO4Ah8TG_VxRM%dP0qMGj+we-#l+j|9}G}XSpIB2zUTp;9?-iIIGaMM++jLkb6muQ zNlT3#PqzUMxR&DiFRNNn`Z=m$nHwC3qnt1JG)oJfgiUXK<@L~_N%ongQP zK!gERe@C}pL6?~VYxbAcU~=a{oor@tPhG*L+9E|7rHI9AQQv7CdCvzxNU-$n0+E?X zS5EgjtBhjo7)-*7aK493;(hbS49@o=LKl_+dr`7gRo`q@_YHyfOirGW91pD5fQvcL z4_XPus@#wK75MoDph4JD1+!dIj5qPQ@ydcQat8|!aqs9%65O@6kBnkWHw-2b*2;+j z`yX#5FIu6covrcFXzI~B3I>sf{MH`hG=S@@+*Ej(blCnLBK37Pf&?lk)52|Lvo-4f zEGv?pco=cI5*<8gdew&m1gT1i!Z!jxXS5Us7z8P!$x^Q0{{X%(UhvDbIOMPa6JkC@ z6oA^JM2V`lo0wdleNESJ4l;0LPqD3hKq`!j-p5e@gV1E1_Tav_R2A^J4DLn+@l!_q zM#0iFAW<7HPHa2g>|1Tm&kY2g1o2t!q)6iU=qdy}X@qK9c~4V%=$6BoHILx;YbbcCO_^E5r>YtS_;gNFxwLd`9PxE2!7FnD@w=0*_&9{7U z){sN6sDllh+63%t^=`9G{(`qWi_A>C%H|*aHtlW8tc4d8lCVmOGc5jV(ebz+&3_VZ YrszQ6A_$u%>wHm9d!PBQJQ4MACm-K?@&Et;