mirror of
https://github.com/kmein/niveum
synced 2026-03-16 10:11:08 +01:00
Compare commits
1226 Commits
960311c65f
...
feature/sp
| Author | SHA1 | Date | |
|---|---|---|---|
| 2d25c1fc7b | |||
| 9456adc0b5 | |||
| d6372b8d8e | |||
| 5da8218a8f | |||
| 17cbff9917 | |||
| d72c234adb | |||
| ffc5f9b596 | |||
| c20a9e3098 | |||
| 7759cfb35f | |||
| b7a5c3c333 | |||
| 672257fc04 | |||
| fada909105 | |||
| 96d44a52f0 | |||
| 22f957ee1f | |||
| 13e674389d | |||
| f805550ff8 | |||
| a8db4ab8a8 | |||
| 83efbcd61c | |||
| 246b4e1cec | |||
| 29985fffc2 | |||
| 85036b55a5 | |||
| 15c7e5a35a | |||
| c829a3ecac | |||
| ee2b929838 | |||
| 36f5bc6dc0 | |||
| 54793196bc | |||
| bbe6a9efec | |||
| eb5cedabf8 | |||
| a294bf009d | |||
| eb45fe28f6 | |||
| 5e8b1f37c6 | |||
| 7e86718b0f | |||
| 97ae9ec0bf | |||
| a342aa687c | |||
| 0a92d58d00 | |||
| 0955b68054 | |||
| 87ab995b82 | |||
| 743a0f3239 | |||
| fdaa98886e | |||
| e07b053f6e | |||
| ef08f4decd | |||
| e6fb052ab8 | |||
| 11f1be099e | |||
| dc267fc464 | |||
| 24b552b966 | |||
| bc27b8bc64 | |||
| 58ceef04d6 | |||
| bf62f74bc1 | |||
| cbeffcdadd | |||
| 8f4019443d | |||
| eba8788547 | |||
| 3ebf717112 | |||
| 4e6c8e13af | |||
| 18ec46c773 | |||
| 9d61f006a6 | |||
| d2fc37a70f | |||
| e55a99f53d | |||
| 9d096ab4c4 | |||
| ed02741ee0 | |||
| cbd2b8edc2 | |||
| bfd00e9a3b | |||
| ad15c08c05 | |||
| 749e783056 | |||
| cc37e7ab00 | |||
| 0ba9124baa | |||
| b3c996c154 | |||
| b1743f031c | |||
| c9af430f31 | |||
| c51db2b53c | |||
| b98ac4ebce | |||
| d03c6bb0de | |||
| ba27e98297 | |||
| 08cd4b0202 | |||
| 708e2ab1f4 | |||
| 2e482d3fec | |||
| 4fae6d1ed0 | |||
| 9a80eb84d4 | |||
| f7cb9b8957 | |||
| e7c050c1c4 | |||
| c6ab8b4eb7 | |||
| 7d0a802d30 | |||
| eec6cf1bf9 | |||
| 0698624eb8 | |||
| d0eb69229d | |||
| 0f88954989 | |||
| 7c349f1383 | |||
| 0eadbf08df | |||
| 72100329b1 | |||
| bf7b490372 | |||
| dd4083aec5 | |||
| 6edd1c0439 | |||
| 467c80a239 | |||
| b100ea7b28 | |||
| 3cdc468e31 | |||
| 2d19ba7249 | |||
| 7af32a0ad3 | |||
| 0e75118416 | |||
| 139fcae7a0 | |||
| bcfd5d73be | |||
| bcf057e871 | |||
| fad2d0629d | |||
| 27cc5766ee | |||
| 813072e47c | |||
|
|
bcc355f822 | ||
| d8b931af7c | |||
| 4c8d2a051d | |||
| 2906848f92 | |||
| c2a78a88bd | |||
| 63bf7ddeb0 | |||
|
|
19e4e76e6f | ||
| 79e9ab38a8 | |||
| 318687f5cf | |||
| c5a297cd7d | |||
| 6f6100d752 | |||
| 049dadd704 | |||
| 0a4fa2d16f | |||
| f25c59178c | |||
| 88b6802dae | |||
| 5f88e7287b | |||
| abb0be6a17 | |||
| fec8479e90 | |||
| 190a46abcd | |||
| 0a4fccd582 | |||
| 232b6059df | |||
| eb17c7fdd9 | |||
| 1aa7b78b4a | |||
| de6408f28f | |||
| aeed540089 | |||
| d769b79ac3 | |||
| 126dfada4b | |||
|
|
2793d2ca0e | ||
| b536f2af34 | |||
| 41d2a32585 | |||
| 94f2c18432 | |||
| a2e98794cb | |||
| 547d59ee2c | |||
| bc8a035451 | |||
| 36ce5143b4 | |||
| e4514389f1 | |||
| 99bc72eb29 | |||
| 7aee4b566c | |||
| 42cff2dc92 | |||
| 2576637960 | |||
|
|
d83f43a141 | ||
| 218195a781 | |||
| bb8940c9e5 | |||
| e6623e8b4d | |||
| b5514150ab | |||
| 2b2514b2eb | |||
| 3b1af791c9 | |||
| f3e14ffc9e | |||
| f04ca9d1de | |||
| 72b48e90aa | |||
| bd065e7888 | |||
| 45644518bb | |||
| 77ddd1d02f | |||
| 0f5e0e8d6f | |||
| de066361b7 | |||
| ba3a139f8e | |||
| 91fa6faeaf | |||
| e95546ef8a | |||
| b9623e3d57 | |||
| 73929c1963 | |||
| 3197a5a232 | |||
| 6a605633ae | |||
| 52376128a5 | |||
| 4a5bc2d89d | |||
| 3ec22d6ef0 | |||
| 3c86532a5d | |||
| a34b4a8262 | |||
| 3102d6f56c | |||
| a2b65034bf | |||
| 90550dc18b | |||
| 03d40a488b | |||
| 74191a27ee | |||
| a33db562c4 | |||
| 93cc209e52 | |||
| d1b5b0c25c | |||
| ff5bc035c0 | |||
| e06e7bbe0d | |||
| 8786bfad24 | |||
|
|
10949f7746 | ||
| 12e3529df8 | |||
| 4b954a7e83 | |||
| ce99920054 | |||
| c3c0792d50 | |||
| 851a9edc4d | |||
| e69668606e | |||
| 52d73abe06 | |||
| bf899d0bde | |||
| dcf2fa523b | |||
| cae4423fb3 | |||
| 25b37c2b01 | |||
| a4e0e25465 | |||
| 4fa3a3e5fc | |||
| 4950442f8b | |||
| 7252826719 | |||
| a22acd2073 | |||
| 9e85a12084 | |||
| 600d8a5f7d | |||
| 857518578a | |||
| b1fcbcaa96 | |||
| 005e193f56 | |||
| 6e5ff9214e | |||
| 85f3722ba5 | |||
| 797d091643 | |||
| b1544906aa | |||
| c886511c99 | |||
| 7388395908 | |||
| bf42e37daa | |||
| 035fa9e29d | |||
| cc28b894d1 | |||
| c1c1665e50 | |||
| 2dca2596cd | |||
|
|
bede997e7d | ||
| 0082602131 | |||
| 8ffeddb46b | |||
| c06e37f40a | |||
| 8d36a77405 | |||
| 1219517d62 | |||
| 786d1df781 | |||
| c49859900a | |||
| f9ce538975 | |||
| 7d6e7ae1a2 | |||
| 176958cd75 | |||
| 816c21d7de | |||
| 3b1f4799e0 | |||
| c52df45b4f | |||
| 84f83cb6ac | |||
| 652b7d4852 | |||
| e73c139d69 | |||
| 549282140f | |||
| f3bb52e820 | |||
| 717672e86e | |||
| 1cee1c06f7 | |||
| 4d5989aa5b | |||
| 01bdeb05b7 | |||
| 5c422e74e8 | |||
|
|
be3795e957 | ||
| 6063f4c90b | |||
| 7c4557331f | |||
| 8a7e4386fb | |||
| 61ab528d56 | |||
| 032810109c | |||
| 6b0bb6a806 | |||
| 7ce64d461c | |||
| 51afd41254 | |||
| eb4fa1b9bd | |||
| ac7a4b2aa5 | |||
| 89a4b13b2d | |||
| f5da2dffd8 | |||
| cdf42df7c1 | |||
| 3ccf0cfe9a | |||
| 83632cbd9c | |||
|
|
092879a425 | ||
| c6a45b421b | |||
| b5addef848 | |||
| e2cf761aea | |||
| 868dc8a4aa | |||
| dfd4bb0ca8 | |||
| 3e03688c81 | |||
| 3136002449 | |||
| 4cbd2fee7d | |||
| 565c73bd05 | |||
| e5f933977c | |||
| 736b289643 | |||
| e0e0dd9e34 | |||
| 1e2613b838 | |||
| f41ddb654a | |||
| 41ecca8411 | |||
| a80f4d866a | |||
| f56e9aa37b | |||
| 822b0df4b8 | |||
| c16123dc8d | |||
| de34cb6d66 | |||
| 3d6b34572d | |||
| ce0869c64b | |||
| a589332b42 | |||
| 5a6b32e0b4 | |||
| 6cf3072609 | |||
| 4fe122f06c | |||
| 4fa6a62966 | |||
|
|
dbdc876375 | ||
| eb79f88c59 | |||
| 8384363dcb | |||
| 797e53db7a | |||
| 426a82dff9 | |||
| 7264fce03c | |||
| b332784140 | |||
| ed51858a67 | |||
| ba13cd24a1 | |||
| 8331d11a50 | |||
| 79e14bfbc2 | |||
| eed0d0b2af | |||
| 5930340a05 | |||
| a5f6a46262 | |||
| 4eea890efc | |||
| b5232c1d81 | |||
| e1b1458bb0 | |||
| 1c05cccac0 | |||
| 0f80e80d1f | |||
| 06baeb8f1b | |||
| 3b08c19e02 | |||
| 5ad8f2843d | |||
| af3c018cc1 | |||
| 2493206ff9 | |||
| 985ff45e17 | |||
| ee373fcf3d | |||
| 04993972ce | |||
| 972b810d23 | |||
| 34576b51bc | |||
| 5c1f29f2e7 | |||
| bce13c9306 | |||
| b9a3ed40d6 | |||
| 9a11a00e4f | |||
| 5fa7957978 | |||
| 38946d1c20 | |||
| fe07e13848 | |||
| d06a27431c | |||
| e3a6b9ee03 | |||
| 9a2f03beaf | |||
| 5a247d68a0 | |||
| 88a2ace2e0 | |||
| ce17c069e5 | |||
| 4c730f9730 | |||
| 39847fc8fe | |||
| b07d74c72a | |||
| 460dcb5101 | |||
|
|
03b565e8ef | ||
| d97ddf8357 | |||
| a593e6242a | |||
| ecbe639a8c | |||
| dde14495de | |||
|
|
3d3374d296 | ||
| 2fb1274286 | |||
| 2ecf9bd008 | |||
| ea1242933b | |||
| 5bc26ddc12 | |||
| 5a16a90a8a | |||
| 44501db7fb | |||
| f805e3a076 | |||
| e5d63b92d7 | |||
| f9f17b59a7 | |||
| fcdac38986 | |||
| 0a156eaeb8 | |||
| c243dbf180 | |||
| 8b69768c82 | |||
| 61d95a2f00 | |||
| c945a92467 | |||
| 7813ac0eaf | |||
| df94a61b8b | |||
| 06c682619c | |||
| 8e941f60ea | |||
| 5c5a5609cf | |||
| 0121fc152d | |||
| 61dbcd8ffe | |||
| 927da70957 | |||
| b8a55f024b | |||
| 8513b68132 | |||
|
|
bd1bdce121 | ||
| cfaeb824a6 | |||
|
|
9afb27e526 | ||
| 75c825dc25 | |||
| 85f5c71313 | |||
| ddd4bd5720 | |||
|
|
8e74569cc4 | ||
| e15cc88467 | |||
| 20ba241063 | |||
|
|
4c0b065b8f | ||
| 9d8ee97123 | |||
| a451d2af61 | |||
| 365f6f780a | |||
| 8a713a7180 | |||
| 33c3babfc0 | |||
|
|
dea3aa1c5c | ||
|
|
cc90b1bac4 | ||
| 28949a1072 | |||
| 0a6b5300b0 | |||
| b9c34994c2 | |||
| 95f5ee330b | |||
| eb9e7f534d | |||
|
|
64357f4b42 | ||
| 6f31509e50 | |||
| db7cb8c74c | |||
| fbc50a3fea | |||
| 2a33a37d11 | |||
| d7ee9b7c1a | |||
| b142dcdcc3 | |||
| adae22772b | |||
| 0387d5c44b | |||
|
|
72048388dc | ||
| 5253b83eb5 | |||
| 4b073323da | |||
| bf35fb1020 | |||
| 3fa820a65a | |||
| 0ae6397878 | |||
| 35ce4b1689 | |||
| 5b38655575 | |||
| 129127f917 | |||
| 28ee96bc22 | |||
| 238f2126b0 | |||
| 8c1350c570 | |||
| 4d8912b020 | |||
| 588c161f7b | |||
| 5fb0028a9e | |||
| 8d88e58726 | |||
| 203eecddcb | |||
| 2d67488b02 | |||
| 44efc4dfa1 | |||
|
|
e6ac020fd2 | ||
| 9a3499ab6c | |||
| 92442db877 | |||
| d2f85ab972 | |||
| b593f45ec2 | |||
| e9b09a3e67 | |||
| 8c9a44d404 | |||
| 45fdbad259 | |||
| 93b8d31a33 | |||
| abb7924fca | |||
| 0c872352e3 | |||
| 31e765da41 | |||
| d655faef3e | |||
| 2f5b177158 | |||
| 4bc176ea42 | |||
| 4b63d1b671 | |||
| dd86c24506 | |||
| 88c73b23a1 | |||
| 3675ab8161 | |||
|
|
aac1053e1d | ||
| 651f6d9319 | |||
| 69332ec98d | |||
| 6c65a48ea8 | |||
| d25cfe6c9b | |||
| 9cd5974870 | |||
| 8c8eceb01a | |||
| 9601fb9456 | |||
| dc9e84599e | |||
| 94bdfda91b | |||
| 84a69f31de | |||
| dcbe8841ba | |||
| bef795e45c | |||
| 9b7c300466 | |||
| f4fca0a971 | |||
|
|
23b341a314 | ||
| 89c852c4ea | |||
|
|
3fa242b957 | ||
| 35c51b3b17 | |||
| f1c049ada3 | |||
| 8118009acb | |||
| 41706bc84b | |||
| eec7be0c3b | |||
| 2aac2609cb | |||
| 2b7db496b0 | |||
| 0feebd18cd | |||
| 892c758303 | |||
| 8cc3541d2d | |||
| 687aa456d1 | |||
|
|
fd60863f77 | ||
| a60cbab742 | |||
| 54383cb1ab | |||
| 9b414d104a | |||
| 67b7d63d9a | |||
| f3116bfc12 | |||
| f31baf9e56 | |||
| 906cc1981e | |||
| d4e82500ae | |||
| 6aa9be6f70 | |||
| 4e362678ca | |||
| a2081dece4 | |||
| 98cf188a17 | |||
| 4932c7c08a | |||
| c8a6991f09 | |||
| 5d3c9a67ab | |||
|
|
659a888c3d | ||
| 26908b03a3 | |||
| feccea5234 | |||
| 8ffb0bd245 | |||
| c1b777b689 | |||
| e85a8f7634 | |||
| 25bc6f573c | |||
| 4b5915354b | |||
| 43ab6b3210 | |||
| e08eb0e970 | |||
| 012d78cc0e | |||
|
|
62f52922b8 | ||
| 28d359c73b | |||
| 8830147359 | |||
| e9adccacd9 | |||
|
|
588ec3d180 | ||
| 6ea8500818 | |||
| bf6c82a11d | |||
| 9c68ff20bc | |||
| 2565bfbc27 | |||
| a4d002e293 | |||
| 730070bc9d | |||
| 6f1f1887b9 | |||
|
|
68f8bb06f4 | ||
| 7afe712c27 | |||
| 1946a30b2f | |||
| c1f013fc2f | |||
| 3be0766a7a | |||
| 5216f693a1 | |||
| ab3de7a042 | |||
| de6d91297b | |||
| 6342fb9047 | |||
| d37e90cb97 | |||
|
|
13727abfd6 | ||
| a23f0c80a2 | |||
| b0b19c3989 | |||
| ef223a9717 | |||
| ecfc2ca06c | |||
| cd7e688a46 | |||
|
|
f7b9008ed0 | ||
| 81706489b5 | |||
| 817f57ad09 | |||
| eafb1ce0c3 | |||
| 0c72a89760 | |||
| a7db357e54 | |||
| 1ad6c63a2f | |||
| 502ab93585 | |||
|
|
fe6bda3cf2 | ||
| c64e681ada | |||
| af813cc876 | |||
| 704f745f5e | |||
| 93dd8bd702 | |||
| 6e995764d4 | |||
| 87b9fc49ea | |||
| b4e42e6b22 | |||
| 87f73a8fc1 | |||
| db8c06364f | |||
| 24b7044a3f | |||
| 908667267b | |||
| b3090737fd | |||
| f195351474 | |||
| 1cce7dc8df | |||
| 894cc6efef | |||
| f1ed00fe40 | |||
| 7d1e1e712f | |||
| fd1c36874a | |||
| bc52a4a358 | |||
| 5aade69fbe | |||
| 0ead88d04a | |||
| d21ff3e731 | |||
| 7a918319b7 | |||
| 5524f3b92b | |||
| fe8af09148 | |||
| d9ca1e673d | |||
| 2efb8d7d8a | |||
| 4e520a82aa | |||
| 62479936b1 | |||
| 9419bb9bdd | |||
| 07b8813ae8 | |||
| 755105a428 | |||
| ac75dcb826 | |||
| 76e22dba3c | |||
| 6b84a024a2 | |||
| 3f2fb3f5a3 | |||
| 40fa14d4a9 | |||
| 272f2bdefe | |||
| 16b25d4890 | |||
| 638751eb20 | |||
| 8b3a9be9fd | |||
| c3d94e5c49 | |||
| 13b8154a2b | |||
| d17c3e942d | |||
| a8467cfb5a | |||
|
|
4d9867a95d | ||
|
|
c417074b7d | ||
| 9ca72a841d | |||
| 7ec0586cf1 | |||
| 6d681e9f43 | |||
| c9248ae9b9 | |||
| 215bae0b9f | |||
| 6f2aab721d | |||
| 1434290100 | |||
| abcbd4dff9 | |||
| 5dbe6b61d1 | |||
| 0dc1e167fd | |||
| 6f06f0c9ef | |||
| 59894e2734 | |||
| f3835ebd5e | |||
| 20da594f97 | |||
| 30c2bfe598 | |||
| bdc5c147dd | |||
| 59c420e8b0 | |||
| efb8dff677 | |||
| 7518c0f893 | |||
| 1b7e0f903d | |||
|
|
0a8ab261f2 | ||
| 9a2205121b | |||
| 4316c604f6 | |||
| 2ce0a6415f | |||
| fbbc9767a3 | |||
| 356269caf7 | |||
| a001a98f7b | |||
| 2624bf0a50 | |||
| 5186b7ac28 | |||
| 5497739980 | |||
| 5bbb01d275 | |||
| 83837932af | |||
| 72c88d0f38 | |||
| ed646335f1 | |||
| 310e9d8b46 | |||
| a7efa8a822 | |||
| f9ceed1352 | |||
| 630d99e191 | |||
| f0e11f3147 | |||
| c651413768 | |||
| ac7ddcfd1a | |||
| 03c944affd | |||
| 57f440ced5 | |||
| 3528ffbda3 | |||
| 237f7d7c96 | |||
| 7f79744a13 | |||
| f2ff05c47e | |||
| a1b13206f1 | |||
| 20fa2c9b08 | |||
| ff098c1f97 | |||
| 2c03311dc2 | |||
| 56bcc26ed6 | |||
| 2619e6e7b5 | |||
| 85f170743b | |||
| 65532d7d47 | |||
| 2aa19c28bd | |||
| 2e6a802f4a | |||
| 08f0018e1f | |||
| cb4b9133c3 | |||
| b9a812962d | |||
| c243dc4cfd | |||
| 230f6fab0c | |||
| 9c16cc62bc | |||
| 18688f1441 | |||
| 2e0765eede | |||
| df461aa72d | |||
| e76ed000cb | |||
| a83e903488 | |||
| 7c36ea2995 | |||
| 185f752de1 | |||
| 6cb800f024 | |||
| 2217128f32 | |||
| 3ed79dbbfc | |||
| 6c7fa8c1b5 | |||
| c36dc50369 | |||
| 0656b0eaa3 | |||
| 5051938679 | |||
| a3464f3328 | |||
| 9b10c883a5 | |||
| 7c42be3475 | |||
| bee1389d7f | |||
| 508ed2f573 | |||
| 8b605d31a3 | |||
| 8502b2966b | |||
| 79b231e1b6 | |||
| 500a0741d3 | |||
| 53b91eb522 | |||
| 25d2294abc | |||
| f0924d7d57 | |||
| 9ebcf731df | |||
| 49f3d9bdf1 | |||
| 4a56ba5bec | |||
| f4383937a8 | |||
| 04a2c83eb8 | |||
| 0e43cee95f | |||
| 1405c2ca98 | |||
| 072c0a09df | |||
| a0fdfbef2b | |||
| a6792399f1 | |||
| 12cd6230fe | |||
| e800cca766 | |||
| b7646b0500 | |||
| 749582bc9b | |||
| e9ae2ddd59 | |||
| e6462e0c34 | |||
| 127cb41e60 | |||
| a77cbcf919 | |||
| 62fbad949a | |||
| 087c9c0b94 | |||
| 74a437af22 | |||
| e431a89ab2 | |||
| 0d6c540143 | |||
| 5b3aea782b | |||
| 913f60a7f5 | |||
| b877eaa1b7 | |||
| ed788d318f | |||
| 2283dd67c6 | |||
| 8b8e0078c1 | |||
| f7763cb99b | |||
| 58d39aa41a | |||
| 383fb35837 | |||
| 3cb561e6cc | |||
| 2a98e680c2 | |||
| d5087c40b2 | |||
| 23fb65ce1e | |||
| c49a5a4187 | |||
| 42df2c032e | |||
| 86d6943dd2 | |||
| 6f10cd277d | |||
| 869c6e6a08 | |||
| 5b131a5a30 | |||
| 0423429e02 | |||
| f451cc5028 | |||
| 8f9e8db71e | |||
| 81e6b5c9f6 | |||
| 50d8788088 | |||
| 805b46ffb1 | |||
| bc9217ba3e | |||
| db2ec25bc1 | |||
| 33b960143b | |||
| f02225d1e9 | |||
| 9c2e2df05a | |||
| aaeef41f55 | |||
| 0787da719e | |||
| e225a7d451 | |||
| 9d3b29add2 | |||
| 5792224240 | |||
| ecadc12c9f | |||
| 4ecc34b63e | |||
| 48e2be7427 | |||
| 296a3a9c9f | |||
| 0136215a4a | |||
| dd8a885e81 | |||
| e755ee06e2 | |||
| 5ade0a7011 | |||
| bed0795a04 | |||
| 31d59aba6a | |||
| 08c04462a7 | |||
| 7d00a2e896 | |||
| 1027a850fb | |||
| 314134d861 | |||
| 143b2f1a06 | |||
| 02cc600c68 | |||
| 25c48354f7 | |||
| 5b2c2c7709 | |||
| e55cc77825 | |||
| 8a45abae35 | |||
| e046c74539 | |||
| 9dae3e2d1a | |||
| 0fea7ba938 | |||
| edcbe19fb2 | |||
| ee573e13fc | |||
| 83d23f8b55 | |||
| addd7077ed | |||
| ec175ef3d7 | |||
| a7a103c853 | |||
| 2105a5a0fe | |||
| d5a71770a6 | |||
| bff6ede4c1 | |||
| 5a82328b37 | |||
| b3871ba6aa | |||
| 9b68ac87d8 | |||
| bbc50f3642 | |||
| fc067a8493 | |||
| 4ac499530d | |||
| 078b3f6183 | |||
| ca0267ce22 | |||
| 10d003371e | |||
| 33da8389f5 | |||
| 707e1f1565 | |||
| 312dd27f02 | |||
| 5a0f6d3035 | |||
| 77bd1116ea | |||
| 8d4362d903 | |||
| bc4e25a42d | |||
| 96627b6f50 | |||
| 6f2a824d8b | |||
| a65a4b28da | |||
| 41f87bdc37 | |||
| 85ab948ccd | |||
| 9f834e742e | |||
| 416d3ab277 | |||
| 82b9bb2a4c | |||
| 82b650bdbf | |||
| 06125303b8 | |||
| c0efacd6ce | |||
| 2aff28c6ed | |||
| e27db27fd8 | |||
| 683bd2f3be | |||
| 01e3cef34f | |||
| f921d3d3b6 | |||
| ffa3f820ce | |||
| 8738cb4a58 | |||
| a2b706e787 | |||
| 22247715a3 | |||
| bdd4bda339 | |||
| 1002fd8b43 | |||
| 1f48644558 | |||
| da95622df1 | |||
| e275c81257 | |||
| bf7d0165b1 | |||
| cb10b423dc | |||
| a93a34e546 | |||
| c7603af4d0 | |||
| dd685afb7c | |||
| 055b4016e6 | |||
| f361d2b877 | |||
| 8b00faf762 | |||
| f7d72e00b6 | |||
| 087c138906 | |||
| bf8f6d8d52 | |||
| fcf2aa4cca | |||
| 48484514bc | |||
| aa359ad986 | |||
| 2432b0bbaa | |||
| 2b754d4a5b | |||
| f38e5c3295 | |||
| f6b4740b73 | |||
| c06fb3f50c | |||
| 4ae2fa4a6a | |||
| 6809db5ccc | |||
| c9fb802c55 | |||
| 2f4505d29b | |||
| b43de46611 | |||
| 3545c37084 | |||
| 043fe3b67b | |||
| f0779c45c3 | |||
| b7a6fda046 | |||
| e431e0bf03 | |||
| ac54cd5eaf | |||
| 4bd5965915 | |||
| f21112465b | |||
| b989684f12 | |||
| beef73daab | |||
| de3fbfd356 | |||
| a1e88e30a7 | |||
| c50698f275 | |||
| 6119c0dbcc | |||
| 7dd5a9e269 | |||
| 2384a4eef5 | |||
| f6ffd477d1 | |||
| 77fc7e4832 | |||
| 76d75048fa | |||
| 71e65461cf | |||
| 6545b016c5 | |||
| 6eff3d831c | |||
| 80abae0daa | |||
| bbdef3a8ed | |||
| 1f28eb000d | |||
| fb7a295310 | |||
| ad84e0445d | |||
| faac180148 | |||
| 2691608f8c | |||
| 9678ba7b28 | |||
| dc90c4c6ab | |||
| 4c2a4df663 | |||
| c60e90f001 | |||
| d0f1287c68 | |||
| f91004fff6 | |||
| adca14865c | |||
| 4cdf954732 | |||
| e2bd211d4b | |||
| d04c652f61 | |||
| f036e50210 | |||
| 8b8fbeb511 | |||
| 04b40f15e2 | |||
| 70755b3cec | |||
| 3ebd71971d | |||
| ca51f06e2a | |||
| 0e9051aaaa | |||
| d1079fe413 | |||
| 6418b03548 | |||
| ecdfd7953d | |||
| 08ab96c0db | |||
| 5939219f8c | |||
| e2f82c3da8 | |||
| 0dc43c2eff | |||
| 136b04cb3f | |||
| 8af855585b | |||
| 4136e7bf3f | |||
| c365f5f8b2 | |||
| d37393b1ca | |||
| b484f424af | |||
| 15e2cd7e4f | |||
| a88a0f57c2 | |||
| 4d81f0b0ac | |||
| 0971a2c575 | |||
| 18c829f224 | |||
| 865b0b736c | |||
| 84613b8d51 | |||
| 7fcf265ffd | |||
| 5892702841 | |||
| 233fa97da5 | |||
| aeda9e63e6 | |||
| 80d9a1b41c | |||
| 40fd40453f | |||
| 8beb632b1e | |||
| 83c9b0e30c | |||
| 8471f7e1e2 | |||
| 8ff3cab263 | |||
| 321eb82116 | |||
| 9d0dc4397c | |||
| 6ab4332965 | |||
| f00d903043 | |||
| cb1f3ce4f1 | |||
| d3e3bf92eb | |||
| 60e44ae4eb | |||
| 9bc3279f52 | |||
| 2f75f4c3b3 | |||
| f8a3bfe21e | |||
| 56fe6b3f00 | |||
| 8746b4522a | |||
| e8f46cd497 | |||
| 10a4afd59d | |||
| 27499d6a7a | |||
| c20acb75f8 | |||
| 4dd00e1063 | |||
| 20df63014d | |||
| 27a6c5833e | |||
| 2201b192fd | |||
| cf2c0c7a37 | |||
| 3a48c9860b | |||
| 9c44e03215 | |||
| d6c4899dc1 | |||
| 94092fbfeb | |||
| a1e96d67b7 | |||
| a2290fd6f7 | |||
| bc2d4fb005 | |||
| a0096a771d | |||
| eb2f7ea275 | |||
| c2b567664c | |||
| 900839b9b3 | |||
| 6498e5a1da | |||
| 1f971b2a74 | |||
| be178dffc6 | |||
| 934a5840df | |||
| 199ccf7537 | |||
| e479ea36ec | |||
| b8f8e97df1 | |||
| 5e6baef3d2 | |||
| 008db3167d | |||
| 2cbf412f27 | |||
| f1021be262 | |||
| bed819219c | |||
| 0a21d0434c | |||
| 5e34212f5b | |||
| 01925ed0ff | |||
| 1311b64824 | |||
| 2b85e37fb6 | |||
| 6fb75ace21 | |||
| 72135addb0 | |||
| 1ebf7d6cec | |||
| 27442da13d | |||
| 5f0b0beb94 | |||
| 52fd14c4fb | |||
| b33a64796c | |||
| 2a761efc90 | |||
| f320afd838 | |||
| 345fd8159c | |||
| daef8b79d4 | |||
| 6cdfdaf703 | |||
| eca981e5c9 | |||
| 2fee6ae34b | |||
| 6c96c792f0 | |||
| 70414128e5 | |||
| d480eff8cd | |||
| d23d443cc5 | |||
| 1131da55ce | |||
| f5882d1577 | |||
| 39917e0bf6 | |||
| 6727673dcf | |||
| 2b2290841b | |||
| 179b526214 | |||
| 8894fb2a27 | |||
| ed97c13314 | |||
| cd0874f093 | |||
| d67f501452 | |||
| 118dcf3046 | |||
| 7154c84cdc | |||
| 94f0299a75 | |||
| 69354bbd3a | |||
| e6b761da34 | |||
| 724ac3aa99 | |||
| 8880e6814c | |||
| bee54c5f0b | |||
| a5e1ef0a77 | |||
| 8b1dc82eae | |||
| e830c87763 | |||
| 6079c109f9 | |||
| d74b261897 | |||
| fa192a3977 | |||
| fd38db79c0 | |||
| 06eda7cb6f | |||
| 543ea247ed | |||
| 742018dab0 | |||
| 8a8a4aae67 | |||
| e521a82246 | |||
| 78f490cdfb | |||
| b5905f886a | |||
| f1ce023eca | |||
| 13793d3263 | |||
| 99a8ecf876 | |||
| 6a3add22ed | |||
| 83fb13d541 | |||
| e34aecaa66 | |||
| 000091f910 | |||
| c68895cbb8 | |||
| 295dfad33e | |||
| 0f6d9bdc66 | |||
| dcd7a9a4f6 | |||
| 51ca66c383 | |||
| 574fded6e2 | |||
| bdb9220df6 | |||
| aac96c00bf | |||
| 97e61f6eb1 | |||
| 3cb211c682 | |||
| a133f2bb3d | |||
| 7b617aecd8 | |||
| 9f38cc3850 | |||
| e62e28ffb1 | |||
| d3b2ce8277 | |||
| 30b4c6354f | |||
| 7c88a16a32 | |||
| 60dc5a9629 | |||
| 29da1f50cf | |||
| 14cc0ac6aa | |||
| 80e91d1685 | |||
| c17b611af5 | |||
| c85b73a874 | |||
| ff49bb95a7 | |||
| 3a21680812 | |||
| 4f962778b7 | |||
| 4006c36f9b | |||
| eb521b2e0e | |||
| f178daaffd | |||
| f23e644417 | |||
| 0f432025ad | |||
| 7f009cfd08 | |||
| 94cdfa3ea3 | |||
| e75348e1cb | |||
| e13e421b75 | |||
| a3fa195089 | |||
| 35192198a7 | |||
| b93f4a49e0 | |||
| 9a4b9946cb | |||
| 9955d05152 | |||
| 141d5db610 | |||
| a4edbfd29d | |||
| 6f7d5eadbf | |||
| 1d6d8f8249 | |||
| 901ab8d6b0 | |||
| 5249d6ab0d | |||
| 9a00809a2d | |||
| 376a2e115c | |||
| aac1a2e813 | |||
| 28ef523c82 | |||
| c672260930 | |||
| 5cc34626e1 | |||
| 9f1f73ad21 | |||
| 5fdb612033 | |||
| 508bc908ce | |||
| 4cba5a0b8a | |||
| 71b5a8cb24 | |||
| 200bff8386 | |||
| 79fd340f82 | |||
| 69ed97a4ab | |||
| ebbbb537c3 | |||
| 556255ac8b | |||
| 6516c5c9b7 | |||
| b5d32d3962 | |||
| 766874a226 | |||
| 2e9386a6c2 | |||
| 9af10ecf46 | |||
| bd200b655d | |||
| 4adf8fea0a | |||
| 0f0b5658be | |||
| 4f8f3751f4 | |||
| 5b76c1439f | |||
| 3e684ae24a | |||
| 83afa6174a | |||
| 0d483bfc0c | |||
| dea9c3f0ed | |||
| f8b452901f | |||
| 80143fee87 | |||
| 834e5d9ef3 | |||
| 121d5e242f | |||
| b9748964d0 | |||
| 4ab7d0d92e | |||
| 08ada6b818 | |||
| a128813990 | |||
| 5eaee95ba1 | |||
| 5eba5b84f1 | |||
| 2a8495a92c | |||
| 5e62f0363d | |||
| 1c8c210f06 | |||
| 48ce381be0 | |||
| 777f24e37e | |||
| 78a50e9ae3 | |||
| b8967c8e5c | |||
| e3f3e4045a | |||
| 08ce7749b5 | |||
| d7adefc289 | |||
| 7472eb5028 | |||
| f85a8d2737 | |||
| 9724cdda54 | |||
| 6727df461d | |||
| 0f11a9398f | |||
| db07d68a60 | |||
| f4c8094ad8 | |||
| 04247c6ca1 | |||
| d99399009c | |||
| 19c1f7c50d | |||
| a983ce13f8 | |||
| b6fa1fc274 | |||
| 68e60b93ff | |||
| 3aabeea2c3 | |||
| 74c6fcd3a5 | |||
| 392ef95c4f | |||
| 5869807936 | |||
| e2a0ba3eed | |||
| 25c6f97693 | |||
| 12698d9f48 | |||
| 5dccdfee83 | |||
| 8420a2435d | |||
| ed732b3a65 | |||
| cbb676bf00 | |||
| 74b102e55e | |||
| c14f5925e2 | |||
| 9a7b6b020a | |||
| 68338c2791 | |||
| e74f9b6bd0 | |||
| a17201c28d | |||
| 2a94899db5 | |||
| bae1cb485c | |||
| 7f6e00a309 | |||
| 2a5ea9700b | |||
| 8b5bfd236d | |||
| 8302b1d9fb | |||
| 8f66163c39 | |||
| 7ad02f75a9 | |||
| 2f3d4fb3b1 | |||
| 005da63416 | |||
| beaf6c81e4 | |||
| 7c67d3f88a | |||
| 0d20cded25 | |||
| 6c1e8368a1 | |||
| ac1a7ac37e | |||
| 85a6001b53 | |||
| 4e107f3df7 | |||
| 37880ae746 | |||
| 155722a8cd | |||
| 73d71498c7 | |||
| e9b5c2623d | |||
| ddc4ca0db4 | |||
| 8fbaed35f8 | |||
| 87042f5409 | |||
| a9b1a03af1 | |||
| 010d620b76 | |||
| 18033c0e54 | |||
| 5cdf3637a5 | |||
| 9192fa458b | |||
| 40472e2ff8 | |||
| a592947bbf | |||
| 444336cd19 | |||
| 6ef578d644 | |||
| 8e19069d4c | |||
| 42df0dc7df | |||
| d6c10df13e | |||
| 8cbbb4b50d | |||
| bc23d7ac24 | |||
| 40f31fa316 | |||
| f73d8725c4 | |||
| 97fc0f82bf | |||
| ef3d6c4eaf | |||
| c6d7dbe787 | |||
| b9149c8d9a | |||
| 36502ecfd8 | |||
| 43fd4bbf19 | |||
| 37e851cc50 | |||
| 018f79f88d | |||
| 6843ac90b5 | |||
| afb69bf334 | |||
| ea57f539b0 | |||
| 3d10ac09ab | |||
| 38f088d9e5 | |||
| 422f2b8676 | |||
| 7c1ca72a29 | |||
| f171284b71 | |||
| ca50ba931a | |||
| 63ad607d46 | |||
| e553f1bcda | |||
| 8923f7a2c9 | |||
| 07024df1c9 | |||
| cb9bcf2d1d | |||
| 7aeda72026 | |||
| 95c93cc565 | |||
| c9979de250 | |||
| 7889d56b99 | |||
| 03be9636ad | |||
| 5d36ed4cd6 | |||
| c33446aee3 | |||
| fe7744bedb | |||
| 9673e9d3e8 | |||
| 5175f3f819 | |||
| 5923f3341a | |||
| 901cf6f711 | |||
| 859e536159 | |||
| 4ea18d0152 | |||
| c7c7017070 | |||
| 7c80f160db | |||
| 6fce803c70 | |||
| a6bff424b0 | |||
| d61b17c656 | |||
| cbdf8ef038 | |||
| 876dbe785b | |||
| fb4a14a6bf | |||
| 02977ea936 | |||
| dcca34d5c1 | |||
| 8bd8ec611f | |||
| 96a67a937e | |||
| fb85c29651 | |||
| 3344af5339 | |||
| fdfd8a687f | |||
| e804da180d | |||
| 2af8e1aa86 | |||
| 10224de58a | |||
| 2bf095c553 | |||
| a7d994abe7 | |||
| 680997fb12 | |||
| a2d1ab6f53 | |||
| 52761a13e2 | |||
| 98f7de9680 | |||
| 72f04f9391 | |||
| 10ad21a39c | |||
| 5c9e25f27a | |||
| 4b563ddf00 | |||
| d041e6fa52 | |||
| 8749646101 |
38
.bin/256color
Executable file
38
.bin/256color
Executable file
@@ -0,0 +1,38 @@
|
|||||||
|
#! /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
|
||||||
29
.bin/anki-poem.sh
Executable file
29
.bin/anki-poem.sh
Executable file
@@ -0,0 +1,29 @@
|
|||||||
|
#!/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
|
||||||
54
.bin/avesta.sed
Executable file
54
.bin/avesta.sed
Executable file
@@ -0,0 +1,54 @@
|
|||||||
|
#!/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
Executable file
24
.bin/browser
Executable file
@@ -0,0 +1,24 @@
|
|||||||
|
#!/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
Executable file
46
.bin/bvg.sh
Executable file
@@ -0,0 +1,46 @@
|
|||||||
|
#!/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")
|
||||||
|
))
|
||||||
|
'
|
||||||
19
.bin/calendars.sh
Executable file
19
.bin/calendars.sh
Executable file
@@ -0,0 +1,19 @@
|
|||||||
|
#!/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"
|
||||||
25
.bin/candyman
Executable file
25
.bin/candyman
Executable file
@@ -0,0 +1,25 @@
|
|||||||
|
#!/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
|
||||||
13
.bin/countdown
Executable file
13
.bin/countdown
Executable file
@@ -0,0 +1,13 @@
|
|||||||
|
#!/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
|
||||||
|
}
|
||||||
|
}
|
||||||
14
.bin/csv2json
Executable file
14
.bin/csv2json
Executable file
@@ -0,0 +1,14 @@
|
|||||||
|
#!/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)
|
||||||
43
.bin/dummy-alert
Executable file
43
.bin/dummy-alert
Executable file
@@ -0,0 +1,43 @@
|
|||||||
|
#!/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 ""
|
||||||
7
.bin/elm-publish-private
Executable file
7
.bin/elm-publish-private
Executable file
@@ -0,0 +1,7 @@
|
|||||||
|
#! /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 "$@"
|
||||||
34
.bin/horoscope.sh
Normal file
34
.bin/horoscope.sh
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
#!/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"
|
||||||
24
.bin/json2csv
Executable file
24
.bin/json2csv
Executable file
@@ -0,0 +1,24 @@
|
|||||||
|
#!/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)
|
||||||
5
.bin/json2csv.jq
Executable file
5
.bin/json2csv.jq
Executable file
@@ -0,0 +1,5 @@
|
|||||||
|
#!/usr/bin/env -S jq -r -f
|
||||||
|
(map(keys) | add | unique) as $cols
|
||||||
|
| map(. as $row | $cols | map($row[.])) as $rows
|
||||||
|
| $cols, $rows[]
|
||||||
|
| @csv
|
||||||
15
.bin/libib.sh
Executable file
15
.bin/libib.sh
Executable file
@@ -0,0 +1,15 @@
|
|||||||
|
#!/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
|
||||||
81
.bin/lieferando.sh
Normal file
81
.bin/lieferando.sh
Normal file
@@ -0,0 +1,81 @@
|
|||||||
|
#!/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
Normal file
17
.bin/lit.awk
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
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;
|
||||||
|
}
|
||||||
|
}
|
||||||
3
.bin/mail-current-part
Executable file
3
.bin/mail-current-part
Executable file
@@ -0,0 +1,3 @@
|
|||||||
|
#! /bin/sh
|
||||||
|
set -efu
|
||||||
|
exec curl -fSs --unix-socket /tmp/much.api.sock http://localhost/current/part
|
||||||
27
.bin/mail-current-query-find-part-by-name
Executable file
27
.bin/mail-current-query-find-part-by-name
Executable file
@@ -0,0 +1,27 @@
|
|||||||
|
#! /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"
|
||||||
39
.bin/mail-current-query-find-part-by-type
Executable file
39
.bin/mail-current-query-find-part-by-type
Executable file
@@ -0,0 +1,39 @@
|
|||||||
|
#! /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
.bin/mud.sh
Executable file
1
.bin/mud.sh
Executable file
@@ -0,0 +1 @@
|
|||||||
|
ssh mud@hotdog.r -t "MUD_NICKNAME=$LOGNAME mud"
|
||||||
6
.bin/mushakkil.sh
Executable file
6
.bin/mushakkil.sh
Executable file
@@ -0,0 +1,6 @@
|
|||||||
|
#!/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
|
||||||
23
.bin/pdf-ocr.sh
Executable file
23
.bin/pdf-ocr.sh
Executable file
@@ -0,0 +1,23 @@
|
|||||||
|
#!/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
|
||||||
2
.bin/playlist_entries.sh
Executable file
2
.bin/playlist_entries.sh
Executable file
@@ -0,0 +1,2 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
youtube-dl -ij "$*" | jq -sr '.[] | .webpage_url'
|
||||||
65
.bin/prospekte.sh
Executable file
65
.bin/prospekte.sh
Executable file
@@ -0,0 +1,65 @@
|
|||||||
|
#!/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"
|
||||||
17
.bin/proxies.sh
Normal file
17
.bin/proxies.sh
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
#!/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]
|
||||||
|
}
|
||||||
|
)
|
||||||
|
'
|
||||||
4
.bin/readme
Executable file
4
.bin/readme
Executable file
@@ -0,0 +1,4 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
curl -sSL "https://raw.githubusercontent.com/$*/master/README.md" \
|
||||||
|
| pandoc -f gfm -t man -s \
|
||||||
|
| man -l -
|
||||||
6
.bin/sample-pdf.sh
Executable file
6
.bin/sample-pdf.sh
Executable file
@@ -0,0 +1,6 @@
|
|||||||
|
#!/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"
|
||||||
16
.bin/screencap.sh
Executable file
16
.bin/screencap.sh
Executable file
@@ -0,0 +1,16 @@
|
|||||||
|
#! /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 "$@"
|
||||||
49
.bin/space.py
Normal file
49
.bin/space.py
Normal file
@@ -0,0 +1,49 @@
|
|||||||
|
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)
|
||||||
50
.bin/toposort.nix
Normal file
50
.bin/toposort.nix
Normal file
@@ -0,0 +1,50 @@
|
|||||||
|
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;
|
||||||
|
}
|
||||||
18
.bin/ttrss-unread
Executable file
18
.bin/ttrss-unread
Executable file
@@ -0,0 +1,18 @@
|
|||||||
|
#/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
|
||||||
16
.bin/tuesday-1800
Executable file
16
.bin/tuesday-1800
Executable file
@@ -0,0 +1,16 @@
|
|||||||
|
#!/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]
|
||||||
|
'
|
||||||
8
.bin/unicode
Normal file
8
.bin/unicode
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
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)))
|
||||||
26
.bin/watson2fdf.sh
Executable file
26
.bin/watson2fdf.sh
Executable file
@@ -0,0 +1,26 @@
|
|||||||
|
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
|
||||||
|
)
|
||||||
|
'
|
||||||
19
.github/workflows/flake.yml
vendored
Normal file
19
.github/workflows/flake.yml
vendored
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
name: Update flake.lock
|
||||||
|
on:
|
||||||
|
workflow_dispatch: # allows manual triggering
|
||||||
|
schedule:
|
||||||
|
- cron: '0 0 * * 0' # runs weekly on Sunday at 00:00
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
lockfile:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout repository
|
||||||
|
uses: actions/checkout@v2
|
||||||
|
- name: Install Nix
|
||||||
|
uses: cachix/install-nix-action@v16
|
||||||
|
with:
|
||||||
|
extra_nix_config: |
|
||||||
|
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
|
||||||
|
- name: Update flake.lock
|
||||||
|
uses: DeterminateSystems/update-flake-lock@v3
|
||||||
14
.github/workflows/niveum.yml
vendored
Normal file
14
.github/workflows/niveum.yml
vendored
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
name: CI
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
strategy:
|
||||||
|
matrix:
|
||||||
|
system: [makanek,manakish,kabsa,zaatar,ful]
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v2
|
||||||
|
- uses: cachix/install-nix-action@v16
|
||||||
|
- run: nix run .?submodules=1#apps.nixinate.${{matrix.system}}-dry-run
|
||||||
1
.gitignore
vendored
1
.gitignore
vendored
@@ -3,3 +3,4 @@ result
|
|||||||
.envrc
|
.envrc
|
||||||
.history
|
.history
|
||||||
.todo
|
.todo
|
||||||
|
node_modules
|
||||||
|
|||||||
6
.gitmodules
vendored
6
.gitmodules
vendored
@@ -1,3 +1,3 @@
|
|||||||
[submodule "submodules/much"]
|
[submodule "secrets"]
|
||||||
path = submodules/much
|
path = secrets
|
||||||
url = git@github.com:kmein/much
|
url = ssh://gitea@code.kmein.de:22022/kfm/niveum-secrets.git
|
||||||
|
|||||||
@@ -1,10 +0,0 @@
|
|||||||
{
|
|
||||||
"url": "https://github.com/rycee/home-manager.git",
|
|
||||||
"rev": "63f299b3347aea183fc5088e4d6c4a193b334a41",
|
|
||||||
"date": "2020-11-03T23:11:32+01:00",
|
|
||||||
"path": "/nix/store/8ivnh2bjbnyl3aisb83f9z18pgwsca4l-home-manager",
|
|
||||||
"sha256": "0iksjch94wfvyq0cgwv5wq52j0dc9cavm68wka3pahhdvjlxd3js",
|
|
||||||
"fetchSubmodules": false,
|
|
||||||
"deepClone": false,
|
|
||||||
"leaveDotGit": false
|
|
||||||
}
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
{
|
|
||||||
"url": "https://cgit.krebsco.de/krops",
|
|
||||||
"rev": "55aa2c77ce8183f3d2b24f54efa33ab6a42e1e02",
|
|
||||||
"date": "2020-04-19T01:06:20+02:00",
|
|
||||||
"path": "/nix/store/08wg2yrcgkr6iwipjd6g0fbwb7gacqax-krops",
|
|
||||||
"sha256": "00rvx9h596ync8wgic6xc9srzajzm28wlp9q7mv4z0jsb27l5bj8",
|
|
||||||
"fetchSubmodules": false,
|
|
||||||
"deepClone": false,
|
|
||||||
"leaveDotGit": false
|
|
||||||
}
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
{
|
|
||||||
"url": "https://github.com/NixOS/nixpkgs.git",
|
|
||||||
"rev": "0ead6f8cfd461c3a366c8bc9893037afd89f798d",
|
|
||||||
"date": "2020-10-27T18:30:26+01:00",
|
|
||||||
"sha256": "170kziw7bxfm4mwi8q5c2vdpayml0mini4zyxagbvbivivdj5hla",
|
|
||||||
"fetchSubmodules": false
|
|
||||||
}
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
{
|
|
||||||
"url": "https://github.com/NixOS/nixpkgs.git",
|
|
||||||
"rev": "58f9c4c7d3a42c912362ca68577162e38ea8edfb",
|
|
||||||
"date": "2020-11-18T12:49:40-05:00",
|
|
||||||
"path": "/nix/store/nlnshfx9mp77cybwihjxmcw27jn42wsl-nixpkgs",
|
|
||||||
"sha256": "1517dy07jf4zhzknqbgm617lgjxsn7a6k1vgq61c67f6h55qs5ij",
|
|
||||||
"fetchSubmodules": false,
|
|
||||||
"deepClone": false,
|
|
||||||
"leaveDotGit": false
|
|
||||||
}
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
{
|
|
||||||
"url": "https://github.com/krebs/retiolum",
|
|
||||||
"rev": "982ae5aa3ed51fc982e7e872d8131e6f7a96909f",
|
|
||||||
"date": "2020-11-16T18:02:12+01:00",
|
|
||||||
"path": "/nix/store/33sjdb90l2w80wjcqq2ihcb80x984rp2-retiolum",
|
|
||||||
"sha256": "0r9gzzjc1j0issqh4m1ynrk3xa7f44s22h4r0llp8qiiy5b5cxxp",
|
|
||||||
"fetchSubmodules": false,
|
|
||||||
"deepClone": false,
|
|
||||||
"leaveDotGit": false
|
|
||||||
}
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
{
|
|
||||||
"url": "https://github.com/kmein/stockholm",
|
|
||||||
"rev": "f0325bef7954cb946674050847c6d52112cb658f",
|
|
||||||
"date": "2020-11-11T07:45:58+01:00",
|
|
||||||
"path": "/nix/store/lka6fhjfbwdx9bc7lk1bz4gizdv7nrbm-stockholm",
|
|
||||||
"sha256": "0gbw6n5yq36ysc30afa5d2dbsl2d46f73ms6f0rprdbr4nhdw8l2",
|
|
||||||
"fetchSubmodules": false,
|
|
||||||
"deepClone": false,
|
|
||||||
"leaveDotGit": false
|
|
||||||
}
|
|
||||||
10
README.md
Normal file
10
README.md
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
# niveum
|
||||||
|
|
||||||
|
> [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.—
|
||||||
|
>
|
||||||
|
> 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
|
||||||
|
> das ist ja pure poesie —[xkey](https://github.com/riotbib)
|
||||||
394
configs/aerc.nix
Normal file
394
configs/aerc.nix
Normal file
@@ -0,0 +1,394 @@
|
|||||||
|
{
|
||||||
|
pkgs,
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
defaults = {
|
||||||
|
aerc.enable = true;
|
||||||
|
realName = "Kierán Meinhardt";
|
||||||
|
folders.inbox = "INBOX";
|
||||||
|
};
|
||||||
|
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;
|
||||||
|
};
|
||||||
|
in {
|
||||||
|
age.secrets = {
|
||||||
|
email-password-cock = {
|
||||||
|
file = ../secrets/email-password-cock.age;
|
||||||
|
owner = config.users.users.me.name;
|
||||||
|
group = config.users.users.me.group;
|
||||||
|
mode = "400";
|
||||||
|
};
|
||||||
|
email-password-fysi = {
|
||||||
|
file = ../secrets/email-password-fysi.age;
|
||||||
|
owner = config.users.users.me.name;
|
||||||
|
group = config.users.users.me.group;
|
||||||
|
mode = "400";
|
||||||
|
};
|
||||||
|
email-password-posteo = {
|
||||||
|
file = ../secrets/email-password-posteo.age;
|
||||||
|
owner = config.users.users.me.name;
|
||||||
|
group = config.users.users.me.group;
|
||||||
|
mode = "400";
|
||||||
|
};
|
||||||
|
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 = {
|
||||||
|
services.mbsync = {
|
||||||
|
enable = true;
|
||||||
|
frequency = "daily";
|
||||||
|
preExec = "${pkgs.coreutils}/bin/mkdir -p ${config.home-manager.users.me.accounts.email.maildirBasePath}";
|
||||||
|
postExec = "${pkgs.notmuch}/bin/notmuch new";
|
||||||
|
};
|
||||||
|
|
||||||
|
programs.notmuch = {
|
||||||
|
enable = true;
|
||||||
|
extraConfig = {
|
||||||
|
database.path = config.home-manager.users.me.accounts.email.maildirBasePath;
|
||||||
|
new.tags = "";
|
||||||
|
user.name = defaults.realName;
|
||||||
|
user.primary_email = config.home-manager.users.me.accounts.email.accounts.posteo.address;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
programs.mbsync = {
|
||||||
|
enable = true;
|
||||||
|
extraConfig = lib.concatStringsSep "\n\n" (lib.mapAttrsToList (name: account: ''
|
||||||
|
IMAPAccount ${name}
|
||||||
|
CertificateFile /etc/ssl/certs/ca-certificates.crt
|
||||||
|
Host ${account.imap.host}
|
||||||
|
PassCmd "${toString account.passwordCommand}"
|
||||||
|
User ${account.userName}
|
||||||
|
SSLType IMAPS
|
||||||
|
${lib.optionalString (lib.isInt account.imap.port) "Port ${toString account.imap.port}"}
|
||||||
|
|
||||||
|
IMAPStore ${name}-remote
|
||||||
|
Account ${name}
|
||||||
|
|
||||||
|
MaildirStore ${name}-local
|
||||||
|
Path ${config.home-manager.users.me.accounts.email.maildirBasePath}/${name}/
|
||||||
|
SubFolders Verbatim
|
||||||
|
|
||||||
|
Channel ${name}
|
||||||
|
Create Near
|
||||||
|
Expunge None
|
||||||
|
Far :${name}-remote:
|
||||||
|
Near :${name}-local:
|
||||||
|
Patterns *
|
||||||
|
Remove None
|
||||||
|
SyncState *
|
||||||
|
'')
|
||||||
|
config.home-manager.users.me.accounts.email.accounts);
|
||||||
|
};
|
||||||
|
|
||||||
|
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
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
});
|
||||||
|
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";
|
||||||
|
};
|
||||||
|
cock =
|
||||||
|
lib.recursiveUpdate defaults
|
||||||
|
rec {
|
||||||
|
address = "2210@cock.li";
|
||||||
|
userName = address;
|
||||||
|
passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-cock.path}";
|
||||||
|
realName = "";
|
||||||
|
imap.host = "mail.cock.li";
|
||||||
|
smtp.host = imap.host;
|
||||||
|
};
|
||||||
|
posteo =
|
||||||
|
lib.recursiveUpdate defaults
|
||||||
|
rec {
|
||||||
|
address = "kieran.meinhardt@posteo.net";
|
||||||
|
aliases = ["kmein@posteo.de"];
|
||||||
|
userName = address;
|
||||||
|
imap.host = "posteo.de";
|
||||||
|
smtp.host = imap.host;
|
||||||
|
primary = true;
|
||||||
|
passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-posteo.path}";
|
||||||
|
# himalaya = { enable = true; backend = "imap"; sender = "smtp"; };
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
# programs.himalaya.enable = true;
|
||||||
|
|
||||||
|
programs.aerc = {
|
||||||
|
enable = true;
|
||||||
|
|
||||||
|
extraBinds = {
|
||||||
|
# Binds are of the form <key sequence> = <command to run>
|
||||||
|
# To use '=' in a key sequence, substitute it with "Eq": "<Ctrl+Eq>"
|
||||||
|
# If you wish to bind #, you can wrap the key sequence in quotes: "#" = quit
|
||||||
|
global = {
|
||||||
|
"<C-p>" = ":prev-tab<Enter>";
|
||||||
|
"<C-n>" = ":next-tab <Enter>";
|
||||||
|
"<C-t>" = ":term<Enter>";
|
||||||
|
"?" = ":help keys<Enter>";
|
||||||
|
};
|
||||||
|
messages = {
|
||||||
|
q = ":quit<Enter>";
|
||||||
|
j = ":next <Enter>";
|
||||||
|
"<Down>" = ":next<Enter>";
|
||||||
|
"<C-d>" = ":next 50%<Enter>";
|
||||||
|
"<C-f>" = ":next 100%<Enter>";
|
||||||
|
"<PgDn>" = ":next 100%<Enter>";
|
||||||
|
k = ":prev <Enter>";
|
||||||
|
"<Up>" = ":prev<Enter>";
|
||||||
|
"<C-u>" = ":prev 50%<Enter>";
|
||||||
|
"<C-b>" = ":prev 100%<Enter>";
|
||||||
|
"<PgUp>" = ":prev 100%<Enter>";
|
||||||
|
g = ":select 0 <Enter>";
|
||||||
|
G = ":select -1<Enter>";
|
||||||
|
J = ":next-folder <Enter>";
|
||||||
|
K = ":prev-folder<Enter>";
|
||||||
|
H = ":collapse-folder<Enter>";
|
||||||
|
L = ":expand-folder<Enter>";
|
||||||
|
"<space>" = ":read -t<Enter>:next<Enter>";
|
||||||
|
v = ":mark -t<Enter>";
|
||||||
|
V = ":mark -v<Enter>";
|
||||||
|
F = ":flag -t<Enter>";
|
||||||
|
T = ":toggle-threads<Enter>";
|
||||||
|
"<Enter>" = ":view<Enter>";
|
||||||
|
d = ":prompt 'Delete? ' 'delete-message'<Enter>";
|
||||||
|
D = ":move Trash<Enter>";
|
||||||
|
A = ":archive flat<Enter>";
|
||||||
|
C = ":compose<Enter>";
|
||||||
|
rr = ":reply -a<Enter>";
|
||||||
|
rq = ":reply -aq<Enter>";
|
||||||
|
Rr = ":reply<Enter>";
|
||||||
|
Rq = ":reply -q<Enter>";
|
||||||
|
c = ":cf<space>";
|
||||||
|
"$" = ":term<space>";
|
||||||
|
"!" = ":term<space>";
|
||||||
|
"|" = ":pipe<space>";
|
||||||
|
"/" = ":search<space>";
|
||||||
|
"\\" = ":filter <space>";
|
||||||
|
n = ":next-result<Enter>";
|
||||||
|
N = ":prev-result<Enter>";
|
||||||
|
"<Esc>" = ":clear<Enter>";
|
||||||
|
"*" = ":filter -x Flagged<Enter>";
|
||||||
|
};
|
||||||
|
view = {
|
||||||
|
"/" = ":toggle-key-passthrough <Enter> /";
|
||||||
|
q = ":close<Enter>";
|
||||||
|
O = ":open<Enter>";
|
||||||
|
S = ":save<space>";
|
||||||
|
"|" = ":pipe<space>";
|
||||||
|
D = ":move Trash<Enter>";
|
||||||
|
A = ":archive flat<Enter>";
|
||||||
|
"<C-l>" = ":open-link <space>";
|
||||||
|
f = ":forward <Enter>";
|
||||||
|
rr = ":reply -a<Enter>";
|
||||||
|
rq = ":reply -aq<Enter>";
|
||||||
|
Rr = ":reply<Enter>";
|
||||||
|
Rq = ":reply -q<Enter>";
|
||||||
|
H = ":toggle-headers<Enter>";
|
||||||
|
"<C-k>" = ":prev-part<Enter>";
|
||||||
|
"<C-j>" = ":next-part<Enter>";
|
||||||
|
J = ":next <Enter>";
|
||||||
|
K = ":prev<Enter>";
|
||||||
|
};
|
||||||
|
"view::passthrough" = {
|
||||||
|
"$noinherit" = "true";
|
||||||
|
"$ex" = "<C-x>";
|
||||||
|
"<Esc>" = ":toggle-key-passthrough<Enter>";
|
||||||
|
};
|
||||||
|
compose = {
|
||||||
|
# Keybindings used when the embedded terminal is not selected in the compose
|
||||||
|
# view
|
||||||
|
"$noinherit" = "true";
|
||||||
|
"$ex" = "<C-x>";
|
||||||
|
"<C-k>" = ":prev-field<Enter>";
|
||||||
|
"<C-j>" = ":next-field<Enter>";
|
||||||
|
"<tab>" = ":next-field<Enter>";
|
||||||
|
"<C-p>" = ":prev-tab<Enter>";
|
||||||
|
"<C-n>" = ":next-tab<Enter>";
|
||||||
|
};
|
||||||
|
|
||||||
|
"compose::editor" = {
|
||||||
|
# Keybindings used when the embedded terminal is selected in the compose view
|
||||||
|
"$noinherit" = "true";
|
||||||
|
"$ex" = "<C-x>";
|
||||||
|
"<C-k>" = ":prev-field<Enter>";
|
||||||
|
"<C-j>" = ":next-field<Enter>";
|
||||||
|
"<C-p>" = ":prev-tab<Enter>";
|
||||||
|
"<C-n>" = ":next-tab<Enter>";
|
||||||
|
};
|
||||||
|
|
||||||
|
"compose::review" = {
|
||||||
|
# Keybindings used when reviewing a message to be sent
|
||||||
|
y = ":send <Enter>";
|
||||||
|
n = ":abort<Enter>";
|
||||||
|
p = ":postpone<Enter>";
|
||||||
|
q = ":choose -o d discard abort -o p postpone postpone<Enter>";
|
||||||
|
e = ":edit<Enter>";
|
||||||
|
a = ":attach<space>";
|
||||||
|
d = ":detach<space>";
|
||||||
|
};
|
||||||
|
|
||||||
|
terminal = {
|
||||||
|
"$noinherit" = "true";
|
||||||
|
"$ex" = "<C-x>";
|
||||||
|
"<C-p>" = ":prev-tab<Enter>";
|
||||||
|
"<C-n>" = ":next-tab<Enter>";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
extraConfig = {
|
||||||
|
ui.sort = "-r date";
|
||||||
|
ui.timestamp-format = "2006-01-02 15:04";
|
||||||
|
ui.mouse-enabled = true;
|
||||||
|
ui.spinner = ". , .";
|
||||||
|
general.unsafe-accounts-conf = true;
|
||||||
|
general.pgp-provider = "gpg";
|
||||||
|
viewer = {pager = "${pkgs.less}/bin/less -R";};
|
||||||
|
compose = {
|
||||||
|
address-book-cmd = "khard email --remove-first-line --parsable '%s'";
|
||||||
|
no-attachment-warning = "(attach|attached|attachments?|anbei|Anhang|angehängt)";
|
||||||
|
};
|
||||||
|
filters = {
|
||||||
|
"text/plain" = "${pkgs.gawk}/bin/awk -f ${pkgs.aerc}/share/aerc/filters/colorize";
|
||||||
|
"text/calendar" = "${pkgs.gawk}/bin/awk -f ${pkgs.aerc}/share/aerc/filters/calendar";
|
||||||
|
"text/html" = "${pkgs.aerc}/share/aerc/filters/html"; # Requires w3m, dante
|
||||||
|
# "text/html" =
|
||||||
|
# "${pkgs.aerc}/share/aerc/filters/html | ${pkgs.aerc}/share/aerc/filters/colorize";
|
||||||
|
# "text/*" =
|
||||||
|
# ''${pkgs.bat}/bin/bat -fP --file-name="$AERC_FILENAME "'';
|
||||||
|
"message/delivery-status" = "${pkgs.gawk}/bin/awk -f ${pkgs.aerc}/share/aerc/filters/colorize";
|
||||||
|
"message/rfc822" = "${pkgs.gawk}/bin/awk -f ${pkgs.aerc}/share/aerc/filters/colorize";
|
||||||
|
"application/x-sh" = "${pkgs.bat}/bin/bat -fP -l sh";
|
||||||
|
};
|
||||||
|
openers = let
|
||||||
|
as-pdf = pkgs.writers.writeDash "as-pdf" ''
|
||||||
|
d=$(mktemp -d)
|
||||||
|
trap clean EXIT
|
||||||
|
clean() {
|
||||||
|
rm -rf "$d"
|
||||||
|
}
|
||||||
|
${pkgs.libreoffice}/bin/libreoffice --headless --convert-to pdf "$1" --outdir "$d"
|
||||||
|
${pkgs.zathura}/bin/zathura "$d"/*.pdf
|
||||||
|
'';
|
||||||
|
in {
|
||||||
|
"image/*" = "${pkgs.nsxiv}/bin/nsxiv";
|
||||||
|
"application/pdf" = "${pkgs.zathura}/bin/zathura";
|
||||||
|
"application/vnd.openxmlformats-officedocument.wordprocessingml.document" = toString as-pdf;
|
||||||
|
"application/vnd.oasis.opendocument.text" = toString as-pdf;
|
||||||
|
"video/*" = "${pkgs.mpv}/bin/mpv";
|
||||||
|
"audio/*" = "${pkgs.mpv}/bin/mpv";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
templates = {
|
||||||
|
# new_message = "hello!";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -1,46 +1,68 @@
|
|||||||
{ pkgs, lib, config, ... }:
|
{
|
||||||
let
|
pkgs,
|
||||||
inherit (import <niveum/lib>) colours;
|
lib,
|
||||||
colourNames =
|
config,
|
||||||
[ "black" "red" "green" "yellow" "blue" "magenta" "cyan" "white" ];
|
...
|
||||||
colourPairs = lib.getAttrs colourNames colours;
|
}: let
|
||||||
alacrittyConfig = {
|
alacritty-cfg = theme:
|
||||||
background_opacity = 0.9;
|
(pkgs.formats.yaml {}).generate "alacritty.yml" {
|
||||||
colors = {
|
window.opacity = 0.99;
|
||||||
primary = { inherit (colours) background foreground; };
|
bell = {
|
||||||
normal = lib.mapAttrs (_: colour: colour.dark) colourPairs;
|
animation = "EaseOut";
|
||||||
bright = lib.mapAttrs (_: colour: colour.bright) colourPairs;
|
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;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
font = {
|
alacritty-pkg = pkgs.symlinkJoin {
|
||||||
normal.family = "Monospace";
|
name = "alacritty";
|
||||||
size = 6;
|
paths = [
|
||||||
};
|
(pkgs.writers.writeDashBin "alacritty" ''
|
||||||
key_bindings = [
|
${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 "$@"
|
||||||
key = "Add";
|
'')
|
||||||
mods = "Control";
|
pkgs.alacritty
|
||||||
action = "IncreaseFontSize";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
key = "Minus";
|
|
||||||
mods = "Control";
|
|
||||||
action = "DecreaseFontSize";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
key = "Key0";
|
|
||||||
mods = "Control";
|
|
||||||
action = "ResetFontSize";
|
|
||||||
}
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
in {
|
in {
|
||||||
environment.variables.TERMINAL = "alacritty";
|
environment.variables.TERMINAL = "alacritty";
|
||||||
|
|
||||||
environment.systemPackages = [
|
environment.systemPackages = [
|
||||||
pkgs.alacritty
|
alacritty-pkg
|
||||||
];
|
];
|
||||||
|
|
||||||
home-manager.users.me.xdg.configFile = {
|
environment.etc = {
|
||||||
"alacritty/alacritty.yml".text = builtins.toJSON alacrittyConfig;
|
"themes/dark/alacritty.yml".source = alacritty-cfg (import ../lib/colours/owickstrom-dark.nix);
|
||||||
|
"themes/light/alacritty.yml".source = alacritty-cfg (import ../lib/colours/owickstrom-light.nix);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
53
configs/backup.nix
Normal file
53
configs/backup.nix
Normal file
@@ -0,0 +1,53 @@
|
|||||||
|
{
|
||||||
|
pkgs,
|
||||||
|
config,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
inherit (import ../lib) restic;
|
||||||
|
in {
|
||||||
|
services.restic.backups.niveum = {
|
||||||
|
initialize = true;
|
||||||
|
inherit (restic) repository;
|
||||||
|
timerConfig = {
|
||||||
|
OnCalendar = "8:00";
|
||||||
|
RandomizedDelaySec = "1h";
|
||||||
|
};
|
||||||
|
passwordFile = config.age.secrets.restic.path;
|
||||||
|
extraBackupArgs = [
|
||||||
|
"--exclude=/home/kfm/projects/nixpkgs/.git"
|
||||||
|
"--exclude=node_modules"
|
||||||
|
];
|
||||||
|
paths = [
|
||||||
|
"/home/kfm/work"
|
||||||
|
"/home/kfm/projects"
|
||||||
|
"/home/kfm/notes"
|
||||||
|
"/home/kfm/Maildir"
|
||||||
|
"/home/kfm/cloud"
|
||||||
|
"/home/kfm/.gnupg"
|
||||||
|
"/home/kfm/.ssh"
|
||||||
|
"/mnt/sd-card/music"
|
||||||
|
"/mnt/sd-card/Books"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
systemd.services.restic-backups-niveum.serviceConfig = {
|
||||||
|
Restart = "on-failure";
|
||||||
|
RestartSec = "15s";
|
||||||
|
StartLimitIntervalSec = "1m"; # don't try more than 4 times
|
||||||
|
StartLimitBurst = 4;
|
||||||
|
};
|
||||||
|
|
||||||
|
environment.systemPackages = [
|
||||||
|
(pkgs.writers.writeDashBin "restic-niveum" ''
|
||||||
|
${pkgs.restic}/bin/restic -r ${restic.repository} -p ${config.age.secrets.restic.path} "$@"
|
||||||
|
'')
|
||||||
|
(pkgs.writers.writeDashBin "restic-mount" ''
|
||||||
|
mountdir=$(mktemp -d)
|
||||||
|
trap clean EXIT
|
||||||
|
clean() {
|
||||||
|
rm -r "$mountdir"
|
||||||
|
}
|
||||||
|
${pkgs.restic}/bin/restic -r ${restic.repository} -p ${config.age.secrets.restic.path} mount "$mountdir"
|
||||||
|
'')
|
||||||
|
];
|
||||||
|
}
|
||||||
20
configs/battery.nix
Normal file
20
configs/battery.nix
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
|
boot.extraModulePackages = with config.boot.kernelPackages; [
|
||||||
|
tp_smapi
|
||||||
|
acpi_call
|
||||||
|
];
|
||||||
|
boot.kernelModules = ["tp_smapi" "acpi_call"];
|
||||||
|
environment.systemPackages = [pkgs.tpacpi-bat pkgs.powertop];
|
||||||
|
|
||||||
|
services.tlp = {
|
||||||
|
enable = true;
|
||||||
|
settings = {
|
||||||
|
START_CHARGE_THRESH_BAT0 = 80;
|
||||||
|
STOP_CHARGE_THRESH_BAT0 = 95;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
14
configs/beets.nix
Normal file
14
configs/beets.nix
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
{
|
||||||
|
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,11 +1,17 @@
|
|||||||
{ pkgs, lib, ... }: {
|
{
|
||||||
|
pkgs,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
hardware.bluetooth = {
|
hardware.bluetooth = {
|
||||||
enable = true;
|
enable = true;
|
||||||
config.General.Enable =
|
settings.General.Enable =
|
||||||
lib.concatStringsSep "," [ "Source" "Sink" "Media" "Socket" ];
|
lib.concatStringsSep "," ["Source" "Sink" "Media" "Socket"];
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.systemPackages = [ pkgs.blueman ];
|
services.blueman.enable = true;
|
||||||
|
|
||||||
home-manager.users.me = { services.blueman-applet.enable = false; };
|
# environment.systemPackages = [pkgs.blueman];
|
||||||
|
|
||||||
|
home-manager.users.me = {services.blueman-applet.enable = true;};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,44 +0,0 @@
|
|||||||
{ pkgs, lib, ... }:
|
|
||||||
{
|
|
||||||
environment.systemPackages = [ pkgs.calcurse ];
|
|
||||||
|
|
||||||
systemd.services.caldav-sync = {
|
|
||||||
enable = true;
|
|
||||||
wants = [ "network-online.target" ];
|
|
||||||
startAt = "*:0/15";
|
|
||||||
serviceConfig.User = "kfm";
|
|
||||||
script = "${pkgs.calcurse}/bin/calcurse-caldav";
|
|
||||||
};
|
|
||||||
|
|
||||||
home-manager.users.me = {
|
|
||||||
home.file = {
|
|
||||||
".calcurse/conf".text = ''
|
|
||||||
appearance.calendarview=monthly
|
|
||||||
appearance.layout=1
|
|
||||||
daemon.enable=no
|
|
||||||
daemon.log=no
|
|
||||||
format.inputdate=4
|
|
||||||
format.outputdate=%F
|
|
||||||
general.confirmquit=no
|
|
||||||
general.confirmdelete=yes
|
|
||||||
general.firstdayofweek=monday
|
|
||||||
appearance.theme=default on default
|
|
||||||
'';
|
|
||||||
".calcurse/caldav/config".text = lib.generators.toINI {} {
|
|
||||||
General = {
|
|
||||||
Binary = "${pkgs.calcurse}/bin/calcurse";
|
|
||||||
Hostname = "posteo.de:8443";
|
|
||||||
Path = "/calendars/kieran.meinhardt/default/";
|
|
||||||
InsecureSSL = "No";
|
|
||||||
DryRun = "No";
|
|
||||||
Verbose = "Yes";
|
|
||||||
};
|
|
||||||
Auth = {
|
|
||||||
Username = "kieran.meinhardt@posteo.net";
|
|
||||||
Password = lib.strings.fileContents <secrets/mail/posteo>;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
{ pkgs, ... }:
|
{pkgs, ...}:
|
||||||
# https://paste.sr.ht/~erictapen/11716989e489b600f237041b6d657fdf0ee17b34
|
# https://paste.sr.ht/~erictapen/11716989e489b600f237041b6d657fdf0ee17b34
|
||||||
let
|
let
|
||||||
certificate = pkgs.stdenv.mkDerivation rec {
|
certificate = pkgs.stdenv.mkDerivation rec {
|
||||||
@@ -7,7 +7,7 @@ let
|
|||||||
1,/DST Root CA X3/d
|
1,/DST Root CA X3/d
|
||||||
1,/-----END CERTIFICATE-----/p
|
1,/-----END CERTIFICATE-----/p
|
||||||
'';
|
'';
|
||||||
nativeBuildInputs = with pkgs; [ cacert gnused ];
|
nativeBuildInputs = with pkgs; [cacert gnused];
|
||||||
phases = "installPhase";
|
phases = "installPhase";
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
${pkgs.gnused}/bin/sed -n -f $src ${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt > $out
|
${pkgs.gnused}/bin/sed -n -f $src ${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt > $out
|
||||||
|
|||||||
@@ -1,16 +1,97 @@
|
|||||||
{ pkgs, ... }: {
|
{
|
||||||
|
pkgs,
|
||||||
|
config,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
programs.chromium = {
|
programs.chromium = {
|
||||||
enable = true;
|
enable = true;
|
||||||
extensions = [
|
extensions = [
|
||||||
"hdokiejnpimakedhajhdlcegeplioahd" # LastPass
|
|
||||||
# "ihlenndgcmojhcghmfjfneahoeklbjjh" # cVim
|
# "ihlenndgcmojhcghmfjfneahoeklbjjh" # cVim
|
||||||
# "fpnmgdkabkmnadcjpehmlllkndpkmiak" # Wayback Machine
|
# "fpnmgdkabkmnadcjpehmlllkndpkmiak" # Wayback Machine
|
||||||
"cjpalhdlnbpafiamejdnhcphjbkeiagm" # uBlock Origin
|
"cjpalhdlnbpafiamejdnhcphjbkeiagm" # uBlock Origin
|
||||||
"khncfooichmfjbepaaaebmommgaepoid" # Remove YouTube Recommended Videos
|
"pjjgklgkfeoeiebjogplpnibpfnffkng" # undistracted
|
||||||
|
"nhdogjmejiglipccpnnnanhbledajbpd" # vuejs devtools
|
||||||
|
"eimadpbcbfnmbkopoojfekhnkhdbieeh" # dark reader
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.systemPackages = [ pkgs.chromium pkgs.brave ];
|
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";
|
environment.variables.BROWSER = "brave";
|
||||||
}
|
}
|
||||||
|
|||||||
7
configs/clipboard.nix
Normal file
7
configs/clipboard.nix
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
|
services.clipmenu.enable = true;
|
||||||
|
}
|
||||||
@@ -1,22 +1,116 @@
|
|||||||
{ config, lib, pkgs, ... }: {
|
{
|
||||||
imports = [
|
config,
|
||||||
<niveum/modules/seafile.nix>
|
lib,
|
||||||
<niveum/modules/dropbox.nix>
|
pkgs,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
inherit (import ../lib) tmpfilesConfig;
|
||||||
|
in {
|
||||||
|
systemd.tmpfiles.rules = map tmpfilesConfig [
|
||||||
|
{
|
||||||
|
type = "L+";
|
||||||
|
user = config.users.users.me.name;
|
||||||
|
group = "users";
|
||||||
|
mode = "0755";
|
||||||
|
argument = "${config.users.users.me.home}/cloud/Seafile/Uni";
|
||||||
|
path = "${config.users.users.me.home}/uni";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
type = "L+";
|
||||||
|
user = config.users.users.me.name;
|
||||||
|
group = "users";
|
||||||
|
mode = "0755";
|
||||||
|
argument = "${config.users.users.me.home}/cloud/syncthing/common/mahlzeit";
|
||||||
|
path = "${config.users.users.me.home}/mahlzeit";
|
||||||
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
niveum = {
|
home-manager.users.me = {
|
||||||
dropbox.enable = true;
|
services.gnome-keyring.enable = false;
|
||||||
seafile.enable = true;
|
services.nextcloud-client = {
|
||||||
|
enable = false;
|
||||||
|
startInBackground = true;
|
||||||
|
};
|
||||||
|
systemd.user.services.nextcloud-client = {
|
||||||
|
Unit = {
|
||||||
|
Wants = ["gnome-keyring.service"];
|
||||||
|
After = ["gnome-keyring.service"];
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
system.activationScripts.home-symlinks = ''
|
systemd.user.services.nextcloud-syncer = {
|
||||||
ln -sfn ${config.users.users.me.home}/cloud/syncthing/common/mahlzeit ${config.users.users.me.home}/mahlzeit
|
enable = true;
|
||||||
ln -sfn ${config.users.users.me.home}/cloud/Seafile/Wiki ${config.users.users.me.home}/notes
|
wants = ["network-online.target"];
|
||||||
ln -sfn ${config.users.users.me.home}/cloud/Seafile/Uni ${config.users.users.me.home}/uni
|
wantedBy = ["default.target"];
|
||||||
'';
|
startAt = "*:00/10";
|
||||||
|
script = let
|
||||||
|
kieran = {
|
||||||
|
user = "kieran";
|
||||||
|
passwordFile = config.age.secrets.nextcloud-password-kieran.path;
|
||||||
|
endpoint = "https://cloud.xn--kiern-0qa.de";
|
||||||
|
target = "${config.users.users.me.home}/notes";
|
||||||
|
};
|
||||||
|
in ''
|
||||||
|
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 = {
|
||||||
|
Type = "oneshot";
|
||||||
|
Restart = "on-failure";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
home-manager.users.me = {
|
environment.systemPackages = [
|
||||||
services.nextcloud-client.enable = true;
|
(pkgs.writers.writeDashBin "book" ''
|
||||||
|
set -efu
|
||||||
|
book="$({
|
||||||
|
${pkgs.findutils}/bin/find ${config.users.users.me.home}/cloud/syncthing/library -type f
|
||||||
|
${pkgs.findutils}/bin/find ${config.users.users.me.home}/cloud/Seafile/Books -type f
|
||||||
|
} | ${pkgs.fzf}/bin/fzf)"
|
||||||
|
exec ${pkgs.zathura}/bin/zathura "$book"
|
||||||
|
'')
|
||||||
|
(let
|
||||||
|
kieran = {
|
||||||
|
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
|
||||||
|
pkgs.writers.writeDashBin "book-mega" ''
|
||||||
|
set -efu
|
||||||
|
selection="$(${megatools "ls"} | ${pkgs.fzf}/bin/fzf)"
|
||||||
|
test -n "$selection" || exit 1
|
||||||
|
|
||||||
|
tmpdir="$(mktemp -d)"
|
||||||
|
trap clean EXIT
|
||||||
|
clean() {
|
||||||
|
rm -rf "$tmpdir"
|
||||||
|
}
|
||||||
|
|
||||||
|
(
|
||||||
|
cd "$tmpdir"
|
||||||
|
${megatools "get"} "$selection"
|
||||||
|
exec ${pkgs.zathura}/bin/zathura "$(basename "$selection")"
|
||||||
|
)
|
||||||
|
'')
|
||||||
|
];
|
||||||
|
|
||||||
|
age.secrets.mega-password = {
|
||||||
|
file = ../secrets/mega-password.age;
|
||||||
|
owner = config.users.users.me.name;
|
||||||
|
group = config.users.users.me.group;
|
||||||
|
mode = "400";
|
||||||
|
};
|
||||||
|
|
||||||
|
fileSystems."/media/moodle" = {
|
||||||
|
device = "zaatar.r:/moodle";
|
||||||
|
fsType = "nfs";
|
||||||
|
options = [
|
||||||
|
"x-systemd.idle-timeout=600"
|
||||||
|
"noauto"
|
||||||
|
"x-systemd.automount"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
services.syncthing = rec {
|
services.syncthing = rec {
|
||||||
@@ -25,22 +119,19 @@
|
|||||||
openDefaultPorts = true;
|
openDefaultPorts = true;
|
||||||
configDir = "/home/kfm/.config/syncthing";
|
configDir = "/home/kfm/.config/syncthing";
|
||||||
dataDir = "/home/kfm/.config/syncthing";
|
dataDir = "/home/kfm/.config/syncthing";
|
||||||
declarative = rec {
|
cert = config.age.secrets.syncthing-cert.path;
|
||||||
cert = toString <system-secrets/syncthing/cert.pem>;
|
key = config.age.secrets.syncthing-key.path;
|
||||||
key = toString <system-secrets/syncthing/key.pem>;
|
inherit ((import ../lib).syncthing) devices;
|
||||||
inherit ((import <niveum/lib>).syncthing) devices;
|
folders = let
|
||||||
folders =
|
cloud-dir = "${config.users.users.me.home}/cloud";
|
||||||
let cloud-dir = "${config.users.users.me.home}/cloud";
|
in {
|
||||||
in {
|
"${cloud-dir}/syncthing/common".devices = ["kabsa" "manakish"];
|
||||||
"${cloud-dir}/syncthing/common".devices = [ "wilde" "manakish" ];
|
"${cloud-dir}/syncthing/library".devices = ["kabsa" "manakish" "heym"];
|
||||||
"${cloud-dir}/syncthing/library".devices = [ "wilde" "manakish" "heym" ];
|
"${cloud-dir}/syncthing/mundoiu".devices = ["kabsa" "manakish" "heym"];
|
||||||
"${cloud-dir}/syncthing/mundoiu".devices = [ "wilde" "manakish" "heym" ];
|
"${cloud-dir}/syncthing/music" = {
|
||||||
"${cloud-dir}/syncthing/music".devices = [ "wilde" "manakish" "heym" ];
|
devices = ["kabsa" "manakish" "heym" "zaatar"];
|
||||||
"${cloud-dir}/moodle" = {
|
id = "music";
|
||||||
devices = [ "wilde" "toum" "manakish" ];
|
};
|
||||||
id = "moodle-dl";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,25 +0,0 @@
|
|||||||
{
|
|
||||||
services.nginx.virtualHosts."pad.xn--kiern-0qa.de" = {
|
|
||||||
enableACME = true;
|
|
||||||
addSSL = true;
|
|
||||||
locations."/".extraConfig = ''
|
|
||||||
client_max_body_size 4G;
|
|
||||||
proxy_set_header Host $host;
|
|
||||||
proxy_pass http://localhost:3091;
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
services.codimd = {
|
|
||||||
enable = true;
|
|
||||||
configuration = {
|
|
||||||
allowAnonymous = false;
|
|
||||||
allowGravatar = false;
|
|
||||||
db = {
|
|
||||||
dialect = "sqlite";
|
|
||||||
storage = "/var/lib/codimd/db.codimd.sqlite";
|
|
||||||
useCDN = false;
|
|
||||||
};
|
|
||||||
port = 3091;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
{
|
|
||||||
services.compton = {
|
|
||||||
enable = true;
|
|
||||||
shadow = true;
|
|
||||||
menuOpacity = 0.9;
|
|
||||||
shadowOpacity = 0.3;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,52 +1,54 @@
|
|||||||
{ pkgs, lib, config, options, ... }:
|
{
|
||||||
let
|
pkgs,
|
||||||
|
lib,
|
||||||
|
config,
|
||||||
|
niveumPackages,
|
||||||
|
inputs,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
inherit (lib.strings) makeBinPath;
|
inherit (lib.strings) makeBinPath;
|
||||||
inherit (import <niveum/lib>) localAddresses kieran;
|
inherit (import ../lib) localAddresses kieran;
|
||||||
|
defaultApplications = (import ../lib).defaultApplications {inherit pkgs;};
|
||||||
in {
|
in {
|
||||||
imports = [
|
imports = [
|
||||||
<home-manager/nixos>
|
inputs.self.nixosModules.system-dependent
|
||||||
<niveum/modules/system-dependent.nix>
|
inputs.self.nixosModules.traadfri
|
||||||
|
inputs.self.nixosModules.power-action
|
||||||
{
|
{
|
||||||
boot.supportedFilesystems = [ "ntfs" ];
|
boot.supportedFilesystems = ["ntfs"];
|
||||||
}
|
}
|
||||||
{
|
|
||||||
nix.nixPath = [
|
|
||||||
"/var/src"
|
|
||||||
"nixpkgs-overlays=${toString ../overlays}"
|
|
||||||
];
|
|
||||||
}
|
|
||||||
{ services.dbus.packages = [ pkgs.gnome3.dconf ]; }
|
|
||||||
{
|
{
|
||||||
nixpkgs = {
|
nixpkgs = {
|
||||||
config = {
|
config = {
|
||||||
allowUnfree = true;
|
allowUnfree = true;
|
||||||
packageOverrides = pkgs: {
|
packageOverrides = pkgs: {
|
||||||
nur = import (builtins.fetchTarball
|
dmenu = pkgs.writers.writeDashBin "dmenu" ''exec ${pkgs.rofi}/bin/rofi -dmenu "$@"'';
|
||||||
"https://github.com/nix-community/NUR/archive/aea85375c7a82297d977904de8dd7f41baf2d59a.tar.gz") {
|
|
||||||
inherit pkgs;
|
|
||||||
};
|
|
||||||
writeDashBin = pkgs.writers.writeDashBin;
|
|
||||||
writeDash = pkgs.writers.writeDash;
|
|
||||||
gfs-fonts = pkgs.callPackage <niveum/packages/gfs-fonts.nix> {};
|
|
||||||
iolanguage = pkgs.callPackage <niveum/packages/iolanguage.nix> { };
|
|
||||||
ix = pkgs.callPackage <niveum/packages/ix.nix> { };
|
|
||||||
};
|
};
|
||||||
|
permittedInsecurePackages = [
|
||||||
|
"qtwebkit-5.212.0-alpha4"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
overlays = [
|
|
||||||
(self: super: {
|
|
||||||
scripts = import <niveum/packages/scripts> { pkgs = super; lib = super.lib; };
|
|
||||||
})
|
|
||||||
(import <niveum/overlays/toml.nix>)
|
|
||||||
(import <stockholm/krebs/5pkgs/haskell>)
|
|
||||||
(import <stockholm/submodules/nix-writers/pkgs>)
|
|
||||||
(import <stockholm/krebs/5pkgs/override>)
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
boot.cleanTmpDir = true;
|
boot.cleanTmpDir = true;
|
||||||
boot.loader.timeout = 1;
|
boot.loader.timeout = 1;
|
||||||
boot.extraModulePackages = [ config.boot.kernelPackages.exfat-nofuse ];
|
}
|
||||||
|
{
|
||||||
|
age.secrets = {
|
||||||
|
di-fm-key = {
|
||||||
|
file = ../secrets/di-fm-key.age;
|
||||||
|
owner = config.users.users.me.name;
|
||||||
|
group = config.users.users.me.group;
|
||||||
|
mode = "400";
|
||||||
|
};
|
||||||
|
restic = {
|
||||||
|
file = ../secrets/restic.age;
|
||||||
|
owner = config.users.users.me.name;
|
||||||
|
group = config.users.users.me.group;
|
||||||
|
mode = "400";
|
||||||
|
};
|
||||||
|
};
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
home-manager.users.me = {
|
home-manager.users.me = {
|
||||||
@@ -54,6 +56,7 @@ in {
|
|||||||
enable = true;
|
enable = true;
|
||||||
options = {
|
options = {
|
||||||
selection-clipboard = "clipboard";
|
selection-clipboard = "clipboard";
|
||||||
|
recolor-keephue = true;
|
||||||
# first-page-column = "1:1"; # makes side-by-side mode start on the left side
|
# first-page-column = "1:1"; # makes side-by-side mode start on the left side
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
@@ -67,26 +70,15 @@ in {
|
|||||||
users.users.me = {
|
users.users.me = {
|
||||||
name = "kfm";
|
name = "kfm";
|
||||||
description = kieran.name;
|
description = kieran.name;
|
||||||
hashedPassword =
|
hashedPassword = "$6$w9hXyGFl/.IZBXk$5OiWzS1G.5hImhh1YQmZiCXYNAJhi3X6Y3uSLupJNYYXPLMsQpx2fwF4Xr2uYzGMV8Foqh8TgUavx1APD9rcb/";
|
||||||
"$6$w9hXyGFl/.IZBXk$5OiWzS1G.5hImhh1YQmZiCXYNAJhi3X6Y3uSLupJNYYXPLMsQpx2fwF4Xr2uYzGMV8Foqh8TgUavx1APD9rcb/";
|
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
};
|
uid = 1000;
|
||||||
}
|
|
||||||
{
|
|
||||||
sound.enable = true;
|
|
||||||
|
|
||||||
hardware.pulseaudio = {
|
|
||||||
enable = true;
|
|
||||||
package = pkgs.pulseaudioFull; # for bluetooth sound output
|
|
||||||
};
|
};
|
||||||
|
|
||||||
users.users.me.extraGroups = [ "audio" ];
|
home-manager.users.me.xdg.enable = true;
|
||||||
|
|
||||||
environment.systemPackages = [ pkgs.pavucontrol pkgs.pamixer pkgs.pulsemixer ];
|
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
environment.interactiveShellInit =
|
environment.interactiveShellInit = "export PATH=$PATH:$HOME/projects/niveum";
|
||||||
"export PATH=$PATH:$HOME/projects/niveum";
|
|
||||||
environment.shellAliases = let
|
environment.shellAliases = let
|
||||||
wcd = pkgs.writers.writeDash "wcd" ''
|
wcd = pkgs.writers.writeDash "wcd" ''
|
||||||
cd "$(readlink "$(${pkgs.which}/bin/which --skip-alias "$1")" | xargs dirname)/.."
|
cd "$(readlink "$(${pkgs.which}/bin/which --skip-alias "$1")" | xargs dirname)/.."
|
||||||
@@ -97,42 +89,49 @@ in {
|
|||||||
take = pkgs.writers.writeDash "take" ''
|
take = pkgs.writers.writeDash "take" ''
|
||||||
mkdir "$1" && cd "$1"
|
mkdir "$1" && cd "$1"
|
||||||
'';
|
'';
|
||||||
swallow = command: "${pkgs.scripts.swallow}/bin/swallow ${command}";
|
cdt = pkgs.writers.writeDash "cdt" ''
|
||||||
|
cd "$(mktemp -d)"
|
||||||
|
pwd
|
||||||
|
'';
|
||||||
|
swallow = command: "${niveumPackages.swallow}/bin/swallow ${command}";
|
||||||
in {
|
in {
|
||||||
"ß" = "${pkgs.utillinux}/bin/setsid";
|
"ß" = "${pkgs.util-linux}/bin/setsid";
|
||||||
cat = "${pkgs.bat}/bin/bat --style=plain";
|
cat = "${pkgs.bat}/bin/bat --style=plain";
|
||||||
chromium-incognito =
|
chromium-incognito = "chromium --user-data-dir=$(mktemp -d /tmp/chr.XXXXXX) --no-first-run --incognito";
|
||||||
"chromium --user-data-dir=$(mktemp -d /tmp/chr.XXXXXX) --no-first-run --incognito";
|
|
||||||
cp = "cp --interactive";
|
cp = "cp --interactive";
|
||||||
ip = "${pkgs.iproute}/bin/ip -c";
|
ip = "${pkgs.iproute2}/bin/ip -c";
|
||||||
l = "ls --color=auto --time-style=long-iso";
|
l = "ls --color=auto --time-style=long-iso --almost-all";
|
||||||
ls = "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";
|
ll = "ls --color=auto --time-style=long-iso -l";
|
||||||
la = "ls --color=auto --time-style=long-iso --almost-all -l";
|
la = "ls --color=auto --time-style=long-iso --almost-all -l";
|
||||||
mv = "mv --interactive";
|
mv = "mv --interactive";
|
||||||
nixi = "nix repl '<nixpkgs>'";
|
nixi = "nix repl '<nixpkgs>'";
|
||||||
ns = "nix-shell --run zsh";
|
ns = "nix-shell --run zsh";
|
||||||
o = "${pkgs.xdg_utils}/bin/xdg-open";
|
o = "${pkgs.xdg-utils}/bin/xdg-open";
|
||||||
pbcopy = "${pkgs.xclip}/bin/xclip -selection clipboard -in";
|
pbcopy = "${pkgs.xclip}/bin/xclip -selection clipboard -in";
|
||||||
pbpaste = "${pkgs.xclip}/bin/xclip -selection clipboard -out";
|
pbpaste = "${pkgs.xclip}/bin/xclip -selection clipboard -out";
|
||||||
rm = "rm --interactive";
|
rm = "rm --interactive";
|
||||||
s = "${pkgs.systemd}/bin/systemctl";
|
s = "${pkgs.systemd}/bin/systemctl";
|
||||||
take = "source ${take}";
|
take = "source ${take}";
|
||||||
|
cdt = "source ${cdt}";
|
||||||
|
vit = "$EDITOR $(mktemp)";
|
||||||
tmux = "${pkgs.tmux}/bin/tmux -2";
|
tmux = "${pkgs.tmux}/bin/tmux -2";
|
||||||
sxiv = swallow "${pkgs.sxiv}/bin/sxiv";
|
sxiv = swallow "${pkgs.nsxiv}/bin/nsxiv";
|
||||||
zathura = swallow "${pkgs.zathura}/bin/zathura";
|
zathura = swallow "${pkgs.zathura}/bin/zathura";
|
||||||
us = "${pkgs.systemd}/bin/systemctl --user";
|
us = "${pkgs.systemd}/bin/systemctl --user";
|
||||||
wcd = "source ${wcd}";
|
wcd = "source ${wcd}";
|
||||||
weechat = "${pkgs.openssh}/bin/ssh weechat@toum -t screen -x weechat-screen";
|
im = "${pkgs.openssh}/bin/ssh weechat@makanek -t tmux attach-session -t IM";
|
||||||
where = "source ${where}";
|
where = "source ${where}";
|
||||||
yt =
|
yt = "${pkgs.yt-dlp}/bin/yt-dlp --add-metadata -ic"; # Download video link
|
||||||
"${pkgs.youtube-dl}/bin/youtube-dl --add-metadata -ic"; # Download video link
|
yta = "${pkgs.yt-dlp}/bin/yt-dlp --add-metadata -xic"; # Download with audio
|
||||||
yta =
|
};
|
||||||
"${pkgs.youtube-dl}/bin/youtube-dl --add-metadata -xic"; # Download with audio
|
}
|
||||||
|
{
|
||||||
|
i18n = {
|
||||||
|
defaultLocale = "en_DK.UTF-8";
|
||||||
|
supportedLocales = ["all"];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
{ i18n.defaultLocale = "en_GB.UTF-8"; }
|
|
||||||
{ services.illum.enable = true; }
|
|
||||||
{
|
{
|
||||||
services.xserver = {
|
services.xserver = {
|
||||||
enable = true;
|
enable = true;
|
||||||
@@ -145,7 +144,7 @@ in {
|
|||||||
enable = true;
|
enable = true;
|
||||||
greeters.gtk = {
|
greeters.gtk = {
|
||||||
enable = true;
|
enable = true;
|
||||||
indicators = [ "~spacer" "~host" "~spacer" "~session" "~power" ];
|
indicators = ["~spacer" "~host" "~spacer" "~session" "~power"];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
@@ -153,87 +152,130 @@ in {
|
|||||||
}
|
}
|
||||||
{
|
{
|
||||||
security.wrappers = {
|
security.wrappers = {
|
||||||
pmount.source = "${pkgs.pmount}/bin/pmount";
|
pmount = {
|
||||||
pumount.source = "${pkgs.pmount}/bin/pumount";
|
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; }
|
{programs.command-not-found.enable = true;}
|
||||||
{
|
{
|
||||||
programs.gnupg.agent.enable = true;
|
home-manager.users.me = {
|
||||||
|
services.gpg-agent = rec {
|
||||||
|
enable = true;
|
||||||
|
enableZshIntegration = true;
|
||||||
|
defaultCacheTtl = 2 * 60 * 60;
|
||||||
|
maxCacheTtl = 4 * defaultCacheTtl;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
environment.systemPackages = [
|
environment.systemPackages = [
|
||||||
pkgs.gnupg
|
pkgs.gnupg
|
||||||
(pkgs.pass.withExtensions (e: [e.pass-otp]))
|
(pkgs.pass.withExtensions (e: [e.pass-otp e.pass-import e.pass-genphrase]))
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
services.atd.enable = true;
|
services.atd.enable = true;
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
services.mingetty = {
|
services.getty = {
|
||||||
greetingLine = lib.mkForce "";
|
greetingLine = lib.mkForce "";
|
||||||
helpLine = lib.mkForce "";
|
helpLine = lib.mkForce "";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
networking.hosts = lib.mapAttrs' (name: address: {
|
networking.hosts =
|
||||||
name = address;
|
lib.mapAttrs' (name: address: {
|
||||||
value = [ "${name}.local" ];
|
name = address;
|
||||||
}) localAddresses;
|
value = ["${name}.local"];
|
||||||
|
})
|
||||||
|
localAddresses;
|
||||||
|
}
|
||||||
|
{
|
||||||
|
home-manager.users.me.home.stateVersion = "22.05";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
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;
|
||||||
|
home-manager.users.me = {
|
||||||
|
dconf.enable = true;
|
||||||
|
dconf.settings = {
|
||||||
|
# Change the default terminal for Nemo
|
||||||
|
"org/cinnamon/desktop/applications/terminal".exec = defaultApplications.terminal;
|
||||||
|
};
|
||||||
|
};
|
||||||
}
|
}
|
||||||
./alacritty.nix
|
./alacritty.nix
|
||||||
|
./backup.nix
|
||||||
./bash.nix
|
./bash.nix
|
||||||
|
./beets.nix
|
||||||
./bluetooth.nix
|
./bluetooth.nix
|
||||||
|
./aerc.nix
|
||||||
./ccc.nix
|
./ccc.nix
|
||||||
./kleiter.nix
|
./khal.nix
|
||||||
./calcurse.nix
|
|
||||||
./chromium.nix
|
./chromium.nix
|
||||||
|
./clipboard.nix
|
||||||
./cloud.nix
|
./cloud.nix
|
||||||
./compton.nix
|
|
||||||
./direnv.nix
|
./direnv.nix
|
||||||
./distrobump.nix
|
|
||||||
./docker.nix
|
./docker.nix
|
||||||
./dunst.nix
|
./dunst.nix
|
||||||
./flix.nix
|
./flix.nix
|
||||||
./fonts.nix
|
./fonts.nix
|
||||||
./fzf.nix
|
./fzf.nix
|
||||||
./gaslight.nix
|
|
||||||
./git.nix
|
./git.nix
|
||||||
./hledger.nix
|
./hledger.nix
|
||||||
./htop.nix
|
./htop.nix
|
||||||
./hu-berlin.nix
|
./hu-berlin.nix
|
||||||
./i3.nix
|
./i3.nix
|
||||||
./keybase.nix
|
|
||||||
./keyboard.nix
|
./keyboard.nix
|
||||||
./mail.nix
|
./lb.nix
|
||||||
./mpv.nix
|
./mpv.nix
|
||||||
./mime.nix
|
./mime.nix
|
||||||
./nano.nix
|
|
||||||
./neovim.nix
|
./neovim.nix
|
||||||
|
./nix.nix
|
||||||
./newsboat.nix
|
./newsboat.nix
|
||||||
./flameshot-once.nix
|
./flameshot.nix
|
||||||
./packages
|
./packages.nix
|
||||||
|
./picom.nix
|
||||||
|
./stardict.nix
|
||||||
|
./polkit.nix
|
||||||
|
./power-action.nix
|
||||||
./printing.nix
|
./printing.nix
|
||||||
|
# ./openweathermap.nix
|
||||||
./wallpaper.nix
|
./wallpaper.nix
|
||||||
./redshift.nix
|
./redshift.nix
|
||||||
./retiolum.nix
|
./retiolum.nix
|
||||||
./rofi.nix
|
./rofi.nix
|
||||||
./spacetime.nix
|
./spacetime.nix
|
||||||
|
./seafile.nix
|
||||||
./ssh.nix
|
./ssh.nix
|
||||||
./sshd.nix
|
./sshd.nix
|
||||||
|
./sound.nix
|
||||||
./sudo.nix
|
./sudo.nix
|
||||||
./sxiv.nix
|
./themes.nix
|
||||||
./theming.nix
|
|
||||||
./tmux.nix
|
./tmux.nix
|
||||||
./tor.nix
|
|
||||||
./todo-txt.nix
|
|
||||||
./traadfri.nix
|
./traadfri.nix
|
||||||
./unclutter.nix
|
./unclutter.nix
|
||||||
./version.nix
|
|
||||||
./vscode.nix
|
./vscode.nix
|
||||||
./watson.nix
|
./watson.nix
|
||||||
./wifi.nix
|
|
||||||
./xautolock.nix
|
|
||||||
./zsh.nix
|
./zsh.nix
|
||||||
|
./tor.nix
|
||||||
|
./mastodon-bot.nix
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
{ pkgs, ... }:
|
{pkgs, ...}: let
|
||||||
let
|
|
||||||
nixify = pkgs.writers.writeDashBin "nixify" ''
|
nixify = pkgs.writers.writeDashBin "nixify" ''
|
||||||
set -efuC
|
set -efuC
|
||||||
|
|
||||||
@@ -11,26 +10,25 @@ let
|
|||||||
cat > shell.nix <<'EOF'
|
cat > shell.nix <<'EOF'
|
||||||
{ pkgs ? import <nixpkgs> {} }:
|
{ pkgs ? import <nixpkgs> {} }:
|
||||||
pkgs.mkShell {
|
pkgs.mkShell {
|
||||||
buildInputs = with pkgs; [];
|
packages = [];
|
||||||
shellHook = "export HISTFILE=''${toString ./.history}";
|
|
||||||
}
|
}
|
||||||
EOF
|
EOF
|
||||||
''${EDITOR:-vim} shell.nix
|
''${EDITOR:-vim} shell.nix
|
||||||
fi
|
fi
|
||||||
'';
|
'';
|
||||||
in {
|
in {
|
||||||
environment.systemPackages = [ pkgs.direnv nixify ];
|
environment.systemPackages = [pkgs.direnv nixify];
|
||||||
|
|
||||||
home-manager.users.me.programs.direnv = {
|
home-manager.users.me.programs.direnv = {
|
||||||
enable = true;
|
enable = true;
|
||||||
stdlib = builtins.readFile ("${
|
stdlib = builtins.readFile "${
|
||||||
pkgs.fetchFromGitHub {
|
pkgs.fetchFromGitHub {
|
||||||
owner = "Mic92";
|
owner = "Mic92";
|
||||||
repo = "dotfiles";
|
repo = "dotfiles";
|
||||||
rev = "a0a9b7e358fa70a85cd468f8ca1fbb02ae0a91df";
|
rev = "a0a9b7e358fa70a85cd468f8ca1fbb02ae0a91df";
|
||||||
sha256 = "1y9h5s1lf59sczsm0ksq2x1yhl98ba9lwk5yil3q53rg7n4574pg";
|
sha256 = "1y9h5s1lf59sczsm0ksq2x1yhl98ba9lwk5yil3q53rg7n4574pg";
|
||||||
}
|
}
|
||||||
}/home/.direnvrc");
|
}/home/.direnvrc";
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.zsh.interactiveShellInit = ''
|
programs.zsh.interactiveShellInit = ''
|
||||||
|
|||||||
@@ -1,8 +1,13 @@
|
|||||||
{ lib, config, pkgs, ... }: {
|
{
|
||||||
|
lib,
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
imports = [
|
imports = [
|
||||||
(import <stockholm/makefu/3modules/bump-distrowatch.nix> {
|
(import <stockholm/makefu/3modules/bump-distrowatch.nix> {
|
||||||
inherit lib config;
|
inherit lib config;
|
||||||
pkgs = pkgs // { writeDash = pkgs.writers.writeDash; };
|
pkgs = pkgs // {writeDash = pkgs.writers.writeDash;};
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,16 @@
|
|||||||
{ pkgs, ... }: {
|
{
|
||||||
virtualisation.docker.enable = true;
|
lib,
|
||||||
users.users.me.extraGroups = [ "docker" ];
|
pkgs,
|
||||||
environment.systemPackages = [ pkgs.docker pkgs.docker_compose ];
|
...
|
||||||
|
}: {
|
||||||
|
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,6 +1,9 @@
|
|||||||
{ config, pkgs, ... }:
|
{
|
||||||
let
|
config,
|
||||||
inherit (import <niveum/lib>) defaultApplications colours theme;
|
pkgs,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
inherit (import ../lib) defaultApplications colours theme;
|
||||||
in {
|
in {
|
||||||
home-manager.users.me.services.dunst = {
|
home-manager.users.me.services.dunst = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|||||||
@@ -1,25 +0,0 @@
|
|||||||
{ lib, pkgs, ... }:
|
|
||||||
let
|
|
||||||
inherit (import <niveum/lib>) defaultApplications;
|
|
||||||
flameshot-once =
|
|
||||||
pkgs.callPackage <stockholm/krebs/5pkgs/simple/flameshot-once> {};
|
|
||||||
in {
|
|
||||||
nixpkgs.overlays = [
|
|
||||||
(self: super: {
|
|
||||||
xwaitforwindow =
|
|
||||||
super.callPackage <stockholm/krebs/5pkgs/simple/xwaitforwindow.nix> { };
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
environment.systemPackages = [
|
|
||||||
(flameshot-once.override {
|
|
||||||
config.imgur = {
|
|
||||||
enable = true;
|
|
||||||
createUrl = "http://p.r/image";
|
|
||||||
deleteUrl = "http://p.r/image/delete/%1";
|
|
||||||
xdg-open.browser = (defaultApplications pkgs).browser;
|
|
||||||
};
|
|
||||||
config.timeout = 200;
|
|
||||||
})
|
|
||||||
];
|
|
||||||
}
|
|
||||||
23
configs/flameshot.nix
Normal file
23
configs/flameshot.nix
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
{
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
|
home-manager.users.me = {
|
||||||
|
services.flameshot = {
|
||||||
|
enable = true;
|
||||||
|
settings.General = {
|
||||||
|
autoCloseIdleDaemon = true;
|
||||||
|
drawColor = "#ff0000";
|
||||||
|
drawThickness = 2;
|
||||||
|
checkForUpdates = false;
|
||||||
|
showDesktopNotification = true;
|
||||||
|
disabledTrayIcon = true;
|
||||||
|
showHelp = false;
|
||||||
|
squareMagnifier = 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)'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -1,13 +1,19 @@
|
|||||||
{ config, pkgs, ... }:
|
{
|
||||||
let
|
config,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
flixLocation = "/media/flix";
|
flixLocation = "/media/flix";
|
||||||
|
flixLocationNew = "/media/flix-new";
|
||||||
cacheLocation = "/var/cache/flix";
|
cacheLocation = "/var/cache/flix";
|
||||||
indexFilename = "index";
|
indexFilename = "index";
|
||||||
|
indexFilenameNew = "index-new";
|
||||||
flixUser = "flix";
|
flixUser = "flix";
|
||||||
flixGroup = "users";
|
flixGroup = "users";
|
||||||
|
inherit (import ../lib) tmpfilesConfig;
|
||||||
in {
|
in {
|
||||||
fileSystems.${flixLocation} = {
|
fileSystems.${flixLocation} = {
|
||||||
device = "prism.r:/export";
|
device = "prism.r:/export/download";
|
||||||
fsType = "nfs";
|
fsType = "nfs";
|
||||||
options = [
|
options = [
|
||||||
"noauto"
|
"noauto"
|
||||||
@@ -17,20 +23,42 @@ in {
|
|||||||
"x-systemd.device-timeout=1"
|
"x-systemd.device-timeout=1"
|
||||||
"x-systemd.idle-timeout=1min"
|
"x-systemd.idle-timeout=1min"
|
||||||
"x-systemd.requires=tinc.retiolum.service"
|
"x-systemd.requires=tinc.retiolum.service"
|
||||||
"x-systemd.requires=wpa_supplicant.service"
|
|
||||||
"user"
|
"user"
|
||||||
"_netdev"
|
"_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 = [
|
systemd.tmpfiles.rules = [
|
||||||
"d '${cacheLocation}' 0750 ${flixUser} ${flixGroup} - -"
|
(tmpfilesConfig {
|
||||||
|
type = "d";
|
||||||
|
path = cacheLocation;
|
||||||
|
mode = "0750";
|
||||||
|
user = flixUser;
|
||||||
|
group = flixGroup;
|
||||||
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
systemd.services.flix-index = {
|
systemd.services.flix-index = {
|
||||||
description = "Flix indexing service";
|
description = "Flix indexing service";
|
||||||
wants = [ "network-online.target" ];
|
wants = ["network-online.target"];
|
||||||
script = "cp ${flixLocation}/download/index ./${indexFilename}";
|
script = ''
|
||||||
|
cp ${flixLocation}/index ./${indexFilename}
|
||||||
|
cp ${flixLocationNew}/index ./${indexFilenameNew}
|
||||||
|
'';
|
||||||
startAt = "hourly";
|
startAt = "hourly";
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
Type = "oneshot";
|
Type = "oneshot";
|
||||||
@@ -44,19 +72,27 @@ in {
|
|||||||
isSystemUser = true;
|
isSystemUser = true;
|
||||||
createHome = true;
|
createHome = true;
|
||||||
home = cacheLocation;
|
home = cacheLocation;
|
||||||
extraGroups = [ flixGroup ];
|
group = flixGroup;
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.systemPackages = [
|
environment.systemPackages = [
|
||||||
(pkgs.writeDashBin "flixmenu" ''
|
(pkgs.writers.writeDashBin "mpv-simpsons" ''
|
||||||
set -efu
|
set -efu
|
||||||
cd "${flixLocation}/download"
|
cd "${flixLocation}/download"
|
||||||
|
|
||||||
[ -f "${cacheLocation}/${indexFilename}" ] || exit 1
|
[ -f "${cacheLocation}/${indexFilename}" ] || exit 1
|
||||||
|
|
||||||
${pkgs.dmenu}/bin/dmenu -i -p flix -l 5 "$@" < ${cacheLocation}/${indexFilename} \
|
cat "${cacheLocation}/${indexFilename}" \
|
||||||
| ${pkgs.findutils}/bin/xargs -I '{}' ${pkgs.utillinux}/bin/setsid ${pkgs.xdg_utils}/bin/xdg-open '{}'
|
| ${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,35 +1,127 @@
|
|||||||
{ pkgs, ... }: {
|
{
|
||||||
|
pkgs,
|
||||||
|
niveumPackages,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
zip-font = name: arguments: let
|
||||||
|
directory = pkgs.fetchzip arguments;
|
||||||
|
in
|
||||||
|
pkgs.runCommand name {} ''
|
||||||
|
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 '*.otf' -exec install '{}' $out/share/fonts/opentype \;
|
||||||
|
${pkgs.findutils}/bin/find ${directory} -name '*.woff' -exec install '{}' $out/share/fonts/woff \;
|
||||||
|
'';
|
||||||
|
simple-ttf = name: arguments: let
|
||||||
|
file = pkgs.fetchurl arguments;
|
||||||
|
in
|
||||||
|
pkgs.runCommand name {} ''
|
||||||
|
mkdir -p $out/share/fonts/truetype
|
||||||
|
install ${file} $out/share/fonts/truetype
|
||||||
|
'';
|
||||||
|
|
||||||
|
egyptianHiero = zip-font "EgyptianHiero" {
|
||||||
|
url = "https://github.com/MKilani/Djehuty/archive/master.zip";
|
||||||
|
sha256 = "sha256-KbY4vedm757NWfDlgmNhslbZd+2Vs+o5PjtMMGDt61Y=";
|
||||||
|
};
|
||||||
|
antinoou = zip-font "Antinoou" {
|
||||||
|
url = "https://www.evertype.com/fonts/coptic/AntinoouFont.zip";
|
||||||
|
sha256 = "0jwihj08n4yrshcx07dnaml2x9yws6dgyjkvg19jqbz17drbp3sw";
|
||||||
|
stripRoot = false;
|
||||||
|
};
|
||||||
|
newGardiner = zip-font "NewGardiner" {
|
||||||
|
url = "https://mjn.host.cs.st-andrews.ac.uk/egyptian/fonts/NewGardiner.zip";
|
||||||
|
sha256 = "1jd0qa6shh9pqqyig2w43m9l9rv1i50l73jzkhb6g6mqxbhb1mip";
|
||||||
|
stripRoot = false;
|
||||||
|
};
|
||||||
|
junicode2 = zip-font "JunicodeTwo" {
|
||||||
|
url = "https://github.com/psb1558/Junicode-font/archive/48bf476db278c844c67542b04d1e0e4c71f139d2.zip";
|
||||||
|
sha256 = "1ryicc155vkvgv3315ddliigwa01afwyb4c4f6pnqcns03af001i";
|
||||||
|
};
|
||||||
|
newAthenaUnicode = zip-font "NewAthenaUnicode" {
|
||||||
|
url = "https://classicalstudies.org/sites/default/files/userfiles/files/NAU5_005.zip";
|
||||||
|
sha256 = "1g7qk9gl4nq2dz41bvck1nzilhin44j8691cxax3dlp77bbn9bxr";
|
||||||
|
};
|
||||||
|
jsesh = simple-ttf "JSesh" {
|
||||||
|
url = "http://files.qenherkhopeshef.org/jsesh/JSeshFont.ttf";
|
||||||
|
sha256 = "1203jrk2xzvgckcc5hx88kja1i3h8gm1wiyla5j6gspc0hbv56ry";
|
||||||
|
};
|
||||||
|
egyptianText = simple-ttf "EgyptianText-1.0beta" {
|
||||||
|
url = "http://c.krebsco.de/EgyptianText-v1.0-beta.ttf";
|
||||||
|
sha256 = "0cfjbk7xxnxhlp6v922psm5j1xzrv6wfk226ji2wz2yfrnkbcbsv";
|
||||||
|
};
|
||||||
|
in {
|
||||||
fonts = {
|
fonts = {
|
||||||
enableDefaultFonts = true;
|
enableDefaultFonts = true;
|
||||||
enableFontDir = true;
|
fontDir.enable = true;
|
||||||
fonts = with pkgs; [
|
fonts = with pkgs; [
|
||||||
|
alegreya
|
||||||
|
alegreya-sans
|
||||||
|
amiri
|
||||||
|
annapurna-sil
|
||||||
|
antinoou
|
||||||
|
cantarell-fonts
|
||||||
|
cardo
|
||||||
|
charis-sil
|
||||||
|
doulos-sil
|
||||||
|
newAthenaUnicode
|
||||||
corefonts
|
corefonts
|
||||||
|
crimson
|
||||||
eb-garamond
|
eb-garamond
|
||||||
|
jsesh
|
||||||
|
egyptianHiero
|
||||||
|
egyptianText
|
||||||
|
font-awesome_6
|
||||||
|
etBook
|
||||||
|
newGardiner
|
||||||
|
junicode2
|
||||||
|
ezra-sil
|
||||||
fira
|
fira
|
||||||
font-awesome-ttf
|
font-awesome
|
||||||
|
galatia-sil
|
||||||
|
gentium
|
||||||
|
niveumPackages.gfs-fonts
|
||||||
|
gyre-fonts
|
||||||
ibm-plex
|
ibm-plex
|
||||||
inconsolata
|
jetbrains-mono
|
||||||
iosevka
|
libertinus
|
||||||
libertine
|
libre-bodoni
|
||||||
lmodern
|
lmodern
|
||||||
noto-fonts
|
merriweather
|
||||||
|
ocr-a
|
||||||
roboto
|
roboto
|
||||||
roboto-mono
|
roboto-mono
|
||||||
|
noto-fonts
|
||||||
|
noto-fonts-cjk
|
||||||
|
noto-fonts-emoji
|
||||||
roboto-slab
|
roboto-slab
|
||||||
|
scheherazade-new
|
||||||
source-code-pro
|
source-code-pro
|
||||||
source-serif-pro
|
|
||||||
source-sans-pro
|
source-sans-pro
|
||||||
ubuntu_font_family
|
source-serif-pro
|
||||||
gfs-fonts
|
theano
|
||||||
jetbrains-mono
|
niveumPackages.tocharian-font
|
||||||
twemoji-color-font
|
vistafonts
|
||||||
joypixels
|
vollkorn
|
||||||
];
|
zilla-slab
|
||||||
fontconfig.defaultFonts = {
|
]; # google-fonts league-of-moveable-type
|
||||||
monospace = [ "JetBrains Mono" ];
|
fontconfig.defaultFonts = rec {
|
||||||
serif = [ "Source Serif Pro" ];
|
monospace = ["Noto Sans Mono"] ++ emoji;
|
||||||
sansSerif = [ "Source Sans Pro" ];
|
serif = ["Noto Serif" "Noto Naskh Arabic" "Noto Serif Devanagari"];
|
||||||
emoji = [ "JoyPixels" ];
|
sansSerif = ["Noto Sans Display" "Noto Kufi Arabic" "Noto Sans Devanagari" "Noto Sans CJK JP"];
|
||||||
|
emoji = ["Noto Color Emoji"];
|
||||||
};
|
};
|
||||||
|
# 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
|
||||||
|
fontconfig.localConf = ''
|
||||||
|
<fontconfig>
|
||||||
|
<!-- Reject WOFF fonts We don't register WOFF(2) fonts with fontconfig because of the W3C spec -->
|
||||||
|
<selectfont>
|
||||||
|
<rejectfont>
|
||||||
|
<glob>*.woff*</glob>
|
||||||
|
</rejectfont>
|
||||||
|
</selectfont>
|
||||||
|
</fontconfig>
|
||||||
|
'';
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,18 +1,23 @@
|
|||||||
{ pkgs, lib, ... }: {
|
{
|
||||||
|
pkgs,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
environment = {
|
environment = {
|
||||||
systemPackages = [ pkgs.fzf ];
|
systemPackages = [pkgs.fzf];
|
||||||
variables = {
|
variables = rec {
|
||||||
|
FZF_DEFAULT_COMMAND = "${pkgs.fd}/bin/fd --type f --strip-cwd-prefix --follow --no-ignore-vcs --exclude .git";
|
||||||
FZF_DEFAULT_OPTS =
|
FZF_DEFAULT_OPTS =
|
||||||
lib.escapeShellArgs [ "--height=40%" "--layout=reverse" ];
|
lib.escapeShellArgs ["--height=40%"];
|
||||||
FZF_ALT_C_COMMAND = "${pkgs.fd}/bin/fd --type d";
|
FZF_ALT_C_COMMAND = "${pkgs.fd}/bin/fd --type d";
|
||||||
FZF_ALT_C_OPTS = lib.escapeShellArgs [
|
FZF_ALT_C_OPTS = lib.escapeShellArgs [
|
||||||
"--preview='${pkgs.tree}/bin/tree -L 1 \"{}\"'"
|
"--preview='${pkgs.tree}/bin/tree -L 1 \"{}\"'"
|
||||||
"--bind=space:toggle-preview"
|
"--bind=space:toggle-preview"
|
||||||
"--preview-window=hidden"
|
"--preview-window=hidden"
|
||||||
];
|
];
|
||||||
FZF_CTRL_T_COMMAND = "${pkgs.fd}/bin/fd --type f";
|
FZF_CTRL_T_COMMAND = FZF_DEFAULT_COMMAND;
|
||||||
FZF_CTRL_T_OPTS =
|
FZF_CTRL_T_OPTS =
|
||||||
lib.escapeShellArgs [ "--preview='${pkgs.bat}/bin/bat \"{}\"'" ];
|
lib.escapeShellArgs ["--preview='head -$LINES {}'"];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -1,20 +1,25 @@
|
|||||||
{ pkgs, config, lib, ... }:
|
|
||||||
let
|
|
||||||
inherit (import <niveum/lib>) kieran ignorePaths;
|
|
||||||
in
|
|
||||||
{
|
{
|
||||||
|
pkgs,
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
inputs,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
inherit (import ../lib) kieran ignorePaths;
|
||||||
|
in {
|
||||||
environment.systemPackages = [
|
environment.systemPackages = [
|
||||||
pkgs.mr
|
pkgs.mr
|
||||||
pkgs.git
|
pkgs.git
|
||||||
|
pkgs.git-crypt
|
||||||
pkgs.gitAndTools.gitflow
|
pkgs.gitAndTools.gitflow
|
||||||
pkgs.gitAndTools.hub
|
|
||||||
pkgs.gitAndTools.gh
|
pkgs.gitAndTools.gh
|
||||||
pkgs.gitAndTools.git-extras
|
pkgs.gitAndTools.git-extras
|
||||||
pkgs.gitAndTools.git-trim
|
pkgs.gitAndTools.git-trim
|
||||||
|
pkgs.gitAndTools.git-absorb
|
||||||
pkgs.gitstats
|
pkgs.gitstats
|
||||||
pkgs.patch
|
pkgs.patch
|
||||||
pkgs.patchutils
|
pkgs.patchutils
|
||||||
pkgs.git-preview
|
inputs.self.packages.x86_64-linux.git-preview
|
||||||
];
|
];
|
||||||
|
|
||||||
environment.shellAliases = {
|
environment.shellAliases = {
|
||||||
@@ -23,37 +28,6 @@ in
|
|||||||
};
|
};
|
||||||
|
|
||||||
home-manager.users.me = {
|
home-manager.users.me = {
|
||||||
home.file.".mrconfig".text = let
|
|
||||||
prependPath = prefix:
|
|
||||||
lib.attrsets.mapAttrs'
|
|
||||||
(path: lib.attrsets.nameValuePair "${prefix}/${path}");
|
|
||||||
git = url: { checkout = "git clone ${url}"; };
|
|
||||||
github = owner: repo: git "git@github.com:${owner}/${repo}";
|
|
||||||
keybase = owner: repo: git "keybase://private/${owner}/${repo}";
|
|
||||||
in lib.generators.toINI { } ({
|
|
||||||
DEFAULT = { git_gc = ''git gc "$@"''; };
|
|
||||||
} // prependPath "projects" {
|
|
||||||
"menstruation.rs" = github "kmein" "menstruation.rs";
|
|
||||||
brockman = github "kmein" "brockman";
|
|
||||||
challenges = github "kmein" "challenges";
|
|
||||||
conlangs = github "kmein" "conlangs";
|
|
||||||
ledger = keybase "kmein" "ledger";
|
|
||||||
mahlzeit = github "kmein" "mahlzeit";
|
|
||||||
menstruation-telegram = github "kmein" "menstruation-telegram";
|
|
||||||
meteora = github "kmein" "meteora";
|
|
||||||
modernizr = github "kmein" "modernizr";
|
|
||||||
niveum = github "kmein" "niveum";
|
|
||||||
nixpkgs = github "NixOS" "nixpkgs";
|
|
||||||
poetry = github "kmein" "poetry";
|
|
||||||
quotes = github "kmein" "quotes";
|
|
||||||
sphinx = github "kmein" "sphinx";
|
|
||||||
stockholm = git "https://cgit.krebsco.de/stockholm";
|
|
||||||
telebots = github "kmein" "telebots";
|
|
||||||
traadfri = github "kmein" "traadfri";
|
|
||||||
wissen = github "kmein" "wissen";
|
|
||||||
zen = github "kmein" "zen";
|
|
||||||
});
|
|
||||||
|
|
||||||
programs.git = {
|
programs.git = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.gitAndTools.gitFull;
|
package = pkgs.gitAndTools.gitFull;
|
||||||
@@ -70,33 +44,20 @@ in
|
|||||||
diffs = "diff --staged";
|
diffs = "diff --staged";
|
||||||
last = "log -1 HEAD";
|
last = "log -1 HEAD";
|
||||||
logs = "log --pretty=oneline";
|
logs = "log --pretty=oneline";
|
||||||
graph =
|
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";
|
||||||
"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;
|
ignores = ignorePaths;
|
||||||
extraConfig = {
|
extraConfig = {
|
||||||
pull.ff = "only";
|
pull.ff = "only";
|
||||||
rebase.autoStash = true;
|
rebase.autoStash = true;
|
||||||
merge.autoStash = true;
|
merge.autoStash = true;
|
||||||
core.pager =
|
|
||||||
"${pkgs.gitAndTools.diff-so-fancy}/bin/diff-so-fancy | ${pkgs.less}/bin/less --tabs=4 -RFX";
|
# # ref https://github.com/dandavison/delta
|
||||||
color = {
|
# core.pager = "${pkgs.delta}/bin/delta";
|
||||||
ui = true;
|
# interactive.diffFilter = "${pkgs.delta}/bin/delta --color-only";
|
||||||
diff = {
|
# delta.navigate = true;
|
||||||
meta = "11";
|
# merge.conflictStyle = "diff3";
|
||||||
frag = "magenta bold";
|
# diff.colorMoved = "default";
|
||||||
commit = "yellow bold";
|
|
||||||
old = "red bold";
|
|
||||||
new = "green bold";
|
|
||||||
whitespace = "red reverse";
|
|
||||||
};
|
|
||||||
diff-highlight = {
|
|
||||||
oldNormal = "red bold";
|
|
||||||
oldHighlight = "red bold 52";
|
|
||||||
newNormal = "green bold";
|
|
||||||
newHighlight = "green bold 22";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,13 +0,0 @@
|
|||||||
{
|
|
||||||
services.gitea = {
|
|
||||||
enable = true;
|
|
||||||
disableRegistration = true;
|
|
||||||
rootUrl = "https://code.xn--kiern-0qa.de";
|
|
||||||
appName = "code.kierán.de";
|
|
||||||
};
|
|
||||||
services.nginx.virtualHosts."code.xn--kiern-0qa.de" = {
|
|
||||||
forceSSL = true;
|
|
||||||
enableACME = true;
|
|
||||||
locations."/".extraConfig = "proxy_pass http://localhost:3000;";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,61 +0,0 @@
|
|||||||
{ config, pkgs, lib, ... }:
|
|
||||||
let
|
|
||||||
inherit (import ./lib.nix) triggers;
|
|
||||||
inherit (import <niveum/lib>) localAddresses;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
imports = [
|
|
||||||
./zigbee.nix
|
|
||||||
./frontend.nix
|
|
||||||
];
|
|
||||||
|
|
||||||
services.home-assistant = {
|
|
||||||
enable = true;
|
|
||||||
configWritable = true;
|
|
||||||
lovelaceConfigWritable = true;
|
|
||||||
openFirewall = true;
|
|
||||||
config = {
|
|
||||||
homeassistant = {
|
|
||||||
name = "Toum";
|
|
||||||
latitude = config.location.latitude;
|
|
||||||
longitude = config.location.longitude;
|
|
||||||
elevation = 90; # TODO find out how high I live
|
|
||||||
unit_system = "metric";
|
|
||||||
time_zone = config.time.timeZone;
|
|
||||||
};
|
|
||||||
config = {};
|
|
||||||
discovery = {};
|
|
||||||
system_health = {};
|
|
||||||
history = {};
|
|
||||||
# tradfri.host = localAddresses.tradfri; # dont use until python3Packages.pytradfri is packaged
|
|
||||||
sun = {};
|
|
||||||
mobile_app = {};
|
|
||||||
shopping_list = {};
|
|
||||||
sensor = [
|
|
||||||
{
|
|
||||||
platform = "dwd_weather_warnings";
|
|
||||||
region_name = "Berlin";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
mqtt = {
|
|
||||||
broker = "localhost";
|
|
||||||
port = 1883;
|
|
||||||
client_id = "home-assistant";
|
|
||||||
username = "albrecht";
|
|
||||||
password = lib.strings.fileContents <system-secrets/mosquitto>;
|
|
||||||
keepalive = 60;
|
|
||||||
protocol = "3.1";
|
|
||||||
|
|
||||||
discovery = true;
|
|
||||||
birth_message = {
|
|
||||||
topic = "/hass/status";
|
|
||||||
payload = "online";
|
|
||||||
};
|
|
||||||
will_message = {
|
|
||||||
topic = "/hass/status";
|
|
||||||
payload = "offline";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,37 +0,0 @@
|
|||||||
let
|
|
||||||
inherit (import ./lib.nix) triggers;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
services.home-assistant.config = {
|
|
||||||
frontend = {
|
|
||||||
themes = {
|
|
||||||
day_theme = import ./themes/clear.nix;
|
|
||||||
night_theme = import ./themes/clear-dark.nix;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
automation = [
|
|
||||||
{
|
|
||||||
alias = "Night Theme";
|
|
||||||
hide_entity = true;
|
|
||||||
trigger = triggers.night;
|
|
||||||
action = [
|
|
||||||
{
|
|
||||||
service = "frontend.set_theme";
|
|
||||||
data.name = "night_theme";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
}
|
|
||||||
{
|
|
||||||
alias = "Day Theme";
|
|
||||||
hide_entity = true;
|
|
||||||
trigger = triggers.day;
|
|
||||||
action = [
|
|
||||||
{
|
|
||||||
service = "frontend.set_theme";
|
|
||||||
data.name = "day_theme";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
{
|
|
||||||
triggers = {
|
|
||||||
night = {
|
|
||||||
platform = "numeric_state";
|
|
||||||
entity_id = "sun.sun";
|
|
||||||
value_template = "{{ state.attributes.elevation }}";
|
|
||||||
below = -4.0;
|
|
||||||
};
|
|
||||||
day = {
|
|
||||||
platform = "numeric_state";
|
|
||||||
entity_id = "sun.sun";
|
|
||||||
value_template = "{{ state.attributes.elevation }}";
|
|
||||||
above = 0;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,72 +0,0 @@
|
|||||||
rec {
|
|
||||||
# Colors
|
|
||||||
text-color = "#DADADB"; # Grey text
|
|
||||||
text-medium-light-color = "#A0A2A8"; # Medium-light grey text
|
|
||||||
text-medium-color = "#80828A"; # Medium grey text
|
|
||||||
text-dark-color = "#6A6B74"; # Dark grey text
|
|
||||||
accent-color = "#008bef"; # Blue
|
|
||||||
accent-medium-color = "#2484C9"; # Decent blue
|
|
||||||
background-color = "#3b4049"; # Dark grey background
|
|
||||||
background-color-2 = "#484E59"; # Light grey background
|
|
||||||
background-card-color = "#434952"; # Grey background
|
|
||||||
border-color = "#383C46"; # Grey border
|
|
||||||
|
|
||||||
# Header
|
|
||||||
app-header-background-color = "#363941"; # Background color
|
|
||||||
|
|
||||||
# Text
|
|
||||||
primary-color = text-color;
|
|
||||||
text-primary-color = text-color;
|
|
||||||
|
|
||||||
# Left Menu
|
|
||||||
paper-listbox-background-color = background-color; # Background
|
|
||||||
sidebar-icon-color = text-medium-color; # icons
|
|
||||||
sidebar-selected-icon-color = text-medium-light-color; # Selected row icon and background (15%)
|
|
||||||
sidebar-selected-text-color = text-color; # Selected row label
|
|
||||||
|
|
||||||
# UI
|
|
||||||
paper-card-header-color = text-color; # Title in settings
|
|
||||||
primary-background-color = background-color; # Background (also title background in left menu)
|
|
||||||
mdc-theme-primary = accent-medium-color; # Action Buttons (save, restart etc.)
|
|
||||||
card-background-color = background-card-color; # Entity Registry Background
|
|
||||||
|
|
||||||
# Card
|
|
||||||
paper-card-background-color = background-card-color; # Background
|
|
||||||
dark-primary-color = text-color;
|
|
||||||
primary-text-color = text-color;
|
|
||||||
paper-listbox-color = text-color;
|
|
||||||
light-primary-color = text-dark-color;
|
|
||||||
secondary-text-color = text-medium-color;
|
|
||||||
disabled-text-color = text-dark-color;
|
|
||||||
paper-dialog-button-color = text-color;
|
|
||||||
secondary-background-color = background-color-2; # Background more info title
|
|
||||||
|
|
||||||
# Icons
|
|
||||||
paper-item-icon-color = text-dark-color; # Off
|
|
||||||
paper-item-icon-active-color = accent-color; # On
|
|
||||||
|
|
||||||
# Switches
|
|
||||||
switch-checked-button-color = text-medium-light-color; # Knob On
|
|
||||||
switch-unchecked-button-color = text-medium-light-color; # Knob Off
|
|
||||||
switch-checked-track-color = "#009FFF"; # Background On
|
|
||||||
switch-unchecked-track-color = "#767682"; # Background Off
|
|
||||||
|
|
||||||
# Slider
|
|
||||||
paper-slider-active-color = accent-color; # Line On
|
|
||||||
paper-slider-knob-color = text-medium-light-color; # Knob On
|
|
||||||
paper-slider-container-color = text-dark-color; # Line Off
|
|
||||||
paper-slider-knob-start-color = text-medium-light-color; # Knob Off
|
|
||||||
|
|
||||||
# Badges
|
|
||||||
label-badge-text-color = text-color;
|
|
||||||
label-badge-background-color = "rgba(54, 57, 65, 0.6)";
|
|
||||||
|
|
||||||
# Shadows
|
|
||||||
ha-card-box-shadow = "inset 0px 0px 0px 1px var(--border-color)";
|
|
||||||
|
|
||||||
# HACS
|
|
||||||
hacs-badge-color = accent-color; # New Badge
|
|
||||||
hacs-status-installed = text-color; # Installed Icon
|
|
||||||
hacs-status-pending-restart = text-dark-color; # Restart Icon
|
|
||||||
hacs-status-pending-update = accent-color;
|
|
||||||
}
|
|
||||||
@@ -1,52 +0,0 @@
|
|||||||
rec {
|
|
||||||
text-color = "#636B75"; # Grey text
|
|
||||||
text-medium-color = "#8c96a5"; # Medium grey text
|
|
||||||
text-light-color = "#BAC0C6"; # Light grey text
|
|
||||||
accent-color = "#00a1ff"; # Blue
|
|
||||||
background-color = "#F7F8F9"; # Light grey background
|
|
||||||
background-color-2 = "#F4F5F6"; # Light grey background
|
|
||||||
background-card-color = "rgba(255,255,255,1.0)"; # White background
|
|
||||||
border-color = "#E8E8E8"; # Light grey border
|
|
||||||
|
|
||||||
# Header
|
|
||||||
primary-color = text-color; # Background
|
|
||||||
text-primary-color = "#FFF"; # Text
|
|
||||||
|
|
||||||
# Left Menu
|
|
||||||
paper-listbox-background-color = background-color; # Background
|
|
||||||
# TODO = Text and Icons
|
|
||||||
|
|
||||||
# UI
|
|
||||||
paper-card-header-color = text-color; # Title in settings
|
|
||||||
primary-background-color = background-color; # Background color (also title background in left menu)
|
|
||||||
|
|
||||||
# Card
|
|
||||||
paper-card-background-color = background-card-color; # Background
|
|
||||||
dark-primary-color = text-color;
|
|
||||||
primary-text-color = text-color;
|
|
||||||
paper-listbox-color = text-color;
|
|
||||||
light-primary-color = text-light-color;
|
|
||||||
secondary-text-color = text-medium-color;
|
|
||||||
disabled-text-color = text-light-color;
|
|
||||||
paper-dialog-button-color = text-color;
|
|
||||||
secondary-background-color = background-color-2; # Background more info title
|
|
||||||
|
|
||||||
# Icons
|
|
||||||
paper-item-icon-color = text-light-color; # Off
|
|
||||||
paper-item-icon-active-color = accent-color; # On
|
|
||||||
|
|
||||||
# Switches
|
|
||||||
switch-checked-button-color = "#FFF"; # Knob On
|
|
||||||
switch-unchecked-button-color = "#FFF"; # Knob Off
|
|
||||||
switch-checked-track-color = "#0077FF"; # Background On
|
|
||||||
switch-unchecked-track-color = disabled-text-color; # Background Off
|
|
||||||
|
|
||||||
# Slider
|
|
||||||
paper-slider-active-color = accent-color; # Line On
|
|
||||||
paper-slider-container-color = "#e5e7ea"; # Line Off
|
|
||||||
paper-slider-knob-color = text-light-color; # Knob On
|
|
||||||
paper-slider-knob-start-color = text-light-color; # Knob Off
|
|
||||||
|
|
||||||
# Shadows
|
|
||||||
ha-card-box-shadow = "inset 0px 0px 0px 1px var(--border-color)";
|
|
||||||
}
|
|
||||||
@@ -1,102 +0,0 @@
|
|||||||
{ config, pkgs, lib, ... }:
|
|
||||||
let
|
|
||||||
inherit (import <niveum/lib>) localAddresses;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
services.zigbee2mqtt = {
|
|
||||||
enable = true;
|
|
||||||
config = {
|
|
||||||
permit_join = false;
|
|
||||||
homeassistant = true;
|
|
||||||
serial = {
|
|
||||||
port = "/dev/ttyACM0";
|
|
||||||
disable_led = true;
|
|
||||||
};
|
|
||||||
mqtt = {
|
|
||||||
discovery = true;
|
|
||||||
base_topic = "zigbee";
|
|
||||||
server = "mqtt://${localAddresses.toum}";
|
|
||||||
user = "albrecht";
|
|
||||||
password = lib.strings.fileContents <system-secrets/mosquitto>;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
services.mosquitto = {
|
|
||||||
enable = true;
|
|
||||||
host = "0.0.0.0";
|
|
||||||
allowAnonymous = false;
|
|
||||||
checkPasswords = true;
|
|
||||||
users."albrecht" = {
|
|
||||||
password = lib.strings.fileContents <system-secrets/mosquitto>;
|
|
||||||
acl = [ "topic readwrite #" ];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
networking.firewall.allowedTCPPorts = [ 1883 ];
|
|
||||||
|
|
||||||
environment.systemPackages = [ pkgs.mosquitto ];
|
|
||||||
|
|
||||||
services.home-assistant = {
|
|
||||||
config = {
|
|
||||||
switch = [
|
|
||||||
{
|
|
||||||
platform = "mqtt";
|
|
||||||
name = "zigbee2mqtt_join";
|
|
||||||
state_topic = "/zigbee2mqtt/bridge/config/permit_join";
|
|
||||||
command_topic = "/zigbee2mqtt/bridge/config/permit_join";
|
|
||||||
payload_on = "true";
|
|
||||||
payload_off = "false";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
timer.zigbee_permit_join = {
|
|
||||||
name = "Zigbee Time remaining";
|
|
||||||
duration = 120;
|
|
||||||
};
|
|
||||||
automation = [
|
|
||||||
# Automation to start timer when enable join is turned on
|
|
||||||
{
|
|
||||||
id = "zigbee_join_enabled";
|
|
||||||
alias = "";
|
|
||||||
hide_entity = "true";
|
|
||||||
trigger = {
|
|
||||||
platform = "state";
|
|
||||||
entity_id = "switch.zigbee2mqtt_join";
|
|
||||||
to = "on";
|
|
||||||
};
|
|
||||||
action = {
|
|
||||||
service = "timer.start";
|
|
||||||
entity_id = "timer.zigbee_permit_join";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
# Automation to stop timer when switch turned off and turn off switch when timer finished
|
|
||||||
{
|
|
||||||
id = "zigbee_join_disabled";
|
|
||||||
hide_entity = "true";
|
|
||||||
trigger = [
|
|
||||||
{
|
|
||||||
platform = "event";
|
|
||||||
event_type = "timer.finished";
|
|
||||||
event_data.entity_id = "timer.zigbee_permit_join";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
platform = "state";
|
|
||||||
entity_id = "switch.zigbee2mqtt_join";
|
|
||||||
to = "off";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
action = [
|
|
||||||
{
|
|
||||||
service = "timer.cancel";
|
|
||||||
data.entity_id = "timer.zigbee_permit_join";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
service = "switch.turn_off";
|
|
||||||
entity_id = "switch.zigbee2mqtt_join";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,14 +1,39 @@
|
|||||||
{ config, pkgs, ... }: {
|
{
|
||||||
imports = [ <niveum/modules/hledger.nix> ];
|
config,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
|
environment.systemPackages = let
|
||||||
|
ledgerDirectory = "$HOME/projects/ledger";
|
||||||
|
timeLedger = "${ledgerDirectory}/time.timeclock";
|
||||||
|
git = "${pkgs.git}/bin/git -C ${ledgerDirectory}";
|
||||||
|
in [
|
||||||
|
pkgs.hledger
|
||||||
|
(pkgs.writers.writeDashBin "hora-edit" ''
|
||||||
|
$EDITOR + "${timeLedger}" && ${pkgs.git}/bin/git -C "$(${pkgs.coreutils}/bin/dirname ${timeLedger})" commit --all --message "$(${pkgs.coreutils}/bin/date -Im)"
|
||||||
|
'')
|
||||||
|
(pkgs.writers.writeDashBin "hora" ''
|
||||||
|
${pkgs.hledger}/bin/hledger -f "${timeLedger}" "$@"
|
||||||
|
'')
|
||||||
|
(pkgs.writers.writeDashBin "hora-filli" ''
|
||||||
|
${pkgs.hledger}/bin/hledger -f "${timeLedger}" register fillidefilla -O csv \
|
||||||
|
-b "$(date -d "$(date +%Y-%m)-20 last month" +%Y-%m-%d)" \
|
||||||
|
-e "$(date -d "$(date +%Y-%m)-20" +%Y-%m-%d)" \
|
||||||
|
| sed 's/(fillidefilla:\(.*\))/\1/g' \
|
||||||
|
| xsv select date,amount,total,account,description
|
||||||
|
'')
|
||||||
|
|
||||||
niveum.hledger = {
|
(pkgs.writers.writeDashBin "hledger-git" ''
|
||||||
enable = true;
|
if [ "$1" = entry ]; then
|
||||||
ledgerFile = "$HOME/projects/ledger/all.journal";
|
${pkgs.hledger}/bin/hledger balance -V > "${ledgerDirectory}/balance.txt"
|
||||||
server = {
|
${git} add balance.txt
|
||||||
enable = false;
|
${git} commit --all --message="$(date -Im)"
|
||||||
user = config.users.users.me;
|
else
|
||||||
package = pkgs.hledger-web;
|
${git} $*
|
||||||
};
|
fi
|
||||||
package = pkgs.hledger;
|
'')
|
||||||
};
|
(pkgs.writers.writeDashBin "hledger-edit" ''
|
||||||
|
$EDITOR ${ledgerDirectory}/current.journal
|
||||||
|
'')
|
||||||
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,45 +2,28 @@
|
|||||||
home-manager.users.me = {
|
home-manager.users.me = {
|
||||||
programs.htop = {
|
programs.htop = {
|
||||||
enable = true;
|
enable = true;
|
||||||
colorScheme = 0;
|
settings = {
|
||||||
accountGuestInCpuMeter = true;
|
color_scheme = 0;
|
||||||
cpuCountFromZero = false;
|
account_guest_in_cpu_meter = true;
|
||||||
delay = 15;
|
cpu_count_from_zero = false;
|
||||||
detailedCpuTime = false;
|
delay = 15;
|
||||||
headerMargin = true;
|
detailed_cpu_time = false;
|
||||||
hideKernelThreads = true;
|
header_margin = true;
|
||||||
hideThreads = false;
|
hide_kernel_threads = true;
|
||||||
hideUserlandThreads = false;
|
hide_threads = true;
|
||||||
highlightBaseName = true;
|
hide_userland_threads = true;
|
||||||
highlightMegabytes = true;
|
highlight_base_name = true;
|
||||||
highlightThreads = true;
|
highlight_megabytes = true;
|
||||||
shadowOtherUsers = true;
|
highlight_threads = true;
|
||||||
showProgramPath = false;
|
shadow_other_users = true;
|
||||||
showThreadNames = true;
|
show_program_path = false;
|
||||||
sortDescending = true;
|
show_thread_names = false;
|
||||||
sortKey = "PERCENT_CPU";
|
sort_descending = true;
|
||||||
treeView = true;
|
sort_key = "PERCENT_CPU";
|
||||||
updateProcessNames = false;
|
tree_view = true;
|
||||||
meters = {
|
update_process_names = false;
|
||||||
left = [
|
right_meters = ["Uptime" "Tasks" "LoadAverage" "Battery"];
|
||||||
{
|
left_meters = ["LeftCPUs2" "RightCPUs2" "Memory" "Swap"];
|
||||||
kind = "LeftCPUs2";
|
|
||||||
mode = 1;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
kind = "RightCPUs2";
|
|
||||||
mode = 1;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
kind = "Memory";
|
|
||||||
mode = 1;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
kind = "Swap";
|
|
||||||
mode = 1;
|
|
||||||
}
|
|
||||||
];
|
|
||||||
right = [ "Uptime" "Tasks" "LoadAverage" "Battery" ];
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,57 +1,86 @@
|
|||||||
{ config, pkgs, lib, ... }:
|
{
|
||||||
let
|
config,
|
||||||
|
pkgs,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
inherit (lib.strings) fileContents;
|
inherit (lib.strings) fileContents;
|
||||||
inherit (import <niveum/lib>) sshPort;
|
inherit (import ../lib) sshPort;
|
||||||
eduroam = {
|
eduroam = {
|
||||||
identity = fileContents <secrets/eduroam/identity>;
|
identity = fileContents <secrets/eduroam/identity>;
|
||||||
password = fileContents <secrets/eduroam/password>;
|
password = fileContents <secrets/eduroam/password>;
|
||||||
};
|
};
|
||||||
eduroamAuth = ''
|
hu-berlin-cifs-options = [
|
||||||
key_mgmt=WPA-EAP
|
"uid=${toString config.users.users.me.uid}"
|
||||||
eap=TTLS
|
"gid=${toString config.users.groups.users.gid}"
|
||||||
proto=RSN
|
"sec=ntlmv2"
|
||||||
identity="${eduroam.identity}"
|
"workgroup=german"
|
||||||
anonymous_identity="anonymous@wlan.hu-berlin.de"
|
"credentials=${config.age.secrets.cifs-credentials-hu-berlin.path}"
|
||||||
altsubject_match="DNS:srv1-radius.cms.hu-berlin.de;DNS:srv2-radius.cms.hu-berlin.de"
|
"noauto"
|
||||||
password="${eduroam.password}"
|
# "x-systemd.requires=hu-vpn.service"
|
||||||
ca_cert="${
|
"x-systemd.automount"
|
||||||
pkgs.fetchurl {
|
"x-systemd.device-timeout=1"
|
||||||
url =
|
"x-systemd.idle-timeout=1min"
|
||||||
"https://www.cms.hu-berlin.de/de/dl/netze/wlan/config/eduroam/t-telesec_globalroot_class_2.pem";
|
];
|
||||||
sha256 = "0if8aqd06sid7a0vw009zpa087wxcgdd2x6z2zs4pis5kvyqj2dk";
|
|
||||||
}
|
|
||||||
}"
|
|
||||||
phase2="auth=PAP"
|
|
||||||
'';
|
|
||||||
in {
|
in {
|
||||||
networking.wireless.networks = {
|
fileSystems."/media/hu-berlin/germpro2" = {
|
||||||
eduroam_5GHz.auth = eduroamAuth;
|
device = "//hugerm31c.user.hu-berlin.de/germpro2/ling";
|
||||||
eduroam.auth = eduroamAuth;
|
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;
|
||||||
|
|
||||||
|
home-manager.users.me.programs.ssh = {
|
||||||
|
matchBlocks = {
|
||||||
|
"alew.hu-berlin.de" = {
|
||||||
|
user = "centos";
|
||||||
|
hostname = "141.20.187.219";
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.systemPackages = [
|
environment.systemPackages = [
|
||||||
pkgs.sshfsFuse
|
(pkgs.writers.writeDashBin "hu-ip" ''
|
||||||
|
${pkgs.w3m}/bin/w3m -dump meineip.hu-berlin.de | head --lines=-4 | tail --lines=+3
|
||||||
(pkgs.writers.writeDashBin "hu-vpn" ''
|
|
||||||
${pkgs.openfortivpn}/bin/openfortivpn -p "${eduroam.password}" -c ${pkgs.writeText "hu-berlin.config" ''
|
|
||||||
host = forti-ssl.vpn.hu-berlin.de
|
|
||||||
port = 443
|
|
||||||
trusted-cert = e5a7d56543002ffe1e8962caa5fd6d94053aa702381458247b670877a66f3c6f
|
|
||||||
username = ${eduroam.identity}
|
|
||||||
''}
|
|
||||||
'')
|
'')
|
||||||
|
(
|
||||||
|
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";
|
||||||
|
}))
|
||||||
|
)
|
||||||
];
|
];
|
||||||
|
|
||||||
services.openvpn.servers.hu-berlin = {
|
systemd.services.hu-vpn = {
|
||||||
autoStart = false;
|
enable = true;
|
||||||
authUserPass = {
|
wants = ["network-online.target"];
|
||||||
username = eduroam.identity;
|
serviceConfig.LoadCredential = "password:${config.age.secrets.email-password-meinhark.path}";
|
||||||
password = eduroam.password;
|
script = ''
|
||||||
};
|
if ${pkgs.wirelesstools}/bin/iwgetid | ${pkgs.gnugrep}/bin/grep --invert-match eduroam
|
||||||
config = fileContents (pkgs.fetchurl {
|
then
|
||||||
url =
|
${pkgs.openfortivpn}/bin/openfortivpn \
|
||||||
"https://www.cms.hu-berlin.de/de/dl/netze/vpn/openvpn/hu-berlin.ovpn";
|
--password="$(cat "$CREDENTIALS_DIRECTORY/password")" \
|
||||||
sha256 = "15b55aibik5460svjq2gwxrcyh6ay4k8savd6cd5lncgndmd8p8h";
|
--config=${
|
||||||
});
|
pkgs.writeText "hu-berlin.config" ''
|
||||||
|
host = forti-ssl.vpn.hu-berlin.de
|
||||||
|
port = 443
|
||||||
|
username = meinhark
|
||||||
|
trusted-cert = 9e5dea8e077970d245900839f437ef7fb9551559501c7defd70af70ea568573d
|
||||||
|
''
|
||||||
|
}
|
||||||
|
fi
|
||||||
|
'';
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
326
configs/i3.nix
326
configs/i3.nix
@@ -1,14 +1,28 @@
|
|||||||
{ config, pkgs, lib, ... }:
|
{
|
||||||
let
|
config,
|
||||||
inherit (import <niveum/lib>) defaultApplications colours;
|
pkgs,
|
||||||
klem = import <niveum/packages/scripts/klem.nix> {
|
lib,
|
||||||
inherit pkgs lib;
|
niveumPackages,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
inherit (import ../lib) defaultApplications colours;
|
||||||
|
klem = niveumPackages.klem.override {
|
||||||
|
config.dmenu = "${pkgs.dmenu}/bin/dmenu -i -p klem";
|
||||||
config.scripts = {
|
config.scripts = {
|
||||||
"p.r" = pkgs.writers.writeDash "p.r" ''
|
"p.r" = 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" ''
|
||||||
|
# ${pkgs.curl}/bin/curl -F "file=$(${pkgs.coreutils}/bin/cat)" https://envs.sh
|
||||||
|
# '';
|
||||||
|
"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
|
||||||
|
'';
|
||||||
"ix.io" = pkgs.writers.writeDash "ix.io" ''
|
"ix.io" = pkgs.writers.writeDash "ix.io" ''
|
||||||
${pkgs.curl}/bin/curl -fSs -F 'f:1=<-' ix.io
|
${pkgs.curl}/bin/curl -fSs -F 'f:1=<-' ix.io
|
||||||
'';
|
'';
|
||||||
@@ -22,10 +36,19 @@ let
|
|||||||
${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" ''
|
||||||
${pkgs.scripts.ipa}/bin/ipa
|
${niveumPackages.ipa}/bin/ipa
|
||||||
'';
|
'';
|
||||||
"betacode" = pkgs.writers.writeDash "betacode" ''
|
"betacode" = pkgs.writers.writeDash "betacode" ''
|
||||||
${pkgs.scripts.betacode}/bin/betacode
|
${niveumPackages.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
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
@@ -36,59 +59,78 @@ let
|
|||||||
move-to-new-workspace = pkgs.writers.writeDash "new-workspace" ''
|
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))
|
i3-msg move container to workspace $(($(i3-msg -t get_workspaces | tr , '\n' | grep '"num":' | cut -d : -f 2 | sort -rn | head -1) + 1))
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# https://github.com/LukeSmithxyz/voidrice/blob/9fe6802122f6e0392c7fe20eefd30437771d7f8e/.local/bin/dmenuunicode
|
|
||||||
emoji-menu = let
|
|
||||||
emoji-file = pkgs.fetchurl {
|
|
||||||
url =
|
|
||||||
"https://raw.githubusercontent.com/LukeSmithxyz/voidrice/master/.local/share/larbs/emoji";
|
|
||||||
sha256 = "03fv69ah8msh2j6i3lm4sdkckqq8jwn1kj43j98dh0xjpzazsy46";
|
|
||||||
};
|
|
||||||
in with pkgs;
|
|
||||||
writers.writeDashBin "emoji-menu" ''
|
|
||||||
PATH=${lib.makeBinPath [ coreutils dmenu gnused libnotify xclip xdotool ]}
|
|
||||||
chosen=$(cut -d ';' -f1 ${emoji-file} | dmenu -i -l 10 | sed "s/ .*//")
|
|
||||||
|
|
||||||
[ "$chosen" != "" ] || exit
|
|
||||||
|
|
||||||
echo "$chosen" | tr -d '\n' | xclip -selection clipboard
|
|
||||||
|
|
||||||
if [ -n "$1" ]; then
|
|
||||||
xdotool key Shift+Insert
|
|
||||||
else
|
|
||||||
notify-send --app-name="emoji-menu" "'$chosen' copied to clipboard." &
|
|
||||||
fi
|
|
||||||
'';
|
|
||||||
|
|
||||||
in {
|
in {
|
||||||
|
age.secrets = {
|
||||||
|
github-token-i3status-rust = {
|
||||||
|
file = ../secrets/github-token-i3status-rust.age;
|
||||||
|
owner = config.users.users.me.name;
|
||||||
|
group = config.users.users.me.group;
|
||||||
|
mode = "400";
|
||||||
|
};
|
||||||
|
openweathermap-api-key = {
|
||||||
|
file = ../secrets/openweathermap-api-key.age;
|
||||||
|
owner = config.users.users.me.name;
|
||||||
|
group = config.users.users.me.group;
|
||||||
|
mode = "400";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
programs.slock.enable = true;
|
||||||
|
|
||||||
services.xserver = {
|
services.xserver = {
|
||||||
displayManager.defaultSession = "none+i3";
|
displayManager.defaultSession = "none+i3";
|
||||||
windowManager.i3 = {
|
windowManager.i3 = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.i3-gaps;
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
home-manager.users.me.xsession.windowManager.i3 = {
|
services.xserver = {
|
||||||
|
monitorSection = ''Option "DPMS" "false"'';
|
||||||
|
serverFlagsSection = ''
|
||||||
|
Option "BlankTime" "0"
|
||||||
|
Option "StandbyTime" "0"
|
||||||
|
Option "SuspendTime" "0"
|
||||||
|
Option "OffTime" "0"
|
||||||
|
'';
|
||||||
|
extraConfig = ''
|
||||||
|
Section "Extensions"
|
||||||
|
Option "DPMS" "Disable"
|
||||||
|
EndSection
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
home-manager.users.me.xsession.windowManager.i3 = let
|
||||||
|
modifier = "Mod4";
|
||||||
|
in {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
extraConfig = ''
|
||||||
|
bindsym --release ${modifier}+Shift+w exec /run/wrappers/bin/slock
|
||||||
|
'';
|
||||||
config = rec {
|
config = rec {
|
||||||
fonts = [ "Monospace 10" ];
|
fonts = {
|
||||||
modifier = "Mod4";
|
names = ["Sans"];
|
||||||
|
size = 10.0;
|
||||||
|
};
|
||||||
|
inherit modifier;
|
||||||
window = {
|
window = {
|
||||||
titlebar = false;
|
titlebar = false;
|
||||||
border = 1;
|
border = 1;
|
||||||
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 = "mpv"; };
|
criteria = {class = ".*";};
|
||||||
|
command = "border pixel 2";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
criteria = {class = "mpv";};
|
||||||
command = lib.strings.concatStringsSep ", " [
|
command = lib.strings.concatStringsSep ", " [
|
||||||
"floating enable"
|
"floating enable"
|
||||||
"sticky enable"
|
"sticky enable"
|
||||||
@@ -99,7 +141,6 @@ in {
|
|||||||
}
|
}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
gaps.inner = 4;
|
|
||||||
floating = {
|
floating = {
|
||||||
titlebar = false;
|
titlebar = false;
|
||||||
border = 1;
|
border = 1;
|
||||||
@@ -110,51 +151,68 @@ in {
|
|||||||
text = colours.foreground;
|
text = colours.foreground;
|
||||||
};
|
};
|
||||||
in rec {
|
in rec {
|
||||||
focused = scheme // {
|
focused =
|
||||||
border = colours.foreground;
|
scheme
|
||||||
indicator = colours.foreground;
|
// {
|
||||||
childBorder = colours.foreground;
|
border = colours.blue.bright;
|
||||||
};
|
indicator = colours.blue.bright;
|
||||||
unfocused = scheme // {
|
childBorder = colours.blue.bright;
|
||||||
border = colours.background;
|
|
||||||
indicator = colours.background;
|
|
||||||
childBorder = colours.background;
|
|
||||||
};
|
|
||||||
focusedInactive = unfocused;
|
|
||||||
urgent = scheme // {
|
|
||||||
border = colours.red.bright;
|
|
||||||
indicator = colours.red.bright;
|
|
||||||
childBorder = colours.red.bright;
|
|
||||||
};
|
|
||||||
placeholder = scheme // {
|
|
||||||
border = colours.green.bright;
|
|
||||||
indicator = colours.green.bright;
|
|
||||||
childBorder = colours.green.bright;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
bars = [{
|
|
||||||
workspaceButtons = false;
|
|
||||||
fonts = [ "Monospace 8" ];
|
|
||||||
mode = "hide"; # "dock"
|
|
||||||
position = "bottom";
|
|
||||||
colors = rec {
|
|
||||||
background = colours.background;
|
|
||||||
separator = background;
|
|
||||||
statusline = colours.foreground;
|
|
||||||
bindingMode = {
|
|
||||||
background = colours.red.bright;
|
|
||||||
border = colours.background;
|
|
||||||
text = colours.foreground;
|
|
||||||
};
|
};
|
||||||
};
|
unfocused =
|
||||||
statusCommand = "${pkgs.i3status-rust}/bin/i3status-rs ${
|
scheme
|
||||||
pkgs.writeTOML (import <niveum/lib/i3status-rust.nix> {
|
// {
|
||||||
inherit (config.niveum) batteryName wirelessInterface;
|
border = colours.background;
|
||||||
inherit colours;
|
indicator = colours.background;
|
||||||
inherit pkgs;
|
childBorder = colours.background;
|
||||||
})
|
};
|
||||||
}";
|
focusedInactive = unfocused;
|
||||||
}];
|
urgent =
|
||||||
|
scheme
|
||||||
|
// {
|
||||||
|
border = colours.red.bright;
|
||||||
|
indicator = colours.red.bright;
|
||||||
|
childBorder = colours.red.bright;
|
||||||
|
};
|
||||||
|
placeholder =
|
||||||
|
scheme
|
||||||
|
// {
|
||||||
|
border = colours.green.bright;
|
||||||
|
indicator = colours.green.bright;
|
||||||
|
childBorder = colours.green.bright;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
bars = [
|
||||||
|
{
|
||||||
|
workspaceButtons = false;
|
||||||
|
fonts = {
|
||||||
|
names = ["Monospace" "Font Awesome 6 Free"];
|
||||||
|
size = 8.0;
|
||||||
|
};
|
||||||
|
mode = "dock"; # "hide";
|
||||||
|
position = "bottom";
|
||||||
|
colors = rec {
|
||||||
|
background = colours.background;
|
||||||
|
separator = background;
|
||||||
|
statusline = colours.foreground;
|
||||||
|
bindingMode = {
|
||||||
|
background = colours.red.bright;
|
||||||
|
border = colours.background;
|
||||||
|
text = colours.foreground;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
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})"
|
||||||
|
${pkgs.i3status-rust}/bin/i3status-rs ${
|
||||||
|
(pkgs.formats.toml {}).generate "i3status-rust.toml" (import ../lib/i3status-rust.nix {
|
||||||
|
inherit (config.niveum) batteryName wirelessInterface;
|
||||||
|
inherit (config.home-manager.users.me.accounts.email) accounts;
|
||||||
|
inherit colours;
|
||||||
|
inherit pkgs;
|
||||||
|
})
|
||||||
|
}'');
|
||||||
|
}
|
||||||
|
];
|
||||||
modes.resize = {
|
modes.resize = {
|
||||||
"Escape" = ''mode "default"'';
|
"Escape" = ''mode "default"'';
|
||||||
"Return" = ''mode "default"'';
|
"Return" = ''mode "default"'';
|
||||||
@@ -173,81 +231,91 @@ in {
|
|||||||
"${modifier}+k" = "focus up";
|
"${modifier}+k" = "focus up";
|
||||||
"${modifier}+l" = "focus right";
|
"${modifier}+l" = "focus right";
|
||||||
|
|
||||||
"${modifier}+Menu" = "exec ${klem}/bin/klem";
|
|
||||||
|
|
||||||
"${modifier}+Shift+b" = "move window to workspace prev";
|
"${modifier}+Shift+b" = "move window to workspace prev";
|
||||||
"${modifier}+Shift+n" = "move window to workspace next";
|
"${modifier}+Shift+n" = "move window to workspace next";
|
||||||
"${modifier}+Shift+x" = "exec --no-startup-id ${move-to-new-workspace}";
|
"${modifier}+Shift+x" = "exec ${move-to-new-workspace}";
|
||||||
"${modifier}+b" = "workspace prev";
|
"${modifier}+b" = "workspace prev";
|
||||||
"${modifier}+n" = "workspace next";
|
"${modifier}+n" = "workspace next";
|
||||||
"${modifier}+x" = "exec --no-startup-id ${new-workspace}";
|
"${modifier}+x" = "exec ${new-workspace}";
|
||||||
|
|
||||||
"${modifier}+Shift+c" = "reload";
|
"${modifier}+Shift+c" = "reload";
|
||||||
"${modifier}+Shift+q" = "kill";
|
"${modifier}+Shift+q" = "kill";
|
||||||
"${modifier}+Shift+r" = "restart";
|
"${modifier}+Shift+r" = "restart";
|
||||||
|
|
||||||
"${modifier}+Shift+s" = "sticky toggle";
|
"${modifier}+z" = "sticky toggle";
|
||||||
"${modifier}+Shift+z" = "floating toggle";
|
"${modifier}+Shift+z" = "floating toggle";
|
||||||
|
|
||||||
|
"${modifier}+s" = "scratchpad show";
|
||||||
|
"${modifier}+Shift+s" = "move scratchpad";
|
||||||
|
|
||||||
"${modifier}+c" = "split h";
|
"${modifier}+c" = "split h";
|
||||||
"${modifier}+e" = "layout toggle split";
|
"${modifier}+e" = "layout toggle split";
|
||||||
"${modifier}+f" = "fullscreen toggle";
|
"${modifier}+f" = "fullscreen toggle";
|
||||||
"${modifier}+r" = "mode resize";
|
"${modifier}+r" = "mode resize";
|
||||||
"${modifier}+s" = "layout stacking";
|
|
||||||
"${modifier}+v" = "split v";
|
"${modifier}+v" = "split v";
|
||||||
"${modifier}+w" = "layout tabbed";
|
"${modifier}+w" = "layout tabbed";
|
||||||
|
"${modifier}+q" = "exec ${pkgs.writers.writeDash "newsboat-sync" ''
|
||||||
|
notify-send --app-name="newsboat" "Updating ..."
|
||||||
|
newsboat -x reload
|
||||||
|
notify-send --app-name="newsboat" "Finished updating."
|
||||||
|
''}";
|
||||||
|
|
||||||
# "${modifier}+Shift+y" = "exec ${pkgs.qutebrowser}/bin/qutebrowser";
|
# "${modifier}+Shift+y" = "exec ${pkgs.qutebrowser}/bin/qutebrowser";
|
||||||
"${modifier}+Return" = "exec ${(defaultApplications pkgs).terminal}";
|
"${modifier}+Return" = "exec ${(defaultApplications pkgs).terminal}";
|
||||||
"${modifier}+t" = "exec ${(defaultApplications pkgs).fileManager}";
|
"${modifier}+t" = "exec ${(defaultApplications pkgs).fileManager}";
|
||||||
"${modifier}+y" = "exec ${(defaultApplications pkgs).browser}";
|
"${modifier}+y" = "exec ${(defaultApplications pkgs).browser}";
|
||||||
|
"${modifier}+0" = "exec ${niveumPackages.menu-calc}/bin/=";
|
||||||
|
|
||||||
"${modifier}+Shift+w" = "exec ${pkgs.xautolock}/bin/xautolock -locknow";
|
"${modifier}+d" = "exec ${pkgs.writers.writeDash "run" ''exec rofi -modi run,ssh,window -show run''}";
|
||||||
"${modifier}+a" =
|
|
||||||
"exec --no-startup-id ${pkgs.rofi}/bin/rofi -display-window — -show window";
|
|
||||||
"${modifier}+d" = "exec --no-startup-id ${pkgs.dmenu}/bin/dmenu_run";
|
|
||||||
"${modifier}+Shift+d" = "exec ${
|
"${modifier}+Shift+d" = "exec ${
|
||||||
pkgs.writers.writeDash "notemenu" ''
|
pkgs.writers.writeDash "notemenu" ''
|
||||||
set -efu
|
set -efu
|
||||||
PATH=$PATH:${
|
PATH=$PATH:${
|
||||||
lib.makeBinPath [ pkgs.dmenu pkgs.findutils pkgs.coreutils ]
|
lib.makeBinPath [pkgs.rofi pkgs.findutils pkgs.coreutils]
|
||||||
}
|
}
|
||||||
|
|
||||||
cd ~/notes
|
cd ~/notes
|
||||||
note_file=$(find . -type f -printf "%T@ %p\n" | sort --reverse --numeric-sort | cut --delimiter=" " --fields=2 | dmenu -i)
|
note_file=$({
|
||||||
if test "$note_file"
|
echo diary/$(date -I).md
|
||||||
then
|
echo diary/$(date -I -d yesterday).md
|
||||||
i3-sensible-terminal -e "$EDITOR" "$note_file"
|
find . ! -name '.*' -type f -printf "%T@ %p\n" | sort --reverse --numeric-sort | cut --delimiter=" " --fields=2-
|
||||||
fi
|
} | rofi -dmenu -i -p 'notes')
|
||||||
''
|
if test "$note_file"
|
||||||
}";
|
then
|
||||||
"${modifier}+p" = "exec --no-startup-id ${pkgs.pass}/bin/passmenu -l 5";
|
alacritty --working-directory ~/notes -e "$EDITOR" "$note_file"
|
||||||
"${modifier}+u" = "exec ${emoji-menu}/bin/emoji-menu";
|
fi
|
||||||
|
''
|
||||||
|
}";
|
||||||
|
"${modifier}+p" = "exec rofi-pass";
|
||||||
|
"${modifier}+Shift+p" = "exec rofi-pass --insert";
|
||||||
|
"${modifier}+u" = "exec ${niveumPackages.unicodmenu}/bin/unicodmenu";
|
||||||
|
|
||||||
"${modifier}+F7" = "exec ${pkgs.scripts.showkeys-toggle}/bin/showkeys-toggle";
|
"${modifier}+F6" = "exec ${pkgs.xorg.xkill}/bin/xkill";
|
||||||
"${modifier}+F8" = "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}+F9" = "exec ${pkgs.redshift}/bin/redshift -O 4000 -b 0.85";
|
||||||
"${modifier}+F10" = "exec ${pkgs.redshift}/bin/redshift -x";
|
"${modifier}+F10" = "exec ${pkgs.redshift}/bin/redshift -x";
|
||||||
"${modifier}+F11" = "exec ${pkgs.xcalib}/bin/xcalib -invert -alter";
|
"${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";
|
||||||
|
|
||||||
"Print" = "exec flameshot-once";
|
"XF86Display" = "exec ${niveumPackages.dmenu-randr}/bin/dmenu-randr";
|
||||||
"XF86AudioLowerVolume" =
|
|
||||||
"exec --no-startup-id ${pkgs.pamixer}/bin/pamixer -d 5";
|
|
||||||
"XF86AudioMute" = "exec --no-startup-id ${pkgs.pamixer}/bin/pamixer -t";
|
|
||||||
"XF86AudioRaiseVolume" =
|
|
||||||
"exec --no-startup-id ${pkgs.pamixer}/bin/pamixer -i 5";
|
|
||||||
"XF86Calculator" =
|
|
||||||
"exec ${pkgs.st}/bin/st -c floating -e ${pkgs.bc}/bin/bc";
|
|
||||||
"XF86AudioPause" =
|
|
||||||
"exec --no-startup-id ${pkgs.playerctl}/bin/playerctl pause";
|
|
||||||
"XF86AudioPlay" =
|
|
||||||
"exec --no-startup-id ${pkgs.playerctl}/bin/playerctl play-pause";
|
|
||||||
"XF86AudioNext" =
|
|
||||||
"exec --no-startup-id ${pkgs.playerctl}/bin/playerctl next";
|
|
||||||
"XF86AudioPrev" =
|
|
||||||
"exec --no-startup-id ${pkgs.playerctl}/bin/playerctl previous";
|
|
||||||
"XF86ScreenSaver" = "exec ${pkgs.xautolock}/bin/xautolock -locknow";
|
|
||||||
|
|
||||||
"XF86Display" = "exec ${pkgs.scripts.dmenurandr}/bin/dmenurandr";
|
|
||||||
|
|
||||||
# key names detected with xorg.xev:
|
# key names detected with xorg.xev:
|
||||||
# XF86WakeUp (fn twice)
|
# XF86WakeUp (fn twice)
|
||||||
|
|||||||
@@ -1,13 +1,17 @@
|
|||||||
{
|
{
|
||||||
networking.firewall = {
|
networking.firewall = {
|
||||||
allowedTCPPortRanges = [{
|
allowedTCPPortRanges = [
|
||||||
from = 1714;
|
{
|
||||||
to = 1764;
|
from = 1714;
|
||||||
}];
|
to = 1764;
|
||||||
allowedUDPPortRanges = [{
|
}
|
||||||
from = 1714;
|
];
|
||||||
to = 1764;
|
allowedUDPPortRanges = [
|
||||||
}];
|
{
|
||||||
|
from = 1714;
|
||||||
|
to = 1764;
|
||||||
|
}
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
home-manager.users.me = {
|
home-manager.users.me = {
|
||||||
|
|||||||
@@ -1,8 +0,0 @@
|
|||||||
{ config, ... }: {
|
|
||||||
services.keybase.enable = true;
|
|
||||||
|
|
||||||
services.kbfs = {
|
|
||||||
enable = true;
|
|
||||||
mountPoint = "%h/cloud/keybase";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,17 +1,75 @@
|
|||||||
{ pkgs, lib, ... }:
|
{
|
||||||
let commaSep = builtins.concatStringsSep ",";
|
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 = "";
|
||||||
|
"in" = "san-kagapa";
|
||||||
|
il = "phonetic";
|
||||||
|
};
|
||||||
|
defaultLanguage = "de";
|
||||||
in {
|
in {
|
||||||
|
# man 7 xkeyboard-config
|
||||||
services.xserver = {
|
services.xserver = {
|
||||||
layout = commaSep [ "de" "gr" ];
|
layout = "de";
|
||||||
xkbVariant = commaSep [ "T3" "polytonic" ];
|
# T3: https://upload.wikimedia.org/wikipedia/commons/a/a9/German-Keyboard-Layout-T3-Version1-large.png
|
||||||
xkbOptions =
|
# buckwalter: http://www.qamus.org/transliteration.htm
|
||||||
commaSep [ "compose:caps" "terminate:ctrl_alt_bksp" "grp:ctrls_toggle" ];
|
xkbVariant = "T3";
|
||||||
|
xkbOptions = commaSep xkbOptions;
|
||||||
libinput.enable = true;
|
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/ave";
|
||||||
|
path = pkgs.fetchurl {
|
||||||
|
url = "https://blog.simos.info/wp-content/uploads/2010/06/avestan.txt";
|
||||||
|
sha256 = "192zmmm3gxyhim39dsax7r87gsay2w5v2xkhwmvsfipjb60hwp5g";
|
||||||
|
};
|
||||||
|
}
|
||||||
|
])
|
||||||
|
];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
console.keyMap = "de";
|
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
|
# improve held key rate
|
||||||
services.xserver.displayManager.sessionCommands =
|
services.xserver.displayManager.sessionCommands = "${pkgs.xorg.xset}/bin/xset r rate 300 50";
|
||||||
"${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;
|
||||||
|
};
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
201
configs/khal.nix
Normal file
201
configs/khal.nix
Normal file
@@ -0,0 +1,201 @@
|
|||||||
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
davHome = "~/.local/share/dav";
|
||||||
|
kmeinCloud = {
|
||||||
|
davEndpoint = "https://cloud.xn--kiern-0qa.de/remote.php/dav";
|
||||||
|
username = "kieran";
|
||||||
|
passwordFile = config.age.secrets.nextcloud-password-kieran.path;
|
||||||
|
};
|
||||||
|
fysiCloud = {
|
||||||
|
davEndpoint = "https://nextcloud.fysi.dev/remote.php/dav";
|
||||||
|
username = "kmein";
|
||||||
|
passwordFile = config.age.secrets.nextcloud-password-fysi.path;
|
||||||
|
};
|
||||||
|
in {
|
||||||
|
age.secrets = {
|
||||||
|
nextcloud-password-kieran = {
|
||||||
|
file = ../secrets/nextcloud-password-kieran.age;
|
||||||
|
owner = config.users.users.me.name;
|
||||||
|
group = config.users.users.me.group;
|
||||||
|
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 = [
|
||||||
|
pkgs.khal
|
||||||
|
pkgs.vdirsyncer
|
||||||
|
pkgs.khard
|
||||||
|
pkgs.todoman
|
||||||
|
(pkgs.writers.writeDashBin "todo-procrastinate" ''
|
||||||
|
[ $# -eq 1 ] || {
|
||||||
|
echo "Usage: $0 TODO_ID" >&2
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
todo_id=$1
|
||||||
|
new_timestamp=$(${pkgs.todoman}/bin/todo --porcelain show "$todo_id" | ${pkgs.jq}/bin/jq '.due + 24 * 60 * 60')
|
||||||
|
new_date=$(${pkgs.coreutils}/bin/date +"%Y-%m-%d %H:%M" -d "@$new_timestamp")
|
||||||
|
${pkgs.todoman}/bin/todo edit "$todo_id" --due "$new_date"
|
||||||
|
'')
|
||||||
|
];
|
||||||
|
|
||||||
|
systemd.user.services.vdirsyncer = {
|
||||||
|
enable = true;
|
||||||
|
wants = ["network-online.target"];
|
||||||
|
wantedBy = ["default.target"];
|
||||||
|
startAt = "*:00/10";
|
||||||
|
script = ''
|
||||||
|
${pkgs.vdirsyncer}/bin/vdirsyncer sync
|
||||||
|
${pkgs.khal}/bin/khal printcalendars # https://lostpackets.de/khal/configure.html#syncing
|
||||||
|
'';
|
||||||
|
serviceConfig = {
|
||||||
|
Type = "oneshot";
|
||||||
|
Restart = "on-failure";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
home-manager.users.me = {
|
||||||
|
xdg.configFile = {
|
||||||
|
"khard/khard.conf".text = ''
|
||||||
|
[addressbooks]
|
||||||
|
[[contacts]]
|
||||||
|
path = ${davHome}/contacts/contacts/
|
||||||
|
|
||||||
|
[general]
|
||||||
|
debug = no
|
||||||
|
default_action = list
|
||||||
|
editor = ${config.environment.variables.EDITOR}
|
||||||
|
merge_editor = ${pkgs.vim}/bin/vimdiff
|
||||||
|
|
||||||
|
[contact table]
|
||||||
|
display = first_name
|
||||||
|
group_by_addressbook = no
|
||||||
|
reverse = no
|
||||||
|
show_nicknames = no
|
||||||
|
show_uids = no
|
||||||
|
sort = last_name
|
||||||
|
localize_dates = yes
|
||||||
|
preferred_phone_number_type = pref, cell, home
|
||||||
|
preferred_email_address_type = pref, work, home
|
||||||
|
|
||||||
|
[vcard]
|
||||||
|
search_in_source_files = no
|
||||||
|
skip_unparsable = no
|
||||||
|
'';
|
||||||
|
|
||||||
|
"todoman/config.py".text = ''
|
||||||
|
path = "${davHome}/calendar/*"
|
||||||
|
date_format = "%Y-%m-%d"
|
||||||
|
time_format = "%H:%M"
|
||||||
|
default_due = 0
|
||||||
|
default_list = "Personal"
|
||||||
|
startable = True
|
||||||
|
'';
|
||||||
|
|
||||||
|
"khal/config".text = ''
|
||||||
|
[calendars]
|
||||||
|
|
||||||
|
[[alew]]
|
||||||
|
path = ${davHome}/calendar/alew
|
||||||
|
color = "light gray"
|
||||||
|
|
||||||
|
[[personal]]
|
||||||
|
path = ${davHome}/calendar/personal
|
||||||
|
color = "light cyan"
|
||||||
|
|
||||||
|
[[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]
|
||||||
|
highlight_event_days = True
|
||||||
|
timedelta = 5d
|
||||||
|
print_new = path
|
||||||
|
default_calendar = personal
|
||||||
|
|
||||||
|
[locale]
|
||||||
|
timeformat = %H:%M
|
||||||
|
dateformat = %Y-%m-%d
|
||||||
|
longdateformat = %Y-%m-%d
|
||||||
|
datetimeformat = %Y-%m-%d %H:%M
|
||||||
|
longdatetimeformat = %Y-%m-%d %H:%M
|
||||||
|
local_timezone = ${config.time.timeZone}
|
||||||
|
default_timezone = ${config.time.timeZone}
|
||||||
|
weeknumbers = left
|
||||||
|
'';
|
||||||
|
|
||||||
|
"vdirsyncer/config".text = ''
|
||||||
|
[general]
|
||||||
|
status_path = "~/.local/share/vdirsyncer/status/"
|
||||||
|
|
||||||
|
[pair kontakte]
|
||||||
|
a = "kontakte_local"
|
||||||
|
b = "kontakte_cloud"
|
||||||
|
collections = ["contacts"]
|
||||||
|
conflict_resolution = "b wins"
|
||||||
|
|
||||||
|
[pair kalender]
|
||||||
|
a = "kalender_local"
|
||||||
|
b = "kalender_cloud"
|
||||||
|
collections = ["personal", "alew", "uni-1"]
|
||||||
|
conflict_resolution = "b wins"
|
||||||
|
|
||||||
|
[pair fysi]
|
||||||
|
a = "kalender_local"
|
||||||
|
b = "fysi_cloud"
|
||||||
|
collections = ["fysi-1", "personal_shared_by_fdf"]
|
||||||
|
conflict_resolution = "b wins"
|
||||||
|
|
||||||
|
[storage kontakte_local]
|
||||||
|
type = "filesystem"
|
||||||
|
path = "${davHome}/contacts/"
|
||||||
|
fileext = ".vcf"
|
||||||
|
|
||||||
|
[storage kalender_local]
|
||||||
|
type = "filesystem"
|
||||||
|
path = "${davHome}/calendar/"
|
||||||
|
fileext = ".ics"
|
||||||
|
|
||||||
|
[storage kontakte_cloud]
|
||||||
|
type = "carddav"
|
||||||
|
url = "${kmeinCloud.davEndpoint}/addressbooks/users/${kmeinCloud.username}/"
|
||||||
|
username = "${kmeinCloud.username}"
|
||||||
|
password.fetch = ["command", "cat", "${kmeinCloud.passwordFile}"]
|
||||||
|
|
||||||
|
[storage kalender_cloud]
|
||||||
|
type = "caldav"
|
||||||
|
url = "${kmeinCloud.davEndpoint}/calendars/${kmeinCloud.username}/"
|
||||||
|
username = "${kmeinCloud.username}"
|
||||||
|
password.fetch = ["command", "cat", "${kmeinCloud.passwordFile}"]
|
||||||
|
|
||||||
|
[storage fysi_cloud]
|
||||||
|
type = "caldav"
|
||||||
|
url = "${fysiCloud.davEndpoint}/calendars/${fysiCloud.username}/"
|
||||||
|
username = "${fysiCloud.username}"
|
||||||
|
password.fetch = ["command", "cat", "${fysiCloud.passwordFile}"]
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
{ ... }:
|
|
||||||
let ssid = "Kleiter Gast";
|
|
||||||
in {
|
|
||||||
networking.wireless.networks.${ssid}.psk = "Kleiter-Gast";
|
|
||||||
|
|
||||||
# fix dns
|
|
||||||
systemd.network.networks.kleiter = {
|
|
||||||
dns = [ "8.8.8.8" "8.8.4.4" ];
|
|
||||||
networkConfig.DHCP = "yes";
|
|
||||||
matchConfig.Name = "wlp3s0";
|
|
||||||
matchConfig.SSID = ssid;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
27
configs/lb.nix
Normal file
27
configs/lb.nix
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
{
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
|
systemd.services.lb-subscription = {
|
||||||
|
enable = true;
|
||||||
|
wants = ["network-online.target"];
|
||||||
|
startAt = "weekly";
|
||||||
|
serviceConfig = {
|
||||||
|
user = "kfm";
|
||||||
|
WorkingDirectory = "/home/kfm/cloud/Seafile/Books/Germanistik/LB";
|
||||||
|
};
|
||||||
|
script = ''
|
||||||
|
first_year=2019
|
||||||
|
for year in $(${pkgs.coreutils}/bin/seq "$first_year" "$(date +%Y)"); do
|
||||||
|
${pkgs.curl}/bin/curl -sSL "https://www.literarische-blaetter.de/jahrgang-$year/" \
|
||||||
|
| ${pkgs.htmlq}/bin/htmlq --attribute href 'ul.slides a' \
|
||||||
|
| while read -r month; do
|
||||||
|
${pkgs.curl}/bin/curl -sSL "$month" \
|
||||||
|
| ${pkgs.htmlq}/bin/htmlq --attribute src iframe \
|
||||||
|
| ${pkgs.gnused}/bin/sed 's/.*?pdf=//;s/?wp-hosted.*//'
|
||||||
|
done
|
||||||
|
done | ${pkgs.findutils}/bin/xargs ${pkgs.wget}/bin/wget --no-clobber
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
}
|
||||||
245
configs/mail.nix
245
configs/mail.nix
@@ -1,245 +0,0 @@
|
|||||||
{ config, pkgs, lib, ... }:
|
|
||||||
let
|
|
||||||
inherit (import <niveum/lib>) kieran;
|
|
||||||
|
|
||||||
nixpkgs-much = import (pkgs.fetchFromGitHub {
|
|
||||||
owner = "NixOS";
|
|
||||||
repo = "nixpkgs";
|
|
||||||
rev = "7c2a362b58a1c2ba72d24aa3869da3b1a91d39e1";
|
|
||||||
sha256 = "0gl4xndyahasa9dv5mi3x9w8s457wl2xh9lcldizcn1irjvkrzs4";
|
|
||||||
}) {
|
|
||||||
overlays = [
|
|
||||||
(import <stockholm/krebs/5pkgs/haskell>)
|
|
||||||
];
|
|
||||||
};
|
|
||||||
much-pkg = nixpkgs-much.haskellPackages.callCabal2nix "much" <niveum/submodules/much> {};
|
|
||||||
much = nixpkgs-much.haskell.lib.dontHaddock much-pkg;
|
|
||||||
|
|
||||||
tagRules = [
|
|
||||||
{
|
|
||||||
query = "to:miaengiadina-pwa@noreply.github.com AND subject:\"PR run failed\"";
|
|
||||||
tags = [ "-new" "+deleted" ];
|
|
||||||
}
|
|
||||||
{
|
|
||||||
query = lib.concatStringsSep " OR " [
|
|
||||||
"from:noreply-local-guides@google.com"
|
|
||||||
"from:google-maps-noreply@google.com"
|
|
||||||
"subject:fd-noti"
|
|
||||||
"from:nebenan.de"
|
|
||||||
"to:miaengiadina-pwa@noreply.github.com"
|
|
||||||
];
|
|
||||||
tags = [ "-new" ];
|
|
||||||
}
|
|
||||||
{
|
|
||||||
query = "tag:new";
|
|
||||||
tags = [ "-new" "+inbox" ];
|
|
||||||
}
|
|
||||||
];
|
|
||||||
|
|
||||||
# turns out we have to escape $ because, if the password contains a $, it will get interpolated as a variable by the msmtp `passwordeval` which does: `bash -c "COMMAND; echo"`
|
|
||||||
pass_ = file: "echo ${lib.escape ["$"] (lib.escapeShellArg (lib.strings.fileContents file))}";
|
|
||||||
|
|
||||||
generateTaggingScript = filters:
|
|
||||||
let
|
|
||||||
template = { tags, query, message ? "tagging ${query} -> ${lib.concatStringsSep " " tags}", ... }: ''
|
|
||||||
echo '${message}'
|
|
||||||
${pkgs.notmuch}/bin/notmuch tag ${lib.concatStringsSep " " tags} -- "${query}"
|
|
||||||
'';
|
|
||||||
in lib.concatStringsSep "\n" (map template filters);
|
|
||||||
|
|
||||||
enableDefaults = lib.recursiveUpdate {
|
|
||||||
mbsync = {
|
|
||||||
enable = true;
|
|
||||||
create = "both";
|
|
||||||
expunge = "both";
|
|
||||||
};
|
|
||||||
msmtp.enable = true;
|
|
||||||
notmuch.enable = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
mail-sync = pkgs.writers.writeDashBin "mail-sync" ''
|
|
||||||
${pkgs.isync}/bin/mbsync --all
|
|
||||||
${pkgs.notmuch}/bin/notmuch new
|
|
||||||
'';
|
|
||||||
in {
|
|
||||||
environment.variables.NOTMUCH_CONFIG = config.home-manager.users.me.home.sessionVariables.NOTMUCH_CONFIG;
|
|
||||||
|
|
||||||
systemd.services.mail-sync = {
|
|
||||||
enable = true;
|
|
||||||
wants = [ "network-online.target" ];
|
|
||||||
startAt = "*:0/15";
|
|
||||||
serviceConfig.User = "kfm";
|
|
||||||
serviceConfig.Type = "oneshot";
|
|
||||||
environment.NOTMUCH_CONFIG = config.home-manager.users.me.home.sessionVariables.NOTMUCH_CONFIG;
|
|
||||||
script = ''
|
|
||||||
export PATH=${lib.makeBinPath [ pkgs.muchsync pkgs.notmuch mail-sync ]}
|
|
||||||
mail-sync
|
|
||||||
muchsync
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
environment.systemPackages = [
|
|
||||||
pkgs.neomutt
|
|
||||||
|
|
||||||
pkgs.notmuch-addrlookup
|
|
||||||
|
|
||||||
mail-sync
|
|
||||||
|
|
||||||
pkgs.muchsync
|
|
||||||
|
|
||||||
(pkgs.writers.writeDashBin "mua" ''
|
|
||||||
if [ $# -eq 0 ]; then
|
|
||||||
${much}/bin/much-kmein
|
|
||||||
else
|
|
||||||
${much}/bin/much-kmein -q "$*"
|
|
||||||
fi
|
|
||||||
'')
|
|
||||||
|
|
||||||
(pkgs.writers.writeDashBin "mail-clean" ''
|
|
||||||
${pkgs.notmuch}/bin/notmuch search --output files --format=text0 tag:deleted | ${pkgs.findutils}/bin/xargs -r0 rm
|
|
||||||
${pkgs.notmuch}/bin/notmuch new
|
|
||||||
'')
|
|
||||||
];
|
|
||||||
|
|
||||||
|
|
||||||
home-manager.users.me = {
|
|
||||||
services.muchsync.remotes =
|
|
||||||
let
|
|
||||||
muchsyncConfig = host: {
|
|
||||||
name = host;
|
|
||||||
value = {
|
|
||||||
frequency = "*:0/10";
|
|
||||||
remote.host = host;
|
|
||||||
remote.checkForModifiedFiles = false;
|
|
||||||
local.checkForModifiedFiles = false;
|
|
||||||
# don't run `notmuch new` locally nor remotely because muchsync is only regularly run after `mail-sync`
|
|
||||||
remote.importNew = false;
|
|
||||||
local.importNew = false;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
in lib.listToAttrs (map muchsyncConfig [
|
|
||||||
"wilde"
|
|
||||||
"manakish"
|
|
||||||
]);
|
|
||||||
|
|
||||||
programs.msmtp.enable = true;
|
|
||||||
|
|
||||||
programs.mbsync.enable = true;
|
|
||||||
|
|
||||||
programs.notmuch = {
|
|
||||||
enable = true;
|
|
||||||
new.tags = [ "new" ];
|
|
||||||
search.excludeTags = [ "deleted" "spam" ];
|
|
||||||
hooks.postNew = generateTaggingScript tagRules;
|
|
||||||
extraConfig.muchsync.and_tags = "inbox;unread";
|
|
||||||
};
|
|
||||||
|
|
||||||
accounts.email.maildirBasePath = "${config.users.users.me.home}/mail";
|
|
||||||
|
|
||||||
accounts.email.accounts = {
|
|
||||||
fysi = enableDefaults {
|
|
||||||
primary = false;
|
|
||||||
smtp = {
|
|
||||||
host = "smtp.fastmail.com";
|
|
||||||
port = 465;
|
|
||||||
tls.enable = true;
|
|
||||||
};
|
|
||||||
imap = {
|
|
||||||
host = "imap.fastmail.com";
|
|
||||||
port = 993;
|
|
||||||
tls.enable = true;
|
|
||||||
};
|
|
||||||
userName = "kieran@fysi.tech";
|
|
||||||
address = "kieran@fysi.tech";
|
|
||||||
realName = kieran.name;
|
|
||||||
passwordCommand = pass_ <secrets/mail/fastmail>;
|
|
||||||
};
|
|
||||||
cock = enableDefaults {
|
|
||||||
primary = false;
|
|
||||||
smtp = {
|
|
||||||
host = "mail.cock.li";
|
|
||||||
port = 587;
|
|
||||||
tls = {
|
|
||||||
enable = true;
|
|
||||||
useStartTls = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
imap = {
|
|
||||||
host = "mail.cock.li";
|
|
||||||
port = 993;
|
|
||||||
tls.enable = true;
|
|
||||||
};
|
|
||||||
userName = "2210@cock.li";
|
|
||||||
address = "2210@cock.li";
|
|
||||||
realName = "2210";
|
|
||||||
passwordCommand = pass_ <secrets/mail/cock>;
|
|
||||||
};
|
|
||||||
kieran-gmail = enableDefaults {
|
|
||||||
primary = false;
|
|
||||||
flavor = "gmail.com";
|
|
||||||
address = "kieran.meinhardt@gmail.com";
|
|
||||||
realName = kieran.name;
|
|
||||||
userName = "kieran.meinhardt";
|
|
||||||
passwordCommand = pass_ <secrets/mail/gmail/kieran.meinhardt>;
|
|
||||||
folders = {
|
|
||||||
drafts = "[Gmail]/Entw&APw-rfe";
|
|
||||||
sent = "[Gmail]/Gesendet";
|
|
||||||
trash = "[Gmail]/Papierkorb";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
amroplay = enableDefaults {
|
|
||||||
primary = false;
|
|
||||||
flavor = "gmail.com";
|
|
||||||
address = "amroplay@gmail.com";
|
|
||||||
realName = kieran.name;
|
|
||||||
userName = "amroplay";
|
|
||||||
passwordCommand = pass_ <secrets/mail/gmail/amroplay>;
|
|
||||||
folders = {
|
|
||||||
drafts = "[Gmail]/Drafts";
|
|
||||||
sent = "[Gmail]/Sent Mail";
|
|
||||||
trash = "[Gmail]/Bin";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
posteo = enableDefaults {
|
|
||||||
primary = true;
|
|
||||||
smtp = {
|
|
||||||
host = "posteo.de";
|
|
||||||
port = 587;
|
|
||||||
tls = {
|
|
||||||
enable = true;
|
|
||||||
useStartTls = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
imap = {
|
|
||||||
host = "posteo.de";
|
|
||||||
port = 993;
|
|
||||||
tls.enable = true;
|
|
||||||
};
|
|
||||||
address = "kieran.meinhardt@posteo.net";
|
|
||||||
realName = kieran.name;
|
|
||||||
userName = "kieran.meinhardt@posteo.net";
|
|
||||||
passwordCommand = pass_ <secrets/mail/posteo>;
|
|
||||||
};
|
|
||||||
hu-berlin = enableDefaults {
|
|
||||||
primary = false;
|
|
||||||
address = "meinhark@hu-berlin.de";
|
|
||||||
realName = kieran.name;
|
|
||||||
userName = "meinhark";
|
|
||||||
passwordCommand = pass_ <secrets/eduroam/password>;
|
|
||||||
smtp = {
|
|
||||||
host = "mailhost.cms.hu-berlin.de";
|
|
||||||
port = 25;
|
|
||||||
tls = {
|
|
||||||
enable = true;
|
|
||||||
useStartTls = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
imap = {
|
|
||||||
host = "mailbox.cms.hu-berlin.de";
|
|
||||||
port = 993;
|
|
||||||
tls.enable = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
19
configs/mastodon-bot.nix
Normal file
19
configs/mastodon-bot.nix
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
{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";
|
||||||
|
}
|
||||||
@@ -1,72 +0,0 @@
|
|||||||
{ pkgs, lib, ... }:
|
|
||||||
let
|
|
||||||
bridgeBotToken = lib.strings.fileContents <system-secrets/telegram/kmein.token>;
|
|
||||||
config = {
|
|
||||||
general = {
|
|
||||||
RemoteNickFormat = "[{NOPINGNICK}] ";
|
|
||||||
Charset = "utf-8";
|
|
||||||
};
|
|
||||||
telegram.kmein.Token = bridgeBotToken;
|
|
||||||
irc.freenode = {
|
|
||||||
Server = "irc.freenode.net:6667";
|
|
||||||
Nick = "ponte";
|
|
||||||
};
|
|
||||||
mumble.lassulus = {
|
|
||||||
Server = "lassul.us:64738";
|
|
||||||
Nick = "krebs_bridge";
|
|
||||||
SkipTLSVerify = true;
|
|
||||||
};
|
|
||||||
gateway = [
|
|
||||||
{
|
|
||||||
name = "krebs-bridge";
|
|
||||||
enable = true;
|
|
||||||
inout = [
|
|
||||||
{
|
|
||||||
account = "irc.freenode";
|
|
||||||
channel = "#krebs";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
account = "telegram.kmein";
|
|
||||||
channel = "-330372458";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
account = "mumble.lassulus";
|
|
||||||
channel = 6; # "nixos"
|
|
||||||
}
|
|
||||||
];
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "myengadin-bridge";
|
|
||||||
enable = true;
|
|
||||||
inout = [
|
|
||||||
{
|
|
||||||
account = "irc.freenode";
|
|
||||||
channel = "##myengadin";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
account = "telegram.kmein";
|
|
||||||
channel = "-425759153";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
in
|
|
||||||
{
|
|
||||||
nixpkgs.overlays = [
|
|
||||||
(import <niveum/overlays/toml.nix>)
|
|
||||||
(self: super: {
|
|
||||||
matterbridge = (import (super.fetchFromGitHub {
|
|
||||||
owner = "NixOS";
|
|
||||||
repo = "nixpkgs";
|
|
||||||
rev = "e45d91ee65db293a172ec506759d1248e40c35f5";
|
|
||||||
sha256 = "03cjs5xcx09lw0djyrx2kfakw7gkg4iqmy9w25azai62im39l30k";
|
|
||||||
}) {}).matterbridge;
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
services.matterbridge = {
|
|
||||||
enable = true;
|
|
||||||
configPath = toString (pkgs.writeTOML config);
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -7,20 +7,20 @@
|
|||||||
"application/pdf" = "org.pwmt.zathura.desktop";
|
"application/pdf" = "org.pwmt.zathura.desktop";
|
||||||
"application/vnd.oasis.opendocument.text" = "writer.desktop";
|
"application/vnd.oasis.opendocument.text" = "writer.desktop";
|
||||||
"application/vnd.openxmlformats-officedocument.wordprocessingml.document" = "writer.desktop";
|
"application/vnd.openxmlformats-officedocument.wordprocessingml.document" = "writer.desktop";
|
||||||
"image/jpeg" = "sxiv.desktop";
|
"image/jpeg" = "nsxiv.desktop";
|
||||||
"image/png" = "sxiv.desktop";
|
"image/png" = "nsxiv.desktop";
|
||||||
"image/vnd.djvu+multipage" = "org.pwmt.zathura.desktop";
|
"image/vnd.djvu+multipage" = "org.pwmt.zathura.desktop";
|
||||||
"text/html" = "brave-browser.desktop";
|
"text/html" = "firefox.desktop";
|
||||||
"text/markdown" = "nvim.desktop";
|
"text/markdown" = "nvim.desktop";
|
||||||
"text/plain" = "nvim.desktop";
|
"text/plain" = "nvim.desktop";
|
||||||
"x-scheme-handler/about" = "brave-browser.desktop";
|
"x-scheme-handler/about" = "firefox.desktop";
|
||||||
"x-scheme-handler/http" = "brave-browser.desktop";
|
"x-scheme-handler/http" = "firefox.desktop";
|
||||||
"x-scheme-handler/https" = "brave-browser.desktop";
|
"x-scheme-handler/https" = "firefox.desktop";
|
||||||
"x-scheme-handler/mailto" = "brave-browser.desktop";
|
"x-scheme-handler/mailto" = "firefox.desktop";
|
||||||
"x-scheme-handler/unknown" = "brave-browser.desktop";
|
"x-scheme-handler/unknown" = "firefox.desktop";
|
||||||
"x-scheme-handler/webcal" = "brave-browser.desktop";
|
"x-scheme-handler/webcal" = "firefox.desktop";
|
||||||
|
"inode/directory" = "pcmanfm.desktop";
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
85
configs/monitoring.nix
Normal file
85
configs/monitoring.nix
Normal file
@@ -0,0 +1,85 @@
|
|||||||
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
|
services.nginx.virtualHosts.default = {
|
||||||
|
locations."= /stub_status".extraConfig = "stub_status;";
|
||||||
|
};
|
||||||
|
|
||||||
|
services.prometheus = {
|
||||||
|
enable = true;
|
||||||
|
port = 9001;
|
||||||
|
exporters = {
|
||||||
|
nginx.enable = false;
|
||||||
|
node = {
|
||||||
|
enable = true;
|
||||||
|
openFirewall = true;
|
||||||
|
enabledCollectors = [
|
||||||
|
"conntrack"
|
||||||
|
"diskstats"
|
||||||
|
"entropy"
|
||||||
|
"filefd"
|
||||||
|
"filesystem"
|
||||||
|
"loadavg"
|
||||||
|
"mdadm"
|
||||||
|
"meminfo"
|
||||||
|
"netdev"
|
||||||
|
"netstat"
|
||||||
|
"stat"
|
||||||
|
"time"
|
||||||
|
"vmstat"
|
||||||
|
"systemd"
|
||||||
|
"logind"
|
||||||
|
"interrupts"
|
||||||
|
"ksmd"
|
||||||
|
];
|
||||||
|
port = 9002;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
systemd.services.promtail = {
|
||||||
|
description = "Promtail service for Loki";
|
||||||
|
wantedBy = ["multi-user.target"];
|
||||||
|
|
||||||
|
serviceConfig = {
|
||||||
|
ExecStart = ''
|
||||||
|
${pkgs.grafana-loki}/bin/promtail --config.file ${
|
||||||
|
(pkgs.formats.yaml {}).generate "promtail.yaml" {
|
||||||
|
server = {
|
||||||
|
http_listen_port = 28183;
|
||||||
|
grpc_listen_port = 0;
|
||||||
|
};
|
||||||
|
positions.filename = "/tmp/positions.yaml";
|
||||||
|
clients = [
|
||||||
|
{
|
||||||
|
url = "http://${
|
||||||
|
if config.networking.hostName == "makanek"
|
||||||
|
then "127.0.0.1"
|
||||||
|
else "makanek.r"
|
||||||
|
}:3100/loki/api/v1/push";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
scrape_configs = [
|
||||||
|
{
|
||||||
|
job_name = "journal";
|
||||||
|
journal = {
|
||||||
|
max_age = "12h";
|
||||||
|
labels.job = "systemd-journal";
|
||||||
|
labels.host = config.networking.hostName;
|
||||||
|
};
|
||||||
|
relabel_configs = [
|
||||||
|
{
|
||||||
|
source_labels = ["__journal__systemd_unit"];
|
||||||
|
target_label = "unit";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
}
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -1,86 +0,0 @@
|
|||||||
{ config, pkgs, lib, ... }:
|
|
||||||
let
|
|
||||||
inherit (import <niveum/lib>) kieran;
|
|
||||||
|
|
||||||
moodle-dl = pkgs.callPackage <niveum/packages/moodle-dl> {};
|
|
||||||
|
|
||||||
moodle-dl-config = {
|
|
||||||
telegram = {
|
|
||||||
token = lib.strings.fileContents <system-secrets/telegram/moodle-dl.token>;
|
|
||||||
chat_id = "18980945";
|
|
||||||
send_error_msg = true;
|
|
||||||
};
|
|
||||||
token = lib.strings.fileContents <system-secrets/moodle.token>;
|
|
||||||
moodle_domain = "moodle.hu-berlin.de";
|
|
||||||
moodle_path = "/";
|
|
||||||
download_course_ids = [
|
|
||||||
99881 # Dialektologie
|
|
||||||
100183 # Onomastik
|
|
||||||
100353 # Sanskrit I
|
|
||||||
100692 # Sanskrit Tutorium
|
|
||||||
99832 # Germanisch
|
|
||||||
99823 # Gotisch
|
|
||||||
99813 # Altalbanisch
|
|
||||||
98681 # Geistliche Lyrik von Luther bis Lehnert
|
|
||||||
99667 # Antike Mythologie
|
|
||||||
# 52365 # FSR KlassPhil
|
|
||||||
];
|
|
||||||
download_submissions = true;
|
|
||||||
download_descriptions = true;
|
|
||||||
download_links_in_descriptions = false;
|
|
||||||
download_databases = false;
|
|
||||||
download_forums = false;
|
|
||||||
download_linked_files = false;
|
|
||||||
download_also_with_cookie = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
moodle-dl-json = pkgs.writeText "moodle-dl.json" (builtins.toJSON moodle-dl-config);
|
|
||||||
|
|
||||||
moodle-dl-directory = "/var/lib/moodle";
|
|
||||||
in
|
|
||||||
{
|
|
||||||
users.extraUsers.moodle = {
|
|
||||||
isNormalUser = false;
|
|
||||||
home = moodle-dl-directory;
|
|
||||||
createHome = true;
|
|
||||||
openssh.authorizedKeys.keys = [
|
|
||||||
# for sshfs mount
|
|
||||||
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDtIFmbspaBHaSkLEx43V0uaVd7l9NUFiwt2VOP++KzLjvRMLkyF2hg2HjmogTjUvTyoDs7RHwEH/cHZlJ5JQkM1jRqQpnYwGfkZEwYvmXAl6LY9+vQMP36gNPfXmKX3y3LelO7oD2uhUs0guTtg0tHUyN5/UY5u+VinyD6djxDkHaCUn3S7CS/odBcs/4flXT654wsvzgYicnSKH9R4W+7C0YsckZ/NoIkA4jnuwtWZYWrUkxd4/290buX6pAc5+zVVZqyy0sI4i8s6pO9RL5W7xvYt+w+U0u0dMxm5ckiRmLVKfIbMN4YtDxsZbZDajlQ1nDbOsEsrSXWz4H4cSNot7J820x1qh5SSxL4GSQlcT+6xCFk9kKyflxoS3oLoPLttx3rmOMkZKJWxF/IKLW47orxV6wkG5mHxdeR3cf6jX4j3nkwFVyC9R+WG4w2Z4vKONVE7uWGYU3y4OpR1e6MGHVShkNKqEvC/Kjcc/6v7I7AKRAuPZB0WEw36tA65/8= root@wilde"
|
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFFPHt+FPQ6gq8Ev65YsBZrafdtpWGpCNnlVvy67S1BK root@manakish"
|
|
||||||
];
|
|
||||||
useDefaultShell = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
system.activationScripts.moodle-dl-config = "ln -sfn ${toString moodle-dl-json} ${config.users.extraUsers.moodle.home}/config.json";
|
|
||||||
|
|
||||||
services.syncthing = {
|
|
||||||
enable = true;
|
|
||||||
user = "moodle"; # config.users.extraUsers.moodle.name;
|
|
||||||
openDefaultPorts = true;
|
|
||||||
configDir = "${moodle-dl-directory}/.config/syncthing";
|
|
||||||
dataDir = "${moodle-dl-directory}/.config/syncthing";
|
|
||||||
declarative = rec {
|
|
||||||
cert = toString <system-secrets/syncthing/cert.pem>;
|
|
||||||
key = toString <system-secrets/syncthing/key.pem>;
|
|
||||||
devices = {
|
|
||||||
inherit ((import <niveum/lib>).syncthing.devices) wilde manakish toum;
|
|
||||||
};
|
|
||||||
folders.${moodle-dl-directory} = {
|
|
||||||
devices = [ "toum" "wilde" "manakish" ];
|
|
||||||
id = "moodle-dl";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
systemd.services.moodle-dl = {
|
|
||||||
enable = true;
|
|
||||||
startAt = "hourly";
|
|
||||||
serviceConfig = {
|
|
||||||
Type = "oneshot";
|
|
||||||
User = config.users.extraUsers.moodle.name;
|
|
||||||
WorkingDirectory = config.users.extraUsers.moodle.home;
|
|
||||||
};
|
|
||||||
wants = [ "network-online.target" ];
|
|
||||||
script = "${moodle-dl}/bin/moodle-dl";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,38 +0,0 @@
|
|||||||
{ config, pkgs, lib, ... }:
|
|
||||||
let
|
|
||||||
playlists = import <niveum/lib/playlists.nix>;
|
|
||||||
playlistFiles = lib.mapAttrs (name: {tracks, ...}: pkgs.writeText "${name}.m3u" (builtins.concatStringsSep "\n" (map ({url, ...}: url) tracks))) playlists;
|
|
||||||
linkPlaylist = name: file: ''
|
|
||||||
ln -sfn "${toString file}" "/var/lib/mpd/playlists/${name}.m3u"
|
|
||||||
'';
|
|
||||||
linkPlaylists = lib.concatStringsSep "\n" (lib.mapAttrsToList linkPlaylist playlistFiles);
|
|
||||||
in
|
|
||||||
{
|
|
||||||
system.activationScripts.mpd-playlists = ''
|
|
||||||
rm -rf /var/lib/mpd/playlists
|
|
||||||
install -d /var/lib/mpd/playlists
|
|
||||||
${linkPlaylists}
|
|
||||||
'';
|
|
||||||
|
|
||||||
environment.systemPackages = [ pkgs.ncmpcpp pkgs.mpc_cli ];
|
|
||||||
|
|
||||||
services.mpd.enable = true;
|
|
||||||
services.ympd.enable = true;
|
|
||||||
|
|
||||||
services.nginx.virtualHosts.default = {
|
|
||||||
locations."^~ /ympd/" = {
|
|
||||||
proxyPass = "http://127.0.0.1:${config.services.ympd.webPort}/";
|
|
||||||
extraConfig = ''
|
|
||||||
auth_basic "Restricted Content";
|
|
||||||
auth_basic_user_file ${pkgs.writeText "ympd-password" "dj:$apr1$1ogLNSki$37uGV8iqjWEYEwtY4iq3F1"};
|
|
||||||
''; # generate password hash with `openssl passwd -apr1`
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
# dont let anyone outside localhost or local network in
|
|
||||||
networking.firewall.extraCommands = let ympdPort = config.services.ympd.webPort; in ''
|
|
||||||
${pkgs.iptables}/bin/iptables -A INPUT -p tcp --dport ${ympdPort} -s 192.168.0.0/16 -j ACCEPT
|
|
||||||
${pkgs.iptables}/bin/iptables -A INPUT -p tcp --dport ${ympdPort} -s 127.0.0.0/8 -j ACCEPT
|
|
||||||
${pkgs.iptables}/bin/iptables -A INPUT -p tcp --dport ${ympdPort} -j DROP
|
|
||||||
'';
|
|
||||||
}
|
|
||||||
@@ -1,14 +1,29 @@
|
|||||||
{ pkgs, ... }: let
|
{
|
||||||
swallow = command: "${pkgs.scripts.swallow}/bin/swallow ${command}";
|
pkgs,
|
||||||
|
lib,
|
||||||
|
config,
|
||||||
|
niveumPackages,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
swallow = command: "${niveumPackages.swallow}/bin/swallow ${command}";
|
||||||
in {
|
in {
|
||||||
environment.shellAliases.mpv = swallow "mpv";
|
environment.shellAliases.smpv = swallow "mpv";
|
||||||
|
|
||||||
|
nixpkgs.overlays = [
|
||||||
|
(self: super: {
|
||||||
|
mpv = config.home-manager.users.me.programs.mpv.finalPackage;
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
home-manager.users.me = {
|
home-manager.users.me = {
|
||||||
programs.mpv = {
|
programs.mpv = {
|
||||||
enable = true;
|
enable = true;
|
||||||
config = {
|
config = {
|
||||||
force-window = "yes";
|
|
||||||
ytdl-format = "bestvideo[height<=?720][fps<=?30][vcodec!=?vp9]+bestaudio/best";
|
ytdl-format = "bestvideo[height<=?720][fps<=?30][vcodec!=?vp9]+bestaudio/best";
|
||||||
|
ytdl-raw-options = lib.concatStringsSep "," [''sub-lang="de,en"'' "write-sub=" "write-auto-sub="];
|
||||||
|
screenshot-template = "%F-%wH%wM%wS-%#04n";
|
||||||
|
script-opts = "ytdl_hook-ytdl_path=${pkgs.yt-dlp}/bin/yt-dlp";
|
||||||
|
ao = "pulse"; # no pipewire for me :(
|
||||||
};
|
};
|
||||||
bindings = {
|
bindings = {
|
||||||
"Alt+RIGHT" = "add video-rotate 90";
|
"Alt+RIGHT" = "add video-rotate 90";
|
||||||
@@ -20,6 +35,10 @@ in {
|
|||||||
"Alt+k" = "add video-pan-y 0.05";
|
"Alt+k" = "add video-pan-y 0.05";
|
||||||
"Alt+j" = "add video-pan-y -0.05";
|
"Alt+j" = "add video-pan-y -0.05";
|
||||||
};
|
};
|
||||||
|
scripts = [
|
||||||
|
pkgs.mpvScripts.youtube-quality
|
||||||
|
niveumPackages.mpv-visualizer
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,10 +0,0 @@
|
|||||||
{
|
|
||||||
programs.nano.nanorc = ''
|
|
||||||
set autoindent
|
|
||||||
set boldtext
|
|
||||||
set morespace
|
|
||||||
set smarthome
|
|
||||||
set tabsize 4
|
|
||||||
set tabstospaces
|
|
||||||
'';
|
|
||||||
}
|
|
||||||
@@ -1,77 +1,70 @@
|
|||||||
{ pkgs, ... }: {
|
{
|
||||||
|
pkgs,
|
||||||
|
niveumPackages,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
environment.variables.EDITOR = pkgs.lib.mkForce "nvim";
|
environment.variables.EDITOR = pkgs.lib.mkForce "nvim";
|
||||||
environment.shellAliases.vi = "nvim";
|
environment.shellAliases.vi = "nvim";
|
||||||
environment.shellAliases.vim = "nvim";
|
environment.shellAliases.vim = "nvim";
|
||||||
environment.shellAliases.view = "nvim -R";
|
environment.shellAliases.view = "nvim -R";
|
||||||
|
|
||||||
nixpkgs.config.packageOverrides = pkgs: {
|
|
||||||
vimPlugins = pkgs.vimPlugins // {
|
|
||||||
cheat-sh-vim = pkgs.callPackage <niveum/packages/vimPlugins/cheat-sh.nix> { };
|
|
||||||
vim-fetch = pkgs.callPackage <niveum/packages/vimPlugins/vim-fetch.nix> { };
|
|
||||||
vim-colors-paramount = pkgs.callPackage <niveum/packages/vimPlugins/vim-colors-paramount.nix> { };
|
|
||||||
vim-256noir = pkgs.callPackage <niveum/packages/vimPlugins/vim-256noir.nix> { };
|
|
||||||
icalendar-vim = pkgs.callPackage <niveum/packages/vimPlugins/icalendar-vim.nix> { };
|
|
||||||
todo-txt-vim = pkgs.callPackage <niveum/packages/vimPlugins/todo-txt-vim.nix> { };
|
|
||||||
jq-vim = pkgs.callPackage <niveum/packages/vimPlugins/jq-vim.nix> { };
|
|
||||||
vim-fsharp = pkgs.callPackage <niveum/packages/vimPlugins/vim-fsharp.nix> { };
|
|
||||||
vim-reason-plus = pkgs.callPackage <niveum/packages/vimPlugins/vim-reason-plus.nix> { };
|
|
||||||
vim-mail = pkgs.callPackage <niveum/packages/vimPlugins/vim-mail.nix> { };
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
environment.systemPackages = [
|
environment.systemPackages = [
|
||||||
|
(pkgs.writers.writeDashBin "vim" ''neovim "$@"'')
|
||||||
(pkgs.neovim.override {
|
(pkgs.neovim.override {
|
||||||
configure = {
|
configure = {
|
||||||
customRC = builtins.readFile <niveum/lib/vim/init.vim>;
|
customRC = ''
|
||||||
|
source ${../lib/vim/init.vim}
|
||||||
|
|
||||||
|
luafile ${../lib/vim/init.lua}
|
||||||
|
'';
|
||||||
packages.nvim = with pkgs.vimPlugins; {
|
packages.nvim = with pkgs.vimPlugins; {
|
||||||
start = [
|
start = [
|
||||||
# cheat-sh-vim
|
|
||||||
# deoplete-nvim
|
|
||||||
# vim-abolish
|
|
||||||
ale
|
ale
|
||||||
fzf-vim
|
fzf-vim
|
||||||
fzfWrapper
|
fzfWrapper
|
||||||
goyo
|
|
||||||
supertab
|
supertab
|
||||||
undotree
|
undotree
|
||||||
tabular
|
tabular
|
||||||
vimwiki
|
# vimwiki
|
||||||
vim-256noir
|
niveumPackages.vimPlugins-vim-colors-paramount
|
||||||
vim-colors-paramount
|
nvim-lspconfig
|
||||||
vim-commentary
|
vim-commentary
|
||||||
vim-css-color
|
vim-css-color
|
||||||
vim-eunuch
|
vim-eunuch
|
||||||
vim-fetch
|
niveumPackages.vimPlugins-vim-fetch
|
||||||
vim-fugitive
|
vim-fugitive
|
||||||
vim-gitgutter
|
vim-gitgutter
|
||||||
vim-pandoc
|
|
||||||
vim-pandoc-syntax # vim-pandoc-after
|
|
||||||
vim-repeat
|
vim-repeat
|
||||||
vim-sensible
|
vim-sensible
|
||||||
# vim-startify
|
|
||||||
vim-surround
|
vim-surround
|
||||||
vim-mail
|
(pkgs.vimUtils.buildVimPlugin rec {
|
||||||
|
pname = "vim-dim";
|
||||||
|
version = "1.1.0";
|
||||||
|
name = "${pname}-${version}";
|
||||||
|
src = pkgs.fetchFromGitHub {
|
||||||
|
owner = "jeffkreeftmeijer";
|
||||||
|
repo = pname;
|
||||||
|
rev = version;
|
||||||
|
sha256 = "sha256-lyTZUgqUEEJRrzGo1FD8/t8KBioPrtB3MmGvPeEVI/g=";
|
||||||
|
};
|
||||||
|
})
|
||||||
];
|
];
|
||||||
opt = [
|
opt = [
|
||||||
csv
|
csv
|
||||||
dhall-vim
|
|
||||||
elm-vim
|
elm-vim
|
||||||
emmet-vim
|
emmet-vim
|
||||||
haskell-vim
|
haskell-vim
|
||||||
icalendar-vim
|
niveumPackages.vimPlugins-icalendar-vim
|
||||||
idris-vim
|
niveumPackages.vimPlugins-jq-vim
|
||||||
jq-vim
|
|
||||||
purescript-vim
|
|
||||||
rust-vim
|
rust-vim
|
||||||
todo-txt-vim
|
|
||||||
typescript-vim
|
typescript-vim
|
||||||
vim-fsharp
|
|
||||||
vim-javascript
|
vim-javascript
|
||||||
vim-ledger
|
vim-ledger
|
||||||
vim-nix
|
vim-nix
|
||||||
vim-reason-plus
|
|
||||||
vim-toml
|
|
||||||
vimtex
|
vimtex
|
||||||
|
vim-pandoc
|
||||||
|
vim-pandoc-syntax
|
||||||
|
niveumPackages.vimPlugins-vim-256noir
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user