mirror of
https://github.com/kmein/niveum
synced 2026-03-16 10:11:08 +01:00
Compare commits
691 Commits
feature/ha
...
b9a222855e
| Author | SHA1 | Date | |
|---|---|---|---|
| b9a222855e | |||
| f8bb3c04bf | |||
| dce42c7e80 | |||
| 5bedd897c9 | |||
| d952ecf17a | |||
| df36954fed | |||
| 697100f85f | |||
| 8eccb752dc | |||
| 6bb16ff6ed | |||
| 8fe9e80522 | |||
| 314848d877 | |||
| 377b338979 | |||
| 26231912cf | |||
| a5532f1e9d | |||
| d878b73ab5 | |||
| 3216cd19f5 | |||
| 14494ca1f7 | |||
| 201e9e5f60 | |||
| 2b59d2a68e | |||
| 722b1e9d14 | |||
| bfbe2da850 | |||
| c34647a800 | |||
| e5c86818d9 | |||
| e885753c7f | |||
| 87e39cc30b | |||
| b46f06a462 | |||
| 9041e4cb11 | |||
| 6d2acd2e3c | |||
| ca6157a4f0 | |||
| 6550c1c077 | |||
| 6fe970ae3a | |||
| e67d6d7df2 | |||
| 4fc29ff0fe | |||
| dbbad1e146 | |||
| 36132b0454 | |||
| 3bebe25adb | |||
| 21029d3bbc | |||
| d8bad81090 | |||
| f12beaa69e | |||
| a94dacb64c | |||
| fb86f8c7f7 | |||
| 86b5e4da9f | |||
| 15ab8ac8a8 | |||
| f202be220b | |||
| 267124dfd1 | |||
| ca05785b26 | |||
| f1610d08dc | |||
| 9aaaaff724 | |||
| c6a11c1d79 | |||
| 8c6363881d | |||
| 01019fffac | |||
| 84f1a2688f | |||
| d4cfb63a11 | |||
| b038278af3 | |||
| e264f13885 | |||
| b90cec1a73 | |||
| 8e47deb2ab | |||
| f883d0ce6f | |||
| 7aef7e7cf6 | |||
| 7d82e284cd | |||
| e99103226d | |||
| 8a0bf14e4e | |||
| 91a650953a | |||
| eae1a7a71b | |||
| 16f8cfbf4c | |||
| e24fdaedf3 | |||
| 09b28ce523 | |||
| 25f1a2ac1e | |||
| db05a76863 | |||
| 3155b8f2a5 | |||
| 3d59940948 | |||
| f373accdd5 | |||
| 6e25f42def | |||
| ff1b274d5e | |||
| 7bdf78df40 | |||
| 3c461efc41 | |||
| 34a7b6f905 | |||
| 1e736dbfaa | |||
| ab3404b356 | |||
| a21583b199 | |||
| a5db2944c6 | |||
| 98e95b1475 | |||
| 8a9e8bf06a | |||
| e0b904b87a | |||
| b4c838d65d | |||
| 028b282d0c | |||
| 58d355e682 | |||
| 4701080f28 | |||
| cecc249daa | |||
| 3d9a48c65e | |||
| ad7fc115c6 | |||
| c93806909f | |||
| 1ce21c9bcd | |||
| ebd017cd20 | |||
| 187d7ec12b | |||
| c05422c8e4 | |||
| f0ec0e99c3 | |||
| 9f806822a4 | |||
| d47de27423 | |||
| fc4b32dd24 | |||
| 27be00fd34 | |||
| 35f309e4b4 | |||
| 6d931c589f | |||
| 8ab1ec895f | |||
| 8d1ec7b1ef | |||
| 65ced40c4c | |||
| b4f8503c16 | |||
| 30e54f5e4e | |||
| e5d2bda7ad | |||
| 98e9083763 | |||
| ea61c3024a | |||
| c5379bf926 | |||
| 31a6cb384e | |||
| fdff04c94b | |||
| 69e752bb6b | |||
| be0a9620a4 | |||
| afb621a98e | |||
| 6259075f40 | |||
| f70383c732 | |||
| c3dc7b9e51 | |||
| 4188968ee1 | |||
| 6a873fb764 | |||
| bd92b75278 | |||
| c15f5375e2 | |||
| 51533efeda | |||
| 977e733ace | |||
| 29571bce10 | |||
| ab895d9f7b | |||
| 2d6294e44b | |||
| c33cbe3817 | |||
| de6e08fa23 | |||
| c3db0404b3 | |||
| cb0307e8bf | |||
| bafb872730 | |||
| b82636ff12 | |||
| 624df65fee | |||
| 7b96a2a326 | |||
| 111d9aa8de | |||
| 6c7645a9c8 | |||
| 1a8295a5a5 | |||
| 95e5a58f15 | |||
| b233c18709 | |||
| 8d3020ef84 | |||
| d058da7198 | |||
| 2688d3d9ad | |||
| 98efafb738 | |||
| 37ef9a1b05 | |||
| dd50715f43 | |||
| a5d4b082ee | |||
| c1ca5336c8 | |||
| 1c788bf103 | |||
| 82b7ffd39f | |||
| c490c81a32 | |||
| 6ac4d821b8 | |||
| 7c9db88672 | |||
| 35234846f5 | |||
| 36960bc547 | |||
| bde513cc2c | |||
| b4708cb31d | |||
| 936ae927b7 | |||
| 07756a0660 | |||
| 3bf70f8956 | |||
| 583bc83839 | |||
| ec7f5f5bb1 | |||
| 746a78ff8f | |||
| 8fd51be217 | |||
| 6ac0c0bae4 | |||
| 2eb69eb1fe | |||
| 0b7308e602 | |||
| f329f25992 | |||
| 11647db257 | |||
| 9f65360713 | |||
| 7c2e5533db | |||
| 32fa3e75ea | |||
| 435aa4a365 | |||
| 8d955bf640 | |||
| a44d15a166 | |||
| b33e1d3569 | |||
| cba0f92a7a | |||
| 1f163d65cd | |||
| e816145b13 | |||
| 4cb62b382b | |||
| ad2c922ab4 | |||
| a0f7867a25 | |||
| dd75268d60 | |||
| 0c6ec93443 | |||
| 15ef01268b | |||
| 682db94aae | |||
| 1bba38be77 | |||
| f7a7e80d97 | |||
| 7327b3149a | |||
| 9ab93d0e82 | |||
| 2f5ad473c6 | |||
| e478ae3e6e | |||
| 06d3d12afa | |||
| 1060339a93 | |||
| af1e852228 | |||
| 9ff500bb37 | |||
| 18603a5682 | |||
| 53578ac92b | |||
| 14118b6a63 | |||
| 0813d2e37c | |||
| 8d5743119f | |||
| 5105ef0b1e | |||
| d67c8a6298 | |||
| 64ac86b32b | |||
| ed5c8815ce | |||
| 5e41f04f72 | |||
| e8e5bb6211 | |||
| e910bf6f6a | |||
| bd47cef7e5 | |||
| ad3249077b | |||
| 367acd05e5 | |||
| bae1d0b0cc | |||
| f58e111ce1 | |||
| b647b9f901 | |||
| 883655dc58 | |||
| 21960a2c95 | |||
| 254195b331 | |||
| ce032525d2 | |||
| f9b992cce3 | |||
| 3f6e4755a6 | |||
| cc4c5b79c1 | |||
| 673edbb8b3 | |||
| 89f9e09c3d | |||
| f1a6b1f4f6 | |||
| 16398282ed | |||
| 315ccf102d | |||
| 7d8feb0876 | |||
| 44f7a9d4fa | |||
| b070207bd5 | |||
| 614f7e0f8c | |||
| a1af05ff48 | |||
| 83536372f0 | |||
| 3357121044 | |||
| 2a7e972256 | |||
| 0d75ab146e | |||
| 385ae53c7e | |||
| a08c41d3db | |||
| bd84c35138 | |||
| 04722684aa | |||
| 025b725551 | |||
| 6411d8a03d | |||
| edce4538d8 | |||
| d1dd41bc6b | |||
| 5d80f6ec0f | |||
| c8ad9d4433 | |||
| 0f05e0467a | |||
| 3c2abbb3b9 | |||
| 61b5e4bd6e | |||
| d4aca5b6f1 | |||
| 551462f1dd | |||
| 5d954684e1 | |||
| b12373eb1b | |||
| 31e6b28b72 | |||
| 4a77a20c9e | |||
| fe5bbbc647 | |||
| 8699f09307 | |||
| d458fb333f | |||
| e7264641a2 | |||
| 8afc04f266 | |||
| 427df80396 | |||
| ff3ba9047f | |||
| 1d14174ad5 | |||
| a307e2c186 | |||
| 1cc3a7c6e3 | |||
| db33374dc0 | |||
| 2c75c0d608 | |||
| f84cd44db5 | |||
| 84cec2eb24 | |||
| 031b934c99 | |||
|
|
7491396645 | ||
| 1c299cafef | |||
| cbce724ade | |||
| 00dfe27738 | |||
| 6e0026ed5c | |||
| d92f382b9a | |||
| 630ec3d052 | |||
| bfd7195543 | |||
| 0d2481bd78 | |||
| 28cd462bc6 | |||
| 67358560b8 | |||
| 675c453599 | |||
| e4543eeb0b | |||
| e8e165ff03 | |||
| 5175bd5f4a | |||
| 874c502094 | |||
| 4490c0a97c | |||
|
|
8e76899b40 | ||
| 8617c8e982 | |||
| 0025d82cd8 | |||
| 03c0e49572 | |||
| 7c3c13abb8 | |||
| f954e867dc | |||
| 67f682aa88 | |||
| 0ceecf4c14 | |||
| 6fdac40832 | |||
| 2ba3c05e4a | |||
| 6ab7e96894 | |||
| ddd759a838 | |||
| 5244ae3850 | |||
| b90aa5ef07 | |||
| d52c10bc84 | |||
| a6bc317141 | |||
| d4ee3cf692 | |||
| c96ac804df | |||
| 4af218f7ad | |||
| b08576c972 | |||
| 44cb0bf8a5 | |||
| 4c9305c89d | |||
| 8c838966f2 | |||
| 6ffb80322b | |||
| 6e1bbb878a | |||
| 4a1abf06f6 | |||
| e9a6a482ee | |||
| 3bdf539540 | |||
| f053f6292d | |||
| e350eac5c7 | |||
| 046f2ca75d | |||
| 6fcba6dc75 | |||
| 3750b6c131 | |||
| 4046339f5b | |||
| da224a0e4b | |||
| 60a73a81be | |||
| 889eb1d5c2 | |||
|
|
e34b3e02b3 | ||
| d7f01e0a5e | |||
| 6ea3629f77 | |||
| b010f7e7cc | |||
| 0b60f953b7 | |||
| d64ce2036a | |||
| ebe3997beb | |||
| 1b23814dc3 | |||
| df35d1d935 | |||
| b01c289a26 | |||
| dafa3229bb | |||
| dee784472f | |||
| 295f8257e3 | |||
| 5adc8309f2 | |||
| cd58ea209e | |||
| 0ae493a0f5 | |||
| c0f6fc1121 | |||
| dc519dc055 | |||
| 4d178f7bb8 | |||
| c0ba0e605a | |||
| 4620390411 | |||
| a18e295a9e | |||
| f3ae88c6d1 | |||
| d08ed06bc5 | |||
| b648661e60 | |||
| b26b48034c | |||
| 6acfa2927c | |||
| 914a464e4f | |||
| 505031d103 | |||
| b5927a5217 | |||
| 5c87fd6cd4 | |||
| dbb5fe131e | |||
| 89cd81b2f4 | |||
| 2c58405314 | |||
| ffe9f90b4e | |||
| f8c3a9dbef | |||
| 2c6007d404 | |||
| 3253a217d7 | |||
| 7c67964ea8 | |||
| b42ea3d7b6 | |||
| eb2179c0ad | |||
| 61ec35a29b | |||
| 56e44e94e0 | |||
| ee24ef7340 | |||
| a1a0a517a2 | |||
| 265a697136 | |||
| 6e53b32f5d | |||
| af6553abf6 | |||
| d22682519b | |||
| b2065c4155 | |||
| 63f5db1c58 | |||
| f3a5e0a54c | |||
| 136000540b | |||
| 762d766db5 | |||
| 812c795723 | |||
| cf72c1df1f | |||
| 05b35bd9f0 | |||
| 4eb7c46286 | |||
| b42945ac7d | |||
| ea4d334d10 | |||
| dd1bc890bd | |||
| f9fe700f68 | |||
| a0b7362fc5 | |||
| e7a77fbfb5 | |||
| 7d38f3a718 | |||
| 70dde17e88 | |||
| 5f11a95d32 | |||
| d78e738f51 | |||
| c9770d065a | |||
| f42d1ebf28 | |||
| f6621a5bb9 | |||
| 136d4e699f | |||
| a28fca11a7 | |||
| e26b8408f6 | |||
| 69d1fd44f8 | |||
| 677aefbe73 | |||
| e2f784ed3b | |||
| ac3758e027 | |||
| f43e4ff664 | |||
| c15e9812c4 | |||
| a2390d52c5 | |||
| 7ee17cb5b8 | |||
| f535ba7b2a | |||
| 48d10b25ee | |||
| ccd8d63d8d | |||
| 519a1079bc | |||
| 84fa3ee4b6 | |||
| 4774a0ec0f | |||
| 5ba3dfc451 | |||
| 729f1180b7 | |||
| 1e74d0470c | |||
| c1b58f7038 | |||
| 904cc4401e | |||
| 7e033412bd | |||
| 3bdf71425b | |||
| 2067944151 | |||
| c34708b989 | |||
| a07b871bbb | |||
| 9b0b4ca08c | |||
| 09c631b4e5 | |||
| c246310cab | |||
| fef3a1fbff | |||
| dacf34ebc0 | |||
| 4b96e82d25 | |||
| 967c5f32c7 | |||
| 18c5a087f3 | |||
| f40ce68ced | |||
| bfa2b1e9b1 | |||
| 6908b75571 | |||
| ce7fd6074b | |||
| 297b3aba37 | |||
| 228d93f399 | |||
| 6364aa446a | |||
| b5c5be02db | |||
| 0bfabd8226 | |||
| c70e877b42 | |||
| 4f1fc0bea5 | |||
| a664bfbe1b | |||
| a744ed593b | |||
| c9a83021a9 | |||
| bea8f8c150 | |||
| c1bdb5e422 | |||
| 6e82ef3b5a | |||
| 6d16b93530 | |||
| 9f6d1c3dc6 | |||
| aca55b4045 | |||
| c23935afe6 | |||
| 88af7bdcc0 | |||
| 838a61c698 | |||
| 5a9dc34ee8 | |||
| b21c6adccc | |||
| 73ef0aafdc | |||
| 9026d6d281 | |||
| 7c193ba043 | |||
| b72a387b97 | |||
| 7e56757597 | |||
| e0c52b06fd | |||
| e94371887b | |||
| b0bb5047b1 | |||
| 48419a1106 | |||
| b74dda987e | |||
| 1ffae8e5c9 | |||
| b8bf6b2b71 | |||
| 9a42b8e125 | |||
| c7f6257539 | |||
| 008d33265b | |||
| 3ea66b6445 | |||
| 2e13dfe565 | |||
| edf26867b1 | |||
| ad1d36cd0b | |||
| d51ffe9735 | |||
| 527439cf9d | |||
| 4871d8d0d8 | |||
| 407d6309a5 | |||
| 580564964b | |||
| acbed9d694 | |||
| c7caaa0fb0 | |||
| d9751b5205 | |||
| 62f99dea6a | |||
| d162de768d | |||
| bbf47de957 | |||
| e3a18282c1 | |||
| 91aa4aeb3e | |||
| b7caaeec65 | |||
| 58eff4733b | |||
| 844d5849da | |||
| 8afe6e1f11 | |||
| 7e23072334 | |||
| a8d92a2f41 | |||
| 964ae49c2f | |||
|
|
6b6dd067ab | ||
| 02b96f2658 | |||
| e668c1eec6 | |||
| 611d3fd7bf | |||
| d6a3deecc7 | |||
| 22b172afd9 | |||
| 154c57f9c0 | |||
| 9432fa62d8 | |||
| 4020fd7ad2 | |||
| 33f308f6b3 | |||
| 2092e46d39 | |||
| aff3f9ac92 | |||
| 35a91d755a | |||
| 3c2a66f990 | |||
| 8633167719 | |||
| 717f5f661b | |||
| 6ae85bde15 | |||
| bd3fce4163 | |||
| 077dc7d1fa | |||
| 33412d50a3 | |||
| 27c6aa1462 | |||
| e4734ce874 | |||
| 393715a373 | |||
| c094653af3 | |||
| 74849558fd | |||
| ee0feb3a06 | |||
| cdd7d1a0ed | |||
| 6ff3f79f83 | |||
| 7c17fa4728 | |||
| 5909167243 | |||
| ee71156f3b | |||
| e0826c2f4e | |||
| 0b0a5c3c62 | |||
| 45e9c2674e | |||
| 4946eceab9 | |||
| 8a543eee37 | |||
| 7482a88ef3 | |||
| 4b523fdad1 | |||
| 0abebcced3 | |||
| 6ec31211d9 | |||
| d02567677c | |||
| 62b0f425e6 | |||
| 641b8976d5 | |||
| d9be7c5eeb | |||
| aecf6b8616 | |||
| 83ca7976ce | |||
| e0a1194dae | |||
| da463f2c27 | |||
|
|
df20b34b2b | ||
| 51f51a78bd | |||
| 155cdc68af | |||
| 82b5da8089 | |||
| 3ddbbf3ab5 | |||
| f8bfc83a61 | |||
| 491a13ed95 | |||
| 58c4f517c5 | |||
| c1b10f0504 | |||
| 62363cc26f | |||
| f93cb20dae | |||
| f57d1780fb | |||
| d4cb0abc24 | |||
| 1f418c9532 | |||
| ab3a17be25 | |||
| 50a96b5f7a | |||
| 31b44906ab | |||
| 858a7e52c3 | |||
| f69d5c423c | |||
| 04bf10a356 | |||
| f2e522a52a | |||
| 0cbf4527c0 | |||
| 64972f99b7 | |||
| e4be74ca87 | |||
| cad3d7ecd5 | |||
| fe199e02a0 | |||
| ef6f7bb23d | |||
| b36be765e8 | |||
| 484c445a24 | |||
| 6a15af9f0b | |||
| d464b137cb | |||
| b000efddbe | |||
| 9d7eea58bd | |||
| ee5c127290 | |||
| 0cb3c06c0a | |||
| 0f083bd4e2 | |||
| 19c9f39128 | |||
| 6db336ec1e | |||
| 7d51ce0850 | |||
| 0ee765de37 | |||
| aa2c84142b | |||
| 3af20cdd7b | |||
| 0c9f488f56 | |||
| 2f9df623fd | |||
| 8b7745f473 | |||
| 8c12edfdb9 | |||
| f263d5d175 | |||
| 61b78cfc73 | |||
|
|
18dbceea76 | ||
|
|
0c97aa2461 | ||
| 680cf898b6 | |||
| 77a4b6fd32 | |||
| fce3abfe0c | |||
| d1624915c4 | |||
|
|
d68c5460fd | ||
| bb0dd24abd | |||
| c66bc3cb68 | |||
| 0c612eeb7a | |||
| a34554a283 | |||
| b214e55690 | |||
| 065b3a2d6a | |||
| 6d9ce99e5b | |||
| a3c69580e5 | |||
| fa71f02dd0 | |||
| 82993ca54a | |||
| 04c60776e3 | |||
| 50e18c168e | |||
| 5fd7bb61d5 | |||
| 64d7437fa4 | |||
| 76d8ebaf2b | |||
| 2b5dde01ec | |||
| 7b0f65645d | |||
| a9f51807b4 | |||
| 53d9e05b95 | |||
| 425a2ad7f5 | |||
| 899163c847 | |||
| ca48e370ff | |||
| f79ab7211c | |||
| 6121a8db3a | |||
| ef7c53f15b | |||
| e5a3ce5f8d | |||
| 63cdfef045 | |||
| 19c916b771 | |||
| acdc09efe0 | |||
| 13860cfb32 | |||
| 77d75b4d8b | |||
| 263e13c8f8 | |||
| e3fcf6e817 | |||
| 89c37d390f | |||
| 3eeb5fd787 | |||
| cf0c353856 | |||
| c76c396342 | |||
| d60ac5de17 | |||
| d9c324c22d | |||
| aec50b5d84 | |||
| 7da1e6178d | |||
| 5fba7afd82 | |||
| 683a206c7b | |||
| 014cead444 | |||
|
|
5ca1312464 | ||
| 3b891aea90 | |||
| b096a1c1ae | |||
| a211650860 | |||
| 8f895f01a7 | |||
| 765a99d89f | |||
| c9cd49c3ac | |||
| 0f612ba72b | |||
| 0f6819f54a | |||
| 6ffed60aaf | |||
| 0a847dbb1e | |||
| 074a6b9434 | |||
| 229a48ac07 | |||
|
|
df508de28b | ||
| 05702d9917 | |||
| 98c0e744ce | |||
| 33770cdf63 | |||
| dbecace73b | |||
| 04738b91ee | |||
| d7c3e03c0f | |||
| 5811fa3921 | |||
| f435277463 | |||
| 587ec584c1 | |||
| 832b115a0d | |||
| 385a26ac9d | |||
| 1b92a35237 | |||
| 06805e5b2a | |||
| 3f50c45bed | |||
| 5a4d49e059 | |||
| 78eb463742 | |||
| 55f0484f93 | |||
| 75d19297ee | |||
| 084a56b0a1 | |||
| 3c5246b159 | |||
| 73ce1bc4b5 | |||
| 84b4e50e64 | |||
| ed160923c7 | |||
| 38c1dc8745 | |||
| 559a6cdc86 | |||
|
|
d4b208b620 | ||
| 51bbbc9e56 | |||
| 39e5653825 | |||
| 65dc602d67 | |||
| 333bf9e145 | |||
| 4052df257c | |||
|
|
1ca8827e91 | ||
| a4f3c98fae | |||
| f403319fea | |||
| d0b405fb15 |
@@ -1,38 +0,0 @@
|
|||||||
#! /bin/sh
|
|
||||||
set -euf
|
|
||||||
|
|
||||||
pl() {
|
|
||||||
for i in $(seq $1 $(expr $2 - 1)); do
|
|
||||||
printf '\e[38;5;%sm%03i\e[m ' $i $i
|
|
||||||
done
|
|
||||||
printf '\e[38;5;%sm%03i\e[m\n' $2 $2
|
|
||||||
}
|
|
||||||
|
|
||||||
p() {
|
|
||||||
printf '\e[38;5;%sm%03i\e[m ' $1 $1
|
|
||||||
}
|
|
||||||
pn() {
|
|
||||||
printf '\e[38;5;%sm%03i\e[m\n' $1 $1
|
|
||||||
}
|
|
||||||
|
|
||||||
p6x6() {
|
|
||||||
for i in $(seq 0 5); do
|
|
||||||
for j in $(seq 0 5); do
|
|
||||||
p $(expr $1 + $i + $j \* 6)
|
|
||||||
done
|
|
||||||
echo
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
pl 0 7
|
|
||||||
pl 8 15
|
|
||||||
|
|
||||||
p6x6 16
|
|
||||||
p6x6 52
|
|
||||||
p6x6 88
|
|
||||||
p6x6 124
|
|
||||||
p6x6 160
|
|
||||||
p6x6 196
|
|
||||||
|
|
||||||
pl 232 243
|
|
||||||
pl 244 255
|
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
file="${1?please supply a poetry file}"
|
|
||||||
[ -f "$file" ] || {
|
|
||||||
echo "'$file' is no file"
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
|
|
||||||
poem="$(mktemp)"
|
|
||||||
clean () {
|
|
||||||
rm "$poem"
|
|
||||||
}
|
|
||||||
trap clean EXIT
|
|
||||||
sed '/^$/d' "$file" > "$poem"
|
|
||||||
|
|
||||||
htmlize() {
|
|
||||||
awk 'ORS="<br/>"' \
|
|
||||||
| head -c -5 # remove final <br/> characters
|
|
||||||
}
|
|
||||||
|
|
||||||
for line_number in $(seq 1 "$(wc -l "$poem" | cut -d' ' -f1)"); do
|
|
||||||
if [ "$line_number" -gt 3 ] && [ "$line_number" -gt 1 ]; then
|
|
||||||
sed -n "$((line_number - 3)),$((line_number - 1))p" "$poem"
|
|
||||||
else
|
|
||||||
sed -n "1,$((line_number - 1))p" "$poem"
|
|
||||||
fi | htmlize
|
|
||||||
printf '\t'
|
|
||||||
sed -n "${line_number},+1p" "$poem" | htmlize
|
|
||||||
printf '\n'
|
|
||||||
done
|
|
||||||
@@ -1,54 +0,0 @@
|
|||||||
#!/usr/bin/env -S sed -f
|
|
||||||
s/ā̊/𐬃/g
|
|
||||||
s/t̰/𐬝/g
|
|
||||||
s/ṣ̌/𐬴/g
|
|
||||||
s/š́/𐬳/g
|
|
||||||
s/ą̄/𐬅/g
|
|
||||||
s/ŋᵛ/𐬤/g
|
|
||||||
s/ə̄/𐬇/g
|
|
||||||
s/ŋ́/𐬣/g
|
|
||||||
s/x́/𐬒/g
|
|
||||||
s/xᵛ/𐬓/g
|
|
||||||
s/a/𐬀/g
|
|
||||||
s/ā/𐬁/g
|
|
||||||
s/å/𐬂/g
|
|
||||||
s/ą/𐬄/g
|
|
||||||
s/ə/𐬆/g
|
|
||||||
s/e/𐬈/g
|
|
||||||
s/ē/𐬉/g
|
|
||||||
s/o/𐬊/g
|
|
||||||
s/ō/𐬋/g
|
|
||||||
s/i/𐬌/g
|
|
||||||
s/ī/𐬍/g
|
|
||||||
s/u/𐬎/g
|
|
||||||
s/ū/𐬏/g
|
|
||||||
s/k/𐬐/g
|
|
||||||
s/x/𐬑/g
|
|
||||||
s/g/𐬔/g
|
|
||||||
s/ġ/𐬕/g
|
|
||||||
s/γ/𐬖/g
|
|
||||||
s/c/𐬗/g
|
|
||||||
s/j/𐬘/g
|
|
||||||
s/t/𐬙/g
|
|
||||||
s/θ/𐬚/g
|
|
||||||
s/d/𐬛/g
|
|
||||||
s/δ/𐬜/g
|
|
||||||
s/p/𐬞/g
|
|
||||||
s/f/𐬟/g
|
|
||||||
s/b/𐬠/g
|
|
||||||
s/β/𐬡/g
|
|
||||||
s/ŋ/𐬢/g
|
|
||||||
s/n/𐬥/g
|
|
||||||
s/ń/𐬦/g
|
|
||||||
s/ṇ/𐬧/g
|
|
||||||
s/m/𐬨/g
|
|
||||||
s/m̨/𐬩/g
|
|
||||||
s/ẏ/𐬫/g
|
|
||||||
s/y/𐬪/g
|
|
||||||
s/v/𐬬/g
|
|
||||||
s/r/𐬭/g
|
|
||||||
s/s/𐬯/g
|
|
||||||
s/z/𐬰/g
|
|
||||||
s/š/𐬱/g
|
|
||||||
s/ž/𐬲/g
|
|
||||||
s/h/𐬵/g
|
|
||||||
24
.bin/browser
24
.bin/browser
@@ -1,24 +0,0 @@
|
|||||||
#!/bin/sh -e
|
|
||||||
#
|
|
||||||
# Usage: browser
|
|
||||||
# pipe html to a browser
|
|
||||||
# e.g.
|
|
||||||
# $ echo '<h1>hi mom!</h1>' | browser
|
|
||||||
# $ ron -5 man/rip.5.ron | browser
|
|
||||||
|
|
||||||
if [ -t 0 ]; then
|
|
||||||
if [ -n "$1" ]; then
|
|
||||||
open $1
|
|
||||||
else
|
|
||||||
cat <<usage
|
|
||||||
Usage: browser
|
|
||||||
pipe html to a browser
|
|
||||||
$ echo '<h1>hi mom!</h1>' | browser
|
|
||||||
$ ron -5 man/rip.5.ron | browser
|
|
||||||
usage
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
f="/tmp/browser.$RANDOM.html"
|
|
||||||
cat /dev/stdin > $f
|
|
||||||
xdg-open $f
|
|
||||||
fi
|
|
||||||
46
.bin/bvg.sh
46
.bin/bvg.sh
@@ -1,46 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
interesting="U6 N6 140 M46 184 N84"
|
|
||||||
|
|
||||||
curl -sSL 'https://www.bvg.de/disruption-reports/q' \
|
|
||||||
--data-raw '{"variables":{},"query":"{
|
|
||||||
allDisruptions {
|
|
||||||
disruptions {
|
|
||||||
meldungsId
|
|
||||||
linie
|
|
||||||
verkehrsmittel
|
|
||||||
__typename
|
|
||||||
... on Traffic {
|
|
||||||
datum
|
|
||||||
gueltigVonDatum
|
|
||||||
gueltigVonZeit
|
|
||||||
gueltigBisDatum
|
|
||||||
gueltigBisZeit
|
|
||||||
richtungName
|
|
||||||
richtungHafasId
|
|
||||||
beginnAbschnittName
|
|
||||||
beginnAbschnittHafasId
|
|
||||||
endeAbschnittName
|
|
||||||
endeAbschnittHafasId
|
|
||||||
textIntUrsache
|
|
||||||
sev
|
|
||||||
textIntAuswirkung
|
|
||||||
umfahrung
|
|
||||||
textWAPSMSUrsache
|
|
||||||
textWAPSMSAuswirkung
|
|
||||||
prioritaet
|
|
||||||
__typename
|
|
||||||
}
|
|
||||||
}
|
|
||||||
__typename
|
|
||||||
}
|
|
||||||
}"}' \
|
|
||||||
| jq --arg interesting "$interesting" '
|
|
||||||
.data.allDisruptions.disruptions
|
|
||||||
| map(select(
|
|
||||||
(.linie as $linie
|
|
||||||
| $interesting
|
|
||||||
| split(" ")
|
|
||||||
| index($linie))
|
|
||||||
and (.["__typename"] == "Traffic")
|
|
||||||
))
|
|
||||||
'
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
directory="$(mktemp -d)"
|
|
||||||
trap clean EXIT
|
|
||||||
clean() {
|
|
||||||
rm -rf "$directory"
|
|
||||||
}
|
|
||||||
|
|
||||||
year=$(date +%Y)
|
|
||||||
output=/tmp/$year.pdf
|
|
||||||
|
|
||||||
for month in $(seq 1 12); do
|
|
||||||
printf "\r%d" "$month" 1>&2
|
|
||||||
astrolog -zN Berlin -qm "$month" "$year" -X -K -XA -Xr -Xm -Xb -Xo "$(printf "%s/%02d.bmp" "$directory" "$month")" -Xw 1080 720 2>/dev/null
|
|
||||||
done
|
|
||||||
printf "\r"
|
|
||||||
|
|
||||||
convert "$directory/*.bmp" "$output"
|
|
||||||
echo "$output"
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
set -efu
|
|
||||||
|
|
||||||
usage() {
|
|
||||||
echo >&2 "$0 add-{reddit,telegram,youtube,twitch,twitter} NAME"
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
|
|
||||||
candyman() {
|
|
||||||
curl -fsSv http://news.r/api -H content-type:application/json -d "$(jq -n "
|
|
||||||
{
|
|
||||||
command: \"PRIVMSG\",
|
|
||||||
params: [\"#all\", \"candyman: $1 $2\"]
|
|
||||||
}
|
|
||||||
")"
|
|
||||||
}
|
|
||||||
|
|
||||||
[ $# -ge 2 ] || usage
|
|
||||||
|
|
||||||
case "$1" in
|
|
||||||
add-reddit|add-telegram|add-youtube|add-twitter|add-twitch)
|
|
||||||
candyman "$@"
|
|
||||||
;;
|
|
||||||
*) usage;;
|
|
||||||
esac
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
#! /usr/bin/env nix-shell
|
|
||||||
#! nix-shell -i bash -p pdftk gnugrep
|
|
||||||
set -efu
|
|
||||||
|
|
||||||
INPUT_FILE="${2:?Pass the PDF path as second argument.}"
|
|
||||||
PAGES_PER_REPORT="${1:?Pass the chunk size as first argument.}"
|
|
||||||
|
|
||||||
if [ ! -f "$INPUT_FILE" ]; then
|
|
||||||
echo >&2 "File $INPUT_FILE does not exist."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
TOTAL_PAGES="$(pdftk "$INPUT_FILE" dump_data | grep NumberOfPages | cut -f2 -d' ')"
|
|
||||||
|
|
||||||
RUNS=$((TOTAL_PAGES/PAGES_PER_REPORT))
|
|
||||||
|
|
||||||
for run in $(seq 0 "$((RUNS-1))"); do
|
|
||||||
start_page=$((run*PAGES_PER_REPORT+1))
|
|
||||||
end_page=$(((run+1)*PAGES_PER_REPORT))
|
|
||||||
output_file="chunk_$((run+1)).pdf"
|
|
||||||
echo "splitting $INPUT_FILE from $start_page to $end_page into $output_file"
|
|
||||||
pdftk "$INPUT_FILE" cat "$start_page-$end_page" output "$output_file"
|
|
||||||
done
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
#!/usr/bin/env -S awk -f
|
|
||||||
function z() {
|
|
||||||
getline < "/proc/uptime"
|
|
||||||
close("/proc/uptime")
|
|
||||||
return $0
|
|
||||||
}
|
|
||||||
BEGIN {
|
|
||||||
x = z()
|
|
||||||
while (1) {
|
|
||||||
y = z()
|
|
||||||
printf "%02d:%05.2f\r", (y - x) / 60, (y - x) % 60
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
#!/usr/bin/env python3
|
|
||||||
|
|
||||||
import csv
|
|
||||||
import json
|
|
||||||
import sys
|
|
||||||
import argparse
|
|
||||||
|
|
||||||
parser = argparse.ArgumentParser()
|
|
||||||
parser.add_argument("--delimiter", "-d", default=",", help="CSV field separator")
|
|
||||||
|
|
||||||
args = parser.parse_args()
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
json.dump(list(csv.DictReader(sys.stdin, delimiter=args.delimiter)), sys.stdout)
|
|
||||||
@@ -1,43 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
name=$RANDOM
|
|
||||||
url='http://localhost:9093/api/v1/alerts'
|
|
||||||
|
|
||||||
echo "firing up alert $name"
|
|
||||||
|
|
||||||
# change url o
|
|
||||||
curl -XPOST $url -d "[{
|
|
||||||
\"status\": \"firing\",
|
|
||||||
\"labels\": {
|
|
||||||
\"alertname\": \"$name\",
|
|
||||||
\"service\": \"my-service\",
|
|
||||||
\"severity\":\"warning\",
|
|
||||||
\"instance\": \"$name.example.net\"
|
|
||||||
},
|
|
||||||
\"annotations\": {
|
|
||||||
\"summary\": \"High latency is high!\"
|
|
||||||
},
|
|
||||||
\"generatorURL\": \"http://prometheus.int.example.net/<generating_expression>\"
|
|
||||||
}]"
|
|
||||||
|
|
||||||
echo ""
|
|
||||||
|
|
||||||
echo "press enter to resolve alert"
|
|
||||||
read
|
|
||||||
|
|
||||||
echo "sending resolve"
|
|
||||||
curl -XPOST $url -d "[{
|
|
||||||
\"status\": \"resolved\",
|
|
||||||
\"labels\": {
|
|
||||||
\"alertname\": \"$name\",
|
|
||||||
\"service\": \"my-service\",
|
|
||||||
\"severity\":\"warning\",
|
|
||||||
\"instance\": \"$name.example.net\"
|
|
||||||
},
|
|
||||||
\"annotations\": {
|
|
||||||
\"summary\": \"High latency is high!\"
|
|
||||||
},
|
|
||||||
\"generatorURL\": \"http://prometheus.int.example.net/<generating_expression>\"
|
|
||||||
}]"
|
|
||||||
|
|
||||||
echo ""
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
#! /usr/bin/env nix-shell
|
|
||||||
#! nix-shell -p "(import <nixpkgs> { overlays = [ (import ~/work/fysiweb/engiadina-pwa/devops/pkgs) ]; }).elm-publish-private"
|
|
||||||
#! nix-shell -i bash
|
|
||||||
|
|
||||||
set -efux
|
|
||||||
|
|
||||||
exec elm-publish-private "$@"
|
|
||||||
@@ -1,34 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
set -efu
|
|
||||||
|
|
||||||
# Berlin: -d lodeg=13 -d lomin=22 -d losec=41 -d lodir=E -d ladeg=52 -d lamin=27 -d lasec=42 -d ladir=N -d usecoords=1 \
|
|
||||||
# Kassel: -d lodeg=9 -d lomin=32 -d losec=5 -d lodir=E -d ladeg=51 -d lamin=18 -d lasec=17 -d ladir=N -d usecoords=1 \
|
|
||||||
|
|
||||||
|
|
||||||
[ $# -eq 1 ] || {
|
|
||||||
echo >&2 Usage: "$0" TIMESTAMP
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
|
|
||||||
export TZ=UTC
|
|
||||||
|
|
||||||
chart_path="$(mktemp /tmp/chart_XXX.pdf)"
|
|
||||||
|
|
||||||
timestamp="$1"
|
|
||||||
|
|
||||||
year="$(date -d "@$timestamp" +%Y)"
|
|
||||||
month="$(date -d "@$timestamp" +%m)"
|
|
||||||
day="$(date -d "@$timestamp" +%d)"
|
|
||||||
hour="$(date -d "@$timestamp" +%H)"
|
|
||||||
minute="$(date -d "@$timestamp" +%M)"
|
|
||||||
|
|
||||||
curl -sSL 'https://edifyingfellowship.org/astro/' \
|
|
||||||
-d lodeg=9 -d lomin=32 -d losec=5 -d lodir=E -d ladeg=51 -d lamin=18 -d lasec=17 -d ladir=N -d usecoords=1 \
|
|
||||||
-d ybyr="$year" -d ybmo="$month" -d ybdy="$day" -d ybhr="$hour" -d ybmi="$minute" -d ybsc=0 -d ybtz="$TZ" \
|
|
||||||
-d currenttime=0 \
|
|
||||||
-d title="$timestamp" \
|
|
||||||
-d options[]=VancouverWheel -d options[]=Arrow -d options[]=XBold -d options[]=HouseLabels -d options[]=Placidus \
|
|
||||||
-d options[]=Sun -d options[]=Moon -d options[]=Mercury -d options[]=Venus -d options[]=Mars -d options[]=Jupiter -d options[]=Saturn -d options[]=Uranus -d options[]=Neptune -d options[]=Pluto -d options[]=Ascendant -d options[]=MC -d options[]=Lilith -d options[]=MeanNode -d options[]=TrueNode \
|
|
||||||
-d aspectpct=100 -d format=PDF -d Submit= -o "$chart_path"
|
|
||||||
|
|
||||||
zathura "$chart_path"
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
#!/usr/bin/env python3
|
|
||||||
import csv
|
|
||||||
import json
|
|
||||||
import sys
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
json_list = json.load(sys.stdin)
|
|
||||||
if not isinstance(json_list, list):
|
|
||||||
print("JSON object is not a list.", file=sys.stderr)
|
|
||||||
sys.exit(1)
|
|
||||||
if len(json_list) == 0:
|
|
||||||
print("JSON list is empty.", file=sys.stderr)
|
|
||||||
sys.exit(1)
|
|
||||||
keys = set()
|
|
||||||
for element in json_list:
|
|
||||||
if isinstance(element, dict):
|
|
||||||
keys |= element.keys()
|
|
||||||
else:
|
|
||||||
print("Non-dict element:", element, file=sys.stderr)
|
|
||||||
sys.exit(1)
|
|
||||||
writer = csv.DictWriter(sys.stdout, fieldnames=list(keys))
|
|
||||||
writer.writeheader()
|
|
||||||
for element in json_list:
|
|
||||||
writer.writerow(element)
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
#!/usr/bin/env -S jq -r -f
|
|
||||||
(map(keys) | add | unique) as $cols
|
|
||||||
| map(. as $row | $cols | map($row[.])) as $rows
|
|
||||||
| $cols, $rows[]
|
|
||||||
| @csv
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
session_id=7b638c194d9bda74f80043045018cc9e
|
|
||||||
|
|
||||||
declare -A libraries
|
|
||||||
|
|
||||||
libraries["Literatur"]=344428
|
|
||||||
libraries["Sprache"]=344160
|
|
||||||
libraries["Miscellanea"]=344427
|
|
||||||
libraries["Wissenschaft"]=344429
|
|
||||||
libraries["Relicta"]=565920
|
|
||||||
|
|
||||||
for library in ${!libraries[@]}
|
|
||||||
do
|
|
||||||
curl -sSL 'https://www.libib.com/library/functions/csv-export.php' -H "Cookie: PHPSESSID=$session_id" -d export="${libraries[$library]}" > "$library.csv"
|
|
||||||
done
|
|
||||||
@@ -1,81 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
set -efu
|
|
||||||
|
|
||||||
if echo "$1" | grep -Eq '[[:digit:]]{5}'; then
|
|
||||||
PLZ="$1"
|
|
||||||
else
|
|
||||||
echo >&2 "Usage: $0 PLZ"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
lieferando_dir=/tmp/lieferando
|
|
||||||
mkdir -p "$lieferando_dir/$PLZ"
|
|
||||||
|
|
||||||
fetch_restaurants() {
|
|
||||||
cache_path="$lieferando_dir/$PLZ.json"
|
|
||||||
|
|
||||||
if [ -r "$cache_path" ]; then
|
|
||||||
cat "$cache_path"
|
|
||||||
else
|
|
||||||
w3m -dump_source "http://www.lieferando.de/$PLZ" \
|
|
||||||
| gunzip \
|
|
||||||
| sed -n '/var restaurants/,/];$/p' \
|
|
||||||
| sed 's/var restaurants =//;$s/;$//' \
|
|
||||||
| prettier --parser=json \
|
|
||||||
| jq '
|
|
||||||
map({
|
|
||||||
name: .[30] | .name,
|
|
||||||
category: .[30] |.categories | split(", "),
|
|
||||||
url: "http://lieferando.de\(.[30] | .url)",
|
|
||||||
minutes: .[19],
|
|
||||||
minimum: .[10],
|
|
||||||
delivery: .[14]
|
|
||||||
})' \
|
|
||||||
| tee "$cache_path"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
fetch_menu() {
|
|
||||||
[ $# -eq 1 ] || exit 1
|
|
||||||
|
|
||||||
slug="$(echo "$1" | sed 's!.*/!!')"
|
|
||||||
cache_path="$lieferando_dir/$PLZ/$slug.json"
|
|
||||||
|
|
||||||
if [ -r "$cache_path" ]; then
|
|
||||||
cat "$cache_path"
|
|
||||||
else
|
|
||||||
w3m -dump_source "$1" \
|
|
||||||
| gunzip \
|
|
||||||
| sed -n '/var MenucardProducts/,/\];/p' \
|
|
||||||
| sed 's/var MenucardProducts =//;s/;$//' \
|
|
||||||
| jq -r '
|
|
||||||
unique_by(.productId)
|
|
||||||
| group_by(.categoryId)
|
|
||||||
| flatten
|
|
||||||
' \
|
|
||||||
| tee "$cache_path"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
data="$(fetch_restaurants)"
|
|
||||||
|
|
||||||
# echo "$data" | jq -c '.[]' | while read -r restaurant; do
|
|
||||||
# fetch_menu "$(echo "$restaurant" | jq -r .url)"
|
|
||||||
# done
|
|
||||||
|
|
||||||
selected_categories="$(echo "$data" | jq -r 'map(.category) | flatten | unique | .[]' | fzf -m)"
|
|
||||||
|
|
||||||
selected_restaurant_url="$(echo "$selected_categories" | jq --argjson restaurants "$data" -sRr '
|
|
||||||
split("\n")[:-1] as $categories
|
|
||||||
| $restaurants[]
|
|
||||||
| select(.category - $categories != .category)
|
|
||||||
| "\(.name) [🚴\(.minutes)min 💰\(.minimum)€ + \(.delivery)€] (\(.url))"
|
|
||||||
' \
|
|
||||||
| fzf \
|
|
||||||
| sed 's/.*(//;s/)$//'
|
|
||||||
)"
|
|
||||||
|
|
||||||
fetch_menu "$selected_restaurant_url" \
|
|
||||||
| jq -r '.[] | "\(.price)\t\(.name)"' \
|
|
||||||
| fzf -m \
|
|
||||||
| awk '{print $0; sum += $1} END {print "-----"; print sum}'
|
|
||||||
17
.bin/lit.awk
17
.bin/lit.awk
@@ -1,17 +0,0 @@
|
|||||||
BEGIN {
|
|
||||||
if (!comment) comment = "--";
|
|
||||||
if (!begin) begin = "\\begin{code}";
|
|
||||||
if (!end) end = "\\end{code}";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
if ($0 == begin) {
|
|
||||||
code = 1;
|
|
||||||
print comment, $0;
|
|
||||||
} else if ($0 == end) {
|
|
||||||
code = 0;
|
|
||||||
print comment, $0;
|
|
||||||
} else {
|
|
||||||
if (code) print $0;
|
|
||||||
else print comment, $0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
#! /bin/sh
|
|
||||||
set -efu
|
|
||||||
exec curl -fSs --unix-socket /tmp/much.api.sock http://localhost/current/part
|
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
#! /bin/sh
|
|
||||||
# usage: mail-current-query-find-part-by-name NAME
|
|
||||||
set -efu
|
|
||||||
|
|
||||||
name=$1
|
|
||||||
|
|
||||||
query=$(mail-current-query)
|
|
||||||
result=$(notmuch show --entire-thread=false --format=json "$query")
|
|
||||||
|
|
||||||
part_id=$(printf %s "$result" | jq --arg name "$name" '
|
|
||||||
[
|
|
||||||
recurse |
|
|
||||||
select(type == "object") |
|
|
||||||
{ id, name: .filename } |
|
|
||||||
select(.id != null and .name != null)
|
|
||||||
] |
|
|
||||||
map(select(.name == $name))[0].id
|
|
||||||
')
|
|
||||||
|
|
||||||
if test "$part_id" = null; then
|
|
||||||
printf 'error: could not find part with name %s\n' \
|
|
||||||
"$name" \
|
|
||||||
>&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
exec notmuch show --part="$part_id" "$query"
|
|
||||||
@@ -1,39 +0,0 @@
|
|||||||
#! /bin/sh
|
|
||||||
# usage: mail-current-query-find-part-by-type TYPE
|
|
||||||
set -efu
|
|
||||||
|
|
||||||
type=$1
|
|
||||||
|
|
||||||
query=$(mail-current-query)
|
|
||||||
result=$(notmuch show --entire-thread=false --format=json "$query")
|
|
||||||
|
|
||||||
part_id=$(printf %s "$result" | jq --arg type "$type" '
|
|
||||||
#flatten|map(select(.!=null))[0].body[0] |
|
|
||||||
#
|
|
||||||
#if .["content-type"] == $type then
|
|
||||||
# .id
|
|
||||||
#elif .["content-type"] | test("^multipart/") then
|
|
||||||
# .content|map(select(.["content-type"]==$type))[0].id
|
|
||||||
#else
|
|
||||||
# null
|
|
||||||
#end
|
|
||||||
|
|
||||||
[
|
|
||||||
recurse |
|
|
||||||
select(type == "object") |
|
|
||||||
{ id, type: .["content-type"] } |
|
|
||||||
select(.id != null and .type != null)
|
|
||||||
] |
|
|
||||||
map(select(.type == $type))[0].id
|
|
||||||
')
|
|
||||||
|
|
||||||
if test "$part_id" = null; then
|
|
||||||
printf 'error: could not find part with type %s\n' \
|
|
||||||
"$type" \
|
|
||||||
>&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
exec notmuch show --part="$part_id" "$query"
|
|
||||||
|
|
||||||
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
ssh mud@hotdog.r -t "MUD_NICKNAME=$LOGNAME mud"
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
curl -sSL 'https://diac.alsharekh.org/Diac/DiacText' \
|
|
||||||
-H "Content-Type: application/json" \
|
|
||||||
--data-raw "$(jq --raw-input '{word: ., type: 1}')" \
|
|
||||||
--compressed \
|
|
||||||
| jq -r .diacWord
|
|
||||||
@@ -1,93 +0,0 @@
|
|||||||
#! /usr/bin/env nix-shell
|
|
||||||
#! nix-shell -i bash -p coreutils gnugrep gnused graphviz
|
|
||||||
#
|
|
||||||
# usage: nix-haddock-index
|
|
||||||
#
|
|
||||||
# Run this script in an environment where either NIX_GHC is set, or the ghc
|
|
||||||
# executable exists, to generate an HTML index file pointing to all Haddock
|
|
||||||
# files accessible to the respective ghc version.
|
|
||||||
#
|
|
||||||
# Additionally, an SVG dependency graph of all packages is linked at the
|
|
||||||
# bottom of the index file.
|
|
||||||
#
|
|
||||||
# Note: all files will be generated in /tmp, and won't be deleted automatically
|
|
||||||
#
|
|
||||||
|
|
||||||
set -efux
|
|
||||||
|
|
||||||
if test -z "${NIX_GHC-}"; then
|
|
||||||
NIX_GHC=$(readlink -f "$(type -P ghc)")
|
|
||||||
fi
|
|
||||||
|
|
||||||
if ! echo $NIX_GHC | grep -q '^/nix/store/'; then
|
|
||||||
printf '%s: error: unsupported GHC executable path (not in Nix store): %q\n' \
|
|
||||||
"$0" \
|
|
||||||
"$NIX_GHC" \
|
|
||||||
>&2
|
|
||||||
exit -1
|
|
||||||
fi
|
|
||||||
|
|
||||||
NIX_GHC_PREFIX=$(dirname "$(dirname "$NIX_GHC")")
|
|
||||||
NIX_GHC_DOCDIR=$NIX_GHC_PREFIX/share/doc/ghc/html
|
|
||||||
|
|
||||||
main() {
|
|
||||||
|
|
||||||
hash=$(echo $NIX_GHC_PREFIX | sed -n 's|^/nix/store/\([a-z0-9]\+\).*|\1|p')
|
|
||||||
title="Haddock index for $NIX_GHC_PREFIX"
|
|
||||||
|
|
||||||
header=$(
|
|
||||||
printf 'Haddock index for <a href="%s">%s</a>\n' \
|
|
||||||
$NIX_GHC_PREFIX \
|
|
||||||
$NIX_GHC_PREFIX \
|
|
||||||
)
|
|
||||||
|
|
||||||
suffix=${hash:+-$hash}
|
|
||||||
index_file=/tmp/haddock$suffix-index.html
|
|
||||||
svg_file=/tmp/haddock$suffix.svg
|
|
||||||
|
|
||||||
#if ! test -e $index_file; then
|
|
||||||
eval "$(
|
|
||||||
echo 'gen_index() {'
|
|
||||||
echo ' html_head'
|
|
||||||
"$NIX_GHC_PREFIX"/bin/ghc-pkg dump | sed -n '
|
|
||||||
s/^---$/ reset/p
|
|
||||||
s/^\(name\|version\):\s*\([-A-Za-z0-9_.]\+\)$/ \1=\2/p
|
|
||||||
s/^haddock-html:\s*\([-A-Za-z0-9_./]\+\)$/ haddock_html \1/p
|
|
||||||
'
|
|
||||||
echo ' html_foot'
|
|
||||||
echo '}'
|
|
||||||
)"
|
|
||||||
|
|
||||||
gen_index > $index_file
|
|
||||||
#fi
|
|
||||||
|
|
||||||
#if ! test -e $svg_file; then
|
|
||||||
"$NIX_GHC_PREFIX"/bin/ghc-pkg dot | tred | dot -Tsvg | sed '
|
|
||||||
s/<svg width="[0-9]\+pt" height="[0-9]\+pt"/<svg width="3600px" height="100%"/
|
|
||||||
' > $svg_file
|
|
||||||
#fi
|
|
||||||
|
|
||||||
echo $index_file
|
|
||||||
}
|
|
||||||
reset() {
|
|
||||||
unset name version
|
|
||||||
}
|
|
||||||
haddock_html() {
|
|
||||||
printf '<li>'
|
|
||||||
printf '<a href="%s/index.html">%s</a>' "$1" "$name-$version"
|
|
||||||
printf '</li>\n'
|
|
||||||
}
|
|
||||||
html_head() {
|
|
||||||
printf '<!doctype html>\n'
|
|
||||||
printf '<title>%s</title>\n' "$title"
|
|
||||||
printf '<link href="%s" rel="stylesheet" type="text/css">\n' \
|
|
||||||
"$NIX_GHC_DOCDIR/libraries/ocean.css"
|
|
||||||
printf '<h1>%s</h1>\n' "$header"
|
|
||||||
printf '<ul>\n'
|
|
||||||
}
|
|
||||||
html_foot() {
|
|
||||||
printf '</ul>\n'
|
|
||||||
printf '<a href="%s">graph</a>\n' "$svg_file"
|
|
||||||
}
|
|
||||||
|
|
||||||
main "$@"
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
# inspired by https://github.com/connermcd/bin/blob/1d38cb98812906d8b95dc6e51e1149e29261617d/notetags
|
|
||||||
|
|
||||||
cd "$HOME/notes/" || exit
|
|
||||||
|
|
||||||
[ -f tags ] && rm tags
|
|
||||||
grep -r 'tags:' ./* | while read -r line; do
|
|
||||||
file=$(echo "$line" | cut -d: -f1)
|
|
||||||
unparsed_tags=$(echo "$line" | cut -d: -f3) #
|
|
||||||
tags=$(echo "$unparsed_tags" | sed -e 's/tags: *//g' -e 's/[][,]//g')
|
|
||||||
for tag in $tags; do
|
|
||||||
echo "$tag $file /^$unparsed_tags$/;" >> tags
|
|
||||||
done
|
|
||||||
done
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
#!/usr/bin/env nix-shell
|
|
||||||
#! nix-shell -i bash -p poppler_utils tesseract4
|
|
||||||
set -eu
|
|
||||||
|
|
||||||
pdf_path="$(realpath "$1")"
|
|
||||||
|
|
||||||
[ -f "$pdf_path" ] || {
|
|
||||||
echo "Usage: $0 FILE.pdf" >&2
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
tmpdir="$(mktemp -d)"
|
|
||||||
trap 'rm -rf $tmpdir' EXIT
|
|
||||||
|
|
||||||
cd "$tmpdir"
|
|
||||||
|
|
||||||
pdftoppm -png "$pdf_path" pdf-ocr
|
|
||||||
for png in pdf-ocr*.png; do
|
|
||||||
tesseract "$png" "$png.txt" 2>/dev/null
|
|
||||||
done
|
|
||||||
|
|
||||||
cat pdf-ocr-*.txt
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
youtube-dl -ij "$*" | jq -sr '.[] | .webpage_url'
|
|
||||||
@@ -1,65 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
lidl() {
|
|
||||||
echo LIDL
|
|
||||||
curl -sSL 'https://endpoints.lidl-flyer.com/v3/region-overview/lidl/de-DE/0.json' \
|
|
||||||
| jq -r '
|
|
||||||
.categories
|
|
||||||
| map(select(.name == "Filial-Angebote") | .subcategories | map(.flyers))
|
|
||||||
| flatten
|
|
||||||
| flatten
|
|
||||||
| .[]
|
|
||||||
| .pdfUrl
|
|
||||||
'
|
|
||||||
}
|
|
||||||
|
|
||||||
aldi_nord() {
|
|
||||||
echo ALDI nord
|
|
||||||
echo 'https://magazine.aldi-nord.de/aldi-nord/aldi-aktuell/GetPDF.ashx'
|
|
||||||
echo 'https://magazine.aldi-nord.de/aldi-nord/aldi-vorschau/GetPDF.ashx'
|
|
||||||
}
|
|
||||||
|
|
||||||
rewe_berlin() {(
|
|
||||||
store_id=662366923
|
|
||||||
publisher_id=1062
|
|
||||||
|
|
||||||
echo REWE
|
|
||||||
curl -sSL 'https://www.bonialserviceswidget.de/de/stores/'$store_id'/brochures?storeId='$store_id'&publisherId='$publisher_id | while read -r brochure_id; do
|
|
||||||
curl -sSL 'https://www.bonialserviceswidget.de/de/v5/brochureDetails/'"$brochure_id"'?publisherId='$publisher_id | jq -r .pdfUrl
|
|
||||||
done
|
|
||||||
)}
|
|
||||||
|
|
||||||
kaufland() {(
|
|
||||||
region_code=8920
|
|
||||||
echo KAUFLAND
|
|
||||||
curl -sSL https://filiale.kaufland.de/prospekte.html | htmlq --attribute href '.flyer a' | grep -Eo 'DE_de_KDZ[^/]*' | sed "s/_3000_/_${region_code}_/" | while read -r flyer_id; do
|
|
||||||
curl -sSL "https://endpoints.leaflets.kaufland.com/v3/$flyer_id/flyer.json?regionCode=$region_code" | jq -r .flyer.pdfUrl
|
|
||||||
done
|
|
||||||
)}
|
|
||||||
|
|
||||||
netto_schwarz() {
|
|
||||||
echo 'NETTO (schwarz)'
|
|
||||||
curl -sSL 'https://squid-api.tjek.com/v2/catalogs?dealer_ids=90f2VL&order_by=created' \
|
|
||||||
| jq -r '.[] | .id' \
|
|
||||||
| while read -r flyer_id; do
|
|
||||||
curl -sSL "https://squid-api.tjek.com/v2/catalogs/$flyer_id/download" \
|
|
||||||
| jq -r .pdf_url
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
dir="$(mktemp -d)"
|
|
||||||
trap clean EXIT
|
|
||||||
|
|
||||||
clean() {
|
|
||||||
rm -rf "$dir"
|
|
||||||
}
|
|
||||||
|
|
||||||
prospekt_url="$( (
|
|
||||||
lidl
|
|
||||||
aldi_nord
|
|
||||||
rewe_berlin
|
|
||||||
kaufland
|
|
||||||
netto_schwarz
|
|
||||||
) | fzf)"
|
|
||||||
|
|
||||||
curl -sSL "$prospekt_url" -o "$dir/prospekt.pdf"
|
|
||||||
zathura "$dir/prospekt.pdf"
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
curl -sSL https://www.netzwelt.de/proxy/index.html \
|
|
||||||
| pup ".tblc" \
|
|
||||||
| xml-to-json /dev/stdin \
|
|
||||||
| jq '
|
|
||||||
.div.table.tbody.tr
|
|
||||||
| map(
|
|
||||||
.td
|
|
||||||
| {
|
|
||||||
ip: .[0].a.value,
|
|
||||||
port: .[1],
|
|
||||||
country: .[2] | (if type == "string" then . else .a.value end),
|
|
||||||
security: .[3],
|
|
||||||
protocol: .[4]
|
|
||||||
}
|
|
||||||
)
|
|
||||||
'
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
curl -sSL "https://raw.githubusercontent.com/$*/master/README.md" \
|
|
||||||
| pandoc -f gfm -t man -s \
|
|
||||||
| man -l -
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
filepath="$(shuf --head-count=1)"
|
|
||||||
pages="$(pdfinfo "$filepath" | awk '/^Pages:/{print $2}')"
|
|
||||||
random_page="$(shuf --input-range="1-$pages" --head-count=1)"
|
|
||||||
zathura --page="$random_page" "$filepath"
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
#! /usr/bin/env nix-shell
|
|
||||||
#! nix-shell -i sh -p coreutils byzanz xorg.xwininfo gnused
|
|
||||||
|
|
||||||
# shellcheck shell=sh
|
|
||||||
# ref https://gist.github.com/aforemny/0994cb7f06ea30d56c8b9681ff5d2054
|
|
||||||
|
|
||||||
set -eux
|
|
||||||
|
|
||||||
eval "$(xwininfo | \
|
|
||||||
sed -n -e 's/^ \+Absolute upper-left X: \+\([0-9]\+\).*/x=\1/p' \
|
|
||||||
-e 's/^ \+Absolute upper-left Y: \+\([0-9]\+\).*/y=\1/p' \
|
|
||||||
-e 's/^ \+Width: \+\([0-9]\+\).*/w=\1/p' \
|
|
||||||
-e 's/^ \+Height: \+\([0-9]\+\).*/h=\1/p')"
|
|
||||||
|
|
||||||
trap "pkill -f 'sleep 360d'" INT
|
|
||||||
byzanz-record -e "sleep 360d" -c -x $x -y $y -w $w -h $h "$@"
|
|
||||||
@@ -1,49 +0,0 @@
|
|||||||
import ephem
|
|
||||||
from datetime import datetime, date, timedelta
|
|
||||||
|
|
||||||
now = datetime.now()
|
|
||||||
limit = now + timedelta(days=365)
|
|
||||||
|
|
||||||
|
|
||||||
def events_until(limit):
|
|
||||||
initial_date = ephem.Date(datetime.now())
|
|
||||||
events = {}
|
|
||||||
|
|
||||||
now = initial_date
|
|
||||||
while ephem.localtime(now) <= limit:
|
|
||||||
now = ephem.next_full_moon(now)
|
|
||||||
events[now] = "🌕"
|
|
||||||
|
|
||||||
now = initial_date
|
|
||||||
while ephem.localtime(now) <= limit:
|
|
||||||
now = ephem.next_new_moon(now)
|
|
||||||
events[now] = "🌑"
|
|
||||||
|
|
||||||
now = initial_date
|
|
||||||
while ephem.localtime(now) <= limit:
|
|
||||||
now = ephem.next_vernal_equinox(now)
|
|
||||||
events[now] = "spring equinox"
|
|
||||||
|
|
||||||
now = initial_date
|
|
||||||
while ephem.localtime(now) <= limit:
|
|
||||||
now = ephem.next_autumnal_equinox(now)
|
|
||||||
events[now] = "fall equinox"
|
|
||||||
|
|
||||||
now = initial_date
|
|
||||||
while ephem.localtime(now) <= limit:
|
|
||||||
now = ephem.next_winter_solstice(now)
|
|
||||||
events[now] = "winter solstice"
|
|
||||||
|
|
||||||
now = initial_date
|
|
||||||
while ephem.localtime(now) <= limit:
|
|
||||||
now = ephem.next_summer_solstice(now)
|
|
||||||
events[now] = "summer solstice"
|
|
||||||
return events
|
|
||||||
|
|
||||||
|
|
||||||
events = events_until(limit)
|
|
||||||
|
|
||||||
|
|
||||||
for date, event in sorted(events.items(), key=lambda x: x[0]):
|
|
||||||
if ephem.localtime(date) < limit:
|
|
||||||
print(ephem.localtime(date), event)
|
|
||||||
@@ -1,50 +0,0 @@
|
|||||||
let
|
|
||||||
lib = import <nixpkgs/lib>;
|
|
||||||
in rec {
|
|
||||||
inherit lib;
|
|
||||||
|
|
||||||
input = [
|
|
||||||
{
|
|
||||||
x = ["pool" "zfs"];
|
|
||||||
y = ["mdadm" "raid1"];
|
|
||||||
}
|
|
||||||
{
|
|
||||||
x = ["pool" "zfs"];
|
|
||||||
y = ["disk" "sda"];
|
|
||||||
}
|
|
||||||
{
|
|
||||||
x = ["mdadm" "raid1"];
|
|
||||||
y = ["disk" "sdb"];
|
|
||||||
}
|
|
||||||
{
|
|
||||||
x = ["mdadm" "raid1"];
|
|
||||||
y = ["disk" "sdc"];
|
|
||||||
}
|
|
||||||
];
|
|
||||||
|
|
||||||
outNodes = node: graph:
|
|
||||||
lib.unique
|
|
||||||
(builtins.map (e: e.y)
|
|
||||||
(builtins.filter (v: v.x == node) graph));
|
|
||||||
|
|
||||||
vertices = graph:
|
|
||||||
lib.unique
|
|
||||||
(builtins.map (x: x.y) graph ++ builtins.map (x: x.x) graph);
|
|
||||||
|
|
||||||
deleteVertex = node: graph: (builtins.filter (v: v.x != node && v.y != node) graph);
|
|
||||||
|
|
||||||
findSink = graph:
|
|
||||||
lib.findFirst
|
|
||||||
(v: outNodes v graph == [])
|
|
||||||
(lib.trace graph (builtins.abort "No sink found"))
|
|
||||||
(vertices graph);
|
|
||||||
|
|
||||||
topSort = graph:
|
|
||||||
if graph == []
|
|
||||||
then []
|
|
||||||
else if builtins.length graph == 1
|
|
||||||
then let only = builtins.head graph; in [only.y only.x]
|
|
||||||
else let sink = findSink graph; in [sink] ++ topSort (deleteVertex sink graph);
|
|
||||||
|
|
||||||
output = topSort input;
|
|
||||||
}
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
#/usr/bin/env -S deno run -A:q
|
|
||||||
set -x
|
|
||||||
session_cache="$HOME/.cache/tt-rss.session"
|
|
||||||
ttrss_endpoint=https://feed.kmein.de/api/
|
|
||||||
ttrss_user=k
|
|
||||||
ttrss_password=$(pass shared/tt-rss/password)
|
|
||||||
|
|
||||||
login() {
|
|
||||||
if [ -f "$session_cache" ]; then
|
|
||||||
session_id="$(cat "$session_cache")"
|
|
||||||
else
|
|
||||||
session_id="$(curl -d '{"op":"login","user":"'"$ttrss_user"'","password":"'"$ttrss_password"'"}' "$ttrss_endpoint" | jq -r .content.session_id)"
|
|
||||||
echo "$session_id" > "$session_cache"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
login
|
|
||||||
curl -d '{"sid":"'"$session_id"'","op":"getUnread"}' "$ttrss_endpoint" | jq .content
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
set -efux
|
|
||||||
expected_max_results=1024 # the upper bound on the number of restaurants
|
|
||||||
radius=250
|
|
||||||
|
|
||||||
echo '[out:json];node(id:260050809)->.cbase;
|
|
||||||
(
|
|
||||||
node(around.cbase:'$radius')[amenity=fast_food];
|
|
||||||
node(around.cbase:'$radius')[amenity=restaurant];
|
|
||||||
);out;' \
|
|
||||||
| curl -sSL -d @- -X POST http://overpass-api.de/api/interpreter \
|
|
||||||
| jq --argjson random "$(shuf -i 0-$expected_max_results -n 1)" '
|
|
||||||
.elements
|
|
||||||
| length as $length
|
|
||||||
| .[$random % $length]
|
|
||||||
'
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
import sys
|
|
||||||
import unicodedata
|
|
||||||
|
|
||||||
for index, character in enumerate(sys.stdin.read().strip()):
|
|
||||||
try:
|
|
||||||
print(index, character, hex(ord(character)), unicodedata.category(character), unicodedata.name(character))
|
|
||||||
except:
|
|
||||||
print(index, character, hex(ord(character)))
|
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
project=Filli
|
|
||||||
year=2022
|
|
||||||
|
|
||||||
for month in Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec; do
|
|
||||||
from="$(date +%F -d "$month 1, $year")"
|
|
||||||
to="$(date +%F -d "$month 1, $year + 1 month")"
|
|
||||||
watson report --json --from "$from" --to "$to" --project "$project"
|
|
||||||
done | jq --slurp '
|
|
||||||
def in_array($arr):
|
|
||||||
. as $value | any($arr[]; . == $value);
|
|
||||||
|
|
||||||
map(
|
|
||||||
["engadin-app","fysiweb","val-muestair","mia-engiadina","ol"] as $official_projects
|
|
||||||
| (.timespan.from | .[0:7]) as $timespan
|
|
||||||
| .projects | .[0]
|
|
||||||
| .time as $total_time
|
|
||||||
| .tags
|
|
||||||
| select(. != null)
|
|
||||||
| map(select(.name | in_array($official_projects)))
|
|
||||||
| (map(.time)|add) as $official_time
|
|
||||||
| map({key:.name, value:.time}) | from_entries
|
|
||||||
| .other |= ($total_time - $official_time)
|
|
||||||
| map_values(. / (60*60) | ceil)
|
|
||||||
| .month |= $timespan
|
|
||||||
)
|
|
||||||
'
|
|
||||||
2
.github/workflows/flake.yml
vendored
2
.github/workflows/flake.yml
vendored
@@ -2,7 +2,7 @@ name: Update flake.lock
|
|||||||
on:
|
on:
|
||||||
workflow_dispatch: # allows manual triggering
|
workflow_dispatch: # allows manual triggering
|
||||||
schedule:
|
schedule:
|
||||||
- cron: '0 0 * * 0' # runs weekly on Sunday at 00:00
|
- cron: "0 0 * * 0" # runs weekly on Sunday at 00:00
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
lockfile:
|
lockfile:
|
||||||
|
|||||||
52
.github/workflows/niveum.yml
vendored
52
.github/workflows/niveum.yml
vendored
@@ -7,31 +7,33 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
system: [makanek,manakish,kabsa,zaatar,ful]
|
system: [makanek, manakish, kabsa, zaatar, ful, fatteh]
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
- name: Install QEMU (ARM)
|
- name: Install QEMU (ARM)
|
||||||
run: sudo apt-get install -y qemu-user-static
|
run: |
|
||||||
if: ${{ matrix.system == 'ful' }}
|
sudo apt-get update
|
||||||
- name: Install Nix (ARM)
|
sudo apt-get install -y qemu-user-static
|
||||||
uses: cachix/install-nix-action@v16
|
if: ${{ matrix.system == 'ful' }}
|
||||||
if: ${{ matrix.system == 'ful' }}
|
- name: Install Nix (ARM)
|
||||||
with:
|
uses: cachix/install-nix-action@v16
|
||||||
extra_nix_config: |
|
if: ${{ matrix.system == 'ful' }}
|
||||||
system = aarch64-linux
|
with:
|
||||||
- name: Install Nix (x86_64)
|
extra_nix_config: |
|
||||||
uses: cachix/install-nix-action@v16
|
system = aarch64-linux
|
||||||
if: ${{ matrix.system != 'ful' }}
|
- name: Install Nix (x86_64)
|
||||||
- name: nixos-rebuild dry-build
|
uses: cachix/install-nix-action@v16
|
||||||
run: |
|
if: ${{ matrix.system != 'ful' }}
|
||||||
# remove secrets: ref https://stackoverflow.com/questions/1260748/how-do-i-remove-a-submodule/36593218
|
- name: nixos-rebuild dry-build
|
||||||
git submodule deinit -f secrets
|
run: |
|
||||||
rm -rf .git/modules/secrets
|
# remove secrets: ref https://stackoverflow.com/questions/1260748/how-do-i-remove-a-submodule/36593218
|
||||||
git rm -f secrets
|
git submodule deinit -f secrets
|
||||||
|
rm -rf .git/modules/secrets
|
||||||
|
git rm -f secrets
|
||||||
|
|
||||||
# recreate secrets
|
# recreate secrets
|
||||||
mkdir secrets
|
mkdir secrets
|
||||||
cat secrets.txt | while read -r path; do touch $path; done
|
cat secrets.txt | while read -r path; do touch $path; done
|
||||||
git add secrets
|
git add secrets
|
||||||
|
|
||||||
nix run nixpkgs#nixos-rebuild -- dry-build --flake $GITHUB_WORKSPACE#${{matrix.system}}
|
nix run nixpkgs#nixos-rebuild -- dry-build --flake $GITHUB_WORKSPACE#${{matrix.system}}
|
||||||
|
|||||||
96
AGENTS.md
Normal file
96
AGENTS.md
Normal file
@@ -0,0 +1,96 @@
|
|||||||
|
# niveum — Agent Notes
|
||||||
|
|
||||||
|
## What This Is
|
||||||
|
|
||||||
|
A NixOS flake managing ~9 machines (desktops, servers, family laptops) for one user (kmein/kfm).
|
||||||
|
Levantine food-themed hostnames: fatteh, kabsa, kibbeh, makanek, manakish, tabula, tahina, zaatar, ful.
|
||||||
|
|
||||||
|
## Repository Structure
|
||||||
|
|
||||||
|
```
|
||||||
|
flake.nix # ~670 lines — inputs, overlay, nixosConfigurations, apps, packages output
|
||||||
|
configs/ # ~50 NixOS config fragments imported by systems
|
||||||
|
default.nix # 200+ line mega-module for desktop machines (user, shell, gnupg, i18n, etc.)
|
||||||
|
graphical/ # Hyprland + home-manager config (415 lines in home-manager.nix)
|
||||||
|
packages.nix # ~250 lines of environment.systemPackages
|
||||||
|
bots/ # Telegram/Mastodon/Matrix bot configs
|
||||||
|
keyboard/ # XKB layouts (Coptic, Avestan, Gothic, etc.)
|
||||||
|
configs/*.nix # Individual concerns: bluetooth, sound, printing, ssh, fonts, etc.
|
||||||
|
modules/ # Proper NixOS modules with options (retiolum, telegram-bot, passport, power-action, etc.)
|
||||||
|
packages/ # ~107 package files (scripts, wrappers, small tools)
|
||||||
|
systems/<name>/ # Per-machine: configuration.nix + hardware-configuration.nix + extras
|
||||||
|
lib/ # default.nix (niveum helpers), machines.nix (IP/key inventory), panoptikon.nix
|
||||||
|
secrets/ # agenix-encrypted .age files (empty dir in checkout, tracked via secrets.txt)
|
||||||
|
```
|
||||||
|
|
||||||
|
## Key Relationships
|
||||||
|
|
||||||
|
- **niphas** (input): Provides shared "how I like things" config — nixosModules (shell, editor, git, desktop, nix, udiskie) and overlay (niphas-* packages). Used in `profiles.default` and `profiles.desktop`.
|
||||||
|
- **configs/default.nix**: The "big desktop profile" — imported by fatteh, kabsa, manakish (the main desktop machines). NOT imported by servers or family laptops.
|
||||||
|
- **profiles** (in flake.nix): `profiles.default`, `profiles.desktop`, `profiles.server` — lists of modules composed per machine.
|
||||||
|
- **lib.niveum**: Custom lib injected via overlay (`pkgs.lib.niveum`) — used everywhere for machine addresses, SSH port, helper functions.
|
||||||
|
|
||||||
|
## Coding Conventions
|
||||||
|
|
||||||
|
- Packages use `writers.writeDashBin`, `writers.writeBashBin`, or `writers.writePython3Bin`
|
||||||
|
- Dependencies are referenced via `lib.getExe pkg` (main executable) or `lib.getExe' pkg "name"` (specific binary)
|
||||||
|
- For packages needing many commands via PATH, use `lib.makeBinPath` instead (see `packages/prospekte.nix`)
|
||||||
|
- Overlay entries use `prev.callPackage packages/foo.nix { }` pattern
|
||||||
|
- Packages are exported via `inherit (pkgs) ...` in the `packages` output
|
||||||
|
|
||||||
|
## Known Bugs / Broken References
|
||||||
|
|
||||||
|
All previously broken references have been fixed (see commits `36132b04`, `e67d6d7d`).
|
||||||
|
|
||||||
|
Remaining issues:
|
||||||
|
- `modules/retiolum.nix` uses `<retiolum/hosts>` and `<system-secrets/...>` NIX_PATH lookups — breaks flake purity but works with current `NIX_PATH` setup
|
||||||
|
|
||||||
|
## Architectural Issues
|
||||||
|
|
||||||
|
### 1. configs/default.nix is a grab-bag (200+ lines, ~15 inline anonymous modules)
|
||||||
|
It's a list of `imports` mixing inline `{ ... }` blocks with file imports. Hard to find what's defined where.
|
||||||
|
|
||||||
|
### 2. Retiolum secret boilerplate repeated 9 times
|
||||||
|
Every system has a near-identical block:
|
||||||
|
```nix
|
||||||
|
age.secrets.retiolum-rsa = { file = ../../secrets/${hostname}-retiolum-privateKey-rsa.age; mode = "400"; owner = "tinc-retiolum"; ... };
|
||||||
|
age.secrets.retiolum-ed25519 = { ... same ... };
|
||||||
|
```
|
||||||
|
Could be a function or module parameterized by hostname.
|
||||||
|
|
||||||
|
### 3. Nginx + ACME boilerplate duplicated
|
||||||
|
ful and makanek have identical nginx recommended settings + ACME config.
|
||||||
|
|
||||||
|
### 4. niveum-* overlay aliases
|
||||||
|
`niveum-terminal`, `niveum-browser`, `niveum-filemanager` are aliases to niphas equivalents. Could be removed by updating ~6 references in configs/ to use niphas-* names directly.
|
||||||
|
|
||||||
|
### 5. The `pkgs.lib.niveum` pattern
|
||||||
|
Custom lib injected via overlay into `pkgs.lib`. Unconventional — only available where overlay is applied. A `specialArgs` approach or standalone lib would be cleaner.
|
||||||
|
|
||||||
|
### 6. Restic backup config scattered
|
||||||
|
`services.restic.backups.niveum` is configured in configs/backup.nix, configs/applicative.nix, and extended in 5+ system files. Hard to see what a given machine backs up.
|
||||||
|
|
||||||
|
### 7. configs/ vs modules/ distinction blurry
|
||||||
|
`configs/` has both stateless config fragments (spacetime.nix = timezone) and stateful ones (backup.nix, cloud.nix). `modules/` has proper option-declaring modules. Some configs/ files import from modules/.
|
||||||
|
|
||||||
|
## Machines Overview
|
||||||
|
|
||||||
|
| Machine | Role | Profile | Arch | Notes |
|
||||||
|
|-----------|--------------|------------------|---------|---------------------------------------|
|
||||||
|
| fatteh | Desktop | default+desktop | x86_64 | ThinkPad T480, CUDA, main daily |
|
||||||
|
| kabsa | Desktop | default+desktop | x86_64 | ThinkPad X220, constrained (2 jobs) |
|
||||||
|
| manakish | Desktop | default+desktop | x86_64 | ThinkPad X230 |
|
||||||
|
| kibbeh | Desktop | default+desktop | x86_64 | Pantheon DE, travel laptop |
|
||||||
|
| ful | Server | default+server | aarch64 | Oracle/Hetzner, nginx, web services |
|
||||||
|
| makanek | Server | default+server | x86_64 | Hetzner, gitea, nextcloud, weechat |
|
||||||
|
| zaatar | Server/Home | default+server | x86_64 | Home assistant, backup server |
|
||||||
|
| tabula | Family laptop| default | x86_64 | LXQt, user "xenos" |
|
||||||
|
| tahina | Family laptop| default | x86_64 | Pantheon, user "xenos", German |
|
||||||
|
|
||||||
|
## Remaining Improvement Ideas
|
||||||
|
|
||||||
|
1. **Extract retiolum secret boilerplate** into a function/module
|
||||||
|
2. **Break up configs/default.nix** into proper named files
|
||||||
|
3. **Extract nginx+ACME server profile**
|
||||||
|
4. **Replace niveum-* aliases** with direct niphas-* references
|
||||||
|
5. **Fix modules/retiolum.nix** NIX_PATH usage for flake purity
|
||||||
12
README.md
12
README.md
@@ -1,10 +1,18 @@
|
|||||||
# niveum
|
# niveum
|
||||||
|
|
||||||
|
> I must Create a System, or be enslav'd by another Man's. —William Blake
|
||||||
|
|
||||||
> [nĭvĕus](https://logeion.uchicago.edu/niveus), a, um, adj. [nix], _of_ or _from snow, snowy, snow-_ (poet.)
|
> [nĭvĕus](https://logeion.uchicago.edu/niveus), a, um, adj. [nix], _of_ or _from snow, snowy, snow-_ (poet.)
|
||||||
>
|
>
|
||||||
> 1. Lit.: aggeribus niveis informis, Verg. G. 3, 354: aqua, _cooled with snow_, Mart. 12, 17, 6; cf. id. 14, 104 and 117: mons, _covered with snow_, Cat. 64, 240.—
|
> 1. Lit.: aggeribus niveis informis, Verg. G. 3, 354: aqua, _cooled with snow_, Mart. 12, 17, 6; cf. id. 14, 104 and 117: mons, _covered with snow_, Cat. 64, 240.—
|
||||||
>
|
|
||||||
> 2. Transf., _snow-white, snowy_ (mostly poet.): a similitudine sic: Corpore niveum candorem, aspectu igneum ardorem assequebatur, Auct. Her. 4, 33, 44: lacerti, Verg. A. 8, 387: lac, id. E. 2, 20: hanc si capite niveae agnae exorari judicas, Sen. Q. N. 2, 36: Briseis niveo colore, Hor. C. 2, 4, 3: vestis, Ov. M. 10, 432: candidior nivei folio, Galatea, ligustri, id. ib. 13, 789: dens, id. H. 18, 18: quā notam duxit niveus videri, Hor. C. 4, 2, 59: panis, Juv. 5, 70: flumen, _clear, pellucid_, Sen. Hippol. 504: undae, Mart. 7, 32, 11: tribuni, _clothed in white togas_, Calp. Ecl. 7, 29; so, Quirites, Juv. 10, 45.
|
> 2. Transf., _snow-white, snowy_ (mostly poet.): a similitudine sic: Corpore niveum candorem, aspectu igneum ardorem assequebatur, Auct. Her. 4, 33, 44: lacerti, Verg. A. 8, 387: lac, id. E. 2, 20: hanc si capite niveae agnae exorari judicas, Sen. Q. N. 2, 36: Briseis niveo colore, Hor. C. 2, 4, 3: vestis, Ov. M. 10, 432: candidior nivei folio, Galatea, ligustri, id. ib. 13, 789: dens, id. H. 18, 18: quā notam duxit niveus videri, Hor. C. 4, 2, 59: panis, Juv. 5, 70: flumen, _clear, pellucid_, Sen. Hippol. 504: undae, Mart. 7, 32, 11: tribuni, _clothed in white togas_, Calp. Ecl. 7, 29; so, Quirites, Juv. 10, 45.
|
||||||
|
|
||||||
## Pressestimmen
|
## Pressestimmen
|
||||||
> das ist ja pure poesie —[xkey](https://github.com/riotbib)
|
|
||||||
|
> das ist ja pure poesie —[riotbib](https://github.com/riotbib/)
|
||||||
|
|
||||||
|
> Deine Configs sind wunderschön <3 —[flxai](https://github.com/flxai/)
|
||||||
|
|
||||||
|
## To do
|
||||||
|
|
||||||
|
🦗
|
||||||
|
|||||||
152
configs/aerc.nix
152
configs/aerc.nix
@@ -3,10 +3,15 @@
|
|||||||
config,
|
config,
|
||||||
lib,
|
lib,
|
||||||
...
|
...
|
||||||
}: let
|
}:
|
||||||
inherit (import ../lib/email.nix) defaults;
|
{
|
||||||
in {
|
|
||||||
age.secrets = {
|
age.secrets = {
|
||||||
|
email-password-ical-ephemeris = {
|
||||||
|
file = ../secrets/email-password-ical-ephemeris.age;
|
||||||
|
owner = config.users.users.me.name;
|
||||||
|
group = config.users.users.me.group;
|
||||||
|
mode = "400";
|
||||||
|
};
|
||||||
email-password-cock = {
|
email-password-cock = {
|
||||||
file = ../secrets/email-password-cock.age;
|
file = ../secrets/email-password-cock.age;
|
||||||
owner = config.users.users.me.name;
|
owner = config.users.users.me.name;
|
||||||
@@ -22,6 +27,8 @@ in {
|
|||||||
};
|
};
|
||||||
|
|
||||||
home-manager.users.me = {
|
home-manager.users.me = {
|
||||||
|
accounts.email.maildirBasePath = "${config.users.users.me.home}/state/Maildir";
|
||||||
|
|
||||||
services.mbsync = {
|
services.mbsync = {
|
||||||
enable = true;
|
enable = true;
|
||||||
frequency = "daily";
|
frequency = "daily";
|
||||||
@@ -34,14 +41,15 @@ in {
|
|||||||
extraConfig = {
|
extraConfig = {
|
||||||
database.path = config.home-manager.users.me.accounts.email.maildirBasePath;
|
database.path = config.home-manager.users.me.accounts.email.maildirBasePath;
|
||||||
new.tags = "";
|
new.tags = "";
|
||||||
user.name = defaults.realName;
|
user.name = pkgs.lib.niveum.email.defaults.realName;
|
||||||
user.primary_email = config.home-manager.users.me.accounts.email.accounts.posteo.address;
|
user.primary_email = config.home-manager.users.me.accounts.email.accounts.posteo.address;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.mbsync = {
|
programs.mbsync = {
|
||||||
enable = true;
|
enable = true;
|
||||||
extraConfig = lib.concatStringsSep "\n\n" (lib.mapAttrsToList (name: account: ''
|
extraConfig = lib.concatStringsSep "\n\n" (
|
||||||
|
lib.mapAttrsToList (name: account: ''
|
||||||
IMAPAccount ${name}
|
IMAPAccount ${name}
|
||||||
CertificateFile /etc/ssl/certs/ca-certificates.crt
|
CertificateFile /etc/ssl/certs/ca-certificates.crt
|
||||||
Host ${account.imap.host}
|
Host ${account.imap.host}
|
||||||
@@ -65,36 +73,85 @@ in {
|
|||||||
Patterns *
|
Patterns *
|
||||||
Remove None
|
Remove None
|
||||||
SyncState *
|
SyncState *
|
||||||
'')
|
'') config.home-manager.users.me.accounts.email.accounts
|
||||||
config.home-manager.users.me.accounts.email.accounts);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
accounts.email.accounts = {
|
accounts.email.accounts = {
|
||||||
cock =
|
cock =
|
||||||
lib.recursiveUpdate defaults
|
let
|
||||||
rec {
|
mailhost = "mail.cock.li";
|
||||||
address = "2210@cock.li";
|
address = "2210@cock.li";
|
||||||
|
in
|
||||||
|
lib.recursiveUpdate pkgs.lib.niveum.email.defaults {
|
||||||
|
address = address;
|
||||||
userName = address;
|
userName = address;
|
||||||
passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-cock.path}";
|
passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-cock.path}";
|
||||||
realName = "";
|
realName = "2210";
|
||||||
imap.host = "mail.cock.li";
|
imap.host = mailhost;
|
||||||
smtp.host = imap.host;
|
imap.port = 993;
|
||||||
|
smtp.host = mailhost;
|
||||||
|
smtp.port = 587;
|
||||||
|
smtp.tls.useStartTls = true;
|
||||||
|
};
|
||||||
|
ical-ephemeris =
|
||||||
|
let
|
||||||
|
address = "ical.ephemeris@web.de";
|
||||||
|
in
|
||||||
|
lib.recursiveUpdate pkgs.lib.niveum.email.defaults {
|
||||||
|
userName = address;
|
||||||
|
realName = "Kieran from iCal Ephemeris";
|
||||||
|
address = address;
|
||||||
|
passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-ical-ephemeris.path}";
|
||||||
|
imap.host = "imap.web.de";
|
||||||
|
imap.port = 993;
|
||||||
|
smtp.host = "smtp.web.de";
|
||||||
|
smtp.port = 587;
|
||||||
|
smtp.tls.useStartTls = true;
|
||||||
};
|
};
|
||||||
posteo =
|
posteo =
|
||||||
lib.recursiveUpdate defaults
|
let
|
||||||
rec {
|
mailhost = "posteo.de";
|
||||||
address = "kieran.meinhardt@posteo.net";
|
address = "kieran.meinhardt@posteo.net";
|
||||||
aliases = ["kmein@posteo.de"];
|
in
|
||||||
|
lib.recursiveUpdate pkgs.lib.niveum.email.defaults {
|
||||||
|
address = address;
|
||||||
|
aliases = [ "kmein@posteo.de" ];
|
||||||
userName = address;
|
userName = address;
|
||||||
imap.host = "posteo.de";
|
imap.host = mailhost;
|
||||||
smtp.host = imap.host;
|
imap.port = 993;
|
||||||
|
imap.tls.enable = true;
|
||||||
|
smtp.host = mailhost;
|
||||||
|
smtp.port = 465;
|
||||||
|
smtp.tls.enable = true;
|
||||||
primary = true;
|
primary = true;
|
||||||
passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-posteo.path}";
|
passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-posteo.path}";
|
||||||
# himalaya = { enable = true; backend = "imap"; sender = "smtp"; };
|
himalaya = {
|
||||||
|
enable = true;
|
||||||
|
};
|
||||||
|
aerc.extraAccounts.pgp-key-id = "9EDE82CC72A343A95266D0F444857074A3ACC8B7";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# programs.himalaya.enable = true;
|
programs.himalaya.enable = true;
|
||||||
|
|
||||||
|
programs.thunderbird = {
|
||||||
|
enable = true;
|
||||||
|
settings = {
|
||||||
|
};
|
||||||
|
profiles.${pkgs.lib.niveum.email.thunderbirdProfile} = {
|
||||||
|
isDefault = true;
|
||||||
|
settings = {
|
||||||
|
"mail.default_send_format" = 1;
|
||||||
|
"msgcompose.default_colors" = false;
|
||||||
|
"msgcompose.text_color" = config.lib.stylix.colors.withHashtag.base00;
|
||||||
|
"msgcompose.background_color" = config.lib.stylix.colors.withHashtag.base05;
|
||||||
|
};
|
||||||
|
userChrome = '''';
|
||||||
|
userContent = '''';
|
||||||
|
withExternalGnupg = false;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
programs.aerc = {
|
programs.aerc = {
|
||||||
enable = true;
|
enable = true;
|
||||||
@@ -153,6 +210,7 @@ in {
|
|||||||
"*" = ":filter -x Flagged<Enter>";
|
"*" = ":filter -x Flagged<Enter>";
|
||||||
};
|
};
|
||||||
view = {
|
view = {
|
||||||
|
tr = ":pipe ${pkgs.trans}/bin/trans -show-original n -b -no-autocorrect<Enter>"; # https://man.sr.ht/~rjarry/aerc/integrations/translator.md
|
||||||
"/" = ":toggle-key-passthrough <Enter> /";
|
"/" = ":toggle-key-passthrough <Enter> /";
|
||||||
q = ":close<Enter>";
|
q = ":close<Enter>";
|
||||||
O = ":open<Enter>";
|
O = ":open<Enter>";
|
||||||
@@ -225,41 +283,45 @@ in {
|
|||||||
ui.spinner = ". , .";
|
ui.spinner = ". , .";
|
||||||
general.unsafe-accounts-conf = true;
|
general.unsafe-accounts-conf = true;
|
||||||
general.pgp-provider = "gpg";
|
general.pgp-provider = "gpg";
|
||||||
viewer = {pager = "${pkgs.less}/bin/less -R";};
|
viewer = {
|
||||||
|
pager = "${pkgs.less}/bin/less -R";
|
||||||
|
};
|
||||||
compose = {
|
compose = {
|
||||||
address-book-cmd = "khard email --remove-first-line --parsable '%s'";
|
# address-book-cmd = "khard email --remove-first-line --parsable '%s'";
|
||||||
no-attachment-warning = "(attach|attached|attachments?|anbei|Anhang|angehängt)";
|
no-attachment-warning = "(attach|attached|attachments?|anbei|Anhang|angehängt|beigefügt)";
|
||||||
};
|
};
|
||||||
filters = {
|
filters = {
|
||||||
"text/plain" = "${pkgs.gawk}/bin/awk -f ${pkgs.aerc}/share/aerc/filters/colorize";
|
"text/plain" = "${pkgs.aerc}/libexec/aerc/filters/colorize";
|
||||||
"text/calendar" = "${pkgs.gawk}/bin/awk -f ${pkgs.aerc}/share/aerc/filters/calendar";
|
"text/calendar" = "${pkgs.aerc}/libexec/aerc/filters/calendar";
|
||||||
"text/html" = "${pkgs.aerc}/share/aerc/filters/html"; # Requires w3m, dante
|
"text/html" = "${pkgs.aerc}/libexec/aerc/filters/html"; # Requires w3m, dante
|
||||||
# "text/html" =
|
# "text/html" =
|
||||||
# "${pkgs.aerc}/share/aerc/filters/html | ${pkgs.aerc}/share/aerc/filters/colorize";
|
# "${pkgs.aerc}/share/aerc/filters/html | ${pkgs.aerc}/share/aerc/filters/colorize";
|
||||||
# "text/*" =
|
# "text/*" =
|
||||||
# ''${pkgs.bat}/bin/bat -fP --theme=ansi --file-name="$AERC_FILENAME "'';
|
# ''${pkgs.bat}/bin/bat -fP --theme=ansi --file-name="$AERC_FILENAME "'';
|
||||||
"message/delivery-status" = "${pkgs.gawk}/bin/awk -f ${pkgs.aerc}/share/aerc/filters/colorize";
|
"message/delivery-status" = "${pkgs.aerc}/libexec/aerc/filters/colorize";
|
||||||
"message/rfc822" = "${pkgs.gawk}/bin/awk -f ${pkgs.aerc}/share/aerc/filters/colorize";
|
"message/rfc822" = "${pkgs.aerc}/libexec/aerc/filters/colorize";
|
||||||
"application/x-sh" = "${pkgs.bat}/bin/bat -fP -l sh";
|
"application/x-sh" = "${pkgs.bat}/bin/bat -fP -l sh";
|
||||||
};
|
};
|
||||||
openers = let
|
openers =
|
||||||
as-pdf = pkgs.writers.writeDash "as-pdf" ''
|
let
|
||||||
d=$(mktemp -d)
|
as-pdf = pkgs.writers.writeDash "as-pdf" ''
|
||||||
trap clean EXIT
|
d=$(mktemp -p "$XDG_RUNTIME_DIR" -d)
|
||||||
clean() {
|
trap clean EXIT
|
||||||
rm -rf "$d"
|
clean() {
|
||||||
}
|
rm -rf "$d"
|
||||||
${pkgs.libreoffice}/bin/libreoffice --headless --convert-to pdf "$1" --outdir "$d"
|
}
|
||||||
${pkgs.zathura}/bin/zathura "$d"/*.pdf
|
${pkgs.libreoffice}/bin/libreoffice --headless --convert-to pdf "$1" --outdir "$d"
|
||||||
'';
|
${pkgs.zathura}/bin/zathura "$d"/*.pdf
|
||||||
in {
|
'';
|
||||||
"image/*" = "${pkgs.nsxiv}/bin/nsxiv";
|
in
|
||||||
"application/pdf" = "${pkgs.zathura}/bin/zathura";
|
{
|
||||||
"application/vnd.openxmlformats-officedocument.wordprocessingml.document" = toString as-pdf;
|
"image/*" = "${pkgs.nsxiv}/bin/nsxiv";
|
||||||
"application/vnd.oasis.opendocument.text" = toString as-pdf;
|
"application/pdf" = "${pkgs.zathura}/bin/zathura";
|
||||||
"video/*" = "${pkgs.mpv}/bin/mpv";
|
"application/vnd.openxmlformats-officedocument.wordprocessingml.document" = toString as-pdf;
|
||||||
"audio/*" = "${pkgs.mpv}/bin/mpv";
|
"application/vnd.oasis.opendocument.text" = toString as-pdf;
|
||||||
};
|
"video/*" = "${pkgs.mpv}/bin/mpv";
|
||||||
|
"audio/*" = "${pkgs.mpv}/bin/mpv";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
templates = {
|
templates = {
|
||||||
|
|||||||
@@ -1,83 +1,7 @@
|
|||||||
{
|
{
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
config,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
alacritty-cfg = theme:
|
|
||||||
(pkgs.formats.yaml {}).generate "alacritty.yml" {
|
|
||||||
bell = {
|
|
||||||
animation = "EaseOut";
|
|
||||||
duration = 100;
|
|
||||||
color = "#ffffff";
|
|
||||||
};
|
|
||||||
font = {
|
|
||||||
normal.family = "Monospace";
|
|
||||||
size = 6;
|
|
||||||
};
|
|
||||||
live_config_reload = true;
|
|
||||||
key_bindings = [
|
|
||||||
{
|
|
||||||
key = "Plus";
|
|
||||||
mods = "Control";
|
|
||||||
action = "IncreaseFontSize";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
key = "Minus";
|
|
||||||
mods = "Control";
|
|
||||||
action = "DecreaseFontSize";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
key = "Key0";
|
|
||||||
mods = "Control";
|
|
||||||
action = "ResetFontSize";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
colors = let
|
|
||||||
colourNames = ["black" "red" "green" "yellow" "blue" "magenta" "cyan" "white"];
|
|
||||||
colourPairs = lib.getAttrs colourNames theme;
|
|
||||||
in {
|
|
||||||
primary = {inherit (theme) background foreground;};
|
|
||||||
cursor = {inherit (theme) cursor;};
|
|
||||||
normal = lib.mapAttrs (_: colour: colour.dark) colourPairs;
|
|
||||||
bright = lib.mapAttrs (_: colour: colour.bright) colourPairs;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
alacritty-pkg = pkgs.symlinkJoin {
|
|
||||||
name = "alacritty";
|
|
||||||
paths = [
|
|
||||||
(pkgs.writers.writeDashBin "alacritty" ''
|
|
||||||
${pkgs.alacritty}/bin/alacritty --config-file /var/theme/config/alacritty.yml msg create-window "$@" ||
|
|
||||||
${pkgs.alacritty}/bin/alacritty --config-file /var/theme/config/alacritty.yml "$@"
|
|
||||||
'')
|
|
||||||
pkgs.alacritty
|
|
||||||
];
|
|
||||||
};
|
|
||||||
in {
|
|
||||||
environment.variables.TERMINAL = "alacritty";
|
|
||||||
|
|
||||||
home-manager.users.me = {
|
home-manager.users.me = {
|
||||||
programs.alacritty = {
|
programs.alacritty = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
|
||||||
key_bindings = [
|
|
||||||
{
|
|
||||||
key = "Plus";
|
|
||||||
mods = "Control";
|
|
||||||
action = "IncreaseFontSize";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
key = "Minus";
|
|
||||||
mods = "Control";
|
|
||||||
action = "DecreaseFontSize";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
key = "Key0";
|
|
||||||
mods = "Control";
|
|
||||||
action = "ResetFontSize";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
programs.adb.enable = true;
|
programs.adb.enable = true;
|
||||||
|
|
||||||
users.users.me.extraGroups = ["adbusers"];
|
users.users.me.extraGroups = [ "adbusers" ];
|
||||||
}
|
}
|
||||||
|
|||||||
56
configs/applicative.nix
Normal file
56
configs/applicative.nix
Normal file
@@ -0,0 +1,56 @@
|
|||||||
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
{
|
||||||
|
users.users.applicative = {
|
||||||
|
name = "asg";
|
||||||
|
description = "Applicative Systems";
|
||||||
|
hashedPasswordFile = config.age.secrets.kfm-password.path;
|
||||||
|
home = "/home/applicative";
|
||||||
|
uid = 1001;
|
||||||
|
isNormalUser = true;
|
||||||
|
extraGroups = [
|
||||||
|
"pipewire"
|
||||||
|
"audio"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
nixpkgs.overlays = [
|
||||||
|
(final: prev: {
|
||||||
|
niphas-wallpaper = prev.callPackage ../packages/applicative-wallpaper.nix {
|
||||||
|
inherit (config.lib.stylix) colors;
|
||||||
|
};
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
|
# to run nspawn in nix sandbox
|
||||||
|
nix.settings = {
|
||||||
|
auto-allocate-uids = true;
|
||||||
|
system-features = [ "uid-range" ];
|
||||||
|
experimental-features = [
|
||||||
|
"auto-allocate-uids"
|
||||||
|
"cgroups"
|
||||||
|
];
|
||||||
|
trusted-users = [ config.users.users.applicative.name ];
|
||||||
|
};
|
||||||
|
|
||||||
|
services.restic.backups.niveum = {
|
||||||
|
extraBackupArgs = [
|
||||||
|
"--exclude=${config.users.users.applicative.home}/src/nixpkgs/.git"
|
||||||
|
];
|
||||||
|
paths = [
|
||||||
|
config.users.users.applicative.home
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
security.sudo.extraRules = [
|
||||||
|
{
|
||||||
|
# still required for systemd-nspawn
|
||||||
|
users = [ config.users.users.applicative.name ];
|
||||||
|
commands = [ "ALL" ];
|
||||||
|
}
|
||||||
|
];
|
||||||
|
}
|
||||||
@@ -1,34 +1,31 @@
|
|||||||
{
|
{
|
||||||
pkgs,
|
pkgs,
|
||||||
config,
|
config,
|
||||||
|
lib,
|
||||||
...
|
...
|
||||||
}: let
|
}:
|
||||||
inherit (import ../lib) restic;
|
{
|
||||||
in {
|
|
||||||
services.restic.backups.niveum = {
|
services.restic.backups.niveum = {
|
||||||
initialize = true;
|
initialize = true;
|
||||||
inherit (restic) repository;
|
repository = pkgs.lib.niveum.restic.repository;
|
||||||
timerConfig = {
|
timerConfig = {
|
||||||
OnCalendar = "8:00";
|
OnCalendar = "8:00";
|
||||||
RandomizedDelaySec = "1h";
|
RandomizedDelaySec = "1h";
|
||||||
};
|
};
|
||||||
passwordFile = config.age.secrets.restic.path;
|
passwordFile = config.age.secrets.restic.path;
|
||||||
extraBackupArgs = [
|
extraBackupArgs = [
|
||||||
"--exclude=/home/kfm/projects/nixpkgs/.git"
|
"--exclude=/home/kfm/sync/src/nixpkgs/.git"
|
||||||
"--exclude=node_modules"
|
"--exclude=node_modules"
|
||||||
"--exclude=.parcel-cache"
|
"--exclude=.parcel-cache"
|
||||||
];
|
];
|
||||||
paths = [
|
paths = [
|
||||||
"/home/kfm/work"
|
"/home/kfm/sync"
|
||||||
"/home/kfm/projects"
|
"/home/kfm/state"
|
||||||
"/home/kfm/Zotero"
|
|
||||||
"/home/kfm/notes"
|
|
||||||
"/home/kfm/Maildir"
|
|
||||||
"/home/kfm/cloud"
|
"/home/kfm/cloud"
|
||||||
|
"/home/kfm/mobile"
|
||||||
"/home/kfm/.gnupg"
|
"/home/kfm/.gnupg"
|
||||||
|
"/home/kfm/.electrum"
|
||||||
"/home/kfm/.ssh"
|
"/home/kfm/.ssh"
|
||||||
"/mnt/sd-card/music"
|
|
||||||
"/mnt/sd-card/Books"
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -41,15 +38,15 @@ in {
|
|||||||
|
|
||||||
environment.systemPackages = [
|
environment.systemPackages = [
|
||||||
(pkgs.writers.writeDashBin "restic-niveum" ''
|
(pkgs.writers.writeDashBin "restic-niveum" ''
|
||||||
${pkgs.restic}/bin/restic -r ${restic.repository} -p ${config.age.secrets.restic.path} "$@"
|
${pkgs.restic}/bin/restic -r ${pkgs.lib.niveum.restic.repository} -p ${config.age.secrets.restic.path} "$@"
|
||||||
'')
|
'')
|
||||||
(pkgs.writers.writeDashBin "restic-mount" ''
|
(pkgs.writers.writeDashBin "restic-mount" ''
|
||||||
mountdir=$(mktemp -d)
|
mountdir=$(mktemp -p "$XDG_RUNTIME_DIR" -d "restic-mount-XXXXXXX")
|
||||||
trap clean EXIT
|
trap clean EXIT
|
||||||
clean() {
|
clean() {
|
||||||
rm -r "$mountdir"
|
rm -r "$mountdir"
|
||||||
}
|
}
|
||||||
${pkgs.restic}/bin/restic -r ${restic.repository} -p ${config.age.secrets.restic.path} mount "$mountdir"
|
${pkgs.restic}/bin/restic -r ${pkgs.lib.niveum.restic.repository} -p ${config.age.secrets.restic.path} mount "$mountdir"
|
||||||
'')
|
'')
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,10 +0,0 @@
|
|||||||
{pkgs, ...}: {
|
|
||||||
programs.bash = {
|
|
||||||
promptInit = ''
|
|
||||||
PS1="$(${pkgs.ncurses}/bin/tput bold)\w \$([[ \$? == 0 ]] && echo \"\[\033[1;32m\]\" || echo \"\[\033[1;31m\]\")\$$(${pkgs.ncurses}/bin/tput sgr0) "'';
|
|
||||||
interactiveShellInit = ''
|
|
||||||
set -o vi
|
|
||||||
'';
|
|
||||||
enableCompletion = true;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
{
|
|
||||||
lib,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
environment.systemPackages = [pkgs.beets];
|
|
||||||
home-manager.users.me.xdg.configFile = {
|
|
||||||
"beets/config.yaml".source = (pkgs.formats.yaml {}).generate "config.yaml" {
|
|
||||||
directory = "~/cloud/syncthing/music";
|
|
||||||
library = "~/cloud/syncthing/common/music.db";
|
|
||||||
plugins = toString ["fetchart" "lastgenre"];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,17 +1,11 @@
|
|||||||
|
{ pkgs, ... }:
|
||||||
{
|
{
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
hardware.bluetooth = {
|
hardware.bluetooth = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings.General.Enable =
|
settings.general = {
|
||||||
lib.concatStringsSep "," ["Source" "Sink" "Media" "Socket"];
|
enable = "Source,Sink,Media,Socket";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
services.blueman.enable = true;
|
environment.systemPackages = [ pkgs.bluetuith ];
|
||||||
|
|
||||||
# environment.systemPackages = [pkgs.blueman];
|
|
||||||
|
|
||||||
home-manager.users.me = {services.blueman-applet.enable = true;};
|
|
||||||
}
|
}
|
||||||
|
|||||||
26
configs/bots/autorenkalender.nix
Normal file
26
configs/bots/autorenkalender.nix
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
{
|
||||||
|
niveum.bots.autorenkalender = {
|
||||||
|
enable = true;
|
||||||
|
time = "07:00";
|
||||||
|
telegram = {
|
||||||
|
enable = true;
|
||||||
|
tokenFile = config.age.secrets.telegram-token-kmein.path;
|
||||||
|
chatIds = [ "@autorenkalender" ];
|
||||||
|
parseMode = "Markdown";
|
||||||
|
};
|
||||||
|
command = "${pkgs.autorenkalender}/bin/autorenkalender";
|
||||||
|
};
|
||||||
|
|
||||||
|
niveum.passport.services = [
|
||||||
|
{
|
||||||
|
title = "Autorenkalender";
|
||||||
|
description = "sends <a href=\"https://www.projekt-gutenberg.org/\">Projekt Gutenberg</a>'s anniversary information to Telegram.";
|
||||||
|
link = "https://t.me/Autorenkalender";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
}
|
||||||
84
configs/bots/celan.nix
Normal file
84
configs/bots/celan.nix
Normal file
@@ -0,0 +1,84 @@
|
|||||||
|
{
|
||||||
|
pkgs,
|
||||||
|
lib,
|
||||||
|
config,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
{
|
||||||
|
niveum.bots.celan = {
|
||||||
|
enable = true;
|
||||||
|
time = "08:00";
|
||||||
|
telegram = {
|
||||||
|
enable = true;
|
||||||
|
tokenFile = config.age.secrets.telegram-token-kmein.path;
|
||||||
|
chatIds = [ "@PaulCelan" ];
|
||||||
|
};
|
||||||
|
mastodon = {
|
||||||
|
enable = true;
|
||||||
|
tokenFile = config.age.secrets.mastodon-token-celan.path;
|
||||||
|
language = "de";
|
||||||
|
};
|
||||||
|
command = toString (
|
||||||
|
pkgs.writers.writePython3 "random-celan.py" { libraries = [ pkgs.python3Packages.lxml ]; } ''
|
||||||
|
from lxml import etree
|
||||||
|
import random
|
||||||
|
|
||||||
|
|
||||||
|
def xml_text(elements):
|
||||||
|
return "".join("".join(t.itertext()) for t in elements).strip()
|
||||||
|
|
||||||
|
|
||||||
|
tree = etree.parse('${
|
||||||
|
pkgs.fetchurl {
|
||||||
|
url = "http://c.krebsco.de/celan.tei.xml";
|
||||||
|
hash = "sha256-HgNmJYfhuwyfm+FcNtnnYWpJpIIU1ElHLeLiIFjF9mE=";
|
||||||
|
}
|
||||||
|
}')
|
||||||
|
root = tree.getroot()
|
||||||
|
|
||||||
|
tei = {"tei": "http://www.tei-c.org/ns/1.0"}
|
||||||
|
|
||||||
|
poems = root.xpath(".//tei:lg[@type='poem']", namespaces=tei)
|
||||||
|
|
||||||
|
poem = random.choice(poems)
|
||||||
|
|
||||||
|
for stanza in poem.xpath("./tei:lg[@type='stanza']", namespaces=tei):
|
||||||
|
for line in stanza.xpath('./tei:l', namespaces=tei):
|
||||||
|
if line.text:
|
||||||
|
print(line.text.strip())
|
||||||
|
print()
|
||||||
|
|
||||||
|
current_element = poem
|
||||||
|
while current_element is not None:
|
||||||
|
if current_element.tag == "{http://www.tei-c.org/ns/1.0}text":
|
||||||
|
text_element = current_element
|
||||||
|
|
||||||
|
title = xml_text(text_element.xpath("./tei:front/tei:docTitle",
|
||||||
|
namespaces=tei))
|
||||||
|
print(f"Aus: #{title.replace(" ", "_")}", end=" ")
|
||||||
|
|
||||||
|
if date := xml_text(text_element.xpath("./tei:front/tei:docDate",
|
||||||
|
namespaces=tei)):
|
||||||
|
print(f"({date})")
|
||||||
|
break
|
||||||
|
current_element = current_element.getparent()
|
||||||
|
|
||||||
|
print("\n\n#PaulCelan #Celan #Lyrik #poetry")
|
||||||
|
''
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
age.secrets = {
|
||||||
|
mastodon-token-celan.file = ../../secrets/mastodon-token-celan.age;
|
||||||
|
};
|
||||||
|
|
||||||
|
systemd.timers.bot-celan.timerConfig.RandomizedDelaySec = "10h";
|
||||||
|
|
||||||
|
niveum.passport.services = [
|
||||||
|
{
|
||||||
|
title = "Paul Celan Bot";
|
||||||
|
description = "sends a random poem by Paul Celan to Telegram.";
|
||||||
|
link = "https://t.me/PaulCelan";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
}
|
||||||
@@ -1,33 +1,44 @@
|
|||||||
{
|
{
|
||||||
config,
|
config,
|
||||||
pkgs,
|
pkgs,
|
||||||
lib,
|
|
||||||
inputs,
|
|
||||||
...
|
...
|
||||||
}: let
|
}:
|
||||||
telebots = inputs.telebots.defaultPackage.x86_64-linux;
|
let
|
||||||
reverseDirectory = "/run/telegram-reverse";
|
reverseDirectory = "/run/telegram-reverse";
|
||||||
proverbDirectory = "/run/telegram-proverb";
|
proverbDirectory = "/run/telegram-proverb";
|
||||||
inherit (import ../../lib) tmpfilesConfig;
|
in
|
||||||
in {
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./literature-quote.nix
|
./logotheca.nix
|
||||||
./astrology.nix
|
./transits.nix
|
||||||
./autorenkalender.nix
|
./autorenkalender.nix
|
||||||
./hesychius.nix
|
./hesychius.nix
|
||||||
./smyth.nix
|
./smyth.nix
|
||||||
./nachtischsatan.nix
|
./nachtischsatan.nix
|
||||||
./tlg-wotd.nix
|
# ./tlg-wotd.nix TODO reenable
|
||||||
./celan.nix
|
./celan.nix
|
||||||
|
./nietzsche.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
systemd.tmpfiles.rules = map (path:
|
age.secrets = {
|
||||||
tmpfilesConfig {
|
telegram-token-kmein.file = ../../secrets/telegram-token-kmein.age;
|
||||||
type = "d";
|
};
|
||||||
mode = "0750";
|
|
||||||
age = "1h";
|
systemd.tmpfiles.rules =
|
||||||
inherit path;
|
map
|
||||||
}) [reverseDirectory proverbDirectory];
|
(
|
||||||
|
path:
|
||||||
|
pkgs.lib.niveum.tmpfilesConfig {
|
||||||
|
type = "d";
|
||||||
|
mode = "0750";
|
||||||
|
age = "1h";
|
||||||
|
inherit path;
|
||||||
|
}
|
||||||
|
)
|
||||||
|
[
|
||||||
|
reverseDirectory
|
||||||
|
proverbDirectory
|
||||||
|
];
|
||||||
|
|
||||||
niveum.passport.services = [
|
niveum.passport.services = [
|
||||||
{
|
{
|
||||||
@@ -51,38 +62,50 @@ in {
|
|||||||
telegram-token-reverse.file = ../../secrets/telegram-token-reverse.age;
|
telegram-token-reverse.file = ../../secrets/telegram-token-reverse.age;
|
||||||
telegram-token-betacode.file = ../../secrets/telegram-token-betacode.age;
|
telegram-token-betacode.file = ../../secrets/telegram-token-betacode.age;
|
||||||
telegram-token-proverb.file = ../../secrets/telegram-token-proverb.age;
|
telegram-token-proverb.file = ../../secrets/telegram-token-proverb.age;
|
||||||
|
telegram-token-streaming-link.file = ../../secrets/telegram-token-streaming-link.age;
|
||||||
};
|
};
|
||||||
|
|
||||||
systemd.services.telegram-reverse = {
|
systemd.services.telegram-reverse = {
|
||||||
wantedBy = ["multi-user.target"];
|
wantedBy = [ "multi-user.target" ];
|
||||||
description = "Telegram reverse bot";
|
description = "Telegram reverse bot";
|
||||||
path = [pkgs.ffmpeg];
|
path = [ pkgs.ffmpeg ];
|
||||||
enable = true;
|
enable = false;
|
||||||
script = ''
|
script = ''
|
||||||
TELEGRAM_BOT_TOKEN="$(cat "$CREDENTIALS_DIRECTORY/token")" ${telebots}/bin/telegram-reverse
|
TELEGRAM_BOT_TOKEN="$(cat "$CREDENTIALS_DIRECTORY/token")" ${pkgs.telebots}/bin/telegram-reverse
|
||||||
'';
|
'';
|
||||||
serviceConfig.Restart = "always";
|
serviceConfig.Restart = "always";
|
||||||
serviceConfig.WorkingDirectory = reverseDirectory;
|
serviceConfig.WorkingDirectory = reverseDirectory;
|
||||||
serviceConfig.LoadCredential = "token:${config.age.secrets.telegram-token-reverse.path}";
|
serviceConfig.LoadCredential = "token:${config.age.secrets.telegram-token-reverse.path}";
|
||||||
};
|
};
|
||||||
|
|
||||||
systemd.services.telegram-betacode = {
|
systemd.services.telegram-streaming-link = {
|
||||||
wantedBy = ["multi-user.target"];
|
wantedBy = [ "multi-user.target" ];
|
||||||
description = "Telegram beta code bot";
|
description = "Telegram bot converting YouTube Music <-> Spotify";
|
||||||
enable = true;
|
enable = false;
|
||||||
script = ''
|
script = ''
|
||||||
TELEGRAM_BOT_TOKEN="$(cat "$CREDENTIALS_DIRECTORY/token")" ${telebots}/bin/telegram-betacode
|
TELEGRAM_BOT_TOKEN="$(cat "$CREDENTIALS_DIRECTORY/token")" ${pkgs.telebots}/bin/telegram-streaming-link
|
||||||
|
'';
|
||||||
|
serviceConfig.Restart = "always";
|
||||||
|
serviceConfig.LoadCredential = "token:${config.age.secrets.telegram-token-streaming-link.path}";
|
||||||
|
};
|
||||||
|
|
||||||
|
systemd.services.telegram-betacode = {
|
||||||
|
wantedBy = [ "multi-user.target" ];
|
||||||
|
description = "Telegram beta code bot";
|
||||||
|
enable = false;
|
||||||
|
script = ''
|
||||||
|
TELEGRAM_BOT_TOKEN="$(cat "$CREDENTIALS_DIRECTORY/token")" ${pkgs.telebots}/bin/telegram-betacode
|
||||||
'';
|
'';
|
||||||
serviceConfig.Restart = "always";
|
serviceConfig.Restart = "always";
|
||||||
serviceConfig.LoadCredential = "token:${config.age.secrets.telegram-token-betacode.path}";
|
serviceConfig.LoadCredential = "token:${config.age.secrets.telegram-token-betacode.path}";
|
||||||
};
|
};
|
||||||
|
|
||||||
systemd.services.telegram-proverb = {
|
systemd.services.telegram-proverb = {
|
||||||
wantedBy = ["multi-user.target"];
|
wantedBy = [ "multi-user.target" ];
|
||||||
description = "Telegram proverb bot";
|
description = "Telegram proverb bot";
|
||||||
enable = true;
|
enable = false;
|
||||||
script = ''
|
script = ''
|
||||||
TELEGRAM_BOT_TOKEN="$(cat "$CREDENTIALS_DIRECTORY/token")" ${telebots}/bin/telegram-proverb
|
TELEGRAM_BOT_TOKEN="$(cat "$CREDENTIALS_DIRECTORY/token")" ${pkgs.telebots}/bin/telegram-proverb
|
||||||
'';
|
'';
|
||||||
serviceConfig.Restart = "always";
|
serviceConfig.Restart = "always";
|
||||||
serviceConfig.WorkingDirectory = proverbDirectory;
|
serviceConfig.WorkingDirectory = proverbDirectory;
|
||||||
36
configs/bots/hesychius.nix
Normal file
36
configs/bots/hesychius.nix
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
{
|
||||||
|
pkgs,
|
||||||
|
config,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
{
|
||||||
|
niveum.bots.hesychius = {
|
||||||
|
enable = true;
|
||||||
|
time = "08:00";
|
||||||
|
mastodon = {
|
||||||
|
enable = true;
|
||||||
|
language = "el";
|
||||||
|
tokenFile = config.age.secrets.mastodon-token-hesychius.path;
|
||||||
|
};
|
||||||
|
telegram = {
|
||||||
|
enable = true;
|
||||||
|
tokenFile = config.age.secrets.telegram-token-kmein.path;
|
||||||
|
chatIds = [ "@HesychiosAlexandreus" ];
|
||||||
|
};
|
||||||
|
command = "${pkgs.coreutils}/bin/shuf -n1 ${pkgs.hesychius}";
|
||||||
|
};
|
||||||
|
|
||||||
|
systemd.timers.bot-hesychius.timerConfig.RandomizedDelaySec = "10h";
|
||||||
|
|
||||||
|
age.secrets = {
|
||||||
|
mastodon-token-hesychius.file = ../../secrets/mastodon-token-hesychius.age;
|
||||||
|
};
|
||||||
|
|
||||||
|
niveum.passport.services = [
|
||||||
|
{
|
||||||
|
title = "Hesychius of Alexandria Bot";
|
||||||
|
description = "sends a random word from Hesychius of Alexandria's lexicon to Telegram.";
|
||||||
|
link = "https://t.me/HesychiosAlexandreus";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
}
|
||||||
37
configs/bots/logotheca.nix
Normal file
37
configs/bots/logotheca.nix
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
{
|
||||||
|
pkgs,
|
||||||
|
config,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
{
|
||||||
|
niveum.bots.logotheca = {
|
||||||
|
enable = true;
|
||||||
|
time = "08/6:00";
|
||||||
|
telegram = {
|
||||||
|
enable = true;
|
||||||
|
tokenFile = config.age.secrets.telegram-token-kmein.path;
|
||||||
|
chatIds = [ "-1001760262519" ];
|
||||||
|
parseMode = "Markdown";
|
||||||
|
};
|
||||||
|
matrix = {
|
||||||
|
enable = true;
|
||||||
|
homeserver = "matrix.4d2.org";
|
||||||
|
tokenFile = config.age.secrets.matrix-token-lakai.path;
|
||||||
|
chatIds = [
|
||||||
|
"!zlwCuPiCNMSxDviFzA:4d2.org"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
command = "${pkgs.literature-quote}/bin/literature-quote";
|
||||||
|
};
|
||||||
|
|
||||||
|
age.secrets = {
|
||||||
|
matrix-token-lakai.file = ../../secrets/matrix-token-lakai.age;
|
||||||
|
};
|
||||||
|
|
||||||
|
niveum.passport.services = [
|
||||||
|
{
|
||||||
|
title = "Literature quote bot";
|
||||||
|
description = "sends me and my friends three <a href=\"https://logotheca.xn--kiern-0qa.de/\">logotheca</a> quotes a day.";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
}
|
||||||
53
configs/bots/nachtischsatan.nix
Normal file
53
configs/bots/nachtischsatan.nix
Normal file
@@ -0,0 +1,53 @@
|
|||||||
|
{
|
||||||
|
pkgs,
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
let
|
||||||
|
nachtischsatan-bot =
|
||||||
|
{ tokenFile }:
|
||||||
|
pkgs.writers.writePython3 "nachtischsatan-bot"
|
||||||
|
{
|
||||||
|
libraries = [ pkgs.python3Packages.python-telegram-bot ];
|
||||||
|
}
|
||||||
|
''
|
||||||
|
from telegram.ext import Application, ContextTypes, MessageHandler, filters
|
||||||
|
from telegram import Update
|
||||||
|
import random
|
||||||
|
import time
|
||||||
|
|
||||||
|
|
||||||
|
async def flubber(update: Update, context: ContextTypes.DEFAULT_TYPE):
|
||||||
|
time.sleep(random.randrange(4000) / 1000)
|
||||||
|
await update.message.reply_text("*flubberflubber*")
|
||||||
|
|
||||||
|
|
||||||
|
with open('${tokenFile}', 'r') as tokenFile:
|
||||||
|
token = tokenFile.read().strip()
|
||||||
|
application = Application.builder().token(token).build()
|
||||||
|
application.add_handler(MessageHandler(filters.ALL, flubber))
|
||||||
|
application.run_polling()
|
||||||
|
'';
|
||||||
|
in
|
||||||
|
{
|
||||||
|
systemd.services.telegram-nachtischsatan = {
|
||||||
|
wantedBy = [ "multi-user.target" ];
|
||||||
|
description = "*flubberflubber*";
|
||||||
|
enable = true;
|
||||||
|
script = toString (nachtischsatan-bot {
|
||||||
|
tokenFile = config.age.secrets.telegram-token-nachtischsatan.path;
|
||||||
|
});
|
||||||
|
serviceConfig.Restart = "always";
|
||||||
|
};
|
||||||
|
|
||||||
|
age.secrets.telegram-token-nachtischsatan.file = ../../secrets/telegram-token-nachtischsatan.age;
|
||||||
|
|
||||||
|
niveum.passport.services = [
|
||||||
|
{
|
||||||
|
title = "Nachtischsatan-Bot";
|
||||||
|
link = "https://t.me/NachtischsatanBot";
|
||||||
|
description = "*flubberflubber*";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
}
|
||||||
33
configs/bots/nietzsche.nix
Normal file
33
configs/bots/nietzsche.nix
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
{
|
||||||
|
niveum.bots.nietzsche = {
|
||||||
|
enable = true;
|
||||||
|
time = "08:00";
|
||||||
|
mastodon = {
|
||||||
|
enable = true;
|
||||||
|
tokenFile = config.age.secrets.mastodon-token-nietzsche.path;
|
||||||
|
language = "de";
|
||||||
|
};
|
||||||
|
command = toString (
|
||||||
|
pkgs.writers.writeBash "random-nietzsche" ''
|
||||||
|
set -efu
|
||||||
|
random_number=$(( ($RANDOM % 10) + 1 ))
|
||||||
|
if [ "$random_number" -eq 1 ]; then
|
||||||
|
${pkgs.random-zeno}/bin/random-zeno "/Literatur/M/Nietzsche,+Friedrich"
|
||||||
|
else
|
||||||
|
${pkgs.random-zeno}/bin/random-zeno "/Philosophie/M/Nietzsche,+Friedrich"
|
||||||
|
fi
|
||||||
|
''
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
systemd.timers.bot-nietzsche.timerConfig.RandomizedDelaySec = "10h";
|
||||||
|
|
||||||
|
age.secrets = {
|
||||||
|
mastodon-token-nietzsche.file = ../../secrets/mastodon-token-nietzsche.age;
|
||||||
|
};
|
||||||
|
}
|
||||||
72
configs/bots/smyth.nix
Normal file
72
configs/bots/smyth.nix
Normal file
@@ -0,0 +1,72 @@
|
|||||||
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
{
|
||||||
|
niveum.bots.smyth = {
|
||||||
|
enable = true;
|
||||||
|
time = "08:00";
|
||||||
|
mastodon = {
|
||||||
|
enable = true;
|
||||||
|
tokenFile = config.age.secrets.mastodon-token-smyth.path;
|
||||||
|
language = "en";
|
||||||
|
};
|
||||||
|
telegram = {
|
||||||
|
enable = true;
|
||||||
|
tokenFile = config.age.secrets.telegram-token-kmein.path;
|
||||||
|
chatIds = [ "@HerbertWeirSmyth" ];
|
||||||
|
};
|
||||||
|
command = toString (
|
||||||
|
pkgs.writers.writeDash "random-smyth" ''
|
||||||
|
set -efu
|
||||||
|
|
||||||
|
good_curl() {
|
||||||
|
${pkgs.curl}/bin/curl "$@" \
|
||||||
|
--compressed \
|
||||||
|
-H 'Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8' \
|
||||||
|
-H 'Accept-Language: en-US,en;q=0.5' \
|
||||||
|
-H 'DNT: 1' \
|
||||||
|
-H 'Connection: keep-alive' \
|
||||||
|
-H 'Upgrade-Insecure-Requests: 1' \
|
||||||
|
-H 'Sec-Fetch-Dest: document' \
|
||||||
|
-H 'Sec-Fetch-Mode: navigate' \
|
||||||
|
-H 'Sec-Fetch-Site: cross-site' \
|
||||||
|
-H 'Priority: u=0, i' \
|
||||||
|
-H 'Pragma: no-cache' \
|
||||||
|
-H 'Cache-Control: no-cache'
|
||||||
|
}
|
||||||
|
|
||||||
|
RANDOM_SECTION=$(
|
||||||
|
good_curl -sSL http://www.perseus.tufts.edu/hopper/xmltoc?doc=Perseus%3Atext%3A1999.04.0007%3Asmythp%3D1 \
|
||||||
|
| ${pkgs.gnugrep}/bin/grep -o 'ref="[^"]*"' \
|
||||||
|
| ${pkgs.coreutils}/bin/shuf -n1 \
|
||||||
|
| ${pkgs.gnused}/bin/sed 's/^ref="//;s/"$//'
|
||||||
|
)
|
||||||
|
|
||||||
|
url="http://www.perseus.tufts.edu/hopper/text?doc=$RANDOM_SECTION"
|
||||||
|
good_curl -sSL "$url"\
|
||||||
|
| ${pkgs.htmlq}/bin/htmlq '#text_main' \
|
||||||
|
| ${pkgs.gnused}/bin/sed 's/<\/\?hr>//g' \
|
||||||
|
| ${pkgs.pandoc}/bin/pandoc -f html -t plain --wrap=none
|
||||||
|
|
||||||
|
printf '\n%s\n\n#AncientGreek' "$url"
|
||||||
|
''
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
systemd.timers.bot-smyth.timerConfig.RandomizedDelaySec = "10h";
|
||||||
|
|
||||||
|
age.secrets = {
|
||||||
|
mastodon-token-smyth.file = ../../secrets/mastodon-token-smyth.age;
|
||||||
|
};
|
||||||
|
|
||||||
|
niveum.passport.services = [
|
||||||
|
{
|
||||||
|
title = "Herbert Weir Smyth Bot";
|
||||||
|
description = "sends a random section from Smyth's Ancient Greek grammar to Telegram.";
|
||||||
|
link = "https://t.me/HerbertWeirSmyth";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
}
|
||||||
176
configs/bots/tlg-wotd.nix
Normal file
176
configs/bots/tlg-wotd.nix
Normal file
@@ -0,0 +1,176 @@
|
|||||||
|
{
|
||||||
|
pkgs,
|
||||||
|
config,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
let
|
||||||
|
mastodonEndpoint = "https://social.krebsco.de";
|
||||||
|
in
|
||||||
|
{
|
||||||
|
systemd.services.bot-tlg-wotd = {
|
||||||
|
# TODO reenable
|
||||||
|
# once https://github.com/NixOS/nixpkgs/pull/462893 is in stable NixOS
|
||||||
|
enable = true;
|
||||||
|
wants = [ "network-online.target" ];
|
||||||
|
startAt = "9:30";
|
||||||
|
path = [
|
||||||
|
pkgs.jq
|
||||||
|
pkgs.curl
|
||||||
|
pkgs.recode
|
||||||
|
pkgs.deno
|
||||||
|
pkgs.imagemagick
|
||||||
|
pkgs.gawk
|
||||||
|
pkgs.gnugrep
|
||||||
|
pkgs.coreutils
|
||||||
|
];
|
||||||
|
environment = {
|
||||||
|
NPM_CONFIG_CACHE = "/tmp";
|
||||||
|
CLTK_DATA = "/tmp";
|
||||||
|
};
|
||||||
|
script = ''
|
||||||
|
set -efux
|
||||||
|
|
||||||
|
chat_id=@tlgwotd
|
||||||
|
|
||||||
|
export TELEGRAM_TOKEN="$(cat "$CREDENTIALS_DIRECTORY/telegram-token")"
|
||||||
|
export MASTODON_TOKEN="$(cat "$CREDENTIALS_DIRECTORY/mastodon-token")"
|
||||||
|
|
||||||
|
json_data=$(curl -sSL http://stephanus.tlg.uci.edu/Iris/Wotd | recode html..utf8)
|
||||||
|
|
||||||
|
word=$(echo "$json_data" | jq -r '.word')
|
||||||
|
compact_word=$(echo "$word" | sed 's/,.*$//')
|
||||||
|
definition=$(echo "$json_data" | jq -r '.definition | sub("<.*>"; "") | rtrimstr(" ")')
|
||||||
|
first_occurrence=$(echo "$json_data" | jq -r '.firstOccurrence')
|
||||||
|
total_occurrences=$(echo "$json_data" | jq -r '.totalOccurrences')
|
||||||
|
telegram_caption="*$word* ‘$definition’
|
||||||
|
|
||||||
|
First occurrence (century): $first_occurrence
|
||||||
|
Number of occurrences (in all Ancient Greek texts): $total_occurrences"
|
||||||
|
mastodon_caption="$word ‘$definition’
|
||||||
|
|
||||||
|
First occurrence (century): $first_occurrence
|
||||||
|
Number of occurrences (in all Ancient Greek texts): $total_occurrences"
|
||||||
|
|
||||||
|
#ancientgreek #classics #wotd #wordoftheday
|
||||||
|
|
||||||
|
transliteration=$(${
|
||||||
|
pkgs.writers.writePython3 "translit.py"
|
||||||
|
{
|
||||||
|
libraries = py: [ py.cltk ];
|
||||||
|
}
|
||||||
|
''
|
||||||
|
import sys
|
||||||
|
from cltk.phonology.grc.transcription import Transcriber
|
||||||
|
|
||||||
|
probert = Transcriber("Attic", "Probert")
|
||||||
|
text = " ".join(sys.argv[1:])
|
||||||
|
ipa = probert.transcribe(text)
|
||||||
|
|
||||||
|
print(ipa)
|
||||||
|
''
|
||||||
|
} "$compact_word")
|
||||||
|
|
||||||
|
|
||||||
|
photo_path=/tmp/output.png
|
||||||
|
|
||||||
|
hex_to_rgb() {
|
||||||
|
hex="$1"
|
||||||
|
r=$(printf "%d" "0x$(echo "$hex" | cut -c2-3)")
|
||||||
|
g=$(printf "%d" "0x$(echo "$hex" | cut -c4-5)")
|
||||||
|
b=$(printf "%d" "0x$(echo "$hex" | cut -c6-7)")
|
||||||
|
echo "$r $g $b"
|
||||||
|
}
|
||||||
|
|
||||||
|
calculate_luminance() {
|
||||||
|
r="$1"
|
||||||
|
g="$2"
|
||||||
|
b="$3"
|
||||||
|
|
||||||
|
r_l=$(echo "$r" | awk '{print ($1 / 255 <= 0.03928) ? $1 / 255 / 12.92 : (($1 / 255 + 0.055) / 1.055)^2.4}')
|
||||||
|
g_l=$(echo "$g" | awk '{print ($1 / 255 <= 0.03928) ? $1 / 255 / 12.92 : (($1 / 255 + 0.055) / 1.055)^2.4}')
|
||||||
|
b_l=$(echo "$b" | awk '{print ($1 / 255 <= 0.03928) ? $1 / 255 / 12.92 : (($1 / 255 + 0.055) / 1.055)^2.4}')
|
||||||
|
|
||||||
|
echo "$r_l $g_l $b_l" | awk '{print 0.2126*$1 + 0.7152*$2 + 0.0722*$3}'
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
hex_color="#$(echo "$compact_word" | md5sum | cut -c 1-6)"
|
||||||
|
if echo "$hex_color" | grep -qE '^#[0-9A-Fa-f]{6}$'; then
|
||||||
|
set -- $(hex_to_rgb "$hex_color")
|
||||||
|
r="$1"
|
||||||
|
g="$2"
|
||||||
|
b="$3"
|
||||||
|
fi
|
||||||
|
|
||||||
|
luminance=$(calculate_luminance "$r" "$g" "$b")
|
||||||
|
|
||||||
|
threshold="0.1"
|
||||||
|
echo "$r $g $b"
|
||||||
|
if [ "$(echo "$luminance" | awk -v threshold="$threshold" '{print ($1 > threshold)}')" -eq 1 ]; then
|
||||||
|
color1="black"
|
||||||
|
color2="#333"
|
||||||
|
else
|
||||||
|
color1="white"
|
||||||
|
color2=lightgrey
|
||||||
|
fi
|
||||||
|
|
||||||
|
magick -size 1400x846 \
|
||||||
|
xc:"$hex_color" \
|
||||||
|
-font "${pkgs.gentium}/share/fonts/truetype/GentiumBookPlus-Bold.ttf" \
|
||||||
|
-fill "$color1" \
|
||||||
|
-pointsize 150 -gravity west \
|
||||||
|
-annotate +100-160 "$compact_word" \
|
||||||
|
-font "${pkgs.gentium}/share/fonts/truetype/GentiumBookPlus-Regular.ttf" \
|
||||||
|
-fill "$color2" \
|
||||||
|
-pointsize 60 -gravity west \
|
||||||
|
-annotate +100+00 "$transliteration" \
|
||||||
|
-fill "$color1" \
|
||||||
|
-annotate +100+120 "‘$definition’" \
|
||||||
|
-fill "$color2" \
|
||||||
|
-pointsize 40 -gravity southwest \
|
||||||
|
-annotate +100+60 "attested $total_occurrences times" \
|
||||||
|
-pointsize 40 -gravity southeast \
|
||||||
|
-annotate +100+60 "$(date -I)" \
|
||||||
|
"$photo_path"
|
||||||
|
|
||||||
|
curl -X POST "https://api.telegram.org/bot$TELEGRAM_TOKEN/sendPhoto" \
|
||||||
|
-F "chat_id=\"$chat_id\"" \
|
||||||
|
-F "photo=@$photo_path" \
|
||||||
|
-F parse_mode=Markdown \
|
||||||
|
-F caption="$telegram_caption"
|
||||||
|
|
||||||
|
mastodon_upload_response=$(curl -X POST "${mastodonEndpoint}/api/v2/media" \
|
||||||
|
-H "Authorization: Bearer $MASTODON_TOKEN" \
|
||||||
|
-F "file=@$photo_path" \
|
||||||
|
-F "description=$word ‘$definition’")
|
||||||
|
mastodon_image_id=$(echo $mastodon_upload_response | jq -r .id)
|
||||||
|
curl -X POST "${mastodonEndpoint}/api/v1/statuses" \
|
||||||
|
-H "Authorization: Bearer $MASTODON_TOKEN" \
|
||||||
|
-d "status=$mastodon_caption" \
|
||||||
|
-d "visibility=public" \
|
||||||
|
-d "media_ids[]=$mastodon_image_id"
|
||||||
|
'';
|
||||||
|
serviceConfig = {
|
||||||
|
Type = "oneshot";
|
||||||
|
DynamicUser = true;
|
||||||
|
StateDirectory = "tlgwotd";
|
||||||
|
PrivateTmp = true;
|
||||||
|
LoadCredential = [
|
||||||
|
"telegram-token:${config.age.secrets.telegram-token-kmein.path}"
|
||||||
|
"mastodon-token:${config.age.secrets.mastodon-token-tlgwotd.path}"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
age.secrets = {
|
||||||
|
mastodon-token-tlgwotd.file = ../../secrets/mastodon-token-tlgwotd.age;
|
||||||
|
};
|
||||||
|
|
||||||
|
niveum.passport.services = [
|
||||||
|
{
|
||||||
|
title = "Thesaurus Linguae Graecae Word of the Day";
|
||||||
|
description = "sends <a href=\"https://stephanus.tlg.uci.edu/\">TLG</a>'s word of the day to Telegram.";
|
||||||
|
link = "https://t.me/tlgwotd";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
}
|
||||||
@@ -3,7 +3,8 @@
|
|||||||
pkgs,
|
pkgs,
|
||||||
lib,
|
lib,
|
||||||
...
|
...
|
||||||
}: let
|
}:
|
||||||
|
let
|
||||||
toSymbols = pkgs.writers.writeDash "to-symbols" ''
|
toSymbols = pkgs.writers.writeDash "to-symbols" ''
|
||||||
${pkgs.gnused}/bin/sed '
|
${pkgs.gnused}/bin/sed '
|
||||||
s/\bTri\b/△/;
|
s/\bTri\b/△/;
|
||||||
@@ -40,19 +41,36 @@
|
|||||||
s/^\s*//
|
s/^\s*//
|
||||||
'
|
'
|
||||||
'';
|
'';
|
||||||
in {
|
in
|
||||||
niveum.telegramBots.transits = {
|
{
|
||||||
|
niveum.bots.transits = {
|
||||||
enable = true;
|
enable = true;
|
||||||
time = "*:0/1";
|
time = "*:0/1";
|
||||||
tokenFile = config.age.secrets.telegram-token-kmein.path;
|
mastodon = {
|
||||||
chatIds = ["-1001796440545"];
|
enable = true;
|
||||||
command = toString (pkgs.writers.writeDash "common-transits" ''
|
tokenFile = config.age.secrets.mastodon-token-transits.path;
|
||||||
now=$(${pkgs.coreutils}/bin/date +%_H:%M | ${pkgs.gnused}/bin/sed 's/^\s*//')
|
};
|
||||||
date=$(${pkgs.coreutils}/bin/date +'%m %d %Y')
|
telegram = {
|
||||||
{
|
enable = true;
|
||||||
${pkgs.astrolog}/bin/astrolog -qd $date -zN Berlin -Yt -Yd -d -R Uranus Neptune Pluto "North Node" -A 2
|
tokenFile = config.age.secrets.telegram-token-kmein.path;
|
||||||
${pkgs.astrolog}/bin/astrolog -Yt -Yd -q 10 22 1999 6:32 -zN Kassel -td $date -R Uranus Neptune Pluto "North Node"
|
chatIds = [ "-1001796440545" ];
|
||||||
} | ${toSymbols} | ${pkgs.coreutils}/bin/sort -n | ${pkgs.gnugrep}/bin/grep "^$now" || :
|
};
|
||||||
'');
|
command = toString (
|
||||||
|
pkgs.writers.writeDash "common-transits" ''
|
||||||
|
set -efu
|
||||||
|
|
||||||
|
now=$(${pkgs.coreutils}/bin/date +%_H:%M | ${pkgs.gnused}/bin/sed 's/^\s*//')
|
||||||
|
date=$(${pkgs.coreutils}/bin/date +'%m %d %Y')
|
||||||
|
(
|
||||||
|
cd ${pkgs.astrolog}/bin
|
||||||
|
# ./astrolog -Yt -Yd -q 10 22 1999 6:32 -zN Kassel -td $date -R Uranus Neptune Pluto "North Node"
|
||||||
|
./astrolog -qd $date -zN Berlin -Yt -Yd -d -R Uranus Neptune Pluto "North Node" -A 2
|
||||||
|
) | ${toSymbols} | ${pkgs.coreutils}/bin/sort -n | ${pkgs.gnugrep}/bin/grep "^$now" || :
|
||||||
|
''
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
age.secrets = {
|
||||||
|
mastodon-token-transits.file = ../../secrets/mastodon-token-transits.age;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
92
configs/browser.nix
Normal file
92
configs/browser.nix
Normal file
@@ -0,0 +1,92 @@
|
|||||||
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
{
|
||||||
|
environment.systemPackages = [
|
||||||
|
pkgs.cro
|
||||||
|
pkgs.tor-browser
|
||||||
|
pkgs.firefox
|
||||||
|
pkgs.brave
|
||||||
|
];
|
||||||
|
|
||||||
|
home-manager.users.me = {
|
||||||
|
programs.firefox = {
|
||||||
|
enable = true;
|
||||||
|
profiles =
|
||||||
|
let
|
||||||
|
defaultSettings = {
|
||||||
|
"beacon.enabled" = false;
|
||||||
|
"browser.bookmarks.showMobileBookmarks" = true;
|
||||||
|
"browser.newtab.preload" = false;
|
||||||
|
"browser.search.isUS" = false;
|
||||||
|
"browser.search.region" = "DE";
|
||||||
|
"browser.send_pings" = false;
|
||||||
|
"browser.shell.checkDefaultBrowser" = false;
|
||||||
|
"browser.startup.homepage" = "chrome://browser/content/blanktab.html";
|
||||||
|
"browser.uidensity" = 1;
|
||||||
|
"browser.urlbar.placeholderName" = "Search";
|
||||||
|
"datareporting.healthreport.service.enabled" = false;
|
||||||
|
"datareporting.healthreport.uploadEnabled" = false;
|
||||||
|
"datareporting.policy.dataSubmissionEnabled" = false;
|
||||||
|
"datareporting.sessions.current.clean" = true;
|
||||||
|
"distribution.searchplugins.defaultLocale" = "de-DE";
|
||||||
|
"general.smoothScroll" = true;
|
||||||
|
"identity.fxaccounts.account.device.name" = config.networking.hostName;
|
||||||
|
"network.cookie.cookieBehavior" = 1;
|
||||||
|
"privacy.donottrackheader.enabled" = true;
|
||||||
|
"privacy.trackingprotection.enabled" = true;
|
||||||
|
"privacy.trackingprotection.pbmode.enabled" = true;
|
||||||
|
"privacy.trackingprotection.socialtracking.enabled" = true;
|
||||||
|
"services.sync.declinedEngines" = "passwords";
|
||||||
|
"services.sync.engine.passwords" = false;
|
||||||
|
"signon.autofillForms" = false;
|
||||||
|
"signon.rememberSignons" = false;
|
||||||
|
"toolkit.legacyUserProfileCustomizations.stylesheets" = true;
|
||||||
|
"toolkit.telemetry.archive.enabled" = false;
|
||||||
|
"toolkit.telemetry.bhrPing.enabled" = false;
|
||||||
|
"toolkit.telemetry.cachedClientID" = "";
|
||||||
|
"toolkit.telemetry.enabled" = false;
|
||||||
|
"toolkit.telemetry.firstShutdownPing.enabled" = false;
|
||||||
|
"toolkit.telemetry.hybridContent.enabled" = false;
|
||||||
|
"toolkit.telemetry.newProfilePing.enabled" = false;
|
||||||
|
"toolkit.telemetry.prompted" = 2;
|
||||||
|
"toolkit.telemetry.rejected" = true;
|
||||||
|
"toolkit.telemetry.server" = "";
|
||||||
|
"toolkit.telemetry.shutdownPingSender.enabled" = false;
|
||||||
|
"toolkit.telemetry.unified" = false;
|
||||||
|
"toolkit.telemetry.unifiedIsOptIn" = false;
|
||||||
|
"toolkit.telemetry.updatePing.enabled" = false;
|
||||||
|
"ui.prefersReducedMotion" = 1;
|
||||||
|
};
|
||||||
|
in
|
||||||
|
{
|
||||||
|
default = {
|
||||||
|
id = 0;
|
||||||
|
isDefault = true;
|
||||||
|
settings = defaultSettings;
|
||||||
|
# extensions = with pkgs.nur.repos.rycee.firefox-addons; [
|
||||||
|
# ublock-origin
|
||||||
|
# darkreader
|
||||||
|
# sponsorblock
|
||||||
|
# consent-o-matic
|
||||||
|
# i-dont-care-about-cookies
|
||||||
|
# # auto-tab-discard TODO what is this
|
||||||
|
# ];
|
||||||
|
userChrome = ''
|
||||||
|
#TabsToolbar {
|
||||||
|
visibility: collapse !important;
|
||||||
|
}
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
home-manager.users.me = {
|
||||||
|
stylix.targets.firefox.profileNames = [ "default" ];
|
||||||
|
};
|
||||||
|
|
||||||
|
environment.variables.BROWSER = "firefox";
|
||||||
|
}
|
||||||
@@ -1,28 +1,38 @@
|
|||||||
{pkgs, ...}:
|
{ pkgs, ... }:
|
||||||
# https://paste.sr.ht/~erictapen/11716989e489b600f237041b6d657fdf0ee17b34
|
{
|
||||||
let
|
networking.networkmanager.ensureProfiles.profiles = {
|
||||||
certificate = pkgs.stdenv.mkDerivation rec {
|
"39C3" = {
|
||||||
name = "dst-root-ca-x3.pem";
|
connection = {
|
||||||
src = builtins.toFile "${name}.sed" ''
|
id = "39C3";
|
||||||
1,/DST Root CA X3/d
|
type = "wifi";
|
||||||
1,/-----END CERTIFICATE-----/p
|
};
|
||||||
'';
|
wifi = {
|
||||||
nativeBuildInputs = with pkgs; [cacert gnused];
|
mode = "infrastructure";
|
||||||
phases = "installPhase";
|
ssid = "39C3";
|
||||||
installPhase = ''
|
};
|
||||||
${pkgs.gnused}/bin/sed -n -f $src ${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt > $out
|
wifi-security = {
|
||||||
'';
|
auth-alg = "open";
|
||||||
};
|
key-mgmt = "wpa-eap";
|
||||||
in {
|
};
|
||||||
networking.wireless.networks."36C3" = {
|
"802-1x" = {
|
||||||
auth = ''
|
anonymous-identity = "39C3";
|
||||||
key_mgmt=WPA-EAP
|
eap = "ttls;";
|
||||||
eap=TTLS
|
identity = "39C3";
|
||||||
identity="kmein"
|
password = "39C3";
|
||||||
password=" "
|
phase2-auth = "pap";
|
||||||
ca_cert="${certificate}"
|
altsubject-matches = "DNS:radius.c3noc.net";
|
||||||
altsubject_match="DNS:radius.c3noc.net"
|
ca-cert = "${builtins.fetchurl {
|
||||||
phase2="auth=PAP"
|
url = "https://letsencrypt.org/certs/isrgrootx1.pem";
|
||||||
'';
|
sha256 = "sha256:1la36n2f31j9s03v847ig6ny9lr875q3g7smnq33dcsmf2i5gd92";
|
||||||
|
}}";
|
||||||
|
};
|
||||||
|
ipv4 = {
|
||||||
|
method = "auto";
|
||||||
|
};
|
||||||
|
ipv6 = {
|
||||||
|
addr-gen-mode = "default";
|
||||||
|
method = "auto";
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,97 +0,0 @@
|
|||||||
{
|
|
||||||
pkgs,
|
|
||||||
config,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
programs.chromium = {
|
|
||||||
enable = true;
|
|
||||||
extensions = [
|
|
||||||
# "ihlenndgcmojhcghmfjfneahoeklbjjh" # cVim
|
|
||||||
# "fpnmgdkabkmnadcjpehmlllkndpkmiak" # Wayback Machine
|
|
||||||
"cjpalhdlnbpafiamejdnhcphjbkeiagm" # uBlock Origin
|
|
||||||
"pjjgklgkfeoeiebjogplpnibpfnffkng" # undistracted
|
|
||||||
"nhdogjmejiglipccpnnnanhbledajbpd" # vuejs devtools
|
|
||||||
"eimadpbcbfnmbkopoojfekhnkhdbieeh" # dark reader
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
home-manager.users.me = {
|
|
||||||
programs.firefox = {
|
|
||||||
enable = true;
|
|
||||||
package = pkgs.firefox.override {
|
|
||||||
cfg = {
|
|
||||||
enableTridactylNative = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
profiles = let
|
|
||||||
defaultSettings = {
|
|
||||||
"beacon.enabled" = false;
|
|
||||||
"browser.bookmarks.showMobileBookmarks" = true;
|
|
||||||
"browser.newtab.preload" = false;
|
|
||||||
"browser.search.isUS" = false;
|
|
||||||
"browser.search.region" = "DE";
|
|
||||||
"browser.send_pings" = false;
|
|
||||||
"browser.shell.checkDefaultBrowser" = false;
|
|
||||||
"browser.startup.homepage" = "chrome://browser/content/blanktab.html";
|
|
||||||
"browser.uidensity" = 1;
|
|
||||||
"browser.urlbar.placeholderName" = "Search";
|
|
||||||
"datareporting.healthreport.service.enabled" = false;
|
|
||||||
"datareporting.healthreport.uploadEnabled" = false;
|
|
||||||
"datareporting.policy.dataSubmissionEnabled" = false;
|
|
||||||
"datareporting.sessions.current.clean" = true;
|
|
||||||
"distribution.searchplugins.defaultLocale" = "de-DE";
|
|
||||||
"general.smoothScroll" = true;
|
|
||||||
"identity.fxaccounts.account.device.name" = config.networking.hostName;
|
|
||||||
"network.cookie.cookieBehavior" = 1;
|
|
||||||
"privacy.donottrackheader.enabled" = true;
|
|
||||||
"privacy.trackingprotection.enabled" = true;
|
|
||||||
"privacy.trackingprotection.pbmode.enabled" = true;
|
|
||||||
"privacy.trackingprotection.socialtracking.enabled" = true;
|
|
||||||
"services.sync.declinedEngines" = "passwords";
|
|
||||||
"services.sync.engine.passwords" = false;
|
|
||||||
"signon.autofillForms" = false;
|
|
||||||
"signon.rememberSignons" = false;
|
|
||||||
"toolkit.legacyUserProfileCustomizations.stylesheets" = true;
|
|
||||||
"toolkit.telemetry.archive.enabled" = false;
|
|
||||||
"toolkit.telemetry.bhrPing.enabled" = false;
|
|
||||||
"toolkit.telemetry.cachedClientID" = "";
|
|
||||||
"toolkit.telemetry.enabled" = false;
|
|
||||||
"toolkit.telemetry.firstShutdownPing.enabled" = false;
|
|
||||||
"toolkit.telemetry.hybridContent.enabled" = false;
|
|
||||||
"toolkit.telemetry.newProfilePing.enabled" = false;
|
|
||||||
"toolkit.telemetry.prompted" = 2;
|
|
||||||
"toolkit.telemetry.rejected" = true;
|
|
||||||
"toolkit.telemetry.server" = "";
|
|
||||||
"toolkit.telemetry.shutdownPingSender.enabled" = false;
|
|
||||||
"toolkit.telemetry.unified" = false;
|
|
||||||
"toolkit.telemetry.unifiedIsOptIn" = false;
|
|
||||||
"toolkit.telemetry.updatePing.enabled" = false;
|
|
||||||
"ui.prefersReducedMotion" = 1;
|
|
||||||
};
|
|
||||||
in {
|
|
||||||
default = {
|
|
||||||
id = 0;
|
|
||||||
isDefault = true;
|
|
||||||
settings = defaultSettings;
|
|
||||||
# extensions = with pkgs.nur.repos.rycee.firefox-addons; [
|
|
||||||
# ublock-origin
|
|
||||||
# darkreader
|
|
||||||
# sponsorblock
|
|
||||||
# consent-o-matic
|
|
||||||
# i-dont-care-about-cookies
|
|
||||||
# # auto-tab-discard TODO what is this
|
|
||||||
# ];
|
|
||||||
userChrome = ''
|
|
||||||
#TabsToolbar {
|
|
||||||
visibility: collapse !important;
|
|
||||||
}
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
environment.systemPackages = [pkgs.brave];
|
|
||||||
|
|
||||||
environment.variables.BROWSER = "brave";
|
|
||||||
}
|
|
||||||
@@ -2,6 +2,7 @@
|
|||||||
config,
|
config,
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}: {
|
}:
|
||||||
|
{
|
||||||
services.clipmenu.enable = true;
|
services.clipmenu.enable = true;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,50 +3,81 @@
|
|||||||
lib,
|
lib,
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}: let
|
}:
|
||||||
inherit (import ../lib) tmpfilesConfig;
|
{
|
||||||
in {
|
systemd.user.services.systemd-tmpfiles-clean = {
|
||||||
systemd.tmpfiles.rules = map tmpfilesConfig [
|
enable = true;
|
||||||
{
|
wantedBy = [ "default.target" ];
|
||||||
type = "L+";
|
startAt = "daily";
|
||||||
user = config.users.users.me.name;
|
script = "systemd-tmpfiles --user --clean";
|
||||||
group = "users";
|
serviceConfig = {
|
||||||
mode = "0755";
|
Type = "oneshot";
|
||||||
argument = "${config.users.users.me.home}/cloud/nextcloud/Uni";
|
};
|
||||||
path = "${config.users.users.me.home}/uni";
|
};
|
||||||
}
|
|
||||||
];
|
systemd.user.tmpfiles.users.me.rules =
|
||||||
|
map pkgs.lib.niveum.tmpfilesConfig [
|
||||||
|
{
|
||||||
|
type = "d";
|
||||||
|
mode = "0755";
|
||||||
|
age = "7d";
|
||||||
|
path = "${config.users.users.me.home}/sync/Downloads";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
type = "d";
|
||||||
|
mode = "0755";
|
||||||
|
age = "7d";
|
||||||
|
path = "${config.users.users.me.home}/cloud/nextcloud/tmp";
|
||||||
|
}
|
||||||
|
]
|
||||||
|
++
|
||||||
|
map
|
||||||
|
(
|
||||||
|
path:
|
||||||
|
pkgs.lib.niveum.tmpfilesConfig {
|
||||||
|
type = "L+";
|
||||||
|
user = config.users.users.me.name;
|
||||||
|
group = config.users.users.me.group;
|
||||||
|
mode = "0755";
|
||||||
|
argument = "${config.users.users.me.home}/sync/${path}";
|
||||||
|
path = "${config.users.users.me.home}/${path}";
|
||||||
|
}
|
||||||
|
)
|
||||||
|
[
|
||||||
|
".ssh"
|
||||||
|
".gnupg"
|
||||||
|
".pki"
|
||||||
|
".local/share/aerc"
|
||||||
|
];
|
||||||
|
|
||||||
|
services.gnome.gnome-keyring.enable = true;
|
||||||
|
security.pam.services.lightdm.enableGnomeKeyring = true;
|
||||||
|
|
||||||
home-manager.users.me = {
|
home-manager.users.me = {
|
||||||
services.gnome-keyring.enable = true;
|
|
||||||
services.nextcloud-client = {
|
services.nextcloud-client = {
|
||||||
enable = true;
|
enable = true;
|
||||||
startInBackground = true;
|
startInBackground = true;
|
||||||
};
|
};
|
||||||
systemd.user.services.nextcloud-client = {
|
|
||||||
Unit = {
|
|
||||||
Wants = ["gnome-keyring.service"];
|
|
||||||
After = ["gnome-keyring.service"];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
systemd.user.services.nextcloud-syncer = {
|
systemd.user.services.nextcloud-syncer = {
|
||||||
enable = false;
|
enable = false;
|
||||||
wants = ["network-online.target"];
|
wants = [ "network-online.target" ];
|
||||||
wantedBy = ["default.target"];
|
wantedBy = [ "default.target" ];
|
||||||
startAt = "*:00/10";
|
startAt = "*:00/10";
|
||||||
script = let
|
script =
|
||||||
kieran = {
|
let
|
||||||
user = "kieran";
|
kieran = {
|
||||||
passwordFile = config.age.secrets.nextcloud-password-kieran.path;
|
user = "kieran";
|
||||||
endpoint = "https://cloud.kmein.de";
|
passwordFile = config.age.secrets.nextcloud-password-kieran.path;
|
||||||
target = "${config.users.users.me.home}/notes";
|
endpoint = "https://cloud.kmein.de";
|
||||||
};
|
target = "${config.users.users.me.home}/notes";
|
||||||
in ''
|
};
|
||||||
mkdir -p ${lib.escapeShellArg kieran.target}
|
in
|
||||||
${pkgs.nextcloud-client}/bin/nextcloudcmd --non-interactive --user ${kieran.user} --password "$(cat ${kieran.passwordFile})" --path /Notes ${lib.escapeShellArg kieran.target} ${kieran.endpoint}
|
''
|
||||||
'';
|
mkdir -p ${lib.escapeShellArg kieran.target}
|
||||||
|
${pkgs.nextcloud-client}/bin/nextcloudcmd --non-interactive --user ${kieran.user} --password "$(cat ${kieran.passwordFile})" --path /Notes ${lib.escapeShellArg kieran.target} ${kieran.endpoint}
|
||||||
|
'';
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
Type = "oneshot";
|
Type = "oneshot";
|
||||||
Restart = "on-failure";
|
Restart = "on-failure";
|
||||||
@@ -62,19 +93,22 @@ in {
|
|||||||
} | ${pkgs.fzf}/bin/fzf)"
|
} | ${pkgs.fzf}/bin/fzf)"
|
||||||
exec ${pkgs.zathura}/bin/zathura "$book"
|
exec ${pkgs.zathura}/bin/zathura "$book"
|
||||||
'')
|
'')
|
||||||
(let
|
(
|
||||||
kieran = {
|
let
|
||||||
user = "kieran.meinhardt@gmail.com";
|
kieran = {
|
||||||
passwordFile = config.age.secrets.mega-password.path;
|
user = "kieran.meinhardt@gmail.com";
|
||||||
};
|
passwordFile = config.age.secrets.mega-password.path;
|
||||||
megatools = command: ''${pkgs.megatools}/bin/megatools ${command} --username ${lib.escapeShellArg kieran.user} --password "$(cat ${kieran.passwordFile})"'';
|
};
|
||||||
in
|
megatools =
|
||||||
|
command:
|
||||||
|
''${pkgs.megatools}/bin/megatools ${command} --username ${lib.escapeShellArg kieran.user} --password "$(cat ${kieran.passwordFile})"'';
|
||||||
|
in
|
||||||
pkgs.writers.writeDashBin "book-mega" ''
|
pkgs.writers.writeDashBin "book-mega" ''
|
||||||
set -efu
|
set -efu
|
||||||
selection="$(${megatools "ls"} | ${pkgs.fzf}/bin/fzf)"
|
selection="$(${megatools "ls"} | ${pkgs.fzf}/bin/fzf)"
|
||||||
test -n "$selection" || exit 1
|
test -n "$selection" || exit 1
|
||||||
|
|
||||||
tmpdir="$(mktemp -d)"
|
tmpdir="$(mktemp -p "$XDG_RUNTIME_DIR" -d)"
|
||||||
trap clean EXIT
|
trap clean EXIT
|
||||||
clean() {
|
clean() {
|
||||||
rm -rf "$tmpdir"
|
rm -rf "$tmpdir"
|
||||||
@@ -85,7 +119,8 @@ in {
|
|||||||
${megatools "get"} "$selection"
|
${megatools "get"} "$selection"
|
||||||
exec ${pkgs.zathura}/bin/zathura "$(basename "$selection")"
|
exec ${pkgs.zathura}/bin/zathura "$(basename "$selection")"
|
||||||
)
|
)
|
||||||
'')
|
''
|
||||||
|
)
|
||||||
];
|
];
|
||||||
|
|
||||||
age.secrets.mega-password = {
|
age.secrets.mega-password = {
|
||||||
@@ -95,7 +130,7 @@ in {
|
|||||||
mode = "400";
|
mode = "400";
|
||||||
};
|
};
|
||||||
|
|
||||||
services.syncthing = rec {
|
services.syncthing = {
|
||||||
enable = true;
|
enable = true;
|
||||||
user = "kfm";
|
user = "kfm";
|
||||||
openDefaultPorts = true;
|
openDefaultPorts = true;
|
||||||
@@ -103,21 +138,31 @@ in {
|
|||||||
dataDir = "/home/kfm/.config/syncthing";
|
dataDir = "/home/kfm/.config/syncthing";
|
||||||
cert = config.age.secrets.syncthing-cert.path;
|
cert = config.age.secrets.syncthing-cert.path;
|
||||||
key = config.age.secrets.syncthing-key.path;
|
key = config.age.secrets.syncthing-key.path;
|
||||||
inherit ((import ../lib).syncthing) devices;
|
settings = {
|
||||||
folders = let
|
devices = pkgs.lib.niveum.syncthingIds;
|
||||||
cloud-dir = "${config.users.users.me.home}/cloud";
|
folders = {
|
||||||
in {
|
"${config.users.users.me.home}/sync" = {
|
||||||
"${cloud-dir}/syncthing/zotero".devices = ["kabsa" "manakish"];
|
devices = [
|
||||||
"${cloud-dir}/syncthing/common".devices = ["kabsa" "manakish"];
|
"kabsa"
|
||||||
"${cloud-dir}/syncthing/library".devices = ["kabsa" "manakish" "heym"];
|
"manakish"
|
||||||
"${cloud-dir}/syncthing/mundoiu".devices = ["kabsa" "manakish" "heym"];
|
"fatteh"
|
||||||
"${cloud-dir}/syncthing/obsidian" = {
|
];
|
||||||
devices = ["kabsa" "manakish" "heym"];
|
label = "sync";
|
||||||
id = "3r1hu-3barr";
|
versioning.type = "trashcan";
|
||||||
};
|
versioning.params.cleanoutDays = 100;
|
||||||
"${cloud-dir}/syncthing/music" = {
|
};
|
||||||
devices = ["kabsa" "manakish" "heym" "zaatar"];
|
"${config.users.users.me.home}/mobile" = {
|
||||||
id = "music";
|
devices = [
|
||||||
|
"kabsa"
|
||||||
|
"manakish"
|
||||||
|
"fatteh"
|
||||||
|
"kibbeh"
|
||||||
|
];
|
||||||
|
id = "mobile";
|
||||||
|
label = "mobile";
|
||||||
|
versioning.type = "trashcan";
|
||||||
|
versioning.params.cleanoutDays = 100;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -2,29 +2,21 @@
|
|||||||
pkgs,
|
pkgs,
|
||||||
lib,
|
lib,
|
||||||
config,
|
config,
|
||||||
niveumPackages,
|
|
||||||
inputs,
|
|
||||||
...
|
...
|
||||||
}: let
|
}:
|
||||||
|
let
|
||||||
inherit (lib.strings) makeBinPath;
|
inherit (lib.strings) makeBinPath;
|
||||||
inherit (import ../lib) localAddresses kieran;
|
in
|
||||||
defaultApplications = (import ../lib).defaultApplications {inherit pkgs;};
|
{
|
||||||
in {
|
|
||||||
imports = [
|
imports = [
|
||||||
inputs.self.nixosModules.system-dependent
|
|
||||||
inputs.self.nixosModules.power-action
|
|
||||||
{
|
{
|
||||||
boot.supportedFilesystems = ["ntfs"];
|
boot.supportedFilesystems = [ "ntfs" ];
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
nixpkgs = {
|
nixpkgs = {
|
||||||
config = {
|
config = {
|
||||||
allowUnfree = true;
|
allowUnfree = true;
|
||||||
packageOverrides = pkgs: {
|
|
||||||
dmenu = pkgs.writers.writeDashBin "dmenu" ''exec ${pkgs.rofi}/bin/rofi -dmenu "$@"'';
|
|
||||||
};
|
|
||||||
permittedInsecurePackages = [
|
permittedInsecurePackages = [
|
||||||
"qtwebkit-5.212.0-alpha4"
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
@@ -39,7 +31,7 @@ in {
|
|||||||
file = ../secrets/di-fm-key.age;
|
file = ../secrets/di-fm-key.age;
|
||||||
owner = config.users.users.me.name;
|
owner = config.users.users.me.name;
|
||||||
group = config.users.users.me.group;
|
group = config.users.users.me.group;
|
||||||
mode = "400";
|
mode = "440";
|
||||||
};
|
};
|
||||||
restic = {
|
restic = {
|
||||||
file = ../secrets/restic.age;
|
file = ../secrets/restic.age;
|
||||||
@@ -60,19 +52,6 @@ in {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
{
|
|
||||||
environment.systemPackages = [
|
|
||||||
pkgs.capitaine-cursors
|
|
||||||
];
|
|
||||||
|
|
||||||
home-manager.users.me = {
|
|
||||||
home.pointerCursor = {
|
|
||||||
name = "capitaine-cursors-white";
|
|
||||||
package = pkgs.capitaine-cursors;
|
|
||||||
size = 12;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
{
|
{
|
||||||
users.mutableUsers = false;
|
users.mutableUsers = false;
|
||||||
|
|
||||||
@@ -80,12 +59,20 @@ in {
|
|||||||
|
|
||||||
users.users.me = {
|
users.users.me = {
|
||||||
name = "kfm";
|
name = "kfm";
|
||||||
description = kieran.name;
|
description = pkgs.lib.niveum.kieran.name;
|
||||||
passwordFile = config.age.secrets.kfm-password.path;
|
hashedPasswordFile = config.age.secrets.kfm-password.path;
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
uid = 1000;
|
uid = 1000;
|
||||||
|
extraGroups = [
|
||||||
|
"pipewire"
|
||||||
|
"audio"
|
||||||
|
"lp"
|
||||||
|
"scanner"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
nix.settings.trusted-users = [ config.users.users.me.name ];
|
||||||
|
|
||||||
age.secrets = {
|
age.secrets = {
|
||||||
kfm-password.file = ../secrets/kfm-password.age;
|
kfm-password.file = ../secrets/kfm-password.age;
|
||||||
};
|
};
|
||||||
@@ -93,108 +80,51 @@ in {
|
|||||||
home-manager.users.me.xdg.enable = true;
|
home-manager.users.me.xdg.enable = true;
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
environment.interactiveShellInit = "export PATH=$PATH:$HOME/projects/niveum";
|
environment.interactiveShellInit = "export PATH=$PATH";
|
||||||
environment.shellAliases = let
|
environment.shellAliases =
|
||||||
wcd = pkgs.writers.writeDash "wcd" ''
|
let
|
||||||
cd "$(readlink "$(${pkgs.which}/bin/which --skip-alias "$1")" | xargs dirname)/.."
|
swallow = command: "${pkgs.swallow}/bin/swallow ${command}";
|
||||||
'';
|
in
|
||||||
where = pkgs.writers.writeDash "where" ''
|
{
|
||||||
readlink "$(${pkgs.which}/bin/which --skip-alias "$1")" | xargs dirname
|
sxiv = swallow "${pkgs.nsxiv}/bin/nsxiv";
|
||||||
'';
|
zathura = swallow "${pkgs.zathura}/bin/zathura";
|
||||||
take = pkgs.writers.writeDash "take" ''
|
im = "${pkgs.openssh}/bin/ssh weechat@makanek -t screen -x weechat";
|
||||||
mkdir "$1" && cd "$1"
|
yt = "${pkgs.yt-dlp}/bin/yt-dlp --add-metadata -ic"; # Download video link
|
||||||
'';
|
yta = "${pkgs.yt-dlp}/bin/yt-dlp --add-metadata --audio-format mp3 --audio-quality 0 -xic"; # Download with audio
|
||||||
cdt = pkgs.writers.writeDash "cdt" ''
|
};
|
||||||
cd "$(mktemp -d)"
|
|
||||||
pwd
|
|
||||||
'';
|
|
||||||
swallow = command: "${niveumPackages.swallow}/bin/swallow ${command}";
|
|
||||||
in {
|
|
||||||
"ß" = "${pkgs.util-linux}/bin/setsid";
|
|
||||||
cat = "${pkgs.bat}/bin/bat --theme=ansi --style=plain";
|
|
||||||
chromium-incognito = "chromium --user-data-dir=$(mktemp -d /tmp/chr.XXXXXX) --no-first-run --incognito";
|
|
||||||
cp = "cp --interactive";
|
|
||||||
ip = "${pkgs.iproute2}/bin/ip -c";
|
|
||||||
l = "ls --color=auto --time-style=long-iso --almost-all";
|
|
||||||
ls = "ls --color=auto --time-style=long-iso";
|
|
||||||
ll = "ls --color=auto --time-style=long-iso -l";
|
|
||||||
la = "ls --color=auto --time-style=long-iso --almost-all -l";
|
|
||||||
mv = "mv --interactive";
|
|
||||||
nixi = "nix repl '<nixpkgs>'";
|
|
||||||
ns = "nix-shell --run zsh";
|
|
||||||
o = "${pkgs.xdg-utils}/bin/xdg-open";
|
|
||||||
pbcopy = "${pkgs.xclip}/bin/xclip -selection clipboard -in";
|
|
||||||
pbpaste = "${pkgs.xclip}/bin/xclip -selection clipboard -out";
|
|
||||||
rm = "rm --interactive";
|
|
||||||
s = "${pkgs.systemd}/bin/systemctl";
|
|
||||||
take = "source ${take}";
|
|
||||||
cdt = "source ${cdt}";
|
|
||||||
vit = "$EDITOR $(mktemp)";
|
|
||||||
tmux = "${pkgs.tmux}/bin/tmux -2";
|
|
||||||
sxiv = swallow "${pkgs.nsxiv}/bin/nsxiv";
|
|
||||||
zathura = swallow "${pkgs.zathura}/bin/zathura";
|
|
||||||
us = "${pkgs.systemd}/bin/systemctl --user";
|
|
||||||
wcd = "source ${wcd}";
|
|
||||||
im = "${pkgs.openssh}/bin/ssh weechat@makanek -t tmux attach-session -t IM";
|
|
||||||
where = "source ${where}";
|
|
||||||
yt = "${pkgs.yt-dlp}/bin/yt-dlp --add-metadata -ic"; # Download video link
|
|
||||||
yta = "${pkgs.yt-dlp}/bin/yt-dlp --add-metadata -xic"; # Download with audio
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
i18n = {
|
i18n = {
|
||||||
defaultLocale = "en_DK.UTF-8";
|
defaultLocale = "en_DK.UTF-8";
|
||||||
supportedLocales = ["all"];
|
supportedLocales = [ "all" ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
services.xserver = {
|
services.power-profiles-daemon.enable = true;
|
||||||
enable = true;
|
|
||||||
displayManager = {
|
|
||||||
autoLogin = {
|
|
||||||
enable = true;
|
|
||||||
user = config.users.users.me.name;
|
|
||||||
};
|
|
||||||
lightdm = {
|
|
||||||
enable = true;
|
|
||||||
greeters.gtk = {
|
|
||||||
enable = true;
|
|
||||||
indicators = ["~spacer" "~host" "~spacer" "~session" "~power"];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
security.wrappers = {
|
programs.gnupg = {
|
||||||
pmount = {
|
agent = {
|
||||||
setuid = true;
|
|
||||||
owner = "root";
|
|
||||||
group = "root";
|
|
||||||
source = "${pkgs.pmount}/bin/pmount";
|
|
||||||
};
|
|
||||||
pumount = {
|
|
||||||
setuid = true;
|
|
||||||
owner = "root";
|
|
||||||
group = "root";
|
|
||||||
source = "${pkgs.pmount}/bin/pumount";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
{programs.command-not-found.enable = true;}
|
|
||||||
{
|
|
||||||
home-manager.users.me = {
|
|
||||||
services.gpg-agent = rec {
|
|
||||||
enable = true;
|
enable = true;
|
||||||
enableZshIntegration = true;
|
pinentryPackage = pkgs.pinentry-qt;
|
||||||
defaultCacheTtl = 2 * 60 * 60;
|
settings =
|
||||||
maxCacheTtl = 4 * defaultCacheTtl;
|
let
|
||||||
|
defaultCacheTtl = 2 * 60 * 60;
|
||||||
|
in
|
||||||
|
{
|
||||||
|
default-cache-ttl = defaultCacheTtl;
|
||||||
|
max-cache-ttl = 4 * defaultCacheTtl;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.systemPackages = [
|
environment.systemPackages = [
|
||||||
pkgs.gnupg
|
pkgs.gnupg
|
||||||
(pkgs.pass.withExtensions (e: [e.pass-otp e.pass-import e.pass-genphrase]))
|
(pkgs.pass.withExtensions (e: [
|
||||||
|
e.pass-otp
|
||||||
|
e.pass-import
|
||||||
|
e.pass-genphrase
|
||||||
|
]))
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
@@ -202,37 +132,27 @@ in {
|
|||||||
}
|
}
|
||||||
{
|
{
|
||||||
services.getty = {
|
services.getty = {
|
||||||
greetingLine = lib.mkForce "";
|
greetingLine = lib.mkForce "As-salamu alaykum wa rahmatullahi wa barakatuh!";
|
||||||
helpLine = lib.mkForce "";
|
helpLine = lib.mkForce "";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
networking.hosts =
|
networking.hosts = lib.mapAttrs' (name: address: {
|
||||||
lib.mapAttrs' (name: address: {
|
name = address;
|
||||||
name = address;
|
value = [ "${name}.local" ];
|
||||||
value = ["${name}.local"];
|
}) pkgs.lib.niveum.localAddresses;
|
||||||
})
|
|
||||||
localAddresses;
|
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
home-manager.users.me.home.stateVersion = "22.05";
|
home-manager.users.me.home.stateVersion = "22.05";
|
||||||
|
home-manager.backupFileExtension = "bak";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
systemd.user.services.udiskie = {
|
|
||||||
after = ["udisks2.service"];
|
|
||||||
wants = ["udisks2.service"];
|
|
||||||
wantedBy = ["graphical-session.target"];
|
|
||||||
serviceConfig = {
|
|
||||||
ExecStart = "${pkgs.udiskie}/bin/udiskie --verbose --no-config --notify";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
services.udisks2.enable = true;
|
|
||||||
programs.dconf.enable = true;
|
programs.dconf.enable = true;
|
||||||
home-manager.users.me = {
|
home-manager.users.me = {
|
||||||
dconf.enable = true;
|
dconf.enable = true;
|
||||||
dconf.settings = {
|
dconf.settings = {
|
||||||
# Change the default terminal for Nemo
|
# Change the default terminal for Nemo
|
||||||
"org/cinnamon/desktop/applications/terminal".exec = defaultApplications.terminal;
|
"org/cinnamon/desktop/applications/terminal".exec = lib.getExe pkgs.niphas-terminal;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -240,57 +160,66 @@ in {
|
|||||||
./stylix.nix
|
./stylix.nix
|
||||||
./alacritty.nix
|
./alacritty.nix
|
||||||
./backup.nix
|
./backup.nix
|
||||||
./bash.nix
|
|
||||||
./bluetooth.nix
|
./bluetooth.nix
|
||||||
./aerc.nix
|
./aerc.nix
|
||||||
./ccc.nix
|
|
||||||
./khal.nix
|
./khal.nix
|
||||||
./chromium.nix
|
./browser.nix
|
||||||
./clipboard.nix
|
./clipboard.nix
|
||||||
./cloud.nix
|
./cloud.nix
|
||||||
./direnv.nix
|
|
||||||
./docker.nix
|
|
||||||
./dunst.nix
|
|
||||||
./flix.nix
|
|
||||||
./fonts.nix
|
./fonts.nix
|
||||||
./fzf.nix
|
|
||||||
./git.nix
|
|
||||||
./hledger.nix
|
./hledger.nix
|
||||||
./htop.nix
|
./htop.nix
|
||||||
./hu-berlin.nix
|
./lix.nix
|
||||||
./fu-berlin.nix
|
./uni.nix
|
||||||
./fysi.nix
|
# ./i3.nix
|
||||||
./i3.nix
|
./graphical
|
||||||
./i3status-rust.nix
|
./keyboard
|
||||||
./keyboard.nix
|
./kdeconnect.nix
|
||||||
|
{ services.upower.enable = true; }
|
||||||
./lb.nix
|
./lb.nix
|
||||||
./mpv.nix
|
./mpv.nix
|
||||||
./mime.nix
|
./mime.nix
|
||||||
./neovim.nix
|
./editor.nix
|
||||||
./nix.nix
|
|
||||||
./newsboat.nix
|
|
||||||
./flameshot.nix
|
./flameshot.nix
|
||||||
./packages.nix
|
./packages.nix
|
||||||
./picom.nix
|
./virtualization.nix
|
||||||
./stardict.nix
|
./stardict.nix
|
||||||
./polkit.nix
|
./polkit.nix
|
||||||
./power-action.nix
|
|
||||||
./printing.nix
|
./printing.nix
|
||||||
./redshift.nix
|
./redshift.nix
|
||||||
./retiolum.nix
|
|
||||||
./rofi.nix
|
./rofi.nix
|
||||||
./spacetime.nix
|
|
||||||
./ssh.nix
|
./ssh.nix
|
||||||
./sshd.nix
|
|
||||||
./sound.nix
|
./sound.nix
|
||||||
./sudo.nix
|
./sudo.nix
|
||||||
./tmux.nix
|
|
||||||
./unclutter.nix
|
./unclutter.nix
|
||||||
./vscode.nix
|
./vscode.nix
|
||||||
./watson.nix
|
./wallpaper.nix
|
||||||
./zsh.nix
|
{
|
||||||
./tor.nix
|
home-manager.users.me.home.file.".zshrc".text = ''
|
||||||
./stw-berlin.nix
|
# nothing to see here
|
||||||
./mastodon-bot.nix
|
'';
|
||||||
|
}
|
||||||
|
{
|
||||||
|
programs.zsh.interactiveShellInit = ''
|
||||||
|
hash -d nixos=/etc/nixos niveum=${config.users.users.me.home}/sync/src/niveum
|
||||||
|
'';
|
||||||
|
|
||||||
|
home-manager.users.me = {
|
||||||
|
xdg.userDirs =
|
||||||
|
let
|
||||||
|
pictures = "${config.users.users.me.home}/cloud/nextcloud/Bilder";
|
||||||
|
in
|
||||||
|
{
|
||||||
|
enable = true;
|
||||||
|
documents = "${config.users.users.me.home}/cloud/nextcloud/Documents";
|
||||||
|
desktop = "/tmp";
|
||||||
|
download = "${config.users.users.me.home}/sync/Downloads";
|
||||||
|
music = "${config.users.users.me.home}/mobile/audio";
|
||||||
|
publicShare = "${config.users.users.me.home}/cloud/nextcloud/tmp";
|
||||||
|
videos = pictures;
|
||||||
|
pictures = pictures;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,37 +0,0 @@
|
|||||||
{pkgs, ...}: let
|
|
||||||
nixify = pkgs.writers.writeDashBin "nixify" ''
|
|
||||||
set -efuC
|
|
||||||
|
|
||||||
if [ ! -e ./.envrc ]; then
|
|
||||||
echo use_nix > .envrc
|
|
||||||
direnv allow
|
|
||||||
fi
|
|
||||||
if [ ! -e shell.nix ]; then
|
|
||||||
cat > shell.nix <<'EOF'
|
|
||||||
{ pkgs ? import <nixpkgs> {} }:
|
|
||||||
pkgs.mkShell {
|
|
||||||
packages = [];
|
|
||||||
}
|
|
||||||
EOF
|
|
||||||
''${EDITOR:-vim} shell.nix
|
|
||||||
fi
|
|
||||||
'';
|
|
||||||
in {
|
|
||||||
environment.systemPackages = [pkgs.direnv nixify];
|
|
||||||
|
|
||||||
home-manager.users.me.programs.direnv = {
|
|
||||||
enable = true;
|
|
||||||
stdlib = builtins.readFile "${
|
|
||||||
pkgs.fetchFromGitHub {
|
|
||||||
owner = "Mic92";
|
|
||||||
repo = "dotfiles";
|
|
||||||
rev = "a0a9b7e358fa70a85cd468f8ca1fbb02ae0a91df";
|
|
||||||
sha256 = "1y9h5s1lf59sczsm0ksq2x1yhl98ba9lwk5yil3q53rg7n4574pg";
|
|
||||||
}
|
|
||||||
}/home/.direnvrc";
|
|
||||||
};
|
|
||||||
|
|
||||||
programs.zsh.interactiveShellInit = ''
|
|
||||||
eval "$(${pkgs.direnv}/bin/direnv hook zsh)"
|
|
||||||
'';
|
|
||||||
}
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
{
|
|
||||||
lib,
|
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
imports = [
|
|
||||||
(import <stockholm/makefu/3modules/bump-distrowatch.nix> {
|
|
||||||
inherit lib config;
|
|
||||||
pkgs = pkgs // {writeDash = pkgs.writers.writeDash;};
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
makefu.distrobump.enable = false;
|
|
||||||
}
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
{
|
|
||||||
lib,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
virtualisation.docker = {
|
|
||||||
enable = true;
|
|
||||||
# for ICE wifi, ref https://gist.github.com/sunsided/7840e89ff4e11b64a2d7503fafa0290c
|
|
||||||
extraOptions = lib.concatStringsSep " " [
|
|
||||||
"--bip=172.39.1.5/24"
|
|
||||||
"--fixed-cidr=172.39.1.0/25"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
users.users.me.extraGroups = ["docker"];
|
|
||||||
environment.systemPackages = [pkgs.docker pkgs.docker-compose];
|
|
||||||
}
|
|
||||||
@@ -1,54 +0,0 @@
|
|||||||
{
|
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
inherit (import ../lib) defaultApplications theme;
|
|
||||||
in {
|
|
||||||
home-manager.users.me.services.dunst = {
|
|
||||||
enable = true;
|
|
||||||
iconTheme = (theme pkgs).icon;
|
|
||||||
settings = {
|
|
||||||
global = {
|
|
||||||
transparency = 10;
|
|
||||||
geometry = "200x5-30+20";
|
|
||||||
follow = "mouse";
|
|
||||||
indicate_hidden = true;
|
|
||||||
notification_height = 0;
|
|
||||||
separator_height = 2;
|
|
||||||
padding = 8;
|
|
||||||
horizontal_padding = 8;
|
|
||||||
sort = true;
|
|
||||||
markup = "full";
|
|
||||||
format = "%a\\n<b>%s</b>\\n%b";
|
|
||||||
alignment = "left";
|
|
||||||
show_age_threshold = 60;
|
|
||||||
bounce_freq = 0;
|
|
||||||
word_wrap = true;
|
|
||||||
ellipsize = "middle";
|
|
||||||
ignore_newline = false;
|
|
||||||
stack_duplicates = true;
|
|
||||||
hide_duplicate_count = false;
|
|
||||||
max_icon_size = 32;
|
|
||||||
sticky_history = true;
|
|
||||||
history_length = 20;
|
|
||||||
dmenu = "${pkgs.rofi}/bin/rofi -display-run dunst -show run";
|
|
||||||
browser = (defaultApplications pkgs).browser;
|
|
||||||
verbosity = "mesg";
|
|
||||||
corner_radius = 0;
|
|
||||||
mouse_left_click = "do_action";
|
|
||||||
mouse_right_click = "close_current";
|
|
||||||
mouse_middle_click = "close_all";
|
|
||||||
};
|
|
||||||
urgency_low = {
|
|
||||||
timeout = 5;
|
|
||||||
};
|
|
||||||
urgency_normal = {
|
|
||||||
timeout = 10;
|
|
||||||
};
|
|
||||||
urgency_critical = {
|
|
||||||
timeout = 0;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,13 +1,10 @@
|
|||||||
{
|
{
|
||||||
pkgs,
|
pkgs,
|
||||||
niveumPackages,
|
lib,
|
||||||
|
config,
|
||||||
...
|
...
|
||||||
}: {
|
}:
|
||||||
environment.variables.EDITOR = pkgs.lib.mkForce "nvim";
|
{
|
||||||
environment.shellAliases.vi = "nvim";
|
|
||||||
environment.shellAliases.vim = "nvim";
|
|
||||||
environment.shellAliases.view = "nvim -R";
|
|
||||||
|
|
||||||
home-manager.users.me = {
|
home-manager.users.me = {
|
||||||
editorconfig = {
|
editorconfig = {
|
||||||
enable = true;
|
enable = true;
|
||||||
@@ -34,7 +31,21 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
environment.systemPackages = [
|
environment.systemPackages = [
|
||||||
(pkgs.writers.writeDashBin "vim" ''neovim "$@"'')
|
pkgs.vim-typewriter
|
||||||
niveumPackages.vim
|
pkgs.dawn-editor
|
||||||
|
|
||||||
|
# language servers
|
||||||
|
pkgs.pyright
|
||||||
|
pkgs.haskellPackages.haskell-language-server
|
||||||
|
pkgs.texlab
|
||||||
|
pkgs.gopls
|
||||||
|
pkgs.nixfmt-rfc-style
|
||||||
|
pkgs.rust-analyzer
|
||||||
|
pkgs.nodePackages.typescript-language-server
|
||||||
|
pkgs.lua-language-server
|
||||||
|
pkgs.nodePackages.vscode-langservers-extracted
|
||||||
|
pkgs.lemminx # XML LSP
|
||||||
|
pkgs.jq-lsp
|
||||||
|
pkgs.dhall-lsp-server
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
@@ -2,7 +2,8 @@
|
|||||||
lib,
|
lib,
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}: {
|
}:
|
||||||
|
{
|
||||||
home-manager.users.me = {
|
home-manager.users.me = {
|
||||||
services.flameshot = {
|
services.flameshot = {
|
||||||
enable = true;
|
enable = true;
|
||||||
@@ -10,13 +11,12 @@
|
|||||||
autoCloseIdleDaemon = true;
|
autoCloseIdleDaemon = true;
|
||||||
drawColor = "#ff0000";
|
drawColor = "#ff0000";
|
||||||
drawThickness = 2;
|
drawThickness = 2;
|
||||||
checkForUpdates = false;
|
|
||||||
showDesktopNotification = true;
|
showDesktopNotification = true;
|
||||||
disabledTrayIcon = true;
|
disabledTrayIcon = true;
|
||||||
showHelp = false;
|
showHelp = false;
|
||||||
squareMagnifier = true;
|
squareMagnifier = true;
|
||||||
uploadWithoutConfirmation = true;
|
uploadWithoutConfirmation = true;
|
||||||
buttons = ''@Variant(\0\0\0\x7f\0\0\0\vQList<int>\0\0\0\0\x10\0\0\0\x2\0\0\0\x5\0\0\0\x13\0\0\0\xa\0\0\0\x1\0\0\0\xc\0\0\0\xd\0\0\0\x6\0\0\0\x8\0\0\0\0\0\0\0\xf\0\0\0\x4\0\0\0\xb\0\0\0\x3\0\0\0\x12\0\0\0\x9)'';
|
# buttons = ''@Variant(\0\0\0\x7f\0\0\0\vQList<int>\0\0\0\0\x10\0\0\0\x2\0\0\0\x5\0\0\0\x13\0\0\0\xa\0\0\0\x1\0\0\0\xc\0\0\0\xd\0\0\0\x6\0\0\0\x8\0\0\0\0\0\0\0\xf\0\0\0\x4\0\0\0\xb\0\0\0\x3\0\0\0\x12\0\0\0\x9)'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,98 +0,0 @@
|
|||||||
{
|
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
flixLocation = "/media/flix";
|
|
||||||
flixLocationNew = "/media/flix-new";
|
|
||||||
cacheLocation = "/var/cache/flix";
|
|
||||||
indexFilename = "index";
|
|
||||||
indexFilenameNew = "index-new";
|
|
||||||
flixUser = "flix";
|
|
||||||
flixGroup = "users";
|
|
||||||
inherit (import ../lib) tmpfilesConfig;
|
|
||||||
in {
|
|
||||||
fileSystems.${flixLocation} = {
|
|
||||||
device = "prism.r:/export/download";
|
|
||||||
fsType = "nfs";
|
|
||||||
options = [
|
|
||||||
"noauto"
|
|
||||||
"noatime"
|
|
||||||
"nodiratime"
|
|
||||||
"x-systemd.automount"
|
|
||||||
"x-systemd.device-timeout=1"
|
|
||||||
"x-systemd.idle-timeout=1min"
|
|
||||||
"x-systemd.requires=tinc.retiolum.service"
|
|
||||||
"user"
|
|
||||||
"_netdev"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
fileSystems.${flixLocationNew} = {
|
|
||||||
device = "//yellow.r/public";
|
|
||||||
fsType = "cifs";
|
|
||||||
options = [
|
|
||||||
"guest"
|
|
||||||
"nofail"
|
|
||||||
"noauto"
|
|
||||||
"ro"
|
|
||||||
"x-systemd.automount"
|
|
||||||
"x-systemd.device-timeout=1"
|
|
||||||
"x-systemd.idle-timeout=1min"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
systemd.tmpfiles.rules = [
|
|
||||||
(tmpfilesConfig {
|
|
||||||
type = "d";
|
|
||||||
path = cacheLocation;
|
|
||||||
mode = "0750";
|
|
||||||
user = flixUser;
|
|
||||||
group = flixGroup;
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
systemd.services.flix-index = {
|
|
||||||
description = "Flix indexing service";
|
|
||||||
wants = ["network-online.target"];
|
|
||||||
script = ''
|
|
||||||
cp ${flixLocation}/index ./${indexFilename}
|
|
||||||
cp ${flixLocationNew}/index ./${indexFilenameNew}
|
|
||||||
'';
|
|
||||||
startAt = "hourly";
|
|
||||||
serviceConfig = {
|
|
||||||
Type = "oneshot";
|
|
||||||
User = flixUser;
|
|
||||||
Group = flixGroup;
|
|
||||||
WorkingDirectory = cacheLocation;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
users.extraUsers.${flixUser} = {
|
|
||||||
isSystemUser = true;
|
|
||||||
createHome = true;
|
|
||||||
home = cacheLocation;
|
|
||||||
group = flixGroup;
|
|
||||||
};
|
|
||||||
|
|
||||||
environment.systemPackages = [
|
|
||||||
(pkgs.writers.writeDashBin "mpv-simpsons" ''
|
|
||||||
set -efu
|
|
||||||
cd "${flixLocation}/download"
|
|
||||||
[ -f "${cacheLocation}/${indexFilename}" ] || exit 1
|
|
||||||
|
|
||||||
cat "${cacheLocation}/${indexFilename}" \
|
|
||||||
| ${pkgs.gnugrep}/bin/grep -i 'simpsons.*mkv' \
|
|
||||||
| shuf \
|
|
||||||
| ${pkgs.findutils}/bin/xargs -d '\n' ${pkgs.mpv}/bin/mpv
|
|
||||||
'')
|
|
||||||
(pkgs.writers.writeDashBin "flixmenu" ''
|
|
||||||
set -efu
|
|
||||||
(
|
|
||||||
${pkgs.gnused}/bin/sed 's#^\.#${flixLocation}#' ${cacheLocation}/${indexFilename}
|
|
||||||
${pkgs.gnused}/bin/sed 's#^\.#${flixLocationNew}#' ${cacheLocation}/${indexFilenameNew}
|
|
||||||
) | ${pkgs.dmenu}/bin/dmenu -i -p flix -l 5 "$@" \
|
|
||||||
| ${pkgs.findutils}/bin/xargs -I '{}' ${pkgs.util-linux}/bin/setsid ${pkgs.xdg-utils}/bin/xdg-open '{}'
|
|
||||||
'')
|
|
||||||
];
|
|
||||||
}
|
|
||||||
@@ -1,28 +1,32 @@
|
|||||||
{
|
{
|
||||||
pkgs,
|
pkgs,
|
||||||
niveumPackages,
|
|
||||||
...
|
...
|
||||||
}: let
|
}:
|
||||||
zip-font = name: arguments: let
|
let
|
||||||
directory = pkgs.fetchzip arguments;
|
zip-font =
|
||||||
in
|
name: arguments:
|
||||||
pkgs.runCommand name {} ''
|
let
|
||||||
|
directory = pkgs.fetchzip arguments;
|
||||||
|
in
|
||||||
|
pkgs.runCommand name { } ''
|
||||||
mkdir -p $out/share/fonts/{truetype,opentype,woff}
|
mkdir -p $out/share/fonts/{truetype,opentype,woff}
|
||||||
${pkgs.findutils}/bin/find ${directory} -name '*.ttf' -exec install '{}' $out/share/fonts/truetype \;
|
${pkgs.findutils}/bin/find ${directory} -name '*.ttf' -exec install '{}' $out/share/fonts/truetype \;
|
||||||
${pkgs.findutils}/bin/find ${directory} -name '*.otf' -exec install '{}' $out/share/fonts/opentype \;
|
${pkgs.findutils}/bin/find ${directory} -name '*.otf' -exec install '{}' $out/share/fonts/opentype \;
|
||||||
${pkgs.findutils}/bin/find ${directory} -name '*.woff' -exec install '{}' $out/share/fonts/woff \;
|
${pkgs.findutils}/bin/find ${directory} -name '*.woff' -exec install '{}' $out/share/fonts/woff \;
|
||||||
'';
|
'';
|
||||||
simple-ttf = name: arguments: let
|
simple-ttf =
|
||||||
file = pkgs.fetchurl arguments;
|
name: arguments:
|
||||||
in
|
let
|
||||||
pkgs.runCommand name {} ''
|
file = pkgs.fetchurl arguments;
|
||||||
|
in
|
||||||
|
pkgs.runCommand name { } ''
|
||||||
mkdir -p $out/share/fonts/truetype
|
mkdir -p $out/share/fonts/truetype
|
||||||
install ${file} $out/share/fonts/truetype
|
install ${file} $out/share/fonts/truetype
|
||||||
'';
|
'';
|
||||||
|
|
||||||
egyptianHiero = zip-font "EgyptianHiero" {
|
egyptianHiero = zip-font "EgyptianHiero" {
|
||||||
url = "https://github.com/MKilani/Djehuty/archive/master.zip";
|
url = "https://github.com/MKilani/Djehuty/archive/master.zip";
|
||||||
sha256 = "sha256-KbY4vedm757NWfDlgmNhslbZd+2Vs+o5PjtMMGDt61Y=";
|
sha256 = "sha256-S3vZxdeBj57KJsF+zaZw7sQw8T+z1aVC2CnpnZ0/x2c=";
|
||||||
};
|
};
|
||||||
antinoou = zip-font "Antinoou" {
|
antinoou = zip-font "Antinoou" {
|
||||||
url = "https://www.evertype.com/fonts/coptic/AntinoouFont.zip";
|
url = "https://www.evertype.com/fonts/coptic/AntinoouFont.zip";
|
||||||
@@ -31,13 +35,9 @@
|
|||||||
};
|
};
|
||||||
newGardiner = zip-font "NewGardiner" {
|
newGardiner = zip-font "NewGardiner" {
|
||||||
url = "https://mjn.host.cs.st-andrews.ac.uk/egyptian/fonts/NewGardiner.zip";
|
url = "https://mjn.host.cs.st-andrews.ac.uk/egyptian/fonts/NewGardiner.zip";
|
||||||
hash = "sha256-i7ZBN28no/884fYMA7ZJ47WpkwZXzY//TK0bDz21pE0=";
|
hash = "sha256-nP0y4ILt+0mlkDRdCNSeO2Gequ8wyix/qQdmujTNw3Y=";
|
||||||
stripRoot = false;
|
stripRoot = false;
|
||||||
};
|
};
|
||||||
junicode2 = zip-font "JunicodeTwo" {
|
|
||||||
url = "https://github.com/psb1558/Junicode-font/archive/48bf476db278c844c67542b04d1e0e4c71f139d2.zip";
|
|
||||||
sha256 = "1ryicc155vkvgv3315ddliigwa01afwyb4c4f6pnqcns03af001i";
|
|
||||||
};
|
|
||||||
newAthenaUnicode = zip-font "NewAthenaUnicode" {
|
newAthenaUnicode = zip-font "NewAthenaUnicode" {
|
||||||
url = "https://classicalstudies.org/sites/default/files/userfiles/files/NAU5_005.zip";
|
url = "https://classicalstudies.org/sites/default/files/userfiles/files/NAU5_005.zip";
|
||||||
sha256 = "1g7qk9gl4nq2dz41bvck1nzilhin44j8691cxax3dlp77bbn9bxr";
|
sha256 = "1g7qk9gl4nq2dz41bvck1nzilhin44j8691cxax3dlp77bbn9bxr";
|
||||||
@@ -46,15 +46,28 @@
|
|||||||
url = "http://files.qenherkhopeshef.org/jsesh/JSeshFont.ttf";
|
url = "http://files.qenherkhopeshef.org/jsesh/JSeshFont.ttf";
|
||||||
sha256 = "1203jrk2xzvgckcc5hx88kja1i3h8gm1wiyla5j6gspc0hbv56ry";
|
sha256 = "1203jrk2xzvgckcc5hx88kja1i3h8gm1wiyla5j6gspc0hbv56ry";
|
||||||
};
|
};
|
||||||
egyptianText = simple-ttf "EgyptianText-1.0beta" {
|
egyptianTextBeta = simple-ttf "EgyptianText-1.0beta" {
|
||||||
url = "http://c.krebsco.de/EgyptianText-v1.0-beta.ttf";
|
url = "http://c.krebsco.de/EgyptianText-v1.0-beta.ttf";
|
||||||
sha256 = "0cfjbk7xxnxhlp6v922psm5j1xzrv6wfk226ji2wz2yfrnkbcbsv";
|
sha256 = "0cfjbk7xxnxhlp6v922psm5j1xzrv6wfk226ji2wz2yfrnkbcbsv";
|
||||||
};
|
};
|
||||||
in {
|
coranica = simple-ttf "Coranica" {
|
||||||
|
url = "https://corpuscoranicum.de/fonts/coranica_1164.ttf";
|
||||||
|
sha256 = "0igi8q8b2p38x9jq8c98afsl7bf8rj32zj2052yyjgj9r88y4yi5";
|
||||||
|
};
|
||||||
|
koineGreek = simple-ttf "KoineGreek.ttf" {
|
||||||
|
url = "https://github.com/Center-for-New-Testament-Restoration/font/raw/af83eed50105344edaa5e5eddaf87696e271468c/KoineGreek.ttf";
|
||||||
|
hash = "sha256-YtC+nj7+Jl8k00rqAAqySYc8iTAOL7PixXc+LfSmnS0=";
|
||||||
|
};
|
||||||
|
egyptianText = simple-ttf "EgyptianText" {
|
||||||
|
url = "https://github.com/microsoft/font-tools/raw/1092cb23520967830001a0807eb21d6a44dda522/EgyptianOpenType/font/eot.ttf";
|
||||||
|
sha256 = "1n294vhcx90270pnsw1dbk6izd61fjvbnjrh4hcf98ff3s540x0c";
|
||||||
|
};
|
||||||
|
in
|
||||||
|
{
|
||||||
fonts = {
|
fonts = {
|
||||||
enableDefaultFonts = true;
|
enableDefaultPackages = true;
|
||||||
fontDir.enable = true;
|
fontDir.enable = true;
|
||||||
fonts = with pkgs; [
|
packages = with pkgs; [
|
||||||
alegreya
|
alegreya
|
||||||
alegreya-sans
|
alegreya-sans
|
||||||
amiri
|
amiri
|
||||||
@@ -65,6 +78,7 @@ in {
|
|||||||
charis-sil
|
charis-sil
|
||||||
doulos-sil
|
doulos-sil
|
||||||
newAthenaUnicode
|
newAthenaUnicode
|
||||||
|
coranica
|
||||||
corefonts
|
corefonts
|
||||||
crimson
|
crimson
|
||||||
eb-garamond
|
eb-garamond
|
||||||
@@ -72,16 +86,18 @@ in {
|
|||||||
jsesh
|
jsesh
|
||||||
egyptianHiero
|
egyptianHiero
|
||||||
egyptianText
|
egyptianText
|
||||||
|
egyptianTextBeta
|
||||||
font-awesome_6
|
font-awesome_6
|
||||||
etBook
|
etBook
|
||||||
newGardiner
|
newGardiner
|
||||||
junicode2
|
junicode
|
||||||
|
koineGreek
|
||||||
|
# brill
|
||||||
ezra-sil
|
ezra-sil
|
||||||
fira
|
fira
|
||||||
font-awesome
|
font-awesome
|
||||||
galatia-sil
|
galatia-sil
|
||||||
gentium
|
gentium
|
||||||
niveumPackages.gfs-fonts
|
|
||||||
gyre-fonts
|
gyre-fonts
|
||||||
ibm-plex
|
ibm-plex
|
||||||
jetbrains-mono
|
jetbrains-mono
|
||||||
@@ -90,28 +106,45 @@ in {
|
|||||||
lmodern
|
lmodern
|
||||||
merriweather
|
merriweather
|
||||||
ocr-a
|
ocr-a
|
||||||
|
montserrat
|
||||||
roboto
|
roboto
|
||||||
roboto-mono
|
roboto-mono
|
||||||
noto-fonts
|
noto-fonts
|
||||||
noto-fonts-cjk
|
noto-fonts-cjk-sans
|
||||||
noto-fonts-emoji
|
noto-fonts-color-emoji
|
||||||
roboto-slab
|
roboto-slab
|
||||||
scheherazade-new
|
scheherazade-new
|
||||||
source-code-pro
|
source-code-pro
|
||||||
source-sans-pro
|
source-sans-pro
|
||||||
source-serif-pro
|
source-serif-pro
|
||||||
theano
|
theano
|
||||||
niveumPackages.tocharian-font
|
tocharian-font
|
||||||
vistafonts
|
vista-fonts
|
||||||
vollkorn
|
vollkorn
|
||||||
zilla-slab
|
zilla-slab
|
||||||
]; # google-fonts league-of-moveable-type
|
]; # google-fonts league-of-moveable-type
|
||||||
fontconfig.defaultFonts = rec {
|
fontconfig.defaultFonts =
|
||||||
monospace = ["Noto Sans Mono"] ++ emoji;
|
let
|
||||||
serif = ["Noto Serif" "Noto Naskh Arabic" "Noto Serif Devanagari"];
|
emoji = [ "Noto Color Emoji" ];
|
||||||
sansSerif = ["Noto Sans Display" "Noto Naskh Arabic" "Noto Sans Devanagari" "Noto Sans CJK JP" "Noto Sans Coptic"];
|
in
|
||||||
emoji = ["Noto Color Emoji"];
|
{
|
||||||
};
|
monospace = [ "Noto Sans Mono" ] ++ emoji;
|
||||||
|
serif = [
|
||||||
|
"Noto Serif"
|
||||||
|
"Noto Naskh Arabic"
|
||||||
|
"Noto Serif Devanagari"
|
||||||
|
];
|
||||||
|
sansSerif = [
|
||||||
|
"Noto Sans Display"
|
||||||
|
"Noto Naskh Arabic"
|
||||||
|
"Noto Sans Hebrew"
|
||||||
|
"Noto Sans Devanagari"
|
||||||
|
"Noto Sans CJK JP"
|
||||||
|
"Noto Sans Coptic"
|
||||||
|
"Noto Sans Syriac Western"
|
||||||
|
];
|
||||||
|
inherit emoji;
|
||||||
|
};
|
||||||
# xelatex fails with woff files
|
# xelatex fails with woff files
|
||||||
# ref https://tex.stackexchange.com/questions/392144/xelatex-and-fontspec-crash-trying-to-find-woff-file-for-some-fonts-but-not-other
|
# ref https://tex.stackexchange.com/questions/392144/xelatex-and-fontspec-crash-trying-to-find-woff-file-for-some-fonts-but-not-other
|
||||||
fontconfig.localConf = ''
|
fontconfig.localConf = ''
|
||||||
|
|||||||
@@ -1,80 +0,0 @@
|
|||||||
{
|
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
username = "meinhak99";
|
|
||||||
inherit (import ../lib/email.nix) defaults;
|
|
||||||
fu-defaults = rec {
|
|
||||||
imap.host = "mail.zedat.fu-berlin.de";
|
|
||||||
smtp.host = imap.host;
|
|
||||||
folders.drafts = "Entwürfe";
|
|
||||||
folders.sent = "Gesendet";
|
|
||||||
folders.trash = "Papierkorb";
|
|
||||||
};
|
|
||||||
in {
|
|
||||||
home-manager.users.me = {
|
|
||||||
programs.ssh = {
|
|
||||||
matchBlocks = {
|
|
||||||
fu-berlin = {
|
|
||||||
user = username;
|
|
||||||
hostname = "login.zedat.fu-berlin.de";
|
|
||||||
setEnv.TERM = "xterm";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
accounts.email.accounts = {
|
|
||||||
fu-student =
|
|
||||||
lib.recursiveUpdate defaults
|
|
||||||
(lib.recursiveUpdate fu-defaults
|
|
||||||
rec {
|
|
||||||
userName = "meinhak99";
|
|
||||||
address = "kieran.meinhardt@fu-berlin.de";
|
|
||||||
aliases = ["${userName}@fu-berlin.de"];
|
|
||||||
passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-meinhak99.path}";
|
|
||||||
});
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
systemd.user.services.fu-blackboard-calendar = {
|
|
||||||
enable = true;
|
|
||||||
# startAt = "*:00/10";
|
|
||||||
after = ["vdirsyncer.service"];
|
|
||||||
wantedBy = ["default.target"];
|
|
||||||
script = ''
|
|
||||||
${pkgs.curl}/bin/curl $(cat ${config.age.secrets.blackboard-calendar-ics.path}) | ${pkgs.khal}/bin/khal import -
|
|
||||||
'';
|
|
||||||
serviceConfig = {
|
|
||||||
Type = "oneshot";
|
|
||||||
Restart = "on-failure";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
age.secrets = {
|
|
||||||
email-password-meinhak99 = {
|
|
||||||
file = ../secrets/email-password-meinhak99.age;
|
|
||||||
owner = config.users.users.me.name;
|
|
||||||
group = config.users.users.me.group;
|
|
||||||
mode = "400";
|
|
||||||
};
|
|
||||||
blackboard-calendar-ics = {
|
|
||||||
file = ../secrets/blackboard-calendar-ics.age;
|
|
||||||
owner = config.users.users.me.name;
|
|
||||||
group = config.users.users.me.group;
|
|
||||||
mode = "400";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
systemd.services.fu-vpn = {
|
|
||||||
enable = true;
|
|
||||||
wants = ["network-online.target"];
|
|
||||||
serviceConfig.LoadCredential = "password:${config.age.secrets.email-password-meinhak99.path}";
|
|
||||||
script = ''
|
|
||||||
if ${pkgs.wirelesstools}/bin/iwgetid | ${pkgs.gnugrep}/bin/grep --invert-match eduroam
|
|
||||||
then
|
|
||||||
cat "$CREDENTIALS_DIRECTORY/password" | ${pkgs.openconnect}/bin/openconnect vpn.fu-berlin.de --user ${username} --passwd-on-stdin
|
|
||||||
fi
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,55 +0,0 @@
|
|||||||
{
|
|
||||||
config,
|
|
||||||
lib,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
inherit (import ../lib/email.nix) defaults;
|
|
||||||
sshIdentity = name: "${config.users.users.me.home}/.ssh/${name}";
|
|
||||||
in {
|
|
||||||
age.secrets = {
|
|
||||||
email-password-fysi = {
|
|
||||||
file = ../secrets/email-password-fysi.age;
|
|
||||||
owner = config.users.users.me.name;
|
|
||||||
group = config.users.users.me.group;
|
|
||||||
mode = "400";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
home-manager.users.me = {
|
|
||||||
accounts.email.accounts = {
|
|
||||||
fysi =
|
|
||||||
lib.recursiveUpdate defaults
|
|
||||||
rec {
|
|
||||||
address = "kieran@fysi.tech";
|
|
||||||
userName = address;
|
|
||||||
passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-fysi.path}";
|
|
||||||
flavor = "fastmail.com";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
programs.ssh.matchBlocks = rec {
|
|
||||||
"nextcloud.fysi.dev" = {
|
|
||||||
hostname = "116.203.82.203";
|
|
||||||
user = "root";
|
|
||||||
};
|
|
||||||
"lingua.miaengiadina.ch" = {
|
|
||||||
hostname = "135.181.85.233";
|
|
||||||
user = "root";
|
|
||||||
};
|
|
||||||
"cms-dev.woc2023.app".identityFile = sshIdentity "fysiweb";
|
|
||||||
"cms-master.woc2023.app".identityFile = sshIdentity "fysiweb";
|
|
||||||
"fysi-dev1" = {
|
|
||||||
hostname = "94.130.229.139";
|
|
||||||
user = "root";
|
|
||||||
identityFile = sshIdentity "fysiweb";
|
|
||||||
};
|
|
||||||
${fysi-dev1.hostname} = fysi-dev1;
|
|
||||||
"fysi-shared0" = {
|
|
||||||
hostname = "49.12.205.235";
|
|
||||||
user = "root";
|
|
||||||
identityFile = sshIdentity "fysiweb";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
{pkgs, ...}: {
|
|
||||||
programs.fzf = {
|
|
||||||
fuzzyCompletion = true;
|
|
||||||
keybindings = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
home-manager.users.me = {
|
|
||||||
programs.fzf = rec {
|
|
||||||
enable = true;
|
|
||||||
defaultCommand = "${pkgs.fd}/bin/fd --type f --strip-cwd-prefix --follow --no-ignore-vcs --exclude .git";
|
|
||||||
defaultOptions = ["--height=40%"];
|
|
||||||
changeDirWidgetCommand = "${pkgs.fd}/bin/fd --type d";
|
|
||||||
changeDirWidgetOptions = [
|
|
||||||
"--preview='${pkgs.tree}/bin/tree -L 1 {}'"
|
|
||||||
"--bind=space:toggle-preview"
|
|
||||||
"--preview-window=hidden"
|
|
||||||
];
|
|
||||||
fileWidgetCommand = defaultCommand;
|
|
||||||
fileWidgetOptions = ["--preview='head -$LINES {}'"];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
23
configs/gaming.nix
Normal file
23
configs/gaming.nix
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
{ pkgs, ... }:
|
||||||
|
{
|
||||||
|
environment.systemPackages = [
|
||||||
|
pkgs.zeroad
|
||||||
|
pkgs.mari0
|
||||||
|
pkgs.luanti # fka minetest
|
||||||
|
# pkgs.openarena
|
||||||
|
# pkgs.teeworlds
|
||||||
|
pkgs.nethack
|
||||||
|
# pkgs.freeciv
|
||||||
|
# pkgs.lincity-ng
|
||||||
|
# pkgs.superTuxKart
|
||||||
|
|
||||||
|
pkgs.morris
|
||||||
|
pkgs.gnome-chess
|
||||||
|
pkgs.gnuchess
|
||||||
|
];
|
||||||
|
networking.firewall = {
|
||||||
|
# for 0ad multiplayer
|
||||||
|
allowedTCPPorts = [ 20595 ];
|
||||||
|
allowedUDPPorts = [ 20595 ];
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -1,65 +0,0 @@
|
|||||||
{
|
|
||||||
pkgs,
|
|
||||||
config,
|
|
||||||
lib,
|
|
||||||
inputs,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
inherit (import ../lib) kieran ignorePaths;
|
|
||||||
in {
|
|
||||||
environment.systemPackages = [
|
|
||||||
pkgs.mr
|
|
||||||
pkgs.git
|
|
||||||
pkgs.git-crypt
|
|
||||||
pkgs.gitAndTools.gitflow
|
|
||||||
pkgs.gitAndTools.gh
|
|
||||||
pkgs.gitAndTools.git-extras
|
|
||||||
pkgs.gitAndTools.git-trim
|
|
||||||
pkgs.gitAndTools.git-absorb
|
|
||||||
pkgs.gitstats
|
|
||||||
pkgs.patch
|
|
||||||
pkgs.patchutils
|
|
||||||
inputs.self.packages.x86_64-linux.git-preview
|
|
||||||
];
|
|
||||||
|
|
||||||
environment.shellAliases = {
|
|
||||||
gf = "git-flow";
|
|
||||||
g = "git";
|
|
||||||
};
|
|
||||||
|
|
||||||
home-manager.users.me = {
|
|
||||||
programs.git = {
|
|
||||||
enable = true;
|
|
||||||
package = pkgs.gitAndTools.gitFull;
|
|
||||||
userName = kieran.name;
|
|
||||||
userEmail = kieran.email;
|
|
||||||
aliases = {
|
|
||||||
br = "branch";
|
|
||||||
co = "checkout";
|
|
||||||
ci = "commit";
|
|
||||||
cm = "commit -m";
|
|
||||||
amend = "commit --amend";
|
|
||||||
st = "status -s";
|
|
||||||
unstage = "reset HEAD --";
|
|
||||||
diffs = "diff --staged";
|
|
||||||
last = "log -1 HEAD";
|
|
||||||
logs = "log --pretty=oneline";
|
|
||||||
graph = "log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all";
|
|
||||||
};
|
|
||||||
ignores = ignorePaths;
|
|
||||||
extraConfig = {
|
|
||||||
pull.ff = "only";
|
|
||||||
rebase.autoStash = true;
|
|
||||||
merge.autoStash = true;
|
|
||||||
push.autoSetupRemote = true;
|
|
||||||
|
|
||||||
# # ref https://github.com/dandavison/delta
|
|
||||||
# core.pager = "${pkgs.delta}/bin/delta";
|
|
||||||
# interactive.diffFilter = "${pkgs.delta}/bin/delta --color-only";
|
|
||||||
# delta.navigate = true;
|
|
||||||
# merge.conflictStyle = "diff3";
|
|
||||||
# diff.colorMoved = "default";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
5
configs/gnome.nix
Normal file
5
configs/gnome.nix
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
{
|
||||||
|
services.xserver.enable = true;
|
||||||
|
services.xserver.displayManager.lightdm.enable = true;
|
||||||
|
services.xserver.desktopManager.gnome.enable = true;
|
||||||
|
}
|
||||||
44
configs/graphical/default.nix
Normal file
44
configs/graphical/default.nix
Normal file
@@ -0,0 +1,44 @@
|
|||||||
|
{
|
||||||
|
pkgs,
|
||||||
|
lib,
|
||||||
|
config,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
{
|
||||||
|
programs.hyprland = {
|
||||||
|
enable = true;
|
||||||
|
withUWSM = true;
|
||||||
|
xwayland.enable = true;
|
||||||
|
package = pkgs.hyprland;
|
||||||
|
portalPackage = pkgs.xdg-desktop-portal-hyprland;
|
||||||
|
};
|
||||||
|
|
||||||
|
programs.ydotool.enable = true;
|
||||||
|
|
||||||
|
xdg.portal = {
|
||||||
|
enable = true;
|
||||||
|
extraPortals = [
|
||||||
|
pkgs.xdg-desktop-portal-hyprland
|
||||||
|
pkgs.xdg-desktop-portal-gtk
|
||||||
|
];
|
||||||
|
config.common.default = "*";
|
||||||
|
};
|
||||||
|
|
||||||
|
services.dbus = {
|
||||||
|
implementation = "broker";
|
||||||
|
# needed for GNOME services outside of GNOME (?)
|
||||||
|
packages = [ pkgs.gcr ];
|
||||||
|
};
|
||||||
|
|
||||||
|
environment.systemPackages = [
|
||||||
|
pkgs.xdg-desktop-portal
|
||||||
|
pkgs.xdg-desktop-portal-hyprland
|
||||||
|
];
|
||||||
|
|
||||||
|
services.getty.autologinOnce = true;
|
||||||
|
services.getty.autologinUser = config.users.users.me.name;
|
||||||
|
|
||||||
|
home-manager.users.me = import ./home-manager.nix {
|
||||||
|
inherit lib pkgs config;
|
||||||
|
};
|
||||||
|
}
|
||||||
415
configs/graphical/home-manager.nix
Normal file
415
configs/graphical/home-manager.nix
Normal file
@@ -0,0 +1,415 @@
|
|||||||
|
{
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
config,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
let
|
||||||
|
klem = pkgs.klem.override {
|
||||||
|
options.dmenu = "${pkgs.dmenu}/bin/dmenu -i -p klem";
|
||||||
|
options.scripts = {
|
||||||
|
"p.r paste" = pkgs.writers.writeDash "p.r" ''
|
||||||
|
${pkgs.curl}/bin/curl -fSs http://p.r --data-binary @- \
|
||||||
|
| ${pkgs.coreutils}/bin/tail --lines=1 \
|
||||||
|
| ${pkgs.gnused}/bin/sed 's/\\<r\\>/krebsco.de/'
|
||||||
|
'';
|
||||||
|
"envs.sh paste" = pkgs.writers.writeDash "envs-host" ''
|
||||||
|
${pkgs.curl}/bin/curl -F "file=@-" https://envs.sh
|
||||||
|
'';
|
||||||
|
# this segfaults
|
||||||
|
# "envs.sh mirror" = pkgs.writers.writeDash "envs-mirror" ''
|
||||||
|
# ${pkgs.curl}/bin/curl -F "url=$(${pkgs.coreutils}/bin/cat)" https://envs.sh
|
||||||
|
# '';
|
||||||
|
"envs.sh shorten" = pkgs.writers.writeDash "envs-shorten" ''
|
||||||
|
${pkgs.curl}/bin/curl -F "shorten=$(${pkgs.coreutils}/bin/cat)" https://envs.sh
|
||||||
|
'';
|
||||||
|
"go.r shorten" = pkgs.writers.writeDash "go.r" ''
|
||||||
|
${pkgs.curl}/bin/curl -fSs http://go.r -F "uri=$(${pkgs.coreutils}/bin/cat)"
|
||||||
|
'';
|
||||||
|
"4d2.org paste" = pkgs.writers.writeDash "4d2-paste" ''
|
||||||
|
${pkgs.curl}/bin/curl -F "file=@-" https://depot.4d2.org/
|
||||||
|
'';
|
||||||
|
"0x0.st shorten" = pkgs.writers.writeDash "0x0.st" ''
|
||||||
|
${pkgs.curl}/bin/curl -fSs https://0x0.st -F "shorten=$(${pkgs.coreutils}/bin/cat)"
|
||||||
|
'';
|
||||||
|
"rot13" = pkgs.writers.writeDash "rot13" ''
|
||||||
|
${pkgs.coreutils}/bin/tr '[A-Za-z]' '[N-ZA-Mn-za-m]'
|
||||||
|
'';
|
||||||
|
"ipa" = pkgs.writers.writeDash "ipa" ''
|
||||||
|
${pkgs.ipa}/bin/ipa
|
||||||
|
'';
|
||||||
|
"betacode" = pkgs.writers.writeDash "betacode" ''
|
||||||
|
${pkgs.betacode}/bin/betacode
|
||||||
|
'';
|
||||||
|
"curl" = pkgs.writers.writeDash "curl" ''
|
||||||
|
${pkgs.curl}/bin/curl -fSs "$(${pkgs.coreutils}/bin/cat)"
|
||||||
|
'';
|
||||||
|
ocr = pkgs.writers.writeDash "ocr" ''
|
||||||
|
${pkgs.tesseract4}/bin/tesseract -l eng+deu - stdout
|
||||||
|
'';
|
||||||
|
emojai = pkgs.writers.writeDash "emojai" ''
|
||||||
|
${pkgs.curl}/bin/curl https://www.emojai.app/api/generate -X POST -H 'Content-Type: application/json' --data-raw "$(${pkgs.jq}/bin/jq -sR '{emoji:.}')" | ${pkgs.jq}/bin/jq -r .result
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
arabic.workspaces = [
|
||||||
|
"١"
|
||||||
|
"٢"
|
||||||
|
"٣"
|
||||||
|
"٤"
|
||||||
|
"٥"
|
||||||
|
"٦"
|
||||||
|
"٧"
|
||||||
|
"٨"
|
||||||
|
"٩"
|
||||||
|
"١٠"
|
||||||
|
];
|
||||||
|
arabic.music = "الموسيقى";
|
||||||
|
arabic.obsidian = "السبج";
|
||||||
|
hindi.workspaces = [
|
||||||
|
"१"
|
||||||
|
"२"
|
||||||
|
"३"
|
||||||
|
"४"
|
||||||
|
"५"
|
||||||
|
"६"
|
||||||
|
"७"
|
||||||
|
"८"
|
||||||
|
"९"
|
||||||
|
"१०"
|
||||||
|
];
|
||||||
|
hindi.music = "संगीत";
|
||||||
|
hindi.obsidian = "उपलविशेषः";
|
||||||
|
hebrew.workspaces = [
|
||||||
|
"א"
|
||||||
|
"ב"
|
||||||
|
"ג"
|
||||||
|
"ד"
|
||||||
|
"ה"
|
||||||
|
"ו"
|
||||||
|
"ז"
|
||||||
|
"ח"
|
||||||
|
"ט"
|
||||||
|
"י"
|
||||||
|
];
|
||||||
|
hebrew.music = "מוסיקה";
|
||||||
|
hebrew.obsidian = "אובסידיאן";
|
||||||
|
|
||||||
|
latin.workspaces = [
|
||||||
|
"Ⅰ"
|
||||||
|
"Ⅱ"
|
||||||
|
"Ⅲ"
|
||||||
|
"Ⅳ"
|
||||||
|
"Ⅴ"
|
||||||
|
"Ⅵ"
|
||||||
|
"Ⅶ"
|
||||||
|
"Ⅷ"
|
||||||
|
"Ⅸ"
|
||||||
|
"Ⅹ"
|
||||||
|
];
|
||||||
|
latin.music = "MVSICA";
|
||||||
|
latin.obsidian = "NOSCENDA";
|
||||||
|
|
||||||
|
greek.workspaces = [
|
||||||
|
"Α"
|
||||||
|
"Β"
|
||||||
|
"Γ"
|
||||||
|
"Δ"
|
||||||
|
"Ε"
|
||||||
|
"Ϛ"
|
||||||
|
"Ζ"
|
||||||
|
"Η"
|
||||||
|
"Θ"
|
||||||
|
"Ι"
|
||||||
|
];
|
||||||
|
greek.music = "ΜΟΥΣΙΚΗ";
|
||||||
|
greek.obsidian = "ΥΠΟΜΝΗΜΑΤΑ";
|
||||||
|
|
||||||
|
language = greek;
|
||||||
|
in
|
||||||
|
{
|
||||||
|
services.mako = {
|
||||||
|
enable = true;
|
||||||
|
settings.default-timeout = 10 * 1000;
|
||||||
|
};
|
||||||
|
|
||||||
|
programs.ashell = {
|
||||||
|
enable = true;
|
||||||
|
settings = {
|
||||||
|
# position = "bottom";
|
||||||
|
modules = {
|
||||||
|
left = [
|
||||||
|
"Workspaces"
|
||||||
|
[
|
||||||
|
"WindowTitle"
|
||||||
|
]
|
||||||
|
];
|
||||||
|
center = [ "Clock" ];
|
||||||
|
right = [
|
||||||
|
"KeyboardLayout"
|
||||||
|
[
|
||||||
|
"Tray"
|
||||||
|
"SystemInfo"
|
||||||
|
"Settings"
|
||||||
|
]
|
||||||
|
];
|
||||||
|
};
|
||||||
|
workspaces = {
|
||||||
|
enable_workspace_filling = false;
|
||||||
|
disable_special_workspaces = true;
|
||||||
|
visibility_mode = "MonitorSpecific";
|
||||||
|
workspace_names = language.workspaces;
|
||||||
|
};
|
||||||
|
keyboard_layout.labels = {
|
||||||
|
"de" = "🇩🇪";
|
||||||
|
};
|
||||||
|
window_title = {
|
||||||
|
mode = "Title";
|
||||||
|
truncate_title_after_length = 75;
|
||||||
|
};
|
||||||
|
media_player = {
|
||||||
|
max_title_length = 40;
|
||||||
|
};
|
||||||
|
system_info.indicators = [
|
||||||
|
"Cpu"
|
||||||
|
"Memory"
|
||||||
|
{ Disk = "/"; }
|
||||||
|
];
|
||||||
|
clock.format = "%Y-%m-%d (%j %a %W) %H:%M";
|
||||||
|
settings.indicators = [
|
||||||
|
"IdleInhibitor"
|
||||||
|
"PowerProfile"
|
||||||
|
"Audio"
|
||||||
|
"Bluetooth"
|
||||||
|
"Network"
|
||||||
|
"Vpn"
|
||||||
|
"Battery"
|
||||||
|
];
|
||||||
|
appearance = {
|
||||||
|
font_name = config.stylix.fonts.sansSerif.name;
|
||||||
|
backdrop = 0.3;
|
||||||
|
scale_factor = 0.85;
|
||||||
|
# style = "Solid";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
services.hypridle = {
|
||||||
|
enable = true;
|
||||||
|
settings = {
|
||||||
|
general = {
|
||||||
|
after_sleep_cmd = "hyprctl dispatch dpms on";
|
||||||
|
ignore_dbus_inhibit = false;
|
||||||
|
lock_cmd = "hyprlock";
|
||||||
|
};
|
||||||
|
listener = [
|
||||||
|
{
|
||||||
|
timeout = 900;
|
||||||
|
on-timeout = "hyprlock";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
timeout = 1200;
|
||||||
|
on-timeout = "hyprctl dispatch dpms off";
|
||||||
|
on-resume = "hyprctl dispatch dpms on";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
programs.hyprlock = {
|
||||||
|
enable = true;
|
||||||
|
settings = {
|
||||||
|
animations.enabled = false;
|
||||||
|
general = {
|
||||||
|
hide_cursor = true;
|
||||||
|
ignore_empty_input = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
gtk = {
|
||||||
|
enable = true;
|
||||||
|
iconTheme = {
|
||||||
|
name = "Adwaita";
|
||||||
|
package = pkgs.adwaita-icon-theme;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
wayland.windowManager.hyprland =
|
||||||
|
let
|
||||||
|
mod = "SUPER";
|
||||||
|
in
|
||||||
|
{
|
||||||
|
enable = true;
|
||||||
|
systemd.enable = false;
|
||||||
|
systemd.variables = [ "--all" ];
|
||||||
|
settings = {
|
||||||
|
env = [
|
||||||
|
"XCURSOR_SIZE,${toString config.stylix.cursor.size}" # TODO
|
||||||
|
"HYPRCURSOR_SIZE,${toString config.stylix.cursor.size}" # TODO
|
||||||
|
"HYPRCURSOR_THEME,${config.stylix.cursor.name}"
|
||||||
|
"QT_QPA_PLATFORM=wayland"
|
||||||
|
"GDK_BACKEND=wayland"
|
||||||
|
"NIXOS_OZONE_WL=1"
|
||||||
|
];
|
||||||
|
permission = [
|
||||||
|
"${pkgs.xdg-desktop-portal-hyprland}/libexec/.xdg-desktop-portal-hyprland-wrapped, screencopy, allow"
|
||||||
|
];
|
||||||
|
monitor = [
|
||||||
|
"eDP-1, 1920x1080, 0x0, 1" # fatteh's display
|
||||||
|
"desc:Samsung Electric Company C27F390 HTQH602129, 1920x1080, 0x-1080, 1" # home
|
||||||
|
"desc:Dell Inc. DELL P2419HC 8L0FL03, 1920x1080, 0x-1080, 1" # amo
|
||||||
|
", preferred, auto, 1"
|
||||||
|
];
|
||||||
|
exec-once = [
|
||||||
|
(lib.getExe pkgs.ashell)
|
||||||
|
"hyprctl dispatch exec \"[workspace special:${language.obsidian} silent] obsidian\""
|
||||||
|
(lib.getExe pkgs.niphas-clipboard-watcher)
|
||||||
|
(lib.getExe pkgs.niphas-redshift)
|
||||||
|
(lib.getExe pkgs.niphas-set-wallpaper)
|
||||||
|
];
|
||||||
|
|
||||||
|
device = [
|
||||||
|
{
|
||||||
|
name = "elan-touchscreen";
|
||||||
|
enabled = false;
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
|
general = {
|
||||||
|
gaps_in = 2;
|
||||||
|
gaps_out = 2;
|
||||||
|
border_size = 2;
|
||||||
|
resize_on_border = true;
|
||||||
|
allow_tearing = false;
|
||||||
|
layout = "dwindle";
|
||||||
|
};
|
||||||
|
|
||||||
|
decoration = {
|
||||||
|
rounding = 0;
|
||||||
|
rounding_power = 0;
|
||||||
|
active_opacity = 1.0;
|
||||||
|
inactive_opacity = 1.0;
|
||||||
|
shadow = {
|
||||||
|
enabled = false;
|
||||||
|
range = 4;
|
||||||
|
render_power = 3;
|
||||||
|
};
|
||||||
|
blur = {
|
||||||
|
enabled = false;
|
||||||
|
size = 3;
|
||||||
|
passes = 1;
|
||||||
|
vibrancy = 0.17;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
animations = {
|
||||||
|
enabled = true;
|
||||||
|
animation = [
|
||||||
|
"global, 1, 2, default"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
dwindle = {
|
||||||
|
preserve_split = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
master.new_status = "master";
|
||||||
|
|
||||||
|
gesture = [
|
||||||
|
"3, horizontal, workspace"
|
||||||
|
];
|
||||||
|
|
||||||
|
input = {
|
||||||
|
kb_layout = "de";
|
||||||
|
kb_variant = "T3";
|
||||||
|
kb_options = "compose:caps,grp:ctrls_toggle";
|
||||||
|
follow_mouse = 1;
|
||||||
|
sensitivity = 0;
|
||||||
|
touchpad.natural_scroll = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
bindm = [
|
||||||
|
"${mod}, mouse:272, movewindow"
|
||||||
|
"${mod}, mouse:273, resizewindow"
|
||||||
|
];
|
||||||
|
bindel = [
|
||||||
|
",XF86AudioRaiseVolume, exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+"
|
||||||
|
",XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
|
||||||
|
",XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
|
||||||
|
",XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"
|
||||||
|
",XF86MonBrightnessUp, exec, brightnessctl -e4 -n2 set 5%+"
|
||||||
|
",XF86MonBrightnessDown, exec, brightnessctl -e4 -n2 set 5%-"
|
||||||
|
", Print, exec, ${lib.getExe pkgs.niphas-screenshot}"
|
||||||
|
];
|
||||||
|
bindl = [
|
||||||
|
", XF86AudioNext, exec, playerctl next"
|
||||||
|
", XF86AudioPause, exec, playerctl play-pause"
|
||||||
|
", XF86AudioPlay, exec, playerctl play-pause"
|
||||||
|
", XF86AudioPrev, exec, playerctl previous"
|
||||||
|
];
|
||||||
|
bind = [
|
||||||
|
"${mod}, Return, exec, ${lib.getExe pkgs.niphas-terminal}"
|
||||||
|
"${mod} SHIFT, Q, killactive,"
|
||||||
|
"${mod} SHIFT, R, exit,"
|
||||||
|
"${mod}, t, exec, ${lib.getExe pkgs.niphas-file-browser}"
|
||||||
|
"${mod}, Y, exec, ${lib.getExe pkgs.niphas-web-browser}"
|
||||||
|
"${mod}, Q, exec, ${lib.getExe pkgs.niphas-clipman}"
|
||||||
|
"${mod}, u, exec, ${lib.getExe pkgs.unicodmenu}"
|
||||||
|
"${mod}, p, exec, ${lib.getExe pkgs.rofi-pass-wayland}"
|
||||||
|
"${mod} SHIFT, Z, togglefloating,"
|
||||||
|
"${mod}, D, exec, ${lib.getExe pkgs.rofi} -show run"
|
||||||
|
"${mod}, E, togglesplit," # dwindle
|
||||||
|
"${mod}, F, fullscreen"
|
||||||
|
"${mod}, G, moveoutofgroup"
|
||||||
|
"${mod} SHIFT, G, togglegroup"
|
||||||
|
"${mod}, h, movefocus, l"
|
||||||
|
"${mod}, l, movefocus, r"
|
||||||
|
"${mod}, k, movefocus, u"
|
||||||
|
"${mod}, j, movefocus, d"
|
||||||
|
|
||||||
|
"${mod}, F12, exec, ${klem}/bin/klem"
|
||||||
|
"${mod} SHIFT, W, exec, hyprlock"
|
||||||
|
"${mod} SHIFT, H, movewindow, l"
|
||||||
|
"${mod} SHIFT, L, movewindow, r"
|
||||||
|
"${mod} SHIFT, K, movewindow, u"
|
||||||
|
"${mod} SHIFT, J, movewindow, d"
|
||||||
|
"${mod}, S, togglespecialworkspace, ${language.music}"
|
||||||
|
"${mod} SHIFT, S, movetoworkspace, special:${language.music}"
|
||||||
|
"${mod}, O, togglespecialworkspace, ${language.obsidian}"
|
||||||
|
"${mod} SHIFT, O, movetoworkspace, special:${language.obsidian}"
|
||||||
|
]
|
||||||
|
++ lib.concatMap (
|
||||||
|
i:
|
||||||
|
let
|
||||||
|
key = lib.mod i 10;
|
||||||
|
in
|
||||||
|
[
|
||||||
|
"${mod}, ${toString key}, workspace, ${toString i}"
|
||||||
|
"${mod} SHIFT, ${toString key}, movetoworkspace, ${toString i}"
|
||||||
|
]
|
||||||
|
) (lib.range 1 10);
|
||||||
|
|
||||||
|
windowrule = [
|
||||||
|
"suppressevent maximize, class:.*" # ignore maximize requests from apps
|
||||||
|
"nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0" # fix some dragging issues with wayyland
|
||||||
|
|
||||||
|
"float,title:^(Picture-in-Picture)$"
|
||||||
|
"pin,title:^(Picture-in-Picture)$"
|
||||||
|
"size 640 360,title:^(Picture-in-Picture)$"
|
||||||
|
"move 100%-640 100%-360,title:^(Picture-in-Picture)$"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
extraConfig = ''
|
||||||
|
bind = ${mod}, R, submap, resize
|
||||||
|
submap = resize
|
||||||
|
binde = , l, resizeactive, 50 0
|
||||||
|
binde = , h, resizeactive, -50 0
|
||||||
|
binde = , k, resizeactive, 0 -50
|
||||||
|
binde = , j, resizeactive, 0 50
|
||||||
|
bind = , escape, submap, reset
|
||||||
|
submap = reset
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -1,39 +1,28 @@
|
|||||||
{
|
{
|
||||||
config,
|
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}: {
|
}:
|
||||||
environment.systemPackages = let
|
let
|
||||||
ledgerDirectory = "$HOME/projects/ledger";
|
ledgerDirectory = "/home/kfm/sync/src/ledger";
|
||||||
timeLedger = "${ledgerDirectory}/time.timeclock";
|
in
|
||||||
git = "${pkgs.git}/bin/git -C ${ledgerDirectory}";
|
{
|
||||||
in [
|
environment.systemPackages =
|
||||||
pkgs.hledger
|
let
|
||||||
(pkgs.writers.writeDashBin "hora-edit" ''
|
git = "${pkgs.git}/bin/git -C ${ledgerDirectory}";
|
||||||
$EDITOR + "${timeLedger}" && ${pkgs.git}/bin/git -C "$(${pkgs.coreutils}/bin/dirname ${timeLedger})" commit --all --message "$(${pkgs.coreutils}/bin/date -Im)"
|
in
|
||||||
'')
|
[
|
||||||
(pkgs.writers.writeDashBin "hora" ''
|
pkgs.hledger
|
||||||
${pkgs.hledger}/bin/hledger -f "${timeLedger}" "$@"
|
(pkgs.writers.writeDashBin "hledger-git" ''
|
||||||
'')
|
if [ "$1" = entry ]; then
|
||||||
(pkgs.writers.writeDashBin "hora-filli" ''
|
${pkgs.hledger}/bin/hledger balance -V > "${ledgerDirectory}/balance.txt"
|
||||||
${pkgs.hledger}/bin/hledger -f "${timeLedger}" register fillidefilla -O csv \
|
${git} add balance.txt
|
||||||
-b "$(date -d "$(date +%Y-%m)-01 last month" +%Y-%m-%d)" \
|
${git} commit --all --message="$(date -Im)"
|
||||||
-e "$(date -d "$(date +%Y-%m)-01" +%Y-%m-%d)" \
|
else
|
||||||
| sed 's/(fillidefilla:\(.*\))/\1/g' \
|
${git} $*
|
||||||
| xsv select date,amount,total,account,description
|
fi
|
||||||
'')
|
'')
|
||||||
|
(pkgs.writers.writeDashBin "hledger-edit" ''
|
||||||
(pkgs.writers.writeDashBin "hledger-git" ''
|
$EDITOR ${ledgerDirectory}/current.journal
|
||||||
if [ "$1" = entry ]; then
|
'')
|
||||||
${pkgs.hledger}/bin/hledger balance -V > "${ledgerDirectory}/balance.txt"
|
];
|
||||||
${git} add balance.txt
|
|
||||||
${git} commit --all --message="$(date -Im)"
|
|
||||||
else
|
|
||||||
${git} $*
|
|
||||||
fi
|
|
||||||
'')
|
|
||||||
(pkgs.writers.writeDashBin "hledger-edit" ''
|
|
||||||
$EDITOR ${ledgerDirectory}/current.journal
|
|
||||||
'')
|
|
||||||
];
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,8 +22,18 @@
|
|||||||
sort_key = "PERCENT_CPU";
|
sort_key = "PERCENT_CPU";
|
||||||
tree_view = false;
|
tree_view = false;
|
||||||
update_process_names = false;
|
update_process_names = false;
|
||||||
right_meters = ["Uptime" "Tasks" "LoadAverage" "Battery"];
|
right_meters = [
|
||||||
left_meters = ["LeftCPUs2" "RightCPUs2" "Memory" "Swap"];
|
"Uptime"
|
||||||
|
"Tasks"
|
||||||
|
"LoadAverage"
|
||||||
|
"Battery"
|
||||||
|
];
|
||||||
|
left_meters = [
|
||||||
|
"LeftCPUs2"
|
||||||
|
"RightCPUs2"
|
||||||
|
"Memory"
|
||||||
|
"Swap"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,200 +0,0 @@
|
|||||||
{
|
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
inherit (import ../lib/email.nix) defaults;
|
|
||||||
hu-defaults = {
|
|
||||||
imap.host = "mailbox.cms.hu-berlin.de";
|
|
||||||
imap.port = 993;
|
|
||||||
smtp.host = "mailhost.cms.hu-berlin.de";
|
|
||||||
smtp.port = 25;
|
|
||||||
smtp.tls.useStartTls = true;
|
|
||||||
};
|
|
||||||
hu-berlin-cifs-options = [
|
|
||||||
"uid=${toString config.users.users.me.uid}"
|
|
||||||
"gid=${toString config.users.groups.users.gid}"
|
|
||||||
"sec=ntlmv2"
|
|
||||||
"workgroup=german"
|
|
||||||
"credentials=${config.age.secrets.cifs-credentials-hu-berlin.path}"
|
|
||||||
"noauto"
|
|
||||||
"x-systemd.automount"
|
|
||||||
"x-systemd.device-timeout=1"
|
|
||||||
"x-systemd.idle-timeout=1min"
|
|
||||||
];
|
|
||||||
in {
|
|
||||||
fileSystems."/media/hu-berlin/germpro2" = {
|
|
||||||
device = "//hugerm31c.user.hu-berlin.de/germpro2/ling";
|
|
||||||
fsType = "cifs";
|
|
||||||
options = hu-berlin-cifs-options;
|
|
||||||
};
|
|
||||||
|
|
||||||
fileSystems."/media/hu-berlin/germhome" = {
|
|
||||||
device = "//hugerm31c.user.hu-berlin.de/germhome/ling/meinhaki";
|
|
||||||
fsType = "cifs";
|
|
||||||
options = hu-berlin-cifs-options;
|
|
||||||
};
|
|
||||||
|
|
||||||
age.secrets = {
|
|
||||||
cifs-credentials-hu-berlin.file = ../secrets/cifs-credentials-hu-berlin.age;
|
|
||||||
email-password-meinhark = {
|
|
||||||
file = ../secrets/email-password-meinhark.age;
|
|
||||||
owner = config.users.users.me.name;
|
|
||||||
group = config.users.users.me.group;
|
|
||||||
mode = "400";
|
|
||||||
};
|
|
||||||
email-password-meinhaki = {
|
|
||||||
file = ../secrets/email-password-meinhaki.age;
|
|
||||||
owner = config.users.users.me.name;
|
|
||||||
group = config.users.users.me.group;
|
|
||||||
mode = "400";
|
|
||||||
};
|
|
||||||
email-password-dslalewa = {
|
|
||||||
file = ../secrets/email-password-dslalewa.age;
|
|
||||||
owner = config.users.users.me.name;
|
|
||||||
group = config.users.users.me.group;
|
|
||||||
mode = "400";
|
|
||||||
};
|
|
||||||
email-password-fsklassp = {
|
|
||||||
file = ../secrets/email-password-fsklassp.age;
|
|
||||||
owner = config.users.users.me.name;
|
|
||||||
group = config.users.users.me.group;
|
|
||||||
mode = "400";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
home-manager.users.me = {
|
|
||||||
programs.ssh = {
|
|
||||||
matchBlocks = {
|
|
||||||
"gruenau6.informatik.hu-berlin.de" = {
|
|
||||||
hostname = "gruenau6.informatik.hu-berlin.de";
|
|
||||||
user = "meinhark";
|
|
||||||
setEnv.TERM = "xterm";
|
|
||||||
};
|
|
||||||
"alew.hu-berlin.de" = {
|
|
||||||
user = "centos";
|
|
||||||
hostname = "141.20.187.219";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
accounts.email.accounts = rec {
|
|
||||||
hu-student =
|
|
||||||
lib.recursiveUpdate defaults
|
|
||||||
(lib.recursiveUpdate hu-defaults
|
|
||||||
rec {
|
|
||||||
userName = "meinhark";
|
|
||||||
address = "kieran.felix.meinhardt@hu-berlin.de";
|
|
||||||
aliases = ["${userName}@hu-berlin.de"];
|
|
||||||
passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-meinhark.path}";
|
|
||||||
});
|
|
||||||
hu-student-cs =
|
|
||||||
lib.recursiveUpdate defaults
|
|
||||||
(lib.recursiveUpdate hu-defaults
|
|
||||||
rec {
|
|
||||||
userName = "meinhark";
|
|
||||||
address = "kieran.felix.meinhardt@informatik.hu-berlin.de";
|
|
||||||
aliases = ["${userName}@informatik.hu-berlin.de"];
|
|
||||||
imap.host = "mailbox.informatik.hu-berlin.de";
|
|
||||||
smtp.host = "mailhost.informatik.hu-berlin.de";
|
|
||||||
passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-meinhark.path}";
|
|
||||||
});
|
|
||||||
hu-employee =
|
|
||||||
lib.recursiveUpdate defaults
|
|
||||||
(lib.recursiveUpdate hu-defaults
|
|
||||||
rec {
|
|
||||||
userName = "meinhaki";
|
|
||||||
address = "kieran.meinhardt@hu-berlin.de";
|
|
||||||
aliases = ["${userName}@hu-berlin.de"];
|
|
||||||
passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-meinhaki.path}";
|
|
||||||
aerc.extraAccounts.signature-file = toString (pkgs.writeText "signature" signature.text);
|
|
||||||
signature = {
|
|
||||||
showSignature = "append";
|
|
||||||
text = ''
|
|
||||||
${defaults.realName}
|
|
||||||
Studentische Hilfskraft / Administrator ALEW
|
|
||||||
Humboldt-Universität zu Berlin
|
|
||||||
|
|
||||||
Telefon: +49 (0)30 2093 9634
|
|
||||||
Raum 3.212, Dorotheenstraße 24, 10117 Berlin-Mitte
|
|
||||||
https://alew.hu-berlin.de
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
});
|
|
||||||
hu-admin =
|
|
||||||
lib.recursiveUpdate defaults
|
|
||||||
(lib.recursiveUpdate hu-defaults
|
|
||||||
rec {
|
|
||||||
userName = "dslalewa";
|
|
||||||
address = "admin.alew.vglsprwi@hu-berlin.de";
|
|
||||||
aliases = ["${userName}@hu-berlin.de"];
|
|
||||||
passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-dslalewa.path}";
|
|
||||||
inherit (hu-employee) signature;
|
|
||||||
aerc.extraAccounts.signature-file = toString (pkgs.writeText "signature" signature.text);
|
|
||||||
});
|
|
||||||
hu-fsi =
|
|
||||||
lib.recursiveUpdate defaults
|
|
||||||
(lib.recursiveUpdate hu-defaults
|
|
||||||
rec {
|
|
||||||
userName = "fsklassp";
|
|
||||||
passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-fsklassp.path}";
|
|
||||||
address = "${userName}@hu-berlin.de";
|
|
||||||
realName = "FSI Klassische Philologie";
|
|
||||||
aerc.extraAccounts.signature-file = toString (pkgs.writeText "signature" signature.text);
|
|
||||||
signature = {
|
|
||||||
showSignature = "append";
|
|
||||||
text = ''
|
|
||||||
Fachschafts-Initiative
|
|
||||||
|
|
||||||
Humboldt-Universität zu Berlin
|
|
||||||
Sprach- und literaturwissenschaftliche Fakultät
|
|
||||||
Institut für klassische Philologie
|
|
||||||
Unter den Linden 6
|
|
||||||
10099 Berlin
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
});
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
environment.systemPackages = [
|
|
||||||
(pkgs.writers.writeDashBin "hu-ip" ''
|
|
||||||
${pkgs.w3m}/bin/w3m -dump meineip.hu-berlin.de | head --lines=-4 | tail --lines=+3
|
|
||||||
'')
|
|
||||||
(
|
|
||||||
pkgs.writers.writePython3Bin "hu-eduroam-install"
|
|
||||||
{
|
|
||||||
libraries = with pkgs.python3Packages; [distro pyopenssl dbus-python];
|
|
||||||
flakeIgnore = ["E501" "E123" "W504" "E722" "F821" "E226" "E126" "E265" "W291"];
|
|
||||||
}
|
|
||||||
(builtins.readFile (builtins.fetchurl {
|
|
||||||
url = "https://www.cms.hu-berlin.de/de/dl/netze/wlan/config/eduroam/linux-installer/eduroam-linux-hub.py";
|
|
||||||
sha256 = "19x2kvwxx13265b2hj5fjf53g0liw6dw7xf9j9cav67cswmz60kf";
|
|
||||||
}))
|
|
||||||
)
|
|
||||||
];
|
|
||||||
|
|
||||||
# ref https://github.com/NixOS/nixpkgs/issues/231038#issuecomment-1591888919
|
|
||||||
environment.etc."ppp/options".text = "ipcp-accept-remote";
|
|
||||||
|
|
||||||
systemd.services.hu-vpn = {
|
|
||||||
enable = true;
|
|
||||||
wants = ["network-online.target"];
|
|
||||||
serviceConfig.LoadCredential = "password:${config.age.secrets.email-password-meinhark.path}";
|
|
||||||
script = ''
|
|
||||||
if ${pkgs.wirelesstools}/bin/iwgetid | ${pkgs.gnugrep}/bin/grep --invert-match eduroam
|
|
||||||
then
|
|
||||||
${pkgs.openfortivpn}/bin/openfortivpn \
|
|
||||||
--password="$(cat "$CREDENTIALS_DIRECTORY/password")" \
|
|
||||||
--config=${
|
|
||||||
pkgs.writeText "hu-berlin.config" ''
|
|
||||||
host = forti-ssl.vpn.hu-berlin.de
|
|
||||||
port = 443
|
|
||||||
username = meinhark
|
|
||||||
''
|
|
||||||
}
|
|
||||||
fi
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
}
|
|
||||||
399
configs/i3.nix
399
configs/i3.nix
@@ -2,44 +2,44 @@
|
|||||||
config,
|
config,
|
||||||
pkgs,
|
pkgs,
|
||||||
lib,
|
lib,
|
||||||
niveumPackages,
|
|
||||||
...
|
...
|
||||||
}: let
|
}:
|
||||||
inherit (import ../lib) defaultApplications;
|
let
|
||||||
klem = niveumPackages.klem.override {
|
klem = pkgs.klem.override {
|
||||||
config.dmenu = "${pkgs.dmenu}/bin/dmenu -i -p klem";
|
options.dmenu = "${pkgs.dmenu}/bin/dmenu -i -p klem";
|
||||||
config.scripts = {
|
options.scripts = {
|
||||||
"p.r" = pkgs.writers.writeDash "p.r" ''
|
"p.r paste" = pkgs.writers.writeDash "p.r" ''
|
||||||
${pkgs.curl}/bin/curl -fSs http://p.r --data-binary @- \
|
${pkgs.curl}/bin/curl -fSs http://p.r --data-binary @- \
|
||||||
| ${pkgs.coreutils}/bin/tail --lines=1 \
|
| ${pkgs.coreutils}/bin/tail --lines=1 \
|
||||||
| ${pkgs.gnused}/bin/sed 's/\\<r\\>/krebsco.de/'
|
| ${pkgs.gnused}/bin/sed 's/\\<r\\>/krebsco.de/'
|
||||||
'';
|
'';
|
||||||
# "envs.sh host" = pkgs.writers.writeDash "envs-host" ''
|
"envs.sh paste" = pkgs.writers.writeDash "envs-host" ''
|
||||||
# ${pkgs.curl}/bin/curl -F "file=$(${pkgs.coreutils}/bin/cat)" https://envs.sh
|
${pkgs.curl}/bin/curl -F "file=@-" https://envs.sh
|
||||||
# '';
|
|
||||||
"envs.sh mirror" = pkgs.writers.writeDash "envs-mirror" ''
|
|
||||||
${pkgs.curl}/bin/curl -F "url=$(${pkgs.coreutils}/bin/cat)" https://envs.sh
|
|
||||||
'';
|
'';
|
||||||
|
# this segfaults
|
||||||
|
# "envs.sh mirror" = pkgs.writers.writeDash "envs-mirror" ''
|
||||||
|
# ${pkgs.curl}/bin/curl -F "url=$(${pkgs.coreutils}/bin/cat)" https://envs.sh
|
||||||
|
# '';
|
||||||
"envs.sh shorten" = pkgs.writers.writeDash "envs-shorten" ''
|
"envs.sh shorten" = pkgs.writers.writeDash "envs-shorten" ''
|
||||||
${pkgs.curl}/bin/curl -F "shorten=$(${pkgs.coreutils}/bin/cat)" https://envs.sh
|
${pkgs.curl}/bin/curl -F "shorten=$(${pkgs.coreutils}/bin/cat)" https://envs.sh
|
||||||
'';
|
'';
|
||||||
"ix.io" = pkgs.writers.writeDash "ix.io" ''
|
"go.r shorten" = pkgs.writers.writeDash "go.r" ''
|
||||||
${pkgs.curl}/bin/curl -fSs -F 'f:1=<-' ix.io
|
|
||||||
'';
|
|
||||||
"go.r" = pkgs.writers.writeDash "go.r" ''
|
|
||||||
${pkgs.curl}/bin/curl -fSs http://go.r -F "uri=$(${pkgs.coreutils}/bin/cat)"
|
${pkgs.curl}/bin/curl -fSs http://go.r -F "uri=$(${pkgs.coreutils}/bin/cat)"
|
||||||
'';
|
'';
|
||||||
"0x0.st" = pkgs.writers.writeDash "0x0.st" ''
|
"4d2.org paste" = pkgs.writers.writeDash "4d2-paste" ''
|
||||||
|
${pkgs.curl}/bin/curl -F "file=@-" https://depot.4d2.org/
|
||||||
|
'';
|
||||||
|
"0x0.st shorten" = pkgs.writers.writeDash "0x0.st" ''
|
||||||
${pkgs.curl}/bin/curl -fSs https://0x0.st -F "shorten=$(${pkgs.coreutils}/bin/cat)"
|
${pkgs.curl}/bin/curl -fSs https://0x0.st -F "shorten=$(${pkgs.coreutils}/bin/cat)"
|
||||||
'';
|
'';
|
||||||
"rot13" = pkgs.writers.writeDash "rot13" ''
|
"rot13" = pkgs.writers.writeDash "rot13" ''
|
||||||
${pkgs.coreutils}/bin/tr '[A-Za-z]' '[N-ZA-Mn-za-m]'
|
${pkgs.coreutils}/bin/tr '[A-Za-z]' '[N-ZA-Mn-za-m]'
|
||||||
'';
|
'';
|
||||||
"ipa" = pkgs.writers.writeDash "ipa" ''
|
"ipa" = pkgs.writers.writeDash "ipa" ''
|
||||||
${niveumPackages.ipa}/bin/ipa
|
${pkgs.ipa}/bin/ipa
|
||||||
'';
|
'';
|
||||||
"betacode" = pkgs.writers.writeDash "betacode" ''
|
"betacode" = pkgs.writers.writeDash "betacode" ''
|
||||||
${niveumPackages.betacode}/bin/betacode
|
${pkgs.betacode}/bin/betacode
|
||||||
'';
|
'';
|
||||||
"curl" = pkgs.writers.writeDash "curl" ''
|
"curl" = pkgs.writers.writeDash "curl" ''
|
||||||
${pkgs.curl}/bin/curl -fSs "$(${pkgs.coreutils}/bin/cat)"
|
${pkgs.curl}/bin/curl -fSs "$(${pkgs.coreutils}/bin/cat)"
|
||||||
@@ -50,19 +50,10 @@
|
|||||||
emojai = pkgs.writers.writeDash "emojai" ''
|
emojai = pkgs.writers.writeDash "emojai" ''
|
||||||
${pkgs.curl}/bin/curl https://www.emojai.app/api/generate -X POST -H 'Content-Type: application/json' --data-raw "$(${pkgs.jq}/bin/jq -sR '{emoji:.}')" | ${pkgs.jq}/bin/jq -r .result
|
${pkgs.curl}/bin/curl https://www.emojai.app/api/generate -X POST -H 'Content-Type: application/json' --data-raw "$(${pkgs.jq}/bin/jq -sR '{emoji:.}')" | ${pkgs.jq}/bin/jq -r .result
|
||||||
'';
|
'';
|
||||||
gpt = pkgs.writers.writeDash "gpt" ''
|
|
||||||
${niveumPackages.gpt}/bin/gpt
|
|
||||||
'';
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
in
|
||||||
new-workspace = pkgs.writers.writeDash "new-workspace" ''
|
{
|
||||||
i3-msg workspace $(($(i3-msg -t get_workspaces | tr , '\n' | grep '"num":' | cut -d : -f 2 | sort -rn | head -1) + 1))
|
|
||||||
'';
|
|
||||||
move-to-new-workspace = pkgs.writers.writeDash "new-workspace" ''
|
|
||||||
i3-msg move container to workspace $(($(i3-msg -t get_workspaces | tr , '\n' | grep '"num":' | cut -d : -f 2 | sort -rn | head -1) + 1))
|
|
||||||
'';
|
|
||||||
in {
|
|
||||||
age.secrets = {
|
age.secrets = {
|
||||||
github-token-i3status-rust = {
|
github-token-i3status-rust = {
|
||||||
file = ../secrets/github-token-i3status-rust.age;
|
file = ../secrets/github-token-i3status-rust.age;
|
||||||
@@ -76,15 +67,28 @@ in {
|
|||||||
group = config.users.users.me.group;
|
group = config.users.users.me.group;
|
||||||
mode = "400";
|
mode = "400";
|
||||||
};
|
};
|
||||||
|
miniflux-api-token = {
|
||||||
|
file = ../secrets/miniflux-api-token.age;
|
||||||
|
owner = config.users.users.me.name;
|
||||||
|
group = config.users.users.me.group;
|
||||||
|
mode = "400";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.slock.enable = true;
|
environment.systemPackages = [
|
||||||
|
pkgs.xsecurelock
|
||||||
|
];
|
||||||
|
environment.sessionVariables = {
|
||||||
|
XSECURELOCK_NO_COMPOSITE = "1";
|
||||||
|
XSECURELOCK_BACKGROUND_COLOR = "navy";
|
||||||
|
XSECURELOCK_PASSWORD_PROMPT = "time_hex";
|
||||||
|
};
|
||||||
|
|
||||||
|
services.displayManager.defaultSession = "none+i3";
|
||||||
services.xserver = {
|
services.xserver = {
|
||||||
displayManager.defaultSession = "none+i3";
|
|
||||||
windowManager.i3 = {
|
windowManager.i3 = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.i3-gaps;
|
package = pkgs.i3;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -103,34 +107,76 @@ in {
|
|||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
home-manager.users.me.xsession.windowManager.i3 = let
|
home-manager.users.me =
|
||||||
modifier = "Mod4";
|
let
|
||||||
in {
|
modifier = "Mod4";
|
||||||
enable = true;
|
infoWorkspace = "ℹ";
|
||||||
extraConfig = ''
|
messageWorkspace = "✉";
|
||||||
bindsym --release ${modifier}+Shift+w exec /run/wrappers/bin/slock
|
modes.resize = {
|
||||||
'';
|
"Escape" = ''mode "default"'';
|
||||||
config = rec {
|
"Return" = ''mode "default"'';
|
||||||
inherit modifier;
|
"h" = "resize shrink width 10 px or 5 ppt";
|
||||||
|
"j" = "resize grow height 10 px or 5 ppt";
|
||||||
|
"k" = "resize shrink height 10 px or 5 ppt";
|
||||||
|
"l" = "resize grow width 10 px or 5 ppt";
|
||||||
|
};
|
||||||
|
gaps.inner = 4;
|
||||||
|
floating = {
|
||||||
|
titlebar = false;
|
||||||
|
border = 1;
|
||||||
|
};
|
||||||
|
bars =
|
||||||
|
let
|
||||||
|
position = "bottom";
|
||||||
|
in
|
||||||
|
[
|
||||||
|
(lib.recursiveUpdate config.home-manager.users.me.stylix.targets.i3.exportedBarConfig {
|
||||||
|
workspaceButtons = true;
|
||||||
|
mode = "hide"; # "dock";
|
||||||
|
inherit position;
|
||||||
|
statusCommand = toString (
|
||||||
|
pkgs.writers.writeDash "i3status-rust" ''
|
||||||
|
export I3RS_GITHUB_TOKEN="$(cat ${config.age.secrets.github-token-i3status-rust.path})"
|
||||||
|
export OPENWEATHERMAP_API_KEY="$(cat ${config.age.secrets.openweathermap-api-key.path})"
|
||||||
|
exec ${config.home-manager.users.me.programs.i3status-rust.package}/bin/i3status-rs ${config.home-manager.users.me.home.homeDirectory}/.config/i3status-rust/config-${position}.toml
|
||||||
|
''
|
||||||
|
);
|
||||||
|
fonts = {
|
||||||
|
names = [
|
||||||
|
"${config.stylix.fonts.sansSerif.name}"
|
||||||
|
"FontAwesome 6 Free"
|
||||||
|
];
|
||||||
|
size = config.stylix.fonts.sizes.desktop * 0.8;
|
||||||
|
};
|
||||||
|
})
|
||||||
|
];
|
||||||
window = {
|
window = {
|
||||||
titlebar = false;
|
titlebar = false;
|
||||||
border = 2;
|
border = 2;
|
||||||
hideEdgeBorders = "smart";
|
hideEdgeBorders = "smart";
|
||||||
commands = [
|
commands = [
|
||||||
{
|
{
|
||||||
criteria = {class = "floating";};
|
criteria = {
|
||||||
|
class = "floating";
|
||||||
|
};
|
||||||
command = "floating enable";
|
command = "floating enable";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
criteria = {class = "fzfmenu";};
|
criteria = {
|
||||||
|
class = "fzfmenu";
|
||||||
|
};
|
||||||
command = "floating enable";
|
command = "floating enable";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
criteria = {class = ".*";};
|
criteria = {
|
||||||
|
class = ".*";
|
||||||
|
};
|
||||||
command = "border pixel 2";
|
command = "border pixel 2";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
criteria = {class = "mpv";};
|
criteria = {
|
||||||
|
class = "mpv";
|
||||||
|
};
|
||||||
command = lib.strings.concatStringsSep ", " [
|
command = lib.strings.concatStringsSep ", " [
|
||||||
"floating enable"
|
"floating enable"
|
||||||
"sticky enable"
|
"sticky enable"
|
||||||
@@ -141,131 +187,144 @@ in {
|
|||||||
}
|
}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
gaps.inner = 4;
|
colors =
|
||||||
floating = {
|
let
|
||||||
titlebar = false;
|
background = config.lib.stylix.colors.withHashtag.base00;
|
||||||
border = 1;
|
in
|
||||||
};
|
{
|
||||||
bars = [
|
unfocused = {
|
||||||
(config.home-manager.users.me.lib.stylix.i3.bar
|
border = lib.mkForce background;
|
||||||
// rec {
|
childBorder = lib.mkForce background;
|
||||||
workspaceButtons = false;
|
};
|
||||||
mode = "dock"; # "hide";
|
};
|
||||||
position = "bottom";
|
keybindings =
|
||||||
statusCommand = toString (pkgs.writers.writeDash "i3status-rust" ''
|
lib.listToAttrs (
|
||||||
export I3RS_GITHUB_TOKEN="$(cat ${config.age.secrets.github-token-i3status-rust.path})"
|
map (
|
||||||
export OPENWEATHERMAP_API_KEY="$(cat ${config.age.secrets.openweathermap-api-key.path})"
|
x: lib.nameValuePair "${modifier}+Shift+${toString x}" "move container to workspace ${toString x}"
|
||||||
${config.home-manager.users.me.programs.i3status-rust.package}/bin/i3status-rs ${config.home-manager.users.me.home.homeDirectory}/.config/i3status-rust/config-${position}.toml
|
) (lib.range 1 9)
|
||||||
'');
|
)
|
||||||
fonts = {
|
// lib.listToAttrs (
|
||||||
names = ["${config.stylix.fonts.sansSerif.name}" "FontAwesome 6 Free"];
|
map (x: lib.nameValuePair "${modifier}+${toString x}" "workspace ${toString x}") (lib.range 1 9)
|
||||||
size = config.stylix.fonts.sizes.desktop * 0.8;
|
)
|
||||||
};
|
// {
|
||||||
})
|
"${modifier}+i" = "workspace ${infoWorkspace}";
|
||||||
];
|
"${modifier}+m" = "workspace ${messageWorkspace}";
|
||||||
colors = let
|
|
||||||
background = config.lib.stylix.colors.withHashtag.base00;
|
"${modifier}+Shift+h" = "move left 25 px";
|
||||||
in {
|
"${modifier}+Shift+j" = "move down 25 px";
|
||||||
unfocused = {
|
"${modifier}+Shift+k" = "move up 25 px";
|
||||||
border = lib.mkForce background;
|
"${modifier}+Shift+l" = "move right 25 px";
|
||||||
childBorder = lib.mkForce background;
|
"${modifier}+h" = "focus left";
|
||||||
|
"${modifier}+j" = "focus down";
|
||||||
|
"${modifier}+k" = "focus up";
|
||||||
|
"${modifier}+l" = "focus right";
|
||||||
|
|
||||||
|
# "${modifier}+Shift+b" = "move container to workspace prev";
|
||||||
|
# "${modifier}+Shift+n" = "move container to workspace next";
|
||||||
|
# "${modifier}+b" = "workspace prev";
|
||||||
|
# "${modifier}+n" = "workspace next";
|
||||||
|
|
||||||
|
"${modifier}+Shift+c" = "reload";
|
||||||
|
"${modifier}+Shift+q" = "kill";
|
||||||
|
"${modifier}+Shift+r" = "restart";
|
||||||
|
|
||||||
|
"${modifier}+z" = "sticky toggle";
|
||||||
|
"${modifier}+Shift+z" = "floating toggle";
|
||||||
|
|
||||||
|
"${modifier}+Shift+s" = "move scratchpad";
|
||||||
|
"${modifier}+s" = ''[class="^(?i)(?!obsidian).*"] scratchpad show'';
|
||||||
|
"${modifier}+o" = ''[class="obsidian"] scratchpad show'';
|
||||||
|
|
||||||
|
"${modifier}+c" = "split h";
|
||||||
|
"${modifier}+e" = "layout toggle split";
|
||||||
|
"${modifier}+f" = "fullscreen toggle";
|
||||||
|
"${modifier}+r" = "mode resize";
|
||||||
|
"${modifier}+v" = "split v";
|
||||||
|
"${modifier}+w" = "layout tabbed";
|
||||||
|
"${modifier}+q" = "exec ${config.services.clipmenu.package}/bin/clipmenu";
|
||||||
|
|
||||||
|
"${modifier}+Return" = "exec ${lib.getExe pkgs.niphas-terminal}";
|
||||||
|
"${modifier}+t" = "exec ${lib.getExe pkgs.niphas-file-browser}";
|
||||||
|
"${modifier}+y" = "exec ${lib.getExe pkgs.niphas-web-browser}";
|
||||||
|
|
||||||
|
"${modifier}+d" =
|
||||||
|
"exec ${pkgs.writers.writeDash "run" ''exec rofi -modi run,ssh,window -show run''}";
|
||||||
|
"${modifier}+Shift+d" = "exec ${lib.getExe pkgs.notemenu}";
|
||||||
|
"${modifier}+p" = "exec rofi-pass";
|
||||||
|
"${modifier}+Shift+p" = "exec rofi-pass --insert";
|
||||||
|
"${modifier}+u" = "exec ${lib.getExe pkgs.unicodmenu}";
|
||||||
|
"${modifier}+Shift+u" =
|
||||||
|
"exec ${pkgs.writers.writeDash "last-unicode" ''${pkgs.xdotool}/bin/xdotool type --delay 1000 "$(${pkgs.gawk}/bin/awk 'END{print $1}' ~/.cache/unicodmenu)"''}";
|
||||||
|
|
||||||
|
"${modifier}+F7" = "exec ${pkgs.writers.writeDash "showkeys-toggle" ''
|
||||||
|
if ${pkgs.procps}/bin/pgrep screenkey; then
|
||||||
|
exec ${pkgs.procps}/bin/pkill screenkey
|
||||||
|
else
|
||||||
|
exec ${pkgs.screenkey}/bin/screenkey
|
||||||
|
fi
|
||||||
|
''}";
|
||||||
|
"${modifier}+F12" = "exec ${klem}/bin/klem";
|
||||||
|
"XF86AudioLowerVolume" = "exec ${lib.getExe pkgs.pamixer} -d 5";
|
||||||
|
"XF86AudioMute" = "exec ${lib.getExe pkgs.pamixer} -t";
|
||||||
|
"XF86AudioRaiseVolume" = "exec ${pkgs.pamixer}/bin/pamixer -i 5";
|
||||||
|
"XF86Calculator" = "exec ${lib.getExe pkgs.st} -c floating -e ${pkgs.bc}/bin/bc";
|
||||||
|
"XF86AudioPause" = "exec ${lib.getExe pkgs.playerctl} play-pause";
|
||||||
|
"XF86AudioPlay" = "exec ${lib.getExe pkgs.playerctl} play-pause";
|
||||||
|
"XF86AudioNext" = "exec ${lib.getExe pkgs.playerctl} next";
|
||||||
|
"XF86AudioPrev" = "exec ${lib.getExe pkgs.playerctl} previous";
|
||||||
|
"XF86AudioStop" = "exec ${lib.getExe pkgs.playerctl} stop";
|
||||||
|
|
||||||
|
# key names detected with xorg.xev:
|
||||||
|
# XF86WakeUp (fn twice)
|
||||||
|
# XF86Battery (fn f3)
|
||||||
|
# XF86Sleep (fn f4) - actually suspends
|
||||||
|
# XF86WLAN
|
||||||
|
# XF86WebCam (fn f6)
|
||||||
|
# XF86TouchpadToggle (fn f8)
|
||||||
|
# XF86Suspend (fn f12) - actually suspends to disk
|
||||||
|
# Num_Lock (fn Roll) - numlocks
|
||||||
|
# XF86Audio{Prev,Next,Mute,Play,Stop}
|
||||||
|
# XF86Forward
|
||||||
|
# XF86Back
|
||||||
|
# XF86Launch1 (thinkvantage)
|
||||||
|
};
|
||||||
|
in
|
||||||
|
{
|
||||||
|
stylix.targets.i3.enable = true;
|
||||||
|
|
||||||
|
xsession.windowManager.i3 = {
|
||||||
|
enable = true;
|
||||||
|
extraConfig = ''
|
||||||
|
bindsym --release ${modifier}+Shift+w exec xsecurelock
|
||||||
|
|
||||||
|
exec "${lib.getExe pkgs.obsidian}"
|
||||||
|
for_window [class="obsidian"] , move scratchpad
|
||||||
|
|
||||||
|
assign [class="message"] ${messageWorkspace}
|
||||||
|
exec "${pkgs.writers.writeDash "irc" "exec ${lib.getExe pkgs.alacritty} --class message -e ssh weechat@makanek -t tmux attach-session -t IM"}"
|
||||||
|
exec "${pkgs.writers.writeDash "email" "exec ${lib.getExe pkgs.alacritty} --class message -e aerc"}"
|
||||||
|
|
||||||
|
exec --no-startup-id ${pkgs.xss-lock}/bin/xss-lock -- xsecurelock
|
||||||
|
'';
|
||||||
|
config = {
|
||||||
|
inherit
|
||||||
|
modifier
|
||||||
|
gaps
|
||||||
|
modes
|
||||||
|
bars
|
||||||
|
floating
|
||||||
|
window
|
||||||
|
colors
|
||||||
|
;
|
||||||
|
keybindings = keybindings // {
|
||||||
|
"${modifier}+F9" = "exec ${pkgs.redshift}/bin/redshift -O 4000 -b 0.85";
|
||||||
|
"${modifier}+F10" = "exec ${pkgs.redshift}/bin/redshift -x";
|
||||||
|
"Print" = "exec flameshot gui";
|
||||||
|
# "${modifier}+Shift+x" = "exec ${move-to-new-workspace}";
|
||||||
|
# "${modifier}+x" = "exec ${new-workspace}";
|
||||||
|
"XF86Display" = "exec ${lib.getExe pkgs.dmenu-randr}";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
modes.resize = {
|
|
||||||
"Escape" = ''mode "default"'';
|
|
||||||
"Return" = ''mode "default"'';
|
|
||||||
"h" = "resize shrink width 10 px or 5 ppt";
|
|
||||||
"j" = "resize grow height 10 px or 5 ppt";
|
|
||||||
"k" = "resize shrink height 10 px or 5 ppt";
|
|
||||||
"l" = "resize grow width 10 px or 5 ppt";
|
|
||||||
};
|
|
||||||
keybindings = {
|
|
||||||
"${modifier}+Shift+h" = "move left 25 px";
|
|
||||||
"${modifier}+Shift+j" = "move down 25 px";
|
|
||||||
"${modifier}+Shift+k" = "move up 25 px";
|
|
||||||
"${modifier}+Shift+l" = "move right 25 px";
|
|
||||||
"${modifier}+h" = "focus left";
|
|
||||||
"${modifier}+j" = "focus down";
|
|
||||||
"${modifier}+k" = "focus up";
|
|
||||||
"${modifier}+l" = "focus right";
|
|
||||||
|
|
||||||
"${modifier}+Shift+b" = "move window to workspace prev";
|
|
||||||
"${modifier}+Shift+n" = "move window to workspace next";
|
|
||||||
"${modifier}+Shift+x" = "exec ${move-to-new-workspace}";
|
|
||||||
"${modifier}+b" = "workspace prev";
|
|
||||||
"${modifier}+n" = "workspace next";
|
|
||||||
"${modifier}+x" = "exec ${new-workspace}";
|
|
||||||
|
|
||||||
"${modifier}+Shift+c" = "reload";
|
|
||||||
"${modifier}+Shift+q" = "kill";
|
|
||||||
"${modifier}+Shift+r" = "restart";
|
|
||||||
|
|
||||||
"${modifier}+z" = "sticky toggle";
|
|
||||||
"${modifier}+Shift+z" = "floating toggle";
|
|
||||||
|
|
||||||
"${modifier}+s" = "scratchpad show";
|
|
||||||
"${modifier}+Shift+s" = "move scratchpad";
|
|
||||||
|
|
||||||
"${modifier}+c" = "split h";
|
|
||||||
"${modifier}+e" = "layout toggle split";
|
|
||||||
"${modifier}+f" = "fullscreen toggle";
|
|
||||||
"${modifier}+r" = "mode resize";
|
|
||||||
"${modifier}+v" = "split v";
|
|
||||||
"${modifier}+w" = "layout tabbed";
|
|
||||||
"${modifier}+q" = "exec ${config.services.clipmenu.package}/bin/clipmenu";
|
|
||||||
|
|
||||||
"${modifier}+Return" = "exec ${(defaultApplications pkgs).terminal}";
|
|
||||||
"${modifier}+t" = "exec ${(defaultApplications pkgs).fileManager}";
|
|
||||||
"${modifier}+y" = "exec ${(defaultApplications pkgs).browser}";
|
|
||||||
"${modifier}+0" = "exec ${niveumPackages.menu-calc}/bin/=";
|
|
||||||
|
|
||||||
"${modifier}+d" = "exec ${pkgs.writers.writeDash "run" ''exec rofi -modi run,ssh,window -show run''}";
|
|
||||||
"${modifier}+Shift+d" = "exec ${niveumPackages.notemenu}/bin/notemenu";
|
|
||||||
"${modifier}+p" = "exec rofi-pass";
|
|
||||||
"${modifier}+Shift+p" = "exec rofi-pass --insert";
|
|
||||||
"${modifier}+u" = "exec ${niveumPackages.unicodmenu}/bin/unicodmenu";
|
|
||||||
|
|
||||||
"${modifier}+F6" = "exec ${pkgs.xorg.xkill}/bin/xkill";
|
|
||||||
"${modifier}+F7" = "exec ${pkgs.writers.writeDash "showkeys-toggle" ''
|
|
||||||
if ${pkgs.procps}/bin/pgrep screenkey; then
|
|
||||||
exec ${pkgs.procps}/bin/pkill screenkey
|
|
||||||
else
|
|
||||||
exec ${pkgs.screenkey}/bin/screenkey
|
|
||||||
fi
|
|
||||||
''}";
|
|
||||||
"${modifier}+F8" = "exec switch-theme toggle";
|
|
||||||
"${modifier}+F9" = "exec ${pkgs.redshift}/bin/redshift -O 4000 -b 0.85";
|
|
||||||
"${modifier}+F10" = "exec ${pkgs.redshift}/bin/redshift -x";
|
|
||||||
"${modifier}+F11" = "exec ${pkgs.xcalib}/bin/xcalib -invert -alter";
|
|
||||||
"${modifier}+F12" = "exec ${klem}/bin/klem";
|
|
||||||
"Print" = "exec flameshot gui";
|
|
||||||
"XF86AudioLowerVolume" = "exec ${pkgs.pamixer}/bin/pamixer -d 5";
|
|
||||||
"XF86AudioMute" = "exec ${pkgs.pamixer}/bin/pamixer -t";
|
|
||||||
"XF86AudioRaiseVolume" = "exec ${pkgs.pamixer}/bin/pamixer -i 5";
|
|
||||||
"XF86Calculator" = "exec ${pkgs.st}/bin/st -c floating -e ${pkgs.bc}/bin/bc";
|
|
||||||
"XF86AudioPause" = "exec ${pkgs.playerctl}/bin/playerctl pause";
|
|
||||||
"XF86AudioPlay" = "exec ${pkgs.playerctl}/bin/playerctl play-pause";
|
|
||||||
"XF86AudioNext" = "exec ${pkgs.playerctl}/bin/playerctl next";
|
|
||||||
"XF86AudioPrev" = "exec ${pkgs.playerctl}/bin/playerctl previous";
|
|
||||||
"XF86AudioStop" = "exec ${pkgs.playerctl}/bin/playerctl stop";
|
|
||||||
"XF86ScreenSaver" = "exec ${niveumPackages.k-lock}/bin/k-lock";
|
|
||||||
|
|
||||||
"XF86Display" = "exec ${niveumPackages.dmenu-randr}/bin/dmenu-randr";
|
|
||||||
|
|
||||||
# key names detected with xorg.xev:
|
|
||||||
# XF86WakeUp (fn twice)
|
|
||||||
# XF86Battery (fn f3)
|
|
||||||
# XF86Sleep (fn f4) - actually suspends
|
|
||||||
# XF86WLAN
|
|
||||||
# XF86WebCam (fn f6)
|
|
||||||
# XF86TouchpadToggle (fn f8)
|
|
||||||
# XF86Suspend (fn f12) - actually suspends to disk
|
|
||||||
# Num_Lock (fn Roll) - numlocks
|
|
||||||
# XF86Audio{Prev,Next,Mute,Play,Stop}
|
|
||||||
# XF86Forward
|
|
||||||
# XF86Back
|
|
||||||
# XF86Launch1 (thinkvantage)
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,175 +0,0 @@
|
|||||||
{
|
|
||||||
pkgs,
|
|
||||||
config,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
home-manager.users.me = {
|
|
||||||
programs.i3status-rust = {
|
|
||||||
enable = true;
|
|
||||||
bars.bottom = {
|
|
||||||
icons = "awesome6";
|
|
||||||
settings = {
|
|
||||||
theme.overrides = let
|
|
||||||
colours = config.lib.stylix.colors.withHashtag;
|
|
||||||
in {
|
|
||||||
idle_bg = colours.base00;
|
|
||||||
idle_fg = colours.base05;
|
|
||||||
good_bg = colours.base00;
|
|
||||||
good_fg = colours.base0B;
|
|
||||||
warning_bg = colours.base00;
|
|
||||||
warning_fg = colours.base0A;
|
|
||||||
critical_bg = colours.base00;
|
|
||||||
critical_fg = colours.base09;
|
|
||||||
info_bg = colours.base00;
|
|
||||||
info_fg = colours.base04;
|
|
||||||
separator_bg = colours.base00;
|
|
||||||
separator = " ";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
blocks = [
|
|
||||||
{
|
|
||||||
block = "weather";
|
|
||||||
autolocate = true;
|
|
||||||
format = "$icon $location: $temp";
|
|
||||||
service = {
|
|
||||||
name = "openweathermap";
|
|
||||||
city_id = "2950159";
|
|
||||||
units = "metric";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
{
|
|
||||||
block = "custom";
|
|
||||||
interval = 60 * 5;
|
|
||||||
command = let
|
|
||||||
spacetime = import ../configs/spacetime.nix;
|
|
||||||
in
|
|
||||||
pkgs.writers.writePython3 "sun.py" {
|
|
||||||
libraries = [pkgs.python3Packages.astral];
|
|
||||||
flakeIgnore = ["E121" "E501"];
|
|
||||||
}
|
|
||||||
''
|
|
||||||
import astral
|
|
||||||
import astral.moon
|
|
||||||
import astral.sun
|
|
||||||
|
|
||||||
current_phase = astral.moon.phase()
|
|
||||||
|
|
||||||
city = astral.LocationInfo("Berlin", "Germany", "${spacetime.time.timeZone}", ${toString spacetime.location.latitude}, ${toString spacetime.location.longitude})
|
|
||||||
sun = astral.sun.sun(city.observer, date=astral.today(), tzinfo=city.timezone)
|
|
||||||
|
|
||||||
print("↑{} ↓{} {}{}".format(sun["sunrise"].strftime("%R"), sun["sunset"].strftime("%R"), "☽" if current_phase < 14 else "☾", round(current_phase, 1)))
|
|
||||||
'';
|
|
||||||
}
|
|
||||||
{
|
|
||||||
block = "github";
|
|
||||||
info = ["total"];
|
|
||||||
warning = ["mention" "review_requested" "team_mention" "manual" "invitation" "assign" "subscribed"];
|
|
||||||
}
|
|
||||||
{
|
|
||||||
block = "custom";
|
|
||||||
interval = 10;
|
|
||||||
command = pkgs.writers.writeDash "todo" ''
|
|
||||||
${pkgs.todoman}/bin/todo --porcelain | ${pkgs.jq}/bin/jq -r '
|
|
||||||
map(select(.due != null))
|
|
||||||
| (map(select(.due < now)) | length) as $overdue
|
|
||||||
| (map(select(.due >= now and .due < now + (60 * 60 * 24))) | length) as $dueToday
|
|
||||||
| {
|
|
||||||
icon: "tasks",
|
|
||||||
text: (($overdue + $dueToday) as $sum | if $sum > 0 then $sum | tostring else "" end),
|
|
||||||
state: (
|
|
||||||
if $overdue > 0 then
|
|
||||||
"Critical"
|
|
||||||
elif $dueToday > 0 then
|
|
||||||
"Warning"
|
|
||||||
else
|
|
||||||
"Idle"
|
|
||||||
end
|
|
||||||
)
|
|
||||||
}
|
|
||||||
'
|
|
||||||
'';
|
|
||||||
json = true;
|
|
||||||
hide_when_empty = true;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
block = "custom";
|
|
||||||
interval = 60;
|
|
||||||
command = pkgs.writers.writeDash "weechat" ''
|
|
||||||
ssh -o ConnectTimeout=1 makanek cat /var/lib/weechat/hotlist.txt | sed 's/,/\n/g' | wc -l | jq '{
|
|
||||||
text: (if . > 0 then . | tostring else "" end),
|
|
||||||
state: (if . > 0 then "Info" else "Idle" end),
|
|
||||||
icon: "bell"
|
|
||||||
}'
|
|
||||||
'';
|
|
||||||
json = true;
|
|
||||||
hide_when_empty = true;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
block = "net";
|
|
||||||
format = " $icon HU";
|
|
||||||
missing_format = "";
|
|
||||||
device = "ppp0";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
block = "net";
|
|
||||||
format = " $icon FU";
|
|
||||||
missing_format = "";
|
|
||||||
device = "tun0";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
block = "net";
|
|
||||||
device = config.niveum.wirelessInterface;
|
|
||||||
format = "$icon $ssid $signal_strength";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
block = "battery";
|
|
||||||
device = config.niveum.batteryName;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
block = "sound";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
block = "disk_space";
|
|
||||||
format = "$icon $available";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
block = "memory";
|
|
||||||
format = "$icon $mem_used.eng(prefix:G)";
|
|
||||||
}
|
|
||||||
{block = "load";}
|
|
||||||
{
|
|
||||||
block = "custom";
|
|
||||||
interval = 10;
|
|
||||||
json = true;
|
|
||||||
command = pkgs.writers.writeDash "time" ''
|
|
||||||
${pkgs.jq}/bin/jq -n \
|
|
||||||
--arg now "$(${pkgs.coreutils}/bin/date +'%Y-%m-%d (%W %a) %H:%M')" \
|
|
||||||
--argjson nextEvent "$(
|
|
||||||
${pkgs.khal}/bin/khal list --format "{start}" --day-format "" $(${pkgs.coreutils}/bin/date +'%Y-%m-%d %H:%M') 2>/dev/null \
|
|
||||||
| ${pkgs.gnugrep}/bin/grep -E '[0-9]{2}:[0-9]{2}' \
|
|
||||||
| ${pkgs.coreutils}/bin/head -1 \
|
|
||||||
| ${pkgs.coreutils}/bin/date --date="$(cat)" +%s
|
|
||||||
)" \
|
|
||||||
'{
|
|
||||||
text: $now,
|
|
||||||
icon: "time",
|
|
||||||
state: (
|
|
||||||
($nextEvent - now) as $deltaT
|
|
||||||
| if $deltaT < (5 * 60) then
|
|
||||||
"Critical"
|
|
||||||
elif $deltaT < (15 * 60) then
|
|
||||||
"Warning"
|
|
||||||
elif $deltaT < (60 * 60) then
|
|
||||||
"Info"
|
|
||||||
else
|
|
||||||
"Idle"
|
|
||||||
end
|
|
||||||
)
|
|
||||||
}'
|
|
||||||
'';
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,83 +0,0 @@
|
|||||||
{
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
commaSep = builtins.concatStringsSep ",";
|
|
||||||
xkbOptions = ["compose:caps" "terminate:ctrl_alt_bksp" "grp:ctrls_toggle"];
|
|
||||||
languages = {
|
|
||||||
de = "T3";
|
|
||||||
gr = "polytonic";
|
|
||||||
ru = "phonetic";
|
|
||||||
ara = "buckwalter";
|
|
||||||
cop = "";
|
|
||||||
ave = "";
|
|
||||||
got = "";
|
|
||||||
"in" = "san-kagapa";
|
|
||||||
il = "phonetic";
|
|
||||||
};
|
|
||||||
defaultLanguage = "de";
|
|
||||||
in {
|
|
||||||
# man 7 xkeyboard-config
|
|
||||||
services.xserver = {
|
|
||||||
layout = "de";
|
|
||||||
# T3: https://upload.wikimedia.org/wikipedia/commons/a/a9/German-Keyboard-Layout-T3-Version1-large.png
|
|
||||||
# buckwalter: http://www.qamus.org/transliteration.htm
|
|
||||||
xkbVariant = "T3";
|
|
||||||
xkbOptions = commaSep xkbOptions;
|
|
||||||
libinput.enable = true;
|
|
||||||
xkbDir = pkgs.symlinkJoin {
|
|
||||||
name = "x-keyboard-directory";
|
|
||||||
paths = [
|
|
||||||
"${pkgs.xkeyboard_config}/etc/X11/xkb"
|
|
||||||
(pkgs.linkFarm "custom-x-keyboards" [
|
|
||||||
{
|
|
||||||
name = "symbols/cop";
|
|
||||||
path = pkgs.fetchurl {
|
|
||||||
url = "http://www.moheb.de/download/cop";
|
|
||||||
sha256 = "1l0h6aq536hyinrh0i0ia355y229bjrlibii0sya5bmqh46vycia";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "symbols/got";
|
|
||||||
path = pkgs.fetchurl {
|
|
||||||
url = "https://c.krebsco.de/got";
|
|
||||||
sha256 = "1i0jxghxi3rldlijw6gm2xawrv7f0pmm7a5cqbzzgjrg7ldk46gd";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "symbols/ave";
|
|
||||||
path = pkgs.fetchurl {
|
|
||||||
url = "https://blog.simos.info/wp-content/uploads/2010/06/avestan.txt";
|
|
||||||
sha256 = "192zmmm3gxyhim39dsax7r87gsay2w5v2xkhwmvsfipjb60hwp5g";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
])
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
console.keyMap = "de";
|
|
||||||
|
|
||||||
environment.systemPackages =
|
|
||||||
lib.mapAttrsToList
|
|
||||||
(language: variant:
|
|
||||||
pkgs.writers.writeDashBin "kb-${language}" ''
|
|
||||||
${pkgs.xorg.setxkbmap}/bin/setxkbmap ${defaultLanguage},${language} ${languages.${defaultLanguage}},${variant} ${toString (map (option: "-option ${option}") xkbOptions)}
|
|
||||||
'')
|
|
||||||
languages;
|
|
||||||
|
|
||||||
# improve held key rate
|
|
||||||
services.xserver.displayManager.sessionCommands = "${pkgs.xorg.xset}/bin/xset r rate 300 50";
|
|
||||||
|
|
||||||
systemd.user.services.gxkb = {
|
|
||||||
wantedBy = ["graphical-session.target"];
|
|
||||||
serviceConfig = {
|
|
||||||
SyslogIdentifier = "gxkb";
|
|
||||||
ExecStart = "${pkgs.gxkb}/bin/gxkb";
|
|
||||||
Restart = "always";
|
|
||||||
RestartSec = "15s";
|
|
||||||
StartLimitBurst = 0;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
34
configs/keyboard/XCompose
Normal file
34
configs/keyboard/XCompose
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
# Import default rules from the system Compose file
|
||||||
|
include "%L"
|
||||||
|
|
||||||
|
# Custom definitions
|
||||||
|
<Multi_key> <U0634> <U0634> : "ژ" U0698 # ز + ز = ژ
|
||||||
|
<Multi_key> <U063A> <U063A> : "گ" U06AF # غ + غ = گ
|
||||||
|
<Multi_key> <U0641> <U0641> : "ڤ" U06A4 # ف + ف = ڤ
|
||||||
|
<Multi_key> <U062C> <U062C> : "چ" U0686 # ج + ج = چ
|
||||||
|
<Multi_key> <U0628> <U0628> : "پ" U067E # ب + ب = پ
|
||||||
|
<Multi_key> <U0643> <U0643> : "ک" U06A9 # ك + ك = ک
|
||||||
|
<Multi_key> <U064A> <U064A> : "ی" U06CC # ي + ي = ی
|
||||||
|
<Multi_key> <U0647> <U064A> : "ۀ" U06C0 # ه + ي = ۀ
|
||||||
|
<Multi_key> <E> <E> : "ɛ" U025B
|
||||||
|
<Multi_key> <O> <O> : "ɔ" U0254
|
||||||
|
<Multi_key> <s> <h> : "ʃ" U0283
|
||||||
|
<Multi_key> <g> <h> : "ɣ" U0283
|
||||||
|
<Multi_key> <b> <h> : "β" U0283
|
||||||
|
<Multi_key> <p> <h> : "ɸ" U0283
|
||||||
|
<Multi_key> <z> <h> : "ʒ" U0292
|
||||||
|
<Multi_key> <e> <i> : "ɪ" U026A
|
||||||
|
<Multi_key> <e> <u> : "ʊ" U028A
|
||||||
|
<Multi_key> <colon> <colon> : "ː" U02D0
|
||||||
|
<Multi_key> <question> <period> : "ʔ" U0294
|
||||||
|
<Multi_key> <period> <question> : "ʕ" U0295
|
||||||
|
<Multi_key> <apostrophe> <period> : "ˈ" U02C8
|
||||||
|
<Multi_key> <period> <apostrophe> : "ˌ" U02CC
|
||||||
|
<dead_belowring> <nobreakspace> : "̥" U0325 # COMBINING RING BELOW
|
||||||
|
<dead_belowbreve> <nobreakspace> : "̮" U032E # COMBINING BREVE BELOW
|
||||||
|
<dead_invertedbreve> <nobreakspace> : "̑" U0311 # COMBINING INVERTED BREVE
|
||||||
|
<dead_belowmacron> <nobreakspace> : "̱" U0331 # COMBINING MACRON BELOW
|
||||||
|
<dead_belowcircumflex> <nobreakspace> : "̯" U032F # COMBINING INVERTED BREVE BELOW
|
||||||
|
<dead_circumflex> <Multi_key> <underscore> <e> : "ᵊ" U1D4A
|
||||||
|
|
||||||
|
# TODO zwnj
|
||||||
60
configs/keyboard/avestan
Normal file
60
configs/keyboard/avestan
Normal file
@@ -0,0 +1,60 @@
|
|||||||
|
/////////////////////////////////////////////////////////////////////////////////
|
||||||
|
//
|
||||||
|
// Generated keyboard layout file with the Keyboard Layout Editor.
|
||||||
|
// For more about the software, see http://code.google.com/p/keyboardlayouteditor
|
||||||
|
//
|
||||||
|
// Version 0.2, changed AD09.
|
||||||
|
|
||||||
|
partial default alphanumeric_keys
|
||||||
|
xkb_symbols "avestan"
|
||||||
|
{
|
||||||
|
name[Group1] = "Iran - Avestan";
|
||||||
|
|
||||||
|
key <AB01> { [ U10B30, U10B32 ] }; // 𬰠ð¬²
|
||||||
|
key <AB02> { [ U10B11, U10B12 ] }; // 𬑠ð¬’
|
||||||
|
key <AB03> { [ U10B17, UE102 ] }; // 𬗠
|
||||||
|
key <AB04> { [ U10B2C, U10B13 ] }; // 𬬠ð¬“
|
||||||
|
key <AB05> { [ U10B20, U10B21 ] }; // ð¬ ð¬¡
|
||||||
|
key <AB06> { [ U10B25, U10B27 ] }; // 𬥠ð¬§
|
||||||
|
key <AB07> { [ U10B28, U10B29 ] }; // 𬨠ð¬©
|
||||||
|
key <AB08> { [ U10B3C, U10B39 ] }; // 𬼠ð¬¹
|
||||||
|
key <AB09> { [ U10B3E, U10B3D ] }; // 𬾠ð¬½
|
||||||
|
key <AB10> { [ U10B3F, periodcentered ] }; // 𬿠·
|
||||||
|
|
||||||
|
key <AC01> { [ U10B00, U10B01 ] }; // 𬀠ð¬
|
||||||
|
key <AC02> { [ U10B2F, U10B31 ] }; // 𬯠ð¬±
|
||||||
|
key <AC03> { [ U10B1B, U10B1C ] }; // 𬛠ð¬œ
|
||||||
|
key <AC04> { [ U10B1F, U10B16 ] }; // 𬟠ð¬–
|
||||||
|
key <AC05> { [ U10B14, U10B15 ] }; // 𬔠ð¬•
|
||||||
|
key <AC06> { [ U10B35, UE100 ] }; // 𬵠
|
||||||
|
key <AC07> { [ U10B18, U10B24 ] }; // 𬘠ð¬¤
|
||||||
|
key <AC08> { [ U10B10, UE101 ] }; // ð¬ î„
|
||||||
|
key <AC09> { [ U10B2E, UE103 ] }; // 𬮠
|
||||||
|
key <AC10> { [ U10B3B, U10B3A ] }; // 𬻠ð¬º
|
||||||
|
key <AC11> { [ U10B1D ] }; // ð¬
|
||||||
|
|
||||||
|
key <AD01> { [ U10B22, U10B23 ] }; // 𬢠ð¬£
|
||||||
|
key <AD02> { [ U10B33, U10B34 ] }; // 𬳠ð¬´
|
||||||
|
key <AD03> { [ U10B08, U10B09 ] }; // 𬈠ð¬‰
|
||||||
|
key <AD04> { [ U10B2D, U10B26 ] }; // ð¬ ð¬¦
|
||||||
|
key <AD05> { [ U10B19, U10B1A ] }; // 𬙠ð¬š
|
||||||
|
key <AD06> { [ U10B2B, U10B2A ] }; // 𬫠ð¬ª
|
||||||
|
key <AD07> { [ U10B0E, U10B0F ] }; // 𬎠ð¬
|
||||||
|
key <AD08> { [ U10B0C, U10B0D ] }; // 𬌠ð¬
|
||||||
|
key <AD09> { [ U10B0A, U10B0B ] }; // 𬊠ð¬‹
|
||||||
|
key <AD10> { [ U10B1E ] }; // ð¬ž
|
||||||
|
key <AD11> { [ U10B06, U10B07 ] }; // 𬆠ð¬‡
|
||||||
|
key <AD12> { [ U10B02, U10B03 ] }; // 𬂠ð¬ƒ
|
||||||
|
|
||||||
|
key <AE01> { [ U10B78 ] }; // ð¸
|
||||||
|
key <AE02> { [ U10B79 ] }; // ð¹
|
||||||
|
key <AE03> { [ U10B7A ] }; // ðº
|
||||||
|
key <AE04> { [ U10B7B ] }; // ð»
|
||||||
|
key <AE05> { [ U10B7C ] }; // ð¼
|
||||||
|
key <AE06> { [ U10B7D ] }; // ð½
|
||||||
|
key <AE07> { [ U10B7E ] }; // ð¾
|
||||||
|
key <AE08> { [ U10B7F ] }; // ð¿
|
||||||
|
|
||||||
|
key <BKSL> { [ U10B04, U10B05 ] }; // 𬄠ð¬…
|
||||||
|
key <LSGT> { [ U10B04, U10B05 ] }; // 𬄠ð¬…
|
||||||
|
};
|
||||||
79
configs/keyboard/coptic
Normal file
79
configs/keyboard/coptic
Normal file
@@ -0,0 +1,79 @@
|
|||||||
|
// Coptic keyboard symbols for XKB and PC keyboard
|
||||||
|
// based on the mapping of logos
|
||||||
|
// (C) 2006 Moheb Mekhaiel <mohebm@gmx.de>
|
||||||
|
//
|
||||||
|
// Permission is granted to anyone to use, distribute and modify
|
||||||
|
// this file in any way, provided that the above copyright notice
|
||||||
|
// is left intact and the author of the modification summarizes
|
||||||
|
// the changes in this header.
|
||||||
|
//
|
||||||
|
// This file is distributed without any expressed or implied warranty.
|
||||||
|
|
||||||
|
|
||||||
|
partial default alphanumeric_keys
|
||||||
|
xkb_symbols "basic" {
|
||||||
|
name[Group1]= "Coptic";
|
||||||
|
|
||||||
|
key <TLDE> { [ U0308, U0311, U0361, U2CE5 ] };
|
||||||
|
|
||||||
|
key <AE01> { type[Group1] = "FOUR_LEVEL",
|
||||||
|
[ 1, U0304, VoidSymbol, U2CE6 ] };
|
||||||
|
key <AE02> { [ 2, U0306, U2CFD, U2CE7 ] };
|
||||||
|
key <AE03> { [ 3, U0374, U2056, U2CE8 ] };
|
||||||
|
key <AE04> { [ 4, U0375, U2058, U2CE9 ] };
|
||||||
|
key <AE05> { [ 5, U0307, U2059, U2CEA ] };
|
||||||
|
key <AE06> { [ 6, U0323, U2C8B, U2C8A ] };
|
||||||
|
key <AE07> { [ 7, U2CE4 ] };
|
||||||
|
key <AE08> { [ 8, U002A, U2026 ] };
|
||||||
|
key <AE09> { [ 9, parenleft, U201C, plusminus ] };
|
||||||
|
key <AE10> { [ 0, parenright, U201D, degree ] };
|
||||||
|
key <AE11> { [ U00B7, underscore, U2013, U2014 ] };
|
||||||
|
key <AE12> { [ U2E17, U0305, U033F ] };
|
||||||
|
key <BKSL> { [ U0300, U007C, backslash, U007C ] };
|
||||||
|
|
||||||
|
key <AD01> { [ U2C91, U2C90 ] };
|
||||||
|
key <AD02> { [ U2CB1, U2CB0 ] };
|
||||||
|
key <AD03> { [ U2C89, U2C88 ] };
|
||||||
|
key <AD04> { [ U2CA3, U2CA2 ] };
|
||||||
|
key <AD05> { [ U2CA7, U2CA6, U03EF, U03EE ] };
|
||||||
|
key <AD06> { [ U2CAF, U2CAE ] };
|
||||||
|
key <AD07> { [ U2CA9, U2CA8 ] };
|
||||||
|
key <AD08> { [ U2C93, U2C92 ] };
|
||||||
|
key <AD09> { [ U2C9F, U2C9E ] };
|
||||||
|
key <AD10> { [ U2CA1, U2CA0 ] };
|
||||||
|
key <AD11> { [ bracketleft,braceleft, U2018 ] };
|
||||||
|
key <AD12> { [ bracketright,braceright,U2019 ] };
|
||||||
|
|
||||||
|
key <AC01> { [ U2C81, U2C80 ] };
|
||||||
|
key <AC02> { [ U2CA5, U2CA4, U03E3, U03E2 ] };
|
||||||
|
key <AC03> { [ U2C87, U2C86, U03EF, U03EE ] };
|
||||||
|
key <AC04> { [ U2CAB, U2CAA, U03E5, U03E4 ] };
|
||||||
|
key <AC05> { [ U2C85, U2C84, U03EB, U03EA ] };
|
||||||
|
key <AC06> { [ U2C8F, U2C8E, U03E9, U03E8 ] };
|
||||||
|
key <AC07> { [ U03EB, U03EA, U03EB, U03EA ] };
|
||||||
|
key <AC08> { [ U2C95, U2C94, U03E7, U03E6 ] };
|
||||||
|
key <AC09> { [ U2C97, U2C96 ] };
|
||||||
|
key <AC10> { [ semicolon, colon, U2053, dead_doubleacute ] };
|
||||||
|
key <AC11> { [ apostrophe, U2CFF, U0022 ] };
|
||||||
|
|
||||||
|
key <AB01> { [ U2C8D, U2C8C ] };
|
||||||
|
key <AB02> { [ U2C9D, U2C9C ] };
|
||||||
|
key <AB03> { [ U2CAD, U2CAC, U03ED, U03EC ] };
|
||||||
|
key <AB04> { [ U03E3, U03E2, U03E3, U03E2 ] };
|
||||||
|
key <AB05> { [ U2C83, U2C82 ] };
|
||||||
|
key <AB06> { [ U2C9B, U2C9A ] };
|
||||||
|
key <AB07> { [ U2C99, U2C98 ] };
|
||||||
|
key <AB08> { [ comma, less, U00AB, U2039 ] };
|
||||||
|
key <AB09> { [ period, greater, U00BB, U203A ] };
|
||||||
|
key <AB10> { [ U0301, U2CFE, slash, question ] };
|
||||||
|
|
||||||
|
key <RALT> { type[Group1]="TWO_LEVEL",
|
||||||
|
[ ISO_Level3_Shift, Multi_key ] };
|
||||||
|
|
||||||
|
modifier_map Mod5 { <RALT> };
|
||||||
|
|
||||||
|
//include "level3(ralt_switch_multikey)"
|
||||||
|
|
||||||
|
// End alphanumeric section
|
||||||
|
};
|
||||||
|
|
||||||
143
configs/keyboard/default.nix
Normal file
143
configs/keyboard/default.nix
Normal file
@@ -0,0 +1,143 @@
|
|||||||
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
let
|
||||||
|
|
||||||
|
commaSep = builtins.concatStringsSep ",";
|
||||||
|
xkbOptions = [
|
||||||
|
"compose:caps"
|
||||||
|
"terminate:ctrl_alt_bksp"
|
||||||
|
"grp:ctrls_toggle"
|
||||||
|
];
|
||||||
|
languages = {
|
||||||
|
deutsch = {
|
||||||
|
code = "de";
|
||||||
|
variant = "T3";
|
||||||
|
};
|
||||||
|
greek = {
|
||||||
|
code = "gr";
|
||||||
|
variant = "polytonic";
|
||||||
|
};
|
||||||
|
russian = {
|
||||||
|
code = "ru";
|
||||||
|
variant = "phonetic";
|
||||||
|
};
|
||||||
|
arabic = {
|
||||||
|
code = "ara";
|
||||||
|
variant = "buckwalter";
|
||||||
|
};
|
||||||
|
coptic = ./coptic;
|
||||||
|
avestan = ./avestan;
|
||||||
|
gothic = ./gothic;
|
||||||
|
farsi = {
|
||||||
|
code = "ir";
|
||||||
|
variant = "qwerty";
|
||||||
|
};
|
||||||
|
syriac = {
|
||||||
|
code = "sy";
|
||||||
|
variant = "syc_phonetic";
|
||||||
|
};
|
||||||
|
sanskrit = {
|
||||||
|
code = "in";
|
||||||
|
variant = "san-kagapa";
|
||||||
|
};
|
||||||
|
gujarati = {
|
||||||
|
code = "in";
|
||||||
|
variant = "guj-kagapa";
|
||||||
|
};
|
||||||
|
urdu = {
|
||||||
|
code = "in";
|
||||||
|
variant = "urd-phonetic";
|
||||||
|
};
|
||||||
|
hebrew = {
|
||||||
|
code = "il";
|
||||||
|
variant = "phonetic";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
defaultLanguage = languages.deutsch;
|
||||||
|
in
|
||||||
|
{
|
||||||
|
services.libinput.enable = true;
|
||||||
|
|
||||||
|
# man 7 xkeyboard-config
|
||||||
|
services.xserver = {
|
||||||
|
exportConfiguration = lib.mkForce true; # link /usr/share/X11 properly
|
||||||
|
xkb.layout = defaultLanguage.code;
|
||||||
|
# T3: https://upload.wikimedia.org/wikipedia/commons/a/a9/German-Keyboard-Layout-T3-Version1-large.png
|
||||||
|
# buckwalter: http://www.qamus.org/transliteration.htm
|
||||||
|
xkb.variant = defaultLanguage.variant;
|
||||||
|
xkb.options = commaSep xkbOptions;
|
||||||
|
xkb.extraLayouts = {
|
||||||
|
coptic = {
|
||||||
|
languages = [ "cop" ];
|
||||||
|
description = "Coptic is the latest stage of the Egyptian language and was used by Egyptian Christians. The Coptic script is based on the Greek alphabet with some letters borrowed from Demotic Egyptian.";
|
||||||
|
symbolsFile = ./coptic;
|
||||||
|
};
|
||||||
|
avestan = {
|
||||||
|
languages = [ "ave" ];
|
||||||
|
description = "Avestan is an ancient Iranian language known primarily from its use in the sacred texts of Zoroastrianism, the Avesta. It is an Indo-Iranian language that was spoken in ancient Persia.";
|
||||||
|
symbolsFile = ./avestan;
|
||||||
|
};
|
||||||
|
gothic = {
|
||||||
|
languages = [ "got" ];
|
||||||
|
description = "Gothic is an extinct East Germanic language that was spoken by the Goths. It is known primarily from the Codex Argenteus, a 6th-century manuscript containing a translation of the Bible into Gothic.";
|
||||||
|
symbolsFile = ./gothic;
|
||||||
|
};
|
||||||
|
farsi = {
|
||||||
|
languages = [ "fas" ];
|
||||||
|
description = "Farsi, also known as Persian, is an Indo-Iranian language spoken primarily in Iran, Afghanistan (where it is known as Dari), and Tajikistan (where it is called Tajik). It has a rich literary tradition and is written in a modified Arabic script.";
|
||||||
|
symbolsFile = ./farsi;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
environment.etc."x11-locale".source = toString pkgs.xorg.libX11 + "share/X11/locale";
|
||||||
|
|
||||||
|
home-manager.users.me = {
|
||||||
|
home.file = {
|
||||||
|
".XCompose".source = ./XCompose;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
console.keyMap = "de";
|
||||||
|
|
||||||
|
environment.systemPackages = lib.mapAttrsToList (
|
||||||
|
language: settings:
|
||||||
|
let
|
||||||
|
code = if settings ? "code" then settings.code else language;
|
||||||
|
variant = if settings ? "variant" then settings.variant else "";
|
||||||
|
in
|
||||||
|
pkgs.writers.writeDashBin "kb-${language}" ''
|
||||||
|
if [ -n "$SWAYSOCK" ]; then
|
||||||
|
swaymsg -s $SWAYSOCK 'input * xkb_layout "${defaultLanguage.code},${code}"'
|
||||||
|
swaymsg -s $SWAYSOCK 'input * xkb_variant "${defaultLanguage.variant},${variant}"'
|
||||||
|
swaymsg -s $SWAYSOCK 'input * xkb_options "${lib.concatStringsSep "," xkbOptions}"'
|
||||||
|
elif [ -n "$HYPRLAND_INSTANCE_SIGNATURE" ]; then
|
||||||
|
hyprctl keyword input:kb_variant "" # otherwise we end up with an invalid combination for a short while
|
||||||
|
hyprctl keyword input:kb_layout "${defaultLanguage.code},${code}"
|
||||||
|
hyprctl keyword input:kb_variant "${defaultLanguage.variant},${variant}"
|
||||||
|
elif [ -n "$DISPLAY" ]; then
|
||||||
|
${pkgs.xorg.setxkbmap}/bin/setxkbmap ${defaultLanguage.code},${code} ${defaultLanguage.variant},${variant} ${
|
||||||
|
toString (map (option: "-option ${option}") xkbOptions)
|
||||||
|
}
|
||||||
|
fi
|
||||||
|
''
|
||||||
|
) (languages // config.services.xserver.xkb.extraLayouts);
|
||||||
|
|
||||||
|
# improve held key rate
|
||||||
|
services.xserver.displayManager.sessionCommands = "${pkgs.xorg.xset}/bin/xset r rate 300 50";
|
||||||
|
|
||||||
|
systemd.user.services.gxkb = {
|
||||||
|
wantedBy = [ "graphical-session.target" ];
|
||||||
|
serviceConfig = {
|
||||||
|
SyslogIdentifier = "gxkb";
|
||||||
|
ExecStart = "${pkgs.gxkb}/bin/gxkb";
|
||||||
|
Restart = "always";
|
||||||
|
RestartSec = "15s";
|
||||||
|
StartLimitBurst = 0;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
114
configs/keyboard/farsi
Normal file
114
configs/keyboard/farsi
Normal file
@@ -0,0 +1,114 @@
|
|||||||
|
// https://github.com/gpuminingir/Farsi-Phonetic-Keyboard-Linux
|
||||||
|
// by @gpuminingir
|
||||||
|
|
||||||
|
partial alphanumeric_keys
|
||||||
|
xkb_symbols "qwerty" {
|
||||||
|
// Classic Finnish keyboard layout without dead keys and {[]} on asdf + AltG
|
||||||
|
name[Group1]="Persian (QWERTY)";
|
||||||
|
include "ir(pesq_part_basic)"
|
||||||
|
include "ir(pesq_part_ext)"
|
||||||
|
include "ir(pesq_part_keypad)"
|
||||||
|
include "nbsp(zwnj2nb3nnb4)"
|
||||||
|
include "level3(ralt_switch)"
|
||||||
|
};
|
||||||
|
|
||||||
|
hidden partial alphanumeric_keys
|
||||||
|
xkb_symbols "pesq_part_basic" {
|
||||||
|
// Persian digits
|
||||||
|
key <AE01> { [ Arabic_1, exclam, exclam ] }; // ١ ! !
|
||||||
|
key <AE02> { [ Arabic_2, at, at ] }; // ٢ @ @
|
||||||
|
key <AE03> { [ Arabic_3, numbersign, numbersign ] }; // ٣ # #
|
||||||
|
key <AE04> { [ Farsi_4, dollar, dollar ] }; // ۴ $ $
|
||||||
|
key <AE05> { [ Farsi_5, percent, percent ] }; // ۵ % %
|
||||||
|
key <AE06> { [ Farsi_6, asciicircum, asciicircum ] }; // ۶ ^ ^
|
||||||
|
key <AE07> { [ Arabic_7, ampersand, ampersand ] }; // ٧ & &
|
||||||
|
key <AE08> { [ Arabic_8, KP_Multiply, KP_Multiply ] }; // ٨ * *
|
||||||
|
key <AE09> { [ Arabic_9, Armenian_parenright, Armenian_parenright, Armenian_parenleft ] }; // ٩ ) ) (
|
||||||
|
key <AE10> { [ Farsi_0, Armenian_parenleft, Armenian_parenleft ] }; // ۰ ( (
|
||||||
|
key <AE11> { [ underbar, KP_Subtract, KP_Subtract ] }; // _ – –
|
||||||
|
key <AE12> { [ KP_Equal, KP_Add, KP_Add ] }; // = + +
|
||||||
|
|
||||||
|
// Persian letters and symbols
|
||||||
|
key <AD01> { [ Arabic_qaf, Arabic_ghain ] }; // ق غ
|
||||||
|
key <AD02> { [ Arabic_sheen ] }; // ش
|
||||||
|
key <AD03> { [ Arabic_ain ] }; // ع
|
||||||
|
key <AD04> { [ Arabic_ra ] }; // ر
|
||||||
|
key <AD05> { [ Arabic_teh, Arabic_tah ] }; // ت ط
|
||||||
|
key <AD06> { [ Farsi_yeh ] }; // ى
|
||||||
|
key <AD07> { [ Arabic_waw ] }; // و
|
||||||
|
key <AD08> { [ Farsi_yeh ] }; // ى
|
||||||
|
key <AD09> { [ Arabic_waw ] }; // و
|
||||||
|
key <AD10> { [ Arabic_peh ] }; // پ
|
||||||
|
key <AD11> { [ bracketright, braceleft ] }; // ] } {
|
||||||
|
key <AD12> { [ bracketleft, braceright ] }; // [ { }
|
||||||
|
|
||||||
|
key <AC01> { [ Arabic_alef, Arabic_maddaonalef, Arabic_maddaonalef ] }; // ا آ آ
|
||||||
|
key <AC02> { [ Arabic_seen, Arabic_sad, Arabic_sheen, Arabic_sheen ] }; // س ص ش
|
||||||
|
key <AC03> { [ Arabic_dal, Arabic_thal ] }; // د ذ ذ
|
||||||
|
key <AC04> { [ Arabic_feh ] }; // ف
|
||||||
|
key <AC05> { [ Arabic_gaf, Arabic_ghain ] }; // گ
|
||||||
|
key <AC06> { [ Arabic_heh, Arabic_hah ] }; // ە ح ه
|
||||||
|
key <AC07> { [ Arabic_jeem, Arabic_jeh ] }; // ج ژ ژ
|
||||||
|
key <AC08> { [ Arabic_keheh ] }; // ک
|
||||||
|
key <AC09> { [ Arabic_lam ] }; // ل
|
||||||
|
key <AC10> { [ Arabic_semicolon, colon ] }; // ؛ : ։
|
||||||
|
key <AC11> { [ Arabic_comma, quotedbl, quotedbl ] }; // ، ” ”
|
||||||
|
|
||||||
|
key <AB01> { [ Arabic_zain, Arabic_dad, Arabic_zah, Arabic_zah ] }; // ض ض ز خ
|
||||||
|
key <AB02> { [ Arabic_khah, Arabic_zah ] }; // ظ خ
|
||||||
|
key <AB03> { [ Arabic_theh, Arabic_tcheh ] }; // چ ث
|
||||||
|
key <AB04> { [ Arabic_hamza, Arabic_waw ] }; // و
|
||||||
|
key <AB05> { [ Arabic_beh ] }; // ب
|
||||||
|
key <AB06> { [ Arabic_noon ] }; // ن
|
||||||
|
key <AB07> { [ Arabic_meem ] }; // م
|
||||||
|
key <AB08> { [ Arabic_comma, rightcaret, leftcaret ] }; // , > <
|
||||||
|
key <AB09> { [ period, leftcaret, rightcaret ] }; // . < >
|
||||||
|
key <AB10> { [ slash, Arabic_question_mark, question ] }; // / ?
|
||||||
|
|
||||||
|
key <AE11> { [ minus, underscore ] };
|
||||||
|
key <AE12> { [ equal, plus, 0x1002212 ] };
|
||||||
|
key <BKSL> { [ backslash, bar, 0x1002010 ] };
|
||||||
|
key <TLDE> { [ U02DC, UFDFC, UFDF2 ] }; // ˜ ﷼ ﷲ
|
||||||
|
};
|
||||||
|
|
||||||
|
hidden partial alphanumeric_keys
|
||||||
|
xkb_symbols "pesq_part_ext" {
|
||||||
|
// Persian and ASCII digits
|
||||||
|
key <AE01> { [ Farsi_1, exclam, grave, 1 ] };
|
||||||
|
key <AE02> { [ Farsi_2, 0x100066c, at, 2 ] };
|
||||||
|
key <AE03> { [ Farsi_3, 0x100066b, numbersign, 3 ] };
|
||||||
|
key <AE04> { [ Farsi_4, 0x100fdfc, dollar, 4 ] };
|
||||||
|
key <AE05> { [ Farsi_5, 0x100066a, percent, 5 ] };
|
||||||
|
key <AE06> { [ Farsi_6, multiply, asciicircum, 6 ] };
|
||||||
|
key <AE07> { [ Farsi_7, Arabic_comma, ampersand, 7 ] };
|
||||||
|
key <AE08> { [ Farsi_8, asterisk, enfilledcircbullet, 8 ] };
|
||||||
|
key <AE09> { [ Farsi_9, parenright, 0x100200e, 9 ] };
|
||||||
|
key <AE10> { [ Farsi_0, parenleft, 0x100200f, 0 ] };
|
||||||
|
};
|
||||||
|
|
||||||
|
hidden partial alphanumeric_keys
|
||||||
|
xkb_symbols "pesq_part_keypad" {
|
||||||
|
// Persian digits and Mathematical operators
|
||||||
|
key <KPDV> { [ division, XF86_Ungrab ] };
|
||||||
|
key <KPMU> { [ multiply, XF86_ClearGrab ] };
|
||||||
|
key <KPSU> { [ 0x1002212, XF86_Prev_VMode ] };
|
||||||
|
key <KPAD> { [ plus, XF86_Next_VMode ] };
|
||||||
|
|
||||||
|
key <KPEN> { [ KP_Enter ] };
|
||||||
|
key <KPEQ> { [ equal ] };
|
||||||
|
|
||||||
|
key <KP7> { [ KP_Home, Farsi_7 ] };
|
||||||
|
key <KP8> { [ KP_Up, Farsi_8 ] };
|
||||||
|
key <KP9> { [ KP_Prior, Farsi_9 ] };
|
||||||
|
|
||||||
|
key <KP4> { [ KP_Left, Farsi_4 ] };
|
||||||
|
key <KP5> { [ KP_Begin, Farsi_5 ] };
|
||||||
|
key <KP6> { [ KP_Right, Farsi_6 ] };
|
||||||
|
|
||||||
|
key <KP1> { [ KP_End, Farsi_1 ] };
|
||||||
|
key <KP2> { [ KP_Down, Farsi_2 ] };
|
||||||
|
key <KP3> { [ KP_Next, Farsi_3 ] };
|
||||||
|
|
||||||
|
key <KP0> { [ KP_Insert, Farsi_0 ] };
|
||||||
|
key <KPDL> { [ KP_Delete, 0x100066b ] };
|
||||||
|
};
|
||||||
69
configs/keyboard/gothic
Normal file
69
configs/keyboard/gothic
Normal file
@@ -0,0 +1,69 @@
|
|||||||
|
/////////////////////////////////////////////////////////////////////////////////
|
||||||
|
//
|
||||||
|
// Generated keyboard layout file with the Keyboard Layout Editor.
|
||||||
|
// For more about the software, see http://code.google.com/p/keyboardlayouteditor
|
||||||
|
//
|
||||||
|
// Version 0.2, changed AD09.
|
||||||
|
|
||||||
|
partial default alphanumeric_keys
|
||||||
|
xkb_symbols "Gothic"
|
||||||
|
{
|
||||||
|
name[Group1] = "Gothic";
|
||||||
|
|
||||||
|
key <AB01> { [ U10336, U10336 ] }; // Z: 𐌶
|
||||||
|
key <AB02> { [ U10347, U10347 ] }; // X: 𐍇
|
||||||
|
key <AB03> { [ U10343, U10343 ] }; // C: 𐍃
|
||||||
|
key <AB04> { [ U10338, U10338 ] }; // V: 𐌸
|
||||||
|
key <AB05> { [ U10331, U10331 ] }; // B: 𐌱
|
||||||
|
key <AB06> { [ U1033D, U10341 ] }; // n: 𐌽 N: 𐍁
|
||||||
|
key <AB07> { [ U1033C, U1033C ] }; // M: 𐌼
|
||||||
|
key <AB08> { [ U10B3C, U10B39 ] };
|
||||||
|
key <AB09> { [ U10349, U10349 ] };
|
||||||
|
key <AB10> { [ U10B3F, periodcentered ] };
|
||||||
|
|
||||||
|
key <AC01> { [ U10330, U10330 ] }; // A: 𐌰
|
||||||
|
key <AC02> { [ U10343, U10343 ] }; // S: 𐍃
|
||||||
|
key <AC03> { [ U10333, U10338 ] }; // d: 𐌳 D: 𐌸
|
||||||
|
key <AC04> { [ U10346, U10346 ] }; // F: 𐍆
|
||||||
|
key <AC05> { [ U10332, U10332 ] }; // G: 𐌲
|
||||||
|
key <AC06> { [ U10337, U10337 ] }; // H: 𐌷
|
||||||
|
key <AC07> { [ U1033E, U1033E ] }; // J: 𐌾
|
||||||
|
key <AC08> { [ U1033A, U1033A ] }; // K: 𐌺
|
||||||
|
key <AC09> { [ U1033B, U1033B ] }; // L: 𐌻
|
||||||
|
key <AC10> { [ semicolon, colon ] };
|
||||||
|
key <AC11> { [ apostrophe, quotedbl ] };
|
||||||
|
|
||||||
|
key <AD01> { [ U10335, U10335 ] }; // Q: 𐌵
|
||||||
|
key <AD02> { [ U10345, U10345 ] }; // W: 𐍅
|
||||||
|
key <AD03> { [ U10334, U10334 ] }; // E: 𐌴
|
||||||
|
key <AD04> { [ U10342, U10342 ] }; // R: 𐍂
|
||||||
|
key <AD05> { [ U10344, U10338 ] }; // t: 𐍄 T: 𐌸
|
||||||
|
key <AD06> { [ U10348, U1034A ] }; // y: 𐍈 Y: 𐍊
|
||||||
|
key <AD07> { [ U1033F, U1033F ] }; // U: 𐌿
|
||||||
|
key <AD08> { [ U10339, U10339 ] }; // I: 𐌹
|
||||||
|
key <AD09> { [ U10349, U10349 ] }; // O: 𐍉
|
||||||
|
key <AD10> { [ U10340, U10340 ] }; // P: 𐍀
|
||||||
|
key <AD11> { [ bracketleft, braceleft ] };
|
||||||
|
key <AD12> { [ bracketright, braceright ] };
|
||||||
|
|
||||||
|
key <TLDE> { [ grave, asciitilde ] };
|
||||||
|
key <AE01> { [ 1, exclam ] };
|
||||||
|
key <AE02> { [ 2, at ] };
|
||||||
|
key <AE03> { [ 3, numbersign ] };
|
||||||
|
key <AE04> { [ 4, dollar ] };
|
||||||
|
key <AE05> { [ 5, percent ] };
|
||||||
|
key <AE06> { [ 6, asciicircum ] };
|
||||||
|
key <AE07> { [ 7, ampersand ] };
|
||||||
|
key <AE08> { [ 8, asterisk ] };
|
||||||
|
key <AE09> { [ 9, parenleft ] };
|
||||||
|
key <AE10> { [ 0, parenright ] };
|
||||||
|
key <AE11> { [ minus, underscore ] };
|
||||||
|
key <AE12> { [ equal, plus ] };
|
||||||
|
|
||||||
|
key <AB08> { [ comma, less ] };
|
||||||
|
key <AB09> { [ period, greater ] };
|
||||||
|
key <AB10> { [ slash, question ] };
|
||||||
|
|
||||||
|
key <BKSL> { [ U10B04, U10B05 ] };
|
||||||
|
key <LSGT> { [ U10B04, U10B05 ] };
|
||||||
|
};
|
||||||
@@ -3,19 +3,16 @@
|
|||||||
pkgs,
|
pkgs,
|
||||||
lib,
|
lib,
|
||||||
...
|
...
|
||||||
}: let
|
}:
|
||||||
|
let
|
||||||
davHome = "~/.local/share/dav";
|
davHome = "~/.local/share/dav";
|
||||||
kmeinCloud = {
|
kmeinCloud = {
|
||||||
davEndpoint = "https://cloud.kmein.de/remote.php/dav";
|
davEndpoint = "https://cloud.kmein.de/remote.php/dav";
|
||||||
username = "kieran";
|
username = "kieran";
|
||||||
passwordFile = config.age.secrets.nextcloud-password-kieran.path;
|
passwordFile = config.age.secrets.nextcloud-password-kieran.path;
|
||||||
};
|
};
|
||||||
fysiCloud = {
|
in
|
||||||
davEndpoint = "https://nextcloud.fysi.dev/remote.php/dav";
|
{
|
||||||
username = "kmein";
|
|
||||||
passwordFile = config.age.secrets.nextcloud-password-fysi.path;
|
|
||||||
};
|
|
||||||
in {
|
|
||||||
age.secrets = {
|
age.secrets = {
|
||||||
nextcloud-password-kieran = {
|
nextcloud-password-kieran = {
|
||||||
file = ../secrets/nextcloud-password-kieran.age;
|
file = ../secrets/nextcloud-password-kieran.age;
|
||||||
@@ -23,12 +20,6 @@ in {
|
|||||||
group = config.users.users.me.group;
|
group = config.users.users.me.group;
|
||||||
mode = "400";
|
mode = "400";
|
||||||
};
|
};
|
||||||
nextcloud-password-fysi = {
|
|
||||||
file = ../secrets/nextcloud-password-fysi.age;
|
|
||||||
owner = config.users.users.me.name;
|
|
||||||
group = config.users.users.me.group;
|
|
||||||
mode = "400";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.systemPackages = [
|
environment.systemPackages = [
|
||||||
@@ -50,8 +41,8 @@ in {
|
|||||||
|
|
||||||
systemd.user.services.vdirsyncer = {
|
systemd.user.services.vdirsyncer = {
|
||||||
enable = true;
|
enable = true;
|
||||||
wants = ["network-online.target"];
|
wants = [ "network-online.target" ];
|
||||||
wantedBy = ["default.target"];
|
wantedBy = [ "default.target" ];
|
||||||
startAt = "*:00/10";
|
startAt = "*:00/10";
|
||||||
script = ''
|
script = ''
|
||||||
${pkgs.vdirsyncer}/bin/vdirsyncer sync && ${pkgs.khal}/bin/khal printcalendars # https://lostpackets.de/khal/configure.html#syncing
|
${pkgs.vdirsyncer}/bin/vdirsyncer sync && ${pkgs.khal}/bin/khal printcalendars # https://lostpackets.de/khal/configure.html#syncing
|
||||||
@@ -103,34 +94,9 @@ in {
|
|||||||
"khal/config".text = ''
|
"khal/config".text = ''
|
||||||
[calendars]
|
[calendars]
|
||||||
|
|
||||||
[[alew]]
|
[[kalender_local]]
|
||||||
path = ${davHome}/calendar/alew
|
path = ${davHome}/calendar/*
|
||||||
color = "light gray"
|
type = discover
|
||||||
|
|
||||||
[[personal]]
|
|
||||||
path = ${davHome}/calendar/personal
|
|
||||||
color = "light cyan"
|
|
||||||
|
|
||||||
[[krebs]]
|
|
||||||
path = ${davHome}/calendar/krebs
|
|
||||||
color = "light red"
|
|
||||||
|
|
||||||
[[uni]]
|
|
||||||
path = ${davHome}/calendar/uni-1
|
|
||||||
color = "yellow"
|
|
||||||
|
|
||||||
[[fysi]]
|
|
||||||
path = ${davHome}/calendar/fysi-1
|
|
||||||
color = "light magenta"
|
|
||||||
|
|
||||||
[[fysi_team]]
|
|
||||||
path = ${davHome}/calendar/personal_shared_by_fdf
|
|
||||||
color = "light red"
|
|
||||||
|
|
||||||
[[birthdays]]
|
|
||||||
path = ${davHome}/contacts/contacts
|
|
||||||
type = birthdays
|
|
||||||
color = "light green"
|
|
||||||
|
|
||||||
[default]
|
[default]
|
||||||
highlight_event_days = True
|
highlight_event_days = True
|
||||||
@@ -162,19 +128,7 @@ in {
|
|||||||
[pair kalender]
|
[pair kalender]
|
||||||
a = "kalender_local"
|
a = "kalender_local"
|
||||||
b = "kalender_cloud"
|
b = "kalender_cloud"
|
||||||
collections = ["personal", "alew", "uni-1"]
|
collections = ["from b"]
|
||||||
conflict_resolution = "b wins"
|
|
||||||
|
|
||||||
[pair krebs]
|
|
||||||
a = "kalender_local"
|
|
||||||
b = "krebs_cloud"
|
|
||||||
collections = ["3edef929-d509-7944-2440-000a54f2d054"]
|
|
||||||
conflict_resolution = "b wins"
|
|
||||||
|
|
||||||
[pair fysi]
|
|
||||||
a = "kalender_local"
|
|
||||||
b = "fysi_cloud"
|
|
||||||
collections = ["fysi-1", "personal_shared_by_fdf"]
|
|
||||||
conflict_resolution = "b wins"
|
conflict_resolution = "b wins"
|
||||||
|
|
||||||
[storage kontakte_local]
|
[storage kontakte_local]
|
||||||
@@ -198,18 +152,6 @@ in {
|
|||||||
url = "${kmeinCloud.davEndpoint}/calendars/${kmeinCloud.username}/"
|
url = "${kmeinCloud.davEndpoint}/calendars/${kmeinCloud.username}/"
|
||||||
username = "${kmeinCloud.username}"
|
username = "${kmeinCloud.username}"
|
||||||
password.fetch = ["command", "cat", "${kmeinCloud.passwordFile}"]
|
password.fetch = ["command", "cat", "${kmeinCloud.passwordFile}"]
|
||||||
|
|
||||||
[storage krebs_cloud]
|
|
||||||
type = "caldav"
|
|
||||||
url = "http://calendar.r/krebs/"
|
|
||||||
username = "krebs"
|
|
||||||
password = "krebs"
|
|
||||||
|
|
||||||
[storage fysi_cloud]
|
|
||||||
type = "caldav"
|
|
||||||
url = "${fysiCloud.davEndpoint}/calendars/${fysiCloud.username}/"
|
|
||||||
username = "${fysiCloud.username}"
|
|
||||||
password.fetch = ["command", "cat", "${fysiCloud.passwordFile}"]
|
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -2,10 +2,11 @@
|
|||||||
lib,
|
lib,
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}: {
|
}:
|
||||||
|
{
|
||||||
systemd.services.lb-subscription = {
|
systemd.services.lb-subscription = {
|
||||||
enable = true;
|
enable = true;
|
||||||
wants = ["network-online.target"];
|
wants = [ "network-online.target" ];
|
||||||
startAt = "weekly";
|
startAt = "weekly";
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
user = "kfm";
|
user = "kfm";
|
||||||
|
|||||||
11
configs/lix.nix
Normal file
11
configs/lix.nix
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
{
|
||||||
|
pkgs,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
{
|
||||||
|
nix = {
|
||||||
|
package = lib.mkForce pkgs.lix;
|
||||||
|
settings.experimental-features = [ "nix-command" "flakes" ];
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
{pkgs, ...}: {
|
|
||||||
systemd.services.imaginary-illuminations = {
|
|
||||||
enable = false;
|
|
||||||
wants = ["network-online.target"];
|
|
||||||
serviceConfig = {
|
|
||||||
User = "kfm";
|
|
||||||
Group = "users";
|
|
||||||
WorkingDirectory = "/home/kfm/cloud/Seafile/Documents/Media/imaginary-illuminations";
|
|
||||||
Restart = "on-failure";
|
|
||||||
RestartSec = "15s";
|
|
||||||
};
|
|
||||||
startAt = "7:00";
|
|
||||||
script = ''
|
|
||||||
${pkgs.deno}/bin/deno run -A post.ts
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
systemd.timers.imaginary-illuminations.timerConfig.RandomizedDelaySec = "14h";
|
|
||||||
}
|
|
||||||
@@ -2,6 +2,13 @@
|
|||||||
home-manager.users.me = {
|
home-manager.users.me = {
|
||||||
xdg.mimeApps = {
|
xdg.mimeApps = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
associations = {
|
||||||
|
added = {
|
||||||
|
"x-scheme-handler/tg" = "org.telegram.desktop.desktop";
|
||||||
|
};
|
||||||
|
removed = {
|
||||||
|
};
|
||||||
|
};
|
||||||
defaultApplications = {
|
defaultApplications = {
|
||||||
"application/epub+zip" = "org.pwmt.zathura.desktop";
|
"application/epub+zip" = "org.pwmt.zathura.desktop";
|
||||||
"application/pdf" = "org.pwmt.zathura.desktop";
|
"application/pdf" = "org.pwmt.zathura.desktop";
|
||||||
@@ -19,7 +26,7 @@
|
|||||||
"x-scheme-handler/mailto" = "firefox.desktop";
|
"x-scheme-handler/mailto" = "firefox.desktop";
|
||||||
"x-scheme-handler/unknown" = "firefox.desktop";
|
"x-scheme-handler/unknown" = "firefox.desktop";
|
||||||
"x-scheme-handler/webcal" = "firefox.desktop";
|
"x-scheme-handler/webcal" = "firefox.desktop";
|
||||||
"inode/directory" = "pcmanfm.desktop";
|
"x-scheme-handler/tg" = "org.telegram.desktop.desktop";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -2,7 +2,8 @@
|
|||||||
config,
|
config,
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}: {
|
}:
|
||||||
|
{
|
||||||
services.nginx.virtualHosts.default = {
|
services.nginx.virtualHosts.default = {
|
||||||
locations."= /stub_status".extraConfig = "stub_status;";
|
locations."= /stub_status".extraConfig = "stub_status;";
|
||||||
};
|
};
|
||||||
@@ -41,12 +42,12 @@
|
|||||||
|
|
||||||
systemd.services.promtail = {
|
systemd.services.promtail = {
|
||||||
description = "Promtail service for Loki";
|
description = "Promtail service for Loki";
|
||||||
wantedBy = ["multi-user.target"];
|
wantedBy = [ "multi-user.target" ];
|
||||||
|
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
ExecStart = ''
|
ExecStart = ''
|
||||||
${pkgs.grafana-loki}/bin/promtail --config.file ${
|
${pkgs.grafana-loki}/bin/promtail --config.file ${
|
||||||
(pkgs.formats.yaml {}).generate "promtail.yaml" {
|
(pkgs.formats.yaml { }).generate "promtail.yaml" {
|
||||||
server = {
|
server = {
|
||||||
http_listen_port = 28183;
|
http_listen_port = 28183;
|
||||||
grpc_listen_port = 0;
|
grpc_listen_port = 0;
|
||||||
@@ -55,9 +56,7 @@
|
|||||||
clients = [
|
clients = [
|
||||||
{
|
{
|
||||||
url = "http://${
|
url = "http://${
|
||||||
if config.networking.hostName == "makanek"
|
if config.networking.hostName == "makanek" then "127.0.0.1" else "makanek.r"
|
||||||
then "127.0.0.1"
|
|
||||||
else "makanek.r"
|
|
||||||
}:3100/loki/api/v1/push";
|
}:3100/loki/api/v1/push";
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
@@ -71,7 +70,7 @@
|
|||||||
};
|
};
|
||||||
relabel_configs = [
|
relabel_configs = [
|
||||||
{
|
{
|
||||||
source_labels = ["__journal__systemd_unit"];
|
source_labels = [ "__journal__systemd_unit" ];
|
||||||
target_label = "unit";
|
target_label = "unit";
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user