Compare commits
544 commits
91e5d860e7
...
bfeea8cb21
Author | SHA1 | Date | |
---|---|---|---|
Manuel Thalmann | bfeea8cb21 | ||
Manuel Thalmann | e1d3191020 | ||
Manuel Thalmann | ff284c1493 | ||
Manuel Thalmann | d5ed4b4cb7 | ||
Manuel Thalmann | 9312e92e5c | ||
Manuel Thalmann | 2b8b26477f | ||
Manuel Thalmann | 46a6847316 | ||
Manuel Thalmann | 34c53ef27c | ||
Manuel Thalmann | 9763c78886 | ||
Manuel Thalmann | fc515eac83 | ||
Manuel Thalmann | dc579c71b1 | ||
Manuel Thalmann | 2962896615 | ||
Manuel Thalmann | 1d47795c0b | ||
Manuel Thalmann | a9a037597f | ||
Manuel Thalmann | 0dba76d1f5 | ||
Manuel Thalmann | d61ad60d70 | ||
Manuel Thalmann | 72e5abb2b6 | ||
Manuel Thalmann | 053a9ce142 | ||
Manuel Thalmann | 902a8d504d | ||
Manuel Thalmann | e22aab490b | ||
Manuel Thalmann | 7b140b2c7f | ||
Manuel Thalmann | 1c068468c1 | ||
Manuel Thalmann | 488358093f | ||
Manuel Thalmann | 1a2b088678 | ||
Manuel Thalmann | 0fb175012e | ||
Manuel Thalmann | 5879aefe04 | ||
Manuel Thalmann | 4c55137785 | ||
Manuel Thalmann | 68d258daa6 | ||
Manuel Thalmann | 38d123e4f1 | ||
Manuel Thalmann | c4ebf9d72e | ||
Manuel Thalmann | 8372d6b6ef | ||
Manuel Thalmann | 2cb9afaf5a | ||
Manuel Thalmann | 2b73da1f64 | ||
Manuel Thalmann | 4d4b6a9386 | ||
Manuel Thalmann | 47cccf0268 | ||
Manuel Thalmann | 544e1158ff | ||
Manuel Thalmann | 63ffe417ca | ||
Manuel Thalmann | 174980ae76 | ||
Manuel Thalmann | 7a540836dd | ||
Manuel Thalmann | 9383b251ad | ||
Manuel Thalmann | e7ecf83e55 | ||
Manuel Thalmann | 8802f970ae | ||
Manuel Thalmann | 2aa431726c | ||
Manuel Thalmann | 756c990bb0 | ||
Manuel Thalmann | 3f195eb94a | ||
Manuel Thalmann | 9576f7f58a | ||
Manuel Thalmann | 59f3a56183 | ||
Manuel Thalmann | c43d522a08 | ||
Manuel Thalmann | 1cc4a9c023 | ||
Manuel Thalmann | 9c721cea8d | ||
Manuel Thalmann | a6b164da09 | ||
Manuel Thalmann | 7a080893bc | ||
Manuel Thalmann | 2512fab756 | ||
Manuel Thalmann | a620a6d15f | ||
Manuel Thalmann | bb67590008 | ||
Manuel Thalmann | 808f0964f2 | ||
Manuel Thalmann | 92ccdfdda2 | ||
Manuel Thalmann | 9f34efa06b | ||
Manuel Thalmann | 3d86a23e03 | ||
Manuel Thalmann | 8fdb7f7f83 | ||
Manuel Thalmann | d0895eca2e | ||
Manuel Thalmann | e9e0a89acb | ||
Manuel Thalmann | 742ed4afb5 | ||
Manuel Thalmann | c82f95d4fc | ||
Manuel Thalmann | a8f6e80236 | ||
Manuel Thalmann | 1465a3bed0 | ||
Manuel Thalmann | 4182545e18 | ||
Manuel Thalmann | ab0e63f45d | ||
Manuel Thalmann | a8ea8dcbef | ||
Manuel Thalmann | 20d8498b17 | ||
Manuel Thalmann | 46de60f3e9 | ||
Manuel Thalmann | 4d260800b6 | ||
Manuel Thalmann | 99738e0e0b | ||
Manuel Thalmann | b44f8806bf | ||
Manuel Thalmann | 4551b43409 | ||
Manuel Thalmann | b638786a26 | ||
Manuel Thalmann | 4e4a79f7a8 | ||
Manuel Thalmann | 9f6efde958 | ||
Manuel Thalmann | e93c872ddf | ||
Manuel Thalmann | 4532e75e55 | ||
Manuel Thalmann | f0a67ffc4e | ||
Manuel Thalmann | d89019d960 | ||
Manuel Thalmann | 74b28384c7 | ||
Manuel Thalmann | 512a263f2c | ||
Manuel Thalmann | 53bbe011f2 | ||
Manuel Thalmann | 0d9c4c76d5 | ||
Manuel Thalmann | 1f700ab419 | ||
Manuel Thalmann | 59eda06b83 | ||
Manuel Thalmann | 95a49d68f0 | ||
Manuel Thalmann | f9f5b142c8 | ||
Manuel Thalmann | dff8ccaf62 | ||
Manuel Thalmann | 6ff940d47f | ||
Manuel Thalmann | a9c665889e | ||
Manuel Thalmann | 6cac8246c0 | ||
Manuel Thalmann | 609b3223f6 | ||
Manuel Thalmann | a94d633c4b | ||
Manuel Thalmann | 5bd4fb4c45 | ||
Manuel Thalmann | ad7743c3dd | ||
Manuel Thalmann | d16f328767 | ||
Manuel Thalmann | f0e169de33 | ||
Manuel Thalmann | cb589e69ee | ||
Manuel Thalmann | 43cde70d91 | ||
Manuel Thalmann | ffbc87064e | ||
Manuel Thalmann | 179cb57768 | ||
Manuel Thalmann | 3926269a3d | ||
Manuel Thalmann | f03e5b5a06 | ||
Manuel Thalmann | f077c63a55 | ||
Manuel Thalmann | 1a8eac196a | ||
Manuel Thalmann | b5c2eb7882 | ||
Manuel Thalmann | d6027982dc | ||
Manuel Thalmann | 24a3c90749 | ||
Manuel Thalmann | d0c0c62b0c | ||
Manuel Thalmann | d7f34a9c9c | ||
Manuel Thalmann | 0ce927d6ed | ||
Manuel Thalmann | f0b6672fec | ||
Manuel Thalmann | 2fb5fa03c9 | ||
Manuel Thalmann | 14297367ae | ||
Manuel Thalmann | 2392b40987 | ||
Manuel Thalmann | 076b06ef19 | ||
Manuel Thalmann | acc6ca5403 | ||
Manuel Thalmann | 90389abc43 | ||
Manuel Thalmann | 1f0c8ff4e0 | ||
Manuel Thalmann | 6be1a93617 | ||
Manuel Thalmann | d2228ee198 | ||
Manuel Thalmann | d1fefa9d7d | ||
Manuel Thalmann | 15c9550abe | ||
Manuel Thalmann | ba12d3dfdf | ||
Manuel Thalmann | 1a7a5e1f56 | ||
Manuel Thalmann | 96377bc11b | ||
Manuel Thalmann | 47b0e000a1 | ||
Manuel Thalmann | 52db008682 | ||
Manuel Thalmann | aa608e3fb3 | ||
Manuel Thalmann | f6b5aa4378 | ||
Manuel Thalmann | ea51f83639 | ||
Manuel Thalmann | 4108a300c8 | ||
Manuel Thalmann | c161a64d1a | ||
Manuel Thalmann | 15984e16af | ||
Manuel Thalmann | ee51f61a0f | ||
Manuel Thalmann | 2ce9f6f731 | ||
Manuel Thalmann | 1816dd8fe3 | ||
Manuel Thalmann | 693dd414df | ||
Manuel Thalmann | 7411addeba | ||
Manuel Thalmann | 18eaae2164 | ||
Manuel Thalmann | e2a8084b0b | ||
Manuel Thalmann | dd6ccf8b37 | ||
Manuel Thalmann | 09b12efbb8 | ||
Manuel Thalmann | cb3c285078 | ||
Manuel Thalmann | 64611ab928 | ||
Manuel Thalmann | a1674d7090 | ||
Manuel Thalmann | 17820a63a6 | ||
Manuel Thalmann | e91c688063 | ||
Manuel Thalmann | c0bb75a01c | ||
Manuel Thalmann | a012c336b4 | ||
Manuel Thalmann | 4a3e497532 | ||
Manuel Thalmann | 008af9891a | ||
Manuel Thalmann | 04e6c47a5b | ||
Manuel Thalmann | 5ad465f021 | ||
Manuel Thalmann | a0d44ca4a1 | ||
Manuel Thalmann | c80c6e8fc2 | ||
Manuel Thalmann | 85bb47994d | ||
Manuel Thalmann | c24ddfd3aa | ||
Manuel Thalmann | eb3ffcde9f | ||
Manuel Thalmann | 0763b3b5a8 | ||
Manuel Thalmann | 7ea26324b1 | ||
Manuel Thalmann | 888a8093ba | ||
Manuel Thalmann | e0848b6e1b | ||
Manuel Thalmann | 39b44ca6e8 | ||
Manuel Thalmann | e0421e908a | ||
Manuel Thalmann | 95bab2a45d | ||
Manuel Thalmann | 8dfd90d660 | ||
Manuel Thalmann | 5011a8ab8a | ||
Manuel Thalmann | 50d1825f92 | ||
Manuel Thalmann | 4b6f34b812 | ||
Manuel Thalmann | 9116cb8266 | ||
Manuel Thalmann | 0bf8652b03 | ||
Manuel Thalmann | 37268e0e76 | ||
Manuel Thalmann | ce03f18523 | ||
Manuel Thalmann | 30f767a88e | ||
Manuel Thalmann | 103873c517 | ||
Manuel Thalmann | b0351b5878 | ||
Manuel Thalmann | 4875f962b0 | ||
Manuel Thalmann | ee41e5ba66 | ||
Manuel Thalmann | faa1187714 | ||
Manuel Thalmann | b4199c43a6 | ||
Manuel Thalmann | fccc0c2a7a | ||
Manuel Thalmann | e13a1c0eb1 | ||
Manuel Thalmann | 8e0672b53b | ||
Manuel Thalmann | 2a03f8fffe | ||
Manuel Thalmann | f010e1a03d | ||
Manuel Thalmann | c5b71096ec | ||
Manuel Thalmann | 25f613d7a6 | ||
Manuel Thalmann | c0b137903d | ||
Manuel Thalmann | 887cf0b029 | ||
Manuel Thalmann | f01fef4adf | ||
Manuel Thalmann | 1d9ea92f6e | ||
Manuel Thalmann | b4844c631d | ||
Manuel Thalmann | 0d2c28e74a | ||
Manuel Thalmann | 9f43dbf0e8 | ||
Manuel Thalmann | 28a90de5ae | ||
Manuel Thalmann | 18fb258ac2 | ||
Manuel Thalmann | af2b41fb1d | ||
Manuel Thalmann | 17d6870538 | ||
Manuel Thalmann | 2fcc77f4ee | ||
Manuel Thalmann | 120c05ced1 | ||
Manuel Thalmann | 934db1ff87 | ||
Manuel Thalmann | 5baed04a6f | ||
Manuel Thalmann | 7c288a1e53 | ||
Manuel Thalmann | 8cdb32b9a2 | ||
Manuel Thalmann | ceddb4acfa | ||
Manuel Thalmann | ce9cd892bf | ||
Manuel Thalmann | d018ff84c2 | ||
Manuel Thalmann | 529ff841ea | ||
Manuel Thalmann | 3fe762f7a2 | ||
Manuel Thalmann | 014eb975ce | ||
Manuel Thalmann | ce8feb5935 | ||
Manuel Thalmann | a59a306588 | ||
Manuel Thalmann | f2282a9ac6 | ||
Manuel Thalmann | 7179e93084 | ||
Manuel Thalmann | 24edf6a5e7 | ||
Manuel Thalmann | 8305b66342 | ||
Manuel Thalmann | 61520d4953 | ||
Manuel Thalmann | 1829e567ee | ||
Manuel Thalmann | 591eff31f9 | ||
Manuel Thalmann | 6ce1f9b9cc | ||
Manuel Thalmann | 7879b3f915 | ||
Manuel Thalmann | eea1c19dd4 | ||
Manuel Thalmann | 9f5d9874dc | ||
Manuel Thalmann | 5e3e4af20f | ||
Manuel Thalmann | 1058913d7a | ||
Manuel Thalmann | a511aba2d2 | ||
Manuel Thalmann | 4cf9aac9a5 | ||
Manuel Thalmann | bd7a800237 | ||
Manuel Thalmann | 42ac6851c1 | ||
Manuel Thalmann | 72ea501180 | ||
Manuel Thalmann | 94cf40bd22 | ||
Manuel Thalmann | b5d65079da | ||
Manuel Thalmann | bfd8c40548 | ||
Manuel Thalmann | 88f69879df | ||
Manuel Thalmann | 556843f14d | ||
Manuel Thalmann | d5db33cb37 | ||
Manuel Thalmann | 476a721376 | ||
Manuel Thalmann | 6185ca4c60 | ||
Manuel Thalmann | 937ad12042 | ||
Manuel Thalmann | d0889ae6dc | ||
Manuel Thalmann | 56b5f44323 | ||
Manuel Thalmann | cc41fed2fa | ||
Manuel Thalmann | d813d146b7 | ||
Manuel Thalmann | dd71366522 | ||
Manuel Thalmann | da6a3c627d | ||
Manuel Thalmann | 864dd521cf | ||
Manuel Thalmann | 4404b6173b | ||
Manuel Thalmann | 1a8e1d0c40 | ||
Manuel Thalmann | 74efc21819 | ||
Manuel Thalmann | 78c9b76508 | ||
Manuel Thalmann | 875935a223 | ||
Manuel Thalmann | 2de8140182 | ||
Manuel Thalmann | 72a370383d | ||
Manuel Thalmann | 27944f1642 | ||
Manuel Thalmann | c26b791e7d | ||
Manuel Thalmann | 16785a1793 | ||
Manuel Thalmann | bb47bd1b56 | ||
Manuel Thalmann | d7cbe47dc9 | ||
Manuel Thalmann | d632f966ae | ||
Manuel Thalmann | 587e3e4c5f | ||
Manuel Thalmann | f2aee71256 | ||
Manuel Thalmann | c957ee4b19 | ||
Manuel Thalmann | 617a29da3e | ||
Manuel Thalmann | abbda0a38b | ||
Manuel Thalmann | 13d33293eb | ||
Manuel Thalmann | 08ac2e921a | ||
Manuel Thalmann | e7b9a92918 | ||
Manuel Thalmann | 4becccc18b | ||
Manuel Thalmann | 9e1f6ca788 | ||
Manuel Thalmann | f21ff7e5f0 | ||
Manuel Thalmann | c3cc94e57d | ||
Manuel Thalmann | 3f9e6322bd | ||
Manuel Thalmann | 1ad932b017 | ||
Manuel Thalmann | 26f2087ba1 | ||
Manuel Thalmann | 60b8308709 | ||
Manuel Thalmann | 6b6cbd337c | ||
Manuel Thalmann | 1fa55e9578 | ||
Manuel Thalmann | ed6585161e | ||
Manuel Thalmann | 1b5d60b650 | ||
Manuel Thalmann | 90d35da839 | ||
Manuel Thalmann | 931161b4cf | ||
Manuel Thalmann | 37a71f7ed9 | ||
Manuel Thalmann | 5db8d0fec6 | ||
Manuel Thalmann | 1fa4adb53b | ||
Manuel Thalmann | 5a36ee2c42 | ||
Manuel Thalmann | 787ecd7953 | ||
Manuel Thalmann | e8ccc740cf | ||
Manuel Thalmann | 22c0055e96 | ||
Manuel Thalmann | 08b953fdf1 | ||
Manuel Thalmann | 536cacc324 | ||
Manuel Thalmann | e9677a3d6f | ||
Manuel Thalmann | b411a6a73d | ||
Manuel Thalmann | 07dc211904 | ||
Manuel Thalmann | 790abdb5f3 | ||
Manuel Thalmann | 31ce380ebc | ||
Manuel Thalmann | 7262a7752e | ||
Manuel Thalmann | b305d93637 | ||
Manuel Thalmann | 5db92219aa | ||
Manuel Thalmann | 444f5e3f70 | ||
Manuel Thalmann | 58727d3dae | ||
Manuel Thalmann | d90f81ecc1 | ||
Manuel Thalmann | 2bd2daf158 | ||
Manuel Thalmann | e293b56f8c | ||
Manuel Thalmann | 59009a4628 | ||
Manuel Thalmann | 39e904cc7f | ||
Manuel Thalmann | 3ea2f39ced | ||
Manuel Thalmann | 4f9b3f6ecd | ||
Manuel Thalmann | 80e370e954 | ||
Manuel Thalmann | 9d767fa845 | ||
Manuel Thalmann | 416a55df76 | ||
Manuel Thalmann | dc156b7316 | ||
Manuel Thalmann | 710268ed28 | ||
Manuel Thalmann | dfa18b0671 | ||
Manuel Thalmann | 394194d979 | ||
Manuel Thalmann | 1fb69f9cf9 | ||
Manuel Thalmann | 3ac5e0b712 | ||
Manuel Thalmann | 137a41bdc1 | ||
Manuel Thalmann | 763b3ad3a2 | ||
Manuel Thalmann | 6a7a237882 | ||
Manuel Thalmann | 03e62fce35 | ||
Manuel Thalmann | 784f05d80e | ||
Manuel Thalmann | 44689082cf | ||
Manuel Thalmann | 6d6a187d29 | ||
Manuel Thalmann | 2d585b7e7b | ||
Manuel Thalmann | 39967a3efb | ||
Manuel Thalmann | 553174e610 | ||
Manuel Thalmann | 80f18a2014 | ||
Manuel Thalmann | f8190f1d02 | ||
Manuel Thalmann | a6ef92d55f | ||
Manuel Thalmann | 9ef634c1b7 | ||
Manuel Thalmann | 1a1d75e19c | ||
Manuel Thalmann | 8f1b6bf2ed | ||
Manuel Thalmann | ed854c8c3c | ||
Manuel Thalmann | 2b9fa4f72f | ||
Manuel Thalmann | 3bce7da58f | ||
Manuel Thalmann | 524e96c9ec | ||
Manuel Thalmann | 6d55b8a31d | ||
Manuel Thalmann | 3d2f0fee27 | ||
Manuel Thalmann | 97a0466f94 | ||
Manuel Thalmann | a3b17d50a5 | ||
Manuel Thalmann | bc571560a9 | ||
Manuel Thalmann | 0587c402ae | ||
Manuel Thalmann | 984de111eb | ||
Manuel Thalmann | b9803a2de7 | ||
Manuel Thalmann | cd0b79820a | ||
Manuel Thalmann | 76e9f69a2a | ||
Manuel Thalmann | 9d5c9eb55b | ||
Manuel Thalmann | ded13359b3 | ||
Manuel Thalmann | 022b623752 | ||
Manuel Thalmann | ba5346787b | ||
Manuel Thalmann | 630e42629e | ||
Manuel Thalmann | 96ab1a2322 | ||
Manuel Thalmann | fef722f9e5 | ||
Manuel Thalmann | 8572ef1f46 | ||
Manuel Thalmann | ee4d402a5d | ||
Manuel Thalmann | b016f310ea | ||
Manuel Thalmann | ec5b19474d | ||
Manuel Thalmann | 34d6ced776 | ||
Manuel Thalmann | 6662828dbe | ||
Manuel Thalmann | 9b1654c828 | ||
Manuel Thalmann | 8ae54f48e8 | ||
Manuel Thalmann | 6dde1d3603 | ||
Manuel Thalmann | e85504e40e | ||
Manuel Thalmann | 1452bd3f1e | ||
Manuel Thalmann | 67152b7661 | ||
Manuel Thalmann | b9591cb36f | ||
Manuel Thalmann | f8b7f2481b | ||
Manuel Thalmann | 98020588ce | ||
Manuel Thalmann | a5eac04749 | ||
Manuel Thalmann | 8cfceba667 | ||
Manuel Thalmann | e206df494e | ||
Manuel Thalmann | 75f9c54840 | ||
Manuel Thalmann | ace227693c | ||
Manuel Thalmann | ceb036e80f | ||
Manuel Thalmann | 134bf77a9a | ||
Manuel Thalmann | 3542cd33e4 | ||
Manuel Thalmann | 3225d00f31 | ||
Manuel Thalmann | ec5e4c6340 | ||
Manuel Thalmann | d6b7adb505 | ||
Manuel Thalmann | 7f652770d1 | ||
Manuel Thalmann | 68aaa413a6 | ||
Manuel Thalmann | d302f21790 | ||
Manuel Thalmann | 53ac1902ac | ||
Manuel Thalmann | 64c1f6e6e6 | ||
Manuel Thalmann | c9cbc56d9b | ||
Manuel Thalmann | e5597f52bb | ||
Manuel Thalmann | 3c931ecaa4 | ||
Manuel Thalmann | 28215029fc | ||
Manuel Thalmann | eeaf5e02d4 | ||
Manuel Thalmann | 39a7f508a8 | ||
Manuel Thalmann | 1e6dee9fbf | ||
Manuel Thalmann | ca3bd7269d | ||
Manuel Thalmann | 5af51b76cf | ||
Manuel Thalmann | 208a559b31 | ||
Manuel Thalmann | eed031e193 | ||
Manuel Thalmann | 7215cfe7b0 | ||
Manuel Thalmann | bc32dd49cf | ||
Manuel Thalmann | eb6bcc0c0c | ||
Manuel Thalmann | ab44eed518 | ||
Manuel Thalmann | 42045d4570 | ||
Manuel Thalmann | 0b43f4db9b | ||
Manuel Thalmann | e717c9ba29 | ||
Manuel Thalmann | e37a482ed0 | ||
Manuel Thalmann | 2fc4ff4625 | ||
Manuel Thalmann | a8e5b39a45 | ||
Manuel Thalmann | b68564064f | ||
Manuel Thalmann | 4a00f804ad | ||
Manuel Thalmann | 18ebf99de1 | ||
Manuel Thalmann | d1a8d08780 | ||
Manuel Thalmann | c07961826e | ||
Manuel Thalmann | dac832c8bb | ||
Manuel Thalmann | 9cd44db4e8 | ||
Manuel Thalmann | 1b0fc045d5 | ||
Manuel Thalmann | 96d454475d | ||
Manuel Thalmann | 1452c2c9f2 | ||
Manuel Thalmann | 66b374e1ad | ||
Manuel Thalmann | 28cddf6a1b | ||
Manuel Thalmann | 294609430e | ||
Manuel Thalmann | c56d79f21e | ||
Manuel Thalmann | c2c088ee6b | ||
Manuel Thalmann | 5975f96155 | ||
Manuel Thalmann | cffe1672e8 | ||
Manuel Thalmann | bfb86531b5 | ||
Manuel Thalmann | 7efb82e0e6 | ||
Manuel Thalmann | 95affefc35 | ||
Manuel Thalmann | 382e3aac61 | ||
Manuel Thalmann | 60dc4af97e | ||
Manuel Thalmann | 2abd362e22 | ||
Manuel Thalmann | 7ed20680b1 | ||
Manuel Thalmann | 0a47d980c5 | ||
Manuel Thalmann | 6ff93d2060 | ||
Manuel Thalmann | 120888b232 | ||
Manuel Thalmann | a762ca15d1 | ||
Manuel Thalmann | 1d388471d9 | ||
Manuel Thalmann | 6eec0251f5 | ||
Manuel Thalmann | ffaf0eb403 | ||
Manuel Thalmann | 9d7c26b868 | ||
Manuel Thalmann | 5e4aab3eb3 | ||
Manuel Thalmann | 5e0a25c2b6 | ||
Manuel Thalmann | 7bcea552b2 | ||
Manuel Thalmann | 5b38858526 | ||
Manuel Thalmann | 3fec9f0a1b | ||
Manuel Thalmann | ed950a1da3 | ||
Manuel Thalmann | 7ac1e9cb1d | ||
Manuel Thalmann | 6521f7e861 | ||
Manuel Thalmann | 923bd456ea | ||
Manuel Thalmann | 5308dfceff | ||
Manuel Thalmann | 78cb5ae8fd | ||
Manuel Thalmann | 2b50801f5d | ||
Manuel Thalmann | f6260d41a1 | ||
Manuel Thalmann | e28de727c0 | ||
Manuel Thalmann | 3411e4287b | ||
Manuel Thalmann | 221a7b749d | ||
Manuel Thalmann | 3342ca10d1 | ||
Manuel Thalmann | 9392cf2aae | ||
Manuel Thalmann | 4585b3c751 | ||
Manuel Thalmann | afd488dbda | ||
Manuel Thalmann | 0584532785 | ||
Manuel Thalmann | a0f74c7776 | ||
Manuel Thalmann | c88c6b434c | ||
Manuel Thalmann | 50ca9227b5 | ||
Manuel Thalmann | 69b934c3d0 | ||
Manuel Thalmann | cddae6ef2b | ||
Manuel Thalmann | c8139ae9c3 | ||
Manuel Thalmann | f863d9e360 | ||
Manuel Thalmann | 107b8fc14b | ||
Manuel Thalmann | c97150e22d | ||
Manuel Thalmann | eb8f07def1 | ||
Manuel Thalmann | 3b346ee757 | ||
Manuel Thalmann | 7118623d15 | ||
Manuel Thalmann | 51bcc6c16f | ||
Manuel Thalmann | 9a940d3c82 | ||
Manuel Thalmann | eea07cbe00 | ||
Manuel Thalmann | b1276083fb | ||
Manuel Thalmann | ce2681ed2b | ||
Manuel Thalmann | 0c378ba754 | ||
Manuel Thalmann | 422499e9cc | ||
Manuel Thalmann | 40418dc7f3 | ||
Manuel Thalmann | 4fb9e3b228 | ||
Manuel Thalmann | 6f1bfcd1f2 | ||
Manuel Thalmann | ad191005ca | ||
Manuel Thalmann | 0c1ce6cdca | ||
Manuel Thalmann | 03c465ed96 | ||
Manuel Thalmann | ddfbc0e53f | ||
Manuel Thalmann | 0875cd8bee | ||
Manuel Thalmann | 8a8d470e5d | ||
Manuel Thalmann | c2958ec453 | ||
Manuel Thalmann | 3e8eca8876 | ||
Manuel Thalmann | 3e234d701b | ||
Manuel Thalmann | eb96816af6 | ||
Manuel Thalmann | fed56d5609 | ||
Manuel Thalmann | 12fcf13210 | ||
Manuel Thalmann | 1d6c41974f | ||
Manuel Thalmann | 4c4d2c75e9 | ||
Manuel Thalmann | 391ba0c92d | ||
Manuel Thalmann | 757906d155 | ||
Manuel Thalmann | 2270614318 | ||
Manuel Thalmann | 00b63b58d4 | ||
Manuel Thalmann | a926829cc2 | ||
Manuel Thalmann | 5f58124bbd | ||
Manuel Thalmann | 9fb47de6db | ||
Manuel Thalmann | 8d14af4cef | ||
Manuel Thalmann | 1cd890e04a | ||
Manuel Thalmann | a6655dfea7 | ||
Manuel Thalmann | 0877c36623 | ||
Manuel Thalmann | f993387a2d | ||
Manuel Thalmann | fa88419548 | ||
Manuel Thalmann | 82fbc84565 | ||
Manuel Thalmann | b6afa29dc2 | ||
Manuel Thalmann | b19767ea08 | ||
Manuel Thalmann | f54659fd94 | ||
Manuel Thalmann | eaa85ce56d | ||
Manuel Thalmann | ec29ab5002 | ||
Manuel Thalmann | 3a6f921790 | ||
Manuel Thalmann | c5e7afa396 | ||
Manuel Thalmann | cb000757d8 | ||
Manuel Thalmann | 3f320ec605 | ||
Manuel Thalmann | 0d05a56b9c | ||
Manuel Thalmann | 9cca02b44c | ||
Manuel Thalmann | c8f96fcb31 | ||
Manuel Thalmann | 6aa3724e32 | ||
Manuel Thalmann | 30bfcafeae | ||
Manuel Thalmann | 9b65cb96f7 | ||
Manuel Thalmann | c841dadb7e | ||
Manuel Thalmann | bbc0df9fd4 | ||
Manuel Thalmann | ce2feb0dc1 | ||
Manuel Thalmann | 3ab402c474 | ||
Manuel Thalmann | 53e0557025 | ||
Manuel Thalmann | de471cae6f | ||
Manuel Thalmann | aa360ac456 | ||
Manuel Thalmann | 1db727efd9 | ||
Manuel Thalmann | 8b05b16f1f | ||
Manuel Thalmann | 9a75e6bed2 | ||
Manuel Thalmann | 50f81e15e3 | ||
Manuel Thalmann | c5548e6858 | ||
Manuel Thalmann | da94859be9 | ||
Manuel Thalmann | 893075c857 | ||
Manuel Thalmann | 3ecd50e55c | ||
Manuel Thalmann | 245f2ce987 | ||
Manuel Thalmann | 34e850d789 |
2
.gitattributes
vendored
Normal file
2
.gitattributes
vendored
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
*.fish text eol=lf
|
||||||
|
*.sh text eol=lf
|
|
@ -10,6 +10,10 @@
|
||||||
{
|
{
|
||||||
"name": "archiso-valhalla",
|
"name": "archiso-valhalla",
|
||||||
"path": "./archiso"
|
"path": "./archiso"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "winiso-valhalla",
|
||||||
|
"path": "./winiso"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,7 +23,7 @@ automated_script() {
|
||||||
sleep 1
|
sleep 1
|
||||||
done
|
done
|
||||||
printf '%s: downloading %s\n' "$0" "${script}"
|
printf '%s: downloading %s\n' "$0" "${script}"
|
||||||
curl "${script}" --location --retry-connrefused --retry 10 -s -o /tmp/startup_script
|
curl "${script}" --location --retry-connrefused --retry 10 --fail -s -o /tmp/startup_script
|
||||||
rt=$?
|
rt=$?
|
||||||
else
|
else
|
||||||
cp "${script}" /tmp/startup_script
|
cp "${script}" /tmp/startup_script
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
extra-experimental-features = nix-command flakes
|
|
|
@ -1,8 +1,8 @@
|
||||||
diff --git a/airootfs/root/.zlogin b/airootfs/root/.zlogin
|
diff --git a/airootfs/root/.zlogin b/airootfs/root/.zlogin
|
||||||
index bf6bc8f..76e5893 100755
|
index bf6bc8f..a0dae7b 100755
|
||||||
--- a/airootfs/root/.zlogin
|
--- a/airootfs/root/.zlogin
|
||||||
+++ b/airootfs/root/.zlogin
|
+++ b/airootfs/root/.zlogin
|
||||||
@@ -4,3 +4,18 @@ if grep -Fqa 'accessibility=' /proc/cmdline &> /dev/null; then
|
@@ -4,3 +4,19 @@ if grep -Fqa 'accessibility=' /proc/cmdline &> /dev/null; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
~/.automated_script.sh
|
~/.automated_script.sh
|
||||||
|
@ -16,13 +16,14 @@ index bf6bc8f..76e5893 100755
|
||||||
+
|
+
|
||||||
+git diff -p -R --no-ext-diff --no-color --diff-filter=M \
|
+git diff -p -R --no-ext-diff --no-color --diff-filter=M \
|
||||||
+ | grep -E "^(diff|(old|new) mode)" --color=never \
|
+ | grep -E "^(diff|(old|new) mode)" --color=never \
|
||||||
|
+ | sed "/^diff/{ x; d; }; x; /./{ p; z; }; x;" \
|
||||||
+ | git apply
|
+ | git apply
|
||||||
+
|
+
|
||||||
+popd > /dev/null
|
+popd > /dev/null
|
||||||
+
|
+
|
||||||
+loadkeys de_CH-latin1
|
+loadkeys de_CH-latin1
|
||||||
diff --git a/packages.x86_64 b/packages.x86_64
|
diff --git a/packages.x86_64 b/packages.x86_64
|
||||||
index 9e876e7..b89ab30 100755
|
index 9e876e7..c5db92a 100755
|
||||||
--- a/packages.x86_64
|
--- a/packages.x86_64
|
||||||
+++ b/packages.x86_64
|
+++ b/packages.x86_64
|
||||||
@@ -30,8 +30,10 @@ ethtool
|
@@ -30,8 +30,10 @@ ethtool
|
||||||
|
@ -36,7 +37,15 @@ index 9e876e7..b89ab30 100755
|
||||||
gnu-netcat
|
gnu-netcat
|
||||||
gpart
|
gpart
|
||||||
gpm
|
gpm
|
||||||
@@ -75,6 +77,7 @@ nbd
|
@@ -45,6 +47,7 @@ irssi
|
||||||
|
iw
|
||||||
|
iwd
|
||||||
|
jfsutils
|
||||||
|
+jq
|
||||||
|
kitty-terminfo
|
||||||
|
ldns
|
||||||
|
less
|
||||||
|
@@ -75,6 +78,7 @@ nbd
|
||||||
ndisc6
|
ndisc6
|
||||||
nfs-utils
|
nfs-utils
|
||||||
nilfs-utils
|
nilfs-utils
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
flake-utils.url = "github:numtide/flake-utils?ref=b1d9ab70662946ef0850d488da1c9019f3a9752a";
|
flake-utils.url = "github:numtide/flake-utils?ref=b1d9ab70662946ef0850d488da1c9019f3a9752a";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { self, flake-utils, nixpkgs }: flake-utils.lib.eachDefaultSystem (
|
outputs = { self, flake-utils, nixpkgs }: (flake-utils.lib.eachDefaultSystem (
|
||||||
system:
|
system:
|
||||||
let
|
let
|
||||||
pkgs = import nixpkgs {
|
pkgs = import nixpkgs {
|
||||||
|
@ -32,5 +32,10 @@
|
||||||
packages = {
|
packages = {
|
||||||
archiso = pkgs.archiso;
|
archiso = pkgs.archiso;
|
||||||
};
|
};
|
||||||
});
|
})) // {
|
||||||
|
valhalla = {
|
||||||
|
DerGeret = import ./profiles/machines/manuel/DerGeret/Arch/config.nix;
|
||||||
|
ManuSurface = import ./profiles/machines/manuel/ManuSurface/Arch/config.nix;
|
||||||
|
};
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
15
lib/eval-attribute.nix
Normal file
15
lib/eval-attribute.nix
Normal file
|
@ -0,0 +1,15 @@
|
||||||
|
let
|
||||||
|
inherit (nixpkgs) lib;
|
||||||
|
nixpkgs = import <nixpkgs> { config = {}; overlay = []; };
|
||||||
|
property = (builtins.getEnv "PROPERTY");
|
||||||
|
processor = if (builtins.stringLength property > 0)
|
||||||
|
then
|
||||||
|
(_: lib.attrsets.getAttrFromPath (lib.strings.splitString "." property) _)
|
||||||
|
else
|
||||||
|
(_: _);
|
||||||
|
in
|
||||||
|
_: processor (lib.evalModules {
|
||||||
|
modules = [
|
||||||
|
_
|
||||||
|
];
|
||||||
|
}).config
|
16
lib/eval-module.nix
Normal file
16
lib/eval-module.nix
Normal file
|
@ -0,0 +1,16 @@
|
||||||
|
let
|
||||||
|
inherit (nixpkgs) lib;
|
||||||
|
nixpkgs = import <nixpkgs> { config = {}; overlay = []; };
|
||||||
|
file = (builtins.getEnv "FILE");
|
||||||
|
property = (builtins.getEnv "PROPERTY");
|
||||||
|
processor = if (builtins.stringLength property > 0)
|
||||||
|
then
|
||||||
|
(_: lib.attrsets.getAttrFromPath (lib.strings.splitString "." property) _)
|
||||||
|
else
|
||||||
|
(_: _);
|
||||||
|
in
|
||||||
|
processor (lib.evalModules {
|
||||||
|
modules = [
|
||||||
|
(import file)
|
||||||
|
];
|
||||||
|
}).config
|
|
@ -1,41 +0,0 @@
|
||||||
{ lib, ... }:
|
|
||||||
let
|
|
||||||
inherit (lib)
|
|
||||||
mkOption
|
|
||||||
types
|
|
||||||
;
|
|
||||||
|
|
||||||
gitOptions = {
|
|
||||||
defaultBranch = mkOption {
|
|
||||||
type = types.nullOr types.str;
|
|
||||||
description = "The name of the default branch in git.";
|
|
||||||
default = null;
|
|
||||||
};
|
|
||||||
|
|
||||||
flow = {
|
|
||||||
mainBranch = mkOption {
|
|
||||||
type = types.nullOr types.str;
|
|
||||||
description = "The name of the stable branch in git flow.";
|
|
||||||
default = null;
|
|
||||||
};
|
|
||||||
|
|
||||||
devBranch = mkOption {
|
|
||||||
type = types.nullOr types.str;
|
|
||||||
description = "The name of the development branch in git flow.";
|
|
||||||
default = null;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
aliases = mkOption {
|
|
||||||
type = types.attrsOf types.str;
|
|
||||||
description = "Git command aliases to install.";
|
|
||||||
default = {};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
in {
|
|
||||||
options = {
|
|
||||||
valhalla = {
|
|
||||||
git = gitOptions;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
55
lib/modules/hardware.nix
Normal file
55
lib/modules/hardware.nix
Normal file
|
@ -0,0 +1,55 @@
|
||||||
|
{ lib, ... }:
|
||||||
|
let
|
||||||
|
inherit (lib)
|
||||||
|
mkOption
|
||||||
|
types
|
||||||
|
;
|
||||||
|
in {
|
||||||
|
options = {
|
||||||
|
valhalla = {
|
||||||
|
hardware = {
|
||||||
|
components = mkOption {
|
||||||
|
type = types.listOf types.str;
|
||||||
|
description = "The names of the hardware components of the computer.";
|
||||||
|
default = [];
|
||||||
|
};
|
||||||
|
|
||||||
|
eyeX = mkOption {
|
||||||
|
type = types.bool;
|
||||||
|
description = "A value indicating whether a Tobii EyeX device is present.";
|
||||||
|
default = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
amdCPU = mkOption {
|
||||||
|
type = types.bool;
|
||||||
|
description = "A value indicating whether an AMD CPU is present.";
|
||||||
|
default = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
nvidiaGPU = mkOption {
|
||||||
|
type = types.bool;
|
||||||
|
description = "A value indicating whether an NVIDIA GPU is present.";
|
||||||
|
default = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
corsairDevice = mkOption {
|
||||||
|
type = types.bool;
|
||||||
|
description = "A value indicating whether a Corsair device is present.";
|
||||||
|
default = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
elgatoWave = mkOption {
|
||||||
|
type = types.bool;
|
||||||
|
description = "A value indicating whether an Elgato Wave device is present.";
|
||||||
|
default = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
logitechG = mkOption {
|
||||||
|
type = types.bool;
|
||||||
|
description = "A value indicating whether a Logitech G device is present.";
|
||||||
|
default = false;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
52
lib/modules/os.nix
Normal file
52
lib/modules/os.nix
Normal file
|
@ -0,0 +1,52 @@
|
||||||
|
{ lib, ... }:
|
||||||
|
let
|
||||||
|
inherit (lib)
|
||||||
|
mkOption
|
||||||
|
types
|
||||||
|
;
|
||||||
|
in {
|
||||||
|
options = {
|
||||||
|
valhalla = mkOption {
|
||||||
|
type = types.submodule (
|
||||||
|
{ extendModules, ... }:
|
||||||
|
let
|
||||||
|
osVariant = extendModules {
|
||||||
|
modules = [
|
||||||
|
({ config, ... }: {
|
||||||
|
options = {
|
||||||
|
config = mkOption {
|
||||||
|
type = types.attrs;
|
||||||
|
description = "The configuration of the Operating System.";
|
||||||
|
default = builtins.removeAttrs config ["_module" "config" "linux" "windows"];
|
||||||
|
visible = false;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
})
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
linuxVariant = osVariant.extendModules { };
|
||||||
|
windowsVariant = osVariant.extendModules { };
|
||||||
|
in {
|
||||||
|
options = {
|
||||||
|
linux = mkOption {
|
||||||
|
inherit (linuxVariant) type;
|
||||||
|
description = "The options for setting up Linux.";
|
||||||
|
default = {};
|
||||||
|
visible = "shallow";
|
||||||
|
};
|
||||||
|
|
||||||
|
windows = mkOption {
|
||||||
|
inherit (windowsVariant) type;
|
||||||
|
description = "The options for setting up Windows.";
|
||||||
|
default = {};
|
||||||
|
visible = "shallow";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
description = "Configuration for PortValhalla.";
|
||||||
|
default = {};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
59
lib/modules/packages/git.nix
Normal file
59
lib/modules/packages/git.nix
Normal file
|
@ -0,0 +1,59 @@
|
||||||
|
{ lib, ... }:
|
||||||
|
let
|
||||||
|
inherit (lib)
|
||||||
|
mkOption
|
||||||
|
types
|
||||||
|
;
|
||||||
|
|
||||||
|
gitType = types.submodule (
|
||||||
|
{ ... }: {
|
||||||
|
options = {
|
||||||
|
defaultBranch = mkOption {
|
||||||
|
type = types.nullOr types.str;
|
||||||
|
description = "The name of the default branch in newly created repositories.";
|
||||||
|
default = null;
|
||||||
|
};
|
||||||
|
|
||||||
|
flow = {
|
||||||
|
mainBranch = mkOption {
|
||||||
|
type = types.nullOr types.str;
|
||||||
|
description = "The name of the stable branch in git flow.";
|
||||||
|
default = null;
|
||||||
|
};
|
||||||
|
|
||||||
|
devBranch = mkOption {
|
||||||
|
type = types.nullOr types.str;
|
||||||
|
description = "The name of the development branch in git flow.";
|
||||||
|
default = null;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
aliases = mkOption {
|
||||||
|
type = types.attrsOf types.str;
|
||||||
|
description = "The git command aliases to install.";
|
||||||
|
default = {};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
gitOption = mkOption {
|
||||||
|
type = gitType;
|
||||||
|
description = "The git related options.";
|
||||||
|
default = {};
|
||||||
|
};
|
||||||
|
in {
|
||||||
|
options = {
|
||||||
|
valhalla = {
|
||||||
|
git = gitOption;
|
||||||
|
|
||||||
|
users = mkOption {
|
||||||
|
type = types.attrsOf (types.submodule (
|
||||||
|
{ ... }: {
|
||||||
|
options = {
|
||||||
|
git = gitOption;
|
||||||
|
};
|
||||||
|
}));
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
44
lib/modules/packages/nextcloud.nix
Normal file
44
lib/modules/packages/nextcloud.nix
Normal file
|
@ -0,0 +1,44 @@
|
||||||
|
{ lib, ... }:
|
||||||
|
let
|
||||||
|
inherit (lib)
|
||||||
|
mkEnableOption
|
||||||
|
mkOption
|
||||||
|
types
|
||||||
|
;
|
||||||
|
|
||||||
|
syncType = types.submodule (
|
||||||
|
{ ... }: {
|
||||||
|
options = {
|
||||||
|
remotePath = mkOption {
|
||||||
|
type = types.str;
|
||||||
|
description = "The path to the folder on the cloud to sync.";
|
||||||
|
};
|
||||||
|
|
||||||
|
localPath = mkOption {
|
||||||
|
type = types.str;
|
||||||
|
description = "The path to sync the cloud content to.";
|
||||||
|
};
|
||||||
|
|
||||||
|
virtualFiles = (mkEnableOption "virtual file support") // {
|
||||||
|
default = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
});
|
||||||
|
in {
|
||||||
|
options = {
|
||||||
|
valhalla.windows.users = mkOption {
|
||||||
|
type = types.attrsOf (types.submodule (
|
||||||
|
{ ... }: {
|
||||||
|
options = {
|
||||||
|
nextcloud = {
|
||||||
|
folderSyncs = mkOption {
|
||||||
|
type = types.listOf syncType;
|
||||||
|
description = "The folders to synchronize.";
|
||||||
|
default = [];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}));
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
55
lib/modules/packages/oh-my-posh.nix
Normal file
55
lib/modules/packages/oh-my-posh.nix
Normal file
|
@ -0,0 +1,55 @@
|
||||||
|
{ lib, ... }:
|
||||||
|
let
|
||||||
|
inherit (lib)
|
||||||
|
mkOption
|
||||||
|
types
|
||||||
|
;
|
||||||
|
|
||||||
|
themeType = types.submodule (
|
||||||
|
{ config, ... }: {
|
||||||
|
options = {
|
||||||
|
source = mkOption {
|
||||||
|
type = types.path;
|
||||||
|
description = "The path to the oh-my-posh theme to use.";
|
||||||
|
};
|
||||||
|
|
||||||
|
name = mkOption {
|
||||||
|
type = types.nullOr types.str;
|
||||||
|
description = "The name of the theme.";
|
||||||
|
default = lib.strings.removeSuffix ".omp" (lib.strings.removeSuffix ".json" (builtins.baseNameOf config.source));
|
||||||
|
};
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
ompType = types.submodule (
|
||||||
|
{ config, ... }: {
|
||||||
|
options = {
|
||||||
|
theme = mkOption {
|
||||||
|
type = types.nullOr (types.either types.str themeType);
|
||||||
|
description = "The default theme.";
|
||||||
|
default = null;
|
||||||
|
};
|
||||||
|
|
||||||
|
additionalThemes = mkOption {
|
||||||
|
type = types.listOf themeType;
|
||||||
|
description = "A set of additional themes to install.";
|
||||||
|
default = [];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
});
|
||||||
|
in {
|
||||||
|
options = {
|
||||||
|
valhalla.users = mkOption {
|
||||||
|
type = types.attrsOf (types.submodule (
|
||||||
|
{ ... }: {
|
||||||
|
options = {
|
||||||
|
oh-my-posh = mkOption {
|
||||||
|
type = ompType;
|
||||||
|
description = "The Oh My Posh configuration to apply.";
|
||||||
|
default = {};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}));
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
40
lib/modules/packages/rclone.nix
Normal file
40
lib/modules/packages/rclone.nix
Normal file
|
@ -0,0 +1,40 @@
|
||||||
|
{ lib, ... }:
|
||||||
|
let
|
||||||
|
inherit (lib)
|
||||||
|
mkOption
|
||||||
|
types
|
||||||
|
;
|
||||||
|
|
||||||
|
syncType = types.submodule (
|
||||||
|
{ ... }: {
|
||||||
|
options = {
|
||||||
|
dirName = mkOption {
|
||||||
|
type = types.str;
|
||||||
|
description = "The name of the directory to sync the remote files to.";
|
||||||
|
};
|
||||||
|
|
||||||
|
cacheDuration = mkOption {
|
||||||
|
type = types.nullOr types.str;
|
||||||
|
description = "The amount of time to keep cached files.";
|
||||||
|
default = null;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
});
|
||||||
|
in {
|
||||||
|
options = {
|
||||||
|
valhalla.linux.users = mkOption {
|
||||||
|
type = types.attrsOf (types.submodule (
|
||||||
|
{ ... }: {
|
||||||
|
options = {
|
||||||
|
rclone = {
|
||||||
|
configurations = mkOption {
|
||||||
|
type = types.attrsOf syncType;
|
||||||
|
description = "The configurations of the rclone mounts.";
|
||||||
|
default = {};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}));
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
|
@ -8,6 +8,7 @@
|
||||||
fs = import ./fs.nix;
|
fs = import ./fs.nix;
|
||||||
|
|
||||||
diskListVarName = "myDisks";
|
diskListVarName = "myDisks";
|
||||||
|
probeScript = "partprobe 2> /dev/null || true";
|
||||||
isSwap = partition: builtins.elem partition.type [fs.swap 19];
|
isSwap = partition: builtins.elem partition.type [fs.swap 19];
|
||||||
|
|
||||||
mkDiskType = osDisk: types.submodule (
|
mkDiskType = osDisk: types.submodule (
|
||||||
|
@ -136,19 +137,12 @@
|
||||||
|
|
||||||
create = lib.strings.concatLines [
|
create = lib.strings.concatLines [
|
||||||
(appendScript "${toString index}: \"$(${sizeOption})\" type=${mkType type}")
|
(appendScript "${toString index}: \"$(${sizeOption})\" type=${mkType type}")
|
||||||
# Wait for partition to be detected
|
probeScript
|
||||||
''echo "Waiting for ${partVar} to appear..."''
|
|
||||||
''
|
|
||||||
while true;
|
|
||||||
do
|
|
||||||
[ -b ${partVar} ] && break;
|
|
||||||
done;
|
|
||||||
''
|
|
||||||
"sudo ${formatScripts.${format}}"
|
"sudo ${formatScripts.${format}}"
|
||||||
];
|
];
|
||||||
|
|
||||||
fallback = ''
|
fallback = ''
|
||||||
if ! { ls "${diskVar}"?(p)${toString index} 2>&1; } > /dev/null
|
if ! { ls "${partVar}" 2>&1; } > /dev/null
|
||||||
then
|
then
|
||||||
${create}
|
${create}
|
||||||
fi
|
fi
|
||||||
|
@ -329,13 +323,7 @@
|
||||||
mountScript = lib.strings.concatLines (
|
mountScript = lib.strings.concatLines (
|
||||||
builtins.concatMap
|
builtins.concatMap
|
||||||
(_: [
|
(_: [
|
||||||
''echo "Waiting for "${lib.strings.escapeShellArg (partPath _)}" to appear..."''
|
probeScript
|
||||||
''
|
|
||||||
while true;
|
|
||||||
do
|
|
||||||
[ -b ${lib.strings.escapeShellArg (partPath _)} ] && break
|
|
||||||
done
|
|
||||||
''
|
|
||||||
(builtins.concatStringsSep " " [
|
(builtins.concatStringsSep " " [
|
||||||
"sudo"
|
"sudo"
|
||||||
"mount"
|
"mount"
|
||||||
|
@ -351,13 +339,20 @@
|
||||||
|
|
||||||
swapScript = lib.strings.concatLines (
|
swapScript = lib.strings.concatLines (
|
||||||
builtins.map
|
builtins.map
|
||||||
(_: "sudo swapon ${partPath _}")
|
(_: ''
|
||||||
|
${probeScript}
|
||||||
|
sudo swapon ${partPath _}
|
||||||
|
'')
|
||||||
(builtins.filter (_: _.useSwap) partitions));
|
(builtins.filter (_: _.useSwap) partitions));
|
||||||
in lib.strings.concatLines (
|
in lib.strings.concatLines ([
|
||||||
(builtins.map (_: _.deviceScript) disks) ++ lib.optionals ((builtins.length disks) > 0) [
|
"#!/bin/bash"
|
||||||
|
"set -o errexit"
|
||||||
|
] ++
|
||||||
|
(builtins.map (_: _.deviceScript) disks) ++
|
||||||
|
lib.optionals ((builtins.length disks) > 0) [
|
||||||
". ${./../../../scripts/Common/Scripts/is-truthy.sh}"
|
". ${./../../../scripts/Common/Scripts/is-truthy.sh}"
|
||||||
''echo "$(tput setaf 3)==== WARNING ====$(tput sgr0)"''
|
''echo "$(tput setaf 3)==== WARNING ====$(tput sgr0)"''
|
||||||
(''echo "Continuing this script will wipe the contents of '' + (
|
(''echo "Continuing this script will alter the partitions of '' + (
|
||||||
lib.strings.concatStringsSep ", " (builtins.map (_: "${_.deviceVariable}") (lib.lists.init disks))
|
lib.strings.concatStringsSep ", " (builtins.map (_: "${_.deviceVariable}") (lib.lists.init disks))
|
||||||
) + (if (builtins.length disks) > 1 then " and " else "") + (lib.lists.last disks).deviceVariable + ''"'')
|
) + (if (builtins.length disks) > 1 then " and " else "") + (lib.lists.last disks).deviceVariable + ''"'')
|
||||||
''read -p "Are you sure you want to continue? [y/n] " answer''
|
''read -p "Are you sure you want to continue? [y/n] " answer''
|
||||||
|
|
|
@ -12,6 +12,7 @@
|
||||||
software =
|
software =
|
||||||
let
|
let
|
||||||
inherit (cfg.software)
|
inherit (cfg.software)
|
||||||
|
coding
|
||||||
common
|
common
|
||||||
desktopExperience
|
desktopExperience
|
||||||
school
|
school
|
||||||
|
@ -42,6 +43,12 @@
|
||||||
default = common && !server;
|
default = common && !server;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
fileSync = mkOption {
|
||||||
|
type = types.bool;
|
||||||
|
description = "A value indicating whether file syncs should be installed.";
|
||||||
|
default = common && !server;
|
||||||
|
};
|
||||||
|
|
||||||
school = mkOption {
|
school = mkOption {
|
||||||
type = types.bool;
|
type = types.bool;
|
||||||
description = "A value indicating whether software for studies should be installed.";
|
description = "A value indicating whether software for studies should be installed.";
|
||||||
|
@ -77,6 +84,12 @@
|
||||||
description = "A value indicating whether development apps should be installed.";
|
description = "A value indicating whether development apps should be installed.";
|
||||||
default = common;
|
default = common;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
python = mkOption {
|
||||||
|
type = types.bool;
|
||||||
|
description = "A value indicating whether apps for coding python should be installed.";
|
||||||
|
default = coding;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
91
lib/modules/users.nix
Normal file
91
lib/modules/users.nix
Normal file
|
@ -0,0 +1,91 @@
|
||||||
|
{ lib, ... }:
|
||||||
|
let
|
||||||
|
inherit (lib)
|
||||||
|
mkOption
|
||||||
|
types
|
||||||
|
;
|
||||||
|
|
||||||
|
capitalize = (import ../text.nix { inherit lib; }).capitalize;
|
||||||
|
|
||||||
|
userType = types.submodule (
|
||||||
|
{ ... } : {
|
||||||
|
options = {
|
||||||
|
displayName = mkOption {
|
||||||
|
type = types.nullOr types.str;
|
||||||
|
description = "The human-readable name of the user.";
|
||||||
|
default = null;
|
||||||
|
};
|
||||||
|
|
||||||
|
mailAddress = mkOption {
|
||||||
|
type = types.nullOr types.str;
|
||||||
|
description = "The mail address of the user.";
|
||||||
|
default = null;
|
||||||
|
};
|
||||||
|
|
||||||
|
groups = mkOption {
|
||||||
|
type = types.listOf types.str;
|
||||||
|
description = "The additional groups of the user.";
|
||||||
|
default = [];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
linuxUserType = types.submodule (
|
||||||
|
{ ... }: {
|
||||||
|
options = {
|
||||||
|
defaultShell = mkOption {
|
||||||
|
type = types.nullOr types.str;
|
||||||
|
description = "The default shell of the user.";
|
||||||
|
default = null;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
winUserType = types.submodule (
|
||||||
|
{ ... }: {
|
||||||
|
options = {
|
||||||
|
microsoftAccount = mkOption {
|
||||||
|
type = types.bool;
|
||||||
|
description = "A value indicating whether this user is a Microsoft Account.";
|
||||||
|
default = false;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
});
|
||||||
|
in {
|
||||||
|
options = {
|
||||||
|
valhalla = {
|
||||||
|
users = mkOption {
|
||||||
|
type = types.attrsOf userType;
|
||||||
|
description = "The users to create on the machine.";
|
||||||
|
default = {};
|
||||||
|
};
|
||||||
|
|
||||||
|
linux.users = mkOption {
|
||||||
|
type = types.attrsOf linuxUserType;
|
||||||
|
};
|
||||||
|
|
||||||
|
windows = mkOption {
|
||||||
|
type = types.submoduleWith {
|
||||||
|
modules = [
|
||||||
|
({ config, options, ... }: {
|
||||||
|
options = {
|
||||||
|
users = mkOption {
|
||||||
|
type = types.attrsOf winUserType;
|
||||||
|
};
|
||||||
|
|
||||||
|
winUsers = mkOption {
|
||||||
|
type = options.users.type;
|
||||||
|
description = "Blablabla";
|
||||||
|
default = (lib.attrsets.concatMapAttrs (
|
||||||
|
name: options: {
|
||||||
|
${capitalize name} = options;
|
||||||
|
}) config.users);
|
||||||
|
};
|
||||||
|
};
|
||||||
|
})
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
|
@ -6,10 +6,17 @@
|
||||||
;
|
;
|
||||||
in {
|
in {
|
||||||
imports = [
|
imports = [
|
||||||
./git.nix
|
./packages/git.nix
|
||||||
|
./packages/nextcloud.nix
|
||||||
|
./packages/oh-my-posh.nix
|
||||||
|
./packages/rclone.nix
|
||||||
|
./hardware.nix
|
||||||
./i18n.nix
|
./i18n.nix
|
||||||
|
./os.nix
|
||||||
./partition.nix
|
./partition.nix
|
||||||
./software.nix
|
./software.nix
|
||||||
|
./users.nix
|
||||||
|
./windows.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
options = {
|
options = {
|
||||||
|
|
47
lib/modules/windows.nix
Normal file
47
lib/modules/windows.nix
Normal file
|
@ -0,0 +1,47 @@
|
||||||
|
{ lib, config, ... }:
|
||||||
|
let
|
||||||
|
inherit (lib)
|
||||||
|
mkDefault
|
||||||
|
mkEnableOption
|
||||||
|
mkIf
|
||||||
|
mkOption
|
||||||
|
types
|
||||||
|
;
|
||||||
|
|
||||||
|
capitalize = (import ../text.nix { inherit lib; }).capitalize;
|
||||||
|
in {
|
||||||
|
options = {
|
||||||
|
valhalla = {
|
||||||
|
windows = {
|
||||||
|
dualboot = {
|
||||||
|
enable = mkEnableOption "dual boot";
|
||||||
|
|
||||||
|
linuxPercentage = mkOption {
|
||||||
|
type = types.number;
|
||||||
|
description = "The percentage of the disk size reserved for Linux.";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
showFileExt = mkOption {
|
||||||
|
type = types.bool;
|
||||||
|
description = "A value indicating whether file extensions should be displayed in Windows Explorer.";
|
||||||
|
default = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
legacyIconSpacing = mkEnableOption "legacy icon spacing" // {
|
||||||
|
default = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
dynamicLighting = mkEnableOption "dynamic lighting";
|
||||||
|
adware = mkEnableOption "adware"; # Fuck you for displaying ads on an OS I fricking paid for!
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
config = {
|
||||||
|
valhalla.windows = {
|
||||||
|
setupUser.name = mkDefault (capitalize config.valhalla.setupUser.name);
|
||||||
|
dualboot.linuxPercentage = mkIf (!config.valhalla.windows.dualboot.enable) (mkDefault 0);
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
9
lib/text.nix
Normal file
9
lib/text.nix
Normal file
|
@ -0,0 +1,9 @@
|
||||||
|
{ lib, ... }: {
|
||||||
|
capitalize = text:
|
||||||
|
let
|
||||||
|
chars = lib.strings.stringToCharacters text;
|
||||||
|
in lib.strings.concatStrings (
|
||||||
|
[(lib.strings.toUpper (builtins.elemAt chars 0))] ++
|
||||||
|
(lib.lists.drop 1 chars)
|
||||||
|
);
|
||||||
|
}
|
|
@ -1,19 +0,0 @@
|
||||||
#!/bin/bash -e
|
|
||||||
function install() {
|
|
||||||
function installDrivers() {
|
|
||||||
. "../../../scripts/Arch/Config/SecureBoot/install.sh";
|
|
||||||
. "../../../scripts/Arch/Software/nvidia-dkms/install.sh";
|
|
||||||
. "../../../scripts/Arch/Software/xone/install.sh";
|
|
||||||
. "../../../scripts/Arch/Software/bt-dualboot/install.sh";
|
|
||||||
}
|
|
||||||
|
|
||||||
function initializeConfig() {
|
|
||||||
. "../../../scripts/Unix/Devices/Logitech G903/install.sh";
|
|
||||||
}
|
|
||||||
|
|
||||||
pushd "$dir" > /dev/null;
|
|
||||||
. "../../../scripts/Arch/OS/install.sh";
|
|
||||||
popd > /dev/null;
|
|
||||||
}
|
|
||||||
|
|
||||||
install;
|
|
|
@ -1,139 +0,0 @@
|
||||||
#!/bin/pwsh
|
|
||||||
$env:WIN_COMPUTER_NAME = "DerGeret";
|
|
||||||
$env:SETUP_SCRIPT_NAME = "$PSScriptRoot/Restore.ps1";
|
|
||||||
|
|
||||||
function Initialize-SetupConfig() {
|
|
||||||
param(
|
|
||||||
[xml] $config,
|
|
||||||
[System.Xml.XmlNamespaceManager] $namespace
|
|
||||||
);
|
|
||||||
|
|
||||||
$setupComponent = $config.SelectSingleNode(
|
|
||||||
"/ua:unattend/ua:settings[@pass='windowsPE']/ua:component[@name='Microsoft-Windows-Setup']",
|
|
||||||
$namespace);
|
|
||||||
|
|
||||||
$diskConfig = $setupComponent.SelectSingleNode("./ua:DiskConfiguration/ua:Disk", $namespace);
|
|
||||||
|
|
||||||
$partitionCreationContainer = $diskConfig.SelectSingleNode("./ua:CreatePartitions", $namespace);
|
|
||||||
$partitionCreations = $partitionCreationContainer.SelectNodes("./ua:CreatePartition", $namespace);
|
|
||||||
|
|
||||||
$partitionModificationContainer = $diskConfig.SelectSingleNode("./ua:ModifyPartitions", $namespace);
|
|
||||||
$partitionModifications = $partitionModificationContainer.SelectNodes("./ua:ModifyPartition", $namespace);
|
|
||||||
|
|
||||||
<#
|
|
||||||
.SYNOPSIS
|
|
||||||
Gets the XML element describing the installation partition ID.
|
|
||||||
#>
|
|
||||||
function Get-InstallationPartition {
|
|
||||||
$setupComponent.SelectSingleNode("./ua:ImageInstall/ua:OSImage/ua:InstallTo/ua:PartitionID", $namespace)
|
|
||||||
}
|
|
||||||
|
|
||||||
<#
|
|
||||||
.SYNOPSIS
|
|
||||||
Increases the ID of all partitions in the specified range by 1.
|
|
||||||
#>
|
|
||||||
function Move-PartitionRange {
|
|
||||||
param (
|
|
||||||
[int]$From = 0,
|
|
||||||
[System.Nullable[int]]$To = $null,
|
|
||||||
[int]$By = 1
|
|
||||||
)
|
|
||||||
|
|
||||||
# Update installation partition ID if necessary
|
|
||||||
$installationPartition = Get-InstallationPartition;
|
|
||||||
$installPartitionID = [int]$installationPartition.InnerText;
|
|
||||||
|
|
||||||
if (($installPartitionID -ge $From) -and (($null -eq $To) -or ($installPartitionID -le $To))) {
|
|
||||||
$installationPartition.InnerText = "$($installPartitionID + $By)";
|
|
||||||
}
|
|
||||||
|
|
||||||
# Update IDs of all partition creations
|
|
||||||
foreach ($partition in $partitionCreations) {
|
|
||||||
$orderNode = $partition.SelectSingleNode("./ua:Order", $namespace);
|
|
||||||
$order = [int]$orderNode.InnerText;
|
|
||||||
$newOrder = $order;
|
|
||||||
|
|
||||||
if (($newOrder -ge $From) -and (($null -eq $To) -or ($newOrder -le $To))) {
|
|
||||||
$newOrder += $By;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($order -ne $newOrder) {
|
|
||||||
$orderNode.InnerText = "$newOrder";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# Update IDs of all partition modifications
|
|
||||||
foreach ($partition in $partitionModifications) {
|
|
||||||
$partitionNode = $partition.SelectSingleNode("./ua:PartitionID", $namespace);
|
|
||||||
$partitionID = [int]$partitionNode.InnerText;
|
|
||||||
$newID = $partitionID;
|
|
||||||
|
|
||||||
if (($newID -ge $From) -and (($null -eq $To) -or ($newID -le $To))) {
|
|
||||||
$newID += $By;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($partitionID -ne $newID) {
|
|
||||||
$partitionNode.InnerText = "$newID";
|
|
||||||
$partition.SelectSingleNode("./ua:Order", $namespace).InnerText = "$newID";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function Add-Partition {
|
|
||||||
param (
|
|
||||||
[int]$Index,
|
|
||||||
[int]$Size,
|
|
||||||
[string]$Type = "Primary"
|
|
||||||
)
|
|
||||||
|
|
||||||
Move-PartitionRange -From $Index -By 1;
|
|
||||||
|
|
||||||
$newPartition = $partitionCreations[0].CloneNode($true);
|
|
||||||
$newPartition.SelectSingleNode("./ua:Order", $namespace).InnerText = "$Index";
|
|
||||||
$newPartition.SelectSingleNode("./ua:Type", $namespace).InnerText = "$Type";
|
|
||||||
$newPartition.SelectSingleNode("./ua:Size", $namespace).InnerText = "$Size";
|
|
||||||
$null = $partitionCreationContainer.AppendChild($newPartition);
|
|
||||||
|
|
||||||
$newModification = $partitionModifications[2].CloneNode($true);
|
|
||||||
$newModification.SelectSingleNode("./ua:Order", $namespace).InnerText = "$Index";
|
|
||||||
$newModification.SelectSingleNode("./ua:PartitionID", $namespace).InnerText = "$Index";
|
|
||||||
$null = $partitionModificationContainer.AppendChild($newModification);
|
|
||||||
}
|
|
||||||
|
|
||||||
<#
|
|
||||||
.SYNOPSIS
|
|
||||||
Relocates the partition with the specified `$From` ID to the specified `$To` ID.
|
|
||||||
#>
|
|
||||||
function Invoke-PartitionRelocation {
|
|
||||||
param (
|
|
||||||
[int]$From,
|
|
||||||
[int]$To
|
|
||||||
)
|
|
||||||
|
|
||||||
Move-PartitionRange $From $From (-1 * ($From + 1))
|
|
||||||
|
|
||||||
if ($From -gt $To) {
|
|
||||||
Move-PartitionRange $To ($From - 1);
|
|
||||||
}
|
|
||||||
elseif ($From -lt $To) {
|
|
||||||
Move-PartitionRange ($From + 1) $To -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
Move-PartitionRange -1 -1 ($To + 1)
|
|
||||||
}
|
|
||||||
|
|
||||||
# Resize EFI partition to 1GB
|
|
||||||
$partitionCreations[1].SelectSingleNode("./ua:Size", $namespace).InnerText = "$(1024)";
|
|
||||||
|
|
||||||
# Swap Windows RE partition (partition #1) and boot partition (partition #2)
|
|
||||||
Invoke-PartitionRelocation 2 1;
|
|
||||||
|
|
||||||
# Add space before Windows installation... wha-!? For Linux, ofc! I use Arch Linux, btw.
|
|
||||||
$swapSpacer = 100;
|
|
||||||
Add-Partition 2 $swapSpacer;
|
|
||||||
|
|
||||||
# Add a 1.2 TB partition for Linux
|
|
||||||
Add-Partition 3 ((1.2 * 1024 * 1024) - 1024 - $swapSpacer);
|
|
||||||
}
|
|
||||||
|
|
||||||
. "$PSScriptRoot/../../../scripts/Windows/OS/Setup.ps1";
|
|
|
@ -1,21 +0,0 @@
|
||||||
{ ... }: {
|
|
||||||
imports = [
|
|
||||||
../Generic/config.nix
|
|
||||||
];
|
|
||||||
|
|
||||||
config = {
|
|
||||||
valhalla.partition.os.partitions = {
|
|
||||||
Boot.keepExisting = true;
|
|
||||||
|
|
||||||
Windows = {
|
|
||||||
index = 6;
|
|
||||||
label = "OS";
|
|
||||||
format = "ntfs";
|
|
||||||
size = "+600G";
|
|
||||||
mountPoint = "/win";
|
|
||||||
mountOptions = ["force"];
|
|
||||||
keepExisting = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -1,11 +0,0 @@
|
||||||
{ ... }: {
|
|
||||||
imports = [
|
|
||||||
../config.nix
|
|
||||||
];
|
|
||||||
|
|
||||||
config = {
|
|
||||||
valhalla.partition.os.partitions = {
|
|
||||||
OS.label = "Arch";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -1,13 +0,0 @@
|
||||||
#!/bin/pwsh
|
|
||||||
. "$PSScriptRoot/../../../scripts/Windows/Scripts/Context.ps1";
|
|
||||||
. "$PSScriptRoot/../../../scripts/Windows/OS/Install.ps1";
|
|
||||||
. "$PSScriptRoot/../../../scripts/Windows/Collections/Generic.ps1"
|
|
||||||
|
|
||||||
function Restore-Apps {
|
|
||||||
param([Context] $context)
|
|
||||||
Restore-GenericApps $context;
|
|
||||||
}
|
|
||||||
|
|
||||||
[Context]$context = [Context]::new();
|
|
||||||
Invoke-WindowsInstallation $context;
|
|
||||||
Restart-Computer -Force;
|
|
|
@ -1,5 +0,0 @@
|
||||||
#!/bin/pwsh
|
|
||||||
$env:WIN_COMPUTER_NAME ??= "win11";
|
|
||||||
$env:SETUP_SCRIPT_NAME ??= "$PSScriptRoot/Install.ps1";
|
|
||||||
|
|
||||||
. "$PSScriptRoot/../../../scripts/Windows/OS/Setup.ps1";
|
|
|
@ -1,4 +0,0 @@
|
||||||
#!/bin/pwsh
|
|
||||||
$env:SETUP_SCRIPT_NAME ??= "$PSScriptRoot/Install.ps1";
|
|
||||||
|
|
||||||
. "$PSScriptRoot/../../Generic/Windows/Setup.ps1";
|
|
|
@ -1,5 +0,0 @@
|
||||||
#!/bin/env fish
|
|
||||||
begin
|
|
||||||
set -l dir (status dirname)
|
|
||||||
source "$dir/../../../scripts/Arch/OS/install.fish"
|
|
||||||
end
|
|
|
@ -1,26 +0,0 @@
|
||||||
#!/bin/bash -e
|
|
||||||
function install() {
|
|
||||||
function installDrivers() {
|
|
||||||
. "../../../scripts/Arch/Config/SecureBoot/install.sh";
|
|
||||||
. "../../../scripts/Arch/Drivers/SurfaceBook2/install.sh";
|
|
||||||
}
|
|
||||||
|
|
||||||
function installSoftware() {
|
|
||||||
. "../../../scripts/Arch/Collections/school.sh";
|
|
||||||
}
|
|
||||||
|
|
||||||
function initializeConfig() {
|
|
||||||
. "../../../scripts/Common/Config/Steam/hidpi.sh";
|
|
||||||
. "../../../scripts/Unix/Devices/Surface Book 2/install.sh";
|
|
||||||
. "../../../scripts/Unix/Devices/Logitech G903/install.sh";
|
|
||||||
|
|
||||||
# Because, as it looks, Surface Books are fucking stupid.
|
|
||||||
. "../../../scripts/Common/Config/GRUB/verbose.sh";
|
|
||||||
}
|
|
||||||
|
|
||||||
pushd "${BASH_SOURCE%/*}" > /dev/null;
|
|
||||||
. "../../../scripts/Arch/OS/install.sh";
|
|
||||||
popd > /dev/null;
|
|
||||||
}
|
|
||||||
|
|
||||||
install;
|
|
|
@ -1,16 +0,0 @@
|
||||||
#!/bin/bash
|
|
||||||
pushd "${BASH_SOURCE%/*}" > /dev/null;
|
|
||||||
# Set Hostname
|
|
||||||
sudo hostnamectl set-hostname ManuSurface;
|
|
||||||
|
|
||||||
source "../../../scripts/PopOS/Scripts/preinstall.sh";
|
|
||||||
source "../../../scripts/PopOS/OS/install.sh";
|
|
||||||
source "../../../scripts/Debian/Drivers/SurfaceBook2/Setup/install.sh";
|
|
||||||
source "../../../scripts/PopOS/Software/Collections/school.sh";
|
|
||||||
INSTALL_FONTS=1 NEXTCLOUD_DIR="${NEXTCLOUD_DIR}" source "../../../scripts/Common/Config/UserProfile/install.sh";
|
|
||||||
|
|
||||||
# Install equalizer
|
|
||||||
source "../../../scripts/Common/Config/EasyEffects/SurfaceBook2/install.sh";
|
|
||||||
|
|
||||||
source "../../../scripts/PopOS/Scripts/postinstall.sh";
|
|
||||||
popd > /dev/null;
|
|
|
@ -1,12 +0,0 @@
|
||||||
#!/bin/bash
|
|
||||||
pushd "${BASH_SOURCE%/*}" > /dev/null;
|
|
||||||
|
|
||||||
# Set Hostname
|
|
||||||
sudo hostnamectl set-hostname ManuPopOSLive;
|
|
||||||
source "../../scripts/PopOS/Scripts/prepare.sh";
|
|
||||||
source "../../scripts/PopOS/OS/install.sh";
|
|
||||||
source "../../scripts/PopOS/Software/Collections/personal.sh";
|
|
||||||
INSTALL_FONTS=1 NEXTCLOUD_DIR="${NEXTCLOUD_DIR}" source "../../scripts/Common/Config/UserProfile/personal.sh";
|
|
||||||
|
|
||||||
source "../../scripts/PopOS/Scripts/postinstall.sh";
|
|
||||||
popd > /dev/null;
|
|
4
profiles/machines/manuel/DerGeret/Arch/install.fish
Executable file
4
profiles/machines/manuel/DerGeret/Arch/install.fish
Executable file
|
@ -0,0 +1,4 @@
|
||||||
|
#!/bin/env fish
|
||||||
|
begin
|
||||||
|
bash "$(status dirname)/install.sh"
|
||||||
|
end
|
19
profiles/machines/manuel/DerGeret/Arch/install.sh
Executable file
19
profiles/machines/manuel/DerGeret/Arch/install.sh
Executable file
|
@ -0,0 +1,19 @@
|
||||||
|
#!/bin/bash -e
|
||||||
|
function install() {
|
||||||
|
function installDrivers() {
|
||||||
|
. "../../../../../scripts/Arch/Config/SecureBoot/install.sh";
|
||||||
|
. "../../../../../scripts/Arch/Software/nvidia-dkms/install.sh";
|
||||||
|
. "../../../../../scripts/Arch/Software/xone/install.sh";
|
||||||
|
. "../../../../../scripts/Arch/Software/bt-dualboot/install.sh";
|
||||||
|
}
|
||||||
|
|
||||||
|
function initializeConfig() {
|
||||||
|
. "../../../../../scripts/Unix/Devices/Logitech G903/install.sh";
|
||||||
|
}
|
||||||
|
|
||||||
|
pushd "$dir" > /dev/null;
|
||||||
|
. "../../../../../scripts/Arch/OS/install.sh";
|
||||||
|
popd > /dev/null;
|
||||||
|
}
|
||||||
|
|
||||||
|
install;
|
13
profiles/machines/manuel/DerGeret/Arch/setup.fish
Executable file
13
profiles/machines/manuel/DerGeret/Arch/setup.fish
Executable file
|
@ -0,0 +1,13 @@
|
||||||
|
#!/bin/env fish
|
||||||
|
begin
|
||||||
|
set -l dir (status dirname)
|
||||||
|
|
||||||
|
function getInstallerScript -V dir -S
|
||||||
|
echo "$dir/install.fish"
|
||||||
|
end
|
||||||
|
|
||||||
|
CONFIG_NAME="DerGeret" \
|
||||||
|
ARCH_HOSTNAME="der-geret" \
|
||||||
|
USER_DISPLAYNAME="Manuel Thalmann" \
|
||||||
|
source "$(status dirname)/../../../../../scripts/Arch/OS/setup.fish"
|
||||||
|
end
|
|
@ -4,6 +4,6 @@ pushd "${BASH_SOURCE%/*}" > /dev/null;
|
||||||
CONFIG_MODULE="./config.nix" \
|
CONFIG_MODULE="./config.nix" \
|
||||||
ARCH_HOSTNAME="der-geret" \
|
ARCH_HOSTNAME="der-geret" \
|
||||||
USER_DISPLAYNAME="Manuel Thalmann" \
|
USER_DISPLAYNAME="Manuel Thalmann" \
|
||||||
. "../../../scripts/Arch/OS/setup.sh";
|
. "../../../../../scripts/Arch/OS/setup.sh";
|
||||||
|
|
||||||
popd > /dev/null;
|
popd > /dev/null;
|
|
@ -1,7 +1,7 @@
|
||||||
#!/bin/pwsh
|
#!/bin/pwsh
|
||||||
$null = New-Module {
|
$null = New-Module {
|
||||||
. "$PSScriptRoot/../../../scripts/Windows/Scripts/Context.ps1";
|
. "$PSScriptRoot/../../../../../scripts/Common/Scripts/Context.ps1";
|
||||||
. "$PSScriptRoot/../../../scripts/Windows/OS/Manage.ps1";
|
. "$PSScriptRoot/../../../../../scripts/Windows/OS/Legacy.ps1";
|
||||||
|
|
||||||
Write-Host "Starting Backup of Windows";
|
Write-Host "Starting Backup of Windows";
|
||||||
$context = [Context]::new();
|
$context = [Context]::new();
|
|
@ -1,12 +1,12 @@
|
||||||
#!/bin/pwsh
|
#!/bin/pwsh
|
||||||
. "$PSScriptRoot/../../../scripts/Windows/Scripts/Context.ps1";
|
. "$PSScriptRoot/../../../../../scripts/Common/Scripts/Context.ps1";
|
||||||
|
|
||||||
function Install-PortValhallaDrivers {
|
function Install-PortValhallaDrivers {
|
||||||
param(
|
param(
|
||||||
[Context] $context
|
[Context] $context
|
||||||
)
|
)
|
||||||
|
|
||||||
$winPath = "$PSScriptRoot/../../../scripts/Windows";
|
$winPath = "$PSScriptRoot/../../../../../scripts/Windows";
|
||||||
$driverPath = "$winPath/Drivers";
|
$driverPath = "$winPath/Drivers";
|
||||||
$mbDriverPath = "$driverPath/ROG Zenith Extreme Alpha";
|
$mbDriverPath = "$driverPath/ROG Zenith Extreme Alpha";
|
||||||
$context.RegisterReboot();
|
$context.RegisterReboot();
|
||||||
|
@ -38,7 +38,7 @@ function Install-PersonalDrivers {
|
||||||
[Context] $context
|
[Context] $context
|
||||||
)
|
)
|
||||||
|
|
||||||
$softwarePath = "$PSScriptRoot/../../../scripts/Windows/Software";
|
$softwarePath = "$PSScriptRoot/../../../../../scripts/Windows/Software";
|
||||||
. "$softwarePath/TobiiGhost/Install.ps1" $context;
|
. "$softwarePath/TobiiGhost/Install.ps1" $context;
|
||||||
. "$softwarePath/TobiiGameHub/Install.ps1" $context;
|
. "$softwarePath/TobiiGameHub/Install.ps1" $context;
|
||||||
}
|
}
|
|
@ -1,8 +1,8 @@
|
||||||
#!/bin/pwsh
|
#!/bin/pwsh
|
||||||
. "$PSScriptRoot/Drivers.ps1";
|
. "$PSScriptRoot/Drivers.ps1";
|
||||||
. "$PSScriptRoot/../../../scripts/Windows/Collections/Personal.ps1"
|
. "$PSScriptRoot/../../../../../scripts/Common/Scripts/Context.ps1";
|
||||||
. "$PSScriptRoot/../../../scripts/Windows/OS/Install.ps1";
|
. "$PSScriptRoot/../../../../../scripts/Windows/Collections/Personal.ps1"
|
||||||
. "$PSScriptRoot/../../../scripts/Windows/Scripts/Context.ps1";
|
. "$PSScriptRoot/../../../../../scripts/Windows/OS/Manage.ps1";
|
||||||
|
|
||||||
function Initialize-Configuration {
|
function Initialize-Configuration {
|
||||||
# Fix synchronization between Linux and Windows clock
|
# Fix synchronization between Linux and Windows clock
|
||||||
|
@ -26,5 +26,4 @@ function Restore-Apps {
|
||||||
|
|
||||||
Write-Host "Starting Restoration of Windows";
|
Write-Host "Starting Restoration of Windows";
|
||||||
[Context]$context = [Context]::new();
|
[Context]$context = [Context]::new();
|
||||||
Invoke-WindowsInstallation $context;
|
Start-WindowsInstallation;
|
||||||
Restart-Computer -Force;
|
|
5
profiles/machines/manuel/DerGeret/Windows/Setup.ps1
Normal file
5
profiles/machines/manuel/DerGeret/Windows/Setup.ps1
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
#!/bin/pwsh
|
||||||
|
$env:WIN_COMPUTER_NAME = "DerGeret";
|
||||||
|
$env:CONFIG_NAME = $env:WIN_COMPUTER_NAME;
|
||||||
|
|
||||||
|
. "$PSScriptRoot/../../../../../scripts/Windows/OS/Setup.ps1";
|
48
profiles/machines/manuel/DerGeret/config.nix
Normal file
48
profiles/machines/manuel/DerGeret/config.nix
Normal file
|
@ -0,0 +1,48 @@
|
||||||
|
{ ... }: {
|
||||||
|
imports = [
|
||||||
|
../defaults.nix
|
||||||
|
];
|
||||||
|
|
||||||
|
config = {
|
||||||
|
valhalla = {
|
||||||
|
windows = {
|
||||||
|
dualboot = {
|
||||||
|
enable = true;
|
||||||
|
linuxPercentage = 70; # better safe than sorry
|
||||||
|
};
|
||||||
|
|
||||||
|
users.manuel = {
|
||||||
|
microsoftAccount = true;
|
||||||
|
groups = ["Administrators"];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
partition.os.partitions = {
|
||||||
|
Boot.keepExisting = true;
|
||||||
|
|
||||||
|
Windows = {
|
||||||
|
index = 6;
|
||||||
|
label = "OS";
|
||||||
|
format = "ntfs";
|
||||||
|
mountPoint = "/win";
|
||||||
|
mountOptions = ["force"];
|
||||||
|
keepExisting = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
hardware = {
|
||||||
|
components = [
|
||||||
|
"ROG Zenith Extreme Alpha"
|
||||||
|
"Predator Z301C"
|
||||||
|
];
|
||||||
|
|
||||||
|
eyeX = true;
|
||||||
|
amdCPU = true;
|
||||||
|
nvidiaGPU = true;
|
||||||
|
logitechG = true;
|
||||||
|
corsairDevice = true;
|
||||||
|
elgatoWave = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
9
profiles/machines/manuel/Generic/Arch/config.nix
Normal file
9
profiles/machines/manuel/Generic/Arch/config.nix
Normal file
|
@ -0,0 +1,9 @@
|
||||||
|
{ ... }: {
|
||||||
|
imports = [
|
||||||
|
../config.nix
|
||||||
|
];
|
||||||
|
|
||||||
|
config = {
|
||||||
|
valhalla.boot.label = "Arch";
|
||||||
|
};
|
||||||
|
}
|
|
@ -3,11 +3,11 @@ function install() {
|
||||||
local dir="$(realpath "${BASH_SOURCE%/*}")";
|
local dir="$(realpath "${BASH_SOURCE%/*}")";
|
||||||
|
|
||||||
function installDrivers() {
|
function installDrivers() {
|
||||||
. "$dir/../../../scripts/Arch/Config/SecureBoot/install.sh";
|
. "$dir/../../../../../scripts/Arch/Config/SecureBoot/install.sh";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
. "../../../scripts/Arch/OS/install.sh";
|
. "../../../../../scripts/Arch/OS/install.sh";
|
||||||
}
|
}
|
||||||
|
|
||||||
install;
|
install;
|
|
@ -4,6 +4,6 @@ pushd "${BASH_SOURCE%/*}" > /dev/null;
|
||||||
ARCH_MOUNT_ROOT="/mnt" \
|
ARCH_MOUNT_ROOT="/mnt" \
|
||||||
ARCH_HOSTNAME="archlinux" \
|
ARCH_HOSTNAME="archlinux" \
|
||||||
USER_DISPLAYNAME="Manuel Thalmann" \
|
USER_DISPLAYNAME="Manuel Thalmann" \
|
||||||
. "../../../scripts/Arch/OS/setup.sh";
|
. "../../../../../scripts/Arch/OS/setup.sh";
|
||||||
|
|
||||||
popd > /dev/null;
|
popd > /dev/null;
|
13
profiles/machines/manuel/Generic/Windows/Install.ps1
Normal file
13
profiles/machines/manuel/Generic/Windows/Install.ps1
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
#!/bin/pwsh
|
||||||
|
. "$PSScriptRoot/../../../../../scripts/Common/Scripts/Context.ps1";
|
||||||
|
. "$PSScriptRoot/../../../../../scripts/Windows/OS/Manage.ps1";
|
||||||
|
. "$PSScriptRoot/../../../../../scripts/Windows/Collections/Generic.ps1"
|
||||||
|
|
||||||
|
function Restore-Apps {
|
||||||
|
param([Context] $context)
|
||||||
|
Restore-GenericApps $context;
|
||||||
|
}
|
||||||
|
|
||||||
|
[Context]$context = [Context]::new();
|
||||||
|
Invoke-WindowsInstallation $context;
|
||||||
|
Restart-Computer -Force;
|
5
profiles/machines/manuel/Generic/Windows/Setup.ps1
Normal file
5
profiles/machines/manuel/Generic/Windows/Setup.ps1
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
#!/bin/pwsh
|
||||||
|
$env:WIN_COMPUTER_NAME ??= "win11";
|
||||||
|
$env:CONFIG_MODULE ??= "$PSScriptRoot/../config.nix";
|
||||||
|
|
||||||
|
. "$PSScriptRoot/../../../../../scripts/Windows/OS/Setup.ps1";
|
|
@ -1,9 +1,9 @@
|
||||||
{ lib, config, ... }:
|
{ lib, config, ... }:
|
||||||
let
|
let
|
||||||
fs = import ../../lib/modules/partition/fs.nix;
|
fs = import ../../../../lib/modules/partition/fs.nix;
|
||||||
in {
|
in {
|
||||||
imports = [
|
imports = [
|
||||||
../../lib/modules/valhalla.nix
|
../defaults.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
config = {
|
config = {
|
|
@ -14,4 +14,4 @@ function Install-PortValhallaDrivers {
|
||||||
choco install -y spice-agent;
|
choco install -y spice-agent;
|
||||||
}
|
}
|
||||||
|
|
||||||
. "$PSScriptRoot/../../Generic/Windows/Install.ps1";
|
. "$PSScriptRoot/../../../../Generic/Windows/Install.ps1";
|
2
profiles/machines/manuel/KVM/Windows/Setup.ps1
Normal file
2
profiles/machines/manuel/KVM/Windows/Setup.ps1
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
#!/bin/pwsh
|
||||||
|
. "$PSScriptRoot/../../../../Generic/Windows/Setup.ps1";
|
5
profiles/machines/manuel/ManuSurface/Arch/install.fish
Executable file
5
profiles/machines/manuel/ManuSurface/Arch/install.fish
Executable file
|
@ -0,0 +1,5 @@
|
||||||
|
#!/bin/env fish
|
||||||
|
begin
|
||||||
|
set -l dir (status dirname)
|
||||||
|
source "$dir/../../../../../scripts/Arch/OS/install.fish"
|
||||||
|
end
|
26
profiles/machines/manuel/ManuSurface/Arch/install.sh
Executable file
26
profiles/machines/manuel/ManuSurface/Arch/install.sh
Executable file
|
@ -0,0 +1,26 @@
|
||||||
|
#!/bin/bash -e
|
||||||
|
function install() {
|
||||||
|
function installDrivers() {
|
||||||
|
. "../../../../../scripts/Arch/Config/SecureBoot/install.sh";
|
||||||
|
. "../../../../../scripts/Arch/Drivers/SurfaceBook2/install.sh";
|
||||||
|
}
|
||||||
|
|
||||||
|
function installSoftware() {
|
||||||
|
. "../../../../../scripts/Arch/Collections/school.sh";
|
||||||
|
}
|
||||||
|
|
||||||
|
function initializeConfig() {
|
||||||
|
. "../../../../../scripts/Common/Config/Steam/hidpi.sh";
|
||||||
|
. "../../../../../scripts/Unix/Devices/Surface Book 2/install.sh";
|
||||||
|
. "../../../../../scripts/Unix/Devices/Logitech G903/install.sh";
|
||||||
|
|
||||||
|
# Because, as it looks, Surface Books are fucking stupid.
|
||||||
|
. "../../../../../scripts/Common/Config/GRUB/verbose.sh";
|
||||||
|
}
|
||||||
|
|
||||||
|
pushd "${BASH_SOURCE%/*}" > /dev/null;
|
||||||
|
. "../../../../../scripts/Arch/OS/install.sh";
|
||||||
|
popd > /dev/null;
|
||||||
|
}
|
||||||
|
|
||||||
|
install;
|
|
@ -3,7 +3,7 @@ begin
|
||||||
set -l dir (status dirname)
|
set -l dir (status dirname)
|
||||||
|
|
||||||
function installDrivers -V dir -S
|
function installDrivers -V dir -S
|
||||||
source "$dir/../../../scripts/Common/Scripts/config.fish"
|
source "$dir/../../../../../scripts/Common/Scripts/config.fish"
|
||||||
pacstrap -K (getConfig valhalla.partition.rootDir) linux-firmware-marvell;
|
pacstrap -K (getConfig valhalla.partition.rootDir) linux-firmware-marvell;
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -11,8 +11,8 @@ begin
|
||||||
echo "$dir/install.fish"
|
echo "$dir/install.fish"
|
||||||
end
|
end
|
||||||
|
|
||||||
CONFIG_MODULE="$(status dirname)/config.nix" \
|
CONFIG_NAME="ManuSurface" \
|
||||||
ARCH_HOSTNAME="manu-surface" \
|
ARCH_HOSTNAME="manu-surface" \
|
||||||
USER_DISPLAYNAME="Manuel Thalmann" \
|
USER_DISPLAYNAME="Manuel Thalmann" \
|
||||||
source "$(status dirname)/../../../scripts/Arch/OS/setup.fish";
|
source "$(status dirname)/../../../../../scripts/Arch/OS/setup.fish";
|
||||||
end
|
end
|
16
profiles/machines/manuel/ManuSurface/PopOS/setup.sh
Executable file
16
profiles/machines/manuel/ManuSurface/PopOS/setup.sh
Executable file
|
@ -0,0 +1,16 @@
|
||||||
|
#!/bin/bash
|
||||||
|
pushd "${BASH_SOURCE%/*}" > /dev/null;
|
||||||
|
# Set Hostname
|
||||||
|
sudo hostnamectl set-hostname ManuSurface;
|
||||||
|
|
||||||
|
source "../../../../../scripts/PopOS/Scripts/preinstall.sh";
|
||||||
|
source "../../../../../scripts/PopOS/OS/install.sh";
|
||||||
|
source "../../../../../scripts/Debian/Drivers/SurfaceBook2/Setup/install.sh";
|
||||||
|
source "../../../../../scripts/PopOS/Software/Collections/school.sh";
|
||||||
|
INSTALL_FONTS=1 NEXTCLOUD_DIR="${NEXTCLOUD_DIR}" source "../../../../../scripts/Common/Config/UserProfile/install.sh";
|
||||||
|
|
||||||
|
# Install equalizer
|
||||||
|
source "../../../../../scripts/Common/Config/EasyEffects/SurfaceBook2/install.sh";
|
||||||
|
|
||||||
|
source "../../../../../scripts/PopOS/Scripts/postinstall.sh";
|
||||||
|
popd > /dev/null;
|
12
profiles/machines/manuel/PopOSLive/setup.sh
Executable file
12
profiles/machines/manuel/PopOSLive/setup.sh
Executable file
|
@ -0,0 +1,12 @@
|
||||||
|
#!/bin/bash
|
||||||
|
pushd "${BASH_SOURCE%/*}" > /dev/null;
|
||||||
|
|
||||||
|
# Set Hostname
|
||||||
|
sudo hostnamectl set-hostname ManuPopOSLive;
|
||||||
|
source "../../../../scripts/PopOS/Scripts/prepare.sh";
|
||||||
|
source "../../../../scripts/PopOS/OS/install.sh";
|
||||||
|
source "../../../../scripts/PopOS/Software/Collections/personal.sh";
|
||||||
|
INSTALL_FONTS=1 NEXTCLOUD_DIR="${NEXTCLOUD_DIR}" source "../../../../scripts/Common/Config/UserProfile/personal.sh";
|
||||||
|
|
||||||
|
source "../../../../scripts/PopOS/Scripts/postinstall.sh";
|
||||||
|
popd > /dev/null;
|
6
profiles/machines/manuel/defaults.nix
Normal file
6
profiles/machines/manuel/defaults.nix
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
{ ... }: {
|
||||||
|
imports = [
|
||||||
|
../../users/manuel/config.nix
|
||||||
|
../../../lib/modules/valhalla.nix
|
||||||
|
];
|
||||||
|
}
|
66
profiles/users/manuel/config.nix
Normal file
66
profiles/users/manuel/config.nix
Normal file
|
@ -0,0 +1,66 @@
|
||||||
|
{ ... }: {
|
||||||
|
imports = [
|
||||||
|
../../../lib/modules/valhalla.nix
|
||||||
|
];
|
||||||
|
|
||||||
|
config = {
|
||||||
|
valhalla = {
|
||||||
|
users.manuel = {
|
||||||
|
displayName = "Manuel Thalmann";
|
||||||
|
mailAddress = "m@nuth.ch";
|
||||||
|
|
||||||
|
oh-my-posh = {
|
||||||
|
theme = {
|
||||||
|
source = ./manuel.omp.json;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
linux.users.manuel = {
|
||||||
|
defaultShell = "fish";
|
||||||
|
|
||||||
|
groups = [
|
||||||
|
"wheel"
|
||||||
|
"nix-users"
|
||||||
|
];
|
||||||
|
|
||||||
|
rclone = {
|
||||||
|
configurations = {
|
||||||
|
nextcloud = {
|
||||||
|
dirName = "Nextcloud";
|
||||||
|
};
|
||||||
|
proton = {
|
||||||
|
dirName = "Proton";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
windows.users.manuel = {
|
||||||
|
nextcloud = {
|
||||||
|
folderSyncs =
|
||||||
|
let
|
||||||
|
localPath = "C:/tools/RetroArch-Win64";
|
||||||
|
remotePath = "/Saved Games/RetroArch";
|
||||||
|
in [
|
||||||
|
{
|
||||||
|
remotePath = "${remotePath}/Saves";
|
||||||
|
localPath = "${localPath}/saves";
|
||||||
|
virtualFiles = false;
|
||||||
|
}
|
||||||
|
{
|
||||||
|
remotePath = "${remotePath}/System";
|
||||||
|
localPath = "${localPath}/system";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
partition = {
|
||||||
|
os = {
|
||||||
|
partitions = { };
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
173
profiles/users/manuel/manuel.omp.json
Normal file
173
profiles/users/manuel/manuel.omp.json
Normal file
|
@ -0,0 +1,173 @@
|
||||||
|
{
|
||||||
|
"$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json",
|
||||||
|
"version": 2,
|
||||||
|
"blocks": [
|
||||||
|
{
|
||||||
|
"type": "prompt",
|
||||||
|
"alignment": "left",
|
||||||
|
"segments": [
|
||||||
|
{
|
||||||
|
"type": "os",
|
||||||
|
"style": "diamond",
|
||||||
|
"leading_diamond": "\ue0b6",
|
||||||
|
"trailing_diamond": "\ue0b4",
|
||||||
|
"background_templates": [
|
||||||
|
"{{ if eq .OS \"ubuntu\" }}#EA531A{{ end }}",
|
||||||
|
"{{ if eq .OS \"debian\" }}#D80150{{ end }}",
|
||||||
|
"{{ if eq .OS \"arch\" }}#1793D1{{ end }}"
|
||||||
|
],
|
||||||
|
"foreground": "p:white",
|
||||||
|
"template": "{{ if ne .OS \"windows\" }}{{ .Icon }} {{ end }}"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "session",
|
||||||
|
"style": "diamond",
|
||||||
|
"leading_diamond": "\ue0b6",
|
||||||
|
"trailing_diamond": "\ue0b0",
|
||||||
|
"background": "p:yellow",
|
||||||
|
"foreground": "p:black",
|
||||||
|
"properties": {
|
||||||
|
"display_host": false
|
||||||
|
},
|
||||||
|
"template": "{{ if .SSHSession }}\ueb39{{ end }} {{ .UserName }} "
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "path",
|
||||||
|
"style": "powerline",
|
||||||
|
"powerline_symbol": "\ue0b0",
|
||||||
|
"background": "p:orange",
|
||||||
|
"foreground": "p:black",
|
||||||
|
"properties": {
|
||||||
|
"home_icon": "~",
|
||||||
|
"style": "folder"
|
||||||
|
},
|
||||||
|
"template": " \udb80\ude4b {{ path .Path .Location }} "
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "dotnet",
|
||||||
|
"style": "powerline",
|
||||||
|
"powerline_symbol": "\ue0b0",
|
||||||
|
"foreground": "p:black",
|
||||||
|
"background": "#00ffff",
|
||||||
|
"template": " \udb81\ude10 {{ .Full }} "
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "java",
|
||||||
|
"style": "powerline",
|
||||||
|
"powerline_symbol": "\ue0b0",
|
||||||
|
"background": "#4063d8",
|
||||||
|
"template": " \udb82\udf37 {{ .Full }} "
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "python",
|
||||||
|
"style": "powerline",
|
||||||
|
"powerline_symbol": "\ue0b0",
|
||||||
|
"background": "#906cff",
|
||||||
|
"template": " \udb80\udf20 {{ .Full }} "
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "git",
|
||||||
|
"style": "powerline",
|
||||||
|
"powerline_symbol": "\ue0b0",
|
||||||
|
"trailing_diamond": "\ue0b4",
|
||||||
|
"background": "p:green",
|
||||||
|
"background_templates": [
|
||||||
|
"{{ if or (.Working.Changed) (.Staging.Changed) }}p:yellow{{ end }}",
|
||||||
|
"{{ if and (gt .Ahead 0) (gt .Behind 0) }}p:red{{ end }}",
|
||||||
|
"{{ if gt .Ahead 0 }}#49416D{{ end }}",
|
||||||
|
"{{ if gt .Behind 0 }}#7A306C{{ end }}"
|
||||||
|
],
|
||||||
|
"foreground": "p:black",
|
||||||
|
"foreground_templates": [
|
||||||
|
"{{ if or (.Working.Changed) (.Staging.Changed) }}p:black{{ end }}",
|
||||||
|
"{{ if and (gt .Ahead 0) (gt .Behind 0) }}p:white{{ end }}",
|
||||||
|
"{{ if gt .Ahead 0 }}p:white{{ end }}"
|
||||||
|
],
|
||||||
|
"properties": {
|
||||||
|
"branch_max_length": 25,
|
||||||
|
"fetch_stash_count": true,
|
||||||
|
"fetch_status": true,
|
||||||
|
"fetch_upstream_icon": true,
|
||||||
|
"upstream_icons": {
|
||||||
|
"codeberg.org": "\uf330 ",
|
||||||
|
"git.nuth.ch": "\uf335",
|
||||||
|
"git.jonascosta.ch": "\uf339 ",
|
||||||
|
"git.romhackersworld.eu": "\uf339 ",
|
||||||
|
"aur.archlinux.org": "\uf303 "
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"templates": [
|
||||||
|
"{{ if .UpstreamURL }} {{ url .UpstreamIcon .UpstreamURL }}{{ end }}",
|
||||||
|
" {{ .HEAD }} ",
|
||||||
|
"{{ if .BranchStatus }}{{ .BranchStatus }} {{ end }}",
|
||||||
|
"{{ if .Working.Changed }} \uf044 {{ .Working.String }} {{ end }}",
|
||||||
|
"{{ if and (.Working.Changed) (or (.Staging.Changed) (gt .StashCount 0)) }} | {{ end }}",
|
||||||
|
"{{ if .Staging.Changed }} \uf046 {{ .Staging.String }} {{ end }}",
|
||||||
|
"{{ if and (.Staging.Changed) (gt .StashCount 0) }} | {{ end }}",
|
||||||
|
"{{ if gt .StashCount 0 }} \udb80\udd93 {{ .StashCount }}{{ end }} "
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "node",
|
||||||
|
"style": "powerline",
|
||||||
|
"powerline_symbol": "\ue0b0",
|
||||||
|
"background": "#6ca35e",
|
||||||
|
"foreground": "p:white",
|
||||||
|
"properties": {
|
||||||
|
"fetch_version": true
|
||||||
|
},
|
||||||
|
"template": " \udb80\udf99 {{ if .PackageManagerIcon }}{{ .PackageManagerIcon }} {{ end }}{{ .Full }} "
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "root",
|
||||||
|
"style": "powerline",
|
||||||
|
"powerline_symbol": "\ue0b0",
|
||||||
|
"background": "p:yellow",
|
||||||
|
"foreground": "p:white",
|
||||||
|
"properties": {
|
||||||
|
"root_icon": "\uf0e7"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "executiontime",
|
||||||
|
"style": "plain",
|
||||||
|
"background": "#83769c",
|
||||||
|
"foreground": "p:white",
|
||||||
|
"properties": {
|
||||||
|
"always_enabled": true
|
||||||
|
},
|
||||||
|
"template": "<transparent>\ue0b0</> \udb81\udead {{ .FormattedMs }}\u2800"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "text",
|
||||||
|
"style": "diamond",
|
||||||
|
"background": "p:blue",
|
||||||
|
"trailing_diamond": "\ue0b4",
|
||||||
|
"background_templates": [
|
||||||
|
"{{ if gt .Code 0 }}p:red{{ end }}"
|
||||||
|
],
|
||||||
|
"foreground": "p:white",
|
||||||
|
"properties": {
|
||||||
|
"always_enabled": true
|
||||||
|
},
|
||||||
|
"template": "<parentBackground>\ue0b0</> {{ if gt .Code 0 }}\uf00d{{ else }}\uf00c{{ end }} "
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"transient_prompt": {
|
||||||
|
"background": "transparent",
|
||||||
|
"foreground": "p:black",
|
||||||
|
"template": "<p:yellow,transparent>\ue0b6</><,p:yellow> {{ .Folder }} </><p:yellow,transparent>\ue0b0</> "
|
||||||
|
},
|
||||||
|
"final_space": true,
|
||||||
|
"palette": {
|
||||||
|
"black": "#262B44",
|
||||||
|
"blue": "#4B95E9",
|
||||||
|
"green": "#59C9A5",
|
||||||
|
"orange": "#F07623",
|
||||||
|
"red": "#D81E5B",
|
||||||
|
"white": "#E0DEF4",
|
||||||
|
"yellow": "#F3AE35"
|
||||||
|
}
|
||||||
|
}
|
|
@ -109,7 +109,7 @@ yay --noconfirm -Syu jq;
|
||||||
BROWSER_BIN="brave" \
|
BROWSER_BIN="brave" \
|
||||||
EXTENSION_DIR="/usr/share/chromium-extensions" \
|
EXTENSION_DIR="/usr/share/chromium-extensions" \
|
||||||
EXTENSION_POLICY_DIR="$braveExtensions" \
|
EXTENSION_POLICY_DIR="$braveExtensions" \
|
||||||
source "../../Common/Config/Chromium/install-ytmusic-dl.sh";
|
source "../../Common/Software/Chromium/ytmdl.sh";
|
||||||
|
|
||||||
# sudo ln -sf "$braveExtensions" /opt/brave.com/brave-beta/extensions;
|
# sudo ln -sf "$braveExtensions" /opt/brave.com/brave-beta/extensions;
|
||||||
# sudo ln -sf "$braveExtensions" /opt/brave.com/brave-nightly/extensions;
|
# sudo ln -sf "$braveExtensions" /opt/brave.com/brave-nightly/extensions;
|
||||||
|
|
167
scripts/Arch/OS/install.fish
Normal file → Executable file
167
scripts/Arch/OS/install.fish
Normal file → Executable file
|
@ -41,18 +41,21 @@ begin
|
||||||
rar
|
rar
|
||||||
|
|
||||||
sudo pkgfile --update
|
sudo pkgfile --update
|
||||||
|
source "$dir/../../Common/Software/bash/main.fish"
|
||||||
source "$dir/../Software/openssh/main.fish"
|
source "$dir/../Software/openssh/main.fish"
|
||||||
source "$dir/../Software/vim/main.fish"
|
source "$dir/../Software/vim/main.fish"
|
||||||
source "$dir/../Software/git/main.fish"
|
source "$dir/../Software/git/main.fish"
|
||||||
source "$dir/../Software/zoxide/main.fish"
|
source "$dir/../Software/zoxide/main.fish"
|
||||||
|
source "$dir/../Software/logo-ls/main.fish"
|
||||||
|
|
||||||
|
# GRUB Shenanigans - if that's not an essential I don't know what is!
|
||||||
|
source "$dir/../Software/minegrub-theme/main.fish";
|
||||||
end
|
end
|
||||||
|
|
||||||
if collectionActive common
|
if collectionActive common
|
||||||
yayinst \
|
yayinst \
|
||||||
tldr \
|
tldr \
|
||||||
btop \
|
btop \
|
||||||
nvtop \
|
|
||||||
numbat-bin \
|
|
||||||
terminal-parrot
|
terminal-parrot
|
||||||
|
|
||||||
source "$dir/../Software/aliae/main.fish"
|
source "$dir/../Software/aliae/main.fish"
|
||||||
|
@ -75,6 +78,69 @@ begin
|
||||||
ttf-ms-win11-auto \
|
ttf-ms-win11-auto \
|
||||||
otf-cascadia-code \
|
otf-cascadia-code \
|
||||||
ttf-droid
|
ttf-droid
|
||||||
|
|
||||||
|
# Password Management
|
||||||
|
yayinst \
|
||||||
|
bitwarden \
|
||||||
|
keepass \
|
||||||
|
keepassxc
|
||||||
|
|
||||||
|
# Tools
|
||||||
|
yayinst \
|
||||||
|
android-tools \
|
||||||
|
blackbox-terminal \
|
||||||
|
cpu-x \
|
||||||
|
gnome-calculator \
|
||||||
|
yubikey-manager-qt
|
||||||
|
|
||||||
|
yayinst \
|
||||||
|
remmina (
|
||||||
|
# RDP support for Remmina
|
||||||
|
) freerdp \
|
||||||
|
wireshark-qt \
|
||||||
|
linux-wifi-hotspot
|
||||||
|
|
||||||
|
# Creativity
|
||||||
|
yayinst \
|
||||||
|
gimp \
|
||||||
|
inkscape
|
||||||
|
|
||||||
|
# Office stuff
|
||||||
|
yayinst \
|
||||||
|
libreoffice-fresh \
|
||||||
|
naps2-bin \
|
||||||
|
pdfarranger \
|
||||||
|
protonmail-bridge \
|
||||||
|
thunderbird
|
||||||
|
|
||||||
|
yayinst \
|
||||||
|
texlive \
|
||||||
|
texlive-langgerman
|
||||||
|
|
||||||
|
# Browser
|
||||||
|
source "$dir/../Software/Firefox/main.fish"
|
||||||
|
source "$dir/../Software/brave/main.fish"
|
||||||
|
source "$dir/../Software/Pennywise/main.fish"
|
||||||
|
|
||||||
|
# Virtualization
|
||||||
|
source "$dir/../Software/waydroid/main.fish"
|
||||||
|
source "$dir/../Software/Virtual Machine Manager/main.fish"
|
||||||
|
yayinst propertree-git # mac config file editor
|
||||||
|
|
||||||
|
if collectionActive coding
|
||||||
|
yayinst \
|
||||||
|
devdocs-desktop \
|
||||||
|
godot-mono-bin
|
||||||
|
|
||||||
|
source "$dir/../Software/vscode/main.fish"
|
||||||
|
end
|
||||||
|
|
||||||
|
if collectionActive school
|
||||||
|
yayinst \
|
||||||
|
teams-for-linux \
|
||||||
|
xournalpp-git \
|
||||||
|
rnote
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
if collectionActive server
|
if collectionActive server
|
||||||
|
@ -86,7 +152,102 @@ begin
|
||||||
# Networking
|
# Networking
|
||||||
yayinst \
|
yayinst \
|
||||||
networkmanager-openvpn \
|
networkmanager-openvpn \
|
||||||
networkmanager-openconnect
|
networkmanager-openconnect \
|
||||||
|
protonvpn
|
||||||
|
|
||||||
|
if collectionActive common
|
||||||
|
source "$dir/../Software/IcedTea/main.fish"
|
||||||
|
|
||||||
|
yayinst \
|
||||||
|
img2pdf \
|
||||||
|
numbat-bin \
|
||||||
|
nvtop \
|
||||||
|
pdf2svg \
|
||||||
|
tnef
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
if collectionActive media
|
||||||
|
yayinst \
|
||||||
|
ytmdesktop-bin \
|
||||||
|
netflix \
|
||||||
|
spotube-bin \
|
||||||
|
stremio \
|
||||||
|
tidal-dl \
|
||||||
|
tidal-hifi-bin \
|
||||||
|
nuclear-player-bin \
|
||||||
|
audius-client-bin
|
||||||
|
end
|
||||||
|
|
||||||
|
if collectionActive fileSync
|
||||||
|
yayinst nextcloud-client
|
||||||
|
source "$dir/../Software/rclone/main.fish"
|
||||||
|
end
|
||||||
|
|
||||||
|
if collectionActive socialMedia
|
||||||
|
yayinst \
|
||||||
|
signal-desktop \
|
||||||
|
threema-desktop \
|
||||||
|
discord (
|
||||||
|
# Open Source Discord implementation
|
||||||
|
) openasar-git
|
||||||
|
end
|
||||||
|
|
||||||
|
if collectionActive productivity
|
||||||
|
yayinst \
|
||||||
|
anki-bin
|
||||||
|
end
|
||||||
|
|
||||||
|
if collectionActive school
|
||||||
|
yayinst \
|
||||||
|
jdk17-temurin \
|
||||||
|
gradle \
|
||||||
|
jetbrains-toolbox
|
||||||
|
|
||||||
|
source "$dir/../../Common/Software/udev/ct-board.fish"
|
||||||
|
end
|
||||||
|
|
||||||
|
if collectionActive coding
|
||||||
|
yayinst \
|
||||||
|
archiso \
|
||||||
|
wimlib (
|
||||||
|
# ISO support for wimlib
|
||||||
|
) cdrkit \
|
||||||
|
tea \
|
||||||
|
woodpecker-cli (
|
||||||
|
# AsciiDocs
|
||||||
|
) python-docutils (
|
||||||
|
# reStructuredText
|
||||||
|
) esbonio
|
||||||
|
|
||||||
|
source "$dir/../Software/n/main.fish"
|
||||||
|
end
|
||||||
|
|
||||||
|
if collectionActive python
|
||||||
|
yayinst \
|
||||||
|
python \
|
||||||
|
python-pip \
|
||||||
|
python-pipenv
|
||||||
|
|
||||||
|
source "$dir/../Software/pyenv/main.fish"
|
||||||
|
end
|
||||||
|
|
||||||
|
if collectionActive gaming
|
||||||
|
yayinst \
|
||||||
|
steam \
|
||||||
|
chiaki \
|
||||||
|
osu-lazer-bin \
|
||||||
|
libretro \
|
||||||
|
supertux \
|
||||||
|
gamepad-tool-bin
|
||||||
|
|
||||||
|
source "$dir/../Software/Lutris/main.fish"
|
||||||
|
flatpak install -y flathub com.usebottles.bottles
|
||||||
|
end
|
||||||
|
|
||||||
|
if collectionActive essential
|
||||||
|
yayinst \
|
||||||
|
bb
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
14
scripts/Arch/OS/setup.fish
Normal file → Executable file
14
scripts/Arch/OS/setup.fish
Normal file → Executable file
|
@ -1,7 +1,6 @@
|
||||||
#!/bin/env fish
|
#!/bin/env fish
|
||||||
begin
|
begin
|
||||||
set -l dir (status dirname)
|
set -l dir (status dirname)
|
||||||
set -q CONFIG_MODULE || set -l CONFIG_MODULE "$dir/config.nix"
|
|
||||||
source "$dir/../../Common/OS/setup.fish"
|
source "$dir/../../Common/OS/setup.fish"
|
||||||
source "$dir/../../Common/Scripts/config.fish"
|
source "$dir/../../Common/Scripts/config.fish"
|
||||||
|
|
||||||
|
@ -15,7 +14,7 @@ begin
|
||||||
pacstrap -K "$mountDir" fish jq nix tmux
|
pacstrap -K "$mountDir" fish jq nix tmux
|
||||||
end
|
end
|
||||||
|
|
||||||
function setupOS -S -V dir -V CONFIG_MODULE -V mountDir
|
function setupOS -S -V dir -V mountDir
|
||||||
source "$dir/../../Common/Scripts/wait-network.fish"
|
source "$dir/../../Common/Scripts/wait-network.fish"
|
||||||
source "$dir/../../Common/Scripts/hooks.fish"
|
source "$dir/../../Common/Scripts/hooks.fish"
|
||||||
|
|
||||||
|
@ -69,6 +68,7 @@ begin
|
||||||
end | begin
|
end | begin
|
||||||
read LOCALES
|
read LOCALES
|
||||||
and arch-chroot "$mountDir" sed -i "s/^#\?\(\($LOCALES\).*\)\$/\1/" /etc/locale.gen
|
and arch-chroot "$mountDir" sed -i "s/^#\?\(\($LOCALES\).*\)\$/\1/" /etc/locale.gen
|
||||||
|
and arch-chroot "$mountDir" locale-gen
|
||||||
end
|
end
|
||||||
|
|
||||||
and begin
|
and begin
|
||||||
|
@ -86,14 +86,8 @@ begin
|
||||||
|
|
||||||
and arch-chroot "$mountDir" mkinitcpio -P
|
and arch-chroot "$mountDir" mkinitcpio -P
|
||||||
and runHook installDrivers "Installing drivers..." || true
|
and runHook installDrivers "Installing drivers..." || true
|
||||||
and runInOS fish "$tempDir/../../Common/Software/nix/main.fish" configure user
|
|
||||||
and arch-chroot "$mountDir" bash "$tempDir/../Software/sudo/install.sh"
|
and arch-chroot "$mountDir" bash "$tempDir/../Software/sudo/install.sh"
|
||||||
and arch-chroot "$mountDir" bash "$tempDir/../Software/GRUB/install.sh"
|
and runInOS fish "$tempDir/../Software/GRUB/main.fish"
|
||||||
|
|
||||||
and USER_NAME="$USER_NAME" \
|
|
||||||
USER_DISPLAYNAME="$USER_DISPLAYNAME" \
|
|
||||||
USER_GROUPS="$USER_GROUPS" \
|
|
||||||
arch-chroot "$mountDir" bash "$tempDir/user.sh"
|
|
||||||
|
|
||||||
and if set -l keyLayout (getConfig valhalla.keyboardLayout)
|
and if set -l keyLayout (getConfig valhalla.keyboardLayout)
|
||||||
set -l serviceName set-keymap.service
|
set -l serviceName set-keymap.service
|
||||||
|
@ -113,7 +107,7 @@ begin
|
||||||
set -l file "/etc/systemd/system/getty@tty1.service.d/autologin.conf"
|
set -l file "/etc/systemd/system/getty@tty1.service.d/autologin.conf"
|
||||||
arch-chroot "$mountDir" mkdir -p (dirname "$file")
|
arch-chroot "$mountDir" mkdir -p (dirname "$file")
|
||||||
|
|
||||||
begin
|
and begin
|
||||||
printf %s\n \
|
printf %s\n \
|
||||||
"[Service]" \
|
"[Service]" \
|
||||||
"ExecStart=" \
|
"ExecStart=" \
|
||||||
|
|
12
scripts/Arch/Scripts/software.fish
Normal file → Executable file
12
scripts/Arch/Scripts/software.fish
Normal file → Executable file
|
@ -3,11 +3,19 @@ begin
|
||||||
set -l dir (status dirname)
|
set -l dir (status dirname)
|
||||||
source "$dir/../../Common/Scripts/software.fish"
|
source "$dir/../../Common/Scripts/software.fish"
|
||||||
|
|
||||||
|
function runYay -d "Run yay with pre-configured defaults"
|
||||||
|
yay --needed --answerclean=None --answerdiff=None -Syu $argv
|
||||||
|
end
|
||||||
|
|
||||||
function yayinst -d "Install yay-package non-interactively"
|
function yayinst -d "Install yay-package non-interactively"
|
||||||
yay --noconfirm --needed --answerclean=None --answerdiff=None -Syu $argv
|
runYay --noconfirm $argv
|
||||||
|
end
|
||||||
|
|
||||||
|
function runPacman -d "Run pacman with pre-configured defaults"
|
||||||
|
sudo pacman --needed -Syu $argv
|
||||||
end
|
end
|
||||||
|
|
||||||
function pacinst -d "Install pacman-package non-interactively"
|
function pacinst -d "Install pacman-package non-interactively"
|
||||||
sudo pacman --noconfirm --needed -Syu $argv
|
runPacman --noconfirm $argv
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
12
scripts/Arch/Software/Firefox/main.fish
Executable file
12
scripts/Arch/Software/Firefox/main.fish
Executable file
|
@ -0,0 +1,12 @@
|
||||||
|
#!/bin/env fish
|
||||||
|
begin
|
||||||
|
set -l dir (status dirname)
|
||||||
|
source "$dir/../../Scripts/software.fish"
|
||||||
|
|
||||||
|
function installSW -V dir
|
||||||
|
yayinst firefox
|
||||||
|
fish "$dir/../../../Common/Software/Firefox/main.fish" configure
|
||||||
|
end
|
||||||
|
|
||||||
|
runInstaller $argv
|
||||||
|
end
|
16
scripts/Arch/Software/GRUB/main.fish
Executable file
16
scripts/Arch/Software/GRUB/main.fish
Executable file
|
@ -0,0 +1,16 @@
|
||||||
|
#!/bin/env fish
|
||||||
|
begin
|
||||||
|
set -l dir (status dirname)
|
||||||
|
source "$dir/../../Scripts/software.fish"
|
||||||
|
|
||||||
|
function installSW -V dir
|
||||||
|
pacinst \
|
||||||
|
grub \
|
||||||
|
efibootmgr \
|
||||||
|
os-prober
|
||||||
|
|
||||||
|
fish "$dir/../../../Common/Software/GRUB/main.fish" configure
|
||||||
|
end
|
||||||
|
|
||||||
|
runInstaller $argv
|
||||||
|
end
|
24
scripts/Arch/Software/IcedTea/main.fish
Executable file
24
scripts/Arch/Software/IcedTea/main.fish
Executable file
|
@ -0,0 +1,24 @@
|
||||||
|
#!/bin/env fish
|
||||||
|
begin
|
||||||
|
set -l dir (status dirname)
|
||||||
|
source "$dir/../../Scripts/software.fish"
|
||||||
|
|
||||||
|
function installSW
|
||||||
|
yayinst \
|
||||||
|
jdk-temurin
|
||||||
|
|
||||||
|
yayinst \
|
||||||
|
icedtea-web
|
||||||
|
|
||||||
|
configureSW
|
||||||
|
end
|
||||||
|
|
||||||
|
function configureSW
|
||||||
|
# Allow execution of huwaei KVM application (uses out of date security mechanisms)
|
||||||
|
sudo sed -i \
|
||||||
|
"/^jdk.jar.disabledAlgorithms=/{ :comment; s/\(.*\)/#\1/; /\\\\\$/{ n; bcomment; }; }" \
|
||||||
|
/usr/lib/jvm/default-runtime/conf/security/java.security
|
||||||
|
end
|
||||||
|
|
||||||
|
runInstaller $argv
|
||||||
|
end
|
0
scripts/Arch/Software/KDE/main.fish
Normal file → Executable file
0
scripts/Arch/Software/KDE/main.fish
Normal file → Executable file
72
scripts/Arch/Software/Lutris/main.fish
Executable file
72
scripts/Arch/Software/Lutris/main.fish
Executable file
|
@ -0,0 +1,72 @@
|
||||||
|
#!/bin/env fish
|
||||||
|
begin
|
||||||
|
set -l dir (status dirname)
|
||||||
|
source "$dir/../../Scripts/software.fish"
|
||||||
|
|
||||||
|
function installSW
|
||||||
|
yayinst \
|
||||||
|
wine-staging \
|
||||||
|
giflib \
|
||||||
|
lib32-giflib \
|
||||||
|
libpng \
|
||||||
|
lib32-libpng \
|
||||||
|
libldap \
|
||||||
|
lib32-libldap \
|
||||||
|
gnutls \
|
||||||
|
lib32-gnutls \
|
||||||
|
mpg123 \
|
||||||
|
lib32-mpg123 \
|
||||||
|
openal \
|
||||||
|
lib32-openal \
|
||||||
|
v4l-utils \
|
||||||
|
lib32-v4l-utils \
|
||||||
|
libpulse \
|
||||||
|
lib32-libpulse \
|
||||||
|
libgpg-error \
|
||||||
|
lib32-libgpg-error \
|
||||||
|
alsa-plugins \
|
||||||
|
lib32-alsa-plugins \
|
||||||
|
alsa-lib \
|
||||||
|
lib32-alsa-lib \
|
||||||
|
libjpeg-turbo \
|
||||||
|
lib32-libjpeg-turbo \
|
||||||
|
sqlite \
|
||||||
|
lib32-sqlite \
|
||||||
|
libxcomposite \
|
||||||
|
lib32-libxcomposite \
|
||||||
|
libxinerama \
|
||||||
|
lib32-libgcrypt \
|
||||||
|
libgcrypt \
|
||||||
|
lib32-libxinerama \
|
||||||
|
ncurses \
|
||||||
|
lib32-ncurses \
|
||||||
|
ocl-icd \
|
||||||
|
lib32-ocl-icd \
|
||||||
|
libxslt \
|
||||||
|
lib32-libxslt \
|
||||||
|
libva \
|
||||||
|
lib32-libva \
|
||||||
|
gtk3 \
|
||||||
|
lib32-gtk3 \
|
||||||
|
gst-plugins-base-libs \
|
||||||
|
lib32-gst-plugins-base-libs \
|
||||||
|
vulkan-icd-loader \
|
||||||
|
lib32-vulkan-icd-loader
|
||||||
|
|
||||||
|
yayinst (
|
||||||
|
# Extracting GOG games
|
||||||
|
) innoextract \
|
||||||
|
gamemode \
|
||||||
|
lib32-gamemode \
|
||||||
|
vkd3d \
|
||||||
|
lib32-vkd3d \
|
||||||
|
gamescope \
|
||||||
|
yad \
|
||||||
|
protontricks \
|
||||||
|
protonup-qt-bin
|
||||||
|
|
||||||
|
yayinst lutris
|
||||||
|
end
|
||||||
|
|
||||||
|
runInstaller $argv
|
||||||
|
end
|
25
scripts/Arch/Software/Pennywise/main.fish
Executable file
25
scripts/Arch/Software/Pennywise/main.fish
Executable file
|
@ -0,0 +1,25 @@
|
||||||
|
#!/bin/env fish
|
||||||
|
begin
|
||||||
|
set -l dir (status dirname)
|
||||||
|
source "$dir/../../Scripts/software.fish"
|
||||||
|
|
||||||
|
function installSW
|
||||||
|
yayinst \
|
||||||
|
pennywise-bin
|
||||||
|
|
||||||
|
configureSW
|
||||||
|
end
|
||||||
|
|
||||||
|
function configureSW
|
||||||
|
set -l patch " --no-sandbox"
|
||||||
|
set -l pattern "^Exec=.*"
|
||||||
|
set -l indicator "$pattern$patch"
|
||||||
|
set -l file /usr/share/applications/pennywise.desktop
|
||||||
|
|
||||||
|
if ! grep "$indicator" "$file" > /dev/null
|
||||||
|
sudo sed -i "/$pattern/s/$pattern/\0 --no-sandbox/" "$file"
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
runInstaller $argv
|
||||||
|
end
|
28
scripts/Arch/Software/Virtual Machine Manager/main.fish
Executable file
28
scripts/Arch/Software/Virtual Machine Manager/main.fish
Executable file
|
@ -0,0 +1,28 @@
|
||||||
|
#!/bin/env fish
|
||||||
|
begin
|
||||||
|
set -l dir (status dirname)
|
||||||
|
source "$dir/../../Scripts/software.fish"
|
||||||
|
|
||||||
|
function installSW
|
||||||
|
yayinst qemu-full
|
||||||
|
yes | runPacman --asdeps iptables-nft
|
||||||
|
|
||||||
|
yes | yayinst \
|
||||||
|
virtiofsd \
|
||||||
|
virt-manager \
|
||||||
|
dnsmasq \
|
||||||
|
swtpm \
|
||||||
|
lxc \
|
||||||
|
virt-bootstrap-git
|
||||||
|
|
||||||
|
configureSW
|
||||||
|
end
|
||||||
|
|
||||||
|
function configureSW -V dir
|
||||||
|
sudo systemctl enable --now libvirtd
|
||||||
|
sudo systemctl enable --now virtlogd
|
||||||
|
fish "$dir/../../../Common/Software/Virtual Machine Manager/main.fish" configure
|
||||||
|
end
|
||||||
|
|
||||||
|
runInstaller $argv
|
||||||
|
end
|
5
scripts/Arch/Software/aliae/main.fish
Normal file → Executable file
5
scripts/Arch/Software/aliae/main.fish
Normal file → Executable file
|
@ -2,13 +2,12 @@
|
||||||
begin
|
begin
|
||||||
set -l dir (status dirname)
|
set -l dir (status dirname)
|
||||||
source "$dir/../../Scripts/software.fish"
|
source "$dir/../../Scripts/software.fish"
|
||||||
source "$dir/../../../Common/Software/aliae/main.fish"
|
|
||||||
|
|
||||||
function installSW
|
function installSW -V dir
|
||||||
yayinst \
|
yayinst \
|
||||||
aliae-bin
|
aliae-bin
|
||||||
|
|
||||||
configureSW
|
fish "$dir/../../../Common/Software/aliae/main.fish" configure
|
||||||
end
|
end
|
||||||
|
|
||||||
runInstaller $argv
|
runInstaller $argv
|
||||||
|
|
0
scripts/Arch/Software/base-devel/main.fish
Normal file → Executable file
0
scripts/Arch/Software/base-devel/main.fish
Normal file → Executable file
17
scripts/Arch/Software/brave/main.fish
Executable file
17
scripts/Arch/Software/brave/main.fish
Executable file
|
@ -0,0 +1,17 @@
|
||||||
|
#!/bin/env fish
|
||||||
|
begin
|
||||||
|
set -l dir (status dirname)
|
||||||
|
source "$dir/../../Scripts/software.fish"
|
||||||
|
source "$dir/../../../Common/Software/brave/main.fish"
|
||||||
|
|
||||||
|
function installSW -V dir
|
||||||
|
yayinst brave-bin (
|
||||||
|
# brave-beta-bin
|
||||||
|
# brave-nightly-bin
|
||||||
|
)
|
||||||
|
|
||||||
|
fish "$dir/../../../Common/Software/brave/main.fish" configure
|
||||||
|
end
|
||||||
|
|
||||||
|
runInstaller $argv
|
||||||
|
end
|
4
scripts/Arch/Software/git/main.fish
Normal file → Executable file
4
scripts/Arch/Software/git/main.fish
Normal file → Executable file
|
@ -4,7 +4,7 @@ begin
|
||||||
source "$dir/../../Scripts/software.fish"
|
source "$dir/../../Scripts/software.fish"
|
||||||
source "$dir/../../../Common/Software/git/main.fish"
|
source "$dir/../../../Common/Software/git/main.fish"
|
||||||
|
|
||||||
function installSW
|
function installSW -V dir
|
||||||
yayinst \
|
yayinst \
|
||||||
git \
|
git \
|
||||||
git-lfs \
|
git-lfs \
|
||||||
|
@ -13,7 +13,7 @@ begin
|
||||||
gitflow-fishcompletion-avh \
|
gitflow-fishcompletion-avh \
|
||||||
gitflow-zshcompletion-avh
|
gitflow-zshcompletion-avh
|
||||||
|
|
||||||
and configureSW
|
and fish "$dir/../../../Common/Software/git/main.fish" configure
|
||||||
end
|
end
|
||||||
|
|
||||||
runInstaller $argv
|
runInstaller $argv
|
||||||
|
|
45
scripts/Arch/Software/logo-ls/main.fish
Executable file
45
scripts/Arch/Software/logo-ls/main.fish
Executable file
|
@ -0,0 +1,45 @@
|
||||||
|
#!/bin/env fish
|
||||||
|
begin
|
||||||
|
set -l dir (status dirname)
|
||||||
|
source "$dir/../../Scripts/software.fish"
|
||||||
|
|
||||||
|
function installSW -V dir
|
||||||
|
set -l dirName (realpath "$dir")
|
||||||
|
set -l contextRoot (mktemp -d)
|
||||||
|
set -l pkgName logo-ls
|
||||||
|
set -l patchName workaround.patch
|
||||||
|
|
||||||
|
if not type -q logo-ls
|
||||||
|
begin
|
||||||
|
pushd "$contextRoot" > /dev/null
|
||||||
|
yay -G -f "$pkgName"
|
||||||
|
cd "$pkgName"
|
||||||
|
cp "$dirName/$patchName" .
|
||||||
|
|
||||||
|
sed -i \
|
||||||
|
-e "/^source=(/s/source=(/\0$patchName /" \
|
||||||
|
-e "/^md5sums=(/s/^md5sums=(/\0SKIP /" \
|
||||||
|
-e "/^build() {/,/}/{" \
|
||||||
|
-e "/^[[:space:]]*cd/{" \
|
||||||
|
-e "a cat ../$patchName | patch --strip 1 --forward --merge" \
|
||||||
|
-e "}" \
|
||||||
|
-e "}" \
|
||||||
|
PKGBUILD
|
||||||
|
|
||||||
|
makepkg --noconfirm -si --force
|
||||||
|
popd > /dev/null
|
||||||
|
end
|
||||||
|
|
||||||
|
rm -rf "$contextRoot"
|
||||||
|
end
|
||||||
|
|
||||||
|
configureSW
|
||||||
|
end
|
||||||
|
|
||||||
|
function configureSW -V dir
|
||||||
|
sudo systemctl enable --now nix-daemon
|
||||||
|
fish "$dir/../../../Common/Software/logo-ls/main.fish" configure
|
||||||
|
end
|
||||||
|
|
||||||
|
runInstaller $argv
|
||||||
|
end
|
12
scripts/Arch/Software/minegrub-theme/main.fish
Executable file
12
scripts/Arch/Software/minegrub-theme/main.fish
Executable file
|
@ -0,0 +1,12 @@
|
||||||
|
#!/bin/env fish
|
||||||
|
begin
|
||||||
|
set -l dir (status dirname)
|
||||||
|
source "$dir/../../Scripts/software.fish"
|
||||||
|
|
||||||
|
function installSW -V dir
|
||||||
|
yayinst grub-theme-minegrub-git
|
||||||
|
fish "$dir/../../../Common/Software/minegrub-theme/main.fish" configure
|
||||||
|
end
|
||||||
|
|
||||||
|
runInstaller $argv
|
||||||
|
end
|
12
scripts/Arch/Software/n/main.fish
Executable file
12
scripts/Arch/Software/n/main.fish
Executable file
|
@ -0,0 +1,12 @@
|
||||||
|
#!/bin/env fish
|
||||||
|
begin
|
||||||
|
set -l dir (status dirname)
|
||||||
|
source "$dir/../../Scripts/software.fish"
|
||||||
|
|
||||||
|
function installSW -V dir
|
||||||
|
yayinst nodejs-n
|
||||||
|
sudo --preserve-env --set-home fish "$dir/../../../Common/Software/n/main.fish" configure
|
||||||
|
end
|
||||||
|
|
||||||
|
runInstaller $argv
|
||||||
|
end
|
20
scripts/Arch/Software/nix/main.fish
Executable file
20
scripts/Arch/Software/nix/main.fish
Executable file
|
@ -0,0 +1,20 @@
|
||||||
|
#!/bin/env fish
|
||||||
|
begin
|
||||||
|
set -l dir (status dirname)
|
||||||
|
source "$dir/../../Scripts/software.fish"
|
||||||
|
|
||||||
|
function installSW
|
||||||
|
yayinst \
|
||||||
|
nix \
|
||||||
|
nil-git
|
||||||
|
|
||||||
|
configureSW
|
||||||
|
end
|
||||||
|
|
||||||
|
function configureSW -V dir
|
||||||
|
sudo systemctl enable --now nix-daemon
|
||||||
|
fish "$dir/../../../Common/Software/nix/main.fish" configure
|
||||||
|
end
|
||||||
|
|
||||||
|
runInstaller $argv
|
||||||
|
end
|
4
scripts/Arch/Software/openssh/main.fish
Normal file → Executable file
4
scripts/Arch/Software/openssh/main.fish
Normal file → Executable file
|
@ -7,10 +7,12 @@ begin
|
||||||
yayinst \
|
yayinst \
|
||||||
openssh \
|
openssh \
|
||||||
libfido2
|
libfido2
|
||||||
|
|
||||||
|
source (status filename) configure
|
||||||
end
|
end
|
||||||
|
|
||||||
function configureSW
|
function configureSW
|
||||||
systemctl --global enable --now ssh-agent
|
sudo systemctl --global enable ssh-agent
|
||||||
|
|
||||||
and begin
|
and begin
|
||||||
printf %s\n \
|
printf %s\n \
|
||||||
|
|
0
scripts/Arch/Software/pacman/main.fish
Normal file → Executable file
0
scripts/Arch/Software/pacman/main.fish
Normal file → Executable file
12
scripts/Arch/Software/pyenv/main.fish
Executable file
12
scripts/Arch/Software/pyenv/main.fish
Executable file
|
@ -0,0 +1,12 @@
|
||||||
|
#!/bin/env fish
|
||||||
|
begin
|
||||||
|
set -l dir (status dirname)
|
||||||
|
source "$dir/../../Scripts/software.fish"
|
||||||
|
|
||||||
|
function installSW -V dir
|
||||||
|
yayinst pyenv
|
||||||
|
fish "$dir/../../../Common/Software/pyenv/main.fish" configure
|
||||||
|
end
|
||||||
|
|
||||||
|
runInstaller $argv
|
||||||
|
end
|
15
scripts/Arch/Software/rclone/main.fish
Executable file
15
scripts/Arch/Software/rclone/main.fish
Executable file
|
@ -0,0 +1,15 @@
|
||||||
|
#!/bin/env fish
|
||||||
|
begin
|
||||||
|
set -l dir (status dirname)
|
||||||
|
source "$dir/../../Scripts/software.fish"
|
||||||
|
source "$dir/../../../Common/Software/rclone/main.fish"
|
||||||
|
|
||||||
|
function installSW -V dir
|
||||||
|
yayinst \
|
||||||
|
rclone
|
||||||
|
|
||||||
|
fish "$dir/../../../Common/Software/rclone/main.fish" configure
|
||||||
|
end
|
||||||
|
|
||||||
|
runInstaller $argv
|
||||||
|
end
|
2
scripts/Arch/Software/sddm/main.fish
Normal file → Executable file
2
scripts/Arch/Software/sddm/main.fish
Normal file → Executable file
|
@ -14,7 +14,7 @@ begin
|
||||||
function configureSW -V dir
|
function configureSW -V dir
|
||||||
set -l configDir /etc/sddm.conf.d
|
set -l configDir /etc/sddm.conf.d
|
||||||
sudo systemctl enable sddm
|
sudo systemctl enable sddm
|
||||||
mkdir -p "$configDir"
|
sudo mkdir -p "$configDir"
|
||||||
sudo cp "$dir/wayland.conf" "$configDir/10-wayland.conf"
|
sudo cp "$dir/wayland.conf" "$configDir/10-wayland.conf"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
4
scripts/Arch/Software/vim/main.fish
Normal file → Executable file
4
scripts/Arch/Software/vim/main.fish
Normal file → Executable file
|
@ -4,7 +4,7 @@ begin
|
||||||
source "$dir/../../Scripts/software.fish"
|
source "$dir/../../Scripts/software.fish"
|
||||||
source "$dir/../../../Common/Software/vim/main.fish"
|
source "$dir/../../../Common/Software/vim/main.fish"
|
||||||
|
|
||||||
function installSW
|
function installSW -V dir
|
||||||
yayinst (
|
yayinst (
|
||||||
# Necessary for accessing clipboard in terminal: https://wiki.archlinux.org/title/Vim
|
# Necessary for accessing clipboard in terminal: https://wiki.archlinux.org/title/Vim
|
||||||
) gvim \
|
) gvim \
|
||||||
|
@ -13,7 +13,7 @@ begin
|
||||||
) vim-wayland-clipboard-git \
|
) vim-wayland-clipboard-git \
|
||||||
wl-clipboard
|
wl-clipboard
|
||||||
|
|
||||||
and configureSW
|
and fish "$dir/../../../Common/Software/vim/main.fish" configure
|
||||||
end
|
end
|
||||||
|
|
||||||
runInstaller $argv
|
runInstaller $argv
|
||||||
|
|
33
scripts/Arch/Software/vscode/main.fish
Executable file
33
scripts/Arch/Software/vscode/main.fish
Executable file
|
@ -0,0 +1,33 @@
|
||||||
|
#!/bin/env fish
|
||||||
|
begin
|
||||||
|
set -l dir (status dirname)
|
||||||
|
source "$dir/../../Scripts/software.fish"
|
||||||
|
|
||||||
|
function installSW
|
||||||
|
yayinst \
|
||||||
|
vscodium-bin \
|
||||||
|
visual-studio-code-bin (
|
||||||
|
# Trash functionality
|
||||||
|
) gvfs
|
||||||
|
|
||||||
|
configureSW
|
||||||
|
end
|
||||||
|
|
||||||
|
function configureSW -V dir
|
||||||
|
set -l bins codium code
|
||||||
|
|
||||||
|
for bin in $bins
|
||||||
|
if type -q "$bin"
|
||||||
|
begin
|
||||||
|
set -l file "/etc/skel/.config/$bin-flags.conf"
|
||||||
|
sudo mkdir -p (dirname "$file")
|
||||||
|
echo "--touch-events" | sudo tee "$file" > /dev/null
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
fish "$dir/../../../Common/Software/vscode/main.fish" configure
|
||||||
|
end
|
||||||
|
|
||||||
|
runInstaller $argv
|
||||||
|
end
|
20
scripts/Arch/Software/waydroid/main.fish
Executable file
20
scripts/Arch/Software/waydroid/main.fish
Executable file
|
@ -0,0 +1,20 @@
|
||||||
|
#!/bin/env fish
|
||||||
|
begin
|
||||||
|
set -l dir (status dirname)
|
||||||
|
source "$dir/../../Scripts/software.fish"
|
||||||
|
|
||||||
|
function installSW
|
||||||
|
yayinst (
|
||||||
|
# Waydroid prerequisite: https://wiki.archlinux.org/title/Waydroid#DKMS_modules
|
||||||
|
) binder_linux-dkms \
|
||||||
|
waydroid (
|
||||||
|
# For installing ARM suppot on waydroid
|
||||||
|
) waydroid-script-git (
|
||||||
|
# Clipboard support: https://wiki.archlinux.org/title/Waydroid#Failed_to_start_Clipboard_manager_service
|
||||||
|
) python-pyclip (
|
||||||
|
# Wayland clipboard support: https://github.com/spyoungtech/pyclip?tab=readme-ov-file#linux
|
||||||
|
) wl-clipboard
|
||||||
|
end
|
||||||
|
|
||||||
|
runInstaller $argv
|
||||||
|
end
|
0
scripts/Arch/Software/yay/main.fish
Normal file → Executable file
0
scripts/Arch/Software/yay/main.fish
Normal file → Executable file
5
scripts/Arch/Software/zoxide/main.fish
Normal file → Executable file
5
scripts/Arch/Software/zoxide/main.fish
Normal file → Executable file
|
@ -2,13 +2,12 @@
|
||||||
begin
|
begin
|
||||||
set -l dir (status dirname)
|
set -l dir (status dirname)
|
||||||
source "$dir/../../Scripts/software.fish"
|
source "$dir/../../Scripts/software.fish"
|
||||||
source "$dir/../../../Common/Software/zoxide/main.fish"
|
|
||||||
|
|
||||||
function installSW
|
function installSW -V dir
|
||||||
yayinst \
|
yayinst \
|
||||||
zoxide
|
zoxide
|
||||||
|
|
||||||
configureSW
|
fish "$dir/../../../Common/Software/zoxide/main.fish" configure
|
||||||
end
|
end
|
||||||
|
|
||||||
runInstaller $argv
|
runInstaller $argv
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
pushd "${BASH_SOURCE%/*}" > /dev/null;
|
pushd "${BASH_SOURCE%/*}" > /dev/null;
|
||||||
sudo cp ./firefox.sh /etc/profile.d/;
|
sudo cp ../../Software/Firefox/firefox.sh /etc/profile.d/;
|
||||||
popd > /dev/null;
|
popd > /dev/null;
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
#!/bin/pwsh
|
#!/bin/pwsh
|
||||||
. "$PSScriptRoot/../../Software/powershell/profile.ps1";
|
. "$PSScriptRoot/../../Software/PowerShell/Profile.ps1";
|
||||||
|
|
||||||
Add-PowerShellProfileStatement `
|
Add-PowerShellProfileStatement `
|
||||||
-System `
|
-System `
|
||||||
-Category "oh-my-posh" `
|
-Category "oh-my-posh" `
|
||||||
-Statement $(
|
-Script $(
|
||||||
@(
|
@(
|
||||||
"# Oh My Posh!",
|
"# Oh My Posh!",
|
||||||
$(Get-ScriptInitializer "oh-my-posh init pwsh"),
|
$(Get-ScriptInitializer "oh-my-posh init pwsh"),
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
#!/bin/pwsh
|
#!/bin/pwsh
|
||||||
. "$PSScriptRoot/../../Software/powershell/profile.ps1";
|
. "$PSScriptRoot/../../Software/PowerShell/Profile.ps1";
|
||||||
|
|
||||||
foreach ($defaultUser in @($true, $false)) {
|
foreach ($defaultUser in @($true, $false)) {
|
||||||
Add-PowerShellProfileStatement -DefaultUser:$defaultUser -Statement "# aliae`naliae init pwsh | Invoke-Expression";
|
Add-PowerShellProfileStatement -DefaultUser:$defaultUser -Script "# aliae`naliae init pwsh | Invoke-Expression";
|
||||||
}
|
}
|
||||||
|
|
||||||
Add-PowerShellProfileStatement -System -Category "aliae" -Statement "# aliae`n$(Get-ScriptInitializer "aliae completion powershell")";
|
Add-PowerShellProfileStatement -System -Category "aliae" -Script "# aliae`n$(Get-ScriptInitializer "aliae completion powershell")";
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
pushd "${BASH_SOURCE%/*}" > /dev/null;
|
pushd "${BASH_SOURCE%/*}/../../Software/rclone" > /dev/null;
|
||||||
|
|
||||||
sudo cp "rclone.service" "rclone.target" "rclone@.service" /etc/systemd/user;
|
sudo cp "rclone.service" "rclone.target" "rclone@.service" /etc/systemd/user;
|
||||||
systemctl enable --user rclone;
|
systemctl enable --user rclone;
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
#!/bin/pwsh
|
#!/bin/pwsh
|
||||||
. "$PSScriptRoot/../../Software/powershell/profile.ps1";
|
. "$PSScriptRoot/../../Software/PowerShell/Profile.ps1";
|
||||||
|
|
||||||
Add-PowerShellProfileStatement `
|
Add-PowerShellProfileStatement `
|
||||||
-System `
|
-System `
|
||||||
-Category "zoxide" `
|
-Category "zoxide" `
|
||||||
-Statement $(
|
-Script $(
|
||||||
@(
|
@(
|
||||||
"# zoxide",
|
"# zoxide",
|
||||||
$(Get-ScriptInitializer "zoxide init powershell | Out-String")
|
$(Get-ScriptInitializer "zoxide init powershell | Out-String")
|
||||||
|
|
15
scripts/Common/OS/install.fish
Normal file → Executable file
15
scripts/Common/OS/install.fish
Normal file → Executable file
|
@ -3,14 +3,10 @@ set -l dir (status dirname)
|
||||||
source "$dir/../Scripts/config.fish"
|
source "$dir/../Scripts/config.fish"
|
||||||
source "$dir/../Scripts/hooks.fish"
|
source "$dir/../Scripts/hooks.fish"
|
||||||
|
|
||||||
function configureNix -V dir
|
|
||||||
source "$dir/../Software/nix/main.fish" configure user
|
|
||||||
end
|
|
||||||
|
|
||||||
if [ (id -u) -eq 0 ]
|
if [ (id -u) -eq 0 ]
|
||||||
configureNix
|
|
||||||
set -l name (getConfig valhalla.setupUser.name)
|
set -l name (getConfig valhalla.setupUser.name)
|
||||||
set -l sudoConfig "/etc/sudoers.d/PortValhalla"
|
set -l sudoConfig "/etc/sudoers.d/PortValhalla"
|
||||||
|
rm ~/.bash_profile
|
||||||
|
|
||||||
runHook createUser || \
|
runHook createUser || \
|
||||||
begin
|
begin
|
||||||
|
@ -28,16 +24,21 @@ if [ (id -u) -eq 0 ]
|
||||||
echo "$name ALL=(ALL:ALL) NOPASSWD: ALL"
|
echo "$name ALL=(ALL:ALL) NOPASSWD: ALL"
|
||||||
end > "$sudoConfig"
|
end > "$sudoConfig"
|
||||||
|
|
||||||
and sudo --preserve-env="CONFIG_MODULE" --user "$name" "$INSTALLER_SCRIPT"
|
and sudo --preserve-env="CONFIG_NAME" --user "$name" "$INSTALLER_SCRIPT"
|
||||||
rm "$sudoConfig"
|
rm "$sudoConfig"
|
||||||
userdel -r "$name"
|
userdel -r "$name"
|
||||||
else
|
else
|
||||||
configureNix
|
|
||||||
source "$dir/../Software/bash/main.fish"
|
source "$dir/../Software/bash/main.fish"
|
||||||
runHook initialize || true
|
runHook initialize || true
|
||||||
runHook installDrivers || true
|
runHook installDrivers || true
|
||||||
runHook installOS || true
|
runHook installOS || true
|
||||||
|
|
||||||
|
runHook addUsers || begin
|
||||||
|
source "$dir/users.fish"
|
||||||
|
end
|
||||||
|
|
||||||
runHook installSoftware || true
|
runHook installSoftware || true
|
||||||
runHook initializeConfig || true
|
runHook initializeConfig || true
|
||||||
|
|
||||||
runHook postInstall || true
|
runHook postInstall || true
|
||||||
end
|
end
|
||||||
|
|
14
scripts/Common/OS/setup.fish
Normal file → Executable file
14
scripts/Common/OS/setup.fish
Normal file → Executable file
|
@ -3,12 +3,12 @@ function runSetup
|
||||||
set -l dir (status dirname)
|
set -l dir (status dirname)
|
||||||
source "$dir/../Scripts/config.fish"
|
source "$dir/../Scripts/config.fish"
|
||||||
source "$dir/../Scripts/hooks.fish"
|
source "$dir/../Scripts/hooks.fish"
|
||||||
set -l name (getConfig valhalla.setupUser.name)
|
|
||||||
set -l mountDir (getConfig valhalla.partition.rootDir)
|
set -l mountDir (getConfig valhalla.partition.rootDir)
|
||||||
set -l projectRoot (realpath "$dir/../../..")
|
set -l projectRoot (realpath "$dir/../../..")
|
||||||
set -l projectName (basename "$projectRoot")
|
set -l projectName (basename "$projectRoot")
|
||||||
set -l PROJECT_CLONE_ROOT "/opt/$(basename "$projectName")"
|
set -l PROJECT_CLONE_ROOT "/opt/$(basename "$projectName")"
|
||||||
set -l script (mktemp)
|
set -l script (mktemp)
|
||||||
|
chmod +x "$script"
|
||||||
|
|
||||||
if not type -q runChroot
|
if not type -q runChroot
|
||||||
function runChroot -S
|
function runChroot -S
|
||||||
|
@ -31,21 +31,21 @@ function runSetup
|
||||||
|
|
||||||
function runInOS -S
|
function runInOS -S
|
||||||
set -l script "/root/run_once"
|
set -l script "/root/run_once"
|
||||||
wrapScript $argv | chroot "$mountDir" tee "$script"
|
wrapScript $argv | chroot "$mountDir" tee "$script" > /dev/null
|
||||||
runChroot "$mountDir" chmod +x "$script"
|
and runChroot "$mountDir" chmod +x "$script"
|
||||||
runChroot "$mountDir" "$script"
|
and runChroot "$mountDir" "$script"
|
||||||
runChroot "$mountDir" rm "$script"
|
and runChroot "$mountDir" rm "$script"
|
||||||
end
|
end
|
||||||
|
|
||||||
function wrapScript -S
|
function wrapScript -S
|
||||||
printf %s\n \
|
printf %s\n \
|
||||||
"cd $PROJECT_CLONE_ROOT" \
|
"cd $PROJECT_CLONE_ROOT" \
|
||||||
"export CONFIG_MODULE=$(string escape (getCloneFile "$CONFIG_MODULE"))" \
|
|
||||||
"$argv"
|
"$argv"
|
||||||
end
|
end
|
||||||
|
|
||||||
getConfig valhalla.partition.script > "$script"
|
getConfig valhalla.partition.script > "$script"
|
||||||
bash "$script"
|
and "$script"
|
||||||
|
and rm "$script"
|
||||||
|
|
||||||
# Copy `nixpkgs` channel
|
# Copy `nixpkgs` channel
|
||||||
and begin
|
and begin
|
||||||
|
|
32
scripts/Common/OS/users.fish
Executable file
32
scripts/Common/OS/users.fish
Executable file
|
@ -0,0 +1,32 @@
|
||||||
|
#!/bin/env fish
|
||||||
|
set -l dir (status dirname)
|
||||||
|
source "$dir/../Scripts/config.fish"
|
||||||
|
set -l users (getUsers)
|
||||||
|
|
||||||
|
|
||||||
|
for name in (echo "$users" | jq '.[]' --raw-output0 | string split0)
|
||||||
|
function getUserConfig -S -a config
|
||||||
|
getConfig "valhalla.users.$name.$config" $argv[2..]
|
||||||
|
end
|
||||||
|
|
||||||
|
set -l displayName (getUserConfig displayName --json)
|
||||||
|
set -l shell (getUserConfig displayName --json)
|
||||||
|
|
||||||
|
sudo useradd --create-home (
|
||||||
|
if [ displayName != "null" ]
|
||||||
|
echo "--comment"
|
||||||
|
echo "$displayName" | jq --raw-output
|
||||||
|
end
|
||||||
|
) --groups (getUserConfig groups --apply 'builtins.concatStringsSep ","') \
|
||||||
|
"$name"
|
||||||
|
|
||||||
|
if echo "$shell" | jq --exit-status > /dev/null
|
||||||
|
sudo chsh "$name" --shell "$shell"
|
||||||
|
end
|
||||||
|
|
||||||
|
echo "Please Choose a New Password for User `$name`"
|
||||||
|
|
||||||
|
while ! sudo passwd "$name"
|
||||||
|
echo "An error occurred! Please try again."
|
||||||
|
end
|
||||||
|
end
|
163
scripts/Common/Scripts/BrowserAutomation.ps1
Normal file
163
scripts/Common/Scripts/BrowserAutomation.ps1
Normal file
|
@ -0,0 +1,163 @@
|
||||||
|
#!/bin/bash
|
||||||
|
$null = New-Module {
|
||||||
|
. "$PSScriptRoot/System.ps1";
|
||||||
|
|
||||||
|
<#
|
||||||
|
.SYNOPSIS
|
||||||
|
Runs an action involving browser automation.
|
||||||
|
|
||||||
|
.PARAMETER Action
|
||||||
|
The action to execute.
|
||||||
|
#>
|
||||||
|
function Start-BrowserAutomation {
|
||||||
|
param(
|
||||||
|
[scriptblock] $Action
|
||||||
|
)
|
||||||
|
|
||||||
|
if (-not ("OpenQA.Selenium.Firefox.FirefoxDriver" -as [type])) {
|
||||||
|
$packageRoot = Split-Path -Parent (Get-Package Selenium.WebDriver).Source;
|
||||||
|
$file = Join-Path $packageRoot "lib/netstandard2.0/WebDriver.dll";
|
||||||
|
$env:SE_MANAGER_PATH = Join-Path $packageRoot "manager" ($IsWindows ? "windows" : "linux") "selenium-manager$($IsWindows ? ".exe" : '')";
|
||||||
|
$null = [System.Reflection.Assembly]::LoadFile($file);
|
||||||
|
}
|
||||||
|
|
||||||
|
& $Action;
|
||||||
|
}
|
||||||
|
|
||||||
|
<#
|
||||||
|
.SYNOPSIS
|
||||||
|
Downloads a file from the specified url using browser automation.
|
||||||
|
|
||||||
|
.PARAMETER URL
|
||||||
|
The url to download the file from.
|
||||||
|
|
||||||
|
.PARAMETER Action
|
||||||
|
The action to execute in the browser for initiating the download.
|
||||||
|
|
||||||
|
.PARAMETER OutDir
|
||||||
|
The directory to download the file to.
|
||||||
|
#>
|
||||||
|
function Start-CustomBrowserDownload {
|
||||||
|
param(
|
||||||
|
[string] $URL,
|
||||||
|
[scriptblock] $Action,
|
||||||
|
[string] $OutDir
|
||||||
|
)
|
||||||
|
|
||||||
|
$downloadAction = $Action;
|
||||||
|
|
||||||
|
Start-BrowserAutomation {
|
||||||
|
if (-not $OutDir) {
|
||||||
|
$OutDir = ".";
|
||||||
|
}
|
||||||
|
|
||||||
|
$dir = New-TemporaryDirectory;
|
||||||
|
Write-Host "Downloading ``$URL`` using browser automation…";
|
||||||
|
$options = [OpenQA.Selenium.Firefox.FirefoxOptions]::new();
|
||||||
|
$options.SetPreference("browser.download.folderList", 2);
|
||||||
|
$options.SetPreference("browser.download.dir", "$dir");
|
||||||
|
|
||||||
|
$downloadChecker = {
|
||||||
|
$files = Get-ChildItem $dir;
|
||||||
|
|
||||||
|
if ((@($files)).Count -eq 1) {
|
||||||
|
$file = $files[0];
|
||||||
|
|
||||||
|
try {
|
||||||
|
$stream = [System.IO.File]::Open($file.FullName, [System.IO.FileMode]::Open, [System.IO.FileAccess]::ReadWrite, [System.IO.FileShare]::None);
|
||||||
|
|
||||||
|
if ($stream) {
|
||||||
|
$stream.Close();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch {
|
||||||
|
return $true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return $false;
|
||||||
|
} else {
|
||||||
|
return $true;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
$browser = [OpenQA.Selenium.Firefox.FirefoxDriver]::new($options);
|
||||||
|
$browser.Navigate().GoToUrl($URL);
|
||||||
|
|
||||||
|
while (-not ($browser.ExecuteScript("return document.readyState;") -eq "complete")) {
|
||||||
|
Start-Sleep 0.1;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
$null = & $downloadAction -Browser $browser;
|
||||||
|
|
||||||
|
while (& $downloadChecker) {
|
||||||
|
Write-Host "Waiting for the download to finish…";
|
||||||
|
Start-Sleep 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
$file = Get-ChildItem $dir;
|
||||||
|
$result = Move-Item $file $OutDir -PassThru;
|
||||||
|
$browser.Quit();
|
||||||
|
Remove-Item -Recurse $dir;
|
||||||
|
$result;
|
||||||
|
}
|
||||||
|
catch {
|
||||||
|
Write-Error $Error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
<#
|
||||||
|
.SYNOPSIS
|
||||||
|
Downloads a file from the specified url using browser automation.
|
||||||
|
|
||||||
|
.PARAMETER URL
|
||||||
|
The url to download the file from.
|
||||||
|
|
||||||
|
.PARAMETER ButtonSelector
|
||||||
|
The jQuery selector for finding the download button.
|
||||||
|
|
||||||
|
.PARAMETER OutDir
|
||||||
|
The directory to download the file to.
|
||||||
|
|
||||||
|
.PARAMETER Timeout
|
||||||
|
The number of seconds to wait before clicking the download button.
|
||||||
|
#>
|
||||||
|
function Start-BrowserDownload {
|
||||||
|
param(
|
||||||
|
[string] $URL,
|
||||||
|
[string] $ButtonSelector,
|
||||||
|
[string] $OutDir = $null,
|
||||||
|
[double] $Timeout = 0
|
||||||
|
)
|
||||||
|
|
||||||
|
Start-CustomBrowserDownload @PSBoundParameters -Action {
|
||||||
|
param(
|
||||||
|
[OpenQA.Selenium.Firefox.FirefoxDriver] $Browser
|
||||||
|
)
|
||||||
|
|
||||||
|
$selector = [OpenQA.Selenium.By]::CssSelector($ButtonSelector);
|
||||||
|
[OpenQA.Selenium.IWebElement] $element = $null;
|
||||||
|
|
||||||
|
for ($i = 0; $i -lt 5; $i++) {
|
||||||
|
$element = $Browser.FindElement($selector);
|
||||||
|
|
||||||
|
if ($element) {
|
||||||
|
break;
|
||||||
|
} else {
|
||||||
|
Start-Sleep 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($Timeout -gt 0) {
|
||||||
|
Start-Sleep $Timeout;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($element) {
|
||||||
|
$Browser.FindElement($selector).Click();
|
||||||
|
} else {
|
||||||
|
Write-Error "Unable to find download button!";
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
};
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue