Compare commits
893 Commits
test2
...
e09a1210fa
| Author | SHA1 | Date | |
|---|---|---|---|
| e09a1210fa | |||
| 4cec4765b1 | |||
| 0d4c7ed4d4 | |||
| ee84e3248e | |||
| dae07a30c8 | |||
| 804c0019db | |||
| db92e8982a | |||
| c91584541a | |||
| 440eb42404 | |||
| da4f5bc228 | |||
| c80c40e57a | |||
| 85c81b5a1c | |||
| 28d155400f | |||
| e322bf65fc | |||
| 2b0ab9651e | |||
| f97b03919b | |||
| 660aa2e2fb | |||
| 79ffc5858e | |||
| 21e015a0c2 | |||
| b82c598b53 | |||
| 3d733195d6 | |||
| 81c8483689 | |||
| a0ff050d0e | |||
| a6e792bd6b | |||
| 8447343233 | |||
| 65bfa84566 | |||
| f058ea45c0 | |||
| 96b91f8d2c | |||
| d44ed4165e | |||
| 1bff7ad4fe | |||
| b646d6d730 | |||
| 959ac7825d | |||
| a6ce2ad88f | |||
| e4a22a1b89 | |||
| 1c544e8902 | |||
| f8e68062bd | |||
| ccdbef4bb3 | |||
| 6ed6ede0d8 | |||
| e9e17eceb5 | |||
| d31d39473b | |||
| d0d162f3e9 | |||
| f7915cdbff | |||
| b069b349b2 | |||
| bc1bbb2a5c | |||
| 29d882829f | |||
| f9ba92bd3d | |||
| 2a69ae05df | |||
| 2d5e56e725 | |||
| 0b404f31dd | |||
| 762a4a08f2 | |||
| 8314ad3387 | |||
| d26d37cb7b | |||
| 29175ac617 | |||
| 59b773a438 | |||
| 27cc4e8a86 | |||
| fd30e9d7ef | |||
| 6c78ae24f4 | |||
| ff57670936 | |||
| 53ca90c0b1 | |||
| fb52961120 | |||
| f3785233c1 | |||
| 838e99cb19 | |||
| 6b0c74b674 | |||
| 0befa8b6f5 | |||
| ea465fc075 | |||
| bc414939e6 | |||
| b1db300ae8 | |||
| 0489a0e856 | |||
| 9348ebce7c | |||
| a307940bf4 | |||
| c8413c975f | |||
| 7a71f28303 | |||
| 399294ae65 | |||
| e5b8ded7fa | |||
| da6db3276c | |||
| 5d4e3ac606 | |||
| e095b487dc | |||
| 1ca7f09ea4 | |||
| 205f284c47 | |||
| 394e4686f3 | |||
| 4ed570c7a2 | |||
| 78504a3b1b | |||
| be6aa9f66f | |||
| 0fd006d6c3 | |||
| 9d5783db39 | |||
| c75cdb4473 | |||
| 61b6f85ef3 | |||
| 1d4597c7db | |||
| 897280fc3d | |||
| 9bd326a7cb | |||
| ce316547aa | |||
| 7712c0b153 | |||
| d086320dfb | |||
| 59f5146df8 | |||
| c7a8e1fb31 | |||
| 97ef143f53 | |||
| 31f16cfe52 | |||
| 73c5582e7f | |||
| cdaefbd74f | |||
| 3ebc46f069 | |||
| 91d5dd1186 | |||
| 908fd619e7 | |||
| f052e65a16 | |||
| bd7620d0c4 | |||
| 0f75a28af9 | |||
| 5506d8e4ae | |||
| 32c1e8eac9 | |||
| f08caa5659 | |||
| ea289f1f8d | |||
| fc52b828a5 | |||
| 38448a8194 | |||
| b7fc0c6e3d | |||
| 427da325c4 | |||
| 12fc9737f7 | |||
| 133aa0fa44 | |||
| d431c74ed2 | |||
| f98e9c1351 | |||
| b85059b2fc | |||
| dac6a48a38 | |||
| 90c69533a4 | |||
| b5fb06b977 | |||
| 43042e489f | |||
| 2766d90b27 | |||
| 12d984a840 | |||
| a954a44abc | |||
| 4f2a9e67eb | |||
| d9dd5a581e | |||
| e816019383 | |||
| 9eb9433349 | |||
| 016cb009cf | |||
| 0e5155d447 | |||
| 5f4817d1f2 | |||
| a266112070 | |||
| 873406ade5 | |||
| 77d9901077 | |||
| 0bddfee932 | |||
| 19f0fb0ddb | |||
| 0901f946bc | |||
| 9772e381ce | |||
| 2b86d66dca | |||
| 2fef62c2dd | |||
| ca4070f9e1 | |||
| 1e075ffb13 | |||
| 1429eaf34f | |||
| 4ec1268b2e | |||
| 89ae314939 | |||
| 162c72aa1b | |||
| faed023d89 | |||
| a9a4a1e288 | |||
| ee824be6fa | |||
| c6c5812245 | |||
| 3f2cfc65c8 | |||
| 8514e52850 | |||
| 8b9475681a | |||
| cf2d9274d4 | |||
| 3d3890affe | |||
| c4ed7b9b9b | |||
| 81553524a6 | |||
| e725fdea2a | |||
| c13d4a4d2c | |||
| 4d818cd32b | |||
| 30f04074b7 | |||
| bc4665d629 | |||
| bb90ad407e | |||
| c80add037c | |||
| 980ec8f5eb | |||
| c9b7711a95 | |||
| cebbd6ddbd | |||
| 4d09162f39 | |||
| a726a4de02 | |||
| ecdf14ae5f | |||
| e0bf00ce13 | |||
| c508c795bd | |||
| 60cf14d327 | |||
| 7d5af14d21 | |||
| b259a11a3e | |||
| 12b644378a | |||
| f38c3612df | |||
| 7bcfa38026 | |||
| ddff48eef2 | |||
| 58e538bb4f | |||
| 37e6fafac0 | |||
| 146cbf39b7 | |||
| 59d9c95224 | |||
| 9330040e00 | |||
| 34ad7579f1 | |||
| a34ab937e5 | |||
| 1e91752dc6 | |||
| 8f5e821c13 | |||
| dafdbb3498 | |||
| f2ad356272 | |||
| 82e9856e68 | |||
| 5a1f1cfa14 | |||
| b4c771cc59 | |||
| 6ec26a64fc | |||
| e989b91979 | |||
| 5cc03d302e | |||
| 8314fa6b72 | |||
| 2309b35ed8 | |||
| 49ed1861e0 | |||
| 6de36ffba2 | |||
| e575e03f92 | |||
| ca0cee6398 | |||
| b66fe2a155 | |||
| 9c660f82ed | |||
| b3248a0fca | |||
| f2c651da7c | |||
| 7208028023 | |||
| 7c6078d59d | |||
| 009b8ff5ce | |||
| 1fb5713d41 | |||
| 9307929381 | |||
| ff5897e3b2 | |||
| bfdb956341 | |||
| 6e2b5ddd78 | |||
| 1ed0157ffb | |||
| 00fd98e873 | |||
| b421fb0c95 | |||
| d8e0f3e78c | |||
| 4c7e4918c9 | |||
| a3d9e6c715 | |||
| 680aeac317 | |||
| 2dccc21d33 | |||
| bf77835d30 | |||
| eb122a79cc | |||
| b2a428f1f7 | |||
| d9841e5858 | |||
| 4e1f060c42 | |||
| 0912a6f6d8 | |||
| c000eaf6fa | |||
| e40daae48a | |||
| 7ab9ea0046 | |||
| fefb2d92d3 | |||
| 1e803be540 | |||
| e38885cbe6 | |||
| d7ce1be631 | |||
| e0e5440d98 | |||
| b3a6c1dfe4 | |||
| 0f58284817 | |||
| 13fe52c9dc | |||
| 43ed03d687 | |||
| f4734affb9 | |||
| da3762a3b0 | |||
| 855c6ab014 | |||
| 66abafbfee | |||
| 3f84347937 | |||
| 9b67c4b425 | |||
| 883ee1ac2a | |||
| cee72be14a | |||
| 007749aedd | |||
| 4014996441 | |||
| 68ca420b81 | |||
| 11bfe46eeb | |||
| 12c5d39033 | |||
| ea2f2451e1 | |||
| e2b2391cf7 | |||
| 3a54d52051 | |||
| 6b0105fa71 | |||
| 1fa78b506f | |||
| b68eb1e33d | |||
| be6e67821f | |||
| c4e335a6a3 | |||
| e07736bfb4 | |||
| 7e56f43195 | |||
| 1a37f4ef64 | |||
| 725fe7c075 | |||
| c1c2c828d1 | |||
| a3f443721c | |||
| d84b67360b | |||
| d117edc6d1 | |||
| f6961fab26 | |||
| e9d1905797 | |||
| ea122cd8fb | |||
| 4f2627cf0a | |||
| 05ac37d172 | |||
| 7ae2c59ba4 | |||
| fb781a5b5d | |||
| 0b8a26742a | |||
| b272f5fd3a | |||
| 828b38ec0f | |||
| 2678e2adfe | |||
| d25dba89bb | |||
| 688637b3e3 | |||
| a6fec3c344 | |||
| 7af17b46da | |||
| caaa397332 | |||
| b619694f1f | |||
| a21926f738 | |||
| bcc3583baf | |||
| f4228630b0 | |||
| 679ddf22d6 | |||
| 885def6c5b | |||
| 408ebb68d0 | |||
| ef1c095e7f | |||
| f48c31332f | |||
| 881dd008ad | |||
| 7763435a63 | |||
| 9deaef642f | |||
| 8079f29912 | |||
| 3b9c1279a2 | |||
| 2227a85021 | |||
| 07a8338e77 | |||
| 6071fe4f8f | |||
| 318490e7b8 | |||
| 88c8e49589 | |||
| 49c006bc20 | |||
| b0bc54840d | |||
| 58c40f69d9 | |||
| 3e71f9f1e3 | |||
| 68297bb968 | |||
| b5d1f77c2d | |||
| f56092ed67 | |||
| 38a1abe7e7 | |||
| 63d998c1a4 | |||
| 6e487f4bc1 | |||
| c1cab46edf | |||
| 07c6553a3a | |||
| 11ac43cb35 | |||
| 271dd3b5a0 | |||
| 788cb8ac77 | |||
| b5b99476af | |||
| cb57530810 | |||
| 9d27d345d5 | |||
| 53d6b199b9 | |||
| 6891690305 | |||
| 34a3d55ef2 | |||
| be01f445ff | |||
| c06e834524 | |||
| b49101eef6 | |||
| fce869955f | |||
| 72a77275aa | |||
| d8a65e5082 | |||
| 6b8e016dd5 | |||
| b9d59e8ecf | |||
| 2230b49918 | |||
| 0cd51a17e3 | |||
| d6488c88f8 | |||
| 2240f4e6d2 | |||
| 9886db98d7 | |||
| 0ba83acd3a | |||
| db3daad968 | |||
| f3e54a2401 | |||
| 6aa5f0cd37 | |||
| f42eee05b7 | |||
| d45f2e1f2f | |||
| 678068e959 | |||
| 585fbdb174 | |||
| 9724ef1aa2 | |||
| 856e3d33f9 | |||
| 6bd3caf622 | |||
| 49cf283770 | |||
| 561cb4038f | |||
| d98529f30b | |||
| 3e76a82cb2 | |||
| 0147f7f0a9 | |||
| 880e1376da | |||
| c3d6af2471 | |||
| fd2d4f8bcf | |||
| 0d529e7606 | |||
| 29ecaeea2b | |||
| a268f37854 | |||
| 6cd47dabc1 | |||
| 213cd9b6a1 | |||
| 28b3e95b2c | |||
| 43b9dd3b08 | |||
| 49a7762e6c | |||
| 147866ca69 | |||
| 87e8771d36 | |||
| 66b77f6cd1 | |||
| ea804c530d | |||
| eecd828d60 | |||
| 1da6bf597d | |||
| d5c539eae1 | |||
| e64893cac9 | |||
| 6ab8560b4e | |||
| 3220bc41e8 | |||
| 27b46020e3 | |||
| aba24190db | |||
| a3e64c6145 | |||
| 64e1e6d5d0 | |||
| a6d672c353 | |||
| 6fc3c2aedb | |||
| 8c55badccb | |||
| 555d2bf7f2 | |||
| f28922c9e8 | |||
| 58772148b3 | |||
| 69b390bc40 | |||
| c107056db8 | |||
| 620249c9dc | |||
| 914dd2cb4b | |||
| f70309fedd | |||
| d8c6fd6699 | |||
| f21b69da62 | |||
| e99b513e3b | |||
| b57217f934 | |||
| 42cf7807ab | |||
| 944ba883d7 | |||
| 3521508ff4 | |||
| 200e5645cd | |||
| 2d755648b8 | |||
| bf8acd7f71 | |||
| 864885d47d | |||
| cc447fb2c8 | |||
| 00d68fdcb8 | |||
| cf98ddc251 | |||
| 24b55cf890 | |||
| 686bbd0e34 | |||
| 4afcff4bb1 | |||
| d15b2b08da | |||
| cfbb5df774 | |||
| 94d4fcb178 | |||
| aa498a4d92 | |||
| 15a5bb3696 | |||
| 99c69b80d0 | |||
| af36980a81 | |||
| 9b1fad9530 | |||
| cbded3e6c6 | |||
| 3cd47bdf02 | |||
| a3c7939ff0 | |||
| 3ed374e539 | |||
| 5f8348d0e2 | |||
| 1d72427091 | |||
| ec7c47073b | |||
| 421d877143 | |||
| a6c61cb1c8 | |||
| 6811e62c97 | |||
| b5da26cb91 | |||
| 43b458e1fd | |||
| 5774b3d61a | |||
| 070ee29aa5 | |||
| aaedb9a654 | |||
| 905be2f562 | |||
| 9d5f34011f | |||
| 05b41da541 | |||
| 9e5f1c95fe | |||
| 45060743ce | |||
| 3fdd991cef | |||
| d0b067e3d4 | |||
| b23363ec55 | |||
| 09ed854251 | |||
| 7287ff76a5 | |||
| 97409130ab | |||
| ff70e29117 | |||
| 5ed1650b02 | |||
| ba066166fe | |||
| 9278e8c065 | |||
| c6405280de | |||
| 03a6e6b737 | |||
| 4c5bb331d4 | |||
| 580bfd9e52 | |||
| 2937aa8b9b | |||
| cce054a742 | |||
| db1dddf2ff | |||
| 96fe4d9ec4 | |||
| 8826f60aa2 | |||
| 4e78974f05 | |||
| 950277aa92 | |||
| 3850b70777 | |||
| 57a5b8fd27 | |||
| 1ab6f3e6f9 | |||
| c779077be6 | |||
| ea470d4c92 | |||
| 6e9cbf3fa3 | |||
| 1ce33cf152 | |||
| 18c1070540 | |||
| 8834bca7fb | |||
| 5922d989e0 | |||
| 07884738b8 | |||
| 0b237bd9bc | |||
| d53a3ab0c0 | |||
| 6bdc001e53 | |||
| 996a758670 | |||
| 1318431476 | |||
| db422d2cdb | |||
| a418654fb8 | |||
| f9757b58aa | |||
| 9cf05ac5fe | |||
| 206015074a | |||
| 0ee36e4373 | |||
| 143c41e100 | |||
| a71f756b2d | |||
| e9dfea94c3 | |||
| 2751beafc1 | |||
| fcaa7d40be | |||
| 7298ed104f | |||
| 1501d256b8 | |||
| f2cb3de845 | |||
| b8db8bbfb7 | |||
| 8e87be2ecf | |||
| 029d1f3e0a | |||
| a8d17796e6 | |||
| a04f26343d | |||
| 970c5a614c | |||
| eaf1382493 | |||
| 53701526be | |||
| a2df62dc2b | |||
| 576b343da5 | |||
| 447c525c1d | |||
| f8ae168f7e | |||
| 4e3118e3c7 | |||
| dc8071e099 | |||
| 858d5d2438 | |||
| f0bccad851 | |||
| 42e296b30d | |||
| 80d4f7052c | |||
| 9db32a19be | |||
| f65091e8ba | |||
| 0ccde8d66f | |||
| cd90bb119e | |||
| 5705328277 | |||
| 188b93668c | |||
| 40ca67ebbb | |||
| 4e787f8fa5 | |||
| 5c7ea6ecd8 | |||
| 8aeb9d9f27 | |||
| 2e8708a616 | |||
| af26991d95 | |||
| c063610421 | |||
| 2096b3234f | |||
| e2ae922a85 | |||
| 2e09c7354a | |||
| 8479767fcc | |||
| bb9739755a | |||
| b6b2cecd38 | |||
| 1091f42490 | |||
| b7d2489f6d | |||
| 62bb6d6d40 | |||
| d8fc5aa9c3 | |||
| 9670eb8445 | |||
| 3ff8990a35 | |||
| 5792877f25 | |||
| 1e5719c94c | |||
| ca58ee0c61 | |||
| 0d703b7cad | |||
| 5662e68a16 | |||
| 6db59607eb | |||
| 7040170468 | |||
| 40c2b659c7 | |||
| 9ae91e724d | |||
| 974a659216 | |||
| 9ed7db6327 | |||
| 38b3285d49 | |||
| 9e4931f37e | |||
| f6fae531d6 | |||
| 7f507ec4c3 | |||
| 4073ac5930 | |||
| a7d23f06c4 | |||
| e5d23adcab | |||
| db329973ec | |||
| e2395d12cf | |||
| 40ef2ad2fd | |||
| c0a2e34fd5 | |||
| ecdbedf4b2 | |||
| fff382e5fa | |||
| 3371d03421 | |||
| 1f27aee39c | |||
| 5dd7cfc6af | |||
| 2b62592bdf | |||
| c66d39fa5a | |||
| 99d14f5f6b | |||
| cc1ebcfd86 | |||
| 8205d867a0 | |||
| 971ce13043 | |||
| f9355f7b9c | |||
| f384a8a1b6 | |||
| fd3f5c4bd6 | |||
| c54278cc7c | |||
| 8209b459d8 | |||
| 86d55197cb | |||
| 50932f8faa | |||
| 35da0e349c | |||
| 97f467f6ec | |||
| ccb10a97d7 | |||
| f29d92dad4 | |||
| 4b6c442d6b | |||
| 6e894943f9 | |||
| 7370df1680 | |||
| 7f352e0910 | |||
| a557b35187 | |||
| 3d0b88031b | |||
| cd8c5f7cf3 | |||
| 5531ce1fda | |||
| 2a58bcadb3 | |||
| f219630319 | |||
| 77d9406f2e | |||
| a6efc6c43d | |||
| 4f1ef573e8 | |||
| 49c95f5be1 | |||
| 5ffc046537 | |||
| 8b4e01b538 | |||
| d6c0df83f1 | |||
| aed9e65c44 | |||
| a71942a69e | |||
| 891c761e66 | |||
| 72386b0005 | |||
| 6763f4105f | |||
| e88b1dd5fa | |||
| 7b892b7d56 | |||
| 67dc8a99f2 | |||
| 4b09d22cfc | |||
| 40f4f73efb | |||
| 504e6784da | |||
| 79a9c7eebd | |||
| 4403719e13 | |||
| 24616ec1db | |||
| 15d2b54eb7 | |||
| 3e4d59348b | |||
| 374c939fdb | |||
| 4dfe80d56b | |||
| 45c48b39bc | |||
| 0d9076d5ed | |||
| 6e4c633b42 | |||
| 316502744b | |||
| c3c22c5944 | |||
| a5c83fb4ac | |||
| 6116088396 | |||
| fe49d682a9 | |||
| 26d5535f0d | |||
| f5456a82fa | |||
| 4060b2f840 | |||
| 032b601561 | |||
| b3d18f3dd9 | |||
| 2c2aaf5de8 | |||
| 3703fd3d3b | |||
| 4c34680a10 | |||
| 478bb17fd1 | |||
| f9c640eecb | |||
| 8a09cb050c | |||
| 84105ba6f6 | |||
| 3970d71363 | |||
| 06674d7b99 | |||
| d62b8ca11d | |||
| 5db5a4fe2a | |||
| c9ee90f889 | |||
| f2aafc1ba7 | |||
| add0adb9a0 | |||
| 7661621c00 | |||
| 0228edc5c7 | |||
| edf62e7622 | |||
| 7fd54e39ca | |||
| a49ea2ee2b | |||
| f0b732ce79 | |||
| 1c06d9ca2e | |||
| 3e336eac2c | |||
| 8ef941ccd3 | |||
| 1532f95ea4 | |||
| e29138ba9b | |||
| 374fd85af6 | |||
| fa05b32485 | |||
| 489b80d136 | |||
| fafca0e743 | |||
| 290bcbe172 | |||
| 6b0db2f804 | |||
| 1a31586fbe | |||
| d00cf5b11c | |||
| 7671b3e48e | |||
| 5462ab0790 | |||
| f6715dedc6 | |||
| 0030cc2ca9 | |||
| 5d116becfb | |||
| 01ebaea6c2 | |||
| 916d67d22f | |||
| 329f2a6e2c | |||
| 8307a4d4ca | |||
| 040e5d09e5 | |||
| 1bc03cffcc | |||
| 465a413ae9 | |||
| 83d7386b25 | |||
| eb07b67107 | |||
| 1c6fe13112 | |||
| 1ae605a52a | |||
| 05618cf533 | |||
| c1c9d7bbad | |||
| 08efa386fc | |||
| 7016c97f9d | |||
| ecde49ce4a | |||
| 3bc6db63cb | |||
| 20eee74860 | |||
| 42c55c6f53 | |||
| 583a2c856b | |||
| 00536c6260 | |||
| ff9d2b547f | |||
| b4fdaae8c5 | |||
| 92a78cf2f4 | |||
| 355443acc6 | |||
| 3b24d2bac4 | |||
| 8d6dc18bb0 | |||
| cef0463e89 | |||
| d9b1a4ca5d | |||
| 4039174e45 | |||
| 0759483348 | |||
| a6dd7e0c21 | |||
| 98bdcb1b2c | |||
| 351fe1bb9a | |||
| 3cf20a7306 | |||
| 06c5871ed4 | |||
| c781636516 | |||
| 22f0586995 | |||
| f4f2f47ee2 | |||
| 86d417264a | |||
| e9647aca00 | |||
| 8067e31901 | |||
| 77c637524f | |||
| d1fe361df6 | |||
| 09d06ac7e7 | |||
| abb78d6248 | |||
| 74e645dd96 | |||
| a2aedcfef3 | |||
| f06f98604f | |||
| d631cdba30 | |||
| 839c941f9e | |||
| 9bd8b62dc4 | |||
| 339798448a | |||
| 9d401a8e69 | |||
| 5cc8f0f0ed | |||
| ebca8ce6e3 | |||
| 7acb66688b | |||
| 0f6629109a | |||
| cb19d91c2b | |||
| a35c8c0dbe | |||
| 8575e7471b | |||
| fe82fa28be | |||
| a74410228a | |||
| dd615deb94 | |||
| 4c7515bbf7 | |||
| 961632639e | |||
| 0dd81432c0 | |||
| 942eec9a0d | |||
| e9412abd21 | |||
| 7b80f3d19d | |||
| ddac3190bd | |||
| b069d87c93 | |||
| 0b52b54c7b | |||
| 658bace2c6 | |||
| c27be08ab1 | |||
| 009b263e9e | |||
| 08bce6511b | |||
| 509f9914e4 | |||
| 09389db745 | |||
| 6a4a410a3c | |||
| 465d332b1a | |||
| 284767614a | |||
| dd589f8b21 | |||
| 6f4a0b01e9 | |||
| 92cc4c31d6 | |||
| 10c96b1862 | |||
| 60e9290414 | |||
| 802c149399 | |||
| ba5aa49a0f | |||
| f59558f29f | |||
| d7791b94c1 | |||
| 5c38e9a5f7 | |||
| c8aa56fe47 | |||
| 9a50d540de | |||
| 091218a685 | |||
| 12fccd6962 | |||
| 3b52181d23 | |||
| 1974f3a939 | |||
| eaf84748f9 | |||
| 0ce4262e64 | |||
| a6969ff360 | |||
| 414bb0f90b | |||
| a284f02869 | |||
| 80cbaa6cab | |||
| 1e895e3cb6 | |||
| ddb3c496e3 | |||
| b2c827a24f | |||
| 104259a58b | |||
| 1f664148cc | |||
| c6adff587a | |||
| c75a116b29 | |||
| 6e8a4ec8c9 | |||
| 625f1c4060 | |||
| 7dfe49b3a3 | |||
| 30973771f4 | |||
| ec17163206 | |||
| efba2a92a2 | |||
| f80e24cc28 | |||
| df1edce5c6 | |||
| f6f7303172 | |||
| fe193ec37e | |||
| a03d9c9cd7 | |||
| 8011c1827a | |||
| 05a00fad3a | |||
| c03c01cd2a | |||
| 5839134243 | |||
| e150f1a2b0 | |||
| 15367851e3 | |||
| 26080d353b | |||
| 138a1d2f32 | |||
| 2cbe7dde04 | |||
| c3b211d0c5 | |||
| 44f7cc4152 | |||
| 9eb5d1362b | |||
| 0c1b622f73 | |||
| 385306319a | |||
| 7db70452d8 | |||
| b00b2781be | |||
| b1d83a7bdc | |||
| 084bf82ea9 | |||
| ef1e07f1f4 | |||
| cf3670cefc | |||
| 5692de9cca | |||
| c212b302f1 | |||
| 381445f0ae | |||
| 55b11f3d90 | |||
| 2b8a9fdcc6 | |||
| 9d4bfa624a | |||
| 6aeda1eac2 | |||
| 4cfdbe6e6a | |||
| 79b2254f28 | |||
| 1590055049 | |||
| 168d986213 | |||
| cb085ae7df | |||
| d1f02f0e46 | |||
| c43172e281 | |||
| 897a37822a | |||
| 708a913046 | |||
| 1d6bb3df9c | |||
| 9160036e1a | |||
| b574b07b11 | |||
| 0a61b619c4 | |||
| 9ac6482127 | |||
| da373d0a62 | |||
| 0548ed7da4 | |||
| 312da06756 | |||
| 0bbf5eb080 | |||
| 6b363120ce | |||
| 02e5ac542c | |||
| bc6abb6492 | |||
| 689b00e46c | |||
| ca70989963 | |||
| 5dab967b6c | |||
| a3deaf6546 | |||
| a527942356 | |||
| 0827d7ba35 | |||
| b65659d631 | |||
| 2a8e1354f8 | |||
| da5245071d | |||
| 67a7d47a1d | |||
| 1551ef8ce0 | |||
| 3765d22ab8 | |||
| 46d6cdf9ba | |||
| ab1c48aefc | |||
| 1d1a2e2e55 | |||
| 969fabe77c | |||
| ca727cf906 | |||
| 86257e57da | |||
| b4f073bd1d | |||
| 2c21846b06 | |||
| 6ea2fe1cac | |||
| ce7ed9420a | |||
| ef2e0e4919 | |||
| 59d57ee694 | |||
| c61d31a568 | |||
| b592d4516e | |||
| 6232638023 | |||
| 5f3c8b43db | |||
| 1cb92ad7b9 | |||
| f454bae025 | |||
| 3f77ddb377 | |||
| 24db348ef8 | |||
| 66485f7219 | |||
| 3ff4718408 | |||
| c381a2c006 | |||
| b6c78e01ff | |||
| 6eb4d5b1d6 | |||
| ec1205f6fa | |||
| 7b57d170bd | |||
| 90ec23a80a | |||
| e6bee6f56b | |||
| f1122edb0e | |||
| 45145efcb8 | |||
| a24bf7f146 | |||
| dd93c0a30b | |||
| 3feee6543c | |||
| b33b79d9a7 | |||
| 956e7abf0d | |||
| 18833de76b | |||
| 04d93333bf | |||
| 895a2dae62 | |||
| aecfaab249 | |||
| 78f50ff693 | |||
| 55120fa816 | |||
| 660ef9ca23 | |||
| b1723520d2 | |||
| a650a72554 | |||
| 7b21921b9d | |||
| a3c42992c7 | |||
| cb97244afa | |||
| 7aea8c0dda | |||
| f723d64780 | |||
| 55728112ce |
2
.gitignore
vendored
2
.gitignore
vendored
@@ -1 +1 @@
|
||||
/venv/
|
||||
/*.bundle
|
||||
|
||||
63
.gitmodules
vendored
63
.gitmodules
vendored
@@ -1,6 +1,63 @@
|
||||
[submodule "contrib/vim-plug"]
|
||||
path = contrib/vim-plug
|
||||
url = https://github.com/junegunn/vim-plug
|
||||
[submodule "ansible_roles/firefox"]
|
||||
path = ansible_roles/firefox
|
||||
url = https://github.com/staticdev/ansible-role-firefox
|
||||
[submodule "pkgbuilds/spotify"]
|
||||
path = pkgbuilds/spotify
|
||||
url = https://aur.archlinux.org/spotify.git
|
||||
[submodule "pkgbuilds/nodejs-intelephense"]
|
||||
path = pkgbuilds/nodejs-intelephense
|
||||
url = https://aur.archlinux.org/nodejs-intelephense.git
|
||||
[submodule "pkgbuilds/portfolio-performance-bin"]
|
||||
path = pkgbuilds/portfolio-performance-bin
|
||||
url = https://aur.archlinux.org/portfolio-performance-bin.git
|
||||
[submodule "pkgbuilds/vim-plug"]
|
||||
path = pkgbuilds/vim-plug
|
||||
url = https://aur.archlinux.org/vim-plug.git
|
||||
[submodule "pkgbuilds/terraform-ls-bin"]
|
||||
path = pkgbuilds/terraform-ls-bin
|
||||
url = https://aur.archlinux.org/terraform-ls-bin.git
|
||||
[submodule "pkgbuilds/grm-git"]
|
||||
path = pkgbuilds/grm-git
|
||||
url = https://aur.archlinux.org/grm-git.git
|
||||
[submodule "pkgbuilds/screencfg-git"]
|
||||
path = pkgbuilds/screencfg-git
|
||||
url = https://aur.archlinux.org/screencfg-git.git
|
||||
[submodule "pkgbuilds/google-earth-pro"]
|
||||
path = pkgbuilds/google-earth-pro
|
||||
url = https://aur.archlinux.org/google-earth-pro.git
|
||||
[submodule "pkgbuilds/aws-sam-cli"]
|
||||
path = pkgbuilds/aws-sam-cli
|
||||
url = https://aur.archlinux.org/aws-sam-cli.git
|
||||
[submodule "pkgbuilds/python-boto3-stubs"]
|
||||
path = pkgbuilds/python-boto3-stubs
|
||||
url = https://aur.archlinux.org/python-boto3-stubs.git
|
||||
[submodule "pkgbuilds/python-botocore-stubs"]
|
||||
path = pkgbuilds/python-botocore-stubs
|
||||
url = https://aur.archlinux.org/python-botocore-stubs.git
|
||||
[submodule "pkgbuilds/python-chevron"]
|
||||
path = pkgbuilds/python-chevron
|
||||
url = https://aur.archlinux.org/python-chevron.git
|
||||
[submodule "pkgbuilds/python-aws-lambda-builders"]
|
||||
path = pkgbuilds/python-aws-lambda-builders
|
||||
url = https://aur.archlinux.org/python-aws-lambda-builders.git
|
||||
[submodule "pkgbuilds/python-vdf"]
|
||||
path = pkgbuilds/python-vdf
|
||||
url = https://aur.archlinux.org/python-vdf.git
|
||||
[submodule "pkgbuilds/protontricks"]
|
||||
path = pkgbuilds/protontricks
|
||||
url = https://aur.archlinux.org/protontricks.git
|
||||
[submodule "pkgbuilds/slack-desktop"]
|
||||
path = pkgbuilds/slack-desktop
|
||||
url = https://aur.archlinux.org/slack-desktop.git
|
||||
[submodule "pkgbuilds/backblaze-b2"]
|
||||
path = pkgbuilds/backblaze-b2
|
||||
url = https://aur.archlinux.org/backblaze-b2.git
|
||||
[submodule "pkgbuilds/python-class-registry"]
|
||||
path = pkgbuilds/python-class-registry
|
||||
url = https://aur.archlinux.org/python-class-registry.git
|
||||
[submodule "pkgbuilds/python-rst2ansi"]
|
||||
path = pkgbuilds/python-rst2ansi
|
||||
url = https://aur.archlinux.org/python-rst2ansi.git
|
||||
[submodule "pkgbuilds/claude-code"]
|
||||
path = pkgbuilds/claude-code
|
||||
url = https://aur.archlinux.org/claude-code.git
|
||||
|
||||
59
Makefile
59
Makefile
@@ -1,51 +1,24 @@
|
||||
venv = ./venv
|
||||
requirements = requirements.txt
|
||||
activate = . $(venv)/bin/activate
|
||||
pip = pip
|
||||
ansible = venv/bin/ansible-playbook
|
||||
ansible_run = $(activate) && ansible-playbook -e ansible_python_interpreter=/usr/bin/python3 --inventory localhost, --diff --verbose ./playbook.yml ${ANSIBLE_EXTRA_ARGS}
|
||||
# Make sure to standardize locale, regardless of the machine config
|
||||
#
|
||||
# Having a different locale broke "yes | pacman -S" to force-install
|
||||
# iptables, for example
|
||||
export LC_ALL = en_US.UTF-8
|
||||
|
||||
.PHONY: all
|
||||
all: | venv $(ansible)
|
||||
ansible_run = ansible-playbook --inventory localhost, --diff ./playbook.yml ${ANSIBLE_EXTRA_ARGS}
|
||||
|
||||
.PHONY: config
|
||||
config:
|
||||
$(ansible_run)
|
||||
|
||||
.PHONY: update
|
||||
update: $(ansible)
|
||||
$(ansible_run) --tags update
|
||||
|
||||
.PHONY: reboot
|
||||
reboot:
|
||||
sudo reboot
|
||||
|
||||
.PHONY: poweroff
|
||||
poweroff:
|
||||
sudo poweroff
|
||||
|
||||
.PHONY: weekend
|
||||
weekend: | update poweroff
|
||||
|
||||
.PHONY: packages
|
||||
packages: $(ansible)
|
||||
$(ansible_run) --tags packages
|
||||
|
||||
.PHONY: dotfiles
|
||||
dotfiles: $(ansible)
|
||||
$(ansible_run) --tags dotfiles
|
||||
|
||||
.PHONY: clean
|
||||
clean:
|
||||
rm -rf venv
|
||||
.PHONY: maintenance
|
||||
maintenance:
|
||||
./maintenance.sh
|
||||
|
||||
.PHONY: test
|
||||
test:
|
||||
./test-in-docker.sh
|
||||
|
||||
$(ansible): venv
|
||||
|
||||
venv:
|
||||
python3 -m venv $(venv)
|
||||
$(activate) && $(pip) install -r $(requirements)
|
||||
|
||||
.PHONY: freeze
|
||||
freeze:
|
||||
$(activate) && $(pip) freeze > $(requirements)
|
||||
.PHONY: fmt
|
||||
fmt:
|
||||
git ls-files -z '*.md' | xargs -0 prettier --print-width 80 --prose-wrap always --write
|
||||
git ls-files -z '*.toml' | xargs -0 taplo format
|
||||
|
||||
34
README.md
34
README.md
@@ -1,27 +1,45 @@
|
||||
# dotfiles
|
||||
|
||||
My configuration files.
|
||||
My configuration files for my systems. Uses Ansible for local configuration.
|
||||
|
||||
# Installation
|
||||
## Supported OS
|
||||
|
||||
Only Arch Linux is supported
|
||||
|
||||
## Bootstrapping
|
||||
|
||||
Bootstrapping is specific to the exact machine that is installed. See
|
||||
`_machines/` for machine-specific configuration, and `install_scripts/` for the
|
||||
machine install scripts.
|
||||
|
||||
They are keyed by hostname.
|
||||
|
||||
For easier installation, the install scripts are available via shortlinks. To
|
||||
(re)install a new machine from a Arch live environment:
|
||||
|
||||
```
|
||||
curl --proto '=https' -sSfL https://s.hkoerber.de/i/${hostname}.sh | bash
|
||||
```
|
||||
|
||||
## Manual Installation
|
||||
|
||||
Because it manages multiple users on the system, the directory is supposed to be
|
||||
at `/var/lib/dotfiles`.
|
||||
|
||||
To setup the dotfiles:
|
||||
To set up the dotfiles:
|
||||
|
||||
1. `git clone https://github.com/hakoerber/dotfiles.git ~/dotfiles`
|
||||
2. `cd ~/dotfiles && ./install.sh`
|
||||
|
||||
# Partial application
|
||||
## Partial application
|
||||
|
||||
To apply only a subset of the changes, use ansible tags that are available via
|
||||
the Makefile:
|
||||
|
||||
| Command | Description |
|
||||
| --- | --- |
|
||||
| `make update` | Updates the system with the latest packages |
|
||||
| Command | Description |
|
||||
| --------------- | -------------------------------------------------- |
|
||||
| `make packages` | Installs all defined packages (see `packages.yml`) |
|
||||
| `make dotfiles` | Manages the users' dotfiles |
|
||||
| `make dotfiles` | Manages the users' dotfiles |
|
||||
|
||||
Note that these are not supported on a first bootstrap run. Only use them after
|
||||
the bootstrap to update existing configuration.
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
font_size: 12
|
||||
font_size: 11
|
||||
|
||||
gpu: amd
|
||||
cpu: amd
|
||||
|
||||
users:
|
||||
- name: hannes
|
||||
@@ -15,20 +16,25 @@ users:
|
||||
- i-dont-care-about-cookies
|
||||
- floccus
|
||||
manage_css: true
|
||||
media:
|
||||
extensions:
|
||||
- ublock-origin
|
||||
- passff
|
||||
- privacy-badger17
|
||||
- tree-style-tab
|
||||
- i-dont-care-about-cookies
|
||||
manage_css: true
|
||||
bigger_font: true
|
||||
mail: hannes@hkoerber.de
|
||||
git_gpg_sign: false
|
||||
ssh_agent: false
|
||||
gpg_agent: true
|
||||
gpg_agent_for_ssh: true
|
||||
gpg_key:
|
||||
email: hannes@hkoerber.de
|
||||
id: "0xB5C002530C6A2053"
|
||||
fingerprint: "973AE48D71B76735C4712B5BB5C002530C6A2053"
|
||||
enable_passwordstore: true
|
||||
environment:
|
||||
MACHINE_HAS_NEXTCLOUD: "true"
|
||||
has_yubikey: true
|
||||
repositories:
|
||||
- personal_projects
|
||||
|
||||
screen:
|
||||
1: DisplayPort-0
|
||||
@@ -42,19 +48,15 @@ screen:
|
||||
9: DisplayPort-0
|
||||
0: DisplayPort-0
|
||||
|
||||
screencfgs: []
|
||||
|
||||
workspace:
|
||||
1: www
|
||||
9: comm
|
||||
10: music
|
||||
1: ""
|
||||
9: ""
|
||||
10: ""
|
||||
|
||||
environment:
|
||||
MACHINE_TYPE: "workstation"
|
||||
MACHINE_HAS_KEEPASSX: "false"
|
||||
MACHINE_HAS_KEEPASSXC: "false"
|
||||
MACHINE_HAS_NEXTCLOUD: "true"
|
||||
MACHINE_HAS_STEAM: "true"
|
||||
MACHINE_HAS_RESTIC_BACKUP: "false"
|
||||
MACHINE_HAS_ELEMENT: "true"
|
||||
MACHINE_RESOLUTION_X: "2560"
|
||||
MACHINE_RESOLUTION_Y: "1440"
|
||||
|
||||
62
_machines/dionysus.yml
Normal file
62
_machines/dionysus.yml
Normal file
@@ -0,0 +1,62 @@
|
||||
font_size: 11
|
||||
|
||||
gpu: intel
|
||||
cpu: intel
|
||||
|
||||
users:
|
||||
- name: hannes
|
||||
vt: 1
|
||||
firefox_profiles:
|
||||
default:
|
||||
extensions:
|
||||
- ublock-origin
|
||||
- passff
|
||||
- privacy-badger17
|
||||
- tree-style-tab
|
||||
- i-dont-care-about-cookies
|
||||
- floccus
|
||||
manage_css: true
|
||||
media:
|
||||
extensions:
|
||||
- ublock-origin
|
||||
- passff
|
||||
- privacy-badger17
|
||||
- tree-style-tab
|
||||
- i-dont-care-about-cookies
|
||||
manage_css: true
|
||||
bigger_font: true
|
||||
mail: hannes@hkoerber.de
|
||||
ssh_agent: false
|
||||
gpg_agent: true
|
||||
gpg_agent_for_ssh: true
|
||||
gpg_key:
|
||||
email: hannes@hkoerber.de
|
||||
id: "0xB5C002530C6A2053"
|
||||
fingerprint: "973AE48D71B76735C4712B5BB5C002530C6A2053"
|
||||
environment:
|
||||
MACHINE_HAS_NEXTCLOUD: "true"
|
||||
|
||||
screen:
|
||||
1: HDMI-1
|
||||
2: HDMI-1
|
||||
3: HDMI-1
|
||||
4: HDMI-1
|
||||
5: HDMI-1
|
||||
6: HDMI-1
|
||||
7: HDMI-1
|
||||
8: HDMI-1
|
||||
9: HDMI-1
|
||||
0: HDMI-1
|
||||
|
||||
workspace:
|
||||
1: ""
|
||||
2: ""
|
||||
3: ""
|
||||
|
||||
environment:
|
||||
MACHINE_TYPE: "tv"
|
||||
MACHINE_HAS_KEEPASSXC: "false"
|
||||
MACHINE_HAS_NEXTCLOUD: "true"
|
||||
MACHINE_HAS_STEAM: "false"
|
||||
MACHINE_RESOLUTION_X: "1920"
|
||||
MACHINE_RESOLUTION_Y: "1080"
|
||||
132
_machines/hera-tasks.yml
Normal file
132
_machines/hera-tasks.yml
Normal file
@@ -0,0 +1,132 @@
|
||||
---
|
||||
- name: Enable sddm
|
||||
ansible.builtin.systemd:
|
||||
name: sddm.service
|
||||
enabled: true
|
||||
daemon_reload: true
|
||||
become: true
|
||||
|
||||
- name: Autoupdate
|
||||
tags: [test]
|
||||
block:
|
||||
- name: Deploy autoupdate script
|
||||
copy:
|
||||
owner: root
|
||||
group: root
|
||||
mode: "0755"
|
||||
dest: /usr/local/bin/pacman-autoupdate
|
||||
content: |
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -o errexit
|
||||
set -o nounset
|
||||
set -o pipefail
|
||||
|
||||
for battery in /sys/class/power_supply/*/capacity ; do
|
||||
capacity="$(< "$battery")"
|
||||
if (( "${capacity}" < 40 )) ; then
|
||||
printf "Battery at %s%%, exiting\n" "${capacity}" >&2
|
||||
exit 0
|
||||
fi
|
||||
done
|
||||
|
||||
if nmcli --terse --fields GENERAL.METERED dev show 2>/dev/null | grep -q "yes" ; then
|
||||
printf "Detected metered connection, exiting\n" >&2
|
||||
exit 0
|
||||
fi
|
||||
|
||||
pacman --sync --refresh --sysupgrade --noprogressbar --noconfirm
|
||||
|
||||
- name: Install pacman autoupdate service
|
||||
ansible.builtin.copy:
|
||||
dest: /etc/systemd/system/pacman-autoupdate.service
|
||||
owner: root
|
||||
group: root
|
||||
mode: "0644"
|
||||
content: |
|
||||
[Service]
|
||||
Type=oneshot
|
||||
ExecStart=/usr/local/bin/pacman-autoupdate
|
||||
become: true
|
||||
|
||||
- name: Install pacman autoupdate timer
|
||||
ansible.builtin.copy:
|
||||
dest: /etc/systemd/system/pacman-autoupdate.timer
|
||||
owner: root
|
||||
group: root
|
||||
mode: "0644"
|
||||
content: |
|
||||
[Timer]
|
||||
OnCalendar=daily
|
||||
OnBootSec=5min
|
||||
OnUnitInactiveSec=120min
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
|
||||
- name: Enable pacman autoupdate timer
|
||||
ansible.builtin.systemd:
|
||||
name: pacman-autoupdate.timer
|
||||
enabled: true
|
||||
state: started
|
||||
daemon_reload: true
|
||||
become: true
|
||||
become: true
|
||||
|
||||
- name: User configuration
|
||||
block:
|
||||
- name: Create user group
|
||||
ansible.builtin.group:
|
||||
name: "herta"
|
||||
state: present
|
||||
become: true
|
||||
|
||||
- name: Create user
|
||||
ansible.builtin.user:
|
||||
name: "herta"
|
||||
state: present
|
||||
home: "/home/herta"
|
||||
create_home: true
|
||||
groups:
|
||||
- dotfiles
|
||||
- libvirt
|
||||
- wheel
|
||||
- vboxusers
|
||||
- wireshark
|
||||
- docker
|
||||
- sudonopw
|
||||
- games
|
||||
- kvm
|
||||
- video
|
||||
shell: /usr/bin/zsh
|
||||
skeleton: /dev/null
|
||||
become: true
|
||||
|
||||
- name: Create sddm config folder
|
||||
ansible.builtin.file:
|
||||
state: directory
|
||||
path: /etc/sddm.conf.d/
|
||||
owner: root
|
||||
group: root
|
||||
mode: "0755"
|
||||
|
||||
- name: Enable autologin
|
||||
ansible.builtin.copy:
|
||||
dest: /etc/sddm.conf.d/autologin.conf
|
||||
owner: root
|
||||
group: root
|
||||
mode: "0644"
|
||||
content: |
|
||||
[Autologin]
|
||||
User=herta
|
||||
Session=plasma
|
||||
|
||||
- name: Lock on startup
|
||||
ansible.builtin.copy:
|
||||
dest: /etc/xdg/kscreenlockerrc
|
||||
owner: root
|
||||
group: root
|
||||
mode: "0644"
|
||||
content: |
|
||||
[Daemon]
|
||||
LockOnStart=true
|
||||
74
_machines/hera.yml
Normal file
74
_machines/hera.yml
Normal file
@@ -0,0 +1,74 @@
|
||||
font_size: 11
|
||||
|
||||
gpu: intel
|
||||
cpu: intel
|
||||
|
||||
# make sure that display manager works
|
||||
system_default_target: "graphical.target"
|
||||
|
||||
additional_packages:
|
||||
- plasma-desktop
|
||||
- konsole
|
||||
- dolphin
|
||||
- kdeplasma-addons
|
||||
- plasma-nm
|
||||
- plasma-pa
|
||||
- plasma-systemmonitor
|
||||
- sddm
|
||||
- sddm-kcm
|
||||
- thunderbird
|
||||
|
||||
users:
|
||||
- name: hannes
|
||||
vt: 1
|
||||
firefox_profiles:
|
||||
default:
|
||||
extensions:
|
||||
- ublock-origin
|
||||
- passff
|
||||
- privacy-badger17
|
||||
- tree-style-tab
|
||||
- i-dont-care-about-cookies
|
||||
- floccus
|
||||
manage_css: true
|
||||
media:
|
||||
extensions:
|
||||
- ublock-origin
|
||||
- passff
|
||||
- privacy-badger17
|
||||
- tree-style-tab
|
||||
- i-dont-care-about-cookies
|
||||
manage_css: true
|
||||
bigger_font: true
|
||||
mail: hannes@hkoerber.de
|
||||
autologin: false
|
||||
ssh_agent: false
|
||||
gpg_agent: true
|
||||
gpg_agent_for_ssh: true
|
||||
gpg_key:
|
||||
email: hannes@hkoerber.de
|
||||
id: "0xB5C002530C6A2053"
|
||||
fingerprint: "973AE48D71B76735C4712B5BB5C002530C6A2053"
|
||||
environment: {}
|
||||
|
||||
screen:
|
||||
1: HDMI-1
|
||||
2: HDMI-1
|
||||
3: HDMI-1
|
||||
4: HDMI-1
|
||||
5: HDMI-1
|
||||
6: HDMI-1
|
||||
7: HDMI-1
|
||||
8: HDMI-1
|
||||
9: HDMI-1
|
||||
0: HDMI-1
|
||||
|
||||
workspace: []
|
||||
|
||||
environment:
|
||||
MACHINE_TYPE: "workstation"
|
||||
MACHINE_HAS_KEEPASSXC: "false"
|
||||
MACHINE_HAS_NEXTCLOUD: "false"
|
||||
MACHINE_HAS_STEAM: "false"
|
||||
MACHINE_RESOLUTION_X: "1920"
|
||||
MACHINE_RESOLUTION_Y: "1080"
|
||||
@@ -1,90 +0,0 @@
|
||||
font_size: 12
|
||||
|
||||
users:
|
||||
- name: hannes-work
|
||||
group: hannes-work
|
||||
vt: 1
|
||||
firefox_profiles:
|
||||
default:
|
||||
extensions:
|
||||
- ublock-origin
|
||||
- privacy-badger17
|
||||
- tree-style-tab
|
||||
- i-dont-care-about-cookies
|
||||
manage_css: true
|
||||
meet:
|
||||
extensions:
|
||||
- ublock-origin
|
||||
manage_css: false
|
||||
mail: hannes.koerber@tradebyte.com
|
||||
git_gpg_sign: false
|
||||
gpg_agent: false
|
||||
gpg_agent_for_ssh: false
|
||||
environment:
|
||||
MACHINE_HAS_NEXTCLOUD: "false"
|
||||
MACHINE_HAS_RESTIC_BACKUP: "true"
|
||||
MACHINE_HAS_ELEMENT: "false"
|
||||
MACHINE_HAS_KEEPASSX: "true"
|
||||
has_yubikey: false
|
||||
repositories: []
|
||||
- name: hannes-private
|
||||
group: hannes-private
|
||||
vt: 2
|
||||
firefox_profiles:
|
||||
default:
|
||||
extensions:
|
||||
- ublock-origin
|
||||
- passff
|
||||
- privacy-badger17
|
||||
- tree-style-tab
|
||||
- i-dont-care-about-cookies
|
||||
- floccus
|
||||
manage_css: true
|
||||
mail: hannes@hkoerber.de
|
||||
git_gpg_sign: false
|
||||
gpg_agent: true
|
||||
gpg_agent_for_ssh: true
|
||||
gpg_key:
|
||||
email: hannes@hkoerber.de
|
||||
id: "0xB5C002530C6A2053"
|
||||
fingerprint: "973AE48D71B76735C4712B5BB5C002530C6A2053"
|
||||
enable_passwordstore: true
|
||||
environment:
|
||||
MACHINE_HAS_NEXTCLOUD: "true"
|
||||
MACHINE_HAS_RESTIC_BACKUP: "false"
|
||||
MACHINE_HAS_ELEMENT: "true"
|
||||
MACHINE_HAS_KEEPASSX: "false"
|
||||
has_yubikey: true
|
||||
repositories:
|
||||
- personal_projects
|
||||
|
||||
screen:
|
||||
1: DP-1-1
|
||||
2: DP-1-1
|
||||
3: DP-1-2
|
||||
4: DP-1-2
|
||||
5: DP-1-2
|
||||
6: DP-1-2
|
||||
7: eDP-1
|
||||
8: eDP-1
|
||||
9: eDP-1
|
||||
0: eDP-1
|
||||
|
||||
workspace:
|
||||
1: www
|
||||
2: www
|
||||
3: term-local
|
||||
4: term-remote
|
||||
7: comm
|
||||
8: pass
|
||||
9: music
|
||||
10: pim
|
||||
|
||||
screencfgs:
|
||||
- name: three-screens
|
||||
key: F3
|
||||
|
||||
environment:
|
||||
MACHINE_TYPE: "laptop"
|
||||
MACHINE_RESOLUTION_X: "1920"
|
||||
MACHINE_RESOLUTION_Y: "1080"
|
||||
@@ -1,8 +1,10 @@
|
||||
font_size: 12
|
||||
font_size: 11
|
||||
|
||||
gpu: nvidia
|
||||
cpu: intel
|
||||
|
||||
users:
|
||||
- name: hannes-work
|
||||
group: hannes-work
|
||||
vt: 1
|
||||
firefox_profiles:
|
||||
default:
|
||||
@@ -16,19 +18,15 @@ users:
|
||||
extensions:
|
||||
- ublock-origin
|
||||
manage_css: false
|
||||
mail: hannes.koerber@tradebyte.com
|
||||
git_gpg_sign: false
|
||||
mail: h.koerber@clipmyhorse.tv
|
||||
ssh_agent: true
|
||||
gpg_agent: false
|
||||
gpg_agent_for_ssh: false
|
||||
environment:
|
||||
MACHINE_HAS_NEXTCLOUD: "false"
|
||||
MACHINE_HAS_RESTIC_BACKUP: "true"
|
||||
MACHINE_HAS_ELEMENT: "false"
|
||||
MACHINE_HAS_KEEPASSX: "true"
|
||||
has_yubikey: false
|
||||
repositories: []
|
||||
MACHINE_HAS_KEEPASSXC: "true"
|
||||
|
||||
- name: hannes-private
|
||||
group: hannes-private
|
||||
vt: 2
|
||||
firefox_profiles:
|
||||
default:
|
||||
@@ -41,50 +39,40 @@ users:
|
||||
- floccus
|
||||
manage_css: true
|
||||
mail: hannes@hkoerber.de
|
||||
git_gpg_sign: false
|
||||
ssh_agent: false
|
||||
gpg_agent: true
|
||||
gpg_agent_for_ssh: true
|
||||
gpg_key:
|
||||
email: hannes@hkoerber.de
|
||||
id: "0xB5C002530C6A2053"
|
||||
fingerprint: "973AE48D71B76735C4712B5BB5C002530C6A2053"
|
||||
enable_passwordstore: true
|
||||
environment:
|
||||
MACHINE_HAS_NEXTCLOUD: "true"
|
||||
MACHINE_HAS_RESTIC_BACKUP: "false"
|
||||
MACHINE_HAS_ELEMENT: "true"
|
||||
MACHINE_HAS_KEEPASSX: "false"
|
||||
has_yubikey: true
|
||||
repositories:
|
||||
- personal_projects
|
||||
MACHINE_HAS_KEEPASSXC: "false"
|
||||
|
||||
screen:
|
||||
1: DP-1-1
|
||||
2: DP-1-1
|
||||
3: DP-1-2
|
||||
4: DP-1-2
|
||||
5: DP-1-2
|
||||
6: DP-1-2
|
||||
1: DP-4-1-6
|
||||
2: DP-4-1-6
|
||||
3: DP-4-1-6
|
||||
4: DP-4-1-6
|
||||
5: DP-4-1-6
|
||||
6: DP-4-1-6
|
||||
7: eDP-1
|
||||
8: eDP-1
|
||||
9: eDP-1
|
||||
0: eDP-1
|
||||
|
||||
workspace:
|
||||
1: www
|
||||
2: www
|
||||
3: term-local
|
||||
4: term-remote
|
||||
7: comm
|
||||
8: pass
|
||||
9: music
|
||||
10: pim
|
||||
|
||||
screencfgs:
|
||||
- name: three-screens
|
||||
key: F3
|
||||
1: ""
|
||||
2: ""
|
||||
3: ""
|
||||
4: ""
|
||||
7: ""
|
||||
8: ""
|
||||
9: ""
|
||||
10: ""
|
||||
|
||||
environment:
|
||||
MACHINE_TYPE: "laptop"
|
||||
MACHINE_RESOLUTION_X: "1920"
|
||||
MACHINE_RESOLUTION_Y: "1080"
|
||||
MACHINE_RESOLUTION_Y: "1200"
|
||||
|
||||
40
alacritty/alacritty.toml.j2
Normal file
40
alacritty/alacritty.toml.j2
Normal file
@@ -0,0 +1,40 @@
|
||||
[general]
|
||||
live_config_reload = true
|
||||
|
||||
import = [
|
||||
"~/.config/alacritty/themes/monokai.toml"
|
||||
]
|
||||
|
||||
[env]
|
||||
TERM = "alacritty"
|
||||
WINIT_X11_SCALE_FACTOR = "1"
|
||||
|
||||
[font]
|
||||
size = {{ machine.font_size }}
|
||||
|
||||
[font.bold]
|
||||
family = "JetBrainsMono"
|
||||
style = "Bold"
|
||||
|
||||
[font.bold_italic]
|
||||
family = "JetBrainsMono"
|
||||
style = "Bold Italic"
|
||||
|
||||
[font.italic]
|
||||
family = "JetBrainsMono"
|
||||
style = "Italic"
|
||||
|
||||
[font.normal]
|
||||
family = "JetBrainsMono"
|
||||
style = "Regular"
|
||||
|
||||
[selection]
|
||||
save_to_clipboard = true
|
||||
|
||||
[window]
|
||||
dynamic_title = true
|
||||
title = "[terminal]"
|
||||
|
||||
[window.padding]
|
||||
x = 3
|
||||
y = 3
|
||||
@@ -1,702 +0,0 @@
|
||||
# Configuration for Alacritty, the GPU enhanced terminal emulator.
|
||||
|
||||
# Import additional configuration files
|
||||
#
|
||||
# Imports are loaded in order, skipping all missing files, with the importing
|
||||
# file being loaded last. If a field is already present in a previous import, it
|
||||
# will be replaced.
|
||||
#
|
||||
# All imports must either be absolute paths starting with `/`, or paths relative
|
||||
# to the user's home directory starting with `~/`.
|
||||
#import:
|
||||
# - /path/to/alacritty.yml
|
||||
|
||||
# Any items in the `env` entry below will be added as
|
||||
# environment variables. Some entries may override variables
|
||||
# set by alacritty itself.
|
||||
env:
|
||||
# TERM variable
|
||||
#
|
||||
# This value is used to set the `$TERM` environment variable for
|
||||
# each instance of Alacritty. If it is not present, alacritty will
|
||||
# check the local terminfo database and use `alacritty` if it is
|
||||
# available, otherwise `xterm-256color` is used.
|
||||
TERM: xterm-256color
|
||||
|
||||
window:
|
||||
# Window dimensions (changes require restart)
|
||||
#
|
||||
# Number of lines/columns (not pixels) in the terminal. The number of columns
|
||||
# must be at least `2`, while using a value of `0` for columns and lines will
|
||||
# fall back to the window manager's recommended size.
|
||||
#dimensions:
|
||||
# columns: 0
|
||||
# lines: 0
|
||||
|
||||
# Window position (changes require restart)
|
||||
#
|
||||
# Specified in number of pixels.
|
||||
# If the position is not set, the window manager will handle the placement.
|
||||
#position:
|
||||
# x: 0
|
||||
# y: 0
|
||||
|
||||
# Window padding (changes require restart)
|
||||
#
|
||||
# Blank space added around the window in pixels. This padding is scaled
|
||||
# by DPI and the specified value is always added at both opposing sides.
|
||||
padding:
|
||||
x: 3
|
||||
y: 3
|
||||
|
||||
# Spread additional padding evenly around the terminal content.
|
||||
#dynamic_padding: false
|
||||
|
||||
# Window decorations
|
||||
#
|
||||
# Values for `decorations`:
|
||||
# - full: Borders and title bar
|
||||
# - none: Neither borders nor title bar
|
||||
#
|
||||
# Values for `decorations` (macOS only):
|
||||
# - transparent: Title bar, transparent background and title bar buttons
|
||||
# - buttonless: Title bar, transparent background and no title bar buttons
|
||||
#decorations: full
|
||||
|
||||
# Startup Mode (changes require restart)
|
||||
#
|
||||
# Values for `startup_mode`:
|
||||
# - Windowed
|
||||
# - Maximized
|
||||
# - Fullscreen
|
||||
#
|
||||
# Values for `startup_mode` (macOS only):
|
||||
# - SimpleFullscreen
|
||||
#startup_mode: Windowed
|
||||
|
||||
# Window title
|
||||
title: "[terminal]"
|
||||
|
||||
# Allow terminal applications to change Alacritty's window title.
|
||||
dynamic_title: true
|
||||
|
||||
# Window class (Linux/BSD only):
|
||||
#class:
|
||||
# Application instance name
|
||||
#instance: Alacritty
|
||||
# General application class
|
||||
#general: Alacritty
|
||||
|
||||
# GTK theme variant (Linux/BSD only)
|
||||
#
|
||||
# Override the variant of the GTK theme. Commonly supported values are `dark`
|
||||
# and `light`. Set this to `None` to use the default theme variant.
|
||||
#gtk_theme_variant: None
|
||||
|
||||
#scrolling:
|
||||
# Maximum number of lines in the scrollback buffer.
|
||||
# Specifying '0' will disable scrolling.
|
||||
#history: 10000
|
||||
|
||||
# Scrolling distance multiplier.
|
||||
#multiplier: 3
|
||||
|
||||
# Font configuration
|
||||
font:
|
||||
# Normal (roman) font face
|
||||
normal:
|
||||
# Font family
|
||||
#
|
||||
# Default:
|
||||
# - (macOS) Menlo
|
||||
# - (Linux/BSD) monospace
|
||||
# - (Windows) Consolas
|
||||
family: Inconsolata
|
||||
|
||||
# The `style` can be specified to pick a specific face.
|
||||
style: Regular
|
||||
|
||||
# Bold font face
|
||||
bold:
|
||||
# Font family
|
||||
#
|
||||
# If the bold family is not specified, it will fall back to the
|
||||
# value specified for the normal font.
|
||||
family: Inconsolata
|
||||
|
||||
# The `style` can be specified to pick a specific face.
|
||||
style: Bold
|
||||
|
||||
# Italic font face
|
||||
italic:
|
||||
# Font family
|
||||
#
|
||||
# If the italic family is not specified, it will fall back to the
|
||||
# value specified for the normal font.
|
||||
family: Inconsolata
|
||||
|
||||
# The `style` can be specified to pick a specific face.
|
||||
style: Italic
|
||||
|
||||
# Bold italic font face
|
||||
bold_italic:
|
||||
# Font family
|
||||
#
|
||||
# If the bold italic family is not specified, it will fall back to the
|
||||
# value specified for the normal font.
|
||||
family: Inconsolata
|
||||
|
||||
# The `style` can be specified to pick a specific face.
|
||||
style: Bold Italic
|
||||
|
||||
# Point size
|
||||
size: {{ machine.font_size }}
|
||||
|
||||
# Offset is the extra space around each character. `offset.y` can be thought
|
||||
# of as modifying the line spacing, and `offset.x` as modifying the letter
|
||||
# spacing.
|
||||
#offset:
|
||||
# x: 0
|
||||
# y: 0
|
||||
|
||||
# Glyph offset determines the locations of the glyphs within their cells with
|
||||
# the default being at the bottom. Increasing `x` moves the glyph to the
|
||||
# right, increasing `y` moves the glyph upward.
|
||||
#glyph_offset:
|
||||
# x: 0
|
||||
# y: 0
|
||||
|
||||
# Thin stroke font rendering (macOS only)
|
||||
#
|
||||
# Thin strokes are suitable for retina displays, but for non-retina screens
|
||||
# it is recommended to set `use_thin_strokes` to `false`.
|
||||
#use_thin_strokes: true
|
||||
|
||||
# If `true`, bold text is drawn using the bright color variants.
|
||||
#draw_bold_text_with_bright_colors: false
|
||||
|
||||
# Colors (Monokai Dark)
|
||||
colors:
|
||||
# Default colors
|
||||
primary:
|
||||
background: '#272822'
|
||||
foreground: '#F8F8F2'
|
||||
|
||||
# Normal colors
|
||||
normal:
|
||||
black: '#272822'
|
||||
red: '#F92672'
|
||||
green: '#A6E22E'
|
||||
yellow: '#F4BF75'
|
||||
blue: '#66D9EF'
|
||||
magenta: '#AE81FF'
|
||||
cyan: '#A1EFE4'
|
||||
white: '#F8F8F2'
|
||||
|
||||
# Bright colors
|
||||
bright:
|
||||
black: '#75715E'
|
||||
red: '#F92672'
|
||||
green: '#A6E22E'
|
||||
yellow: '#F4BF75'
|
||||
blue: '#66D9EF'
|
||||
magenta: '#AE81FF'
|
||||
cyan: '#A1EFE4'
|
||||
white: '#F9F8F5'
|
||||
|
||||
# Bell
|
||||
#
|
||||
# The bell is rung every time the BEL control character is received.
|
||||
#bell:
|
||||
# Visual Bell Animation
|
||||
#
|
||||
# Animation effect for flashing the screen when the visual bell is rung.
|
||||
#
|
||||
# Values for `animation`:
|
||||
# - Ease
|
||||
# - EaseOut
|
||||
# - EaseOutSine
|
||||
# - EaseOutQuad
|
||||
# - EaseOutCubic
|
||||
# - EaseOutQuart
|
||||
# - EaseOutQuint
|
||||
# - EaseOutExpo
|
||||
# - EaseOutCirc
|
||||
# - Linear
|
||||
#animation: EaseOutExpo
|
||||
|
||||
# Duration of the visual bell flash in milliseconds. A `duration` of `0` will
|
||||
# disable the visual bell animation.
|
||||
#duration: 0
|
||||
|
||||
# Visual bell animation color.
|
||||
#color: '#ffffff'
|
||||
|
||||
# Bell Command
|
||||
#
|
||||
# This program is executed whenever the bell is rung.
|
||||
#
|
||||
# When set to `command: None`, no command will be executed.
|
||||
#
|
||||
# Example:
|
||||
# command:
|
||||
# program: notify-send
|
||||
# args: ["Hello, World!"]
|
||||
#
|
||||
#command: None
|
||||
|
||||
# Background opacity
|
||||
#
|
||||
# Window opacity as a floating point number from `0.0` to `1.0`.
|
||||
# The value `0.0` is completely transparent and `1.0` is opaque.
|
||||
#background_opacity: 1.0
|
||||
|
||||
selection:
|
||||
# This string contains all characters that are used as separators for
|
||||
# "semantic words" in Alacritty.
|
||||
#semantic_escape_chars: ",│`|:\"' ()[]{}<>\t"
|
||||
|
||||
# When set to `true`, selected text will be copied to the primary clipboard.
|
||||
save_to_clipboard: true
|
||||
|
||||
#cursor:
|
||||
# Cursor style
|
||||
#style:
|
||||
# Cursor shape
|
||||
#
|
||||
# Values for `shape`:
|
||||
# - ▇ Block
|
||||
# - _ Underline
|
||||
# - | Beam
|
||||
#shape: Block
|
||||
|
||||
# Cursor blinking state
|
||||
#
|
||||
# Values for `blinking`:
|
||||
# - Never: Prevent the cursor from ever blinking
|
||||
# - Off: Disable blinking by default
|
||||
# - On: Enable blinking by default
|
||||
# - Always: Force the cursor to always blink
|
||||
#blinking: Off
|
||||
|
||||
# Vi mode cursor style
|
||||
#
|
||||
# If the vi mode cursor style is `None` or not specified, it will fall back to
|
||||
# the style of the active value of the normal cursor.
|
||||
#
|
||||
# See `cursor.style` for available options.
|
||||
#vi_mode_style: None
|
||||
|
||||
# Cursor blinking interval in milliseconds.
|
||||
#blink_interval: 750
|
||||
|
||||
# If this is `true`, the cursor will be rendered as a hollow box when the
|
||||
# window is not focused.
|
||||
#unfocused_hollow: true
|
||||
|
||||
# Thickness of the cursor relative to the cell width as floating point number
|
||||
# from `0.0` to `1.0`.
|
||||
#thickness: 0.15
|
||||
|
||||
# Live config reload (changes require restart)
|
||||
live_config_reload: false
|
||||
|
||||
# Shell
|
||||
#
|
||||
# You can set `shell.program` to the path of your favorite shell, e.g.
|
||||
# `/bin/fish`. Entries in `shell.args` are passed unmodified as arguments to the
|
||||
# shell.
|
||||
#
|
||||
# Default:
|
||||
# - (macOS) /bin/bash --login
|
||||
# - (Linux/BSD) user login shell
|
||||
# - (Windows) powershell
|
||||
#shell:
|
||||
# program: /bin/bash
|
||||
# args:
|
||||
# - --login
|
||||
|
||||
# Startup directory
|
||||
#
|
||||
# Directory the shell is started in. If this is unset, or `None`, the working
|
||||
# directory of the parent process will be used.
|
||||
#working_directory: None
|
||||
|
||||
# WinPTY backend (Windows only)
|
||||
#
|
||||
# Alacritty defaults to using the newer ConPTY backend if it is available,
|
||||
# since it resolves a lot of bugs and is quite a bit faster. If it is not
|
||||
# available, the WinPTY backend will be used instead.
|
||||
#
|
||||
# Setting this option to `true` makes Alacritty use the legacy WinPTY backend,
|
||||
# even if the ConPTY backend is available.
|
||||
#winpty_backend: false
|
||||
|
||||
# Send ESC (\x1b) before characters when alt is pressed.
|
||||
#alt_send_esc: true
|
||||
|
||||
#mouse:
|
||||
# Click settings
|
||||
#
|
||||
# The `double_click` and `triple_click` settings control the time
|
||||
# alacritty should wait for accepting multiple clicks as one double
|
||||
# or triple click.
|
||||
#double_click: { threshold: 300 }
|
||||
#triple_click: { threshold: 300 }
|
||||
|
||||
# If this is `true`, the cursor is temporarily hidden when typing.
|
||||
#hide_when_typing: false
|
||||
|
||||
#url:
|
||||
# URL launcher
|
||||
#
|
||||
# This program is executed when clicking on a text which is recognized as a
|
||||
# URL. The URL is always added to the command as the last parameter.
|
||||
#
|
||||
# When set to `launcher: None`, URL launching will be disabled completely.
|
||||
#
|
||||
# Default:
|
||||
# - (macOS) open
|
||||
# - (Linux/BSD) xdg-open
|
||||
# - (Windows) explorer
|
||||
#launcher:
|
||||
# program: xdg-open
|
||||
# args: []
|
||||
|
||||
# URL modifiers
|
||||
#
|
||||
# These are the modifiers that need to be held down for opening URLs when
|
||||
# clicking on them. The available modifiers are documented in the key
|
||||
# binding section.
|
||||
#modifiers: None
|
||||
|
||||
# Mouse bindings
|
||||
#
|
||||
# Mouse bindings are specified as a list of objects, much like the key
|
||||
# bindings further below.
|
||||
#
|
||||
# To trigger mouse bindings when an application running within Alacritty
|
||||
# captures the mouse, the `Shift` modifier is automatically added as a
|
||||
# requirement.
|
||||
#
|
||||
# Each mouse binding will specify a:
|
||||
#
|
||||
# - `mouse`:
|
||||
#
|
||||
# - Middle
|
||||
# - Left
|
||||
# - Right
|
||||
# - Numeric identifier such as `5`
|
||||
#
|
||||
# - `action` (see key bindings)
|
||||
#
|
||||
# And optionally:
|
||||
#
|
||||
# - `mods` (see key bindings)
|
||||
#mouse_bindings:
|
||||
# - { mouse: Middle, action: PasteSelection }
|
||||
|
||||
# Key bindings
|
||||
#
|
||||
# Key bindings are specified as a list of objects. For example, this is the
|
||||
# default paste binding:
|
||||
#
|
||||
# `- { key: V, mods: Control|Shift, action: Paste }`
|
||||
#
|
||||
# Each key binding will specify a:
|
||||
#
|
||||
# - `key`: Identifier of the key pressed
|
||||
#
|
||||
# - A-Z
|
||||
# - F1-F24
|
||||
# - Key0-Key9
|
||||
#
|
||||
# A full list with available key codes can be found here:
|
||||
# https://docs.rs/glutin/*/glutin/event/enum.VirtualKeyCode.html#variants
|
||||
#
|
||||
# Instead of using the name of the keys, the `key` field also supports using
|
||||
# the scancode of the desired key. Scancodes have to be specified as a
|
||||
# decimal number. This command will allow you to display the hex scancodes
|
||||
# for certain keys:
|
||||
#
|
||||
# `showkey --scancodes`.
|
||||
#
|
||||
# Then exactly one of:
|
||||
#
|
||||
# - `chars`: Send a byte sequence to the running application
|
||||
#
|
||||
# The `chars` field writes the specified string to the terminal. This makes
|
||||
# it possible to pass escape sequences. To find escape codes for bindings
|
||||
# like `PageUp` (`"\x1b[5~"`), you can run the command `showkey -a` outside
|
||||
# of tmux. Note that applications use terminfo to map escape sequences back
|
||||
# to keys. It is therefore required to update the terminfo when changing an
|
||||
# escape sequence.
|
||||
#
|
||||
# - `action`: Execute a predefined action
|
||||
#
|
||||
# - ToggleViMode
|
||||
# - SearchForward
|
||||
# Start searching toward the right of the search origin.
|
||||
# - SearchBackward
|
||||
# Start searching toward the left of the search origin.
|
||||
# - Copy
|
||||
# - Paste
|
||||
# - IncreaseFontSize
|
||||
# - DecreaseFontSize
|
||||
# - ResetFontSize
|
||||
# - ScrollPageUp
|
||||
# - ScrollPageDown
|
||||
# - ScrollHalfPageUp
|
||||
# - ScrollHalfPageDown
|
||||
# - ScrollLineUp
|
||||
# - ScrollLineDown
|
||||
# - ScrollToTop
|
||||
# - ScrollToBottom
|
||||
# - ClearHistory
|
||||
# Remove the terminal's scrollback history.
|
||||
# - Hide
|
||||
# Hide the Alacritty window.
|
||||
# - Minimize
|
||||
# Minimize the Alacritty window.
|
||||
# - Quit
|
||||
# Quit Alacritty.
|
||||
# - ToggleFullscreen
|
||||
# - SpawnNewInstance
|
||||
# Spawn a new instance of Alacritty.
|
||||
# - ClearLogNotice
|
||||
# Clear Alacritty's UI warning and error notice.
|
||||
# - ClearSelection
|
||||
# Remove the active selection.
|
||||
# - ReceiveChar
|
||||
# - None
|
||||
#
|
||||
# - Vi mode exclusive actions:
|
||||
#
|
||||
# - Open
|
||||
# Open URLs at the cursor location with the launcher configured in
|
||||
# `url.launcher`.
|
||||
# - ToggleNormalSelection
|
||||
# - ToggleLineSelection
|
||||
# - ToggleBlockSelection
|
||||
# - ToggleSemanticSelection
|
||||
# Toggle semantic selection based on `selection.semantic_escape_chars`.
|
||||
#
|
||||
# - Vi mode exclusive cursor motion actions:
|
||||
#
|
||||
# - Up
|
||||
# One line up.
|
||||
# - Down
|
||||
# One line down.
|
||||
# - Left
|
||||
# One character left.
|
||||
# - Right
|
||||
# One character right.
|
||||
# - First
|
||||
# First column, or beginning of the line when already at the first column.
|
||||
# - Last
|
||||
# Last column, or beginning of the line when already at the last column.
|
||||
# - FirstOccupied
|
||||
# First non-empty cell in this terminal row, or first non-empty cell of
|
||||
# the line when already at the first cell of the row.
|
||||
# - High
|
||||
# Top of the screen.
|
||||
# - Middle
|
||||
# Center of the screen.
|
||||
# - Low
|
||||
# Bottom of the screen.
|
||||
# - SemanticLeft
|
||||
# Start of the previous semantically separated word.
|
||||
# - SemanticRight
|
||||
# Start of the next semantically separated word.
|
||||
# - SemanticLeftEnd
|
||||
# End of the previous semantically separated word.
|
||||
# - SemanticRightEnd
|
||||
# End of the next semantically separated word.
|
||||
# - WordLeft
|
||||
# Start of the previous whitespace separated word.
|
||||
# - WordRight
|
||||
# Start of the next whitespace separated word.
|
||||
# - WordLeftEnd
|
||||
# End of the previous whitespace separated word.
|
||||
# - WordRightEnd
|
||||
# End of the next whitespace separated word.
|
||||
# - Bracket
|
||||
# Character matching the bracket at the cursor's location.
|
||||
# - SearchNext
|
||||
# Beginning of the next match.
|
||||
# - SearchPrevious
|
||||
# Beginning of the previous match.
|
||||
# - SearchStart
|
||||
# Start of the match to the left of the vi mode cursor.
|
||||
# - SearchEnd
|
||||
# End of the match to the right of the vi mode cursor.
|
||||
#
|
||||
# - macOS exclusive actions:
|
||||
# - ToggleSimpleFullscreen
|
||||
# Enter fullscreen without occupying another space.
|
||||
#
|
||||
# - Linux/BSD exclusive actions:
|
||||
#
|
||||
# - CopySelection
|
||||
# Copy from the selection buffer.
|
||||
# - PasteSelection
|
||||
# Paste from the selection buffer.
|
||||
#
|
||||
# - `command`: Fork and execute a specified command plus arguments
|
||||
#
|
||||
# The `command` field must be a map containing a `program` string and an
|
||||
# `args` array of command line parameter strings. For example:
|
||||
# `{ program: "alacritty", args: ["-e", "vttest"] }`
|
||||
#
|
||||
# And optionally:
|
||||
#
|
||||
# - `mods`: Key modifiers to filter binding actions
|
||||
#
|
||||
# - Command
|
||||
# - Control
|
||||
# - Option
|
||||
# - Super
|
||||
# - Shift
|
||||
# - Alt
|
||||
#
|
||||
# Multiple `mods` can be combined using `|` like this:
|
||||
# `mods: Control|Shift`.
|
||||
# Whitespace and capitalization are relevant and must match the example.
|
||||
#
|
||||
# - `mode`: Indicate a binding for only specific terminal reported modes
|
||||
#
|
||||
# This is mainly used to send applications the correct escape sequences
|
||||
# when in different modes.
|
||||
#
|
||||
# - AppCursor
|
||||
# - AppKeypad
|
||||
# - Alt
|
||||
# - Vi
|
||||
#
|
||||
# A `~` operator can be used before a mode to apply the binding whenever
|
||||
# the mode is *not* active, e.g. `~Alt`.
|
||||
#
|
||||
# Bindings are always filled by default, but will be replaced when a new
|
||||
# binding with the same triggers is defined. To unset a default binding, it can
|
||||
# be mapped to the `ReceiveChar` action. Alternatively, you can use `None` for
|
||||
# a no-op if you do not wish to receive input characters for that binding.
|
||||
#
|
||||
# If the same trigger is assigned to multiple actions, all of them are executed
|
||||
# in the order they were defined in.
|
||||
#key_bindings:
|
||||
#- { key: Paste, action: Paste }
|
||||
#- { key: Copy, action: Copy }
|
||||
#- { key: L, mods: Control, action: ClearLogNotice }
|
||||
#- { key: L, mods: Control, mode: ~Vi, chars: "\x0c" }
|
||||
#- { key: PageUp, mods: Shift, mode: ~Alt, action: ScrollPageUp, }
|
||||
#- { key: PageDown, mods: Shift, mode: ~Alt, action: ScrollPageDown }
|
||||
#- { key: Home, mods: Shift, mode: ~Alt, action: ScrollToTop, }
|
||||
#- { key: End, mods: Shift, mode: ~Alt, action: ScrollToBottom }
|
||||
|
||||
# Vi Mode
|
||||
#- { key: Space, mods: Shift|Control, mode: Vi, action: ScrollToBottom }
|
||||
#- { key: Space, mods: Shift|Control, action: ToggleViMode }
|
||||
#- { key: Escape, mode: Vi, action: ClearSelection }
|
||||
#- { key: I, mode: Vi, action: ScrollToBottom }
|
||||
#- { key: I, mode: Vi, action: ToggleViMode }
|
||||
#- { key: C, mods: Control, mode: Vi, action: ToggleViMode }
|
||||
#- { key: Y, mods: Control, mode: Vi, action: ScrollLineUp }
|
||||
#- { key: E, mods: Control, mode: Vi, action: ScrollLineDown }
|
||||
#- { key: G, mode: Vi, action: ScrollToTop }
|
||||
#- { key: G, mods: Shift, mode: Vi, action: ScrollToBottom }
|
||||
#- { key: B, mods: Control, mode: Vi, action: ScrollPageUp }
|
||||
#- { key: F, mods: Control, mode: Vi, action: ScrollPageDown }
|
||||
#- { key: U, mods: Control, mode: Vi, action: ScrollHalfPageUp }
|
||||
#- { key: D, mods: Control, mode: Vi, action: ScrollHalfPageDown }
|
||||
#- { key: Y, mode: Vi, action: Copy }
|
||||
#- { key: Y, mode: Vi, action: ClearSelection }
|
||||
#- { key: Copy, mode: Vi, action: ClearSelection }
|
||||
#- { key: V, mode: Vi, action: ToggleNormalSelection }
|
||||
#- { key: V, mods: Shift, mode: Vi, action: ToggleLineSelection }
|
||||
#- { key: V, mods: Control, mode: Vi, action: ToggleBlockSelection }
|
||||
#- { key: V, mods: Alt, mode: Vi, action: ToggleSemanticSelection }
|
||||
#- { key: Return, mode: Vi, action: Open }
|
||||
#- { key: K, mode: Vi, action: Up }
|
||||
#- { key: J, mode: Vi, action: Down }
|
||||
#- { key: H, mode: Vi, action: Left }
|
||||
#- { key: L, mode: Vi, action: Right }
|
||||
#- { key: Up, mode: Vi, action: Up }
|
||||
#- { key: Down, mode: Vi, action: Down }
|
||||
#- { key: Left, mode: Vi, action: Left }
|
||||
#- { key: Right, mode: Vi, action: Right }
|
||||
#- { key: Key0, mode: Vi, action: First }
|
||||
#- { key: Key4, mods: Shift, mode: Vi, action: Last }
|
||||
#- { key: Key6, mods: Shift, mode: Vi, action: FirstOccupied }
|
||||
#- { key: H, mods: Shift, mode: Vi, action: High }
|
||||
#- { key: M, mods: Shift, mode: Vi, action: Middle }
|
||||
#- { key: L, mods: Shift, mode: Vi, action: Low }
|
||||
#- { key: B, mode: Vi, action: SemanticLeft }
|
||||
#- { key: W, mode: Vi, action: SemanticRight }
|
||||
#- { key: E, mode: Vi, action: SemanticRightEnd }
|
||||
#- { key: B, mods: Shift, mode: Vi, action: WordLeft }
|
||||
#- { key: W, mods: Shift, mode: Vi, action: WordRight }
|
||||
#- { key: E, mods: Shift, mode: Vi, action: WordRightEnd }
|
||||
#- { key: Key5, mods: Shift, mode: Vi, action: Bracket }
|
||||
#- { key: Slash, mode: Vi, action: SearchForward }
|
||||
#- { key: Slash, mods: Shift, mode: Vi, action: SearchBackward }
|
||||
#- { key: N, mode: Vi, action: SearchNext }
|
||||
#- { key: N, mods: Shift, mode: Vi, action: SearchPrevious }
|
||||
|
||||
# (Windows, Linux, and BSD only)
|
||||
#- { key: V, mods: Control|Shift, action: Paste }
|
||||
#- { key: C, mods: Control|Shift, action: Copy }
|
||||
#- { key: F, mods: Control|Shift, action: SearchForward }
|
||||
#- { key: B, mods: Control|Shift, action: SearchBackward }
|
||||
#- { key: C, mods: Control|Shift, mode: Vi, action: ClearSelection }
|
||||
#- { key: Insert, mods: Shift, action: PasteSelection }
|
||||
#- { key: Key0, mods: Control, action: ResetFontSize }
|
||||
#- { key: Equals, mods: Control, action: IncreaseFontSize }
|
||||
#- { key: Plus, mods: Control, action: IncreaseFontSize }
|
||||
#- { key: NumpadAdd, mods: Control, action: IncreaseFontSize }
|
||||
#- { key: Minus, mods: Control, action: DecreaseFontSize }
|
||||
#- { key: NumpadSubtract, mods: Control, action: DecreaseFontSize }
|
||||
|
||||
# (Windows only)
|
||||
#- { key: Return, mods: Alt, action: ToggleFullscreen }
|
||||
|
||||
# (macOS only)
|
||||
#- { key: K, mods: Command, mode: ~Vi, chars: "\x0c" }
|
||||
#- { key: Key0, mods: Command, action: ResetFontSize }
|
||||
#- { key: Equals, mods: Command, action: IncreaseFontSize }
|
||||
#- { key: Plus, mods: Command, action: IncreaseFontSize }
|
||||
#- { key: NumpadAdd, mods: Command, action: IncreaseFontSize }
|
||||
#- { key: Minus, mods: Command, action: DecreaseFontSize }
|
||||
#- { key: NumpadSubtract, mods: Command, action: DecreaseFontSize }
|
||||
#- { key: K, mods: Command, action: ClearHistory }
|
||||
#- { key: V, mods: Command, action: Paste }
|
||||
#- { key: C, mods: Command, action: Copy }
|
||||
#- { key: C, mods: Command, mode: Vi, action: ClearSelection }
|
||||
#- { key: H, mods: Command, action: Hide }
|
||||
#- { key: M, mods: Command, action: Minimize }
|
||||
#- { key: Q, mods: Command, action: Quit }
|
||||
#- { key: W, mods: Command, action: Quit }
|
||||
#- { key: N, mods: Command, action: SpawnNewInstance }
|
||||
#- { key: F, mods: Command|Control, action: ToggleFullscreen }
|
||||
#- { key: F, mods: Command, action: SearchForward }
|
||||
#- { key: B, mods: Command, action: SearchBackward }
|
||||
|
||||
#debug:
|
||||
# Display the time it takes to redraw each frame.
|
||||
#render_timer: false
|
||||
|
||||
# Keep the log file after quitting Alacritty.
|
||||
#persistent_logging: false
|
||||
|
||||
# Log level
|
||||
#
|
||||
# Values for `log_level`:
|
||||
# - None
|
||||
# - Error
|
||||
# - Warn
|
||||
# - Info
|
||||
# - Debug
|
||||
# - Trace
|
||||
#log_level: Warn
|
||||
|
||||
# Print all received window events.
|
||||
#print_events: false
|
||||
36
alacritty/themes/github_light.toml
Normal file
36
alacritty/themes/github_light.toml
Normal file
@@ -0,0 +1,36 @@
|
||||
# github Alacritty Colors
|
||||
|
||||
# Default colors
|
||||
[colors.primary]
|
||||
background = '#ffffff'
|
||||
foreground = '#24292f'
|
||||
|
||||
# Normal colors
|
||||
[colors.normal]
|
||||
black = '#24292e'
|
||||
red = '#d73a49'
|
||||
green = '#28a745'
|
||||
yellow = '#dbab09'
|
||||
blue = '#0366d6'
|
||||
magenta = '#5a32a3'
|
||||
cyan = '#0598bc'
|
||||
white = '#6a737d'
|
||||
|
||||
# Bright colors
|
||||
[colors.bright]
|
||||
black = '#959da5'
|
||||
red = '#cb2431'
|
||||
green = '#22863a'
|
||||
yellow = '#b08800'
|
||||
blue = '#005cc5'
|
||||
magenta = '#5a32a3'
|
||||
cyan = '#3192aa'
|
||||
white = '#d1d5da'
|
||||
|
||||
[[colors.indexed_colors]]
|
||||
index = 16
|
||||
color = '#d18616'
|
||||
|
||||
[[colors.indexed_colors]]
|
||||
index = 17
|
||||
color = '#cb2431'
|
||||
23
alacritty/themes/monokai.toml
Normal file
23
alacritty/themes/monokai.toml
Normal file
@@ -0,0 +1,23 @@
|
||||
[colors.primary]
|
||||
background = "#272822"
|
||||
foreground = "#f8f8f2"
|
||||
|
||||
[colors.normal]
|
||||
black = "#272822"
|
||||
red = "#f92672"
|
||||
green = "#a6e22e"
|
||||
yellow = "#f4bf75"
|
||||
blue = "#66d9ef"
|
||||
magenta = "#ae81ff"
|
||||
cyan = "#a1efe4"
|
||||
white = "#f8f8f2"
|
||||
|
||||
[colors.bright]
|
||||
black = "#75715e"
|
||||
red = "#f92672"
|
||||
green = "#a6e22e"
|
||||
yellow = "#f4bf75"
|
||||
blue = "#66d9ef"
|
||||
magenta = "#ae81ff"
|
||||
cyan = "#a1efe4"
|
||||
white = "#f9f8f5"
|
||||
Submodule ansible_roles/firefox updated: fe50549acc...2151dce632
@@ -2,27 +2,32 @@
|
||||
BindsTo=windowmanager.target
|
||||
After=windowmanager.target
|
||||
|
||||
Wants=blueman.service
|
||||
Wants=dpms.service
|
||||
Wants=dunst.service
|
||||
Wants=element.service
|
||||
{% for profile in (user.firefox_profiles|default({})).keys() %}
|
||||
{% for profile, config in (user.firefox_profiles|default({})).items() %}
|
||||
{% if config.bigger_font|default(false) is sameas false %}
|
||||
Wants=firefox@{{ profile }}.service
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
{% for profile, config in (user.firefox_profiles|default({})).items() %}
|
||||
{% if config.bigger_font|default(false) is sameas true %}
|
||||
Wants=firefox-gtk-override-bigger-font@{{ profile }}.service
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
Wants=gpg-agent.service
|
||||
Wants=gnome-keyring.service
|
||||
Wants=keepassx.service
|
||||
Wants=keepassxc.service
|
||||
Wants=keyboard.service
|
||||
Wants=laptop-lid.service
|
||||
Wants=nextcloud.service
|
||||
Wants=nm-applet.service
|
||||
Wants=pasystray.service
|
||||
Wants=redshift.service
|
||||
Wants=restic.timer
|
||||
Wants=screencfg.service
|
||||
Wants=spotify.service
|
||||
Wants=steam.service
|
||||
Wants=touchpad.service
|
||||
Wants=xresources.service
|
||||
Wants=yubikey-touch-detector.service
|
||||
|
||||
Wants=kdeconnect.service
|
||||
Wants=color-theme-dark.service
|
||||
Wants=workstation-mgr.service
|
||||
|
||||
@@ -5,6 +5,5 @@ After=windowmanager.target
|
||||
[Service]
|
||||
Type=oneshot
|
||||
ExecStart=/usr/bin/env xset s off
|
||||
ExecStart=/usr/bin/env xset dpms 0 0 300
|
||||
ExecStart=/usr/bin/env xset dpms 0 0 0
|
||||
PassEnvironment=DISPLAY
|
||||
Restart=always
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
[Unit]
|
||||
BindsTo=autostart.target
|
||||
After=windowmanager.target
|
||||
After=i3.service
|
||||
|
||||
ConditionPathExists=%h/.var/run/features/element
|
||||
|
||||
[Service]
|
||||
ExecStart=/usr/bin/env element-desktop
|
||||
PassEnvironment=DISPLAY
|
||||
Restart=always
|
||||
@@ -0,0 +1,9 @@
|
||||
[Unit]
|
||||
BindsTo=autostart.target
|
||||
After=windowmanager.target
|
||||
|
||||
[Service]
|
||||
ExecStart=/usr/bin/env firefox --setDefaultBrowser -P %i
|
||||
PassEnvironment=DISPLAY
|
||||
Environment=XDG_CONFIG_HOME=%h/.config/gtk-3.0-overrides/bigger-font/
|
||||
Restart=always
|
||||
@@ -1,10 +1,11 @@
|
||||
[Unit]
|
||||
BindsTo=autostart.target
|
||||
After=windowmanager.target
|
||||
ConditionPathExists=%h/.var/run/features/gpg_agent
|
||||
ConditionPathExists=%t/features/gpg_agent
|
||||
|
||||
[Service]
|
||||
Type=forking
|
||||
ExecStart=/usr/bin/env gpg-agent --homedir %h/.gnupg --no-detach --daemon
|
||||
PassEnvironment=DISPLAY
|
||||
ExecStart=/usr/bin/env gpg-agent --daemon
|
||||
PassEnvironment=DISPLAY GNUPGHOME
|
||||
|
||||
Restart=always
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[Service]
|
||||
Type=simple
|
||||
ExecStart=/usr/bin/env i3 --config %h/.i3/config
|
||||
ExecStart=/usr/bin/env i3 --config %h/.config/i3/config
|
||||
PassEnvironment=DISPLAY
|
||||
|
||||
Restart=no
|
||||
|
||||
@@ -3,6 +3,6 @@ BindsTo=autostart.target
|
||||
After=windowmanager.target
|
||||
|
||||
[Service]
|
||||
ExecStart=/usr/bin/env blueman-applet
|
||||
ExecStart=/usr/bin/env kdeconnect-indicator
|
||||
PassEnvironment=DISPLAY
|
||||
Restart=always
|
||||
@@ -1,9 +0,0 @@
|
||||
[Unit]
|
||||
BindsTo=autostart.target
|
||||
After=windowmanager.target
|
||||
ConditionPathExists=%h/.var/run/features/keepassx
|
||||
|
||||
[Service]
|
||||
ExecStart=/usr/bin/env keepassx --keyfile %h/.secret/main.key %h/.secret/main.kdbx
|
||||
PassEnvironment=DISPLAY
|
||||
Restart=always
|
||||
9
autostart/services/keepassxc.service
Normal file
9
autostart/services/keepassxc.service
Normal file
@@ -0,0 +1,9 @@
|
||||
[Unit]
|
||||
BindsTo=autostart.target
|
||||
After=windowmanager.target
|
||||
ConditionPathExists=%t/features/keepassxc
|
||||
|
||||
[Service]
|
||||
ExecStart=/usr/bin/env keepassxc --keyfile %h/.secrets/main.keyx %h/.secrets/main.kdbx
|
||||
PassEnvironment=DISPLAY
|
||||
Restart=always
|
||||
@@ -1,10 +1,10 @@
|
||||
[Unit]
|
||||
BindsTo=autostart.target
|
||||
After=windowmanager.target
|
||||
ConditionPathExists=%h/.var/run/features/machine_is_laptop
|
||||
ConditionPathExists=%t/features/machine_is_laptop
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
ExecStart=/usr/bin/env bash -c 'grep "^${ACPI_LID_NAME}.*enabled" /proc/acpi/wakeup && echo " ${ACPI_LID_NAME}" | sudo tee /proc/acpi/wakeup'
|
||||
ExecStart=/usr/bin/env bash -c 'grep "^LID.*enabled" /proc/acpi/wakeup && echo " LID" | sudo tee /proc/acpi/wakeup || true'
|
||||
RemainAfterExit=true
|
||||
PassEnvironment=DISPLAY
|
||||
|
||||
5
autostart/services/mousespam.service
Normal file
5
autostart/services/mousespam.service
Normal file
@@ -0,0 +1,5 @@
|
||||
[Service]
|
||||
Type=simple
|
||||
ExecStart=%h/bin/mousespam
|
||||
RemainAfterExit=True
|
||||
PassEnvironment=DISPLAY
|
||||
@@ -3,7 +3,7 @@ BindsTo=autostart.target
|
||||
After=windowmanager.target
|
||||
After=gnome-keyring.service
|
||||
|
||||
ConditionPathExists=%h/.var/run/features/nextcloud
|
||||
ConditionPathExists=%t/features/nextcloud
|
||||
|
||||
[Service]
|
||||
ExecStart=/usr/bin/env nextcloud --background
|
||||
|
||||
@@ -3,6 +3,7 @@ BindsTo=autostart.target
|
||||
After=windowmanager.target
|
||||
|
||||
[Service]
|
||||
ExecStartPre=/usr/bin/env redshift-gtk -x
|
||||
ExecStart=/usr/bin/env redshift-gtk -c %h/.config/redshift.conf
|
||||
PassEnvironment=DISPLAY
|
||||
Restart=always
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
[Unit]
|
||||
ConditionPathExists=%h/.var/run/features/restic_backup
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
ExecStart=%h/bin/restic-backup
|
||||
RemainAfterExit=true
|
||||
PassEnvironment=DISPLAY
|
||||
@@ -1,6 +0,0 @@
|
||||
[Unit]
|
||||
BindsTo=autostart.target
|
||||
After=windowmanager.target
|
||||
|
||||
[Timer]
|
||||
OnCalendar=Mon..Fri 12:00:00
|
||||
@@ -1,13 +0,0 @@
|
||||
[Unit]
|
||||
BindsTo=autostart.target
|
||||
After=windowmanager.target
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
# systemd.service(5):
|
||||
|
||||
# > The command to execute may contain spaces, but control characters are not
|
||||
# > allowed.
|
||||
ExecStart=/usr/bin/env screencfg "%h/.screencfg/%H/default.yml"
|
||||
RemainAfterExit=true
|
||||
PassEnvironment=DISPLAY
|
||||
@@ -3,9 +3,10 @@ BindsTo=autostart.target
|
||||
After=windowmanager.target
|
||||
After=i3.service
|
||||
|
||||
ConditionPathExists=%h/.var/run/features/steam
|
||||
ConditionPathExists=%t/features/steam
|
||||
|
||||
[Service]
|
||||
ExecStart=/usr/bin/env steam
|
||||
# `-system-composer`: https://github.com/ValveSoftware/steam-for-linux/issues/10806
|
||||
ExecStart=/usr/bin/env steam -system-composer
|
||||
PassEnvironment=DISPLAY
|
||||
Restart=always
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
[Unit]
|
||||
BindsTo=autostart.target
|
||||
After=windowmanager.target
|
||||
ConditionPathExists=%h/.var/run/features/machine_is_laptop
|
||||
ConditionPathExists=%t/features/machine_is_laptop
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
|
||||
8
autostart/services/workstation-mgr.service
Normal file
8
autostart/services/workstation-mgr.service
Normal file
@@ -0,0 +1,8 @@
|
||||
[Unit]
|
||||
BindsTo=autostart.target
|
||||
After=windowmanager.target
|
||||
|
||||
[Service]
|
||||
Type=simple
|
||||
ExecStart=/usr/bin/workstation-mgr serve
|
||||
Restart=always
|
||||
@@ -4,6 +4,6 @@ After=windowmanager.target
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
ExecStart=/usr/bin/env xrdb -merge -I%h %h/.Xresources
|
||||
ExecStart=/usr/bin/env xrdb -merge -I%h %h/.config/Xresources
|
||||
RemainAfterExit=true
|
||||
PassEnvironment=DISPLAY
|
||||
|
||||
@@ -1,6 +1,9 @@
|
||||
[Unit]
|
||||
BindsTo=autostart.target
|
||||
PartOf=gpg-agent.service
|
||||
After=windowmanager.target
|
||||
After=gpg-agent.service
|
||||
ConditionPathExists=%t/features/gpg_agent
|
||||
|
||||
[Service]
|
||||
ExecStart=/usr/bin/env yubikey-touch-detector -libnotify
|
||||
|
||||
@@ -1,9 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -o errexit
|
||||
|
||||
cd ~/projects/personal/time-tracking/
|
||||
source venv/bin/activate
|
||||
source ~/.attendance_env
|
||||
|
||||
./call.py "${@}"
|
||||
25
bin/dunstctl
25
bin/dunstctl
@@ -1,25 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -o nounset
|
||||
|
||||
_logfile="$LOGDIR/dunstctl.log"
|
||||
|
||||
log() {
|
||||
printf '[%s] %s\n' "$(date -uIseconds)" "$*" >> "$_logfile"
|
||||
}
|
||||
|
||||
case "$1" in
|
||||
enable)
|
||||
log "Enabling dunst"
|
||||
systemctl --user --no-block kill --signal SIGUSR2 dunst
|
||||
|
||||
;;
|
||||
disable)
|
||||
log "Disabling dunst"
|
||||
systemctl --user --no-block kill --signal SIGUSR1 dunst
|
||||
;;
|
||||
*)
|
||||
>&2 printf 'Unknown command\n'
|
||||
exit 1
|
||||
esac
|
||||
|
||||
23
bin/fuck-lxc
23
bin/fuck-lxc
@@ -1,23 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -x
|
||||
|
||||
vagrant destroy -f
|
||||
killall vagrant
|
||||
killall -9 vagrant
|
||||
|
||||
pgrep -fa lxc | grep -v fuck-lxc | awk '{print $1}' | xargs sudo kill -9
|
||||
|
||||
sudo lxc-ls -1 | xargs -l1 sudo lxc-stop --kill --name ; sudo lxc-ls -1 | xargs -l1 sudo lxc-destroy --name
|
||||
|
||||
pgrep -fa lxc | grep -v fuck-lxc | awk '{print $1}' | xargs sudo kill -9
|
||||
|
||||
rm -rf .vagrant
|
||||
|
||||
sudo systemctl restart nfs-kernel-server
|
||||
sudo systemctl restart lxc\*
|
||||
|
||||
sudo apt-get install --reinstall lxc
|
||||
|
||||
sudo systemctl restart nfs-kernel-server
|
||||
sudo systemctl restart lxc\*
|
||||
@@ -1,15 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -o nounset
|
||||
|
||||
submodule_count=$(git diff --staged --submodule=log | grep -c '^Submodule')
|
||||
|
||||
if (( $submodule_count == 1 )) ; then
|
||||
msg="Update submodule $(git diff --staged --submodule=log | grep '^Submodule' | cut -d ' ' -f 2)"
|
||||
else
|
||||
msg="Update submodules"
|
||||
fi
|
||||
|
||||
git commit --edit --no-status \
|
||||
--message="$msg" \
|
||||
--message "$(git diff --staged --color=never --submodule=log | sed 's/^S/\nS/' | sed 's/^Submodule /* /' | sed 's/ >/ */')"
|
||||
@@ -1,8 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -o nounset
|
||||
|
||||
rm -r "${1}"
|
||||
cd ./.gitdir
|
||||
git worktree remove "${1}"
|
||||
git branch -D "${1}"
|
||||
@@ -43,7 +43,7 @@ pandoc \
|
||||
--variable papersize=a4 \
|
||||
--variable date=$(date --iso-8601=date) \
|
||||
--variable fontsize=12pt \
|
||||
--variable fontfamily=libertine \
|
||||
--variable fontfamily=libertinus \
|
||||
--variable familydefault=sfdefault \
|
||||
--variable documentclass=scrartcl \
|
||||
--variable fontfamilyoptions= \
|
||||
|
||||
2
bin/mousespam-toggle
Executable file
2
bin/mousespam-toggle
Executable file
@@ -0,0 +1,2 @@
|
||||
#!/usr/bin/env bash
|
||||
systemctl --no-pager --user status mousespam && systemctl --no-pager --user stop mousespam || systemctl --no-pager --user start mousespam
|
||||
94
bin/mypass
94
bin/mypass
@@ -1,94 +0,0 @@
|
||||
#!/usr/bin/env python3
|
||||
|
||||
import sys
|
||||
import subprocess
|
||||
import yaml
|
||||
|
||||
PASS = '/usr/bin/pass'
|
||||
|
||||
def run(args):
|
||||
return(subprocess.run(
|
||||
args,
|
||||
stdin=sys.stdin,
|
||||
stdout=sys.stdout,
|
||||
stderr=sys.stderr).returncode)
|
||||
|
||||
def get_stdout(args):
|
||||
return(subprocess.run(
|
||||
args,
|
||||
stdout=subprocess.PIPE).stdout)
|
||||
|
||||
def extract_from_dict(d, k, last=None):
|
||||
if '.' in k:
|
||||
k1, k2 = k.split('.', 1)
|
||||
try:
|
||||
d1 = d[k1]
|
||||
return extract_from_dict(d1, k2, last=k1)
|
||||
except KeyError:
|
||||
print("\"{}\" was not found in the data".format(k))
|
||||
sys.exit(3)
|
||||
else:
|
||||
if not isinstance(d, dict):
|
||||
print("element \"{}\" is not a dictionary".format(last))
|
||||
sys.exit(3)
|
||||
try:
|
||||
return d[k]
|
||||
except KeyError:
|
||||
print("\"{}\" was not found in the data".format(k))
|
||||
sys.exit(3)
|
||||
|
||||
|
||||
def cmd_get(*args):
|
||||
if len(args) == 1:
|
||||
print(get_stdout(['pass', 'show', args[0]]).split(b'\n')[0].decode())
|
||||
return 0
|
||||
|
||||
if len(args) < 2:
|
||||
print("what do you want to get?")
|
||||
return 1
|
||||
|
||||
# get the pass output
|
||||
out = get_stdout(['pass', 'show', args[0]])
|
||||
try:
|
||||
data = list(yaml.safe_load_all(out))[-1]
|
||||
except yaml.scanner.ScannerError as e:
|
||||
print("invalid YAML data: {}".format(str(e)))
|
||||
return 2
|
||||
except IndexError:
|
||||
print("invalid YAML data: no YAML document found")
|
||||
return 2
|
||||
|
||||
if not isinstance(data, dict):
|
||||
print("invalid YAML data, not a dict")
|
||||
return 2
|
||||
|
||||
for element in args[1:]:
|
||||
keydata = extract_from_dict(data, element)
|
||||
if isinstance(keydata, list) or isinstance(keydata, dict):
|
||||
print(yaml.safe_dump(keydata, default_flow_style=False).strip())
|
||||
else:
|
||||
print(keydata)
|
||||
|
||||
cmds = ['get']
|
||||
git_push_commands = ['insert', 'edit', 'generate', 'rm', 'mv', 'cp']
|
||||
|
||||
def run_pass(argv):
|
||||
return run([PASS] + argv[1:])
|
||||
|
||||
def just_call_pass(argv):
|
||||
sys.exit(run_pass(argv))
|
||||
|
||||
if len(sys.argv) == 1:
|
||||
just_call_pass(sys.argv)
|
||||
elif sys.argv[1] not in cmds:
|
||||
if sys.argv[1] not in git_push_commands:
|
||||
just_call_pass(sys.argv)
|
||||
else:
|
||||
e = run_pass(sys.argv)
|
||||
if e == 0:
|
||||
print("Pushing to remote repository...")
|
||||
run([PASS, 'git', 'push'])
|
||||
print("Done")
|
||||
sys.exit(e)
|
||||
else:
|
||||
sys.exit(globals()['cmd_' + sys.argv[1]](*sys.argv[2:]))
|
||||
40
bin/nato
40
bin/nato
@@ -1,6 +1,7 @@
|
||||
#!/usr/bin/env python3
|
||||
|
||||
import sys
|
||||
import os.path
|
||||
|
||||
hash = {
|
||||
'A': 'Alpha',
|
||||
@@ -43,6 +44,45 @@ hash = {
|
||||
'.': 'Stop',
|
||||
}
|
||||
|
||||
de = {
|
||||
'A': 'Anton',
|
||||
'Ä': 'Ärger',
|
||||
'B': 'Berta',
|
||||
'C': 'Cäsar',
|
||||
'D': 'Dora',
|
||||
'E': 'Emil',
|
||||
'F': 'Friedrich',
|
||||
'G': 'Gustav',
|
||||
'H': 'Heinrich',
|
||||
'I': 'Ida',
|
||||
'J': 'Julius',
|
||||
'K': 'Kaufmann',
|
||||
'L': 'Ludwig',
|
||||
'M': 'Martha',
|
||||
'N': 'Nordpol',
|
||||
'O': 'Otto',
|
||||
'Ö': 'Ökonom',
|
||||
'P': 'Paula',
|
||||
'Q': 'Quelle',
|
||||
'R': 'Richard',
|
||||
'S': 'Samuel',
|
||||
'ß': 'Eszett',
|
||||
'T': 'Theodor',
|
||||
'U': 'Ulrich',
|
||||
'Ü': 'Übermut',
|
||||
'V': 'Viktor',
|
||||
'W': 'Wilhelm',
|
||||
'X': 'Xanthippe',
|
||||
'Y': 'Ypsilon',
|
||||
'Z': 'Zacharias',
|
||||
'-': 'Strich',
|
||||
'.': 'Punkt',
|
||||
}
|
||||
|
||||
if os.path.basename(sys.argv[0]) == 'natode':
|
||||
hash = de
|
||||
|
||||
|
||||
if len(sys.argv) < 2 or sys.argv[1] == '-':
|
||||
text = [line.strip() for line in sys.stdin.readlines()]
|
||||
else:
|
||||
|
||||
1
bin/natode
Symbolic link
1
bin/natode
Symbolic link
@@ -0,0 +1 @@
|
||||
nato
|
||||
2
bin/pacman-remove-orphans
Executable file
2
bin/pacman-remove-orphans
Executable file
@@ -0,0 +1,2 @@
|
||||
#!/usr/bin/env sh
|
||||
pacman -Qtdq | xargs --open-tty --no-run-if-empty sudo pacman -Rns
|
||||
14
bin/pass
Executable file
14
bin/pass
Executable file
@@ -0,0 +1,14 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -o nounset
|
||||
set -o errexit
|
||||
|
||||
if [[ ! -e "${PASSWORD_STORE_DIR}" ]] ; then
|
||||
printf '%s\n' 'This is the first time running pass, initializting repository ...'
|
||||
|
||||
git clone ssh://git@code.hkoerber.de:2222/hannes/passwordstore.git "${PASSWORD_STORE_DIR}"
|
||||
|
||||
printf '%s\n' 'Done'
|
||||
fi
|
||||
|
||||
command -p pass "${@}"
|
||||
14
bin/pf
Executable file
14
bin/pf
Executable file
@@ -0,0 +1,14 @@
|
||||
#!/usr/bin/env python3
|
||||
|
||||
import sys
|
||||
import json
|
||||
import yaml
|
||||
import subprocess
|
||||
|
||||
jqexpression = sys.argv[1]
|
||||
|
||||
jqprocess = subprocess.Popen(["jq", "-r", jqexpression], stdin=subprocess.PIPE, text=True)
|
||||
|
||||
document = [d for d in yaml.safe_load_all(sys.stdin)][-1]
|
||||
|
||||
json.dump(document, jqprocess.stdin)
|
||||
@@ -1,62 +0,0 @@
|
||||
#!/usr/bin/env python3
|
||||
|
||||
import sys
|
||||
import subprocess
|
||||
import time
|
||||
import argparse
|
||||
|
||||
import yaml
|
||||
|
||||
XRANDR = 'xrandr'
|
||||
|
||||
def run(cmd):
|
||||
print('>>> ' + ' '.join(cmd))
|
||||
start = time.time()
|
||||
ret = subprocess.run(
|
||||
cmd,
|
||||
stdout=sys.stdout,
|
||||
stderr=sys.stderr)
|
||||
end = time.time()
|
||||
print("exit code: {}".format(ret.returncode))
|
||||
print("exec time: {}".format(end - start))
|
||||
|
||||
def fail(msg, code=1):
|
||||
print(msg)
|
||||
sys.exit(code)
|
||||
|
||||
parser = argparse.ArgumentParser()
|
||||
parser.add_argument('config')
|
||||
|
||||
args = parser.parse_args()
|
||||
config_path = args.config
|
||||
|
||||
try:
|
||||
config = yaml.safe_load(open(config_path))
|
||||
except FileNotFoundError:
|
||||
fail("File {0} not found".format(config_path))
|
||||
|
||||
# reset
|
||||
for output in config['outputs']:
|
||||
if config.get('reset') and output.get('reset'):
|
||||
run([XRANDR, '--output', output['name'], '--off'])
|
||||
run([XRANDR, '--delmode', output['name'], output['opts']['mode']])
|
||||
run([XRANDR, '--addmode', output['name'], output['opts']['mode']])
|
||||
run([XRANDR, '--output', output['name'], '--mode', output['opts']['mode']])
|
||||
|
||||
cmd = [XRANDR]
|
||||
for output in config['outputs']:
|
||||
cmd.extend(['--output', output['name']])
|
||||
if output.get('disable'):
|
||||
cmd.append('--off')
|
||||
else:
|
||||
if output.get('primary', False):
|
||||
cmd.append("--primary")
|
||||
# cmd.append('--auto')
|
||||
for k, v in output['opts'].items():
|
||||
cmd.extend(['--{}'.format(k), str(v)])
|
||||
for k,v in output.get('set', {}).items():
|
||||
cmd.extend(['--set', k, v])
|
||||
|
||||
run(cmd)
|
||||
run(['i3-msg', 'restart'])
|
||||
run(['systemctl', '--user', 'restart', 'keyboard'])
|
||||
38
bin/switch-color-mode
Executable file
38
bin/switch-color-mode
Executable file
@@ -0,0 +1,38 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -o nounset
|
||||
|
||||
set -x
|
||||
|
||||
apply() {
|
||||
local mode="${1}"
|
||||
|
||||
case "${mode}" in
|
||||
dark)
|
||||
theme=monokai
|
||||
;;
|
||||
light)
|
||||
theme=github_light
|
||||
;;
|
||||
esac
|
||||
|
||||
sed -i "s#themes/.*\.toml#themes/${theme}.toml#" "${XDG_CONFIG_HOME}/alacritty/config.toml"
|
||||
|
||||
sed -i "s#theme = .*\$#theme = \"${theme}\"#" "${XDG_CONFIG_HOME}/helix/config.toml"
|
||||
|
||||
pkill -SIGUSR1 helix
|
||||
|
||||
printf '%s' "${mode}" > "${XDG_RUNTIME_DIR}"/color_mode
|
||||
}
|
||||
|
||||
case "${1:-}" in
|
||||
dark)
|
||||
apply dark
|
||||
;;
|
||||
light)
|
||||
apply light
|
||||
;;
|
||||
*)
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
@@ -1,24 +1,24 @@
|
||||
#!/usr/bin/env bash
|
||||
# Stolen from https://devops.stackexchange.com/a/8984 and adapted to my use case
|
||||
|
||||
if [[ -z "$@" ]]; then
|
||||
if (( $# == 0 )) ; then
|
||||
echo "Missing file input arguments"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
for FILE in "$@"
|
||||
do
|
||||
RESOURCE=$(sed -n 's/^resource "\([^"]*\)" "\([^"]*\)".*/-target=\1.\2 /gp' $FILE)
|
||||
MODULE=$(sed -n 's/^module "\([^"]*\)".*/-target=module.\1 /gp' $FILE)
|
||||
RESOURCE=$(sed -n 's/^resource "\([^"]*\)" "\([^"]*\)".*/-target=\1.\2 /gp' "$FILE")
|
||||
MODULE=$(sed -n 's/^module "\([^"]*\)".*/-target=module.\1 /gp' "$FILE")
|
||||
if [[ -z "$RESOURCE" ]] && [[ -z "$MODULE" ]]; then
|
||||
echo "Cannot detect terraform resource and module in $FILE"
|
||||
echo "Cannot detect terraform resource and module in $FILE" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ ! -z "$RESOURCE" ]]; then
|
||||
if [[ -n "$RESOURCE" ]]; then
|
||||
echo -e $"$RESOURCE"
|
||||
fi
|
||||
if [[ ! -z "$MODULE" ]]; then
|
||||
if [[ -n "$MODULE" ]]; then
|
||||
echo -e $"$MODULE"
|
||||
fi
|
||||
done
|
||||
|
||||
4
bin/yaml2json
Executable file
4
bin/yaml2json
Executable file
@@ -0,0 +1,4 @@
|
||||
#!/usr/bin/env python3
|
||||
import sys, yaml, json
|
||||
|
||||
json.dump([d for d in yaml.safe_load_all(sys.stdin)][-1], sys.stdout, indent=4)
|
||||
6
cargo/config.toml
Normal file
6
cargo/config.toml
Normal file
@@ -0,0 +1,6 @@
|
||||
[build]
|
||||
rustc-wrapper = "sccache"
|
||||
|
||||
[target.x86_64-unknown-linux-gnu]
|
||||
linker = "/usr/bin/clang"
|
||||
rustflags = ["-C", "link-arg=--ld-path=/usr/bin/mold"]
|
||||
Submodule contrib/vim-plug deleted from c3b6b7c297
@@ -9,11 +9,12 @@ apps = yaml.safe_load(open(package_file, 'r'))
|
||||
|
||||
missing_config = {}
|
||||
|
||||
for appname, appconfig in apps['packages']['list'].items():
|
||||
for appname, appconfig in apps.items():
|
||||
for distro, packagelist in appconfig.items():
|
||||
if len(packagelist) == 0:
|
||||
if distro not in missing_config.keys():
|
||||
missing_config[distro] = []
|
||||
missing_config[distro].append(appname)
|
||||
|
||||
print(yaml.dump(missing_config))
|
||||
if missing_config:
|
||||
print(yaml.dump(missing_config), end="")
|
||||
|
||||
103
dotfiles.yml
103
dotfiles.yml
@@ -1,73 +1,116 @@
|
||||
empty_directories:
|
||||
- name: .i3
|
||||
- name: .gnupg
|
||||
mode: '0700'
|
||||
- name: .config/nvim
|
||||
- name: .config/rofi
|
||||
- name: .config/gtk-3.0
|
||||
- name: .config/gtk-3.0-overrides
|
||||
- name: .config/gtk-3.0-overrides/bigger-font/
|
||||
- name: .config/gtk-3.0-overrides/bigger-font/gtk-3.0
|
||||
- name: .config/qt5ct
|
||||
- name: .config/i3status-rust
|
||||
- name: .config/i3status-rust/icons
|
||||
- name: .config/i3status-rust/themes
|
||||
- name: .config/helix
|
||||
- name: .config/git
|
||||
- name: .config/tmux
|
||||
- name: .config/i3
|
||||
- name: .config/zsh
|
||||
- name: .config/alacritty
|
||||
- name: .local/state/gnupg/
|
||||
mode: '0700'
|
||||
- name: .local/state/cargo/
|
||||
dotfiles:
|
||||
- from: git/gitconfig
|
||||
to: .gitconfig
|
||||
to: .config/git/config
|
||||
template: true
|
||||
- from: gnupg/dirmngr.conf
|
||||
to: .gnupg/dirmngr.conf
|
||||
to: .local/state/gnupg/dirmngr.conf
|
||||
- from: gnupg/scdaemon.conf
|
||||
to: .local/state/gnupg/scdaemon.conf
|
||||
- from: gnupg/gpg-agent.conf
|
||||
to: .gnupg/gpg-agent.conf
|
||||
to: .local/state/gnupg/gpg-agent.conf
|
||||
template: true
|
||||
- from: gnupg/gpg.conf
|
||||
to: .gnupg/gpg.conf
|
||||
to: .local/state/gnupg/gpg.conf
|
||||
template: true
|
||||
- from: i3/config
|
||||
to: .i3/config
|
||||
to: .config/i3/config
|
||||
template: true
|
||||
- from: i3/i3status.conf
|
||||
to: .i3/i3status.conf
|
||||
- from: i3/i3status-rust/config.toml
|
||||
to: .config/i3status-rust/config.toml
|
||||
template: true
|
||||
- from: i3/i3status-rust/themes/native.toml
|
||||
to: .config/i3status-rust/themes/native.toml
|
||||
- from: i3/i3status-rust/icons/awesome.toml
|
||||
to: .config/i3status-rust/icons/awesome.toml
|
||||
- from: i3/scripts
|
||||
to: .i3/scripts
|
||||
to: .config/i3/scripts
|
||||
dir: true
|
||||
- from: tmux/tmux.conf
|
||||
to: .tmux.conf
|
||||
to: .config/tmux/tmux.conf
|
||||
- from: vim/vimrc
|
||||
to: .config/nvim/init.vim
|
||||
- from: vim/vimrc
|
||||
to: .vimrc
|
||||
- from: x/Xresources
|
||||
to: .Xresources
|
||||
template: true
|
||||
to: .config/Xresources
|
||||
- from: x/xinitrc
|
||||
to: .xinitrc
|
||||
to: .config/xinitrc
|
||||
- from: zsh/zprofile
|
||||
to: .zprofile
|
||||
to: .config/zsh/.zprofile
|
||||
template: true
|
||||
- from: zsh/zshrc
|
||||
to: .zshrc
|
||||
to: .config/zsh/.zshrc
|
||||
template: true
|
||||
- from: zsh/zshrc.d
|
||||
to: .zshrc.d
|
||||
- from: zsh/zshenv
|
||||
to: .zshenv
|
||||
- from: dunst/dunstrc
|
||||
to: .config/dunstrc
|
||||
template: true
|
||||
- from: redshift/redshift.conf
|
||||
to: .config/redshift.conf
|
||||
- from: vscode/settings.json
|
||||
to: .config/Code/User/settings.json
|
||||
- from: vscode/keybindings.json
|
||||
to: .config/Code/User/keybindings.json
|
||||
- from: alacritty/alacritty.yml
|
||||
to: .config/alacritty.yml
|
||||
- from: vscodium/product.json
|
||||
to: .config/VSCodium/product.json
|
||||
- from: vscodium/settings.json
|
||||
to: .config/VSCodium/User/settings.json
|
||||
- from: vscodium/keybindings.json
|
||||
to: .config/VSCodium/User/keybindings.json
|
||||
- from: alacritty/alacritty.toml
|
||||
to: .config/alacritty/config.toml
|
||||
template: true
|
||||
- from: alacritty/themes
|
||||
to: .config/alacritty/themes
|
||||
dir: true
|
||||
- from: rofi/config
|
||||
to: .config/rofi/config
|
||||
- from: gtk/gtk-3.0.ini
|
||||
to: .config/gtk-3.0/settings.ini
|
||||
template: true
|
||||
- from: gtk/gtk-3.0-bigger-font.ini
|
||||
to: .config/gtk-3.0-overrides/bigger-font/gtk-3.0/settings.ini
|
||||
template: true
|
||||
- from: gtk/gtkrc-2.0
|
||||
to: .gtkrc-2.0
|
||||
to: .config/gtkrc-2.0
|
||||
template: true
|
||||
- from: qt/qt5ct.conf
|
||||
to: .config/qt5ct/qt5ct.conf
|
||||
- from: screencfg
|
||||
to: .screencfg
|
||||
- from: scripts
|
||||
to: scripts
|
||||
dir: true
|
||||
- from: helix/config.toml
|
||||
to: .config/helix/config.toml
|
||||
- from: helix/languages.toml
|
||||
to: .config/helix/languages.toml
|
||||
- from: screencfg/screencfg.toml
|
||||
to: .config/screencfg.toml
|
||||
- from: cargo/config.toml
|
||||
to: .local/state/cargo/config.toml
|
||||
dotfiles_remove:
|
||||
- .gitconfig
|
||||
- .vimrc
|
||||
- .tmux.conf
|
||||
- .i3
|
||||
- .gtkrc-2.0
|
||||
- .opt
|
||||
- .optbin
|
||||
- .usr
|
||||
- .var
|
||||
- .screenrc
|
||||
- .zshrc.d
|
||||
|
||||
28
drivers.yml
Normal file
28
drivers.yml
Normal file
@@ -0,0 +1,28 @@
|
||||
cpu:
|
||||
amd:
|
||||
- amd-ucode
|
||||
intel:
|
||||
- intel-ucode
|
||||
|
||||
gpu:
|
||||
amd:
|
||||
- mesa
|
||||
- mesa-utils
|
||||
- lib32-mesa
|
||||
- xf86-video-amdgpu
|
||||
- vulkan-radeon
|
||||
- lib32-vulkan-radeon
|
||||
- libva-mesa-driver
|
||||
- lib32-libva-mesa-driver
|
||||
- mesa-vdpau
|
||||
- lib32-mesa-vdpau
|
||||
- vulkan-headers
|
||||
- vulkan-tools
|
||||
nvidia:
|
||||
- mesa
|
||||
- mesa-utils
|
||||
- lib32-mesa
|
||||
- vulkan-nouveau
|
||||
- lib32-vulkan-nouveau
|
||||
- vulkan-headers
|
||||
- vulkan-tools
|
||||
@@ -64,7 +64,7 @@
|
||||
frame_width = 2
|
||||
|
||||
# Defines color of the frame around the notification window.
|
||||
frame_color = "#e16b40"
|
||||
frame_color = "#ff964f"
|
||||
|
||||
# Define a color for the separator.
|
||||
# possible values are:
|
||||
@@ -84,7 +84,7 @@
|
||||
|
||||
### Text ###
|
||||
|
||||
font = DejaVu Sans {{ machine.font_size }}
|
||||
font = JetBrainsMono, Fontawesome {{ machine.font_size }}
|
||||
|
||||
# The spacing between lines. If the height is smaller than the
|
||||
# font height, it will get raised to the font height.
|
||||
|
||||
@@ -2,9 +2,6 @@
|
||||
name = Hannes Körber
|
||||
email = {{ user.mail }}
|
||||
useConfigOnly = true
|
||||
{% if user.git_gpg_sign|bool %}
|
||||
signingkey = {{ user.gpg_key.id }}
|
||||
{% endif %}
|
||||
[github]
|
||||
user = hakoerber
|
||||
[alias]
|
||||
@@ -36,7 +33,7 @@
|
||||
|
||||
k = "!gitk --all"
|
||||
|
||||
serve = !git daemon --reuseaddr --verbose --base-path=. --export-all ./.git
|
||||
serve = !git daemon --reuseaddr --verbose --base-path=. --export-all ./.git
|
||||
|
||||
last = "log -1 HEAD"
|
||||
|
||||
@@ -44,7 +41,7 @@
|
||||
|
||||
pushall = "!bash -c 'for r in $(git remote) ; do [[ "$r" != "upstream" ]] && { echo \"--- [$r] ---\" ; git push $r \"$@\" ; } ; done' -"
|
||||
|
||||
branch-clean = "!sh -c 'git branch --merged | grep -v -e master -e develop -e '^*' | xargs --no-run-if-empty git branch -d'"
|
||||
branch-clean = "!sh -c 'git branch --merged | grep -v -e master -e develop -e main -e '^*' | xargs --no-run-if-empty git branch -d'"
|
||||
brc = "!git branch-clean"
|
||||
|
||||
graph = log --graph --pretty=format:'%C(yellow)%h%Creset%C(bold red)% D%Creset %C(green)(%cr) %C(blue)%an<%ae>%Creset%n %C(bold white)%s%Creset' --all
|
||||
@@ -71,14 +68,18 @@
|
||||
fileMode = true
|
||||
whitespace = "blank-at-eol,space-before-tab,blank-at-eof"
|
||||
abbrev = 8
|
||||
pager = delta
|
||||
[interactive]
|
||||
diffFilter = delta --color-only
|
||||
[color]
|
||||
ui = true
|
||||
[column]
|
||||
ui = auto
|
||||
[push]
|
||||
default = simple
|
||||
autoSetupRemote = true
|
||||
[merge]
|
||||
tool = vimdiff
|
||||
conflictstyle = diff3
|
||||
[gc]
|
||||
auto = 0
|
||||
[advice]
|
||||
@@ -88,7 +89,7 @@
|
||||
commitBeforeMerge = false
|
||||
detachedHead = false
|
||||
[commit]
|
||||
gpgSign = {{ user.git_gpg_sign|bool }}
|
||||
gpgSign = false
|
||||
cleanup = strip
|
||||
status = true
|
||||
[status]
|
||||
@@ -105,7 +106,6 @@
|
||||
autoStash = true
|
||||
[diff]
|
||||
submodule = log
|
||||
mnemonicPrefix = true
|
||||
renameLimit = 1199
|
||||
[branch]
|
||||
autoSetupMerge = true
|
||||
@@ -119,4 +119,17 @@
|
||||
insteadOf = https://code.hkoerber.de/
|
||||
|
||||
[init]
|
||||
defaultBranch = master
|
||||
defaultBranch = main
|
||||
[safe]
|
||||
directory = /var/lib/dotfiles
|
||||
directory = /var/lib/dotfiles/*
|
||||
[includeIf "gitdir:/var/lib/dotfiles/.git"]
|
||||
path = /var/lib/dotfiles/gitcfg
|
||||
[delta]
|
||||
navigate = true # use n and N to move between diff sections
|
||||
|
||||
# delta detects terminal colors automatically; set one of these to disable auto-detection
|
||||
# dark = true
|
||||
# light = true
|
||||
[rerere]
|
||||
enabled = true
|
||||
|
||||
3
gitcfg
Normal file
3
gitcfg
Normal file
@@ -0,0 +1,3 @@
|
||||
[user]
|
||||
email = hannes@hkoerber.de
|
||||
name = Hannes Körber
|
||||
@@ -9,3 +9,6 @@ enable-ssh-support
|
||||
{% endif %}
|
||||
|
||||
pinentry-program /usr/bin/pinentry-qt
|
||||
|
||||
extra-socket none
|
||||
browser-socket none
|
||||
|
||||
@@ -34,12 +34,7 @@ fixed-list-mode
|
||||
no-mangle-dos-filenames
|
||||
require-cross-certification
|
||||
|
||||
{% if not (distro == 'ubuntu' and ansible_distribution_version == '18.04') -%}
|
||||
{# looks like the gpg version in that ubuntu release it too old and does not
|
||||
{# contain the setting #}
|
||||
# do not cache keys for symmetric encryption
|
||||
no-symkey-cache
|
||||
|
||||
{% endif -%}
|
||||
|
||||
keyserver-options no-honor-keyserver-url no-auto-key-retrieve include-revoked
|
||||
|
||||
2
gnupg/scdaemon.conf
Normal file
2
gnupg/scdaemon.conf
Normal file
@@ -0,0 +1,2 @@
|
||||
# makes yubikey work more reliably
|
||||
disable-ccid
|
||||
8
grm/github.toml
Normal file
8
grm/github.toml
Normal file
@@ -0,0 +1,8 @@
|
||||
provider = "github"
|
||||
token_command = "pass show github | ~/bin/yaml2json | jq -r '.personal_access_token.grm.value'"
|
||||
root = "~/code/github.com"
|
||||
worktree = true
|
||||
force_ssh = true
|
||||
|
||||
[filters]
|
||||
owner = true
|
||||
@@ -1,317 +0,0 @@
|
||||
[[trees]]
|
||||
root = "~/projects"
|
||||
|
||||
[[trees.repos]]
|
||||
name = "misc/rbackupd"
|
||||
|
||||
[[trees.repos.remotes]]
|
||||
name = "github"
|
||||
url = "git@github.com:hakoerber/rbackupd.git"
|
||||
type = "ssh"
|
||||
|
||||
[[trees.repos]]
|
||||
name = "misc/cobbler-kickstart"
|
||||
|
||||
[[trees.repos.remotes]]
|
||||
name = "github"
|
||||
url = "ssh://git@github.com/hakoerber/cobbler-kickstart.git"
|
||||
type = "ssh"
|
||||
|
||||
[[trees.repos]]
|
||||
name = "misc/postfix-grok-patterns"
|
||||
|
||||
[[trees.repos.remotes]]
|
||||
name = "origin"
|
||||
url = "ssh://git@github.com/hakoerber/postfix-grok-patterns.git"
|
||||
type = "ssh"
|
||||
|
||||
[[trees.repos.remotes]]
|
||||
name = "upstream"
|
||||
url = "https://github.com/whyscream/postfix-grok-patterns.git"
|
||||
type = "https"
|
||||
|
||||
[[trees.repos]]
|
||||
name = "misc/syncrepo"
|
||||
|
||||
[[trees.repos.remotes]]
|
||||
name = "origin"
|
||||
url = "ssh://git@github.com/hakoerber/syncrepo.git"
|
||||
type = "ssh"
|
||||
|
||||
[[trees.repos]]
|
||||
name = "misc/pkgbuilds"
|
||||
|
||||
[[trees.repos.remotes]]
|
||||
name = "origin"
|
||||
url = "ssh://git@github.com/hakoerber/pkgbuilds.git"
|
||||
type = "ssh"
|
||||
|
||||
[[trees.repos]]
|
||||
name = "misc/openvpn-helper"
|
||||
|
||||
[[trees.repos.remotes]]
|
||||
name = "github"
|
||||
url = "ssh://git@github.com/hakoerber/openvpn-helper.git"
|
||||
type = "ssh"
|
||||
|
||||
[[trees.repos]]
|
||||
name = "misc/wifiqr"
|
||||
|
||||
[[trees.repos.remotes]]
|
||||
name = "github"
|
||||
url = "ssh://git@github.com/hakoerber/wifi-qr.git"
|
||||
type = "ssh"
|
||||
|
||||
[[trees.repos]]
|
||||
name = "misc/checkconn"
|
||||
|
||||
[[trees.repos.remotes]]
|
||||
name = "github"
|
||||
url = "ssh://git@github.com/hakoerber/checkconn.git"
|
||||
type = "ssh"
|
||||
|
||||
[[trees.repos]]
|
||||
name = "misc/xftwidth"
|
||||
|
||||
[[trees.repos.remotes]]
|
||||
name = "origin"
|
||||
url = "ssh://git@github.com/hakoerber/xftwidth.git"
|
||||
type = "ssh"
|
||||
|
||||
[[trees.repos.remotes]]
|
||||
name = "upstream"
|
||||
url = "https://github.com/vixus0/xftwidth"
|
||||
type = "https"
|
||||
|
||||
[[trees.repos]]
|
||||
name = "x-hidecursor"
|
||||
remotes = []
|
||||
|
||||
[[trees.repos]]
|
||||
name = "git-repo-manager"
|
||||
|
||||
[[trees.repos.remotes]]
|
||||
name = "github"
|
||||
url = "ssh://git@github.com/hakoerber/git-repo-manager.git"
|
||||
type = "ssh"
|
||||
|
||||
[[trees.repos.remotes]]
|
||||
name = "origin"
|
||||
url = "ssh://git@code.hkoerber.de:2222/hannes/git-repo-manager.git"
|
||||
type = "ssh"
|
||||
|
||||
[[trees.repos]]
|
||||
name = "talks"
|
||||
|
||||
[[trees.repos.remotes]]
|
||||
name = "origin"
|
||||
url = "ssh://git@github.com/hakoerber/talks.git"
|
||||
type = "ssh"
|
||||
|
||||
[[trees.repos]]
|
||||
name = "container/openresty-oidc"
|
||||
|
||||
[[trees.repos.remotes]]
|
||||
name = "origin"
|
||||
url = "ssh://git@code.hkoerber.de:2222/container/openresty-oidc.git"
|
||||
type = "ssh"
|
||||
|
||||
[[trees.repos]]
|
||||
name = "container/acimaker"
|
||||
|
||||
[[trees.repos.remotes]]
|
||||
name = "github"
|
||||
url = "ssh://git@github.com/hakoerber/acimaker.git"
|
||||
type = "ssh"
|
||||
|
||||
[[trees.repos.remotes]]
|
||||
name = "private"
|
||||
url = "git@code.sys.haktec.de:container/acimaker.git"
|
||||
type = "ssh"
|
||||
|
||||
[[trees.repos]]
|
||||
name = "container/drone-kaniko"
|
||||
|
||||
[[trees.repos.remotes]]
|
||||
name = "origin"
|
||||
url = "ssh://git@code.hkoerber.de:2222/container/drone-kaniko.git"
|
||||
type = "ssh"
|
||||
|
||||
[[trees.repos.remotes]]
|
||||
name = "upstream"
|
||||
url = "https://github.com/banzaicloud/drone-kaniko"
|
||||
type = "https"
|
||||
|
||||
[[trees.repos]]
|
||||
name = "container/roundcube"
|
||||
|
||||
[[trees.repos.remotes]]
|
||||
name = "origin"
|
||||
url = "ssh://git@code.hkoerber.de:2222/container/roundcube.git"
|
||||
type = "ssh"
|
||||
|
||||
[[trees.repos]]
|
||||
name = "container/mycloud-homer"
|
||||
|
||||
[[trees.repos.remotes]]
|
||||
name = "origin"
|
||||
url = "ssh://git@code.hkoerber.de:2222/container/mycloud-homer.git"
|
||||
type = "ssh"
|
||||
|
||||
[[trees.repos]]
|
||||
name = "projects/misc/cobbler-kickstart"
|
||||
|
||||
[[trees.repos.remotes]]
|
||||
name = "origin"
|
||||
url = "ssh://git@github.com/hakoerber/cobbler-kickstart.git"
|
||||
type = "ssh"
|
||||
|
||||
[[trees.repos]]
|
||||
name = "finance-auto-import"
|
||||
|
||||
[[trees.repos.remotes]]
|
||||
name = "origin"
|
||||
url = "ssh://git@code.hkoerber.de:2222/hannes/finance-auto-import.git"
|
||||
type = "ssh"
|
||||
|
||||
[[trees.repos]]
|
||||
name = "guitar_practice"
|
||||
|
||||
[[trees.repos.remotes]]
|
||||
name = "origin"
|
||||
url = "ssh://git@github.com/hakoerber/guitar-practice.git"
|
||||
type = "ssh"
|
||||
|
||||
[[trees.repos]]
|
||||
name = "picture-cleaner"
|
||||
remotes = []
|
||||
|
||||
[[trees.repos]]
|
||||
name = "mycloud"
|
||||
|
||||
[[trees.repos.remotes]]
|
||||
name = "origin"
|
||||
url = "ssh://git@code.hkoerber.de:2222/hannes/mycloud.git"
|
||||
type = "ssh"
|
||||
|
||||
[[trees.repos]]
|
||||
name = "resume"
|
||||
|
||||
[[trees.repos.remotes]]
|
||||
name = "origin"
|
||||
url = "ssh://git@code.hkoerber.de:2222/hannes/resume.git"
|
||||
type = "ssh"
|
||||
|
||||
[[trees.repos]]
|
||||
name = "lea-michael-hochzeit"
|
||||
remotes = []
|
||||
|
||||
[[trees.repos]]
|
||||
name = "builddoc"
|
||||
|
||||
[[trees.repos.remotes]]
|
||||
name = "github"
|
||||
url = "ssh://git@github.com/hakoerber/builddoc.git"
|
||||
type = "ssh"
|
||||
|
||||
[[trees.repos]]
|
||||
name = "blog"
|
||||
|
||||
[[trees.repos.remotes]]
|
||||
name = "github"
|
||||
url = "ssh://git@github.com/hakoerber/blog.hkoerber.de.git"
|
||||
type = "ssh"
|
||||
|
||||
[[trees.repos.remotes]]
|
||||
name = "origin"
|
||||
url = "ssh://git@code.hkoerber.de:2222/hannes/blog.git"
|
||||
type = "ssh"
|
||||
|
||||
[[trees.repos]]
|
||||
name = "fizzbuzz"
|
||||
|
||||
[[trees.repos.remotes]]
|
||||
name = "github"
|
||||
url = "ssh://git@github.com/hakoerber/fizzbuzz.git"
|
||||
type = "ssh"
|
||||
|
||||
[[trees.repos]]
|
||||
name = "ggj/2018/the-lost-son"
|
||||
|
||||
[[trees.repos.remotes]]
|
||||
name = "origin"
|
||||
url = "ssh://git@github.com:niklas-heer/the-lost-son.git"
|
||||
type = "ssh"
|
||||
|
||||
[[trees.repos]]
|
||||
name = "ggj/2019-claim-your-world"
|
||||
|
||||
[[trees.repos.remotes]]
|
||||
name = "origin"
|
||||
url = "ssh://git@github.com:theintroverts/claim-your-world.git"
|
||||
type = "ssh"
|
||||
|
||||
[[trees.repos]]
|
||||
name = "prometheus-restic-backblaze"
|
||||
|
||||
[[trees.repos.remotes]]
|
||||
name = "github"
|
||||
url = "ssh://git@github.com/hakoerber/prometheus-restic-backblaze.git"
|
||||
type = "ssh"
|
||||
|
||||
[[trees.repos.remotes]]
|
||||
name = "origin"
|
||||
url = "ssh://git@code.hkoerber.de:2222/container/prometheus-restic-backblaze.git"
|
||||
type = "ssh"
|
||||
|
||||
[[trees.repos]]
|
||||
name = "dotfiles"
|
||||
|
||||
[[trees.repos.remotes]]
|
||||
name = "github"
|
||||
url = "ssh://git@github.com/hakoerber/dotfiles.git"
|
||||
type = "ssh"
|
||||
|
||||
[[trees.repos.remotes]]
|
||||
name = "origin"
|
||||
url = "ssh://git@code.hkoerber.de:2222/hannes/dotfiles.git"
|
||||
type = "ssh"
|
||||
|
||||
[[trees.repos]]
|
||||
name = "packager"
|
||||
|
||||
[[trees.repos.remotes]]
|
||||
name = "github"
|
||||
url = "ssh://git@github.com/hakoerber/packager.git"
|
||||
type = "ssh"
|
||||
|
||||
[[trees.repos.remotes]]
|
||||
name = "origin"
|
||||
url = "ssh://git@code.hkoerber.de:2222/hannes/packager.git"
|
||||
type = "ssh"
|
||||
|
||||
[[trees.repos]]
|
||||
name = "time-tracking"
|
||||
|
||||
[[trees.repos.remotes]]
|
||||
name = "github"
|
||||
url = "ssh://git@github.com/hakoerber/time-tracking.git"
|
||||
type = "ssh"
|
||||
|
||||
[[trees.repos.remotes]]
|
||||
name = "origin"
|
||||
url = "ssh://git@code.hkoerber.de:2222/hannes/time-tracking.git"
|
||||
type = "ssh"
|
||||
|
||||
[[trees.repos]]
|
||||
name = "aws-glacier-backup"
|
||||
|
||||
[[trees.repos.remotes]]
|
||||
name = "github"
|
||||
url = "ssh://git@github.com/hakoerber/aws-glacier-backup.git"
|
||||
type = "ssh"
|
||||
|
||||
[[trees.repos.remotes]]
|
||||
name = "origin"
|
||||
url = "ssh://git@code.hkoerber.de:2222/hakoerber/aws-glacier-backup.git"
|
||||
type = "ssh"
|
||||
15
gtk/gtk-3.0-bigger-font.ini.j2
Normal file
15
gtk/gtk-3.0-bigger-font.ini.j2
Normal file
@@ -0,0 +1,15 @@
|
||||
[Settings]
|
||||
gtk-theme-name=Breeze
|
||||
gtk-icon-theme-name=breeze
|
||||
gtk-font-name=DejaVu Sans {{ ((machine.font_size|int - 2)|float * 2.0) | round(0, 'floor') | int }}
|
||||
gtk-cursor-theme-name=breeze_cursors
|
||||
gtk-cursor-theme-size=0
|
||||
gtk-toolbar-style=GTK_TOOLBAR_BOTH
|
||||
gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
|
||||
gtk-button-images=1
|
||||
gtk-menu-images=1
|
||||
gtk-enable-event-sounds=1
|
||||
gtk-enable-input-feedback-sounds=1
|
||||
gtk-xft-antialias=1
|
||||
gtk-xft-hinting=1
|
||||
gtk-xft-hintstyle=hintfull
|
||||
@@ -1,6 +1,6 @@
|
||||
[Settings]
|
||||
gtk-theme-name=Breeze
|
||||
gtk-icon-theme-name=breeze-dark
|
||||
gtk-icon-theme-name=breeze
|
||||
gtk-font-name=DejaVu Sans {{ machine.font_size|int - 2 }}
|
||||
gtk-cursor-theme-name=breeze_cursors
|
||||
gtk-cursor-theme-size=0
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
# Any customization should be done in ~/.gtkrc-2.0.mine instead.
|
||||
|
||||
gtk-theme-name="Breeze"
|
||||
gtk-icon-theme-name="breeze-dark"
|
||||
gtk-icon-theme-name="breeze"
|
||||
gtk-font-name="DejaVu Sans {{ machine.font_size| int - 2 }}"
|
||||
gtk-cursor-theme-name="breeze_cursors"
|
||||
gtk-cursor-theme-size=0
|
||||
|
||||
39
helix/config.toml
Normal file
39
helix/config.toml
Normal file
@@ -0,0 +1,39 @@
|
||||
theme = "monokai"
|
||||
|
||||
[editor]
|
||||
idle-timeout = 0
|
||||
completion-trigger-len = 2
|
||||
|
||||
[editor.statusline]
|
||||
left = ["mode", "separator", "file-name", "file-modification-indicator"]
|
||||
|
||||
right = [
|
||||
"spinner",
|
||||
"spacer",
|
||||
"diagnostics",
|
||||
"separator",
|
||||
"selections",
|
||||
"separator",
|
||||
"position",
|
||||
"position-percentage",
|
||||
"file-type",
|
||||
]
|
||||
|
||||
mode.normal = "N"
|
||||
mode.insert = "I"
|
||||
mode.select = "S"
|
||||
|
||||
[editor.lsp]
|
||||
display-inlay-hints = true
|
||||
|
||||
[editor.cursor-shape]
|
||||
insert = "bar"
|
||||
|
||||
[editor.file-picker]
|
||||
hidden = false
|
||||
|
||||
[editor.indent-guides]
|
||||
render = true
|
||||
|
||||
[editor.soft-wrap]
|
||||
enable = true
|
||||
15
helix/languages.toml
Normal file
15
helix/languages.toml
Normal file
@@ -0,0 +1,15 @@
|
||||
|
||||
[[language]]
|
||||
name = "bash"
|
||||
indent = { unit = " ", tab-width = 4 }
|
||||
|
||||
[language-server.pylsp.config.pylsp.plugins]
|
||||
flake8 = { enabled = false }
|
||||
|
||||
[[language]]
|
||||
name = "python"
|
||||
indent = { unit = " ", tab-width = 4 }
|
||||
|
||||
[[language]]
|
||||
name = "dockerfile"
|
||||
indent = { unit = " ", tab-width = 4 }
|
||||
119
i3/config.j2
119
i3/config.j2
@@ -17,10 +17,10 @@
|
||||
set $mod Mod4
|
||||
|
||||
# The default terminal
|
||||
set $terminal "alacritty --config-file ~/.config/alacritty.yml"
|
||||
set $calc "alacritty --config-file ~/.config/alacritty.yml -e $SHELL -i -c calc"
|
||||
set $terminal "alacritty --config-file ~/.config/alacritty/config.toml"
|
||||
set $calc "alacritty --config-file ~/.config/alacritty/config.toml -e $SHELL -i -c calc"
|
||||
|
||||
set $scriptdir ~/.i3/scripts
|
||||
set $scriptdir ~/.config/i3/scripts
|
||||
|
||||
# Keys for the exit mode
|
||||
set $key_lock l
|
||||
@@ -64,8 +64,8 @@
|
||||
set $up k
|
||||
set $right l
|
||||
|
||||
set $splith v
|
||||
set $splitv c
|
||||
set $splith v
|
||||
set $splitv c
|
||||
set $split_toggle x
|
||||
|
||||
set $fullscreen f
|
||||
@@ -95,7 +95,6 @@
|
||||
|
||||
set $screenshot o
|
||||
|
||||
|
||||
################################################################################
|
||||
### WORKSPACE ASSIGNMENTS ######################################################
|
||||
################################################################################
|
||||
@@ -111,8 +110,7 @@ workspace $workspace8 output {{ machine.screen.8 }}
|
||||
workspace $workspace9 output {{ machine.screen.9 }}
|
||||
workspace $workspace10 output {{ machine.screen.0 }}
|
||||
|
||||
|
||||
assign [class="^Keepassx$"] $workspace8
|
||||
assign [class="^KeePassXC$"] $workspace8
|
||||
|
||||
# See https://github.com/i3/i3/issues/2060
|
||||
for_window [class="^Spotify$"] move to workspace $workspace9
|
||||
@@ -120,8 +118,8 @@ assign [class="^Spotify$"] $workspace9
|
||||
|
||||
assign [class="^Google-chrome$"] $workspace7
|
||||
assign [class="^Chromium$"] $workspace7
|
||||
assign [class="^Steam"] $workspace5
|
||||
for_window [class="^Steam$"] move to workspace $workspace5
|
||||
assign [class="^[Ss]team$"] $workspace5
|
||||
for_window [class="^[Ss]team$"] move to workspace $workspace5
|
||||
|
||||
assign [class="^dota2$"] $workspace10
|
||||
assign [class="^Wine$"] $workspace10
|
||||
@@ -206,47 +204,19 @@ assign [class="^Wine$"] $workspace10
|
||||
|
||||
### START APPLICATIONS #####################################################
|
||||
|
||||
bindsym $mod+d exec --no-startup-id ~/.i3/scripts/appmenu
|
||||
bindsym $mod+Return exec $terminal
|
||||
bindsym $mod+d exec --no-startup-id rofi -show combi -combi-modi run -display-combi "run"
|
||||
|
||||
bindsym $mod+Return exec $terminal
|
||||
bindsym $mod+Shift+Return exec $calc
|
||||
|
||||
bindsym F1 exec --no-startup-id ~/.i3/scripts/shutdown-menu
|
||||
bindsym F2 exec --no-startup-id ~/.i3/scripts/screenmenu
|
||||
bindsym F1 exec --no-startup-id workstation-client power menu
|
||||
|
||||
bindsym $mod+F1 exec --no-startup-id ~/.i3/scripts/i3exit lock
|
||||
bindsym $mod+F2 exec --no-startup-id screencfg ~/.screencfg/{{ ansible_hostname }}/default.yml ; exec systemctl --user restart keyboard.service
|
||||
{% for screencfg in machine.screencfgs -%}
|
||||
bindsym $mod+{{ screencfg.key }} exec --no-startup-id screencfg ~/.screencfg/{{ ansible_hostname }}/{{ screencfg.name }}.yml ; exec systemctl --user restart keyboard.service
|
||||
{% endfor -%}
|
||||
bindsym $mod+F4 exec --no-startup-id ~/.i3/scripts/i3exit suspend
|
||||
bindsym $mod+Home exec --no-startup-id ~/.i3/scripts/shutdown-menu
|
||||
bindsym $mod+F1 exec --no-startup-id workstation-client power lock
|
||||
|
||||
bindsym $mod+$screenshot exec --no-startup-id sh -c 'maim | xclip -selection clipboard -t image/png'
|
||||
bindsym $mod+Shift+$screenshot exec --no-startup-id sh -c 'maim --select | xclip -selection clipboard -t image/png'
|
||||
|
||||
bindsym $mod+Shift+v exec --no-startup-id redshift-toggle
|
||||
|
||||
# bindsym $mod+$pim_toggle \
|
||||
# mark --add _source; \
|
||||
# focus output eDP-1; \
|
||||
# mark --add _origin; \
|
||||
# workspace $workspace10; \
|
||||
# mark --add _destination; \
|
||||
# [con_mark="^_destination$"] swap container with mark "_source"; \
|
||||
# [con_mark="^_source$"] focus; unmark _source; \
|
||||
# [con_mark="^_origin$"] focus; unmark _origin; \
|
||||
# [con_mark="^_destination$"] focus; unmark _destination; \
|
||||
|
||||
bindsym $mod+$pim_toggle \
|
||||
unmark _destination; \
|
||||
mark _source; \
|
||||
workspace $workspace10; \
|
||||
mark --add _destination; \
|
||||
[con_mark="^_destination$"] swap container with mark "_source"; \
|
||||
[con_mark="^_source$"] focus; \
|
||||
unmark _source; \
|
||||
[con_mark="^_destination$"] focus; \
|
||||
unmark _destination;
|
||||
bindsym $mod+$pim_toggle exec --no-startup-id $scriptdir/swap-from-workspace $workspace10
|
||||
|
||||
################################################################################
|
||||
### MODES ######################################################################
|
||||
@@ -312,17 +282,17 @@ assign [class="^Wine$"] $workspace10
|
||||
floating_minimum_size 0 x 0
|
||||
floating_maximum_size 0 x 0
|
||||
|
||||
font pango:Inconsolata {{ machine.font_size }}
|
||||
font pango:JetBrainsMono {{ machine.font_size }}
|
||||
|
||||
################################################################################
|
||||
### COLOR SETTINGS #############################################################
|
||||
################################################################################
|
||||
|
||||
# class border backgr. text indicator
|
||||
client.focused #E16B40 #E16B40 #000000 #FF0000
|
||||
client.focused_inactive #333333 #5f676a #ffffff #484e50
|
||||
client.unfocused #333333 #202020 #cccccc #292d2e
|
||||
client.urgent #2f343a #900000 #ffffff #900000
|
||||
client.focused #e5b567 #e5b567 #000000 #FF0000
|
||||
client.focused_inactive #272822 #5f676a #ffffff #484e50
|
||||
client.unfocused #1C1C1C #272822 #cccccc #292d2e
|
||||
client.urgent #272822 #ff7777 #000000 #900000
|
||||
|
||||
################################################################################
|
||||
### APPLICATION SPECIFIC SETTINGS ##############################################
|
||||
@@ -338,33 +308,31 @@ bindsym $mod+F9 exec --no-startup-id evolution
|
||||
### SPECIAL KEYBINDS ###########################################################
|
||||
################################################################################
|
||||
|
||||
bindsym XF86Sleep exec --no-startup-id $scriptdir/i3exit suspend
|
||||
bindsym XF86AudioMute exec --no-startup-id $scriptdir/pa-volume mute-toggle
|
||||
bindsym XF86AudioRaiseVolume exec --no-startup-id $scriptdir/pa-volume set-vol +3
|
||||
bindsym XF86AudioLowerVolume exec --no-startup-id $scriptdir/pa-volume set-vol -3
|
||||
bindsym XF86Sleep exec --no-startup-id workstation-client power lock
|
||||
|
||||
bindsym XF86AudioPlay exec $scriptdir/spotify-control toggle
|
||||
bindsym XF86AudioNext exec $scriptdir/spotify-control next
|
||||
bindsym XF86AudioPrev exec $scriptdir/spotify-control previous
|
||||
bindsym XF86AudioMute exec --no-startup-id workstation-client pulseaudio output toggle
|
||||
bindsym XF86AudioRaiseVolume exec --no-startup-id workstation-client pulseaudio output inc
|
||||
bindsym XF86AudioLowerVolume exec --no-startup-id workstation-client pulseaudio output dec
|
||||
|
||||
# keys seemingly switched
|
||||
bindsym XF86MonBrightnessUp exec --no-startup-id xbacklight -inc 8 ; exec --no-startup-id $scriptdir/update-status
|
||||
bindsym XF86MonBrightnessDown exec --no-startup-id xbacklight -dec 8 ; exec --no-startup-id $scriptdir/update-status
|
||||
bindsym XF86AudioPlay exec --no-startup-id workstation-client spotify toggle
|
||||
bindsym XF86AudioNext exec --no-startup-id workstation-client spotify next
|
||||
bindsym XF86AudioPrev exec --no-startup-id workstation-client spotify previous
|
||||
|
||||
bindsym $mod+m exec --no-startup-id $scriptdir/pa-volume mute-toggle-mic
|
||||
bindsym $mod+space exec --no-startup-id $scriptdir/pa-volume mute-toggle-mic
|
||||
bindsym XF86MonBrightnessUp exec --no-startup-id workstation-client brightness inc
|
||||
bindsym XF86MonBrightnessDown exec --no-startup-id workstation-client brightness dec
|
||||
|
||||
bindsym $mod+m exec --no-startup-id workstation-client pulseaudio input toggle
|
||||
bindsym $mod+space exec --no-startup-id workstation-client pulseaudio input toggle
|
||||
bindsym KP_Enter exec --no-startup-id workstation-client pulseaudio input toggle
|
||||
|
||||
##############################################################################
|
||||
### BARS #######################################################################
|
||||
################################################################################
|
||||
#
|
||||
|
||||
bar {
|
||||
mode dock
|
||||
position bottom
|
||||
|
||||
|
||||
#tray_output HDMI3
|
||||
tray_output primary
|
||||
tray_padding 2
|
||||
|
||||
strip_workspace_numbers no
|
||||
@@ -375,24 +343,23 @@ bar {
|
||||
|
||||
id bar-0
|
||||
|
||||
font pango:Inconsolata, FontAwesome {{ machine.font_size }}
|
||||
font pango:JetBrainsMono, FontAwesome {{ machine.font_size }}
|
||||
|
||||
colors {
|
||||
background #272822
|
||||
statusline #ffffff
|
||||
separator #444444
|
||||
# separator #e16b40
|
||||
separator #555555
|
||||
|
||||
# focused_background #303030
|
||||
# focused_separator #272822
|
||||
focused_separator #e5b567
|
||||
focused_background #272822
|
||||
|
||||
focused_workspace #e16b40 #272822 #ffffff
|
||||
active_workspace #272822 #5f676a #ffffff
|
||||
# border bg text
|
||||
focused_workspace #e5b567 #4f676a #ffffff
|
||||
active_workspace #272822 #4f676a #ffffff
|
||||
inactive_workspace #272822 #272822 #dddddd
|
||||
urgent_workspace #D00000 #D00000 #272822
|
||||
binding_mode #272822 #e16b40 #272822
|
||||
urgent_workspace #272822 #ff7777 #272822
|
||||
binding_mode #272822 #e5b567 #272822
|
||||
}
|
||||
|
||||
i3bar_command i3bar
|
||||
status_command py3status --standalone --dbus-notify -c ~/.i3/i3status.conf
|
||||
status_command i3status-rs ~/.config/i3status-rust/config.toml
|
||||
}
|
||||
|
||||
112
i3/i3status-rust/config.toml.j2
Normal file
112
i3/i3status-rust/config.toml.j2
Normal file
@@ -0,0 +1,112 @@
|
||||
icons_format = "{icon}"
|
||||
|
||||
[icons]
|
||||
icons = "awesome"
|
||||
|
||||
[icons.overrides]
|
||||
microphone = ""
|
||||
volume = ""
|
||||
bat = "\uf240"
|
||||
music = "\uf1bc"
|
||||
|
||||
[theme]
|
||||
theme = "native"
|
||||
|
||||
[theme.overrides]
|
||||
warning_fg = "#000000"
|
||||
warning_bg = "#F4Bf75"
|
||||
critical_fg = "#000000"
|
||||
critical_bg = "#F92672"
|
||||
end_separator = ""
|
||||
|
||||
[[block]]
|
||||
block = "music"
|
||||
player = "spotify"
|
||||
separator = " — "
|
||||
format = " $icon {$combo $prev $play $next|-} "
|
||||
|
||||
[[block]]
|
||||
block = "sound"
|
||||
driver = "pulseaudio"
|
||||
max_vol = 100
|
||||
format = " $icon{ $volume.eng(w:2)|} "
|
||||
|
||||
[[block.click]]
|
||||
button = "left"
|
||||
cmd = "workstation-client pulseaudio output toggle"
|
||||
update = true
|
||||
|
||||
[[block]]
|
||||
block = "sound"
|
||||
driver = "pulseaudio"
|
||||
device_kind = "source"
|
||||
format = " $icon "
|
||||
|
||||
[block.theme_overrides]
|
||||
warning_fg = { link = "idle_fg" }
|
||||
warning_bg = { link = "idle_bg" }
|
||||
idle_fg = { link = "warning_fg" }
|
||||
idle_bg = { link = "warning_bg" }
|
||||
|
||||
[[block.click]]
|
||||
button = "left"
|
||||
cmd = "workstation-client pulseaudio input toggle"
|
||||
update = true
|
||||
|
||||
[[block]]
|
||||
block = "net"
|
||||
format = " $icon{ $signal_strength|}{ $ssid.str(max_width:10) | }"
|
||||
|
||||
[[block]]
|
||||
block = "battery"
|
||||
interval = 10
|
||||
format = " $icon $percentage $time "
|
||||
charging_format = " $icon $percentage "
|
||||
missing_format = ""
|
||||
|
||||
[[block]]
|
||||
block = "toggle"
|
||||
format = " $icon "
|
||||
signal = 1
|
||||
command_on = "workstation-client present toggle ; pkill -SIGRTMIN+1 i3status-rs"
|
||||
command_off = "workstation-client present toggle ; pkill -SIGRTMIN+1 i3status-rs"
|
||||
command_state = "[[ $(workstation-client present status) == on ]] && echo active"
|
||||
|
||||
[[block]]
|
||||
block = "toggle"
|
||||
format = " $icon "
|
||||
command_on = "workstation-client theme light"
|
||||
command_off = "workstation-client theme dark"
|
||||
command_state = "[[ $(workstation-client theme status) == light ]] && echo 1"
|
||||
|
||||
[[block]]
|
||||
block = "toggle"
|
||||
format = " $icon "
|
||||
command_on = "workstation-client redshift start"
|
||||
command_off = "workstation-client redshift stop"
|
||||
command_state = "[[ $(workstation-client redshift status) == active ]] && echo 1"
|
||||
signal = 0
|
||||
|
||||
[[block]]
|
||||
block = "toggle"
|
||||
format = " $icon "
|
||||
command_on = "workstation-client spotify start"
|
||||
command_off = "workstation-client spotify stop"
|
||||
command_state = "[[ $(workstation-client spotify status) == active ]] && echo 1"
|
||||
signal = 0
|
||||
|
||||
[[block]]
|
||||
block = "custom"
|
||||
json = true
|
||||
command = "ping -n -q -w 2 -c 1 8.8.8.8 >/dev/null 2>/dev/null && printf '{\"text\":\"\",\"state\":\"Info\"}' || printf '{\"text\":\"\",\"state\":\"Critical\"}'"
|
||||
|
||||
[[block]]
|
||||
block = "custom"
|
||||
command = "workstation-client weather get"
|
||||
# caching is handled by the workstation daemon
|
||||
interval = 60
|
||||
|
||||
[[block]]
|
||||
block = "time"
|
||||
interval = 1
|
||||
format = " $timestamp.datetime(f:'[CW %V] %a %d.%m.%Y %H:%M:%S', l:de_DE) "
|
||||
94
i3/i3status-rust/icons/awesome.toml
Normal file
94
i3/i3status-rust/icons/awesome.toml
Normal file
@@ -0,0 +1,94 @@
|
||||
# FontAwesome 4: https://fontawesome.com/v4.7.0/cheatsheet/
|
||||
backlight_empty = "\U0001f315"
|
||||
backlight_full = "\U0001f311"
|
||||
backlight_1 = "\U0001f314"
|
||||
backlight_2 = "\U0001f314"
|
||||
backlight_3 = "\U0001f314"
|
||||
backlight_4 = "\U0001f314"
|
||||
backlight_5 = "\U0001f313"
|
||||
backlight_6 = "\U0001f313"
|
||||
backlight_7 = "\U0001f313"
|
||||
backlight_8 = "\U0001f313"
|
||||
backlight_9 = "\U0001f313"
|
||||
backlight_10 = "\U0001f312"
|
||||
backlight_11 = "\U0001f312"
|
||||
backlight_12 = "\U0001f312"
|
||||
backlight_13 = "\U0001f312"
|
||||
bat_charging = "\uf1e6" # fa-plug
|
||||
bat_discharging = "\uf242" # fa-battery-half
|
||||
bat_10 = "\uf244" # fa-battery-empty
|
||||
bat_20 = "\uf243" # fa-battery-quarter
|
||||
bat_30 = "\uf243" # fa-battery-quarter
|
||||
bat_40 = "\uf243" # fa-battery-quarter
|
||||
bat_50 = "\uf242" # fa-battery-half
|
||||
bat_60 = "\uf242" # fa-battery-half
|
||||
bat_70 = "\uf241" # fa-battery-three-quarters
|
||||
bat_80 = "\uf241" # fa-battery-three-quarters
|
||||
bat_90 = "\uf241" # fa-battery-three-quarters
|
||||
bat_full = "\uf240" # fa-battery-full
|
||||
bat_not_available = "\uf244" # fa-battery-empty
|
||||
bell = "\uf0f3" # fa-bell
|
||||
bell-slash = "\uf1f7" # fa-bell-slash-o
|
||||
bluetooth = "\uf294" # fa-bluetooth-b
|
||||
calendar = "\uf073" # fa-calendar
|
||||
cogs = "\uf085" # fa-cogs
|
||||
cpu = "\uf0e4" # fa-dashboard
|
||||
cpu_boost_off = "\uf204" # fa-toggle-off
|
||||
cpu_boost_on = "\uf205" # fa-toggle-on
|
||||
disk_drive = "\uf0a0" # fa-hdd-o
|
||||
docker = "\uf21a" # fa-ship
|
||||
github = "\uf09b" # fa-github
|
||||
gpu = "\uf26c" # fa-television
|
||||
headphones = "\uf025" # fa-headphones
|
||||
joystick = "\uf11b" # fa-gamepad
|
||||
keyboard = "\uf11c" # fa-keyboard-o
|
||||
mail = "\uf0e0" # fa-envelope
|
||||
memory_mem = "\uf2db" # fa-microchip
|
||||
memory_swap = "\uf0a0" # fa-hdd-o
|
||||
mouse = "\uf245" # fa-mouse-pointer
|
||||
music = "\uf001" # fa-music
|
||||
music_next = "\uf061" # fa-arrow-right
|
||||
music_pause = "\uf04c" # fa-pause
|
||||
music_play = "\uf04b" # fa-play
|
||||
music_prev = "\uf060" # fa-arrow-left
|
||||
net_bridge = "\uf0e8" # fa-sitemap
|
||||
net_down = "\u2b07"
|
||||
net_loopback = "LO"
|
||||
net_modem = "\uf095" # fa-phone
|
||||
net_up = "\u2b06"
|
||||
net_vpn = "\uf023" # fa-lock
|
||||
net_wired = "\uf0ac" # fa-globe
|
||||
net_wireless = "\uf1eb" # fa-wifi
|
||||
notification = "\uf0a2" # fa-bell-o
|
||||
phone = "\uf10b" # fa-mobile
|
||||
phone_disconnected = "\U0001f4f5" # https://unicode-table.com/en/1F4F5/
|
||||
ping = "\u21ba"
|
||||
pomodoro = "\U0001f345"
|
||||
pomodoro_break = "\uf0f4" # fa-coffee
|
||||
pomodoro_paused = "\uf04c" # fa-pause
|
||||
pomodoro_started = "\uf04b" # fa-play
|
||||
pomodoro_stopped = "\uf04d" # fa-stop
|
||||
resolution = "\uf096" # fa-square-o
|
||||
tasks = "\uf0ae" # fa-tasks
|
||||
thermometer = "\uf2c8" # fa-thermometer-3
|
||||
time = "\uf017" # fa-clock-o
|
||||
toggle_off = "\uf204" # fa-toggle-off
|
||||
toggle_on = "\uf205" # fa-toggle-on
|
||||
unknown = "\uf128" # fa-question
|
||||
update = "\uf062" # fa-arrow-up
|
||||
uptime = "\uf017" # fa-clock-o
|
||||
volume_empty = "\uf026" # fa-volume-off
|
||||
volume_full = "\uf028" # fa-volume-up
|
||||
volume_half = "\uf027" # fa-volume-down
|
||||
volume_muted = "\uf026 \uf00d"
|
||||
microphone_empty = "\uf130" # fa-microphone
|
||||
microphone_full = "\uf130" # fa-microphone
|
||||
microphone_half = "\uf130" # fa-microphone
|
||||
microphone_muted = "\uf131" # fa-microphone-slash
|
||||
weather_clouds = "\uf0c2" # fa-cloud
|
||||
weather_default = "\uf0c2" # fa-cloud
|
||||
weather_rain = "\uf043" # fa-tint
|
||||
weather_snow = "\uf2dc" # fa-snowflake-o
|
||||
weather_sun = "\uf185" # fa-sun-o
|
||||
weather_thunder = "\uf0e7" # fa-bolt
|
||||
xrandr = "\uf26c" # fa-television
|
||||
1
i3/i3status-rust/themes/native.toml
Normal file
1
i3/i3status-rust/themes/native.toml
Normal file
@@ -0,0 +1 @@
|
||||
|
||||
@@ -1,123 +0,0 @@
|
||||
# i3status configuration file.
|
||||
# see "man i3status" for documentation.
|
||||
|
||||
# It is important that this file is edited as UTF-8.
|
||||
# The following line should contain a sharp s:
|
||||
# ß
|
||||
# If the above line is not correctly displayed, fix your editor first!
|
||||
|
||||
general {
|
||||
interval = 1
|
||||
# color = '#FFFFFF'
|
||||
# color_good = '#00FF00'
|
||||
# color_bad = '#FF0000'
|
||||
# color_degraded = '#FFFF00'
|
||||
color = '#FFFFFF'
|
||||
color_good = '#FFFFFF'
|
||||
color_bad = '#F92672'
|
||||
color_degraded = '#F4Bf75'
|
||||
}
|
||||
|
||||
|
||||
order += spotify
|
||||
{% if user.has_yubikey %}
|
||||
order += "yubikey"
|
||||
{% endif %}
|
||||
order += "volume_status output"
|
||||
order += "volume_status input"
|
||||
order += "wifi"
|
||||
order += "external_script presentation_mode"
|
||||
order += "systemd redshift"
|
||||
order += "systemd spotify"
|
||||
order += online_status
|
||||
order += "battery_level all"
|
||||
order += "clock"
|
||||
|
||||
battery_level all {
|
||||
battery_id = "all"
|
||||
format = " {icon} {percent}% "
|
||||
measurement_mode = "sys"
|
||||
charging_character = ""
|
||||
blocks = ""
|
||||
notification = true
|
||||
hide_when_full = false
|
||||
hide_seconds = true
|
||||
notify_low_level = true
|
||||
threshold_full = 95
|
||||
}
|
||||
|
||||
systemd redshift {
|
||||
unit = "redshift.service"
|
||||
user = true
|
||||
format = " "
|
||||
on_click 1 = "exec $HOME/.i3/scripts/toggle-app redshift"
|
||||
color_bad = '#F4Bf75'
|
||||
color_degraded = '#F4Bf75'
|
||||
}
|
||||
|
||||
systemd spotify {
|
||||
unit = "spotify.service"
|
||||
user = true
|
||||
format = " "
|
||||
color_bad = '#F4Bf75'
|
||||
color_degraded = '#F4Bf75'
|
||||
}
|
||||
|
||||
yubikey {
|
||||
format = '[ YubiKey[\?if=is_gpg ][\?if=is_u2f ] ]'
|
||||
}
|
||||
|
||||
clock {
|
||||
format = ["{DE}", "{NZ}", "{Cuba}", "{MX}", "{CZ}", "{NL}", "{VN}"]
|
||||
format_time = " {name} \[KW %V\] %a %d.%m.%Y %H:%M:%S "
|
||||
}
|
||||
|
||||
wifi {
|
||||
bitrate_bad = 0
|
||||
bitrate_degraded = 0
|
||||
format = " {signal_percent} {ssid} | down "
|
||||
down_color = "good"
|
||||
}
|
||||
|
||||
spotify {
|
||||
format = " {title} - {artist} "
|
||||
format_down = " off "
|
||||
format_stopped = " stopped "
|
||||
cache_timeout = 1
|
||||
color_offline = '#FFFFFF'
|
||||
on_click 1 = "exec $HOME/.i3/scripts/spotify-control toggle"
|
||||
on_click 3 = "exec $HOME/.i3/scripts/spotify-control next"
|
||||
}
|
||||
|
||||
external_script presentation_mode {
|
||||
format = " Present: {output} "
|
||||
script_path = "$HOME/.i3/scripts/presentation-mode status"
|
||||
strip_output = True
|
||||
on_click 1 = "exec $HOME/.i3/scripts/presentation-mode toggle"
|
||||
|
||||
}
|
||||
|
||||
online_status {
|
||||
icon_on = ""
|
||||
icon_off = ""
|
||||
format = " {icon} "
|
||||
}
|
||||
|
||||
volume_status output {
|
||||
cache_timeout = 10
|
||||
format = " {percentage}% "
|
||||
format_muted = " mute "
|
||||
thresholds = []
|
||||
command = "pactl"
|
||||
color_muted = '#FFFFFF'
|
||||
}
|
||||
|
||||
volume_status input {
|
||||
cache_timeout = 10
|
||||
format = " active "
|
||||
format_muted = " mute "
|
||||
thresholds = [(0, 'good'), (1, 'bad')]
|
||||
command = "pactl"
|
||||
color_muted = '#FFFFFF'
|
||||
is_input = True
|
||||
}
|
||||
@@ -1,2 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
rofi -show combi -combi-modi run -display-combi "run"
|
||||
@@ -1,9 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
if [[ "$1" ]] ; then
|
||||
modules="$1"
|
||||
else
|
||||
modules=all
|
||||
fi
|
||||
|
||||
py3-cmd refresh "$modules"
|
||||
@@ -1,103 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
### From http://www.archlinux.org/index.php/i3
|
||||
|
||||
_logfile="$LOGDIR/i3/i3exit.log"
|
||||
LOCKSCREEN="$LIBDIR/lockscreen"
|
||||
|
||||
_fallback_color="000000"
|
||||
|
||||
touch "$_logfile"
|
||||
|
||||
log()
|
||||
{
|
||||
echo "$*"
|
||||
echo "[$(date +%FT%T)] $*" >> "$_logfile"
|
||||
}
|
||||
|
||||
lock()
|
||||
{
|
||||
set -x
|
||||
playing=0
|
||||
if [[ "$(playerctl -p spotify status)" == "Playing" ]] ; then
|
||||
playing=1
|
||||
fi
|
||||
if (( $playing )) ; then
|
||||
playerctl -p spotify pause
|
||||
fi
|
||||
|
||||
if [[ -f "$LOCKSCREEN" ]] ; then
|
||||
resized_lockscreen=$(mktemp)
|
||||
convert "${LOCKSCREEN}" -resize "${MACHINE_RESOLUTION_X}x${MACHINE_RESOLUTION_Y}" "${resized_lockscreen}"
|
||||
i3lock --nofork --show-failed-attempts --ignore-empty-password \
|
||||
--image "${resized_lockscreen}"
|
||||
rm "${resized_lockscreen}"
|
||||
else
|
||||
i3lock --nofork --show-failed-attempts --ignore-empty-password \
|
||||
--color "$_fallback_color"
|
||||
fi
|
||||
if (( $playing )) ; then
|
||||
playerctl -p spotify play
|
||||
fi
|
||||
}
|
||||
|
||||
screen_off() {
|
||||
xset dpms force off
|
||||
}
|
||||
|
||||
reset_screen() {
|
||||
systemctl --user restart dpms.service
|
||||
}
|
||||
|
||||
lock_and_screen_off() {
|
||||
lock &
|
||||
_pid=$!
|
||||
dunstctl disable
|
||||
screen_off
|
||||
wait $_pid
|
||||
dunstctl enable
|
||||
reset_screen
|
||||
}
|
||||
|
||||
signal="$1"
|
||||
log "[I] Received signal \"$signal\"."
|
||||
|
||||
case "$signal" in
|
||||
lock)
|
||||
log "[I] Locking session."
|
||||
lock_and_screen_off
|
||||
;;
|
||||
logout)
|
||||
log "[I] Exiting i3."
|
||||
i3-msg exit
|
||||
;;
|
||||
suspend)
|
||||
log "[I] Suspending."
|
||||
lock &
|
||||
sleep 0.1
|
||||
systemctl suspend
|
||||
;;
|
||||
hibernate)
|
||||
log "[I] Hibernating."
|
||||
sudo systemctl hibernate
|
||||
;;
|
||||
reboot)
|
||||
log "[I] Rebooting."
|
||||
systemctl reboot
|
||||
;;
|
||||
shutdown)
|
||||
log "[I] Shutting down."
|
||||
systemctl poweroff
|
||||
;;
|
||||
screen-off)
|
||||
log "[I] Turning screen off."
|
||||
screen_off
|
||||
;;
|
||||
*)
|
||||
echo "Usage: $0 {lock|logout|suspend|hibernate|reboot|shutdown}"
|
||||
log "[E] Signal \"$signal\" unknown. Aborting."
|
||||
exit 2
|
||||
esac
|
||||
|
||||
log "[I] Done."
|
||||
exit 0
|
||||
@@ -1,137 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
# name of the sink. execute pactl list sinks to get a list
|
||||
SINKNAME="$(pactl info | grep '^Default Sink:' | cut -d ' ' -f 3-)"
|
||||
|
||||
# name of the sink. execute pactl list sinks to get a list
|
||||
SOURCENAME="$(pactl info | grep '^Default Source:' | cut -d ' ' -f 3-)"
|
||||
|
||||
#SINKNAME="alsa_output.usb-Logitech_Logitech_Wireless_Headset_88C626354D45-00.analog-stereo"
|
||||
# this is the worst
|
||||
SINK=$(( $(pactl list sinks | grep "Name: " | grep -n "${SINKNAME}"$ | grep -o "^[[:digit:]]*") -1))
|
||||
|
||||
SOURCE=$(( $(pactl list sources | grep "Name: " | grep -n "${SOURCENAME}"$ | grep -o "^[[:digit:]]*") -1))
|
||||
|
||||
|
||||
getvol() {
|
||||
echo $(pactl list sinks | grep "^[[:space:]]*Volume" | head -n $(( $SINK + 1 )) | tail -n 1 | grep -o "[[:digit:]]*%" | head -n 1 | cut -d "%" -f 1)
|
||||
}
|
||||
|
||||
setvol() {
|
||||
if [[ $1 =~ [+-][0-9]+ ]] ; then
|
||||
oldvol="$(getvol)"
|
||||
echo "oldvol $oldvol"
|
||||
delta="$(echo "$1" | cut -c 2-)"
|
||||
echo "delta $delta"
|
||||
if [[ "$(echo "$1" | cut -c 1)" == "+" ]] ; then
|
||||
echo "+"
|
||||
newvol=$(( $oldvol + $delta ))
|
||||
else
|
||||
echo "-"
|
||||
newvol=$(( $oldvol - $delta ))
|
||||
echo $newvol
|
||||
fi
|
||||
if [[ $newvol -gt 100 ]]; then
|
||||
echo "capping at 100 percent"
|
||||
newvol=100
|
||||
fi
|
||||
if [[ $newvol -lt 0 ]]; then
|
||||
echo "capping at 0 percent"
|
||||
newvol=0
|
||||
fi
|
||||
echo "newvol $newvol"
|
||||
else
|
||||
newvol="$1"
|
||||
fi
|
||||
pactl set-sink-volume $SINKNAME $(( $newvol * 65536 / 100 ))
|
||||
}
|
||||
|
||||
ismuted() {
|
||||
muted=$(pactl list sinks | grep "^[[:space:]]*Mute" | head -n $(( $SINK + 1 )) | tail -n 1 | cut -d " " -f 2)
|
||||
if [[ $muted == "no" ]]; then
|
||||
echo 0
|
||||
else
|
||||
echo 1
|
||||
fi
|
||||
}
|
||||
|
||||
mute() {
|
||||
pactl set-sink-mute $SINKNAME 1
|
||||
}
|
||||
|
||||
unmute() {
|
||||
pactl set-sink-mute $SINKNAME 0
|
||||
}
|
||||
|
||||
mute-toggle() {
|
||||
pactl set-sink-mute $SINKNAME toggle
|
||||
}
|
||||
|
||||
mute-toggle-mic() {
|
||||
pactl set-source-mute $SOURCENAME toggle
|
||||
}
|
||||
|
||||
status() {
|
||||
if [[ $(ismuted) == "1" ]] ; then
|
||||
echo "mute"
|
||||
return
|
||||
fi
|
||||
echo "$(getvol)%"
|
||||
}
|
||||
|
||||
usage() {
|
||||
echo "Usage:"
|
||||
echo
|
||||
echo "$0 get-vol"
|
||||
echo "$0 set-vol VOL_PERC"
|
||||
}
|
||||
|
||||
update_status_bar_sink() {
|
||||
~/.i3/scripts/bar-update "volume_status output"
|
||||
}
|
||||
|
||||
update_status_bar_source() {
|
||||
~/.i3/scripts/bar-update "volume_status input"
|
||||
}
|
||||
|
||||
case "$1" in
|
||||
"sink")
|
||||
echo $SINKNAME
|
||||
echo $SINK
|
||||
;;
|
||||
"get-vol")
|
||||
echo $(getvol)
|
||||
;;
|
||||
"set-vol")
|
||||
if [[ -z "$2" ]] ; then
|
||||
usage
|
||||
else
|
||||
setvol "$2"
|
||||
fi
|
||||
update_status_bar_sink
|
||||
;;
|
||||
"mute")
|
||||
mute
|
||||
update_status_bar_sink
|
||||
;;
|
||||
"unmute")
|
||||
unmute
|
||||
update_status_bar_sink
|
||||
;;
|
||||
"mute-toggle")
|
||||
mute-toggle
|
||||
update_status_bar_sink
|
||||
;;
|
||||
"mute-toggle-mic")
|
||||
mute-toggle-mic
|
||||
update_status_bar_source
|
||||
;;
|
||||
"is-muted")
|
||||
echo $(ismuted)
|
||||
;;
|
||||
"status")
|
||||
echo $(status)
|
||||
;;
|
||||
*)
|
||||
usage
|
||||
esac
|
||||
@@ -1,56 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
_status_file="${XDG_RUNTIME_DIR}/presentation-mode-on"
|
||||
_autostart="$HOME/.autostart.sh"
|
||||
|
||||
is_on() {
|
||||
[[ -e "${_status_file}" ]]
|
||||
}
|
||||
|
||||
switch_on() {
|
||||
touch "${_status_file}"
|
||||
dunstctl disable &
|
||||
systemctl --user --no-block stop redshift.service
|
||||
systemctl --user --no-block stop spotify.service
|
||||
~/.i3/scripts/bar-update "external_script presentation_mode"
|
||||
~/.i3/scripts/bar-update "systemd redshift"
|
||||
~/.i3/scripts/bar-update "systemd spotify"
|
||||
}
|
||||
|
||||
switch_off() {
|
||||
rm -f "${_status_file}"
|
||||
dunstctl enable &
|
||||
systemctl --user --no-block start redshift.service
|
||||
systemctl --user --no-block start spotify.service
|
||||
~/.i3/scripts/bar-update "external_script presentation_mode"
|
||||
~/.i3/scripts/bar-update "systemd redshift"
|
||||
~/.i3/scripts/bar-update "systemd spotify"
|
||||
}
|
||||
|
||||
|
||||
case "$1" in
|
||||
status)
|
||||
if is_on ; then
|
||||
printf "on\n"
|
||||
printf '#F4BF75'
|
||||
else
|
||||
printf "off\n"
|
||||
# printf '#F4BF75'
|
||||
fi
|
||||
;;
|
||||
toggle)
|
||||
if is_on ; then
|
||||
switch_off
|
||||
else
|
||||
switch_on
|
||||
fi
|
||||
;;
|
||||
off)
|
||||
switch_off
|
||||
;;
|
||||
on)
|
||||
switch_on
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
@@ -1,19 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
options=(
|
||||
"lock"
|
||||
"logout"
|
||||
"suspend"
|
||||
"hibernate"
|
||||
"reboot"
|
||||
"shutdown"
|
||||
"screen-off")
|
||||
|
||||
i=1
|
||||
output=$(
|
||||
for option in "${options[@]}"; do
|
||||
echo "($i) $option"
|
||||
(( i++ ))
|
||||
done | rofi -dmenu -p "action" -no-custom)
|
||||
|
||||
[[ "$output" ]] && "$(dirname "$0")"/i3exit "${output#(*) }"
|
||||
@@ -1,20 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
case "$1" in
|
||||
toggle)
|
||||
cmd="play-pause"
|
||||
;;
|
||||
next)
|
||||
cmd="next"
|
||||
;;
|
||||
previous)
|
||||
cmd="previous"
|
||||
;;
|
||||
*)
|
||||
echo "wrong argument $1"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
playerctl -p spotify "${cmd}"
|
||||
~/.i3/scripts/bar-update spotify
|
||||
@@ -1,20 +0,0 @@
|
||||
#!/usr/bin/env python3
|
||||
import dbus
|
||||
session_bus = dbus.SessionBus()
|
||||
spotify_bus = session_bus.get_object("org.mpris.MediaPlayer2.spotify",
|
||||
"/org/mpris/MediaPlayer2")
|
||||
spotify_properties = dbus.Interface(spotify_bus,
|
||||
"org.freedesktop.DBus.Properties")
|
||||
metadata = spotify_properties.Get("org.mpris.MediaPlayer2.Player", "Metadata")
|
||||
|
||||
# The property Metadata behaves like a python dict
|
||||
# for key, value in metadata.items():
|
||||
# print(key, value)
|
||||
|
||||
# To just print the title
|
||||
print("{}: {} - [{}]".format(
|
||||
metadata['xesam:artist'][0],
|
||||
metadata['xesam:title'],
|
||||
metadata['xesam:album']
|
||||
))
|
||||
|
||||
59
i3/scripts/swap-from-workspace
Executable file
59
i3/scripts/swap-from-workspace
Executable file
@@ -0,0 +1,59 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -o nounset
|
||||
set -o errexit
|
||||
set -o pipefail
|
||||
set -o xtrace
|
||||
|
||||
cmds=()
|
||||
|
||||
workspacescratch="${1}"
|
||||
|
||||
i3msgworkspaces="$(i3-msg -t get_workspaces)"
|
||||
|
||||
output_of_pim=$(printf '%s' "${i3msgworkspaces}" | jq -r 'map(select(.name == "'"${workspacescratch}"'")) | .[0].output')
|
||||
|
||||
active_workspace_on_target_output=$(printf '%s' "${i3msgworkspaces}" | jq -r 'map(select(.output == "'"${output_of_pim}"'" and .visible)) | .[0].name')
|
||||
|
||||
focused_workspace_name=$(printf '%s' "${i3msgworkspaces}" | jq -r 'map(select(.focused)) | .[0].name')
|
||||
focused_workspace_output=$(printf '%s' "${i3msgworkspaces}" | jq -r 'map(select(.focused)) | .[0].output')
|
||||
|
||||
if [[ "${focused_workspace_name}" == "${workspacescratch}" ]]; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
cmds+=('unmark _destination')
|
||||
cmds+=('mark _source')
|
||||
|
||||
if [[ "${active_workspace_on_target_output}" != "${workspacescratch}" ]] && [[ "${output_of_pim}" != "${focused_workspace_output}" ]]; then
|
||||
need_output_reset=1
|
||||
else
|
||||
need_output_reset=0
|
||||
fi
|
||||
|
||||
if ((need_output_reset)); then
|
||||
cmds+=('workspace "'"${active_workspace_on_target_output}"'"')
|
||||
cmds+=("mark --add _origin")
|
||||
fi
|
||||
|
||||
cmds+=('workspace "'"${workspacescratch}"'"')
|
||||
cmds+=('mark --add _destination')
|
||||
|
||||
cmds+=('[con_mark="^_destination$"] swap container with mark "_source"')
|
||||
|
||||
cmds+=('[con_mark="^_source$"] focus')
|
||||
cmds+=('unmark _source')
|
||||
|
||||
if ((need_output_reset)); then
|
||||
cmds+=('[con_mark="^_origin$"] focus')
|
||||
cmds+=('unmark _origin')
|
||||
fi
|
||||
|
||||
cmds+=('[con_mark="^_destination$"] focus')
|
||||
cmds+=('unmark _destination')
|
||||
|
||||
i3msgcmd=""
|
||||
for cmd in "${cmds[@]}"; do
|
||||
i3msgcmd="${i3msgcmd}${cmd};"
|
||||
done
|
||||
i3-msg "${i3msgcmd}"
|
||||
@@ -1,17 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
app="${1:?app missing}"
|
||||
|
||||
unitname="${app}.service"
|
||||
|
||||
running() {
|
||||
systemctl --user --quiet status "${unitname}" >/dev/null
|
||||
}
|
||||
|
||||
if running ; then
|
||||
systemctl --user stop "${unitname}"
|
||||
else
|
||||
systemctl --user start "${unitname}"
|
||||
fi
|
||||
|
||||
py3-cmd refresh "systemd $app"
|
||||
85
install.sh
85
install.sh
@@ -8,39 +8,25 @@
|
||||
set -o errexit
|
||||
set -o nounset
|
||||
|
||||
# Make sure to standardize locale, regardless of the machine config
|
||||
#
|
||||
# Having a different locale broke "yes | pacman -S" to force-install
|
||||
# iptables, for example
|
||||
export LC_ALL="en_US.UTF-8"
|
||||
|
||||
DOTDIR="/var/lib/dotfiles"
|
||||
_SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
|
||||
|
||||
[[ -e './.git' ]] && git submodule update --init
|
||||
|
||||
if [[ "$(readlink "${_SCRIPT_DIR}")" != "${DOTDIR}" ]] && [[ "${_SCRIPT_DIR}" != "${DOTDIR}" ]] ; then
|
||||
if [[ -e "${DOTDIR}" ]] ; then
|
||||
2>&1 printf "${DOTDIR} already exists. This seems unsafe.\n"
|
||||
exit 1
|
||||
fi
|
||||
printf "Moving directory to $DOTDIR ...\n"
|
||||
sudo=""
|
||||
if (( $(id -u ) != 0 )) ; then
|
||||
sudo=sudo
|
||||
fi
|
||||
$sudo mv --no-target-directory "${_SCRIPT_DIR}" "${DOTDIR}"
|
||||
printf "Done\n"
|
||||
else
|
||||
printf "Already working in ${DOTDIR}, nothing to do\n"
|
||||
fi
|
||||
|
||||
cd "${DOTDIR}"
|
||||
|
||||
os_release_file=/etc/os-release
|
||||
if [[ ! -e "${os_release_file}" ]] ; then
|
||||
2>&1 printf "Could not find ${os_release_file}, exiting"
|
||||
2>&1 printf 'Could not find %, exiting\n' "${os_release_file}"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
source /etc/os-release
|
||||
# shellcheck source=/etc/os-release
|
||||
source "${os_release_file}"
|
||||
|
||||
sudowrap() {
|
||||
if (( $(id -u ) != 0 )) ; then
|
||||
if (( $(id -u) != 0 )) ; then
|
||||
sudo "${@}"
|
||||
else
|
||||
"${@}"
|
||||
@@ -48,51 +34,22 @@ sudowrap() {
|
||||
}
|
||||
|
||||
cache_updated=0
|
||||
_install() {
|
||||
_package="$1" ; shift
|
||||
if [[ $NAME == "Ubuntu" ]] ; then
|
||||
if ! (( cache_updated )) ; then
|
||||
apt-get update
|
||||
install() {
|
||||
local package="$1" ; shift
|
||||
|
||||
if [[ $NAME == "Arch Linux" ]] ; then
|
||||
if (( ! cache_updated )) ; then
|
||||
sudowrap pacman -Sy
|
||||
cache_updated=1
|
||||
fi
|
||||
sudowrap apt-get install --assume-yes "${_package}"
|
||||
elif [[ $NAME == "Arch Linux" ]] ; then
|
||||
sudowrap pacman -S --noconfirm "${_package}"
|
||||
sudowrap pacman -S --needed --noconfirm "${package}"
|
||||
else
|
||||
2>&1 printf "Unsupported distro $NAME, exiting"
|
||||
2>&1 printf 'Unsupported distro %s, exiting\n' "$NAME"
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
command -v make >/dev/null || install "make"
|
||||
command -v ansible >/dev/null || install "ansible"
|
||||
|
||||
if ! command -v python3 >/dev/null ; then
|
||||
printf 'Python3 not installed, installing ...\n'
|
||||
_install "python3"
|
||||
_install "python3-venv"
|
||||
printf 'Done\n'
|
||||
fi
|
||||
|
||||
if ! command -v make >/dev/null ; then
|
||||
printf 'Make not installed, installing ...\n'
|
||||
_install "make"
|
||||
printf 'Done\n'
|
||||
fi
|
||||
|
||||
# Required for compiling modules in venv.
|
||||
if ! command -v gcc >/dev/null ; then
|
||||
printf 'gcc not installed, installing ...\n'
|
||||
_install "gcc"
|
||||
printf 'Done\n'
|
||||
fi
|
||||
|
||||
if ! python3 -c 'import venv' 2>/dev/null ; then
|
||||
printf 'Python3 venv module not installed, installing ...\n'
|
||||
_install python3-venv
|
||||
printf 'Done\n'
|
||||
fi
|
||||
|
||||
cd "$DOTDIR" && make
|
||||
|
||||
# fix permissions of the directory
|
||||
sudowrap chgrp -R dotfiles "${DOTDIR}"
|
||||
sudowrap chmod g+wX "${DOTDIR}"
|
||||
cd "${DOTDIR}" && make
|
||||
|
||||
@@ -1,24 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -o nounset
|
||||
set -o errexit
|
||||
|
||||
pacman -Sy --noconfirm git # yes its a partial upgrade, but thats just the live cd
|
||||
|
||||
cd /root
|
||||
git clone --recursive https://code.hkoerber.de/hannes/dotfiles.git
|
||||
|
||||
./dotfiles/install_scripts/ares.sh /dev/sda
|
||||
|
||||
mv /root/dotfiles /mnt/root/dotfiles
|
||||
cat << EOF > /mnt/root/.bash_profile
|
||||
if /root/dotfiles/install.sh ; then
|
||||
rm -f /root/.bash_profile
|
||||
reboot
|
||||
fi
|
||||
EOF
|
||||
|
||||
umount -R /mnt
|
||||
|
||||
read -p "> Ready for reboot. Press enter for shutdown, then remove the installation media and boot again "
|
||||
poweroff
|
||||
@@ -1,22 +1,18 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
# Parameters:
|
||||
#
|
||||
# $1: Device
|
||||
|
||||
set -o xtrace
|
||||
set -o nounset
|
||||
set -o errexit
|
||||
|
||||
DEVICE="${1:?}"
|
||||
DEVICE="/dev/sda"
|
||||
|
||||
if [[ ! -b "${DEVICE}" ]] ; then
|
||||
printf '%s does not look like a device' "${DEVICE}"
|
||||
printf '%s does not look like a device\n' "${DEVICE}"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ ! -d /sys/firmware/efi/efivars ]] ; then
|
||||
printf 'efivars does not exist, looks like the system is not booted in EFI mode'
|
||||
printf 'efivars does not exist, looks like the system is not booted in EFI mode\n'
|
||||
exit 1
|
||||
fi
|
||||
|
||||
@@ -36,8 +32,10 @@ EOF
|
||||
# might take a bit for the new partion table to be updated in-kernel
|
||||
sleep 1
|
||||
|
||||
cryptsetup --batch-mode luksFormat --iter-time 1000 ${DEVICE}3
|
||||
cryptsetup --batch-mode open ${DEVICE}3 cryptpart
|
||||
while : ; do
|
||||
cryptsetup --batch-mode luksFormat --iter-time 1000 ${DEVICE}3
|
||||
cryptsetup --batch-mode open --tries 1 ${DEVICE}3 cryptpart && break
|
||||
done
|
||||
|
||||
pvcreate /dev/mapper/cryptpart
|
||||
vgcreate vgbase /dev/mapper/cryptpart
|
||||
@@ -106,6 +104,32 @@ grub-mkconfig -o /boot/grub/grub.cfg
|
||||
systemctl enable NetworkManager
|
||||
|
||||
passwd
|
||||
|
||||
# enable root autologin on first boot
|
||||
|
||||
mkdir /etc/systemd/system/getty@tty1.service.d/
|
||||
cat << EOF > /etc/systemd/system/getty@tty1.service.d/autologin.conf
|
||||
[Service]
|
||||
ExecStart=
|
||||
ExecStart=-/sbin/agetty -o '-p -f -- \\u' --noclear --autologin root %I $TERM
|
||||
EOF
|
||||
# ExecStartPost=/bin/rm /etc/systemd/system/getty@tty1.service.d/autologin.conf
|
||||
# ExecStartPost=/bin/rmdir /etc/systemd/system/getty@tty1.service.d/
|
||||
|
||||
# Run
|
||||
cat << 'EOF' > /root/.bash_profile
|
||||
if [[ "\$(tty)" == "/dev/tty1" ]] ; then
|
||||
while ! ping -w 3 -c 3 8.8.8.8 ; do
|
||||
nmtui
|
||||
sleep 5
|
||||
done
|
||||
rm -rf /etc/systemd/system/getty@tty1.service.d/
|
||||
if /var/lib/dotfiles/install.sh ; then
|
||||
rm -f /root/.bash_profile
|
||||
reboot
|
||||
fi
|
||||
fi
|
||||
EOF
|
||||
CHROOTSCRIPT
|
||||
|
||||
chmod +x /mnt/chroot-script.sh
|
||||
|
||||
19
install_scripts/bootstrap.sh
Executable file
19
install_scripts/bootstrap.sh
Executable file
@@ -0,0 +1,19 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -o nounset
|
||||
set -o errexit
|
||||
|
||||
host="${1}" ; shift
|
||||
|
||||
pacman -Sy --noconfirm git # yes its a partial upgrade, but thats just the live cd
|
||||
|
||||
cd /root
|
||||
git clone --recursive https://code.hkoerber.de/hannes/dotfiles.git
|
||||
|
||||
./dotfiles/install_scripts/"${host}".sh
|
||||
|
||||
mv /root/dotfiles /mnt/var/lib/dotfiles
|
||||
|
||||
read -rp "> Ready for reboot. Press enter for shutdown, then remove the installation media and boot again "
|
||||
|
||||
poweroff
|
||||
137
install_scripts/dionysus.sh
Executable file
137
install_scripts/dionysus.sh
Executable file
@@ -0,0 +1,137 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -o xtrace
|
||||
set -o nounset
|
||||
set -o errexit
|
||||
|
||||
DEVICE="/dev/nvme0n1"
|
||||
|
||||
if [[ ! -b "${DEVICE}" ]] ; then
|
||||
printf '%s does not look like a device\n' "${DEVICE}"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ ! -d /sys/firmware/efi/efivars ]] ; then
|
||||
printf 'efivars does not exist, looks like the system is not booted in EFI mode\n'
|
||||
exit 1
|
||||
fi
|
||||
|
||||
loadkeys de-latin1
|
||||
|
||||
timedatectl set-ntp true
|
||||
|
||||
sed -e 's/\s*\([^#]*\).*/\1/' << EOF | sfdisk ${DEVICE}
|
||||
label: gpt
|
||||
device: ${DEVICE}
|
||||
|
||||
${DEVICE}p1 : name=uefi , size=512M , type=uefi
|
||||
${DEVICE}p2 : name=boot , size=512M , type=linux
|
||||
${DEVICE}p3 : name=cryptpart , type=linux
|
||||
EOF
|
||||
|
||||
# might take a bit for the new partion table to be updated in-kernel
|
||||
sleep 1
|
||||
|
||||
while : ; do
|
||||
cryptsetup --batch-mode luksFormat --iter-time 1000 ${DEVICE}p3
|
||||
cryptsetup --batch-mode open --tries 1 ${DEVICE}p3 cryptpart && break
|
||||
done
|
||||
|
||||
pvcreate /dev/mapper/cryptpart
|
||||
vgcreate vgbase /dev/mapper/cryptpart
|
||||
|
||||
lvcreate -L 16G vgbase -n swap
|
||||
lvcreate -l 100%FREE vgbase -n root
|
||||
|
||||
yes | mkfs.fat -F32 ${DEVICE}p1
|
||||
yes | mkfs.ext4 ${DEVICE}p2
|
||||
yes | mkfs.ext4 /dev/vgbase/swap
|
||||
yes | mkfs.ext4 /dev/vgbase/root
|
||||
|
||||
mount /dev/vgbase/root /mnt
|
||||
|
||||
mkdir /mnt/efi
|
||||
mount ${DEVICE}p1 /mnt/efi
|
||||
|
||||
mkdir /mnt/boot
|
||||
mount ${DEVICE}p2 /mnt/boot
|
||||
|
||||
mkswap /dev/vgbase/swap
|
||||
swapon /dev/vgbase/swap
|
||||
|
||||
pacstrap /mnt base linux-zen linux-firmware networkmanager intel-ucode lvm2 grub efibootmgr
|
||||
|
||||
genfstab -U /mnt >> /mnt/etc/fstab
|
||||
|
||||
cat << CHROOTSCRIPT > /mnt/chroot-script.sh
|
||||
|
||||
set -o xtrace
|
||||
set -o errexit
|
||||
set -o nounset
|
||||
|
||||
ln -sf /usr/share/zoneinfo/Europe/Berlin /etc/localtime
|
||||
hwclock --systohc
|
||||
|
||||
sed -i 's/^#de_DE.UTF-8 UTF-8/de_DE.UTF-8 UTF-8/' /etc/locale.gen
|
||||
sed -i 's/^#en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen
|
||||
|
||||
locale-gen
|
||||
|
||||
printf 'LANG=en_US.UTF-8\n' > /etc/locale.conf
|
||||
|
||||
printf 'KEYMAP=de-latin1\nFONT=lat2-16\n' > /etc/vconsole.conf
|
||||
|
||||
printf 'dionysus\n' > /etc/hostname
|
||||
|
||||
cat <<EOF > /etc/hosts
|
||||
127.0.0.1 localhost
|
||||
::1 localhost
|
||||
127.0.1.1 dionysus
|
||||
EOF
|
||||
|
||||
sed -i 's/^HOOKS=.*$/HOOKS=(base udev autodetect keyboard keymap consolefont modconf block encrypt lvm2 filesystems resume fsck)/' /etc/mkinitcpio.conf
|
||||
|
||||
mkinitcpio -P
|
||||
|
||||
grub-install --target=x86_64-efi --efi-directory=/efi --bootloader-id=GRUB
|
||||
|
||||
sed -i "s/^GRUB_CMDLINE_LINUX=.*$/GRUB_CMDLINE_LINUX=\"cryptdevice=UUID=\$(blkid -s UUID -o value ${DEVICE}p3):cryptpart root=UUID=\$(blkid -s UUID -o value /dev/vgbase/root)\"/" /etc/default/grub
|
||||
sed -i "s/^GRUB_CMDLINE_LINUX_DEFAULT=.*$/GRUB_CMDLINE_LINUX_DEFAULT=\"resume=UUID=\$(blkid -s UUID -o value /dev/vgbase/swap)\"/" /etc/default/grub
|
||||
sed -i 's/^GRUB_DISABLE_RECOVERY=.*$/GRUB_DISABLE_RECOVERY=/' /etc/default/grub
|
||||
|
||||
grub-mkconfig -o /boot/grub/grub.cfg
|
||||
|
||||
systemctl enable NetworkManager
|
||||
|
||||
passwd
|
||||
|
||||
# enable root autologin on first boot
|
||||
|
||||
mkdir /etc/systemd/system/getty@tty1.service.d/
|
||||
cat << EOF > /etc/systemd/system/getty@tty1.service.d/autologin.conf
|
||||
[Service]
|
||||
ExecStart=
|
||||
ExecStart=-/sbin/agetty -o '-p -f -- \\u' --noclear --autologin root %I $TERM
|
||||
EOF
|
||||
# ExecStartPost=/bin/rm /etc/systemd/system/getty@tty1.service.d/autologin.conf
|
||||
# ExecStartPost=/bin/rmdir /etc/systemd/system/getty@tty1.service.d/
|
||||
|
||||
# Run
|
||||
cat << 'EOF' > /root/.bash_profile
|
||||
if [[ "\$(tty)" == "/dev/tty1" ]] ; then
|
||||
while ! ping -w 3 -c 3 8.8.8.8 ; do
|
||||
nmtui
|
||||
sleep 5
|
||||
done
|
||||
rm -rf /etc/systemd/system/getty@tty1.service.d/
|
||||
if /var/lib/dotfiles/install.sh ; then
|
||||
rm -f /root/.bash_profile
|
||||
reboot
|
||||
fi
|
||||
fi
|
||||
EOF
|
||||
CHROOTSCRIPT
|
||||
|
||||
chmod +x /mnt/chroot-script.sh
|
||||
arch-chroot /mnt /chroot-script.sh
|
||||
rm -f /mnt/chroot-script.sh
|
||||
130
install_scripts/hera.sh
Executable file
130
install_scripts/hera.sh
Executable file
@@ -0,0 +1,130 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -o xtrace
|
||||
set -o nounset
|
||||
set -o errexit
|
||||
|
||||
DEVICE="/dev/nvme0n1"
|
||||
|
||||
if [[ ! -b "${DEVICE}" ]] ; then
|
||||
printf '%s does not look like a device\n' "${DEVICE}"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ ! -d /sys/firmware/efi/efivars ]] ; then
|
||||
printf 'efivars does not exist, looks like the system is not booted in EFI mode\n'
|
||||
exit 1
|
||||
fi
|
||||
|
||||
loadkeys de-latin1
|
||||
|
||||
timedatectl set-ntp true
|
||||
|
||||
sed -e 's/\s*\([^#]*\).*/\1/' << EOF | sfdisk ${DEVICE}
|
||||
label: gpt
|
||||
device: ${DEVICE}
|
||||
|
||||
${DEVICE}p1 : name=uefi, size=512M , type=uefi
|
||||
${DEVICE}p2 : name=boot, size=512M , type=linux
|
||||
${DEVICE}p3 : name=swap, size=16G , type=linux
|
||||
${DEVICE}p4 : name=root, size=60G , type=linux
|
||||
${DEVICE}p5 : name=home, type=linux
|
||||
EOF
|
||||
|
||||
# might take a bit for the new partion table to be updated in-kernel
|
||||
sleep 1
|
||||
|
||||
yes | mkfs.fat -F32 /dev/disk/by-partlabel/uefi
|
||||
yes | mkfs.ext4 /dev/disk/by-partlabel/boot
|
||||
yes | mkfs.ext4 /dev/disk/by-partlabel/root
|
||||
yes | mkfs.ext4 /dev/disk/by-partlabel/home
|
||||
|
||||
mkswap /dev/disk/by-partlabel/swap
|
||||
swapon /dev/disk/by-partlabel/swap
|
||||
|
||||
mount /dev/disk/by-partlabel/root /mnt
|
||||
|
||||
mkdir /mnt/efi
|
||||
mount /dev/disk/by-partlabel/uefi /mnt/efi
|
||||
|
||||
mkdir /mnt/boot
|
||||
mount /dev/disk/by-partlabel/boot /mnt/boot
|
||||
|
||||
mkdir /mnt/home
|
||||
mount /dev/disk/by-partlabel/home /mnt/home
|
||||
|
||||
pacstrap /mnt base linux-zen linux-firmware networkmanager intel-ucode grub efibootmgr
|
||||
|
||||
genfstab -U /mnt >> /mnt/etc/fstab
|
||||
|
||||
cat << CHROOTSCRIPT > /mnt/chroot-script.sh
|
||||
|
||||
set -o xtrace
|
||||
set -o errexit
|
||||
set -o nounset
|
||||
|
||||
ln -sf /usr/share/zoneinfo/Europe/Berlin /etc/localtime
|
||||
hwclock --systohc
|
||||
|
||||
sed -i 's/^#de_DE.UTF-8 UTF-8/de_DE.UTF-8 UTF-8/' /etc/locale.gen
|
||||
sed -i 's/^#en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen
|
||||
|
||||
locale-gen
|
||||
|
||||
printf 'LANG=de_DE.UTF-8\n' > /etc/locale.conf
|
||||
|
||||
printf 'KEYMAP=de-latin1\nFONT=lat2-16\n' > /etc/vconsole.conf
|
||||
|
||||
printf 'hera\n' > /etc/hostname
|
||||
|
||||
cat <<EOF > /etc/hosts
|
||||
127.0.0.1 localhost
|
||||
::1 localhost
|
||||
127.0.1.1 hera
|
||||
EOF
|
||||
|
||||
sed -i 's/^HOOKS=.*$/HOOKS=(base udev autodetect keyboard keymap consolefont modconf block filesystems resume fsck)/' /etc/mkinitcpio.conf
|
||||
|
||||
mkinitcpio -P
|
||||
|
||||
grub-install --target=x86_64-efi --efi-directory=/efi --bootloader-id=GRUB
|
||||
|
||||
sed -i 's/^GRUB_DISABLE_RECOVERY=.*$/GRUB_DISABLE_RECOVERY=/' /etc/default/grub
|
||||
sed -i "s/^GRUB_CMDLINE_LINUX_DEFAULT=.*$/GRUB_CMDLINE_LINUX_DEFAULT=\"resume=UUID=\$(blkid -s UUID -o value /dev/disk/by-partlabel/swap)\"/" /etc/default/grub
|
||||
|
||||
grub-mkconfig -o /boot/grub/grub.cfg
|
||||
|
||||
systemctl enable NetworkManager
|
||||
|
||||
passwd
|
||||
|
||||
# enable root autologin on first boot
|
||||
|
||||
mkdir /etc/systemd/system/getty@tty1.service.d/
|
||||
cat << EOF > /etc/systemd/system/getty@tty1.service.d/autologin.conf
|
||||
[Service]
|
||||
ExecStart=
|
||||
ExecStart=-/sbin/agetty -o '-p -f -- \\u' --noclear --autologin root %I $TERM
|
||||
EOF
|
||||
# ExecStartPost=/bin/rm /etc/systemd/system/getty@tty1.service.d/autologin.conf
|
||||
# ExecStartPost=/bin/rmdir /etc/systemd/system/getty@tty1.service.d/
|
||||
|
||||
# Run
|
||||
cat << 'EOF' > /root/.bash_profile
|
||||
if [[ "\$(tty)" == "/dev/tty1" ]] ; then
|
||||
while ! ping -w 3 -c 3 8.8.8.8 ; do
|
||||
nmtui
|
||||
sleep 5
|
||||
done
|
||||
rm -rf /etc/systemd/system/getty@tty1.service.d/
|
||||
if /var/lib/dotfiles/install.sh ; then
|
||||
rm -f /root/.bash_profile
|
||||
reboot
|
||||
fi
|
||||
fi
|
||||
EOF
|
||||
CHROOTSCRIPT
|
||||
|
||||
chmod +x /mnt/chroot-script.sh
|
||||
arch-chroot /mnt /chroot-script.sh
|
||||
rm -f /mnt/chroot-script.sh
|
||||
137
install_scripts/neptune.sh
Executable file
137
install_scripts/neptune.sh
Executable file
@@ -0,0 +1,137 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -o xtrace
|
||||
set -o nounset
|
||||
set -o errexit
|
||||
|
||||
DEVICE="/dev/nvme0n1"
|
||||
|
||||
if [[ ! -b "${DEVICE}" ]] ; then
|
||||
printf '%s does not look like a device\n' "${DEVICE}"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ ! -d /sys/firmware/efi/efivars ]] ; then
|
||||
printf 'efivars does not exist, looks like the system is not booted in EFI mode\n'
|
||||
exit 1
|
||||
fi
|
||||
|
||||
loadkeys de-latin1
|
||||
|
||||
timedatectl set-ntp true
|
||||
|
||||
sed -e 's/\s*\([^#]*\).*/\1/' << EOF | sfdisk ${DEVICE}
|
||||
label: gpt
|
||||
device: ${DEVICE}
|
||||
|
||||
${DEVICE}p1 : name=uefi , size=512M , type=uefi
|
||||
${DEVICE}p2 : name=boot , size=512M , type=linux
|
||||
${DEVICE}p3 : name=cryptpart , type=linux
|
||||
EOF
|
||||
|
||||
# might take a bit for the new partion table to be updated in-kernel
|
||||
sleep 1
|
||||
|
||||
while : ; do
|
||||
cryptsetup --batch-mode luksFormat --iter-time 1000 ${DEVICE}p3
|
||||
cryptsetup --batch-mode open --tries 1 ${DEVICE}p3 cryptpart && break
|
||||
done
|
||||
|
||||
pvcreate /dev/mapper/cryptpart
|
||||
vgcreate vgbase /dev/mapper/cryptpart
|
||||
|
||||
lvcreate -L 32G vgbase -n swap
|
||||
lvcreate -l 100%FREE vgbase -n root
|
||||
|
||||
yes | mkfs.fat -F32 ${DEVICE}p1
|
||||
yes | mkfs.ext4 ${DEVICE}p2
|
||||
yes | mkfs.ext4 /dev/vgbase/swap
|
||||
yes | mkfs.ext4 /dev/vgbase/root
|
||||
|
||||
mount /dev/vgbase/root /mnt
|
||||
|
||||
mkdir /mnt/efi
|
||||
mount ${DEVICE}p1 /mnt/efi
|
||||
|
||||
mkdir /mnt/boot
|
||||
mount ${DEVICE}p2 /mnt/boot
|
||||
|
||||
mkswap /dev/vgbase/swap
|
||||
swapon /dev/vgbase/swap
|
||||
|
||||
pacstrap /mnt base linux-zen linux-firmware networkmanager intel-ucode lvm2 grub efibootmgr
|
||||
|
||||
genfstab -U /mnt >> /mnt/etc/fstab
|
||||
|
||||
cat << CHROOTSCRIPT > /mnt/chroot-script.sh
|
||||
|
||||
set -o xtrace
|
||||
set -o errexit
|
||||
set -o nounset
|
||||
|
||||
ln -sf /usr/share/zoneinfo/Europe/Berlin /etc/localtime
|
||||
hwclock --systohc
|
||||
|
||||
sed -i 's/^#de_DE.UTF-8 UTF-8/de_DE.UTF-8 UTF-8/' /etc/locale.gen
|
||||
sed -i 's/^#en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen
|
||||
|
||||
locale-gen
|
||||
|
||||
printf 'LANG=en_US.UTF-8\n' > /etc/locale.conf
|
||||
|
||||
printf 'KEYMAP=de-latin1\nFONT=lat2-16\n' > /etc/vconsole.conf
|
||||
|
||||
printf 'neptune\n' > /etc/hostname
|
||||
|
||||
cat <<EOF > /etc/hosts
|
||||
127.0.0.1 localhost
|
||||
::1 localhost
|
||||
127.0.1.1 neptune
|
||||
EOF
|
||||
|
||||
sed -i 's/^HOOKS=.*$/HOOKS=(base udev autodetect keyboard keymap consolefont modconf block encrypt lvm2 filesystems resume fsck)/' /etc/mkinitcpio.conf
|
||||
|
||||
mkinitcpio -P
|
||||
|
||||
grub-install --target=x86_64-efi --efi-directory=/efi --bootloader-id=GRUB
|
||||
|
||||
sed -i "s/^GRUB_CMDLINE_LINUX=.*$/GRUB_CMDLINE_LINUX=\"cryptdevice=UUID=\$(blkid -s UUID -o value ${DEVICE}p3):cryptpart root=UUID=\$(blkid -s UUID -o value /dev/vgbase/root)\"/" /etc/default/grub
|
||||
sed -i "s/^GRUB_CMDLINE_LINUX_DEFAULT=.*$/GRUB_CMDLINE_LINUX_DEFAULT=\"resume=UUID=\$(blkid -s UUID -o value /dev/vgbase/swap)\"/" /etc/default/grub
|
||||
sed -i 's/^GRUB_DISABLE_RECOVERY=.*$/GRUB_DISABLE_RECOVERY=/' /etc/default/grub
|
||||
|
||||
grub-mkconfig -o /boot/grub/grub.cfg
|
||||
|
||||
systemctl enable NetworkManager
|
||||
|
||||
passwd
|
||||
|
||||
# enable root autologin on first boot
|
||||
|
||||
mkdir /etc/systemd/system/getty@tty1.service.d/
|
||||
cat << EOF > /etc/systemd/system/getty@tty1.service.d/autologin.conf
|
||||
[Service]
|
||||
ExecStart=
|
||||
ExecStart=-/sbin/agetty -o '-p -f -- \\u' --noclear --autologin root %I $TERM
|
||||
EOF
|
||||
# ExecStartPost=/bin/rm /etc/systemd/system/getty@tty1.service.d/autologin.conf
|
||||
# ExecStartPost=/bin/rmdir /etc/systemd/system/getty@tty1.service.d/
|
||||
|
||||
# Run
|
||||
cat << 'EOF' > /root/.bash_profile
|
||||
if [[ "\$(tty)" == "/dev/tty1" ]] ; then
|
||||
while ! ping -w 3 -c 3 8.8.8.8 ; do
|
||||
nmtui
|
||||
sleep 5
|
||||
done
|
||||
rm -rf /etc/systemd/system/getty@tty1.service.d/
|
||||
if /var/lib/dotfiles/install.sh ; then
|
||||
rm -f /root/.bash_profile
|
||||
reboot
|
||||
fi
|
||||
fi
|
||||
EOF
|
||||
CHROOTSCRIPT
|
||||
|
||||
chmod +x /mnt/chroot-script.sh
|
||||
arch-chroot /mnt /chroot-script.sh
|
||||
rm -f /mnt/chroot-script.sh
|
||||
13
maintenance.sh
Executable file
13
maintenance.sh
Executable file
@@ -0,0 +1,13 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -o nounset
|
||||
set -o errexit
|
||||
|
||||
sudo pacman -Syu
|
||||
|
||||
./update-aur-pkgs.sh
|
||||
|
||||
ANSIBLE_DISPLAY_OK_HOSTS=false \
|
||||
ANSIBLE_DISPLAY_SKIPPED_HOSTS=false \
|
||||
ANSIBLE_EXTRA_ARGS='' \
|
||||
make
|
||||
1
mgr/.gitignore
vendored
Normal file
1
mgr/.gitignore
vendored
Normal file
@@ -0,0 +1 @@
|
||||
/target
|
||||
503
mgr/Cargo.lock
generated
Normal file
503
mgr/Cargo.lock
generated
Normal file
@@ -0,0 +1,503 @@
|
||||
# This file is automatically @generated by Cargo.
|
||||
# It is not intended for manual editing.
|
||||
version = 4
|
||||
|
||||
[[package]]
|
||||
name = "base64"
|
||||
version = "0.22.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
|
||||
|
||||
[[package]]
|
||||
name = "bytes"
|
||||
version = "1.10.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
|
||||
|
||||
[[package]]
|
||||
name = "cc"
|
||||
version = "1.2.35"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "590f9024a68a8c40351881787f1934dc11afd69090f5edb6831464694d836ea3"
|
||||
dependencies = [
|
||||
"find-msvc-tools",
|
||||
"shlex",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cfg-if"
|
||||
version = "1.0.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9"
|
||||
|
||||
[[package]]
|
||||
name = "deranged"
|
||||
version = "0.5.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d630bccd429a5bb5a64b5e94f693bfc48c9f8566418fda4c494cc94f911f87cc"
|
||||
dependencies = [
|
||||
"powerfmt",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "find-msvc-tools"
|
||||
version = "0.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e178e4fba8a2726903f6ba98a6d221e76f9c12c650d5dc0e6afdc50677b49650"
|
||||
|
||||
[[package]]
|
||||
name = "fnv"
|
||||
version = "1.0.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
|
||||
|
||||
[[package]]
|
||||
name = "getrandom"
|
||||
version = "0.2.16"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"libc",
|
||||
"wasi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "http"
|
||||
version = "1.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565"
|
||||
dependencies = [
|
||||
"bytes",
|
||||
"fnv",
|
||||
"itoa",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "httparse"
|
||||
version = "1.10.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
|
||||
|
||||
[[package]]
|
||||
name = "itoa"
|
||||
version = "1.0.15"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
|
||||
|
||||
[[package]]
|
||||
name = "lazy_static"
|
||||
version = "1.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.175"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543"
|
||||
|
||||
[[package]]
|
||||
name = "log"
|
||||
version = "0.4.28"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
|
||||
|
||||
[[package]]
|
||||
name = "mgr"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"thiserror",
|
||||
"time",
|
||||
"tracing",
|
||||
"tracing-subscriber",
|
||||
"ureq",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num-conv"
|
||||
version = "0.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
|
||||
|
||||
[[package]]
|
||||
name = "once_cell"
|
||||
version = "1.21.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
|
||||
|
||||
[[package]]
|
||||
name = "percent-encoding"
|
||||
version = "2.3.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
|
||||
|
||||
[[package]]
|
||||
name = "pin-project-lite"
|
||||
version = "0.2.16"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
|
||||
|
||||
[[package]]
|
||||
name = "powerfmt"
|
||||
version = "0.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.101"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de"
|
||||
dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "quote"
|
||||
version = "1.0.40"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ring"
|
||||
version = "0.17.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
|
||||
dependencies = [
|
||||
"cc",
|
||||
"cfg-if",
|
||||
"getrandom",
|
||||
"libc",
|
||||
"untrusted",
|
||||
"windows-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rustls"
|
||||
version = "0.23.31"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c0ebcbd2f03de0fc1122ad9bb24b127a5a6cd51d72604a3f3c50ac459762b6cc"
|
||||
dependencies = [
|
||||
"log",
|
||||
"once_cell",
|
||||
"ring",
|
||||
"rustls-pki-types",
|
||||
"rustls-webpki",
|
||||
"subtle",
|
||||
"zeroize",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rustls-pemfile"
|
||||
version = "2.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
|
||||
dependencies = [
|
||||
"rustls-pki-types",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rustls-pki-types"
|
||||
version = "1.12.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79"
|
||||
dependencies = [
|
||||
"zeroize",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rustls-webpki"
|
||||
version = "0.103.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0a17884ae0c1b773f1ccd2bd4a8c72f16da897310a98b0e84bf349ad5ead92fc"
|
||||
dependencies = [
|
||||
"ring",
|
||||
"rustls-pki-types",
|
||||
"untrusted",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
version = "1.0.219"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
|
||||
dependencies = [
|
||||
"serde_derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_derive"
|
||||
version = "1.0.219"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "sharded-slab"
|
||||
version = "0.1.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
|
||||
dependencies = [
|
||||
"lazy_static",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "shlex"
|
||||
version = "1.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
|
||||
|
||||
[[package]]
|
||||
name = "subtle"
|
||||
version = "2.6.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "2.0.106"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "thiserror"
|
||||
version = "2.0.16"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3467d614147380f2e4e374161426ff399c91084acd2363eaf549172b3d5e60c0"
|
||||
dependencies = [
|
||||
"thiserror-impl",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "thiserror-impl"
|
||||
version = "2.0.16"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6c5e1be1c48b9172ee610da68fd9cd2770e7a4056cb3fc98710ee6906f0c7960"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "thread_local"
|
||||
version = "1.1.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "time"
|
||||
version = "0.3.43"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "83bde6f1ec10e72d583d91623c939f623002284ef622b87de38cfd546cbf2031"
|
||||
dependencies = [
|
||||
"deranged",
|
||||
"num-conv",
|
||||
"powerfmt",
|
||||
"serde",
|
||||
"time-core",
|
||||
"time-macros",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "time-core"
|
||||
version = "0.1.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b"
|
||||
|
||||
[[package]]
|
||||
name = "time-macros"
|
||||
version = "0.2.24"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3"
|
||||
dependencies = [
|
||||
"num-conv",
|
||||
"time-core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tracing"
|
||||
version = "0.1.41"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
|
||||
dependencies = [
|
||||
"pin-project-lite",
|
||||
"tracing-core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tracing-core"
|
||||
version = "0.1.34"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678"
|
||||
dependencies = [
|
||||
"once_cell",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tracing-subscriber"
|
||||
version = "0.3.20"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2054a14f5307d601f88daf0553e1cbf472acc4f2c51afab632431cdcd72124d5"
|
||||
dependencies = [
|
||||
"sharded-slab",
|
||||
"thread_local",
|
||||
"tracing-core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "unicode-ident"
|
||||
version = "1.0.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
|
||||
|
||||
[[package]]
|
||||
name = "untrusted"
|
||||
version = "0.9.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
|
||||
|
||||
[[package]]
|
||||
name = "ureq"
|
||||
version = "3.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "00432f493971db5d8e47a65aeb3b02f8226b9b11f1450ff86bb772776ebadd70"
|
||||
dependencies = [
|
||||
"base64",
|
||||
"log",
|
||||
"percent-encoding",
|
||||
"rustls",
|
||||
"rustls-pemfile",
|
||||
"rustls-pki-types",
|
||||
"ureq-proto",
|
||||
"utf-8",
|
||||
"webpki-roots",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ureq-proto"
|
||||
version = "0.5.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bbe120bb823a0061680e66e9075942fcdba06d46551548c2c259766b9558bc9a"
|
||||
dependencies = [
|
||||
"base64",
|
||||
"http",
|
||||
"httparse",
|
||||
"log",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "utf-8"
|
||||
version = "0.7.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
|
||||
|
||||
[[package]]
|
||||
name = "wasi"
|
||||
version = "0.11.1+wasi-snapshot-preview1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
|
||||
|
||||
[[package]]
|
||||
name = "webpki-roots"
|
||||
version = "1.0.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7e8983c3ab33d6fb807cfcdad2491c4ea8cbc8ed839181c7dfd9c67c83e261b2"
|
||||
dependencies = [
|
||||
"rustls-pki-types",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows-sys"
|
||||
version = "0.52.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
|
||||
dependencies = [
|
||||
"windows-targets",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows-targets"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
|
||||
dependencies = [
|
||||
"windows_aarch64_gnullvm",
|
||||
"windows_aarch64_msvc",
|
||||
"windows_i686_gnu",
|
||||
"windows_i686_gnullvm",
|
||||
"windows_i686_msvc",
|
||||
"windows_x86_64_gnu",
|
||||
"windows_x86_64_gnullvm",
|
||||
"windows_x86_64_msvc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_gnullvm"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_msvc"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_gnu"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_gnullvm"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_msvc"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnu"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnullvm"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_msvc"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
|
||||
|
||||
[[package]]
|
||||
name = "zeroize"
|
||||
version = "1.8.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
|
||||
184
mgr/Cargo.toml
Normal file
184
mgr/Cargo.toml
Normal file
@@ -0,0 +1,184 @@
|
||||
[package]
|
||||
name = "mgr"
|
||||
version = "0.1.0"
|
||||
edition = "2024"
|
||||
|
||||
[dependencies]
|
||||
thiserror = { version = "2.0.16", default-features = false }
|
||||
time = { version = "0.3.43", default-features = false, features = ["formatting", "parsing", "std"] }
|
||||
tracing = { version = "0.1.41", default-features = false }
|
||||
tracing-subscriber = { version = "0.3.20", default-features = false, features = ["fmt"] }
|
||||
ureq = { version = "3.1.0", default-features = false, features = ["rustls"] }
|
||||
|
||||
[[bin]]
|
||||
name = "workstation-mgr"
|
||||
path = "src/bin/main.rs"
|
||||
|
||||
[[bin]]
|
||||
name = "workstation-client"
|
||||
path = "src/bin/client.rs"
|
||||
|
||||
[profile.release]
|
||||
strip = true
|
||||
lto = true
|
||||
codegen-units = 1
|
||||
panic = "abort"
|
||||
|
||||
[lints.clippy]
|
||||
# enabled groups
|
||||
correctness = { level = "deny", priority = -1 }
|
||||
suspicious = { level = "warn", priority = -1 }
|
||||
style = { level = "warn", priority = -1 }
|
||||
complexity = { level = "warn", priority = -1 }
|
||||
perf = { level = "warn", priority = -1 }
|
||||
cargo = { level = "warn", priority = -1 }
|
||||
pedantic = { level = "warn", priority = -1 }
|
||||
nursery = { level = "warn", priority = -1 }
|
||||
|
||||
# pedantic overrides
|
||||
too_many_lines = "allow"
|
||||
must_use_candidate = "allow"
|
||||
map_unwrap_or = "allow"
|
||||
missing_errors_doc = "allow"
|
||||
if_not_else = "allow"
|
||||
similar_names = "allow"
|
||||
redundant_else = "allow"
|
||||
|
||||
# nursery overrides
|
||||
missing_const_for_fn = "allow"
|
||||
option_if_let_else = "allow"
|
||||
redundant_pub_crate = "allow"
|
||||
|
||||
# complexity overrides
|
||||
too_many_arguments = "allow"
|
||||
|
||||
# style overrides
|
||||
new_without_default = "allow"
|
||||
redundant_closure = "allow"
|
||||
|
||||
# cargo overrides
|
||||
multiple_crate_versions = "allow"
|
||||
cargo_common_metadata = "allow"
|
||||
|
||||
# selected restrictions
|
||||
allow_attributes = "warn"
|
||||
allow_attributes_without_reason = "warn"
|
||||
arithmetic_side_effects = "warn"
|
||||
as_conversions = "warn"
|
||||
assertions_on_result_states = "warn"
|
||||
cfg_not_test = "warn"
|
||||
clone_on_ref_ptr = "warn"
|
||||
create_dir = "warn"
|
||||
dbg_macro = "warn"
|
||||
decimal_literal_representation = "warn"
|
||||
default_numeric_fallback = "warn"
|
||||
deref_by_slicing = "warn"
|
||||
disallowed_script_idents = "warn"
|
||||
empty_drop = "warn"
|
||||
empty_enum_variants_with_brackets = "warn"
|
||||
empty_structs_with_brackets = "warn"
|
||||
exit = "warn"
|
||||
filetype_is_file = "warn"
|
||||
float_arithmetic = "warn"
|
||||
float_cmp_const = "warn"
|
||||
fn_to_numeric_cast_any = "warn"
|
||||
format_push_string = "warn"
|
||||
get_unwrap = "warn"
|
||||
indexing_slicing = "warn"
|
||||
infinite_loop = "warn"
|
||||
inline_asm_x86_att_syntax = "warn"
|
||||
inline_asm_x86_intel_syntax = "warn"
|
||||
integer_division = "warn"
|
||||
iter_over_hash_type = "warn"
|
||||
large_include_file = "warn"
|
||||
let_underscore_must_use = "warn"
|
||||
let_underscore_untyped = "warn"
|
||||
little_endian_bytes = "warn"
|
||||
lossy_float_literal = "warn"
|
||||
map_err_ignore = "warn"
|
||||
mem_forget = "warn"
|
||||
missing_assert_message = "warn"
|
||||
missing_asserts_for_indexing = "warn"
|
||||
mixed_read_write_in_expression = "warn"
|
||||
modulo_arithmetic = "warn"
|
||||
multiple_inherent_impl = "warn"
|
||||
multiple_unsafe_ops_per_block = "warn"
|
||||
mutex_atomic = "warn"
|
||||
panic = "warn"
|
||||
partial_pub_fields = "warn"
|
||||
pattern_type_mismatch = "warn"
|
||||
print_stderr = "warn"
|
||||
print_stdout = "warn"
|
||||
pub_without_shorthand = "warn"
|
||||
rc_buffer = "warn"
|
||||
rc_mutex = "warn"
|
||||
redundant_type_annotations = "warn"
|
||||
renamed_function_params = "warn"
|
||||
rest_pat_in_fully_bound_structs = "warn"
|
||||
same_name_method = "warn"
|
||||
self_named_module_files = "warn"
|
||||
semicolon_inside_block = "warn"
|
||||
str_to_string = "warn"
|
||||
string_add = "warn"
|
||||
string_lit_chars_any = "warn"
|
||||
string_slice = "warn"
|
||||
implicit_clone = "warn"
|
||||
suspicious_xor_used_as_pow = "warn"
|
||||
tests_outside_test_module = "warn"
|
||||
todo = "warn"
|
||||
try_err = "warn"
|
||||
undocumented_unsafe_blocks = "warn"
|
||||
unimplemented = "warn"
|
||||
unnecessary_safety_comment = "warn"
|
||||
unnecessary_safety_doc = "warn"
|
||||
unnecessary_self_imports = "warn"
|
||||
unneeded_field_pattern = "warn"
|
||||
unseparated_literal_suffix = "warn"
|
||||
unused_result_ok = "warn"
|
||||
unwrap_used = "warn"
|
||||
use_debug = "warn"
|
||||
verbose_file_reads = "warn"
|
||||
|
||||
# restrictions explicit allows
|
||||
absolute_paths = "allow"
|
||||
alloc_instead_of_core = "allow"
|
||||
as_underscore = "allow"
|
||||
big_endian_bytes = "allow"
|
||||
default_union_representation = "allow"
|
||||
error_impl_error = "allow"
|
||||
exhaustive_enums = "allow"
|
||||
exhaustive_structs = "allow"
|
||||
expect_used = "allow"
|
||||
field_scoped_visibility_modifiers = "allow"
|
||||
host_endian_bytes = "allow"
|
||||
if_then_some_else_none = "allow"
|
||||
impl_trait_in_params = "allow"
|
||||
implicit_return = "allow"
|
||||
integer_division_remainder_used = "allow"
|
||||
min_ident_chars = "allow"
|
||||
missing_docs_in_private_items = "allow"
|
||||
missing_inline_in_public_items = "allow"
|
||||
missing_trait_methods = "allow"
|
||||
mod_module_files = "allow"
|
||||
needless_raw_strings = "allow"
|
||||
non_ascii_literal = "allow"
|
||||
non_zero_suggestions = "allow"
|
||||
panic_in_result_fn = "allow"
|
||||
pathbuf_init_then_push = "allow"
|
||||
pub_use = "allow"
|
||||
pub_with_shorthand = "allow"
|
||||
question_mark_used = "allow"
|
||||
ref_patterns = "allow"
|
||||
semicolon_outside_block = "allow"
|
||||
separated_literal_suffix = "allow"
|
||||
shadow_reuse = "allow"
|
||||
shadow_same = "allow"
|
||||
shadow_unrelated = "allow"
|
||||
single_call_fn = "allow"
|
||||
single_char_lifetime_names = "allow"
|
||||
std_instead_of_alloc = "allow"
|
||||
std_instead_of_core = "allow"
|
||||
unreachable = "allow"
|
||||
unused_trait_names = "allow"
|
||||
unwrap_in_result = "allow"
|
||||
wildcard_enum_match_arm = "allow"
|
||||
87
mgr/src/bin/client.rs
Normal file
87
mgr/src/bin/client.rs
Normal file
@@ -0,0 +1,87 @@
|
||||
#![expect(
|
||||
clippy::print_stderr,
|
||||
clippy::print_stdout,
|
||||
reason = "output is fine for cli"
|
||||
)]
|
||||
|
||||
use std::{
|
||||
env,
|
||||
io::{self, Read as _},
|
||||
net,
|
||||
os::unix::net::UnixStream,
|
||||
process, str,
|
||||
};
|
||||
|
||||
use thiserror::Error;
|
||||
|
||||
use mgr::{
|
||||
Action,
|
||||
cli::{self, CliCommand as _, ParseError},
|
||||
wire::{client, socket},
|
||||
};
|
||||
|
||||
#[derive(Debug, Error)]
|
||||
enum Error {
|
||||
#[error(transparent)]
|
||||
Io(#[from] io::Error),
|
||||
#[error(transparent)]
|
||||
Socket(#[from] socket::Error),
|
||||
#[error(transparent)]
|
||||
Send(#[from] client::SendError),
|
||||
#[error(transparent)]
|
||||
CliParse(#[from] cli::ParseError),
|
||||
#[error("response is not valid utf8: {0}")]
|
||||
ResponseNonUtf8(#[from] str::Utf8Error),
|
||||
}
|
||||
|
||||
enum MainResult {
|
||||
Success,
|
||||
Failure(Error),
|
||||
}
|
||||
|
||||
impl process::Termination for MainResult {
|
||||
fn report(self) -> process::ExitCode {
|
||||
match self {
|
||||
Self::Success => process::ExitCode::SUCCESS,
|
||||
Self::Failure(e) => {
|
||||
eprintln!("Error: {e}");
|
||||
process::ExitCode::FAILURE
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn main() -> MainResult {
|
||||
fn inner() -> Result<(), Error> {
|
||||
let mut args = env::args().skip(1);
|
||||
|
||||
let action =
|
||||
Action::parse_str(args.next().ok_or(ParseError::MissingAction)?.as_str(), args)?;
|
||||
|
||||
let socket = socket::get_socket_path()?;
|
||||
let mut stream = UnixStream::connect(socket)?;
|
||||
|
||||
action.send(&mut stream)?;
|
||||
|
||||
stream.shutdown(net::Shutdown::Write)?;
|
||||
|
||||
let response = {
|
||||
let mut buf = Vec::new();
|
||||
stream.read_to_end(&mut buf)?;
|
||||
let response = str::from_utf8(&buf)?.to_owned();
|
||||
drop(stream);
|
||||
response
|
||||
};
|
||||
|
||||
if !response.is_empty() {
|
||||
println!("{response}");
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
match inner() {
|
||||
Ok(()) => MainResult::Success,
|
||||
Err(e) => MainResult::Failure(e),
|
||||
}
|
||||
}
|
||||
105
mgr/src/bin/main.rs
Executable file
105
mgr/src/bin/main.rs
Executable file
@@ -0,0 +1,105 @@
|
||||
#![expect(
|
||||
clippy::print_stderr,
|
||||
clippy::print_stdout,
|
||||
reason = "output is fine for cli"
|
||||
)]
|
||||
|
||||
use std::{env, process};
|
||||
|
||||
use thiserror::Error;
|
||||
use tracing::Level;
|
||||
|
||||
use mgr::{
|
||||
self, Action, Exec as _,
|
||||
cli::{CliCommand as _, ParseError},
|
||||
};
|
||||
|
||||
#[derive(Debug, Error)]
|
||||
enum Error {
|
||||
#[error(transparent)]
|
||||
Power(#[from] mgr::power::Error),
|
||||
#[error(transparent)]
|
||||
Dmenu(#[from] mgr::dmenu::Error),
|
||||
#[error(transparent)]
|
||||
Server(#[from] mgr::wire::server::Error),
|
||||
#[error(transparent)]
|
||||
Presentation(#[from] mgr::present::Error),
|
||||
#[error(transparent)]
|
||||
Exec(#[from] mgr::ExecError),
|
||||
#[error(transparent)]
|
||||
ParseParse(#[from] ParseError),
|
||||
#[error(transparent)]
|
||||
Tracing(#[from] tracing::dispatcher::SetGlobalDefaultError),
|
||||
}
|
||||
|
||||
enum MainResult {
|
||||
Success,
|
||||
Failure(Error),
|
||||
}
|
||||
|
||||
impl process::Termination for MainResult {
|
||||
fn report(self) -> process::ExitCode {
|
||||
match self {
|
||||
Self::Success => process::ExitCode::SUCCESS,
|
||||
Self::Failure(e) => {
|
||||
eprintln!("Error: {e}");
|
||||
process::ExitCode::FAILURE
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl From<Error> for MainResult {
|
||||
fn from(value: Error) -> Self {
|
||||
Self::Failure(value)
|
||||
}
|
||||
}
|
||||
|
||||
fn init_tracing() -> Result<(), Error> {
|
||||
tracing::subscriber::set_global_default(
|
||||
tracing_subscriber::fmt()
|
||||
.with_max_level(Level::DEBUG)
|
||||
.event_format(
|
||||
tracing_subscriber::fmt::format()
|
||||
.with_ansi(false)
|
||||
.with_target(false)
|
||||
.compact(),
|
||||
)
|
||||
.finish(),
|
||||
)?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn main() -> MainResult {
|
||||
fn inner() -> Result<(), Error> {
|
||||
init_tracing()?;
|
||||
|
||||
let mut args = env::args().skip(1);
|
||||
|
||||
match args.next().ok_or(ParseError::MissingAction)?.as_str() {
|
||||
"serve" => {
|
||||
mgr::wire::server::run()?;
|
||||
Ok(())
|
||||
}
|
||||
"run" => {
|
||||
let action = Action::parse_str(
|
||||
args.next().ok_or(ParseError::MissingAction)?.as_str(),
|
||||
args,
|
||||
)?;
|
||||
if let Some(output) = action.execute()? {
|
||||
println!("{output}");
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
input => Err(ParseError::UnknownAction {
|
||||
action: input.to_owned(),
|
||||
}
|
||||
.into()),
|
||||
}
|
||||
}
|
||||
|
||||
match inner() {
|
||||
Ok(()) => MainResult::Success,
|
||||
Err(e) => MainResult::Failure(e),
|
||||
}
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user