mirror of
https://github.com/anotherhadi/nixy.git
synced 2026-08-22 19:15:48 +02:00
Compare commits
1356 Commits
v5.0.0
..
5d9ab362a3
| Author | SHA1 | Date | |
|---|---|---|---|
| 5d9ab362a3 | |||
| a6b2f66ac8 | |||
| e2a60b15dc | |||
| d029d6f205 | |||
| d9b4102bed | |||
| a744d85f48 | |||
| 5d50819d49 | |||
| 087f71d2d5 | |||
| 3f36665767 | |||
| 6cb4d1eb96 | |||
| 983c83b981 | |||
| c482e6e075 | |||
| 0a01e8f3e8 | |||
| 641411ad51 | |||
| 86fd60fd3d | |||
| 9a41aff92d | |||
| e4a2a7abd0 | |||
| b4d8e87abe | |||
| 5de0ce50d6 | |||
| aba6dafffa | |||
| 290471fcc2 | |||
| ac90e05258 | |||
| 562f2507c0 | |||
| a393b97680 | |||
| 59901b0081 | |||
| 6ecf475301 | |||
| 75483ea97a | |||
| 4cd0eccde5 | |||
| d32c4a317f | |||
| 5ecc516a2f | |||
| de489d7d9c | |||
| 19bfd1201b | |||
| 20f7bca099 | |||
| 72ed018351 | |||
| b904fd4fde | |||
| b1cf5fb3a1 | |||
| fee44db81c | |||
| 214095c02a | |||
| 29fc893847 | |||
| 3689215480 | |||
| 14168a65ea | |||
| 43ae447b34 | |||
| 07fa66f1b6 | |||
| 168423cf16 | |||
| bde39be205 | |||
| 18137f444a | |||
| e835f2466b | |||
| d2a9fff0d1 | |||
| 081e05c702 | |||
| 4a4b997ef3 | |||
| 37abf49364 | |||
| 36f5ef3792 | |||
| 3d4099c97b | |||
| 89413d06a8 | |||
| 76e3368f3e | |||
| 0f40fccb5e | |||
| cefebdbd0a | |||
| 05cfe684c2 | |||
| f11bd21e00 | |||
| 40477c6562 | |||
| d1fec1128d | |||
| 677a279eda | |||
| 1489261fa9 | |||
| 29d19d5502 | |||
| 2f69c6e1d4 | |||
| 9ad71c5775 | |||
| b5c64e96c4 | |||
| af787952ad | |||
| 4ebf579743 | |||
| 78aa49547d | |||
| d21fc81a19 | |||
| b0684b2e56 | |||
| 49a9f3f169 | |||
| 8caa02139c | |||
| 0c0a487488 | |||
| 6f463fc7f9 | |||
| 3e82b1cd60 | |||
| f9d171cef3 | |||
| 89c61650bc | |||
| c94559d29f | |||
| e91047a3e1 | |||
| 1d75175be8 | |||
| ea18558cb3 | |||
| 72c13294e6 | |||
| a771f685b2 | |||
| 27ad0783bc | |||
| d61e378405 | |||
| baa1ce858d | |||
| f32ea27565 | |||
| b657e5a891 | |||
| 48f3f3170b | |||
| 87778bd3fa | |||
| 5736c8ccf2 | |||
| 31031447ce | |||
| 4fb4058dca | |||
| 33b3ef66f2 | |||
| 52ee08e13b | |||
| 8c4b9340b6 | |||
| a1d57253f0 | |||
| 6e21914113 | |||
| 7acddfafa1 | |||
| 9fb4072893 | |||
| fd644671af | |||
| bfb7c2f4e0 | |||
| 22b5aa9797 | |||
| 4ac3945174 | |||
| d3cdc25481 | |||
| 6a0b3418a7 | |||
| f2c2540cd4 | |||
| 223f785c3a | |||
| 81ab17fed7 | |||
| 8f16767240 | |||
| e32cf43d87 | |||
| 8e6270ca34 | |||
| 1b0eb2f7bf | |||
| 7861a22df0 | |||
| 53ab3a608c | |||
| e6873e8caa | |||
| 9b7a311fc3 | |||
| bb7819114b | |||
| 1acb888684 | |||
| c09899e365 | |||
| d7fea0c4aa | |||
| c8dd5f2bbf | |||
| 71b559e0f6 | |||
| a901005929 | |||
| 31fb93ff68 | |||
| 84018b229c | |||
| 27d8dfb87f | |||
| 61c56e1b1d | |||
| 2ad7a99077 | |||
| 8088a45891 | |||
| 5b8240c176 | |||
| 44964ce7cc | |||
| 25c331b2f1 | |||
| d58e10e95d | |||
| e79e8d0d3b | |||
| 45aa87f9f8 | |||
| 9dee9b0d6a | |||
| 2fac831333 | |||
| a2cfea4c3e | |||
| 6095fb13cc | |||
| 738631870d | |||
| 66169bb57e | |||
| 984c99f45e | |||
| 47ec5d10e9 | |||
| 43e45e5cce | |||
| 76a97d964f | |||
| 198e88682c | |||
| 6e57ee66c2 | |||
| 1ace7442a1 | |||
| cce4cbee10 | |||
| 3c7702789c | |||
| 65213eb7cf | |||
| 56d7a4cd23 | |||
| 8bd2c8752e | |||
| cd95d86540 | |||
| fa37b8c89f | |||
| 32a079507c | |||
| 0cb07052bd | |||
| 0455d520d1 | |||
| 1bca9316b4 | |||
| 60c25395eb | |||
| 3807536cf2 | |||
| fada191840 | |||
| b756f0fcd5 | |||
| f88825b93c | |||
| ae115a50f2 | |||
| 3d6a3f62ec | |||
| b0c93e7e00 | |||
| 96dc0bcb4c | |||
| c853611916 | |||
| 49f4828046 | |||
| 29dbc0af97 | |||
| bc064cf1c5 | |||
| 4f9ea610d6 | |||
| 9d04654018 | |||
| 8508faf26e | |||
| 71437939ab | |||
| e851e8c2c3 | |||
| f3e4069e8c | |||
| 3bce0bce82 | |||
| 38a61285b3 | |||
| 2a77cbf773 | |||
| 87b4be1860 | |||
| e55385b3f0 | |||
| 8d25b1b088 | |||
| 97ff9eb09e | |||
| f9c4bd1f99 | |||
| bd2c7dfc25 | |||
| f110213bb0 | |||
| 8fdab8a9cc | |||
| 1e68496efe | |||
| 172205b613 | |||
| a07b0a38ac | |||
| f70a139bd7 | |||
| b98af7060b | |||
| 31bb45950d | |||
| cd55babaa2 | |||
| d9b4ef2766 | |||
| e8a5db5dc2 | |||
| b69baaf428 | |||
| 550248aa4e | |||
| 229e7bf30e | |||
| e1f03b2909 | |||
| 696bbcdcdf | |||
| d61b5989c0 | |||
| dd73b1c3e5 | |||
| ecde37dbe6 | |||
| 279a89e424 | |||
| be47d4801a | |||
| 6a641139bd | |||
| d211c4408b | |||
| 5a6c1e7663 | |||
| 91944a9b8d | |||
| 4932c2dd5e | |||
| c66fcbd709 | |||
| 9f01990924 | |||
| 4b3c6bcb04 | |||
| c077387e5f | |||
| 877171faa7 | |||
| f9ecc03f9d | |||
| a419fb2214 | |||
| 838187c0ad | |||
| d7dc6ff8ab | |||
| 66ed46603b | |||
| 4323eb53b7 | |||
| 7c36c6ce14 | |||
| c9ec302d19 | |||
| 69bba83536 | |||
| 59ae3d5f9d | |||
| 72e4be86eb | |||
| 18c8afb616 | |||
| f74e15288b | |||
| 21b993d1cc | |||
| 9ee631dd7a | |||
| ba3536c4dd | |||
| 6e14ad1357 | |||
| ee84daa4b4 | |||
| 806697e20d | |||
| db9286108d | |||
| 709c6c3680 | |||
| 4a40717982 | |||
| 51f20ec168 | |||
| fc3d977050 | |||
| 38665036fc | |||
| d5cc53f975 | |||
| 1c539f857d | |||
| b241a2f367 | |||
| d9d4cf53f8 | |||
| 6649f93754 | |||
| 74d2b12889 | |||
| c594900d45 | |||
| f306041af9 | |||
| 5d7c159e34 | |||
| f4e951169a | |||
| 8d75aa0b2d | |||
| 88d712360a | |||
| a1691ae886 | |||
| 37f63e248a | |||
| 1a0e9429f7 | |||
| f2e7751d7f | |||
| 9857d75263 | |||
| 2af2fdd7a1 | |||
| 5eeba41413 | |||
| 794650d294 | |||
| 7013531715 | |||
| d35af50097 | |||
| 1c587f2ff3 | |||
| 2d344e086e | |||
| c5c6c46af8 | |||
| 0afd3fc6cf | |||
| 7f094e0a4f | |||
| 3506f691eb | |||
| 1f36d4eb75 | |||
| a7d433c2fd | |||
| 3ccb167d6d | |||
| 680ee14463 | |||
| 8c4162b885 | |||
| 15f4554703 | |||
| 56792d70ec | |||
| e82fa4e8c8 | |||
| b7636142cd | |||
| 43ae984817 | |||
| e3090bee73 | |||
| 587bbf860e | |||
| 17e31c6bbc | |||
| 3693fad125 | |||
| f275bee6c8 | |||
| 18d5042a21 | |||
| dd83ee0e5e | |||
| 0f944e4c05 | |||
| 98598ee3ce | |||
| 830c1059a9 | |||
| 53e8a42484 | |||
| ea7eaa106a | |||
| 936266ab11 | |||
| 26b08ec009 | |||
| 96673a4e69 | |||
| 81b3128ef6 | |||
| 55349958d3 | |||
| a6524d8d83 | |||
| 682f24b1be | |||
| 4fb4ab9ae2 | |||
| 64c833dfaf | |||
| fe1d58998c | |||
| 557844d07a | |||
| aac1ced91e | |||
| 45cd05c304 | |||
| 4da1706085 | |||
| b06ec10646 | |||
| 8ea5a5e6ae | |||
| 40d80808c3 | |||
| 66cce04e98 | |||
| 580c7302aa | |||
| f36bef6bde | |||
| 0bfb226119 | |||
| 6fd6982d0f | |||
| d1eb1353f5 | |||
| 7dce2b592f | |||
| bbec068d1d | |||
| 30c4099b64 | |||
| 8eec546631 | |||
| 21f9ed2d54 | |||
| a056244dd8 | |||
| d7e1dd20d9 | |||
| f1a7ba0f77 | |||
| 0540ee700d | |||
| 24d77739b9 | |||
| 6d4a886acb | |||
| af0c00d1d0 | |||
| 23c3d86c73 | |||
| 64d63b8f52 | |||
| 6b43b76880 | |||
| 31e03a7fb8 | |||
| c6d4c3f14b | |||
| 9f3521a716 | |||
| 767d687674 | |||
| 13312a62a1 | |||
| a12fe9a81a | |||
| c5e85ae57d | |||
| 0d8bfd7749 | |||
| d8993672c1 | |||
| fedd6a72ea | |||
| 36bd8b84e1 | |||
| c43ae9578b | |||
| 911845949e | |||
| 76c47913ea | |||
| fe1f7245b0 | |||
| ceadb80791 | |||
| cc27decf7a | |||
| cbd2d465e9 | |||
| de2a311f84 | |||
| afedf85534 | |||
| 5af43b4194 | |||
| 10e01b3270 | |||
| 7c6aaf80c3 | |||
| 0fcc535f53 | |||
| 6fe18fb699 | |||
| 5ee6829136 | |||
| 01c55c2428 | |||
| a21e14e5e6 | |||
| b4ecbdb587 | |||
| 299f017b06 | |||
| 3e1c32ff6c | |||
| 7a72b4229d | |||
| 5a9dc62173 | |||
| d146aa6af1 | |||
| 068f8722f0 | |||
| f2cf006a02 | |||
| c268e920c4 | |||
| e9eed8212a | |||
| 8753ac2d0b | |||
| 13578f0f2f | |||
| b8ceb39db9 | |||
| b22bd95f9f | |||
| b25ce91ca0 | |||
| dac3b34e64 | |||
| ae9427b508 | |||
| cd3715664f | |||
| 8136b19187 | |||
| a90a77a29d | |||
| 1006680dea | |||
| d0ad3c6e6e | |||
| 2e6e17f224 | |||
| 61830ffe71 | |||
| 1cb855c181 | |||
| c1eee689fd | |||
| d6c080930d | |||
| 67b70c3e5c | |||
| 07f7654c69 | |||
| 2f5e5683e9 | |||
| 1f2a665ef0 | |||
| 58e16598b1 | |||
| 16896d0b37 | |||
| 3f2a7346c5 | |||
| 3e1255349b | |||
| 7f3757e530 | |||
| d39656ad66 | |||
| 3d25e1799b | |||
| c937ee3afc | |||
| 43b8be4931 | |||
| 31879f6186 | |||
| 0c34239fab | |||
| 104c816612 | |||
| 60d177ba39 | |||
| b6cad25714 | |||
| 542f811107 | |||
| 4b80d21c00 | |||
| ab80268f61 | |||
| 30cd88a6b0 | |||
| 28d59ed58e | |||
| eb81d94717 | |||
| f1c4eff2d6 | |||
| d044e3dd2e | |||
| 6851655e0a | |||
| c7e6aba945 | |||
| 669249bdaa | |||
| 31488b2534 | |||
| 638e37a4b4 | |||
| 422e3ffaf5 | |||
| 8e26c50b92 | |||
| 0ff65b95b5 | |||
| 0f6d9c16b5 | |||
| a26a80596a | |||
| 1a1b5e9d07 | |||
| ad194bb96d | |||
| f8b20c8f20 | |||
| 6971afb3af | |||
| 50c3a83d84 | |||
| 33810fc79e | |||
| cd8cbe7d65 | |||
| e1bec5a053 | |||
| 1a53b35a1f | |||
| 968c7a922e | |||
| aac1a100d8 | |||
| 38c9906ada | |||
| 14744197ac | |||
| f374f6de9b | |||
| e7ccac616d | |||
| f76aee3783 | |||
| 4dd98a5554 | |||
| c70507cebd | |||
| dbc55aaa6f | |||
| 62a1a19d9d | |||
| 1ad395000d | |||
| e54127637e | |||
| 2fc1d31961 | |||
| 9e53d48c68 | |||
| 0b1f3996cf | |||
| b2688973f1 | |||
| 75fcb1c2be | |||
| c587c47b79 | |||
| d63ce02e5e | |||
| 2e371da2e5 | |||
| c52a7766c2 | |||
| d9337db684 | |||
| e5f2161604 | |||
| 9151dc75d8 | |||
| 3ce26e6b88 | |||
| 84026e498e | |||
| 29ff0aa3dd | |||
| fa76704fb5 | |||
| 5c59bfa474 | |||
| b5a5efde90 | |||
| 7c1f56d6a3 | |||
| b20bf2fbce | |||
| dbcddb6115 | |||
| 56ef64700f | |||
| 458fe29a91 | |||
| 8785a2bd04 | |||
| 16c9d54a30 | |||
| e26b4d0285 | |||
| 95d3326857 | |||
| c5175cdaeb | |||
| bb084f66e9 | |||
| 0960892340 | |||
| 34ef6d39f9 | |||
| 444340c880 | |||
| acbc487772 | |||
| 305c11dc6d | |||
| 8a7a76297a | |||
| f9c5e63136 | |||
| 1b70d8c5cf | |||
| 9f5a1ca09e | |||
| 1612dca680 | |||
| f78389127a | |||
| 52c2187734 | |||
| d1fadd9059 | |||
| 2ccd7409ca | |||
| 9e35e81a69 | |||
| 8a596d9d86 | |||
| d8e807633c | |||
| 81ca5204bb | |||
| ca54d98acf | |||
| 62b2ff0090 | |||
| ee976873ce | |||
| 411b951332 | |||
| 71ec7d1390 | |||
| 3571c9da85 | |||
| dee8dcddf8 | |||
| 85fa2c5f11 | |||
| d3881d19af | |||
| d16d6906b8 | |||
| 449ad7997e | |||
| 4d80db7ccb | |||
| b314c9648f | |||
| 77ff7edce5 | |||
| 5ee186ca15 | |||
| 92c34e0c28 | |||
| a38304d73b | |||
| 5fd0da5327 | |||
| 9ae7a67a40 | |||
| 48cb6d9065 | |||
| 62bc08a436 | |||
| e0e933132b | |||
| eba2fc481e | |||
| 15fa1daa8f | |||
| de6a1f4529 | |||
| 04e34161b1 | |||
| 575e2d246b | |||
| 88ee45885b | |||
| b48a197157 | |||
| 59c2ee28e1 | |||
| 4c32612a43 | |||
| 72e2184e0b | |||
| a221b2d5c1 | |||
| de60ad7c84 | |||
| 30293a616b | |||
| 16c76c92b3 | |||
| d22a30be53 | |||
| 92e165396d | |||
| b0899442ab | |||
| 991b456713 | |||
| 53dc030c22 | |||
| afd27f2a92 | |||
| 6a5c430830 | |||
| f04821fffe | |||
| eeeaf1a7c4 | |||
| 2c42201b15 | |||
| e3e7714f4c | |||
| 28ff9b7e6a | |||
| c92d1ac1ad | |||
| 3d214c7c2d | |||
| bfd689beab | |||
| 8879e0c222 | |||
| 794932ee3b | |||
| d5e56f4092 | |||
| ad0cc491f8 | |||
| a90dfeac07 | |||
| 61ae19567a | |||
| 2ffa0a3abf | |||
| 651de22342 | |||
| 3d5516e20c | |||
| 2270fe77b6 | |||
| 6514624612 | |||
| 4d4db27d49 | |||
| 9ff48eb543 | |||
| 519de26e6a | |||
| e1915e1741 | |||
| de177e0003 | |||
| c054d85b1c | |||
| 47e9b45cfa | |||
| f1f8d50c2e | |||
| e514c9ca09 | |||
| 336574206c | |||
| dcd302bf5b | |||
| 5aad861057 | |||
| 1098005af6 | |||
| 223b91e075 | |||
| ee80453e77 | |||
| a49bc73bbd | |||
| 818dfda0e3 | |||
| 33f62390c5 | |||
| fe143348a4 | |||
| 937c0a70d9 | |||
| 11c88abded | |||
| 9c43f16027 | |||
| ffc3b1baed | |||
| 73c349918f | |||
| 662009000d | |||
| d4ffdae2f4 | |||
| 1a69437e3f | |||
| a2210756c5 | |||
| 76dabd905e | |||
| 3c1be077b9 | |||
| 5aef2f7d40 | |||
| 7342a52609 | |||
| 8f1949c3fb | |||
| 09352dbcbc | |||
| b32cc2ade5 | |||
| eb457f8069 | |||
| bba6f699bd | |||
| 532b2e4e0a | |||
| 21beb27859 | |||
| 029655cb72 | |||
| ec8f733408 | |||
| 47449eb534 | |||
| 8d585f941d | |||
| 35e8d0a6a6 | |||
| 5662804337 | |||
| 523a3819d1 | |||
| 4532330c0c | |||
| 0362bbec14 | |||
| fcdd2dc92c | |||
| e7b81f510c | |||
| c3517e5f56 | |||
| 9af2f9f691 | |||
| 9ca1a031b5 | |||
| 640f815782 | |||
| 5885d6e400 | |||
| 897dcfb7e3 | |||
| 17589f5697 | |||
| 914f8bfa7e | |||
| 65f98fd3ec | |||
| f65f5a28e8 | |||
| c9ca8c21f3 | |||
| b0e4113b3b | |||
| 2a200b0e75 | |||
| f1b6044ed1 | |||
| 8891834ae1 | |||
| 4356ad0e2f | |||
| 3cbf606230 | |||
| fb75ecc61d | |||
| 792970dc7f | |||
| 30220aba6c | |||
| 6f0e14a560 | |||
| fb297a1016 | |||
| ea3baad219 | |||
| f12c527cdc | |||
| f16312b953 | |||
| de8abc2c4f | |||
| 3308c7424a | |||
| 12ca3743a1 | |||
| fc7fbfe0ee | |||
| 916a9ed923 | |||
| bd98e149f9 | |||
| a66048b432 | |||
| d8d8d7e990 | |||
| 8c5ce4880e | |||
| 14ef376f03 | |||
| ff5a75f687 | |||
| bbfd3a5de2 | |||
| a980904382 | |||
| 25d6f672a4 | |||
| 1922a9550b | |||
| 79b3cec6fb | |||
| e9f8555d37 | |||
| 0875217932 | |||
| 7dc0964759 | |||
| d7553fbce8 | |||
| 458e61b19c | |||
| d20693de9a | |||
| ea770a10ec | |||
| 970aa3133b | |||
| fe323511a4 | |||
| ea806f21d4 | |||
| a6a6cc3c09 | |||
| c334ff2851 | |||
| 40c8ca00db | |||
| a25c5fd551 | |||
| b6d0f00b34 | |||
| c020deea69 | |||
| 01e6c36348 | |||
| 1c9454a1cd | |||
| 0b65935549 | |||
| b48b9d1ef2 | |||
| c52a218305 | |||
| b5638ad2c8 | |||
| ca94ff3e9b | |||
| a306013288 | |||
| 90a73be013 | |||
| 4aa1b4eb50 | |||
| c2c92cf19c | |||
| d767f47422 | |||
| 442a0ad2b8 | |||
| 8b4fae6767 | |||
| 886e10612b | |||
| 5734351eca | |||
| c52894ecf0 | |||
| 72dd09aca1 | |||
| 4bd0343a63 | |||
| 961bb66e39 | |||
| 3e2f341bdb | |||
| e0dcde257a | |||
| e2ce1c442c | |||
| d3a25298d8 | |||
| b4edee45c2 | |||
| c830e627b0 | |||
| fcec5fff43 | |||
| 8a81c97ef3 | |||
| 6d46bb179c | |||
| a38eb82a2d | |||
| 2c01fd4182 | |||
| ad01749b10 | |||
| 201e9141a9 | |||
| dfbabf721d | |||
| 24553acae4 | |||
| ace16b05dd | |||
| 9222b90b24 | |||
| ac7da3935e | |||
| c08d1bd231 | |||
| 9635c7c8d5 | |||
| 51c00c532f | |||
| e386a42a43 | |||
| 26f5c4d041 | |||
| c3c4d5a027 | |||
| c416c53ec3 | |||
| 51c1e94c15 | |||
| 12657964c0 | |||
| b4a41673ed | |||
| a0c9d2570d | |||
| abca34497f | |||
| 3a66e81390 | |||
| 9c8ff97621 | |||
| fd3b272e31 | |||
| b14941d499 | |||
| b503ef1dec | |||
| f600f4903f | |||
| 023bf6d570 | |||
| 3e23890e43 | |||
| fc4dba9a75 | |||
| 2b56da08c6 | |||
| f95f539cad | |||
| d8b626139a | |||
| 477679c0a7 | |||
| 109ce61bbe | |||
| 0c50468ec2 | |||
| 71f03bde80 | |||
| b568faa7f2 | |||
| 31a84fd6ff | |||
| 30d497fef2 | |||
| 6e41aed96f | |||
| 9256aabe91 | |||
| 7d54322e8c | |||
| 364945be45 | |||
| 7932ba1f44 | |||
| 4eef13d9ba | |||
| 80ea020322 | |||
| 31d025a1b8 | |||
| b41644c69d | |||
| 0ec95f82d2 | |||
| 0df71d76df | |||
| d3f39e88dc | |||
| a8db853539 | |||
| ba4af473f4 | |||
| c272a4a8f9 | |||
| 16f1aba0c1 | |||
| 9be215cdea | |||
| f125369e88 | |||
| 73d9867b9a | |||
| 04b3882399 | |||
| ad0c8828cf | |||
| 89252b80bf | |||
| ab6ae9e7fb | |||
| c84eb4e185 | |||
| 00236ad9b1 | |||
| 3e9f37ea04 | |||
| 0019097d38 | |||
| 90284912bc | |||
| f9f63657fb | |||
| 319da87024 | |||
| b5cad0e00c | |||
| 892666e946 | |||
| d1f5b0ea4f | |||
| a8980eb4dd | |||
| 8482de47b2 | |||
| 7faec62f69 | |||
| 69f2ccceca | |||
| 476d89a651 | |||
| 690ae53780 | |||
| 58ed393097 | |||
| 4367c39873 | |||
| f32062d541 | |||
| eb57aa062e | |||
| fce3056d8f | |||
| 42bb93093c | |||
| e785e84bf2 | |||
| e2af0156c8 | |||
| b071daad02 | |||
| 4e7a020fc4 | |||
| ac53f1a812 | |||
| 5ed0ec12ea | |||
| fc0c2b0d13 | |||
| aa1f99e8f4 | |||
| 2b947bd5b1 | |||
| c0efbbd734 | |||
| 6379ff551d | |||
| 492d257fa5 | |||
| 3bebb475d7 | |||
| 4a832f376f | |||
| a5bd556df9 | |||
| c6710b1d64 | |||
| 731aa270b6 | |||
| 8c74fa0fc8 | |||
| 0bb41bb6dd | |||
| 92e9e59f02 | |||
| 7a177e4bb2 | |||
| e8625f81e9 | |||
| b14c343f14 | |||
| c364668759 | |||
| 3381fe405b | |||
| b738189d0c | |||
| ac914caf6a | |||
| 97e2c915cd | |||
| 21ed46cd7c | |||
| 7eb4e5ade9 | |||
| dae95bc5be | |||
| a33cf73ff1 | |||
| 18c30e5931 | |||
| 13c8f27411 | |||
| a640670baa | |||
| ae77733c71 | |||
| 6827360045 | |||
| 359e9745d6 | |||
| 56bcd3d56a | |||
| 8a81c546de | |||
| 23f0682eac | |||
| 418bc45bd2 | |||
| 1c4fece944 | |||
| 3716ba6b4f | |||
| 0e56be3428 | |||
| 7beef9441e | |||
| 176e3ba305 | |||
| ed045316ff | |||
| cfec304bbb | |||
| 575bb58bfc | |||
| 9ce3df4884 | |||
| 3c9875a110 | |||
| 8c69c549db | |||
| f1f919fe49 | |||
| 12cc080fc3 | |||
| 6b4b9a9aa7 | |||
| 6207e48d84 | |||
| b41dfdf664 | |||
| 8155f65fb9 | |||
| b0ca6aa757 | |||
| fd0251afbc | |||
| 5e16ae7463 | |||
| 2a2f4e4b9d | |||
| eef1d9531f | |||
| b92243118d | |||
| 01f9894fc6 | |||
| 03d202250b | |||
| 9cb8036b73 | |||
| 60fe3769e8 | |||
| 641bf821d4 | |||
| 25aa619445 | |||
| 5a0d476de3 | |||
| 00db8d0ae6 | |||
| ef66b6f848 | |||
| 59caed5e69 | |||
| dad0865d06 | |||
| c106c76cbc | |||
| 4181544de8 | |||
| 30c8414749 | |||
| 6bb9386773 | |||
| ae82cbcf67 | |||
| 518ac107c6 | |||
| 58f5f421e8 | |||
| 999950afc9 | |||
| 13a6249227 | |||
| c68df370cc | |||
| c08d551932 | |||
| fa63cf950a | |||
| 31cb1fd0f2 | |||
| 647236f7b0 | |||
| 43566fc4ae | |||
| 682c50793c | |||
| 2958b5a03c | |||
| 2b25d18bd5 | |||
| 248f9a5ba8 | |||
| 89ff802e16 | |||
| 13643dc1bc | |||
| 188ef240ae | |||
| a8c1b6363d | |||
| 8aaa6199f2 | |||
| 4cd544d59f | |||
| c9a4f2115d | |||
| 395efb8ef1 | |||
| 1280370a0a | |||
| f9bcfb5b50 | |||
| 3244b2d7e0 | |||
| eff0846c0f | |||
| e2a10d4067 | |||
| 39a1d16701 | |||
| adbe7f3295 | |||
| d67f234b2b | |||
| 14a3a77c9e | |||
| 0a1f505dd1 | |||
| c6b1af26ce | |||
| 4a42f1fc91 | |||
| 612a8f6d33 | |||
| e7b608ecc4 | |||
| bfe270b6e1 | |||
| e5f82cdb2d | |||
| d705c8cecc | |||
| f2613218db | |||
| 2099c4636c | |||
| 8cf93bfbc8 | |||
| b2dca45c34 | |||
| 403e4e1967 | |||
| 7ef771f14e | |||
| acb7db87df | |||
| 0f5b7f60b6 | |||
| d7264b0de1 | |||
| 23b518381a | |||
| 8876aae16c | |||
| 0ed5d1cf04 | |||
| 83decac5e9 | |||
| 9104494893 | |||
| 10d1a73eeb | |||
| 307c0b5edd | |||
| 321914861f | |||
| b851c527af | |||
| 69f1aa3072 | |||
| aeaee053c4 | |||
| 7632e82867 | |||
| ffbb5eb322 | |||
| fe6288d42c | |||
| f54ec0a5ab | |||
| 768b475183 | |||
| 0643968e77 | |||
| 18a17abad4 | |||
| c4b19710ef | |||
| 1beb1be29c | |||
| 621520e9e8 | |||
| f030f9b6ed | |||
| f6c5f90a75 | |||
| 3ad6f353b6 | |||
| debc426717 | |||
| 0e6f7110e4 | |||
| af3b9fcd6e | |||
| 8e5df9ff90 | |||
| 7e1eaf33af | |||
| 6a12e7cde9 | |||
| 9a4fb9fd61 | |||
| c77dd39a98 | |||
| a0a7d5755a | |||
| 5efa224a57 | |||
| 61e195d134 | |||
| 5b2c6db769 | |||
| c6fee1ccd6 | |||
| 60652a60df | |||
| b41f3576c9 | |||
| edacf85795 | |||
| 7dd9f021f0 | |||
| ce4da71c70 | |||
| 0380714faa | |||
| 2b7d962b27 | |||
| 11f73f74ff | |||
| 8cc101b169 | |||
| 0bd30d921b | |||
| fe238ca49a | |||
| 527a22c37b | |||
| e1ad72405f | |||
| 985a8b063d | |||
| 66677bc08e | |||
| f3434352d2 | |||
| 65b82b3609 | |||
| c3e544248f | |||
| 6a33d7ac72 | |||
| 9b8c5b9b19 | |||
| 130415e809 | |||
| 52a029e998 | |||
| d1a8286a21 | |||
| 78bccf2c7e | |||
| 4290cc3c35 | |||
| 8f70b0d26b | |||
| d9580c1dff | |||
| 763fa5e549 | |||
| 0c68ac35b5 | |||
| 3ed7128cc4 | |||
| d7f34d9f0e | |||
| 826fd6aaaf | |||
| 1fba2d19b3 | |||
| d92bbe59a6 | |||
| edc0243200 | |||
| 27ac4008f8 | |||
| 9dc7b851f5 | |||
| 4a2d941991 | |||
| a62c549e8f | |||
| 7232c54382 | |||
| 25067c9d06 | |||
| be8b1b696c | |||
| 885f18806e | |||
| b9ebf59fea | |||
| ba007b4710 | |||
| 1d8bc979c3 | |||
| a7197e360e | |||
| 878754ad8b | |||
| 4a08e654e0 | |||
| 5d94699990 | |||
| d98468a34d | |||
| 5f73e46e73 | |||
| 674ef50ac9 | |||
| d276202288 | |||
| 9b31f3be8d | |||
| 24d0f22f8e | |||
| 13cf7cd494 | |||
| 65c430318f | |||
| b4e6f9d48c | |||
| a024023c43 | |||
| 6edf2cd0b9 | |||
| d2b3e6b430 | |||
| b5476da7ef | |||
| 9c1afd279c | |||
| f998316b9e | |||
| fea1eade7f | |||
| 2517219f4c | |||
| c5d95b14ea | |||
| 0a7befb23b | |||
| 41116fb2b5 | |||
| cf2f5f2f9b | |||
| 35ba84724f | |||
| 2151fc6f90 | |||
| 45ed8258ca | |||
| ffc95dcd1b | |||
| 2c68166067 | |||
| ae83c7497a | |||
| 03c675cf62 | |||
| a4d8670563 | |||
| 0114b629e6 | |||
| 7f4280af72 | |||
| e7b4080c2a | |||
| c541832066 | |||
| 8b57bffcd6 | |||
| 7a4e3ad1a3 | |||
| 7a2c2c6201 | |||
| a8c0fdb670 | |||
| 5ce310fe6d | |||
| 89818e9ee2 | |||
| d943b85cc9 | |||
| 8eaa78bf4b | |||
| 82d6c29f21 | |||
| 72a8aa16bb | |||
| 5c9b799afe | |||
| eb584dac56 | |||
| 2fd610a09c | |||
| 8eb88f474a | |||
| f73291c269 | |||
| e93e5807f9 | |||
| 6d0a2e186b | |||
| c2a700ef3a | |||
| 7b0deaf9c1 | |||
| 98d1ccb2c0 | |||
| e6f46e1788 | |||
| e6c2becccb | |||
| cfc9f99c83 | |||
| 3c43b277b7 | |||
| 64f789e52a | |||
| 9ab4dae87b | |||
| f2b742e470 | |||
| a3f44fa53c | |||
| 91d06ef6a4 | |||
| b9df9861fc | |||
| 049e2a9214 | |||
| 78bb7ff465 | |||
| 8e04a559b9 | |||
| aa3f3e2269 | |||
| bcc505f5dd | |||
| f0617924b0 | |||
| 14c33a8191 | |||
| fcd92d0155 | |||
| 9d73c644a7 | |||
| c5c0fdc7cc | |||
| 42d7b8b820 | |||
| 2983dd6270 | |||
| 7d684153a9 | |||
| bc26eb05a7 | |||
| ec38767570 | |||
| 5340cfeb84 | |||
| 734e310f28 | |||
| e388cc7556 | |||
| 0263e08415 | |||
| 65f8fcc926 | |||
| 59a3c1d4de | |||
| 206d4d7433 | |||
| 8c8833b26e | |||
| 392a3e4998 | |||
| 76a423a964 | |||
| 63c19a0c61 | |||
| f3f4689cc8 | |||
| 2050efbfbf | |||
| 8d5734b739 | |||
| f23897d7d8 | |||
| 22b00bf301 | |||
| 76355d3ca1 | |||
| 14b29a6588 | |||
| 5eafcf5b76 | |||
| 9c43d22eb1 | |||
| 06428958dd | |||
| 0d84783032 | |||
| 25af8d6213 | |||
| e3549ce9e5 | |||
| 1d859e5c13 | |||
| 4ef84d1f8d | |||
| ed791eb748 | |||
| 5c6acc2028 | |||
| a9dc177a34 | |||
| ef32063715 | |||
| bdaa52dedc | |||
| c5d7ba76c7 | |||
| 358e8c9158 | |||
| d1dd841da8 | |||
| 8137ebfd99 | |||
| cc45eda3ef | |||
| 8415d92264 | |||
| 17d95716b6 | |||
| 6db2fc373d | |||
| ebbf404c68 | |||
| 9fc328f675 | |||
| ba489aaea3 | |||
| 67ec1dd41f | |||
| ae50fc36d6 | |||
| f401067dd9 | |||
| a02bee95de | |||
| ec7b2a2fe9 | |||
| 2a40427cd6 | |||
| eb42d3e4d1 | |||
| 03f4715693 | |||
| c35dfb8017 | |||
| 7bdacd9ed5 | |||
| c8ca22f308 | |||
| 13b147932e | |||
| 29b6dc17c0 | |||
| 8ff1df4333 | |||
| af0241f1eb | |||
| 3719cc90be | |||
| 396297d6f7 | |||
| cb4b5741d7 | |||
| da000e60bd | |||
| c4a38e7691 | |||
| 8972cd081b | |||
| b930a7e9f7 | |||
| 85a7fc8ca7 | |||
| 869a442843 | |||
| 49b6d81216 | |||
| 21d84fd39d | |||
| 2a12db0133 | |||
| 9c5118264c | |||
| 3a8df54936 | |||
| a3c8ad5efb | |||
| b38a1ccef8 | |||
| 321bb0bd16 | |||
| 6c96796584 | |||
| c6bc2ba192 | |||
| c5f8e0f7a2 | |||
| 9ff0e4cbe4 | |||
| 4c0a61ccad | |||
| 8ddabcee34 | |||
| ccef91e0ed | |||
| f9057b2983 | |||
| 5e276e88f8 | |||
| 6c4428b4ef | |||
| fd32e06cd2 | |||
| 1a4615a781 | |||
| 3823561a0a | |||
| b667a65f31 | |||
| 88df4c8d42 | |||
| 8082c06548 | |||
| 21bf90efc0 | |||
| 6d22f2d409 | |||
| ffa788dd4e | |||
| 79a045e3bb | |||
| 2fb8a97b71 | |||
| 26065f3699 | |||
| 4f2ba52404 | |||
| be23ff67aa | |||
| ff79cbf502 | |||
| 8b8f3fa54b | |||
| 1f2bb4c33a | |||
| 9d458b7e04 | |||
| dedf840131 | |||
| 7dc2c69292 | |||
| def86d31a4 | |||
| 3038f62405 | |||
| fe01b971cf | |||
| 918c865202 | |||
| 6e30f6cd4e | |||
| ff73c05ba6 | |||
| dbf520b556 | |||
| fc046db74b | |||
| 96bae83dd1 | |||
| aae802193c | |||
| 8dc316d6a4 | |||
| ad86356f9a | |||
| 007ef7304b | |||
| 019a6deaf4 | |||
| 7da96ad2c7 | |||
| 7ebc1ba322 | |||
| c5e9cb9c32 | |||
| a3ec52058e | |||
| d78f213006 | |||
| 73b2015d02 | |||
| cedad9a7a6 | |||
| 65d6c2f28f | |||
| 18c7618ebf | |||
| e29a5c2517 | |||
| 6f3c922010 | |||
| 2b902ef731 | |||
| 7cb070b6b1 | |||
| e788f5954e | |||
| bfb370d8fe | |||
| 0332b6c56b | |||
| e5bdab5a24 | |||
| a42ef3ff84 | |||
| da33cf1fd3 | |||
| 4290a5e814 | |||
| 8e425d5d87 | |||
| 8aeff4bb9a | |||
| 6d23ca208e | |||
| 41ccb74258 | |||
| 5f1b047221 | |||
| a5b26b92de | |||
| 5e71ef48dd | |||
| 2fc51aa02e | |||
| 7dc90af1c8 | |||
| 7a564110a5 | |||
| bb08cd494a | |||
| 3b5885e2c9 | |||
| d9810c3c1f | |||
| 13f060d100 | |||
| 40164e8cbd | |||
| f9187d3252 | |||
| b86fe8b3c7 | |||
| 9cdddb99c5 | |||
| 35bb470eb1 | |||
| 1a1597ba49 | |||
| 8c55eb48af | |||
| cd3dfb985c | |||
| 19bf7838c4 | |||
| 05da8fd990 | |||
| d28ad77974 | |||
| 379424e228 | |||
| 355336c9ff | |||
| 46b213bbfa | |||
| 4fda4eda9e | |||
| 3bffc0142c | |||
| 21f5d55569 | |||
| 12d7254c83 | |||
| 35dd9bb964 | |||
| e104aec12d | |||
| e11dcecace | |||
| 84d2f689ed | |||
| 52c060c8be | |||
| 28dc3d1a94 | |||
| ef2ee20495 | |||
| f4f253a218 | |||
| 2f0f3c74f3 | |||
| 2809615f7b | |||
| a617044695 | |||
| 379cd9e98d | |||
| 60d880aac2 | |||
| 89d736c311 | |||
| 96faa74cf0 | |||
| 0f6a8af649 | |||
| 80b3607bc1 | |||
| 9c1c2a21a4 | |||
| ab13ead2a8 | |||
| dea3f4f4fd | |||
| 4bf7d41ff1 | |||
| 54bb1e2064 | |||
| 3e818073e0 | |||
| 9c8d27e687 | |||
| ca138aa8af | |||
| 784df1e08f | |||
| a12846fddc | |||
| 820268a2a1 | |||
| 7e19f9ee0d | |||
| 6558683822 | |||
| 8401688019 | |||
| cfd999b373 | |||
| 70b156b828 | |||
| 6e056afe67 | |||
| caa93f691c | |||
| 34776f0af1 | |||
| 7f30239b2a | |||
| 6d744fab45 | |||
| cf6ed4a265 | |||
| 62e0472698 | |||
| d477340177 | |||
| f9c910f5ac | |||
| 41a225ec83 | |||
| 35c98d1b97 | |||
| 1a477e26bc | |||
| 8166950e74 | |||
| ea0d1cee92 | |||
| 8df0278272 | |||
| 6c471c33f7 | |||
| 5182276d1e | |||
| d18e69ee75 | |||
| f363249e41 | |||
| 342fbc2fcc | |||
| 150617ca7a | |||
| 7196117da7 | |||
| ba1feb92ec | |||
| 7452406a00 | |||
| 2c910092c8 | |||
| c3d9df2cb0 | |||
| b573560024 | |||
| 1633e21d9b | |||
| 406d7ae6e9 | |||
| 2055d2da9a | |||
| ec4fc1864c | |||
| fa0aa29974 | |||
| 8e4d046365 | |||
| aec2c05778 | |||
| 5cd78b81d1 | |||
| d906e2675d | |||
| ac5949e2a0 | |||
| 72111e6c3a | |||
| dad7e92a41 | |||
| 8cf07d7418 | |||
| 3ae887ef0e | |||
| ac34c94aad | |||
| dd54fa49f0 | |||
| 4f1920ac35 | |||
| 7693435eab | |||
| 5451b4cfb4 | |||
| 3677d8f6a1 | |||
| 8f3fd2e2a5 | |||
| d7a1249a3f | |||
| 290cfca8b3 | |||
| 5717331eb6 | |||
| 0bf5355641 | |||
| b4c0b61815 | |||
| 011c084203 | |||
| 10215a086f | |||
| 882c3f0c76 | |||
| c3151cc1f5 | |||
| cb1b2c04c7 | |||
| 8ab6e708f6 | |||
| 06805d8d27 | |||
| 557b1d375e | |||
| b9cf6573bd | |||
| 2cd17956fa | |||
| 435d82cfba | |||
| c1b7e8d56c | |||
| 2956e1599a | |||
| 4545f906ef | |||
| ae7d092e1a | |||
| 7252a96939 | |||
| b24abc3831 | |||
| 22395725a3 | |||
| 9beb7bc157 | |||
| f0d8a6b811 | |||
| 202ac3ca3b | |||
| 1f6075cae7 | |||
| 0ab8844d04 | |||
| 1bb1112db2 | |||
| 61804bcbe7 | |||
| 31ace98f68 | |||
| e9480830d8 | |||
| 7490f1ef84 | |||
| f7e41e3653 |
@@ -127,6 +127,6 @@ sudo nixos-rebuild switch --flake ~/.config/nixos#yourhostname
|
|||||||
|
|
||||||
<div align="center">
|
<div align="center">
|
||||||
<a href="https://github.com/anotherhadi/nixy">github</a> |
|
<a href="https://github.com/anotherhadi/nixy">github</a> |
|
||||||
<a href="https://gitlab.com/anotherhadi_mirror/nixy">gitlab (mirror)</a> |
|
<a href="https://gitlab.com/anotherhadi/nixy">gitlab (mirror)</a> |
|
||||||
<a href="https://git.hadi.icu/anotherhadi/nixy">gitea (mirror)</a>
|
<a href="https://git.hadi.icu/anotherhadi/nixy">gitea (mirror)</a>
|
||||||
</div
|
</div
|
||||||
|
|||||||
Binary file not shown.
|
After Width: | Height: | Size: 837 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 738 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.1 MiB |
@@ -1,3 +1,2 @@
|
|||||||
.sops.yaml
|
.sops.yaml
|
||||||
.claude/
|
|
||||||
old/
|
old/
|
||||||
|
|||||||
@@ -137,6 +137,6 @@ sudo nixos-rebuild switch --flake ~/.config/nixos#yourhostname
|
|||||||
|
|
||||||
<div align="center">
|
<div align="center">
|
||||||
<a href="https://github.com/anotherhadi/nixy">github</a> |
|
<a href="https://github.com/anotherhadi/nixy">github</a> |
|
||||||
<a href="https://gitlab.com/anotherhadi_mirror/nixy">gitlab (mirror)</a> |
|
<a href="https://gitlab.com/anotherhadi/nixy">gitlab (mirror)</a> |
|
||||||
<a href="https://git.hadi.icu/anotherhadi/nixy">gitea (mirror)</a>
|
<a href="https://git.hadi.icu/anotherhadi/nixy">gitea (mirror)</a>
|
||||||
</div
|
</div
|
||||||
|
|||||||
@@ -24,6 +24,8 @@ The server hosts several key applications:
|
|||||||
- **Mealie**: A self-hosted recipe manager and meal planner with a clean user interface.
|
- **Mealie**: A self-hosted recipe manager and meal planner with a clean user interface.
|
||||||
- **Stirling-PDF**: A powerful, locally hosted web application for editing, merging, and converting PDF files.
|
- **Stirling-PDF**: A powerful, locally hosted web application for editing, merging, and converting PDF files.
|
||||||
- **CyberChef**: The "Cyber Swiss Army Knife" for data analysis, decoding, and encryption tasks.
|
- **CyberChef**: The "Cyber Swiss Army Knife" for data analysis, decoding, and encryption tasks.
|
||||||
|
- **Linkding**: A simple, fast, and minimalist bookmark manager.
|
||||||
- **Mazanoke**: A utility service for image processing, specialized in format conversion and downgrading/optimization.
|
- **Mazanoke**: A utility service for image processing, specialized in format conversion and downgrading/optimization.
|
||||||
|
- **Eleakxir**: A private search engine for exploring data wells (parquet files) with a modern web interface.
|
||||||
- **SSH**: Secure remote access configuration for server management. (via browser too)
|
- **SSH**: Secure remote access configuration for server management. (via browser too)
|
||||||
- **Security related stuff**: Cloudflared, Fail2Ban, Firewall
|
- **Security related stuff**: Cloudflared, Fail2Ban, Firewall
|
||||||
|
|||||||
Generated
+193
-240
@@ -20,11 +20,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1775558810,
|
"lastModified": 1774211390,
|
||||||
"narHash": "sha256-fy95EdPnqQlpbP8+rk0yWKclWShCUS5VKs6P7/1MF2c=",
|
"narHash": "sha256-sTtAgCCaX8VNNZlQFACd3i1IQ+DB0Wf3COgiFS152ds=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "aquamarine",
|
"repo": "aquamarine",
|
||||||
"rev": "7371b669b22aa2af980f913fc312a786d2f1abb2",
|
"rev": "f62a4dbfa4e5584f14ad4c62afedf6e4b433cf70",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -38,11 +38,11 @@
|
|||||||
"nixpkgs": "nixpkgs"
|
"nixpkgs": "nixpkgs"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1776107237,
|
"lastModified": 1774471529,
|
||||||
"narHash": "sha256-IKX4tDRbj0yzmuGukXeh4FDcESxQ/GHwtDkz9tuktEo=",
|
"narHash": "sha256-WEBeASUv9MBSp8Ch8m7x4NoE4JMoHkjRU6mw7aA/qp8=",
|
||||||
"owner": "anotherhadi",
|
"owner": "anotherhadi",
|
||||||
"repo": "awesome-wallpapers",
|
"repo": "awesome-wallpapers",
|
||||||
"rev": "9cdea94e611b0a255d507dfd9781a24a3da27845",
|
"rev": "1c2105b7e594e5a96fe7eaa2c9a00ec215e053bd",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -125,11 +125,11 @@
|
|||||||
"nixpkgs": "nixpkgs_2"
|
"nixpkgs": "nixpkgs_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1775921702,
|
"lastModified": 1774893414,
|
||||||
"narHash": "sha256-H/r9IydVUA+89ZIqvNxmTB1z7DMNYrNcxuG+7s0oVQ8=",
|
"narHash": "sha256-2n0foeNENf4O3ZHmsppYtecrVWwjU80A6Dohjy1BKLA=",
|
||||||
"owner": "anotherhadi",
|
"owner": "anotherhadi",
|
||||||
"repo": "blog",
|
"repo": "blog",
|
||||||
"rev": "163471bc2f0f18e001bcef9db18900d70b4ef637",
|
"rev": "cd93b16618678bbebade1ed6898f3844bf61d25d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -210,31 +210,6 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"bun2nix_4": {
|
|
||||||
"inputs": {
|
|
||||||
"flake-parts": "flake-parts_4",
|
|
||||||
"import-tree": "import-tree_4",
|
|
||||||
"nixpkgs": [
|
|
||||||
"iknowyou",
|
|
||||||
"nixpkgs"
|
|
||||||
],
|
|
||||||
"systems": "systems_5",
|
|
||||||
"treefmt-nix": "treefmt-nix_4"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1770895533,
|
|
||||||
"narHash": "sha256-v3QaK9ugy9bN9RXDnjw0i2OifKmz2NnKM82agtqm/UY=",
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "bun2nix",
|
|
||||||
"rev": "c843f477b15f51151f8c6bcc886954699440a6e1",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "bun2nix",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"caelestia-cli": {
|
"caelestia-cli": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"caelestia-shell": "caelestia-shell",
|
"caelestia-shell": "caelestia-shell",
|
||||||
@@ -243,11 +218,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1776578469,
|
"lastModified": 1774320558,
|
||||||
"narHash": "sha256-e1OBCHKW7xubcV1fwkTPe4p1rsLM+QnuhwgPf4LmGVA=",
|
"narHash": "sha256-A9PIRLTV3bOX3sl9G6IO+BRO9Q6vP1KmfPYUVmtVZt4=",
|
||||||
"owner": "caelestia-dots",
|
"owner": "caelestia-dots",
|
||||||
"repo": "cli",
|
"repo": "cli",
|
||||||
"rev": "463f36544a25bc5b0a99317a32e8d3814eb2f66b",
|
"rev": "5bb3276b1418463e7c313f1b2fc064dcbf5b2c86",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -292,11 +267,11 @@
|
|||||||
"quickshell": "quickshell"
|
"quickshell": "quickshell"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1775801889,
|
"lastModified": 1774280005,
|
||||||
"narHash": "sha256-q1LGwhQbNOurIAClh5YwKVU2kJ5lTCxRYZf48bAb9IM=",
|
"narHash": "sha256-Sj28gSYkCgN0ZXpTMYpnpAu4lK51ieCMngOGedB82So=",
|
||||||
"owner": "caelestia-dots",
|
"owner": "caelestia-dots",
|
||||||
"repo": "shell",
|
"repo": "shell",
|
||||||
"rev": "0e07176ff149d02391531c802b51c28e73185f30",
|
"rev": "501a14bd2a8ab7703aac6a224824a23818552554",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -314,11 +289,11 @@
|
|||||||
"quickshell": "quickshell_2"
|
"quickshell": "quickshell_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1776610813,
|
"lastModified": 1774280005,
|
||||||
"narHash": "sha256-izquCGM5xB4rxvvtRQsgvX483TuWrd5RwkXPcVwUTl0=",
|
"narHash": "sha256-Sj28gSYkCgN0ZXpTMYpnpAu4lK51ieCMngOGedB82So=",
|
||||||
"owner": "caelestia-dots",
|
"owner": "caelestia-dots",
|
||||||
"repo": "shell",
|
"repo": "shell",
|
||||||
"rev": "f77ba920ead8b8e82753c1f66ad417cc734631a3",
|
"rev": "501a14bd2a8ab7703aac6a224824a23818552554",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -333,11 +308,11 @@
|
|||||||
"nixpkgs": "nixpkgs_4"
|
"nixpkgs": "nixpkgs_4"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1775241840,
|
"lastModified": 1774887895,
|
||||||
"narHash": "sha256-lknjyRTFqk/lmgWNfTDsJYDyQQ+x2yq79IMVT3ASOD8=",
|
"narHash": "sha256-cULnvYcj/LzUtV8Q6HyYHgKevQBZjAF4FF5YaV68fkc=",
|
||||||
"owner": "anotherhadi",
|
"owner": "anotherhadi",
|
||||||
"repo": "default-creds",
|
"repo": "default-creds",
|
||||||
"rev": "7d1650a207b4dd9bb165ce264dc8d4846113f7be",
|
"rev": "1b7c96da8f3a3923c1cfa36b01cd87b598bed5a5",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -349,11 +324,11 @@
|
|||||||
"firefox-gnome-theme": {
|
"firefox-gnome-theme": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1775176642,
|
"lastModified": 1764873433,
|
||||||
"narHash": "sha256-2veEED0Fg7Fsh81tvVDNYR6SzjqQxa7hbi18Jv4LWpM=",
|
"narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=",
|
||||||
"owner": "rafaelmardojai",
|
"owner": "rafaelmardojai",
|
||||||
"repo": "firefox-gnome-theme",
|
"repo": "firefox-gnome-theme",
|
||||||
"rev": "179704030c5286c729b5b0522037d1d51341022c",
|
"rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -379,6 +354,20 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-compat_2": {
|
"flake-compat_2": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1733328505,
|
||||||
|
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
|
||||||
|
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
|
||||||
|
"revCount": 69,
|
||||||
|
"type": "tarball",
|
||||||
|
"url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"type": "tarball",
|
||||||
|
"url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"flake-compat_3": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1751685974,
|
"lastModified": 1751685974,
|
||||||
@@ -453,11 +442,11 @@
|
|||||||
"nixpkgs-lib": "nixpkgs-lib_4"
|
"nixpkgs-lib": "nixpkgs-lib_4"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1769996383,
|
"lastModified": 1772408722,
|
||||||
"narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
|
"narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "flake-parts",
|
"repo": "flake-parts",
|
||||||
"rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
|
"rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -495,11 +484,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1775087534,
|
"lastModified": 1767609335,
|
||||||
"narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
|
"narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "flake-parts",
|
"repo": "flake-parts",
|
||||||
"rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
|
"rev": "250481aafeb741edfe23d29195671c19b36b6dca",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -549,18 +538,20 @@
|
|||||||
"gnome-shell": {
|
"gnome-shell": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
|
"host": "gitlab.gnome.org",
|
||||||
"lastModified": 1767737596,
|
"lastModified": 1767737596,
|
||||||
"narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=",
|
"narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=",
|
||||||
"owner": "GNOME",
|
"owner": "GNOME",
|
||||||
"repo": "gnome-shell",
|
"repo": "gnome-shell",
|
||||||
"rev": "ef02db02bf0ff342734d525b5767814770d85b49",
|
"rev": "ef02db02bf0ff342734d525b5767814770d85b49",
|
||||||
"type": "github"
|
"type": "gitlab"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
"host": "gitlab.gnome.org",
|
||||||
"owner": "GNOME",
|
"owner": "GNOME",
|
||||||
|
"ref": "gnome-49",
|
||||||
"repo": "gnome-shell",
|
"repo": "gnome-shell",
|
||||||
"rev": "ef02db02bf0ff342734d525b5767814770d85b49",
|
"type": "gitlab"
|
||||||
"type": "github"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"home-manager": {
|
"home-manager": {
|
||||||
@@ -570,11 +561,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1776562531,
|
"lastModified": 1774379316,
|
||||||
"narHash": "sha256-Lh5Ns9DI67E+lSMOCGK0S+mFPy0mz0yOGiJTUXiR9JI=",
|
"narHash": "sha256-0nGNxWDUH2Hzlj/R3Zf4FEK6fsFNB/dvewuboSRZqiI=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "5b56ad02dc643808b8af6d5f3ff179e2ce9593f4",
|
"rev": "1eb0549a1ab3fe3f5acf86668249be15fa0e64f7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -628,11 +619,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1775496928,
|
"lastModified": 1772461523,
|
||||||
"narHash": "sha256-Ds759WU03mGWtu3I43J+5GF5Ni8TvF+GYQUFD+fVeMo=",
|
"narHash": "sha256-mI6A51do+hEUzeJKk9YSWfVHdI/SEEIBi2tp5Whq5mI=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprgraphics",
|
"repo": "hyprgraphics",
|
||||||
"rev": "cf95d93d17baa18f1d9b016b3afe27f820521a6e",
|
"rev": "7d63c04b4a2dd5e59ef943b4b143f46e713df804",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -658,11 +649,11 @@
|
|||||||
"xdph": "xdph"
|
"xdph": "xdph"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1776514109,
|
"lastModified": 1774445873,
|
||||||
"narHash": "sha256-WkUvIWPUrZxR4oSCiExhuMFCjFMQ0cRnZk9e0+ZqhC0=",
|
"narHash": "sha256-chWRF3JavLDD9tOI8Av/1LSAkpvk/+BYvNQvTB8Ctyo=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "889ee4f26d77ff0c36f5c4767ef0629371fd2c18",
|
"rev": "8196711aaa78c8f62e6f720636ef707783685036",
|
||||||
"revCount": 7163,
|
"revCount": 7054,
|
||||||
"submodules": true,
|
"submodules": true,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/hyprwm/Hyprland"
|
"url": "https://github.com/hyprwm/Hyprland"
|
||||||
@@ -706,11 +697,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1774710575,
|
"lastModified": 1772467975,
|
||||||
"narHash": "sha256-p7Rcw13+gA4Z9EI3oGYe3neQ3FqyOOfZCleBTfhJ95Q=",
|
"narHash": "sha256-kipyuDBxrZq+beYpZqWzGvFWm4QbayW9agAvi94vDXY=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprland-guiutils",
|
"repo": "hyprland-guiutils",
|
||||||
"rev": "0703df899520001209646246bef63358c9881e36",
|
"rev": "5e1c6b9025aaf4d578f3eff7c0eb1f0c197a9507",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -837,11 +828,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1774911391,
|
"lastModified": 1774211405,
|
||||||
"narHash": "sha256-c4YVwO33Mmw+FIV8E0u3atJZagHvGTJ9Jai6RtiB8rE=",
|
"narHash": "sha256-6KNwP4ojUzv3YBlZU5BqCpTrWHcix1Jo01BISsTT0xk=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprutils",
|
"repo": "hyprutils",
|
||||||
"rev": "e6caa3d4d1427eedbdf556cf4ceb70f2d9c0b56d",
|
"rev": "cb4e152dc72095a2af422956c6b689590572231a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -891,11 +882,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1775414057,
|
"lastModified": 1773074819,
|
||||||
"narHash": "sha256-mDpHnf+MkdOxEqIM1TnckYYh9p1SXR8B3KQfNZ12M8s=",
|
"narHash": "sha256-qRqYnXiKoJLRTcfaRukn7EifmST2IVBUMZOeZMAc5UA=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprwire",
|
"repo": "hyprwire",
|
||||||
"rev": "86012ee01b0fdd8bf3101ef38816f2efbee42490",
|
"rev": "f68afd0e73687598cc2774804fedad76693046f0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -904,26 +895,6 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"iknowyou": {
|
|
||||||
"inputs": {
|
|
||||||
"bun2nix": "bun2nix_4",
|
|
||||||
"nixpkgs": "nixpkgs_6",
|
|
||||||
"nur-osint": "nur-osint"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1776101657,
|
|
||||||
"narHash": "sha256-N0VpyeJxr5tZ/DNgggebtTJelklSp5AJYwqh7l5tCvw=",
|
|
||||||
"owner": "anotherhadi",
|
|
||||||
"repo": "iknowyou",
|
|
||||||
"rev": "ea5c3484d9aed81219184e70e32f0e4f76b12c2c",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "anotherhadi",
|
|
||||||
"repo": "iknowyou",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"import-tree": {
|
"import-tree": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1763762820,
|
"lastModified": 1763762820,
|
||||||
@@ -969,21 +940,6 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"import-tree_4": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1763762820,
|
|
||||||
"narHash": "sha256-ZvYKbFib3AEwiNMLsejb/CWs/OL/srFQ8AogkebEPF0=",
|
|
||||||
"owner": "vic",
|
|
||||||
"repo": "import-tree",
|
|
||||||
"rev": "3c23749d8013ec6daa1d7255057590e9ca726646",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "vic",
|
|
||||||
"repo": "import-tree",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"mnw": {
|
"mnw": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1770419553,
|
"lastModified": 1770419553,
|
||||||
@@ -1028,11 +984,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1776575850,
|
"lastModified": 1774156144,
|
||||||
"narHash": "sha256-28Gqz0GDpGsBv8GtAn2dywEQRr+CtTDsD5J7VD6icBE=",
|
"narHash": "sha256-gdYe9wTPl4ignDyXUl1LlICWj41+S0GB5lG1fKP17+A=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nix-index-database",
|
"repo": "nix-index-database",
|
||||||
"rev": "3b9653a107c736222b5ae0d4036dd3b885219065",
|
"rev": "55b588747fa3d7fc351a11831c4b874dab992862",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1043,7 +999,7 @@
|
|||||||
},
|
},
|
||||||
"nixarr": {
|
"nixarr": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": "nixpkgs_7",
|
"nixpkgs": "nixpkgs_6",
|
||||||
"vpnconfinement": "vpnconfinement",
|
"vpnconfinement": "vpnconfinement",
|
||||||
"website-builder": "website-builder"
|
"website-builder": "website-builder"
|
||||||
},
|
},
|
||||||
@@ -1061,13 +1017,34 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nixcord": {
|
||||||
|
"inputs": {
|
||||||
|
"flake-compat": "flake-compat_2",
|
||||||
|
"flake-parts": "flake-parts_4",
|
||||||
|
"nixpkgs": "nixpkgs_7",
|
||||||
|
"nixpkgs-nixcord": "nixpkgs-nixcord"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1774456554,
|
||||||
|
"narHash": "sha256-FwlMuGluoa1iWkDsLrzi1ha5nGQzBbw3i+N385BQMgc=",
|
||||||
|
"owner": "kaylorben",
|
||||||
|
"repo": "nixcord",
|
||||||
|
"rev": "82c0155f98000cc691d2b25cc36908b9ba6a05aa",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "kaylorben",
|
||||||
|
"repo": "nixcord",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1775490113,
|
"lastModified": 1774465523,
|
||||||
"narHash": "sha256-2ZBhDNZZwYkRmefK5XLOusCJHnoeKkoN95hoSGgMxWM=",
|
"narHash": "sha256-4v7HPm63Q90nNn4fgkgKsjW1AH2Klw7XzPtHJr562nM=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "c775c2772ba56e906cbeb4e0b2db19079ef11ff7",
|
"rev": "de895be946ad1d8aafa0bb6dfc7e7e0e9e466a29",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1140,11 +1117,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs-lib_4": {
|
"nixpkgs-lib_4": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1769909678,
|
"lastModified": 1772328832,
|
||||||
"narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=",
|
"narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixpkgs.lib",
|
"repo": "nixpkgs.lib",
|
||||||
"rev": "72716169fe93074c333e8d0173151350670b824c",
|
"rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1153,29 +1130,45 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nixpkgs-nixcord": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1773222311,
|
||||||
|
"narHash": "sha256-BHoB/XpbqoZkVYZCfXJXfkR+GXFqwb/4zbWnOr2cRcU=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "0590cd39f728e129122770c029970378a79d076a",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"ref": "nixos-25.11",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nixpkgs-stable": {
|
"nixpkgs-stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1776434932,
|
"lastModified": 1767313136,
|
||||||
"narHash": "sha256-gyqXNMgk3sh+ogY5svd2eNLJ6oEwzbAeaoBrrxD0lKk=",
|
"narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "c7f47036d3df2add644c46d712d14262b7d86c0c",
|
"rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"ref": "nixos-25.11",
|
"ref": "nixos-25.05",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_10": {
|
"nixpkgs_10": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1775888245,
|
"lastModified": 1773840656,
|
||||||
"narHash": "sha256-nwASzrRDD1JBEu/o8ekKYEXm/oJW6EMCzCRdrwcLe90=",
|
"narHash": "sha256-9tpvMGFteZnd3gRQZFlRCohVpqooygFuy9yjuyRL2C0=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "13043924aaa7375ce482ebe2494338e058282925",
|
"rev": "9cf7092bdd603554bd8b63c216e8943cf9b12512",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1187,11 +1180,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_11": {
|
"nixpkgs_11": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1775036866,
|
"lastModified": 1767767207,
|
||||||
"narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=",
|
"narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "6201e203d09599479a3b3450ed24fa81537ebc4e",
|
"rev": "5912c1772a44e31bf1c63c0390b90501e5026886",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1251,11 +1244,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_5": {
|
"nixpkgs_5": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1775423009,
|
"lastModified": 1774106199,
|
||||||
"narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=",
|
"narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9",
|
"rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1266,22 +1259,6 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_6": {
|
"nixpkgs_6": {
|
||||||
"locked": {
|
|
||||||
"lastModified": 1775710090,
|
|
||||||
"narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "4c1018dae018162ec878d42fec712642d214fdfa",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NixOS",
|
|
||||||
"ref": "nixos-unstable",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs_7": {
|
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1765608474,
|
"lastModified": 1765608474,
|
||||||
"narHash": "sha256-9Wx53UK0z8Di5iesJID0tS1dRKwGxI4i7tsSanOHhF0=",
|
"narHash": "sha256-9Wx53UK0z8Di5iesJID0tS1dRKwGxI4i7tsSanOHhF0=",
|
||||||
@@ -1297,13 +1274,29 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nixpkgs_7": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1773222311,
|
||||||
|
"narHash": "sha256-BHoB/XpbqoZkVYZCfXJXfkR+GXFqwb/4zbWnOr2cRcU=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "0590cd39f728e129122770c029970378a79d076a",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"ref": "nixos-25.11",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nixpkgs_8": {
|
"nixpkgs_8": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1776169885,
|
"lastModified": 1774106199,
|
||||||
"narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=",
|
"narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9",
|
"rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1315,11 +1308,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_9": {
|
"nixpkgs_9": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1774386573,
|
"lastModified": 1771008912,
|
||||||
"narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=",
|
"narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9",
|
"rev": "a82ccc39b39b621151d6732718e3e250109076fa",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1341,11 +1334,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1775228139,
|
"lastModified": 1767810917,
|
||||||
"narHash": "sha256-ebbeHmg+V7w8050bwQOuhmQHoLOEOfqKzM1KgCTexK4=",
|
"narHash": "sha256-ZKqhk772+v/bujjhla9VABwcvz+hB2IaRyeLT6CFnT0=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NUR",
|
"repo": "NUR",
|
||||||
"rev": "601971b9c89e0304561977f2c28fa25e73aa7132",
|
"rev": "dead29c804adc928d3a69dfe7f9f12d0eec1f1a4",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1354,42 +1347,21 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nur-osint": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": [
|
|
||||||
"iknowyou",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1775935554,
|
|
||||||
"narHash": "sha256-7StMiQf3HSBruAxZ2/ZYJhhNEp1KbglGVijQBrurqiM=",
|
|
||||||
"owner": "anotherhadi",
|
|
||||||
"repo": "nur-osint",
|
|
||||||
"rev": "460e377522a43d3d968be20bec2cf40a72013904",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "anotherhadi",
|
|
||||||
"repo": "nur-osint",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nvf": {
|
"nvf": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-compat": "flake-compat_2",
|
"flake-compat": "flake-compat_3",
|
||||||
"flake-parts": "flake-parts_5",
|
"flake-parts": "flake-parts_5",
|
||||||
"mnw": "mnw",
|
"mnw": "mnw",
|
||||||
"ndg": "ndg",
|
"ndg": "ndg",
|
||||||
"nixpkgs": "nixpkgs_9",
|
"nixpkgs": "nixpkgs_9",
|
||||||
"systems": "systems_6"
|
"systems": "systems_5"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1776614090,
|
"lastModified": 1774375131,
|
||||||
"narHash": "sha256-zLlv5QgRgsfxoETBNIb9BhUFMtsYkLDZAIdmchG77Xo=",
|
"narHash": "sha256-d22VIgsDXagQQWnAnebYeQWGHlmF81YRwuGCzAgNZAQ=",
|
||||||
"owner": "notashelf",
|
"owner": "notashelf",
|
||||||
"repo": "nvf",
|
"repo": "nvf",
|
||||||
"rev": "c7c90abadb6f714df24b16120e9c57817b62a0cb",
|
"rev": "d847d401bea4dcb1478d02a61a3209fa8512f71d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1408,11 +1380,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1775036584,
|
"lastModified": 1774104215,
|
||||||
"narHash": "sha256-zW0lyy7ZNNT/x8JhzFHBsP2IPx7ATZIPai4FJj12BgU=",
|
"narHash": "sha256-EAtviqz0sEAxdHS4crqu7JGR5oI3BwaqG0mw7CmXkO8=",
|
||||||
"owner": "cachix",
|
"owner": "cachix",
|
||||||
"repo": "git-hooks.nix",
|
"repo": "git-hooks.nix",
|
||||||
"rev": "4e0eb042b67d863b1b34b3f64d52ceb9cd926735",
|
"rev": "f799ae951fde0627157f40aec28dec27b22076d0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1474,9 +1446,9 @@
|
|||||||
"default-creds": "default-creds",
|
"default-creds": "default-creds",
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"hyprland": "hyprland",
|
"hyprland": "hyprland",
|
||||||
"iknowyou": "iknowyou",
|
|
||||||
"nix-index-database": "nix-index-database",
|
"nix-index-database": "nix-index-database",
|
||||||
"nixarr": "nixarr",
|
"nixarr": "nixarr",
|
||||||
|
"nixcord": "nixcord",
|
||||||
"nixos-hardware": "nixos-hardware",
|
"nixos-hardware": "nixos-hardware",
|
||||||
"nixpkgs": "nixpkgs_8",
|
"nixpkgs": "nixpkgs_8",
|
||||||
"nixpkgs-stable": "nixpkgs-stable",
|
"nixpkgs-stable": "nixpkgs-stable",
|
||||||
@@ -1491,11 +1463,11 @@
|
|||||||
"nixpkgs": "nixpkgs_10"
|
"nixpkgs": "nixpkgs_10"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1776119890,
|
"lastModified": 1774303811,
|
||||||
"narHash": "sha256-Zm6bxLNnEOYuS/SzrAGsYuXSwk3cbkRQZY0fJnk8a5M=",
|
"narHash": "sha256-fhG4JAcLgjKwt+XHbjs8brpWnyKUfU4LikLm3s0Q/ic=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "d4971dd58c6627bfee52a1ad4237637c0a2fb0cd",
|
"rev": "614e256310e0a4f8a9ccae3fa80c11844fba7042",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1509,14 +1481,14 @@
|
|||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
],
|
],
|
||||||
"systems": "systems_7"
|
"systems": "systems_6"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1776578704,
|
"lastModified": 1774157037,
|
||||||
"narHash": "sha256-4+JHYCweZ/SSrMcu2nJ5gc7gop2scBk0JIIfaUKuTaQ=",
|
"narHash": "sha256-kJpgEIF0sxMW0vx543m3AwyqptJOxPoOJY1DfJ4jQas=",
|
||||||
"owner": "Gerg-L",
|
"owner": "Gerg-L",
|
||||||
"repo": "spicetify-nix",
|
"repo": "spicetify-nix",
|
||||||
"rev": "73f6d24b4f5bdacc3b41ddcf9965bef2781f97dd",
|
"rev": "2e2234c2932a3aff5f845cda33cb1972a9e889aa",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1536,18 +1508,19 @@
|
|||||||
"gnome-shell": "gnome-shell",
|
"gnome-shell": "gnome-shell",
|
||||||
"nixpkgs": "nixpkgs_11",
|
"nixpkgs": "nixpkgs_11",
|
||||||
"nur": "nur",
|
"nur": "nur",
|
||||||
"systems": "systems_8",
|
"systems": "systems_7",
|
||||||
|
"tinted-foot": "tinted-foot",
|
||||||
"tinted-kitty": "tinted-kitty",
|
"tinted-kitty": "tinted-kitty",
|
||||||
"tinted-schemes": "tinted-schemes",
|
"tinted-schemes": "tinted-schemes",
|
||||||
"tinted-tmux": "tinted-tmux",
|
"tinted-tmux": "tinted-tmux",
|
||||||
"tinted-zed": "tinted-zed"
|
"tinted-zed": "tinted-zed"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1776170745,
|
"lastModified": 1774124764,
|
||||||
"narHash": "sha256-Tl1aZVP5EIlT+k0+iAKH018GLHJpLz3hhJ0LNQOWxCc=",
|
"narHash": "sha256-Poz9WTjiRlqZIf197CrMMJfTifZhrZpbHFv0eU1Nhtg=",
|
||||||
"owner": "danth",
|
"owner": "danth",
|
||||||
"repo": "stylix",
|
"repo": "stylix",
|
||||||
"rev": "e3861617645a43c9bbefde1aa6ac54dd0a44bfa9",
|
"rev": "e31c79f571c5595a155f84b9d77ce53a84745494",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1661,18 +1634,20 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"systems_8": {
|
"tinted-foot": {
|
||||||
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1681028828,
|
"lastModified": 1726913040,
|
||||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
"narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=",
|
||||||
"owner": "nix-systems",
|
"owner": "tinted-theming",
|
||||||
"repo": "default",
|
"repo": "tinted-foot",
|
||||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
"rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-systems",
|
"owner": "tinted-theming",
|
||||||
"repo": "default",
|
"repo": "tinted-foot",
|
||||||
|
"rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -1695,11 +1670,11 @@
|
|||||||
"tinted-schemes": {
|
"tinted-schemes": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1772661346,
|
"lastModified": 1767710407,
|
||||||
"narHash": "sha256-4eu3LqB9tPqe0Vaqxd4wkZiBbthLbpb7llcoE/p5HT0=",
|
"narHash": "sha256-+W1EB79Jl0/gm4JqmO0Nuc5C7hRdp4vfsV/VdzI+des=",
|
||||||
"owner": "tinted-theming",
|
"owner": "tinted-theming",
|
||||||
"repo": "schemes",
|
"repo": "schemes",
|
||||||
"rev": "13b5b0c299982bb361039601e2d72587d6846294",
|
"rev": "2800e2b8ac90f678d7e4acebe4fa253f602e05b2",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1711,11 +1686,11 @@
|
|||||||
"tinted-tmux": {
|
"tinted-tmux": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1772934010,
|
"lastModified": 1767489635,
|
||||||
"narHash": "sha256-x+6+4UvaG+RBRQ6UaX+o6DjEg28u4eqhVRM9kpgJGjQ=",
|
"narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=",
|
||||||
"owner": "tinted-theming",
|
"owner": "tinted-theming",
|
||||||
"repo": "tinted-tmux",
|
"repo": "tinted-tmux",
|
||||||
"rev": "c3529673a5ab6e1b6830f618c45d9ce1bcdd829d",
|
"rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1727,11 +1702,11 @@
|
|||||||
"tinted-zed": {
|
"tinted-zed": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1772909925,
|
"lastModified": 1767488740,
|
||||||
"narHash": "sha256-jx/5+pgYR0noHa3hk2esin18VMbnPSvWPL5bBjfTIAU=",
|
"narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=",
|
||||||
"owner": "tinted-theming",
|
"owner": "tinted-theming",
|
||||||
"repo": "base16-zed",
|
"repo": "base16-zed",
|
||||||
"rev": "b4d3a1b3bcbd090937ef609a0a3b37237af974df",
|
"rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1805,28 +1780,6 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"treefmt-nix_4": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": [
|
|
||||||
"iknowyou",
|
|
||||||
"bun2nix",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1770228511,
|
|
||||||
"narHash": "sha256-wQ6NJSuFqAEmIg2VMnLdCnUc0b7vslUohqqGGD+Fyxk=",
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "treefmt-nix",
|
|
||||||
"rev": "337a4fe074be1042a35086f15481d763b8ddc0e7",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "treefmt-nix",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"vpnconfinement": {
|
"vpnconfinement": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1765634578,
|
"lastModified": 1765634578,
|
||||||
|
|||||||
@@ -7,10 +7,11 @@
|
|||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||||
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.11";
|
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.05";
|
||||||
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
|
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
|
||||||
hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
|
hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
|
||||||
stylix.url = "github:danth/stylix";
|
stylix.url = "github:danth/stylix";
|
||||||
|
nixcord.url = "github:kaylorben/nixcord";
|
||||||
sops-nix.url = "github:Mic92/sops-nix";
|
sops-nix.url = "github:Mic92/sops-nix";
|
||||||
nvf.url = "github:notashelf/nvf";
|
nvf.url = "github:notashelf/nvf";
|
||||||
bun2nix.url = "github:nix-community/bun2nix";
|
bun2nix.url = "github:nix-community/bun2nix";
|
||||||
@@ -42,12 +43,11 @@
|
|||||||
default-creds.url = "github:anotherhadi/default-creds";
|
default-creds.url = "github:anotherhadi/default-creds";
|
||||||
blog.url = "github:anotherhadi/blog";
|
blog.url = "github:anotherhadi/blog";
|
||||||
awesome-wallpapers.url = "github:anotherhadi/awesome-wallpapers";
|
awesome-wallpapers.url = "github:anotherhadi/awesome-wallpapers";
|
||||||
iknowyou.url = "github:anotherhadi/iknowyou";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = inputs @ {nixpkgs, ...}: {
|
outputs = inputs @ {nixpkgs, ...}: {
|
||||||
nixosConfigurations = {
|
nixosConfigurations = {
|
||||||
h-laptop =
|
nixy =
|
||||||
# CHANGEME: This should match the 'hostname' in your variables.nix file
|
# CHANGEME: This should match the 'hostname' in your variables.nix file
|
||||||
nixpkgs.lib.nixosSystem {
|
nixpkgs.lib.nixosSystem {
|
||||||
modules = [
|
modules = [
|
||||||
@@ -65,6 +65,20 @@
|
|||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
pph = nixpkgs.lib.nixosSystem {
|
||||||
|
modules = [
|
||||||
|
{
|
||||||
|
nixpkgs.overlays = [];
|
||||||
|
_module.args = {
|
||||||
|
inherit inputs;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
inputs.home-manager.nixosModules.home-manager
|
||||||
|
inputs.stylix.nixosModules.stylix
|
||||||
|
inputs.nix-index-database.nixosModules.default
|
||||||
|
./hosts/pph/configuration.nix
|
||||||
|
];
|
||||||
|
};
|
||||||
# Jack is my server
|
# Jack is my server
|
||||||
jack = nixpkgs.lib.nixosSystem {
|
jack = nixpkgs.lib.nixosSystem {
|
||||||
modules = [
|
modules = [
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
{
|
{pkgs, ...}: {
|
||||||
programs.brave = {
|
programs.brave = {
|
||||||
enable = true;
|
enable = true;
|
||||||
commandLineArgs = [
|
commandLineArgs = [
|
||||||
@@ -35,6 +35,13 @@
|
|||||||
];
|
];
|
||||||
extensions = let
|
extensions = let
|
||||||
ids = [
|
ids = [
|
||||||
|
"cjpalhdlnbpafiamejdnhcphjbkeiagm" # ublock origin
|
||||||
|
"dbepggeogbaibhgnhhndojpepiihcmeb" # vimium
|
||||||
|
"eimadpbcbfnmbkopoojfekhnkhdbieeh" # dark reader
|
||||||
|
"pkehgijcmpdhfbdbbnkijodmdjhbjlgp" # privacy badger
|
||||||
|
"ghmbeldphafepmbegfdlkpapadhbakde" # proton pass
|
||||||
|
"mmjbdbjnoablegbkcklggeknkfcjkjia" # custom new tab page
|
||||||
|
"oabailhgoobiboghkmlppflobceplfde" # Enable Clipboard
|
||||||
];
|
];
|
||||||
in
|
in
|
||||||
map (id: {inherit id;}) ids;
|
map (id: {inherit id;}) ids;
|
||||||
@@ -56,6 +63,11 @@
|
|||||||
BraveDarkMode = 1;
|
BraveDarkMode = 1;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
home.sessionVariables = {
|
||||||
|
DEFAULT_BROWSER = "${pkgs.brave}/bin/brave";
|
||||||
|
BROWSER = "${pkgs.brave}/bin/brave";
|
||||||
|
};
|
||||||
|
|
||||||
xdg.desktopEntries = {
|
xdg.desktopEntries = {
|
||||||
brave-incognito = {
|
brave-incognito = {
|
||||||
name = "Brave (Private window)";
|
name = "Brave (Private window)";
|
||||||
@@ -75,4 +87,27 @@
|
|||||||
categories = ["Network" "WebBrowser"];
|
categories = ["Network" "WebBrowser"];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# =================================================================
|
||||||
|
# BRAVE SETTINGS (via brave://flags)
|
||||||
|
# =================================================================
|
||||||
|
|
||||||
|
# These need to be set manually in brave://flags on first launch:
|
||||||
|
# - Enable Tab Groups (UI)
|
||||||
|
# - Enable Parallel Downloading
|
||||||
|
# - Enable Reader Mode
|
||||||
|
# - GPU Rasterization: Enabled
|
||||||
|
# - Override software rendering list: Enabled
|
||||||
|
#
|
||||||
|
# Privacy settings (brave://settings/privacy):
|
||||||
|
# - Block trackers & ads: Aggressive
|
||||||
|
# - Block all fingerprinting
|
||||||
|
# - Upgrade connections to HTTPS
|
||||||
|
# - Block scripts: Off (breaks sites, use uBlock instead)
|
||||||
|
# - Block cookies: Only 3rd party
|
||||||
|
#
|
||||||
|
# Appearance (brave://settings/appearance):
|
||||||
|
# - Show home button: Off
|
||||||
|
# - Show bookmarks bar: Only on new tab
|
||||||
|
# - Use wide address bar: On
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,9 @@
|
|||||||
|
# Discord is a popular chat application.
|
||||||
|
{inputs, ...}: {
|
||||||
|
imports = [inputs.nixcord.homeModules.nixcord];
|
||||||
|
|
||||||
|
programs.nixcord = {
|
||||||
|
enable = true;
|
||||||
|
config = {frameless = true;};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,367 @@
|
|||||||
|
# Nerdfetch, a simple system info script written in bash
|
||||||
|
# Source: https://github.com/ThatOneCalculator/NerdFetch
|
||||||
|
{pkgs, ...}: let
|
||||||
|
nerdfetch = pkgs.writeShellScriptBin "nerdfetch" ''
|
||||||
|
ostype="$(uname)"
|
||||||
|
|
||||||
|
version=8.1.1
|
||||||
|
font=nerd
|
||||||
|
distrotype=none
|
||||||
|
osi=""
|
||||||
|
ki=""
|
||||||
|
ri=""
|
||||||
|
pi=""
|
||||||
|
ui=""
|
||||||
|
ci=""
|
||||||
|
|
||||||
|
case $1 in
|
||||||
|
"-p")
|
||||||
|
font=phosphor
|
||||||
|
osi=""
|
||||||
|
ki=""
|
||||||
|
ri=""
|
||||||
|
pi=""
|
||||||
|
ui=""
|
||||||
|
ci=""
|
||||||
|
;;
|
||||||
|
"-c")
|
||||||
|
font=cozette
|
||||||
|
ki="♥"
|
||||||
|
ri=""
|
||||||
|
pi=""
|
||||||
|
ui=""
|
||||||
|
ci=""
|
||||||
|
;;
|
||||||
|
"-e")
|
||||||
|
font=emoji
|
||||||
|
osi="🐧"
|
||||||
|
ki="💓"
|
||||||
|
ri="🐐"
|
||||||
|
pi="📦"
|
||||||
|
ui="☕"
|
||||||
|
ci="🎨"
|
||||||
|
;;
|
||||||
|
"-v")
|
||||||
|
echo "NerdFetch $version"
|
||||||
|
exit
|
||||||
|
;;
|
||||||
|
"-h")
|
||||||
|
echo "Flags:
|
||||||
|
-c: Cozette font
|
||||||
|
-p: Phosphor font
|
||||||
|
-e: Emoji font
|
||||||
|
-v: Version"
|
||||||
|
exit
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
if command -v getprop 1>/dev/null; then
|
||||||
|
distrotype=android
|
||||||
|
fi
|
||||||
|
kernel="$(echo $(uname -r) | cut -d'-' -f1-1)"
|
||||||
|
case $ostype in
|
||||||
|
*"Linux"*)
|
||||||
|
if [ $distrotype = android ]; then
|
||||||
|
host="$(hostname)"
|
||||||
|
USER="$(whoami)"
|
||||||
|
os="Android $(getprop ro.build.version.release)"
|
||||||
|
case $font in
|
||||||
|
phosphor) osi="" ;;
|
||||||
|
emoji) osi="🤖" ;;
|
||||||
|
*) osi="" ;;
|
||||||
|
esac
|
||||||
|
else
|
||||||
|
host="$(cat /proc/sys/kernel/hostname)"
|
||||||
|
. /etc/os-release
|
||||||
|
if [ -f /bedrock/etc/bedrock-release ]; then
|
||||||
|
os="$(brl version)"
|
||||||
|
else
|
||||||
|
os="''${PRETTY_NAME}"
|
||||||
|
if [ $font = nerd ]; then
|
||||||
|
case $(echo $ID | sed 's/ .*//') in
|
||||||
|
debian) osi="" ;;
|
||||||
|
arch) osi="" ;;
|
||||||
|
endeavouros) osi="" ;;
|
||||||
|
fedora) osi="" ;;
|
||||||
|
gentoo) osi="" ;;
|
||||||
|
rhel) osi="" ;;
|
||||||
|
slackware) osi="" ;;
|
||||||
|
void) osi="" ;;
|
||||||
|
alpine) osi="" ;;
|
||||||
|
nixos) osi="" ;;
|
||||||
|
artix) osi="" ;;
|
||||||
|
exherbo) osi="" ;;
|
||||||
|
mageia) osi="" ;;
|
||||||
|
manjaro) osi="" ;;
|
||||||
|
opensuse) osi="" ;;
|
||||||
|
solus) osi="" ;;
|
||||||
|
ubuntu) osi="" ;;
|
||||||
|
mint) osi="" ;;
|
||||||
|
trisquel) osi="" ;;
|
||||||
|
puppy) osi="" ;;
|
||||||
|
coreos) osi="" ;;
|
||||||
|
mx) osi="" ;;
|
||||||
|
vanilla) osi="" ;;
|
||||||
|
pop_os) osi="" ;;
|
||||||
|
raspbian) osi="" ;;
|
||||||
|
deepin) osi="" ;;
|
||||||
|
almalinux) osi="" ;;
|
||||||
|
garuda) osi="" ;;
|
||||||
|
centos) osi="" ;;
|
||||||
|
rocky) osi="" ;;
|
||||||
|
esac
|
||||||
|
elif [ $font = cozette ]; then
|
||||||
|
case $(echo $ID | sed 's/ .*//') in
|
||||||
|
debian) osi="" ;;
|
||||||
|
arch) osi="" ;;
|
||||||
|
fedora) osi="" ;;
|
||||||
|
gentoo) osi="" ;;
|
||||||
|
slackware) osi="" ;;
|
||||||
|
void) osi="" ;;
|
||||||
|
alpine) osi="" ;;
|
||||||
|
nixos) osi="" ;;
|
||||||
|
mageia) osi="" ;;
|
||||||
|
manjaro) osi="" ;;
|
||||||
|
opensuse) osi="" ;;
|
||||||
|
ubuntu) osi="" ;;
|
||||||
|
mint) osi="" ;;
|
||||||
|
coreos) osi="" ;;
|
||||||
|
centos) osi="" ;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
shell=$(basename "$SHELL")
|
||||||
|
;;
|
||||||
|
*"Darwin"*)
|
||||||
|
host="$(hostname -f | sed -e 's/^[^.]*\.//')"
|
||||||
|
mac_product="$(/usr/libexec/PlistBuddy -c "Print:ProductName" /System/Library/CoreServices/SystemVersion.plist)"
|
||||||
|
mac_version="$(/usr/libexec/PlistBuddy -c "Print:ProductVersion" /System/Library/CoreServices/SystemVersion.plist)"
|
||||||
|
os="''${mac_product} ''${mac_version}"
|
||||||
|
case $font in
|
||||||
|
nerd) osi="" ;;
|
||||||
|
phosphor) osi="" ;;
|
||||||
|
cozette) osi="" ;;
|
||||||
|
emoji) osi="🍎" ;;
|
||||||
|
esac
|
||||||
|
;;
|
||||||
|
*"FreeBSD"*)
|
||||||
|
host="$(hostname)"
|
||||||
|
distrotype=bsd
|
||||||
|
os="FreeBSD $(freebsd-version | sed 's/-.*//')"
|
||||||
|
case $font in
|
||||||
|
nerd) osi="" ;;
|
||||||
|
phosphor) osi="" ;;
|
||||||
|
cozette) osi="" ;;
|
||||||
|
emoji) osi="😈" ;;
|
||||||
|
esac
|
||||||
|
;;
|
||||||
|
*"OpenBSD"*)
|
||||||
|
host="$(hostname)"
|
||||||
|
distrotype=bsd
|
||||||
|
os="OpenBSD $(uname -r)"
|
||||||
|
case $font in
|
||||||
|
nerd) osi="" ;;
|
||||||
|
phosphor) osi="" ;;
|
||||||
|
cozette) osi="⌘" ;;
|
||||||
|
emoji) osi="🐡" ;;
|
||||||
|
esac
|
||||||
|
;;
|
||||||
|
*"NetBSD"*)
|
||||||
|
host="$(hostname)"
|
||||||
|
distrotype=netbsd
|
||||||
|
os="NetBSD $(uname -r)"
|
||||||
|
case $font in
|
||||||
|
nerd) osi="" ;;
|
||||||
|
phosphor) osi="" ;;
|
||||||
|
cozette) osi="" ;;
|
||||||
|
emoji) osi="🚩" ;;
|
||||||
|
esac
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
os="Unix-like"
|
||||||
|
host="host"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
## PACKAGE MANAGER AND PACKAGES DETECTION
|
||||||
|
|
||||||
|
MANAGER=$(which nix-env pkg flatpak yum zypper dnf rpm dpkg-query brew port pacman xbps-query emerge cave apk kiss pmm /usr/sbin/slackpkg bulge birb yay paru pacstall cpm pmm eopkg getprop 2>/dev/null)
|
||||||
|
manager=$(basename "$MANAGER")
|
||||||
|
if [ $distrotype = netbsd ]; then
|
||||||
|
manager="pkg_info-netbsd"
|
||||||
|
fi
|
||||||
|
case $manager in
|
||||||
|
cpm) packages="$(cpm C)" ;;
|
||||||
|
flatpak) packages="$(flatpak list --app | wc -l)" ;;
|
||||||
|
brew) packages="$(printf '%s\n' "$(brew --cellar)/"* | wc -l)" ;;
|
||||||
|
port) packages="$(port installed | wc -l)" ;;
|
||||||
|
dpkg-query) packages="$(dpkg-query -f '${"binary:Package"}\n' -W | wc -l)" ;;
|
||||||
|
rpm) packages="$(rpm -qa --last | wc -l)" ;;
|
||||||
|
yum) packages="$(yum list installed | wc -l)" ;;
|
||||||
|
dnf) packages="$(dnf list installed | wc -l)" ;;
|
||||||
|
zypper) packages="$(zypper se | wc -l)" ;;
|
||||||
|
pacman) packages="$(pacman -Q | wc -l)" ;;
|
||||||
|
yay) packages="$(yay -Q | wc -l)" ;;
|
||||||
|
paru) packages="$(paru -Q | wc -l)" ;;
|
||||||
|
pacstall) packages="$(pacstall -L | wc -l)" ;;
|
||||||
|
kiss) packages="$(kiss list | wc -l)" ;;
|
||||||
|
emerge) packages="$(qlist -I | wc -l)" ;;
|
||||||
|
pkg) packages="$(pkg info | wc -l | tr -d ' ')" ;;
|
||||||
|
cave) packages="$(cave show installed-slots | wc -l)" ;;
|
||||||
|
xbps-query) packages="$(xbps-query -l | wc -l)" ;;
|
||||||
|
nix-env) packages="$(nix-store -q --requisites /run/current-system/sw | wc -l)" ;;
|
||||||
|
apk) packages="$(apk list --installed | wc -l)" ;;
|
||||||
|
pmm) packages="$(/bedrock/libexec/pmm pacman pmm -Q 2>/dev/null | wc -l)" ;;
|
||||||
|
eopkg) packages="$(eopkg li | wc -l)" ;;
|
||||||
|
/usr/sbin/slackpkg) packages="$(ls /var/log/packages | wc -l)" ;;
|
||||||
|
bulge) packages="$(bulge list | wc -l)" ;;
|
||||||
|
birb) packages="$(birb --list-installed | wc -l)" ;;
|
||||||
|
pkg_info)
|
||||||
|
packages="$(pkg_info -A | wc -l)"
|
||||||
|
manager="pkg"
|
||||||
|
;;
|
||||||
|
pkg_info-netbsd)
|
||||||
|
packages="$(pkg_info -a | wc -l)"
|
||||||
|
manager="pkg"
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
if [ $distrotype = android ]; then
|
||||||
|
packages="$(dpkg-query -f '${"binary:Package"}\n' -W | wc -l)"
|
||||||
|
manager="dpkg"
|
||||||
|
else
|
||||||
|
packages="$(ls /usr/bin | wc -l)"
|
||||||
|
manager="bin"
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
packages="''${packages#"''${packages%%[![:space:]]*}"}"
|
||||||
|
manager=$(echo $manager | sed "s/-query//; s/\/usr\/.*\///")
|
||||||
|
|
||||||
|
## UPTIME DETECTION
|
||||||
|
|
||||||
|
if [ $distrotype = android ]; then
|
||||||
|
uptime="$(echo $(uptime -p) | cut -c 4-)"
|
||||||
|
elif [ $distrotype = bsd ] || [ $distrotype = netbsd ]; then
|
||||||
|
uptime="$(uptime | sed -e 's/.* up //; s/, [0-9]* user.*//')"
|
||||||
|
else
|
||||||
|
case $ostype in
|
||||||
|
*"Linux"*)
|
||||||
|
IFS=. read -r s _ </proc/uptime
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
s=$(sysctl -n kern.boottime)
|
||||||
|
s=''${s#*=}
|
||||||
|
s=''${s%,*}
|
||||||
|
s=$(($(date +%s) - s))
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
d="$((s / 60 / 60 / 24))"
|
||||||
|
h="$((s / 60 / 60 % 24))"
|
||||||
|
m="$((s / 60 % 60))"
|
||||||
|
# Plurals
|
||||||
|
[ "$d" -gt 1 ] && dp=s
|
||||||
|
[ "$h" -gt 1 ] && hp=s
|
||||||
|
[ "$m" -gt 1 ] && mp=s
|
||||||
|
[ "$s" -gt 1 ] && sp=s
|
||||||
|
# Hide empty fields.
|
||||||
|
[ "$d" = 0 ] && d=
|
||||||
|
[ "$h" = 0 ] && h=
|
||||||
|
[ "$m" = 0 ] && m=
|
||||||
|
[ "$m" != "" ] && s=
|
||||||
|
# Make the output of uptime smaller.
|
||||||
|
[ "$d" ] && uptime="$d day$dp, "
|
||||||
|
[ "$h" ] && uptime="$uptime$h hour$hp, "
|
||||||
|
[ "$m" ] && uptime="$uptime$m min$mp"
|
||||||
|
[ "$s" ] && uptime="$uptime$s sec$sp"
|
||||||
|
uptime=''${uptime%, }
|
||||||
|
fi
|
||||||
|
|
||||||
|
## RAM DETECTION
|
||||||
|
|
||||||
|
case $ostype in
|
||||||
|
*"Linux"*)
|
||||||
|
while IFS=':k ' read -r key val _; do
|
||||||
|
case $key in
|
||||||
|
MemTotal)
|
||||||
|
mem_used=$((mem_used + val))
|
||||||
|
mem_full=$val
|
||||||
|
;;
|
||||||
|
Shmem) mem_used=$((mem_used + val)) ;;
|
||||||
|
MemFree | Buffers | Cached | SReclaimable) mem_used=$((mem_used - val)) ;;
|
||||||
|
esac
|
||||||
|
done </proc/meminfo
|
||||||
|
mem_used=$((mem_used / 1024))
|
||||||
|
mem_full=$((mem_full / 1024))
|
||||||
|
;;
|
||||||
|
*"Darwin"*)
|
||||||
|
mem_full=$(($(sysctl -n hw.memsize) / 1024 / 1024))
|
||||||
|
while IFS=:. read -r key val; do
|
||||||
|
case $key in
|
||||||
|
*' wired'* | *' active'* | *' occupied'*)
|
||||||
|
mem_used=$((mem_used + ${"val:-0"}))
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
done <-EOF
|
||||||
|
$(vm_stat)
|
||||||
|
EOF
|
||||||
|
|
||||||
|
mem_used=$((mem_used * 4 / 1024))
|
||||||
|
;;
|
||||||
|
*"BSD"*)
|
||||||
|
mem_full=$(($(sysctl -n hw.physmem) / 1024 / 1024))
|
||||||
|
if [ $distrotype = netbsd ]; then
|
||||||
|
mem_free=$(($(vmstat | awk 'NR==3 {print $4}') / 1024))
|
||||||
|
else
|
||||||
|
mem_free=$(($(sysctl -n vm.stats.vm.v_free_count) * $(sysctl -n vm.stats.vm.v_page_size) / 1024 / 1024))
|
||||||
|
fi
|
||||||
|
mem_used=$((mem_full - mem_free))
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
mem_full=1
|
||||||
|
mem_used=0
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
memstat="''${mem_used}/''${mem_full} MiB"
|
||||||
|
if which expr >/dev/null 2>&1; then
|
||||||
|
mempercent="($(expr $(expr ''${mem_used} \* 100 / ''${mem_full}))%)"
|
||||||
|
fi
|
||||||
|
|
||||||
|
## DEFINE COLORS
|
||||||
|
|
||||||
|
bold='[1m'
|
||||||
|
black='[30m'
|
||||||
|
red='[31m'
|
||||||
|
green='[32m'
|
||||||
|
yellow='[33m'
|
||||||
|
blue='[34m'
|
||||||
|
magenta='[35m'
|
||||||
|
cyan='[36m'
|
||||||
|
white='[37m'
|
||||||
|
grey='[90m'
|
||||||
|
reset='[0m'
|
||||||
|
|
||||||
|
## USER VARIABLES -- YOU CAN CHANGE THESE
|
||||||
|
|
||||||
|
lc="$reset$bold$magenta" # labels
|
||||||
|
nc="$reset$bold$magenta" # labels
|
||||||
|
hn="$reset$bold$magenta" # labels
|
||||||
|
ic="$reset$white" # info
|
||||||
|
c0="$reset$grey" # first color
|
||||||
|
c1="$reset$white" # second color
|
||||||
|
c2="$reset$yellow" # third color
|
||||||
|
|
||||||
|
## OUTPUT
|
||||||
|
|
||||||
|
echo """
|
||||||
|
''${c0} ___ ''${nc}''${USER}''${grey}@''${reset}''${hn}''${host}''${reset}
|
||||||
|
''${c0} (''${c1}.. ''${c0}\ ''${lc}''${osi} ''${ic}''${os}''${reset}
|
||||||
|
''${c0} (''${c2}<> ''${c0}| ''${lc}''${ki} ''${ic}''${kernel}''${reset}
|
||||||
|
''${c0} /''${c1}/ \\ ''${c0}\\ ''${lc}''${ri} ''${ic}''${RAM}''${memstat} ''${mempercent}
|
||||||
|
''${c0} ( ''${c1}| | ''${c0}/| ''${lc}''${pi} ''${ic}''${packages} (''${manager})''${reset}
|
||||||
|
''${c2} _''${c0}/\\ ''${c1}__)''${c0}/''${c2}_''${c0}) ''${lc}''${ui} ''${ic}''${uptime}''${reset}
|
||||||
|
''${c2} \/''${c0}-____''${c2}\/''${reset} ''${lc}''${ci} ''${red}███''${green}███''${yellow}███''${blue}███''${magenta}███''${cyan}███''${reset}
|
||||||
|
"""
|
||||||
|
'';
|
||||||
|
in {home.packages = [nerdfetch];}
|
||||||
@@ -1,9 +1,4 @@
|
|||||||
{
|
{
|
||||||
home.sessionVariables = {
|
|
||||||
TERMINAL = "ghostty";
|
|
||||||
TERM = "ghostty";
|
|
||||||
};
|
|
||||||
|
|
||||||
programs.ghostty = {
|
programs.ghostty = {
|
||||||
enable = true;
|
enable = true;
|
||||||
installVimSyntax = true;
|
installVimSyntax = true;
|
||||||
|
|||||||
@@ -3,13 +3,10 @@
|
|||||||
# CHANGEME: change this to your own SSH key.
|
# CHANGEME: change this to your own SSH key.
|
||||||
home.file.".ssh/allowed_signers".text = "* ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIINhWby7lUUXQNKbRu9/UOrGjWDf3fvoAwGHomWv/+lL";
|
home.file.".ssh/allowed_signers".text = "* ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIINhWby7lUUXQNKbRu9/UOrGjWDf3fvoAwGHomWv/+lL";
|
||||||
|
|
||||||
programs.git = {
|
programs.git.settings = {
|
||||||
signing.format = "openpgp";
|
commit.gpgsign = true;
|
||||||
settings = {
|
gpg.ssh.allowedSignersFile = "~/.ssh/allowed_signers";
|
||||||
commit.gpgsign = true;
|
gpg.format = "ssh";
|
||||||
gpg.ssh.allowedSignersFile = "~/.ssh/allowed_signers";
|
user.signingkey = "~/.ssh/key.pub";
|
||||||
gpg.format = "ssh";
|
|
||||||
user.signingkey = "~/.ssh/key.pub";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,21 +0,0 @@
|
|||||||
{
|
|
||||||
pkgs,
|
|
||||||
pkgs-stable,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
home.packages = with pkgs-stable; [
|
|
||||||
vlc # Video player
|
|
||||||
blanket # White-noise app
|
|
||||||
obsidian # Note taking app
|
|
||||||
textpieces # Manipulate texts
|
|
||||||
resources # Ressource monitor
|
|
||||||
gnome-clocks # Clocks app
|
|
||||||
gnome-text-editor # Basic graphic text editor
|
|
||||||
ticktick # Todo app
|
|
||||||
pinta # Image editor
|
|
||||||
onlyoffice-desktopeditors # Office suite
|
|
||||||
|
|
||||||
signal-desktop # Messaging app
|
|
||||||
element-desktop # Messaging app
|
|
||||||
];
|
|
||||||
}
|
|
||||||
@@ -1,25 +1,16 @@
|
|||||||
{
|
{
|
||||||
pkgs-stable,
|
pkgs,
|
||||||
inputs,
|
inputs,
|
||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
home.packages = with pkgs-stable; [
|
home.packages = with pkgs; [
|
||||||
|
firefox
|
||||||
wireshark
|
wireshark
|
||||||
nmap
|
nmap
|
||||||
john
|
john
|
||||||
hashcat
|
hashcat
|
||||||
|
# inputs.eleakxir.packages.${stdenv.hostPlatform.system}.leak-utils
|
||||||
# Web
|
|
||||||
caido
|
caido
|
||||||
nuclei
|
nuclei
|
||||||
gobuster
|
|
||||||
dirb
|
|
||||||
|
|
||||||
# Utils
|
|
||||||
inetutils
|
|
||||||
samba
|
|
||||||
openvpn
|
|
||||||
mariadb
|
|
||||||
redis
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,24 +0,0 @@
|
|||||||
{
|
|
||||||
pkgs,
|
|
||||||
pkgs-stable,
|
|
||||||
inputs,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
home.packages =
|
|
||||||
(with pkgs; [
|
|
||||||
# Unstable: latest toolchain versions preferred for dev
|
|
||||||
go
|
|
||||||
bun
|
|
||||||
nodejs
|
|
||||||
air
|
|
||||||
duckdb
|
|
||||||
claude-code
|
|
||||||
inputs.bun2nix.packages.${stdenv.hostPlatform.system}.default
|
|
||||||
])
|
|
||||||
++ (with pkgs-stable; [
|
|
||||||
docker
|
|
||||||
python3
|
|
||||||
jq
|
|
||||||
just
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
{pkgs-stable, ...}: {
|
|
||||||
home.packages = with pkgs-stable; [
|
|
||||||
peaclock
|
|
||||||
cbonsai
|
|
||||||
pipes
|
|
||||||
cmatrix
|
|
||||||
fastfetch
|
|
||||||
];
|
|
||||||
}
|
|
||||||
@@ -10,7 +10,7 @@
|
|||||||
config,
|
config,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
inherit (config.var) configDirectory;
|
configDirectory = config.var.configDirectory;
|
||||||
|
|
||||||
nixy =
|
nixy =
|
||||||
pkgs.writeShellScriptBin "nixy"
|
pkgs.writeShellScriptBin "nixy"
|
||||||
@@ -33,6 +33,8 @@
|
|||||||
";Collect Garbage;nixy gc"
|
";Collect Garbage;nixy gc"
|
||||||
";Clean Boot Menu;nixy cb"
|
";Clean Boot Menu;nixy cb"
|
||||||
";List generation;nixy listgen"
|
";List generation;nixy listgen"
|
||||||
|
";Hyprland Keybindings;nvim ${configDirectory}/docs/KEYBINDINGS-HYPRLAND.md"
|
||||||
|
";Wallpapers;zen https://github.com/anotherhadi/nixy-wallpapers"
|
||||||
)
|
)
|
||||||
|
|
||||||
# Apply default icons if empty:
|
# Apply default icons if empty:
|
||||||
|
|||||||
@@ -47,11 +47,6 @@
|
|||||||
};
|
};
|
||||||
lsp = {
|
lsp = {
|
||||||
enable = true;
|
enable = true;
|
||||||
presets = {
|
|
||||||
tailwindcss-language-server = {
|
|
||||||
enable = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
trouble.enable = true;
|
trouble.enable = true;
|
||||||
lspSignature.enable = true;
|
lspSignature.enable = true;
|
||||||
lspconfig.enable = true;
|
lspconfig.enable = true;
|
||||||
@@ -111,7 +106,7 @@
|
|||||||
};
|
};
|
||||||
extraDiagnostics.enable = true;
|
extraDiagnostics.enable = true;
|
||||||
};
|
};
|
||||||
typescript = {
|
ts = {
|
||||||
enable = true;
|
enable = true;
|
||||||
extensions.ts-error-translator.enable = true;
|
extensions.ts-error-translator.enable = true;
|
||||||
};
|
};
|
||||||
@@ -120,6 +115,7 @@
|
|||||||
html.enable = true;
|
html.enable = true;
|
||||||
bash.enable = true;
|
bash.enable = true;
|
||||||
nix.enable = true;
|
nix.enable = true;
|
||||||
|
tailwind.enable = true;
|
||||||
};
|
};
|
||||||
formatter = {
|
formatter = {
|
||||||
conform-nvim = {
|
conform-nvim = {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{pkgs, ...}: {
|
{pkgs, ...}: {
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
proton-vpn
|
protonvpn-gui
|
||||||
proton-pass
|
proton-pass
|
||||||
proton-authenticator
|
proton-authenticator
|
||||||
];
|
];
|
||||||
@@ -15,21 +15,5 @@
|
|||||||
categories = ["Utility"];
|
categories = ["Utility"];
|
||||||
terminal = false;
|
terminal = false;
|
||||||
};
|
};
|
||||||
"Proton Calendar" = {
|
|
||||||
name = "Proton Calendar";
|
|
||||||
exec = "${pkgs.qutebrowser}/bin/qutebrowser \"https://calendar.proton.me\"";
|
|
||||||
icon = "proton-calendar";
|
|
||||||
type = "Application";
|
|
||||||
categories = ["Utility"];
|
|
||||||
terminal = false;
|
|
||||||
};
|
|
||||||
"Proton Mail" = {
|
|
||||||
name = "Proton Mail";
|
|
||||||
exec = "${pkgs.qutebrowser}/bin/qutebrowser \"https://mail.proton.me/\"";
|
|
||||||
icon = "proton-mail";
|
|
||||||
type = "Application";
|
|
||||||
categories = ["Utility"];
|
|
||||||
terminal = false;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,466 +0,0 @@
|
|||||||
{
|
|
||||||
config,
|
|
||||||
lib,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
bookmarkList = [
|
|
||||||
{
|
|
||||||
name = "Proton Mail";
|
|
||||||
url = "https://mail.proton.me";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Proton Drive";
|
|
||||||
url = "https://drive.proton.me";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Proton Lumo";
|
|
||||||
url = "https://lumo.proton.me";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Proton Calendar";
|
|
||||||
url = "https://calendar.proton.me";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Tools";
|
|
||||||
bookmarks = [
|
|
||||||
{
|
|
||||||
name = "tldr";
|
|
||||||
url = "https://tldr.inbrowser.app/";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Excalidraw";
|
|
||||||
url = "https://excalidraw.com";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Cobalt (downloader)";
|
|
||||||
url = "https://cobalt.meowing.de";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Mazanoke (image)";
|
|
||||||
url = "https://mazanoke.hadi.icu";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Stirling PDF";
|
|
||||||
url = "https://pdf.hadi.icu";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Vert";
|
|
||||||
url = "https://vert.sh";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Markdown to PDF";
|
|
||||||
url = "https://md2file.com";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Image to Vector";
|
|
||||||
url = "https://www.vectorcascade.com/";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "PrivateBin";
|
|
||||||
url = "https://privatebin.net";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Social";
|
|
||||||
bookmarks = [
|
|
||||||
{
|
|
||||||
name = "Bluesky";
|
|
||||||
url = "https://bsky.app";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Reddit";
|
|
||||||
url = "https://reddit.com";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Youtube";
|
|
||||||
url = "https://youtube.com";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Instagram";
|
|
||||||
url = "https://instagram.com";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Github";
|
|
||||||
url = "https://github.com";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Discord";
|
|
||||||
url = "https://discord.com/channels/@me/";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Other";
|
|
||||||
bookmarks = [
|
|
||||||
{
|
|
||||||
name = "Startpage Config";
|
|
||||||
url = "https://www.startpage.com/do/mypage.pl?prfe=45d331deb05471d659dba933e7400df51d952bb103da6f6125c0e769a6be1d65610456a479f495ceeee7e97311cf227d7c1bb198de0ceeb193d8cddf9c455c19a409cc35c3e3f542ee27bd7cecd3";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Hyprland Wiki";
|
|
||||||
url = "https://wiki.hypr.land";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "MyNixOS";
|
|
||||||
url = "https://mynixos.com";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Nixpkgs";
|
|
||||||
url = "https://github.com/NixOS/nixpkgs";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Claude";
|
|
||||||
url = "https://claude.ai";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Gemini";
|
|
||||||
url = "https://gemini.google.com";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Medium";
|
|
||||||
url = "https://medium.com";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Maps";
|
|
||||||
url = "https://maps.apple.com";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Amazon";
|
|
||||||
url = "https://amazon.fr";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Infosec";
|
|
||||||
bookmarks = [
|
|
||||||
{
|
|
||||||
name = "Nix 4 Cyber";
|
|
||||||
url = "https://n4c.hadi.icu";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Cyberchef";
|
|
||||||
url = "https://cyberchef.hadi.icu";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "TryHackMe";
|
|
||||||
url = "https://tryhackme.com";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Root-Me";
|
|
||||||
url = "https://root-me.org";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Exploit-DB";
|
|
||||||
url = "https://exploit-db.com";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Crack Station";
|
|
||||||
url = "https://crackstation.net";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "Osint Tracker";
|
|
||||||
url = "https://app.osintracker.com";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
}
|
|
||||||
];
|
|
||||||
|
|
||||||
c = config.lib.stylix.colors;
|
|
||||||
|
|
||||||
stripProtocol = url:
|
|
||||||
lib.removePrefix "https://" (lib.removePrefix "http://" url);
|
|
||||||
|
|
||||||
mkCard = item: ''
|
|
||||||
<a href="${item.url}" class="card">
|
|
||||||
<div class="favicon-wrapper">
|
|
||||||
<span class="favicon-fallback">${builtins.substring 0 1 item.name}</span>
|
|
||||||
</div>
|
|
||||||
<div class="card-info">
|
|
||||||
<span class="card-name">${item.name}</span>
|
|
||||||
<span class="card-url">${stripProtocol item.url}</span>
|
|
||||||
</div>
|
|
||||||
</a>'';
|
|
||||||
|
|
||||||
# Group consecutive root items so they share the same .cards grid
|
|
||||||
grouped = let
|
|
||||||
step = acc: item:
|
|
||||||
if item ? url
|
|
||||||
then acc // {pending = acc.pending ++ [item];}
|
|
||||||
else {
|
|
||||||
groups =
|
|
||||||
acc.groups
|
|
||||||
++ lib.optional (acc.pending != []) {
|
|
||||||
isRoot = true;
|
|
||||||
items = acc.pending;
|
|
||||||
}
|
|
||||||
++ [
|
|
||||||
{
|
|
||||||
isRoot = false;
|
|
||||||
inherit item;
|
|
||||||
}
|
|
||||||
];
|
|
||||||
pending = [];
|
|
||||||
};
|
|
||||||
result =
|
|
||||||
lib.foldl' step {
|
|
||||||
groups = [];
|
|
||||||
pending = [];
|
|
||||||
}
|
|
||||||
bookmarkList;
|
|
||||||
in
|
|
||||||
result.groups
|
|
||||||
++ lib.optional (result.pending != []) {
|
|
||||||
isRoot = true;
|
|
||||||
items = result.pending;
|
|
||||||
};
|
|
||||||
|
|
||||||
mkSection = group:
|
|
||||||
if group.isRoot
|
|
||||||
then ''
|
|
||||||
<div class="folder-section">
|
|
||||||
<div class="cards">
|
|
||||||
${lib.concatMapStrings mkCard group.items}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
''
|
|
||||||
else ''
|
|
||||||
<div class="folder-section">
|
|
||||||
<h2 class="folder-title">${group.item.name}</h2>
|
|
||||||
<div class="cards">
|
|
||||||
${lib.concatMapStrings mkCard group.item.bookmarks}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
'';
|
|
||||||
|
|
||||||
publicBookmarks =
|
|
||||||
pkgs.writeText "qutebrowser-public-bookmarks"
|
|
||||||
(lib.concatMapStrings (
|
|
||||||
item:
|
|
||||||
if item ? url
|
|
||||||
then "${item.url} ${item.name}\n"
|
|
||||||
else lib.concatMapStrings (b: "${b.url} ${item.name}/${b.name}\n") item.bookmarks
|
|
||||||
)
|
|
||||||
bookmarkList);
|
|
||||||
|
|
||||||
inherit (config.qutebrowser) privateBookmarksPath;
|
|
||||||
in {
|
|
||||||
options.qutebrowser.privateBookmarksPath = lib.mkOption {
|
|
||||||
type = lib.types.nullOr lib.types.str;
|
|
||||||
default = null;
|
|
||||||
description = "Path to a file containing extra (private) bookmarks to append.";
|
|
||||||
};
|
|
||||||
|
|
||||||
config = {
|
|
||||||
# Fully static HTML — order is preserved, no dependency on qutebrowser's Jinja rendering
|
|
||||||
xdg.dataFile."qutebrowser/bookmarks.html".text = ''
|
|
||||||
<!DOCTYPE html>
|
|
||||||
<html lang="en">
|
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8">
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
|
||||||
<title>Bookmarks</title>
|
|
||||||
<style>
|
|
||||||
*, *::before, *::after { box-sizing: border-box; margin: 0; padding: 0; }
|
|
||||||
|
|
||||||
body {
|
|
||||||
background-color: #${c.base00};
|
|
||||||
color: #${c.base05};
|
|
||||||
font-family: 'Source Sans Pro', sans-serif;
|
|
||||||
font-size: 14px;
|
|
||||||
min-height: 100vh;
|
|
||||||
padding: 2.5rem 2rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.header {
|
|
||||||
max-width: 1100px;
|
|
||||||
margin: 0 auto 2rem;
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 1.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.page-title {
|
|
||||||
font-size: 1.3rem;
|
|
||||||
font-weight: 700;
|
|
||||||
color: #${c.base0D};
|
|
||||||
letter-spacing: -0.01em;
|
|
||||||
flex-shrink: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.search-bar {
|
|
||||||
flex: 1;
|
|
||||||
background-color: #${c.base01};
|
|
||||||
border: 1px solid #${c.base02};
|
|
||||||
border-radius: 8px;
|
|
||||||
color: #${c.base05};
|
|
||||||
font-family: 'Source Sans Pro', sans-serif;
|
|
||||||
font-size: 0.9rem;
|
|
||||||
padding: 0.5rem 0.9rem;
|
|
||||||
outline: none;
|
|
||||||
transition: border-color 0.15s ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
.search-bar::placeholder { color: #${c.base03}; }
|
|
||||||
.search-bar:focus { border-color: #${c.base0D}; }
|
|
||||||
|
|
||||||
.bookmarks-container {
|
|
||||||
max-width: 1100px;
|
|
||||||
margin: 0 auto;
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
gap: 1.75rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.folder-title {
|
|
||||||
font-size: 0.72rem;
|
|
||||||
font-weight: 700;
|
|
||||||
letter-spacing: 0.12em;
|
|
||||||
text-transform: uppercase;
|
|
||||||
color: #${c.base03};
|
|
||||||
margin-bottom: 0.6rem;
|
|
||||||
padding-left: 0.2rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.cards {
|
|
||||||
display: grid;
|
|
||||||
grid-template-columns: repeat(auto-fill, minmax(220px, 1fr));
|
|
||||||
gap: 0.4rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.card {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 0.7rem;
|
|
||||||
padding: 0.6rem 0.8rem;
|
|
||||||
background-color: #${c.base01};
|
|
||||||
border: 1px solid #${c.base02};
|
|
||||||
border-radius: 10px;
|
|
||||||
text-decoration: none;
|
|
||||||
transition: background-color 0.12s ease, border-color 0.12s ease;
|
|
||||||
overflow: hidden;
|
|
||||||
}
|
|
||||||
|
|
||||||
.card:hover {
|
|
||||||
background-color: #${c.base02};
|
|
||||||
border-color: #${c.base03};
|
|
||||||
}
|
|
||||||
|
|
||||||
.favicon-wrapper { position: relative; width: 18px; height: 18px; flex-shrink: 0; }
|
|
||||||
|
|
||||||
.favicon-fallback {
|
|
||||||
position: absolute;
|
|
||||||
inset: 0;
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
background-color: #${c.base02};
|
|
||||||
border-radius: 4px;
|
|
||||||
color: #${c.base04};
|
|
||||||
font-size: 10px;
|
|
||||||
font-weight: 700;
|
|
||||||
text-transform: uppercase;
|
|
||||||
user-select: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.card-info {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
gap: 0.05rem;
|
|
||||||
overflow: hidden;
|
|
||||||
flex: 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
.card-name {
|
|
||||||
color: #${c.base05};
|
|
||||||
font-size: 0.86rem;
|
|
||||||
font-weight: 500;
|
|
||||||
white-space: nowrap;
|
|
||||||
overflow: hidden;
|
|
||||||
text-overflow: ellipsis;
|
|
||||||
transition: color 0.12s ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
.card:hover .card-name { color: #${c.base0A}; }
|
|
||||||
|
|
||||||
.card-url {
|
|
||||||
color: #${c.base03};
|
|
||||||
font-family: 'Maple Mono NF', monospace;
|
|
||||||
font-size: 0.7rem;
|
|
||||||
white-space: nowrap;
|
|
||||||
overflow: hidden;
|
|
||||||
text-overflow: ellipsis;
|
|
||||||
}
|
|
||||||
|
|
||||||
.no-results {
|
|
||||||
color: #${c.base03};
|
|
||||||
font-size: 0.9rem;
|
|
||||||
padding: 0.5rem 0.2rem;
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<div class="header">
|
|
||||||
<h1 class="page-title">Bookmarks</h1>
|
|
||||||
<input id="search" class="search-bar" type="text" placeholder="Search…" autocomplete="off" spellcheck="false">
|
|
||||||
</div>
|
|
||||||
<div class="bookmarks-container">
|
|
||||||
<p id="no-results" class="no-results">No results</p>
|
|
||||||
${lib.concatMapStrings mkSection grouped}
|
|
||||||
</div>
|
|
||||||
<script>
|
|
||||||
window.addEventListener('DOMContentLoaded', function () {
|
|
||||||
const input = document.getElementById('search');
|
|
||||||
const noResults = document.getElementById('no-results');
|
|
||||||
|
|
||||||
input.focus();
|
|
||||||
|
|
||||||
input.addEventListener('input', function () {
|
|
||||||
const query = this.value.toLowerCase().trim();
|
|
||||||
let anyVisible = false;
|
|
||||||
|
|
||||||
document.querySelectorAll('.folder-section').forEach(function (section) {
|
|
||||||
let sectionVisible = false;
|
|
||||||
section.querySelectorAll('.card').forEach(function (card) {
|
|
||||||
const name = card.querySelector('.card-name').textContent.toLowerCase();
|
|
||||||
const url = card.querySelector('.card-url').textContent.toLowerCase();
|
|
||||||
const match = !query || name.includes(query) || url.includes(query);
|
|
||||||
card.style.display = match ? ''' : 'none';
|
|
||||||
if (match) { sectionVisible = true; anyVisible = true; }
|
|
||||||
});
|
|
||||||
section.style.display = sectionVisible ? ''' : 'none';
|
|
||||||
});
|
|
||||||
|
|
||||||
noResults.style.display = anyVisible || !query ? 'none' : 'block';
|
|
||||||
});
|
|
||||||
|
|
||||||
input.addEventListener('keydown', function (e) {
|
|
||||||
if (e.key === 'Enter') {
|
|
||||||
const first = document.querySelector('.card:not([style*="none"])');
|
|
||||||
if (first) {
|
|
||||||
location.href = first.href;
|
|
||||||
} else {
|
|
||||||
const q = encodeURIComponent(this.value.trim());
|
|
||||||
if (q) location.href = 'https://www.startpage.com/sp/search?q=' + q;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (e.key === 'Escape') {
|
|
||||||
this.value = ''';
|
|
||||||
this.dispatchEvent(new Event('input'));
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
'';
|
|
||||||
|
|
||||||
home.activation.qutebrowserBookmarks = lib.hm.dag.entryAfter ["setupSecrets" "writeBoundary"] ''
|
|
||||||
mkdir -p ${config.home.homeDirectory}/.config/qutebrowser/bookmarks
|
|
||||||
cat ${publicBookmarks} ${lib.optionalString (privateBookmarksPath != null) ''"${privateBookmarksPath}"''} \
|
|
||||||
> ${config.home.homeDirectory}/.config/qutebrowser/bookmarks/urls
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,37 +0,0 @@
|
|||||||
{...}: {
|
|
||||||
imports = [
|
|
||||||
./bookmarks.nix
|
|
||||||
./search.nix
|
|
||||||
./keybindings.nix
|
|
||||||
./settings.nix
|
|
||||||
./userscripts.nix
|
|
||||||
];
|
|
||||||
|
|
||||||
home.sessionVariables = {
|
|
||||||
DEFAULT_BROWSER = "qutebrowser";
|
|
||||||
BROWSER = "qutebrowser";
|
|
||||||
};
|
|
||||||
|
|
||||||
xdg.mimeApps.defaultApplications = {
|
|
||||||
"text/html" = ["org.qutebrowser.qutebrowser.desktop"];
|
|
||||||
"text/xml" = ["org.qutebrowser.qutebrowser.desktop"];
|
|
||||||
"x-scheme-handler/http" = ["org.qutebrowser.qutebrowser.desktop"];
|
|
||||||
"x-scheme-handler/https" = ["org.qutebrowser.qutebrowser.desktop"];
|
|
||||||
"x-scheme-handler/unknown" = ["org.qutebrowser.qutebrowser.desktop"];
|
|
||||||
"x-scheme-handler/about" = ["org.qutebrowser.qutebrowser.desktop"];
|
|
||||||
"x-scheme-handler/qute" = ["org.qutebrowser.qutebrowser.desktop"];
|
|
||||||
};
|
|
||||||
|
|
||||||
xdg.desktopEntries.qutebrowser-private = {
|
|
||||||
name = "Qutebrowser (Temp session)";
|
|
||||||
genericName = "Web Browser";
|
|
||||||
exec = "qutebrowser --temp-basedir %U";
|
|
||||||
icon = "qutebrowser";
|
|
||||||
categories = ["Network" "WebBrowser"];
|
|
||||||
};
|
|
||||||
|
|
||||||
programs.qutebrowser = {
|
|
||||||
enable = true;
|
|
||||||
loadAutoconfig = true;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,826 +0,0 @@
|
|||||||
// ==UserScript==
|
|
||||||
// @name Don't track me Google
|
|
||||||
// @namespace Rob W
|
|
||||||
// @description Removes the annoying link-conversion at Google Search/maps/...
|
|
||||||
// @version 4.28
|
|
||||||
// @icon https://raw.githubusercontent.com/Rob--W/dont-track-me-google/master/icon48.png
|
|
||||||
// @supportURL https://github.com/Rob--W/dont-track-me-google/issues
|
|
||||||
// @license MIT
|
|
||||||
// @run-at document-start
|
|
||||||
// @match *://*.google.com/*
|
|
||||||
// @match *://*.google.ad/*
|
|
||||||
// @match *://*.google.ae/*
|
|
||||||
// @match *://*.google.com.af/*
|
|
||||||
// @match *://*.google.com.ag/*
|
|
||||||
// @match *://*.google.com.ai/*
|
|
||||||
// @match *://*.google.al/*
|
|
||||||
// @match *://*.google.am/*
|
|
||||||
// @match *://*.google.co.ao/*
|
|
||||||
// @match *://*.google.com.ar/*
|
|
||||||
// @match *://*.google.as/*
|
|
||||||
// @match *://*.google.at/*
|
|
||||||
// @match *://*.google.com.au/*
|
|
||||||
// @match *://*.google.az/*
|
|
||||||
// @match *://*.google.ba/*
|
|
||||||
// @match *://*.google.com.bd/*
|
|
||||||
// @match *://*.google.be/*
|
|
||||||
// @match *://*.google.bf/*
|
|
||||||
// @match *://*.google.bg/*
|
|
||||||
// @match *://*.google.com.bh/*
|
|
||||||
// @match *://*.google.bi/*
|
|
||||||
// @match *://*.google.bj/*
|
|
||||||
// @match *://*.google.com.bn/*
|
|
||||||
// @match *://*.google.com.bo/*
|
|
||||||
// @match *://*.google.com.br/*
|
|
||||||
// @match *://*.google.bs/*
|
|
||||||
// @match *://*.google.bt/*
|
|
||||||
// @match *://*.google.co.bw/*
|
|
||||||
// @match *://*.google.by/*
|
|
||||||
// @match *://*.google.com.bz/*
|
|
||||||
// @match *://*.google.ca/*
|
|
||||||
// @match *://*.google.cd/*
|
|
||||||
// @match *://*.google.cf/*
|
|
||||||
// @match *://*.google.cg/*
|
|
||||||
// @match *://*.google.ch/*
|
|
||||||
// @match *://*.google.ci/*
|
|
||||||
// @match *://*.google.co.ck/*
|
|
||||||
// @match *://*.google.cl/*
|
|
||||||
// @match *://*.google.cm/*
|
|
||||||
// @match *://*.google.cn/*
|
|
||||||
// @match *://*.google.com.co/*
|
|
||||||
// @match *://*.google.co.cr/*
|
|
||||||
// @match *://*.google.com.cu/*
|
|
||||||
// @match *://*.google.cv/*
|
|
||||||
// @match *://*.google.com.cy/*
|
|
||||||
// @match *://*.google.cz/*
|
|
||||||
// @match *://*.google.de/*
|
|
||||||
// @match *://*.google.dj/*
|
|
||||||
// @match *://*.google.dk/*
|
|
||||||
// @match *://*.google.dm/*
|
|
||||||
// @match *://*.google.com.do/*
|
|
||||||
// @match *://*.google.dz/*
|
|
||||||
// @match *://*.google.com.ec/*
|
|
||||||
// @match *://*.google.ee/*
|
|
||||||
// @match *://*.google.com.eg/*
|
|
||||||
// @match *://*.google.es/*
|
|
||||||
// @match *://*.google.com.et/*
|
|
||||||
// @match *://*.google.fi/*
|
|
||||||
// @match *://*.google.com.fj/*
|
|
||||||
// @match *://*.google.fm/*
|
|
||||||
// @match *://*.google.fr/*
|
|
||||||
// @match *://*.google.ga/*
|
|
||||||
// @match *://*.google.ge/*
|
|
||||||
// @match *://*.google.gg/*
|
|
||||||
// @match *://*.google.com.gh/*
|
|
||||||
// @match *://*.google.com.gi/*
|
|
||||||
// @match *://*.google.gl/*
|
|
||||||
// @match *://*.google.gm/*
|
|
||||||
// @match *://*.google.gp/*
|
|
||||||
// @match *://*.google.gr/*
|
|
||||||
// @match *://*.google.com.gt/*
|
|
||||||
// @match *://*.google.gy/*
|
|
||||||
// @match *://*.google.com.hk/*
|
|
||||||
// @match *://*.google.hn/*
|
|
||||||
// @match *://*.google.hr/*
|
|
||||||
// @match *://*.google.ht/*
|
|
||||||
// @match *://*.google.hu/*
|
|
||||||
// @match *://*.google.co.id/*
|
|
||||||
// @match *://*.google.ie/*
|
|
||||||
// @match *://*.google.co.il/*
|
|
||||||
// @match *://*.google.im/*
|
|
||||||
// @match *://*.google.co.in/*
|
|
||||||
// @match *://*.google.iq/*
|
|
||||||
// @match *://*.google.is/*
|
|
||||||
// @match *://*.google.it/*
|
|
||||||
// @match *://*.google.je/*
|
|
||||||
// @match *://*.google.com.jm/*
|
|
||||||
// @match *://*.google.jo/*
|
|
||||||
// @match *://*.google.co.jp/*
|
|
||||||
// @match *://*.google.co.ke/*
|
|
||||||
// @match *://*.google.com.kh/*
|
|
||||||
// @match *://*.google.ki/*
|
|
||||||
// @match *://*.google.kg/*
|
|
||||||
// @match *://*.google.co.kr/*
|
|
||||||
// @match *://*.google.com.kw/*
|
|
||||||
// @match *://*.google.kz/*
|
|
||||||
// @match *://*.google.la/*
|
|
||||||
// @match *://*.google.com.lb/*
|
|
||||||
// @match *://*.google.li/*
|
|
||||||
// @match *://*.google.lk/*
|
|
||||||
// @match *://*.google.co.ls/*
|
|
||||||
// @match *://*.google.lt/*
|
|
||||||
// @match *://*.google.lu/*
|
|
||||||
// @match *://*.google.lv/*
|
|
||||||
// @match *://*.google.com.ly/*
|
|
||||||
// @match *://*.google.co.ma/*
|
|
||||||
// @match *://*.google.md/*
|
|
||||||
// @match *://*.google.me/*
|
|
||||||
// @match *://*.google.mg/*
|
|
||||||
// @match *://*.google.mk/*
|
|
||||||
// @match *://*.google.ml/*
|
|
||||||
// @match *://*.google.com.mm/*
|
|
||||||
// @match *://*.google.mn/*
|
|
||||||
// @match *://*.google.ms/*
|
|
||||||
// @match *://*.google.com.mt/*
|
|
||||||
// @match *://*.google.mu/*
|
|
||||||
// @match *://*.google.mv/*
|
|
||||||
// @match *://*.google.mw/*
|
|
||||||
// @match *://*.google.com.mx/*
|
|
||||||
// @match *://*.google.com.my/*
|
|
||||||
// @match *://*.google.co.mz/*
|
|
||||||
// @match *://*.google.com.na/*
|
|
||||||
// @match *://*.google.com.nf/*
|
|
||||||
// @match *://*.google.com.ng/*
|
|
||||||
// @match *://*.google.com.ni/*
|
|
||||||
// @match *://*.google.ne/*
|
|
||||||
// @match *://*.google.nl/*
|
|
||||||
// @match *://*.google.no/*
|
|
||||||
// @match *://*.google.com.np/*
|
|
||||||
// @match *://*.google.nr/*
|
|
||||||
// @match *://*.google.nu/*
|
|
||||||
// @match *://*.google.co.nz/*
|
|
||||||
// @match *://*.google.com.om/*
|
|
||||||
// @match *://*.google.com.pa/*
|
|
||||||
// @match *://*.google.com.pe/*
|
|
||||||
// @match *://*.google.com.pg/*
|
|
||||||
// @match *://*.google.com.ph/*
|
|
||||||
// @match *://*.google.com.pk/*
|
|
||||||
// @match *://*.google.pl/*
|
|
||||||
// @match *://*.google.pn/*
|
|
||||||
// @match *://*.google.com.pr/*
|
|
||||||
// @match *://*.google.ps/*
|
|
||||||
// @match *://*.google.pt/*
|
|
||||||
// @match *://*.google.com.py/*
|
|
||||||
// @match *://*.google.com.qa/*
|
|
||||||
// @match *://*.google.ro/*
|
|
||||||
// @match *://*.google.ru/*
|
|
||||||
// @match *://*.google.rw/*
|
|
||||||
// @match *://*.google.com.sa/*
|
|
||||||
// @match *://*.google.com.sb/*
|
|
||||||
// @match *://*.google.sc/*
|
|
||||||
// @match *://*.google.se/*
|
|
||||||
// @match *://*.google.com.sg/*
|
|
||||||
// @match *://*.google.sh/*
|
|
||||||
// @match *://*.google.si/*
|
|
||||||
// @match *://*.google.sk/*
|
|
||||||
// @match *://*.google.com.sl/*
|
|
||||||
// @match *://*.google.sn/*
|
|
||||||
// @match *://*.google.so/*
|
|
||||||
// @match *://*.google.sm/*
|
|
||||||
// @match *://*.google.sr/*
|
|
||||||
// @match *://*.google.st/*
|
|
||||||
// @match *://*.google.com.sv/*
|
|
||||||
// @match *://*.google.td/*
|
|
||||||
// @match *://*.google.tg/*
|
|
||||||
// @match *://*.google.co.th/*
|
|
||||||
// @match *://*.google.com.tj/*
|
|
||||||
// @match *://*.google.tk/*
|
|
||||||
// @match *://*.google.tl/*
|
|
||||||
// @match *://*.google.tm/*
|
|
||||||
// @match *://*.google.tn/*
|
|
||||||
// @match *://*.google.to/*
|
|
||||||
// @match *://*.google.com.tr/*
|
|
||||||
// @match *://*.google.tt/*
|
|
||||||
// @match *://*.google.com.tw/*
|
|
||||||
// @match *://*.google.co.tz/*
|
|
||||||
// @match *://*.google.com.ua/*
|
|
||||||
// @match *://*.google.co.ug/*
|
|
||||||
// @match *://*.google.co.uk/*
|
|
||||||
// @match *://*.google.com.uy/*
|
|
||||||
// @match *://*.google.co.uz/*
|
|
||||||
// @match *://*.google.com.vc/*
|
|
||||||
// @match *://*.google.co.ve/*
|
|
||||||
// @match *://*.google.vg/*
|
|
||||||
// @match *://*.google.co.vi/*
|
|
||||||
// @match *://*.google.com.vn/*
|
|
||||||
// @match *://*.google.vu/*
|
|
||||||
// @match *://*.google.ws/*
|
|
||||||
// @match *://*.google.rs/*
|
|
||||||
// @match *://*.google.co.za/*
|
|
||||||
// @match *://*.google.co.zm/*
|
|
||||||
// @match *://*.google.co.zw/*
|
|
||||||
// @match *://*.google.cat/*
|
|
||||||
// @match *://*.google.ng/*
|
|
||||||
// @downloadURL https://update.greasyfork.org/scripts/428243/Don%27t%20track%20me%20Google.user.js
|
|
||||||
// @updateURL https://update.greasyfork.org/scripts/428243/Don%27t%20track%20me%20Google.meta.js
|
|
||||||
// ==/UserScript==
|
|
||||||
|
|
||||||
document.addEventListener('mousedown', handlePointerPress, true);
|
|
||||||
document.addEventListener('touchstart', handlePointerPress, true);
|
|
||||||
document.addEventListener('click', handleClick, true);
|
|
||||||
var scriptCspNonce;
|
|
||||||
var needsCspNonce = typeof browser !== 'undefined'; // Firefox.
|
|
||||||
var preferenceObservers = [];
|
|
||||||
setupAggresiveUglyLinkPreventer();
|
|
||||||
|
|
||||||
var forceNoReferrer = true;
|
|
||||||
var noping = true;
|
|
||||||
if (typeof chrome == 'object' && chrome.storage) {
|
|
||||||
(chrome.storage.sync || chrome.storage.local).get({
|
|
||||||
forceNoReferrer: true,
|
|
||||||
// From version 4.7 until 4.11, the preference was the literal value of
|
|
||||||
// the referrer policy.
|
|
||||||
referrerPolicy: 'no-referrer',
|
|
||||||
noping: true,
|
|
||||||
}, function(items) {
|
|
||||||
if (items) {
|
|
||||||
// Migration code (to be removed in the future).
|
|
||||||
if (items.referrerPolicy === '') {
|
|
||||||
// User explicitly allowed referrers to be sent, respect that.
|
|
||||||
items.forceNoReferrer = false;
|
|
||||||
}
|
|
||||||
forceNoReferrer = items.forceNoReferrer;
|
|
||||||
noping = items.noping;
|
|
||||||
callPreferenceObservers();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
chrome.storage.onChanged.addListener(function(changes) {
|
|
||||||
if (changes.forceNoReferrer) {
|
|
||||||
forceNoReferrer = changes.forceNoReferrer.newValue;
|
|
||||||
}
|
|
||||||
if (changes.noping) {
|
|
||||||
noping = changes.noping.newValue;
|
|
||||||
}
|
|
||||||
callPreferenceObservers();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function callImmediatelyAndOnPreferenceUpdate(callback) {
|
|
||||||
callback();
|
|
||||||
preferenceObservers.push(callback);
|
|
||||||
}
|
|
||||||
function callPreferenceObservers() {
|
|
||||||
// This method is usually once, and occasionally more than once if the user
|
|
||||||
// changes a preference. For simplicity we don't check whether a pref was
|
|
||||||
// changed before calling a callback - these are cheap anyway.
|
|
||||||
preferenceObservers.forEach(function(callback) {
|
|
||||||
callback();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function getReferrerPolicy() {
|
|
||||||
return forceNoReferrer ? 'origin' : '';
|
|
||||||
}
|
|
||||||
|
|
||||||
function updateReferrerPolicy(a) {
|
|
||||||
if (a.referrerPolicy === 'no-referrer') {
|
|
||||||
// "no-referrer" is more privacy-friendly than "origin".
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
var referrerPolicy = getReferrerPolicy();
|
|
||||||
if (referrerPolicy) {
|
|
||||||
a.referrerPolicy = referrerPolicy;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function handlePointerPress(e) {
|
|
||||||
var a = e.target;
|
|
||||||
while (a && !a.href) {
|
|
||||||
a = a.parentElement;
|
|
||||||
}
|
|
||||||
if (!a) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
var inlineMousedown = a.getAttribute('onmousedown');
|
|
||||||
// return rwt(....); // E.g Google search results.
|
|
||||||
// return google.rwt(...); // E.g. sponsored search results
|
|
||||||
// return google.arwt(this); // E.g. sponsored search results (dec 2016).
|
|
||||||
if (inlineMousedown && /\ba?rwt\(/.test(inlineMousedown)) {
|
|
||||||
a.removeAttribute('onmousedown');
|
|
||||||
// Just in case:
|
|
||||||
a.removeAttribute('ping');
|
|
||||||
// In Chrome, removing onmousedown during event dispatch does not
|
|
||||||
// prevent the inline listener from running... So we have to cancel
|
|
||||||
// event propagation just in case.
|
|
||||||
e.stopImmediatePropagation();
|
|
||||||
}
|
|
||||||
if (noping) {
|
|
||||||
a.removeAttribute('ping');
|
|
||||||
}
|
|
||||||
var realLink = getRealLinkFromGoogleUrl(a);
|
|
||||||
if (realLink) {
|
|
||||||
a.href = realLink;
|
|
||||||
// Sometimes, two fixups are needed, on old mobile user agents:
|
|
||||||
// /url?q=https://googleweblight.com/fp?u=... -> ...
|
|
||||||
realLink = getRealLinkFromGoogleUrl(a);
|
|
||||||
if (realLink) {
|
|
||||||
a.href = realLink;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
updateReferrerPolicy(a);
|
|
||||||
|
|
||||||
if (e.eventPhase === Event.CAPTURING_PHASE) {
|
|
||||||
// Our event listener runs first, to sanitize the link.
|
|
||||||
// But the page may have an event handler that modifies the link again.
|
|
||||||
// We can append a listener to the bubbling phase of the (current)
|
|
||||||
// event dispatch to fix the link up again, provided that the page did
|
|
||||||
// not call stopPropagation() or stopImmediatePropagation().
|
|
||||||
var eventOptions = { capture: false, once: true };
|
|
||||||
a.addEventListener(e.type, handlePointerPress, eventOptions);
|
|
||||||
document.addEventListener(e.type, handlePointerPress, eventOptions);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// This is specifically designed for catching clicks in Gmail.
|
|
||||||
// Gmail binds a click handler to a <div> and cancels the event after opening
|
|
||||||
// a window with an ugly URL. It uses a blank window + meta refresh in Firefox,
|
|
||||||
// which is too crazy to patch. So we just make sure that the browser's default
|
|
||||||
// click handler is activated (=open link in new tab).
|
|
||||||
// The entry point for this crazy stuff is shown in my comment at
|
|
||||||
// https://github.com/Rob--W/dont-track-me-google/issues/2
|
|
||||||
function handleClick(e) {
|
|
||||||
if (e.button !== 0) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
var a = e.target;
|
|
||||||
while (a && !a.href) {
|
|
||||||
a = a.parentElement;
|
|
||||||
}
|
|
||||||
if (!a) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (a.dataset && a.dataset.url) {
|
|
||||||
var realLink = getSanitizedIntentUrl(a.dataset.url);
|
|
||||||
if (realLink) {
|
|
||||||
a.dataset.url = realLink;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (!location.hostname.startsWith('mail.')) {
|
|
||||||
// This hack was designed for Gmail, but broke other Google sites:
|
|
||||||
// - https://github.com/Rob--W/dont-track-me-google/issues/6
|
|
||||||
// - https://github.com/Rob--W/dont-track-me-google/issues/19
|
|
||||||
// So let's disable it for every domain except Gmail.
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
// TODO: Consider using a.baseURI instead of location in case Gmail ever
|
|
||||||
// starts using <base href>?
|
|
||||||
if (a.origin === location.origin) {
|
|
||||||
// Same-origin link.
|
|
||||||
// E.g. an in-page navigation at Google Docs (#...)
|
|
||||||
// or an attachment at Gmail (https://mail.google.com/mail/u/0?ui=2&...)
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (a.protocol !== 'http:' &&
|
|
||||||
a.protocol !== 'https:' &&
|
|
||||||
a.protocol !== 'ftp:') {
|
|
||||||
// Be conservative and don't block too much. E.g. Gmail has special
|
|
||||||
// handling for mailto:-URLs, and using stopPropagation now would
|
|
||||||
// cause mailto:-links to be opened by the platform's default mailto
|
|
||||||
// handler instead of Gmail's handler (=open in new window).
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (a.target === '_blank') {
|
|
||||||
e.stopPropagation();
|
|
||||||
updateReferrerPolicy(a);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param {URL|HTMLHyperlinkElementUtils} a
|
|
||||||
* @returns {String} the real URL if the given link is a Google redirect URL.
|
|
||||||
*/
|
|
||||||
function getRealLinkFromGoogleUrl(a) {
|
|
||||||
if (a.protocol !== 'https:' && a.protocol !== 'http:') {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
var url;
|
|
||||||
if ((a.hostname === location.hostname || a.hostname === 'www.google.com') &&
|
|
||||||
(a.pathname === '/url' || a.pathname === '/local_url' ||
|
|
||||||
a.pathname === '/searchurl/rr.html' ||
|
|
||||||
a.pathname === '/linkredirect')) {
|
|
||||||
// Google Maps / Dito (/local_url?q=<url>)
|
|
||||||
// Mobile (/url?q=<url>)
|
|
||||||
// Google Meet's chat (/linkredirect?authuser=0&dest=<url>)
|
|
||||||
url = /[?&](?:q|url|dest)=((?:https?|ftp)[%:][^&]+)/.exec(a.search);
|
|
||||||
if (url) {
|
|
||||||
return decodeURIComponent(url[1]);
|
|
||||||
}
|
|
||||||
// Help pages, e.g. safe browsing (/url?...&q=%2Fsupport%2Fanswer...)
|
|
||||||
url = /[?&](?:q|url)=((?:%2[Ff]|\/)[^&]+)/.exec(a.search);
|
|
||||||
if (url) {
|
|
||||||
return a.origin + decodeURIComponent(url[1]);
|
|
||||||
}
|
|
||||||
// Redirect pages for Android intents (/searchurl/rr.html#...&url=...)
|
|
||||||
// rr.html only supports http(s). So restrict to http(s) only.
|
|
||||||
url = /[#&]url=(https?[:%][^&]+)/.exec(a.hash);
|
|
||||||
if (url) {
|
|
||||||
return decodeURIComponent(url[1]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// Google Search with old mobile UA (e.g. Firefox 41).
|
|
||||||
if (a.hostname === 'googleweblight.com' && a.pathname === '/fp') {
|
|
||||||
url = /[?&]u=((?:https?|ftp)[%:][^&]+)/.exec(a.search);
|
|
||||||
if (url) {
|
|
||||||
return decodeURIComponent(url[1]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param {string} intentUrl
|
|
||||||
* @returns {string|undefined} The sanitized intent:-URL if it was an intent URL
|
|
||||||
* with embedded tracking link.
|
|
||||||
*/
|
|
||||||
function getSanitizedIntentUrl(intentUrl) {
|
|
||||||
if (!intentUrl.startsWith('intent:')) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
// https://developer.chrome.com/multidevice/android/intents#syntax
|
|
||||||
var BROWSER_FALLBACK_URL = ';S.browser_fallback_url=';
|
|
||||||
var indexStart = intentUrl.indexOf(BROWSER_FALLBACK_URL);
|
|
||||||
if (indexStart === -1) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
indexStart += BROWSER_FALLBACK_URL.length;
|
|
||||||
var indexEnd = intentUrl.indexOf(';', indexStart);
|
|
||||||
indexEnd = indexEnd === -1 ? intentUrl.length : indexEnd;
|
|
||||||
|
|
||||||
var url = decodeURIComponent(intentUrl.substring(indexStart, indexEnd));
|
|
||||||
var realUrl = getRealLinkFromGoogleUrl(newURL(url));
|
|
||||||
if (!realUrl) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
return intentUrl.substring(0, indexStart) +
|
|
||||||
encodeURIComponent(realUrl) +
|
|
||||||
intentUrl.substring(indexEnd);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Intercept the .href setter in the page so that the page can never change the
|
|
||||||
* URL to a tracking URL. Just intercepting mousedown/touchstart is not enough
|
|
||||||
* because e.g. on Google Maps, the page rewrites the URL in the contextmenu
|
|
||||||
* event at the bubbling event stage and then stops the event propagation. So
|
|
||||||
* there is no event-driven way to fix the URL. The DOMAttrModified event could
|
|
||||||
* be used, but the event is deprecated, so not a viable long-term solution.
|
|
||||||
*/
|
|
||||||
function setupAggresiveUglyLinkPreventer() {
|
|
||||||
// This content script runs as document_start, so we can have some assurance
|
|
||||||
// that the methods in the page are reliable.
|
|
||||||
var s = document.createElement('script');
|
|
||||||
if (getScriptCspNonce()) {
|
|
||||||
s.setAttribute('nonce', scriptCspNonce);
|
|
||||||
} else if (document.readyState !== 'complete' && needsCspNonce) {
|
|
||||||
// In Firefox, a page's CSP is enforced for content scripts, so we need
|
|
||||||
// to wait for the document to be loaded (we may be at document_start)
|
|
||||||
// and find a fitting CSP nonce.
|
|
||||||
findScriptCspNonce(setupAggresiveUglyLinkPreventer);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
s.textContent = '(' + function(getRealLinkFromGoogleUrl) {
|
|
||||||
var proto = HTMLAnchorElement.prototype;
|
|
||||||
// The link target can be changed in many ways, but let's only consider
|
|
||||||
// the .href attribute since it's probably the only used setter.
|
|
||||||
var hrefProp = Object.getOwnPropertyDescriptor(proto, 'href');
|
|
||||||
var hrefGet = Function.prototype.call.bind(hrefProp.get);
|
|
||||||
var hrefSet = Function.prototype.call.bind(hrefProp.set);
|
|
||||||
|
|
||||||
Object.defineProperty(proto, 'href', {
|
|
||||||
configurable: true,
|
|
||||||
enumerable: true,
|
|
||||||
get() {
|
|
||||||
return hrefGet(this);
|
|
||||||
},
|
|
||||||
set(v) {
|
|
||||||
hrefSet(this, v);
|
|
||||||
try {
|
|
||||||
v = getRealLinkFromGoogleUrl(this);
|
|
||||||
if (v) {
|
|
||||||
hrefSet(this, v);
|
|
||||||
}
|
|
||||||
} catch (e) {
|
|
||||||
// Not expected to happen, but don't break the setter if for
|
|
||||||
// some reason the (hostile) page broke the link APIs.
|
|
||||||
}
|
|
||||||
updateReferrerPolicy(this);
|
|
||||||
},
|
|
||||||
});
|
|
||||||
function replaceAMethod(methodName, methodFunc) {
|
|
||||||
// Overwrite the methods without triggering setters, because that
|
|
||||||
// may inadvertently overwrite the prototype, as observed in
|
|
||||||
// https://github.com/Rob--W/dont-track-me-google/issues/52#issuecomment-1596207655
|
|
||||||
Object.defineProperty(proto, methodName, {
|
|
||||||
configurable: true,
|
|
||||||
// All methods that we are overriding are not part of
|
|
||||||
// HTMLAnchorElement.prototype, but inherit.
|
|
||||||
enumerable: false,
|
|
||||||
writable: true,
|
|
||||||
value: methodFunc,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// proto inherits Element.prototype.setAttribute:
|
|
||||||
var setAttribute = Function.prototype.call.bind(proto.setAttribute);
|
|
||||||
replaceAMethod('setAttribute', function(name, value) {
|
|
||||||
// Attribute names are not case-sensitive, but weird capitalizations
|
|
||||||
// are unlikely, so only check all-lowercase and all-uppercase.
|
|
||||||
if (name === 'href' || name === 'HREF') {
|
|
||||||
this.href = value;
|
|
||||||
} else {
|
|
||||||
setAttribute(this, name, value);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
// proto inherits EventTarget.prototype.dispatchEvent:
|
|
||||||
var aDispatchEvent = Function.prototype.apply.bind(proto.dispatchEvent);
|
|
||||||
replaceAMethod('dispatchEvent', function() {
|
|
||||||
updateReferrerPolicy(this);
|
|
||||||
return aDispatchEvent(this, arguments);
|
|
||||||
});
|
|
||||||
|
|
||||||
// proto inherits HTMLElement.prototype.click:
|
|
||||||
var aClick = Function.prototype.apply.bind(proto.click);
|
|
||||||
replaceAMethod('click', function() {
|
|
||||||
updateReferrerPolicy(this);
|
|
||||||
return aClick(this, arguments);
|
|
||||||
});
|
|
||||||
|
|
||||||
var rpProp = Object.getOwnPropertyDescriptor(proto, 'referrerPolicy');
|
|
||||||
var rpGet = Function.prototype.call.bind(rpProp.get);
|
|
||||||
var rpSet = Function.prototype.call.bind(rpProp.set);
|
|
||||||
|
|
||||||
var currentScript = document.currentScript;
|
|
||||||
var getReferrerPolicy = Object.getOwnPropertyDescriptor(
|
|
||||||
HTMLScriptElement.prototype,
|
|
||||||
'referrerPolicy'
|
|
||||||
).get.bind(currentScript);
|
|
||||||
|
|
||||||
function updateReferrerPolicy(a) {
|
|
||||||
try {
|
|
||||||
if (rpGet(a) === 'no-referrer') {
|
|
||||||
// "no-referrer" is more privacy-friendly than "origin".
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
var referrerPolicy = getReferrerPolicy();
|
|
||||||
if (referrerPolicy) {
|
|
||||||
rpSet(a, referrerPolicy);
|
|
||||||
}
|
|
||||||
} catch (e) {
|
|
||||||
// Not expected to happen, but don't break callers if it happens
|
|
||||||
// anyway.
|
|
||||||
}
|
|
||||||
}
|
|
||||||
currentScript.dataset.jsEnabled = 1;
|
|
||||||
} + ')(' + getRealLinkFromGoogleUrl + ');';
|
|
||||||
callImmediatelyAndOnPreferenceUpdate(function forceNoReferrerChanged() {
|
|
||||||
// Send the desired referrerPolicy value to the injected script.
|
|
||||||
s.referrerPolicy = getReferrerPolicy();
|
|
||||||
});
|
|
||||||
(document.head || document.documentElement).appendChild(s);
|
|
||||||
s.remove();
|
|
||||||
if (!s.dataset.jsEnabled) {
|
|
||||||
cleanLinksWhenJsIsDisabled();
|
|
||||||
if (!needsCspNonce) {
|
|
||||||
needsCspNonce = true;
|
|
||||||
// This is not Firefox, but the script was blocked. Perhaps a CSP
|
|
||||||
// nonce is needed anyway.
|
|
||||||
findScriptCspNonce(function() {
|
|
||||||
if (scriptCspNonce) {
|
|
||||||
setupAggresiveUglyLinkPreventer();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// Scripts enabled (not blocked by CSP), run other inline scripts.
|
|
||||||
blockTrackingBeacons();
|
|
||||||
overwriteWindowOpen();
|
|
||||||
|
|
||||||
if (location.hostname === 'docs.google.com') {
|
|
||||||
// Google Docs have simple non-JS interfaces where the ugly links
|
|
||||||
// are hard-coded in the HTML. Remove them (#51).
|
|
||||||
// https://docs.google.com/document/d/.../mobilebasic
|
|
||||||
// https://docs.google.com/spreadsheets/d/.../htmlview
|
|
||||||
cleanLinksWhenJsIsDisabled();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Block sendBeacon requests with destination /gen_204, because Google
|
|
||||||
// asynchronously sends beacon requests in response to mouse events on links:
|
|
||||||
// https://github.com/Rob--W/dont-track-me-google/issues/20
|
|
||||||
//
|
|
||||||
// This implementation also blocks other forms of tracking via gen_204 as a side
|
|
||||||
// effect. That is not fully intentional, but given the lack of obvious ways to
|
|
||||||
// discern such link-tracking events from others, I will block all of them.
|
|
||||||
function blockTrackingBeacons() {
|
|
||||||
var s = document.createElement('script');
|
|
||||||
if (getScriptCspNonce()) {
|
|
||||||
s.setAttribute('nonce', scriptCspNonce);
|
|
||||||
}
|
|
||||||
s.textContent = '(' + function() {
|
|
||||||
var navProto = window.Navigator.prototype;
|
|
||||||
var navProtoSendBeacon = navProto.sendBeacon;
|
|
||||||
if (!navProtoSendBeacon) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
var sendBeacon = Function.prototype.apply.bind(navProtoSendBeacon);
|
|
||||||
|
|
||||||
// Blocks the following:
|
|
||||||
// gen_204
|
|
||||||
// /gen_204
|
|
||||||
// https://www.google.com/gen_204
|
|
||||||
var isTrackingUrl = RegExp.prototype.test.bind(
|
|
||||||
/^(?:(?:https?:\/\/[^\/]+)?\/)?gen_204(?:[?#]|$)/);
|
|
||||||
|
|
||||||
navProto.sendBeacon = function(url, data) {
|
|
||||||
if (isTrackingUrl(url) && isNoPingEnabled()) {
|
|
||||||
// Lie that the data has been transmitted to avoid fallbacks.
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return sendBeacon(this, arguments);
|
|
||||||
};
|
|
||||||
|
|
||||||
var currentScript = document.currentScript;
|
|
||||||
var getElementId = Object.getOwnPropertyDescriptor(
|
|
||||||
Element.prototype,
|
|
||||||
'id'
|
|
||||||
).get.bind(currentScript);
|
|
||||||
function isNoPingEnabled() {
|
|
||||||
try {
|
|
||||||
return getElementId() !== '_dtmg_do_not_touch_ping';
|
|
||||||
} catch (e) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} + ')();';
|
|
||||||
callImmediatelyAndOnPreferenceUpdate(function nopingChanged() {
|
|
||||||
// Send the noping value to the injected script. The "id" property is
|
|
||||||
// mirrored and can have an arbitrary (string) value, so we use that:
|
|
||||||
s.id = noping ? '' : '_dtmg_do_not_touch_ping';
|
|
||||||
});
|
|
||||||
(document.head || document.documentElement).appendChild(s);
|
|
||||||
s.remove();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Google sometimes uses window.open() to open ugly links.
|
|
||||||
// https://github.com/Rob--W/dont-track-me-google/issues/18
|
|
||||||
// https://github.com/Rob--W/dont-track-me-google/issues/41
|
|
||||||
function overwriteWindowOpen() {
|
|
||||||
var s = document.createElement('script');
|
|
||||||
if (getScriptCspNonce()) {
|
|
||||||
s.setAttribute('nonce', scriptCspNonce);
|
|
||||||
}
|
|
||||||
s.textContent = '(' + function() {
|
|
||||||
var open = window.open;
|
|
||||||
window.open = function(url, windowName, windowFeatures) {
|
|
||||||
var isBlankUrl = !url || url === "about:blank";
|
|
||||||
try {
|
|
||||||
if (!isBlankUrl) {
|
|
||||||
var a = document.createElement('a');
|
|
||||||
// Triggers getRealLinkFromGoogleUrl via the href setter in
|
|
||||||
// setupAggresiveUglyLinkPreventer.
|
|
||||||
a.href = url;
|
|
||||||
url = a.href;
|
|
||||||
// The origin check exists to avoid adding "noreferrer" to
|
|
||||||
// same-origin popups. That implies noopener and causes
|
|
||||||
// https://github.com/Rob--W/dont-track-me-google/issues/43
|
|
||||||
// And allow any Google domain to support auth popups:
|
|
||||||
// https://github.com/Rob--W/dont-track-me-google/issues/45
|
|
||||||
// And don't bother editing the list if it already contains
|
|
||||||
// "opener" (it would be disabled by "noreferrer").
|
|
||||||
if (a.referrerPolicy && a.origin !== location.origin &&
|
|
||||||
!/\.google\.([a-z]+)$/.test(a.hostname) &&
|
|
||||||
!/\bopener|noreferrer/.test(windowFeatures)) {
|
|
||||||
if (windowFeatures) {
|
|
||||||
windowFeatures += ',';
|
|
||||||
} else {
|
|
||||||
windowFeatures = '';
|
|
||||||
}
|
|
||||||
windowFeatures += 'noreferrer';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (e) {
|
|
||||||
// Not expected to happen, but don't break callers if it does.
|
|
||||||
}
|
|
||||||
var win = open(url, windowName, windowFeatures);
|
|
||||||
try {
|
|
||||||
if (isBlankUrl && win) {
|
|
||||||
// In Google Docs, sometimes a blank document is opened,
|
|
||||||
// and document.write is used to insert a redirector.
|
|
||||||
// https://github.com/Rob--W/dont-track-me-google/issues/41
|
|
||||||
var doc = win.document;
|
|
||||||
var docWrite = win.Function.prototype.call.bind(doc.write);
|
|
||||||
doc.write = function(markup) {
|
|
||||||
try {
|
|
||||||
markup = fixupDocMarkup(markup);
|
|
||||||
} catch (e) {
|
|
||||||
// Not expected, but don't break callers otherwise.
|
|
||||||
}
|
|
||||||
return docWrite(this, markup);
|
|
||||||
};
|
|
||||||
}
|
|
||||||
} catch (e) {
|
|
||||||
// Not expected to happen, but don't break callers if it does.
|
|
||||||
}
|
|
||||||
return win;
|
|
||||||
};
|
|
||||||
function fixupDocMarkup(html) {
|
|
||||||
html = html || '';
|
|
||||||
html += '';
|
|
||||||
return html.replace(
|
|
||||||
/<meta [^>]*http-equiv=(["']?)refresh\1[^>]*>/i,
|
|
||||||
function(m) {
|
|
||||||
var doc = new DOMParser().parseFromString(m, 'text/html');
|
|
||||||
var meta = doc.querySelector('meta[http-equiv=refresh]');
|
|
||||||
return meta && fixupMetaUrl(meta) || m;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
function fixupMetaUrl(meta) {
|
|
||||||
var parts = /^(\d*;\s*url=)(.+)$/i.exec(meta.content);
|
|
||||||
if (!parts) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
var metaPrefix = parts[1];
|
|
||||||
var url = parts[2];
|
|
||||||
var a = document.createElement('a');
|
|
||||||
// Triggers getRealLinkFromGoogleUrl via the href setter in
|
|
||||||
// setupAggresiveUglyLinkPreventer.
|
|
||||||
a.href = url;
|
|
||||||
url = a.href;
|
|
||||||
meta.content = metaPrefix + url;
|
|
||||||
|
|
||||||
var html = meta.outerHTML;
|
|
||||||
if (a.referrerPolicy) {
|
|
||||||
// Google appears to already append the no-referrer
|
|
||||||
// meta tag, but add one just in case it doesn't.
|
|
||||||
html = '<meta name="referrer" content="no-referrer">' + html;
|
|
||||||
}
|
|
||||||
return html;
|
|
||||||
}
|
|
||||||
} + ')();';
|
|
||||||
(document.head || document.documentElement).appendChild(s);
|
|
||||||
s.remove();
|
|
||||||
}
|
|
||||||
|
|
||||||
function cleanLinksWhenJsIsDisabled() {
|
|
||||||
// When JavaScript is disabled, Google sets the "href" attribute's value to
|
|
||||||
// an ugly URL. Although the link is rewritten on click, we still need to
|
|
||||||
// rewrite the link even earlier because otherwise the ugly URL is shown in
|
|
||||||
// the tooltip upon hover.
|
|
||||||
|
|
||||||
if (document.readyState == 'complete') {
|
|
||||||
cleanAllLinks();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// When JS is disabled, the links won't change after the document finishes
|
|
||||||
// loading. Until the DOM has finished loading, use the mouseover event to
|
|
||||||
// beautify links (the DOMContentLoaded may be delayed on slow networks).
|
|
||||||
document.addEventListener('mouseover', handleMouseOver);
|
|
||||||
document.addEventListener('DOMContentLoaded', function() {
|
|
||||||
document.removeEventListener('mouseover', handleMouseOver);
|
|
||||||
cleanAllLinks();
|
|
||||||
}, {once: true});
|
|
||||||
|
|
||||||
function cleanAllLinks() {
|
|
||||||
var as = document.querySelectorAll('a[href]');
|
|
||||||
for (var i = 0; i < as.length; ++i) {
|
|
||||||
var href = getRealLinkFromGoogleUrl(as[i]);
|
|
||||||
if (href) {
|
|
||||||
as[i].href = href;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function handleMouseOver(e) {
|
|
||||||
var a = e.target;
|
|
||||||
var href = a.href && getRealLinkFromGoogleUrl(a);
|
|
||||||
if (href) {
|
|
||||||
a.href = href;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function getScriptCspNonce() {
|
|
||||||
var scripts = document.querySelectorAll('script[nonce]');
|
|
||||||
for (var i = 0; i < scripts.length && !scriptCspNonce; ++i) {
|
|
||||||
scriptCspNonce = scripts[i].nonce;
|
|
||||||
}
|
|
||||||
return scriptCspNonce;
|
|
||||||
}
|
|
||||||
|
|
||||||
function findScriptCspNonce(callback) {
|
|
||||||
var timer;
|
|
||||||
function checkDOM() {
|
|
||||||
if (getScriptCspNonce() || document.readyState === 'complete') {
|
|
||||||
document.removeEventListener('DOMContentLoaded', checkDOM, true);
|
|
||||||
if (timer) {
|
|
||||||
clearTimeout(timer);
|
|
||||||
}
|
|
||||||
callback();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
timer = setTimeout(checkDOM, 50);
|
|
||||||
}
|
|
||||||
document.addEventListener('DOMContentLoaded', checkDOM, true);
|
|
||||||
checkDOM();
|
|
||||||
}
|
|
||||||
|
|
||||||
function newURL(href) {
|
|
||||||
try {
|
|
||||||
return new URL(href);
|
|
||||||
} catch (e) {
|
|
||||||
var a = document.createElement('a');
|
|
||||||
a.href = href;
|
|
||||||
return a;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,984 +0,0 @@
|
|||||||
// ==UserScript==
|
|
||||||
// @name I don't care about cookies
|
|
||||||
// @name:vi Tôi không quan tâm về cookie
|
|
||||||
// @name:zh-CN 我不关心cookie
|
|
||||||
// @name:zh-TW 我不關心cookie
|
|
||||||
// @name:ja クッキーについては気にしない
|
|
||||||
// @name:ru Я не забочусь о куки
|
|
||||||
// @namespace http://tampermonkey.net/
|
|
||||||
// @version 2025.01.03.2
|
|
||||||
// @description Remove cookie warnings from almost all websites! Auto accept cookies and remove annoying cookie popups
|
|
||||||
// @description:vi Loại bỏ cảnh báo cookie từ hầu hết các trang web! Tự động chấp nhận cookie và xóa các popup cookie phiền phức
|
|
||||||
// @description:zh-CN 自动接受cookie并移除烦人的cookie弹窗
|
|
||||||
// @description:zh-TW 自動接受cookie並移除煩人的cookie彈窗
|
|
||||||
// @description:ru Автоматическое принятие cookie и удаление надоедливых всплывающих окон
|
|
||||||
// @description:ja 自動承認cookieと迷惑なポップアップを削除
|
|
||||||
// @author Yuusei
|
|
||||||
// @match *://*/*
|
|
||||||
// @grant none
|
|
||||||
// @icon https://lh3.googleusercontent.com/sCLTYpGX0VcVootQ_XaFQ9saRIhVWu79ngSzY5eTZ5evRpJ_Q27OdvxA4RrOoZXP7Q4enFh-u6VhxObcJLfARw1g=s60
|
|
||||||
// @compatible chrome
|
|
||||||
// @compatible edge
|
|
||||||
// @compatible firefox
|
|
||||||
// @compatible safari
|
|
||||||
// @run-at document-start
|
|
||||||
// @license gpl-3.0-only
|
|
||||||
// @downloadURL https://update.greasyfork.org/scripts/522645/I%20don%27t%20care%20about%20cookies.user.js
|
|
||||||
// @updateURL https://update.greasyfork.org/scripts/522645/I%20don%27t%20care%20about%20cookies.meta.js
|
|
||||||
// ==/UserScript==
|
|
||||||
|
|
||||||
(function () {
|
|
||||||
'use strict';
|
|
||||||
|
|
||||||
const CONSENT_TEXTS = {
|
|
||||||
en: ['accept', 'accept all', 'agree', 'continue', 'got it', 'reject all', 'decline', 'necessary only', 'required only', 'manage', 'customize'],
|
|
||||||
vi: ['chấp nhận', 'chấp nhận tất cả', 'đồng ý', 'tiếp tục', 'từ chối tất cả', 'từ chối', 'chỉ cần thiết', 'tùy chỉnh', 'quản lý', 'cho phép', 'đồng ý và tiếp tục', 'tôi đồng ý', 'xác nhận', 'tôi chấp nhận', 'đồng ý tất cả', 'chấp nhận và tiếp tục', 'cho phép tất cả'],
|
|
||||||
zh: ['接受', '接受全部', '同意', '继续', '拒绝全部', '拒绝', '仅必要', '管理', '自定义'],
|
|
||||||
ru: ['принять', 'принять все', 'согласен', 'продолжить', 'отклонить все', 'отклонить', 'только необходимые', 'настроить', 'управлять'],
|
|
||||||
ja: ['承認', '同意', '続ける', 'すべて拒否', '拒否', '必要のみ', 'カスタマイズ', '管理'],
|
|
||||||
de: ['akzeptieren', 'einverstanden', 'fortfahren', 'alle ablehnen', 'ablehnen', 'nur notwendige', 'anpassen', 'verwalten'],
|
|
||||||
fr: ['accepter', 'accepter tout', 'accepte', 'continuer', 'tout refuser', 'refuser', 'uniquement nécessaire', 'personnaliser', 'gérer'],
|
|
||||||
es: ['aceptar', 'acepto todo', 'acepto', 'continuar', 'rechazar todo', 'rechazar', 'solo necesario', 'personalizar', 'gestionar'],
|
|
||||||
it: ['accetta', 'accetto tutto', 'accetto', 'continua', 'rifiuta tutto', 'rifiuta', 'solo necessari', 'personalizza', 'gestisci'],
|
|
||||||
pl: ['akceptuj', 'akceptuj wszystko', 'zgadzam się', 'kontynuuj', 'odrzuć wszystko', 'odrzuć', 'tylko niezbędne', 'dostosuj', 'zarządzaj'],
|
|
||||||
nl: ['accepteren', 'accepteren', 'doorgaan', 'alles weigeren', 'weigeren', 'alleen noodzakelijk', 'aanpassen', 'beheren'],
|
|
||||||
ko: ['동의', '모두 동의', '계속하기', '모두 거부', '거부', '필수만', '설정', '관리'],
|
|
||||||
th: ['ยอมรับ', 'ยอมรับทั้งหมด', 'ตกลง', 'ปฏิเสธทั้งหมด', 'ปฏิเสธ', 'จำเป็นเท่านั้น', 'ตั้งค่า', 'จัดการ'],
|
|
||||||
id: ['setuju', 'setuju semua', 'lanjutkan', 'tolak semua', 'tolak', 'wajib saja', 'pengaturan', 'kelola'],
|
|
||||||
ms: ['terima', 'terima semua', 'teruskan', 'tolak semua', 'tolak', 'perlu sahaja', 'tetapan', 'urus'],
|
|
||||||
pt: ['aceitar', 'aceitar tudo', 'continuar', 'rejeitar tudo', 'rejeitar', 'necessário', 'configurar', 'gerir'],
|
|
||||||
sv: ['godkänn', 'godkänn alla', 'fortsätt', 'neka alla', 'neka', 'nödvändiga', 'inställningar', 'hantera'],
|
|
||||||
da: ['accepter', 'accepter alle', 'fortsæt', 'afvis alle', 'afvis', 'nødvendige', 'indstillinger', 'administrer'],
|
|
||||||
fi: ['hyväksy', 'hyväksy kaikki', 'jatka', 'hylkää kaikki', 'hylkää', 'välttämätön', 'asetukset', 'hallitse'],
|
|
||||||
'zh-CN': ['接受', '接受全部', '同意', '继续', '我同意', '确定', '确认', '知道了', '好的', '拒绝全部', '拒绝', '仅必要', '设置', '自定义', '管理', '保存设置', '允许', '允许全部', '接受并继续', '同意并继续', '保存并继续'],
|
|
||||||
'zh-TW': ['接受', '接受全部', '同意', '繼續', '我同意', '確定', '確認', '知道了', '好的', '拒絕全部', '拒絕', '僅必要', '設置', '自定義', '管理', '保存設置', '允許', '允許全部', '接受並繼續', '同意並繼續', '保存並繼續'],
|
|
||||||
ko: ['동의', '모두 동의', '수락', '계속하기', '확인', '거부', '거부하기', '필수만', '설정', '관리', '저장', '허용', '모두 허용'],
|
|
||||||
th: ['ยอมรับ', 'ยอมรับทั้งหมด', 'ตกลง', 'ดำเนินการต่อ', 'ปฏิเสธ', 'ปฏิเสธทั้งหมด', 'จำเป็นเท่านั้น', 'ตั้งค่า', 'จัดการ', 'บันทึก', 'อนุญาต', 'อนุญาตทั้งหมด'],
|
|
||||||
id: ['terima', 'terima semua', 'setuju', 'lanjutkan', 'tolak', 'tolak semua', 'wajib saja', 'pengaturan', 'kelola', 'simpan', 'izinkan', 'izinkan semua'],
|
|
||||||
ms: ['terima', 'terima semua', 'setuju', 'teruskan', 'tolak', 'tolak semua', 'perlu sahaja', 'tetapan', 'urus', 'simpan', 'benarkan', 'benarkan semua'],
|
|
||||||
};
|
|
||||||
|
|
||||||
function matchesConsentText(element) {
|
|
||||||
const text = element.textContent.toLowerCase();
|
|
||||||
const lang = document.documentElement.lang || 'en';
|
|
||||||
const texts = CONSENT_TEXTS[lang.split('-')[0]] || CONSENT_TEXTS['en'];
|
|
||||||
return texts.some(t => text.includes(t));
|
|
||||||
}
|
|
||||||
|
|
||||||
// Utility functions
|
|
||||||
function _sl(selector, container) {
|
|
||||||
return (container || document).querySelector(selector);
|
|
||||||
}
|
|
||||||
|
|
||||||
function _id(id) {
|
|
||||||
return document.getElementById(id);
|
|
||||||
}
|
|
||||||
|
|
||||||
function _ev(selector, container, full) {
|
|
||||||
return document.evaluate((typeof full == 'undefined' ? '//' : '') + selector, container || document, null, XPathResult.ANY_TYPE, null).iterateNext();
|
|
||||||
}
|
|
||||||
|
|
||||||
function _if(condition, ...selectors) {
|
|
||||||
return _sl(condition) ? _chain(...selectors) : false;
|
|
||||||
}
|
|
||||||
|
|
||||||
function _if_else(condition, if_selectors, else_selectors) {
|
|
||||||
if (_sl(condition)) return _chain(...if_selectors);
|
|
||||||
|
|
||||||
return _chain(...else_selectors);
|
|
||||||
}
|
|
||||||
|
|
||||||
function _chain(...selectors) {
|
|
||||||
let elements,
|
|
||||||
l = selectors.length;
|
|
||||||
let flagUnique = false,
|
|
||||||
flagOptional = false,
|
|
||||||
flagAllMatches = false;
|
|
||||||
|
|
||||||
for (let i = currentChainElement; i < l; i++) {
|
|
||||||
if (/^FLAG\:/.test(selectors[i])) {
|
|
||||||
selectors[i]
|
|
||||||
.split(':')[1]
|
|
||||||
.split(',')
|
|
||||||
.forEach(function (flag) {
|
|
||||||
if (flag == 'UNIQUE') flagUnique = true;
|
|
||||||
else if (flag == 'OPTIONAL') flagOptional = true;
|
|
||||||
else if (flag == 'REQUIRED') flagOptional = false;
|
|
||||||
else if (flag == 'ALL-MATCHES') flagAllMatches = true;
|
|
||||||
else if (flag == 'SINGLE-MATCH') flagAllMatches = false;
|
|
||||||
});
|
|
||||||
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (flagUnique) selectors[i] += selectors[i].startsWith('//') ? '[not(contains(@class, "' + classname + '"))]' : ':not(.' + classname + ')';
|
|
||||||
|
|
||||||
if (i == l - 1) return selectors[i];
|
|
||||||
|
|
||||||
elements = _sl(selectors[i], false, flagAllMatches);
|
|
||||||
|
|
||||||
if (!flagAllMatches) elements = elements ? [elements] : [];
|
|
||||||
|
|
||||||
if (!elements.length) {
|
|
||||||
if (flagOptional) {
|
|
||||||
currentChainElement++;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
currentChainElement++;
|
|
||||||
|
|
||||||
elements.forEach(function (element) {
|
|
||||||
if (flagUnique) element.classList.add(classname);
|
|
||||||
|
|
||||||
if (element.nodeName == 'OPTION') element.selected = true;
|
|
||||||
else element.click();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
function getItem(hostname) {
|
|
||||||
switch (hostname) {
|
|
||||||
case 'youtube.com':
|
|
||||||
case 'www.youtube.com':
|
|
||||||
return { strict: true, key: 'CONSENT', value: 'PENDING+999' };
|
|
||||||
|
|
||||||
case 'google.com':
|
|
||||||
case 'www.google.com':
|
|
||||||
return { strict: true, key: 'CONSENT', value: 'YES+' };
|
|
||||||
|
|
||||||
case 'twitter.com':
|
|
||||||
case 'www.twitter.com':
|
|
||||||
return { strict: false, key: 'twtr_cookie_consent', value: '1' };
|
|
||||||
|
|
||||||
case 'pepephone.com':
|
|
||||||
case 'lyricsbox.com':
|
|
||||||
return { strict: true, key: 'cookieconsent', value: '1111' };
|
|
||||||
|
|
||||||
case 'kontaktbazar.at':
|
|
||||||
case 'hoernews.de':
|
|
||||||
return { strict: false, key: 'cookieconsent_status', value: 'dismiss' };
|
|
||||||
|
|
||||||
case 'vodafoneziggo.nl':
|
|
||||||
return { strict: false, key: 'cookies-accepted', value: 'true' };
|
|
||||||
case 'frankfurt.de':
|
|
||||||
return { strict: false, key: 'cookieAccepted', value: 'needed---piwik' };
|
|
||||||
case 'hackerrank.com':
|
|
||||||
return { strict: false, key: 'show_cookie_banner', value: 'false' };
|
|
||||||
|
|
||||||
case 'facebook.com':
|
|
||||||
case 'www.facebook.com':
|
|
||||||
return { strict: true, key: 'datr', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'instagram.com':
|
|
||||||
case 'www.instagram.com':
|
|
||||||
return { strict: true, key: 'ig_did', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'linkedin.com':
|
|
||||||
case 'www.linkedin.com':
|
|
||||||
return { strict: false, key: 'lidc', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'reddit.com':
|
|
||||||
case 'www.reddit.com':
|
|
||||||
return { strict: false, key: 'eu_cookie', value: '{"opted":true}' };
|
|
||||||
|
|
||||||
case 'tiktok.com':
|
|
||||||
case 'www.tiktok.com':
|
|
||||||
return { strict: true, key: 'tt_webid', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'netflix.com':
|
|
||||||
case 'www.netflix.com':
|
|
||||||
return { strict: false, key: 'netflix-cookie-consent', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'spotify.com':
|
|
||||||
case 'www.spotify.com':
|
|
||||||
return { strict: false, key: 'sp_dc', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'amazon.com':
|
|
||||||
case 'www.amazon.com':
|
|
||||||
return { strict: false, key: 'amazon-cookie-consent', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'pinterest.com':
|
|
||||||
case 'www.pinterest.com':
|
|
||||||
return { strict: false, key: '_pinterest_sess', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'twitch.tv':
|
|
||||||
case 'www.twitch.tv':
|
|
||||||
return { strict: false, key: 'twitch_cookie_consent', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'github.com':
|
|
||||||
case 'www.github.com':
|
|
||||||
return { strict: false, key: '_gh_sess', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'medium.com':
|
|
||||||
case 'www.medium.com':
|
|
||||||
return { strict: false, key: 'medium_cookie_consent', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'quora.com':
|
|
||||||
case 'www.quora.com':
|
|
||||||
return { strict: false, key: 'm-b', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'stackoverflow.com':
|
|
||||||
case 'www.stackoverflow.com':
|
|
||||||
return { strict: false, key: 'acct', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'microsoft.com':
|
|
||||||
case 'www.microsoft.com':
|
|
||||||
return { strict: false, key: 'MUID', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'apple.com':
|
|
||||||
case 'www.apple.com':
|
|
||||||
return { strict: false, key: 'geo', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'dropbox.com':
|
|
||||||
case 'www.dropbox.com':
|
|
||||||
return { strict: false, key: 'dbx-consent', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'booking.com':
|
|
||||||
case 'www.booking.com':
|
|
||||||
return { strict: false, key: 'bkng_consent', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'vnexpress.net':
|
|
||||||
case 'www.vnexpress.net':
|
|
||||||
return { strict: false, key: 'vnexpress_cookie_consent', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'thanhnien.vn':
|
|
||||||
case 'www.thanhnien.vn':
|
|
||||||
return { strict: false, key: 'thanhnien_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'tuoitre.vn':
|
|
||||||
case 'www.tuoitre.vn':
|
|
||||||
return { strict: false, key: 'tuoitre_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'tiki.vn':
|
|
||||||
case 'www.tiki.vn':
|
|
||||||
return { strict: false, key: 'tiki_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'shopee.vn':
|
|
||||||
case 'www.shopee.vn':
|
|
||||||
return { strict: false, key: 'shopee_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'lazada.vn':
|
|
||||||
case 'www.lazada.vn':
|
|
||||||
return { strict: false, key: 'lzd_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'sendo.vn':
|
|
||||||
case 'www.sendo.vn':
|
|
||||||
return { strict: false, key: 'sendo_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'thegioididong.com':
|
|
||||||
case 'www.thegioididong.com':
|
|
||||||
return { strict: false, key: 'tgdd_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'fptshop.com.vn':
|
|
||||||
case 'www.fptshop.com.vn':
|
|
||||||
return { strict: false, key: 'fpt_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'cellphones.com.vn':
|
|
||||||
case 'www.cellphones.com.vn':
|
|
||||||
return { strict: false, key: 'cps_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'aliexpress.com':
|
|
||||||
case 'www.aliexpress.com':
|
|
||||||
return { strict: false, key: 'aep_usuc_f', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'ebay.com':
|
|
||||||
case 'www.ebay.com':
|
|
||||||
return { strict: false, key: 'ebay_cookie_consent', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'coursera.org':
|
|
||||||
case 'www.coursera.org':
|
|
||||||
return { strict: false, key: 'coursera_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'udemy.com':
|
|
||||||
case 'www.udemy.com':
|
|
||||||
return { strict: false, key: 'ud_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'bachhoaxanh.com':
|
|
||||||
case 'www.bachhoaxanh.com':
|
|
||||||
return { strict: false, key: 'bhx_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'dienmayxanh.com':
|
|
||||||
case 'www.dienmayxanh.com':
|
|
||||||
return { strict: false, key: 'dmx_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'nguyenkim.com':
|
|
||||||
case 'www.nguyenkim.com':
|
|
||||||
return { strict: false, key: 'nk_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'dantri.com.vn':
|
|
||||||
case 'www.dantri.com.vn':
|
|
||||||
return { strict: false, key: 'dantri_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'vietnamnet.vn':
|
|
||||||
case 'www.vietnamnet.vn':
|
|
||||||
return { strict: false, key: 'vietnamnet_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case '24h.com.vn':
|
|
||||||
case 'www.24h.com.vn':
|
|
||||||
return { strict: false, key: '24h_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'vietcombank.com.vn':
|
|
||||||
case 'www.vietcombank.com.vn':
|
|
||||||
return { strict: false, key: 'vcb_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'techcombank.com.vn':
|
|
||||||
case 'www.techcombank.com.vn':
|
|
||||||
return { strict: false, key: 'tcb_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'mbbank.com.vn':
|
|
||||||
case 'www.mbbank.com.vn':
|
|
||||||
return { strict: false, key: 'mb_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'amazon.co.jp':
|
|
||||||
case 'www.amazon.co.jp':
|
|
||||||
return { strict: false, key: 'amazon_jp_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'rakuten.co.jp':
|
|
||||||
case 'www.rakuten.co.jp':
|
|
||||||
return { strict: false, key: 'rakuten_jp_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'taobao.com':
|
|
||||||
case 'www.taobao.com':
|
|
||||||
return { strict: false, key: 'taobao_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'line.me':
|
|
||||||
case 'www.line.me':
|
|
||||||
return { strict: false, key: 'line_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'weibo.com':
|
|
||||||
case 'www.weibo.com':
|
|
||||||
return { strict: false, key: 'weibo_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'kakao.com':
|
|
||||||
case 'www.kakao.com':
|
|
||||||
return { strict: false, key: 'kakao_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'yahoo.co.jp':
|
|
||||||
case 'www.yahoo.co.jp':
|
|
||||||
return { strict: false, key: 'yahoo_jp_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'naver.com':
|
|
||||||
case 'www.naver.com':
|
|
||||||
return { strict: false, key: 'naver_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'baidu.com':
|
|
||||||
case 'www.baidu.com':
|
|
||||||
return { strict: false, key: 'baidu_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'zalando.com':
|
|
||||||
case 'www.zalando.com':
|
|
||||||
return { strict: false, key: 'zalando_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'asos.com':
|
|
||||||
case 'www.asos.com':
|
|
||||||
return { strict: false, key: 'asos_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'zara.com':
|
|
||||||
case 'www.zara.com':
|
|
||||||
return { strict: false, key: 'zara_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'tmall.com':
|
|
||||||
case 'www.tmall.com':
|
|
||||||
return { strict: false, key: 'tmall_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'jd.com':
|
|
||||||
case 'www.jd.com':
|
|
||||||
return { strict: false, key: 'jd_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'sina.com.cn':
|
|
||||||
case 'www.sina.com.cn':
|
|
||||||
return { strict: false, key: 'sina_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'qq.com':
|
|
||||||
case 'www.qq.com':
|
|
||||||
return { strict: false, key: 'qq_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case '163.com':
|
|
||||||
case 'www.163.com':
|
|
||||||
return { strict: false, key: 'netease_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'sohu.com':
|
|
||||||
case 'www.sohu.com':
|
|
||||||
return { strict: false, key: 'sohu_cookie', value: 'accepted' };
|
|
||||||
|
|
||||||
case 'bilibili.com':
|
|
||||||
case 'www.bilibili.com':
|
|
||||||
return { strict: false, key: 'bilibili_cookie', value: 'accepted' };
|
|
||||||
}
|
|
||||||
|
|
||||||
const parts = hostname.split('.');
|
|
||||||
if (parts.length > 2) {
|
|
||||||
parts.shift();
|
|
||||||
return getItem(parts.join('.'));
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
function _parent(element) {
|
|
||||||
if (element && element.parentNode) return element.parentNode;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
function _iframe(iframe_selector, selector) {
|
|
||||||
var e = _sl(iframe_selector);
|
|
||||||
return e ? _sl(selector, e.contentDocument || e.contentWindow.contentDocument) : e;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Cookie consent handling logic
|
|
||||||
let searchPairs = {
|
|
||||||
'.vn-cookie-banner': ['.vn-cookie-banner__reject', '.vn-cookie-banner__customize'],
|
|
||||||
'.vn-cookie-notice': ['.vn-cookie-notice__reject', '.vn-cookie-notice__settings'],
|
|
||||||
'.vn-cookie-consent': ['.vn-cookie-consent__reject', '.vn-cookie-consent__customize'],
|
|
||||||
'.vn-cookie-popup': ['.vn-cookie-popup__reject', '.vn-cookie-popup__settings'],
|
|
||||||
|
|
||||||
'.shopee-cookie-banner': ['.shopee-cookie-banner__reject', '.shopee-cookie-banner__settings'],
|
|
||||||
'.lazada-cookie-notice': ['.lazada-cookie-notice__reject', '.lazada-cookie-notice__settings'],
|
|
||||||
'.tiki-cookie-popup': ['.tiki-cookie-popup__reject', '.tiki-cookie-popup__settings'],
|
|
||||||
'.sendo-cookie-consent': ['.sendo-cookie-consent__reject', '.sendo-cookie-consent__settings'],
|
|
||||||
|
|
||||||
'.vnexpress-cookie': ['.vnexpress-cookie__reject', '.vnexpress-cookie__settings'],
|
|
||||||
'.tuoitre-cookie': ['.tuoitre-cookie__reject', '.tuoitre-cookie__settings'],
|
|
||||||
'.thanhnien-cookie': ['.thanhnien-cookie__reject', '.thanhnien-cookie__settings'],
|
|
||||||
'.dantri-cookie': ['.dantri-cookie__reject', '.dantri-cookie__settings'],
|
|
||||||
|
|
||||||
'.tgdd-cookie-notice': ['.tgdd-cookie-notice__reject', '.tgdd-cookie-notice__settings'],
|
|
||||||
'.fpt-cookie-popup': ['.fpt-cookie-popup__reject', '.fpt-cookie-popup__settings'],
|
|
||||||
'.cps-cookie-consent': ['.cps-cookie-consent__reject', '.cps-cookie-consent__settings'],
|
|
||||||
|
|
||||||
'.vcb-cookie-notice': ['.vcb-cookie-notice__reject', '.vcb-cookie-notice__settings'],
|
|
||||||
'.tcb-cookie-popup': ['.tcb-cookie-popup__reject', '.tcb-cookie-popup__settings'],
|
|
||||||
'.mb-cookie-consent': ['.mb-cookie-consent__reject', '.mb-cookie-consent__settings'],
|
|
||||||
|
|
||||||
'div[class*="consent"]': ['button[class*="reject"]', 'button[class*="decline"]', 'button[class*="settings"]'],
|
|
||||||
'div[class*="notice"]': ['button[class*="reject"]', 'button[class*="decline"]', 'button[class*="settings"]'],
|
|
||||||
'div[class*="popup"]': ['button[class*="reject"]', 'button[class*="decline"]', 'button[class*="settings"]'],
|
|
||||||
'div[class*="banner"]': ['button[class*="reject"]', 'button[class*="decline"]', 'button[class*="settings"]'],
|
|
||||||
};
|
|
||||||
|
|
||||||
let searchGroups = [
|
|
||||||
'.qc-cmp2-summary-buttons button[mode="secondary"],\
|
|
||||||
.qc-cmp2-buttons-desktop > button:first-child,\
|
|
||||||
#didomi-popup .didomi-button-highlight:not([class*="paywall"]):not([class*="disagree"]),\
|
|
||||||
#rgpd_video .rgpd-mask a[data-rgpd-consent],\
|
|
||||||
.cli-barmodal-open #wt-cli-privacy-save-btn,\
|
|
||||||
.js--modal[style*="block"] .cookie-permission--accept-button,\
|
|
||||||
.gdpr-modal-rider .btn-cookieaccept,\
|
|
||||||
.js-cookiewall #sel-test-accept-cookies-button,\
|
|
||||||
#mpo[style*="block"] .submit.modal-privacy__btn[onclick*="privacyframe.accept"],\
|
|
||||||
.lightbox--cookie-consent .btn-cta,\
|
|
||||||
.lightbox.cookie-consent .cookie-consent-button-decline,\
|
|
||||||
.js-modal-gdpr.is-active .btn[data-level="2"],\
|
|
||||||
#CybotCookiebotDialogBodyLevelButtonLevelOptinAllowallSelection,\
|
|
||||||
#cookieNotificationModal.in .btn.accept-cookie,\
|
|
||||||
.has-ccwindow .cc-compliance .cc-dismiss,\
|
|
||||||
.ds2-cookie-disclaimer--slidedown .ds2-cookie-disclaimer-js--submit,\
|
|
||||||
#mdlCookieCompliance.in .cookieClose,\
|
|
||||||
#cookieModal.in .js-acceptDefaultCookie,\
|
|
||||||
.c-cookiebutton .c-cookiebutton__close,\
|
|
||||||
#normativa_cookies.in .btn,\
|
|
||||||
#cookiewall.in .btn-primary,\
|
|
||||||
.outerCookieBar .EuCookieBar__cookieButton,\
|
|
||||||
#TOS-POPUP .rhododendron-popup__button--agree,\
|
|
||||||
#cookie-wall #accept-cookies,\
|
|
||||||
#popup-wrapper .button[href*="/cookies.consent.php"],\
|
|
||||||
.reveal.cookies[style*="block"] button[click*="aceptaCookies"],\
|
|
||||||
.mnd-cookie-modal[style*="block"] .btn.is--primary,\
|
|
||||||
.cookieHandler.cookieHandler--modalOpen #acceptAllCookies,\
|
|
||||||
.gdpr-modal--active .btn--primary,\
|
|
||||||
#dpi-banner:not(.hidden) #btn-agree-cookie,\
|
|
||||||
.gh-banner.gh-banner-active #gh-cookiebanner-close,\
|
|
||||||
#mrktpref.notification-bar .btn-success,\
|
|
||||||
#PopinGDPRCookie[style*="block"] .jsbd-popin-ok,\
|
|
||||||
#modal-rodo.in .btn-primary,\
|
|
||||||
.cookie-compliance-modal.in .btn-primary,\
|
|
||||||
.cookieconsent.show .btn[data-dm*="accept"],\
|
|
||||||
.cookie-wall-modal.in .btn.ja,\
|
|
||||||
#modal-consent.in .modal-consent-accept,\
|
|
||||||
.rodo #cookies.in .btn-primary,\
|
|
||||||
.js-cookie-alert.in .js-cookie-alert-accept,\
|
|
||||||
#modal_gdpr_intro_popup.in #gdpr-modal-btn-ok-agree,\
|
|
||||||
#consentButtonContainer > button[onclick*="sendAndRedirect"],\
|
|
||||||
#eu-consent[style*="block"] .btn.yes,\
|
|
||||||
.modal--gdpr.is-open .js-gdpr-consent,\
|
|
||||||
#cookiePopupModal.in .cookiepopup-agreed,\
|
|
||||||
.polityka-cookie-rodo[style*="block"] .button-zgoda,\
|
|
||||||
.ui-dialog.consent-modal[style*="block"] .js-btn-agree,\
|
|
||||||
#up-cookie.active .button[onclick*="setCookiePreference"],\
|
|
||||||
.RodoModal.in .close,\
|
|
||||||
.consent-popup form[action*="cookie-consent"] .consent-popup__button,\
|
|
||||||
#consent form[action*="cookie-consent"] .one-btn,\
|
|
||||||
#cookiewall-wrapper .button[href*="accept"],\
|
|
||||||
#cookieChoiceButtonAccept,\
|
|
||||||
.mod-cookie-consent[style*="block"] .btn-all-cookies,\
|
|
||||||
.c-layer--consent .layer-button--accept,\
|
|
||||||
.button.button-ok[onclick*="acceptAVG"],\
|
|
||||||
#meredithGdprConsentFormButton,\
|
|
||||||
#advanced-cookie-modal.in .cookie-accept,\
|
|
||||||
.show-modal .cookie-settings-manager-container .initial-dialog .js-accept-button,\
|
|
||||||
.cookie-settings-manager-container .initial-dialog[style*="block"] .js-accept-button,\
|
|
||||||
.gdprLightbox[data-module="gdprLightbox"] ._type_gdpr_agree,\
|
|
||||||
.cookie.showa #Row1_Column1_Cell1_CookieSettings_AdvancedSaveAccept,\
|
|
||||||
#core-cookie-container[style*="block"] .btn--agree,\
|
|
||||||
.cookie-consent-modal._show .action-primary,\
|
|
||||||
#dsgvoModal.show #dsvgo-banner__button,\
|
|
||||||
.basicLightbox--visible #accept-all-gdpr,\
|
|
||||||
#gdpr-modal.in .gdpr-modal__btn--accept,\
|
|
||||||
.cookiehint .btn.cookieagree,\
|
|
||||||
#cookiealert .modal.in .btn[href*="accept"],\
|
|
||||||
#lml-data-consent-accept,\
|
|
||||||
#CBCookieMsg.in .btn[onclick*="approveCookies"],\
|
|
||||||
#cookiewall-container .button[name="submit"],\
|
|
||||||
#cookie_disclaimer.in .cookie_disclaimer_button,\
|
|
||||||
.m-cookie.iziModal[style*="block"] .m-cookie__save2.button,\
|
|
||||||
kamino-cookie-policy .mat-raised-button,\
|
|
||||||
#surbma-gpga-modal[style*="block"] button,\
|
|
||||||
#GDPR.overlayBox .menuButton,\
|
|
||||||
#cookiebar .cookie-selection-button.accept,\
|
|
||||||
.modal.in .btn.close-modal-cookie,\
|
|
||||||
#consent-module[style*="block"] #consent-module-text-button,\
|
|
||||||
.modal #consentButton,\
|
|
||||||
#consent-modal[style*="block"] .lm_modal__modal__content__body__buttons__ok,\
|
|
||||||
.cookiesOverlay3Box #cookiesConsentOK,\
|
|
||||||
.bemCookieOverlay--activePopup .bemCookieOverlay__btn--save,\
|
|
||||||
#root main ~ div [data-gi-selector="reject-all-cookies"] ~ div a,\
|
|
||||||
.cookies-management .cookies-deny,\
|
|
||||||
.offcanvas.is-open .js-offcanvas-cookie-submit,\
|
|
||||||
.force--consent.show--consent #cs_save__btn,\
|
|
||||||
.force--consent.show--consent #s-sv-bn,\
|
|
||||||
#cookieNoticeModal.vrm-reveal[style*="block"] .vrm-reveal__icon--close',
|
|
||||||
'.cookie-banner .cookie-banner__buttons .cookie-banner__button--reject,\
|
|
||||||
.cookie-consent-banner .cookie-consent-banner__reject,\
|
|
||||||
.cookie-notification .cookie-notification__buttons .cookie-notification__reject,\
|
|
||||||
.cookie-policy-banner .cookie-policy-banner__buttons .cookie-policy-banner__reject,\
|
|
||||||
.cookie-warning .cookie-warning__buttons .cookie-warning__reject,\
|
|
||||||
.cookie-notice .cookie-notice__buttons .cookie-notice__reject,\
|
|
||||||
.cookie-alert .cookie-alert__buttons .cookie-alert__reject,\
|
|
||||||
.cookie-popup .cookie-popup__buttons .cookie-popup__reject,\
|
|
||||||
.cookie-modal .cookie-modal__buttons .cookie-modal__reject,\
|
|
||||||
.cookie-dialog .cookie-dialog__buttons .cookie-dialog__reject,\
|
|
||||||
.gdpr-banner .gdpr-banner__buttons .gdpr-banner__reject,\
|
|
||||||
.gdpr-modal .gdpr-modal__buttons .gdpr-modal__reject,\
|
|
||||||
.gdpr-notice .gdpr-notice__buttons .gdpr-notice__reject,\
|
|
||||||
.gdpr-popup .gdpr-popup__buttons .gdpr-popup__reject,\
|
|
||||||
.gdpr-dialog .gdpr-dialog__buttons .gdpr-dialog__reject,\
|
|
||||||
.privacy-banner .privacy-banner__buttons .privacy-banner__reject,\
|
|
||||||
.privacy-modal .privacy-modal__buttons .privacy-modal__reject,\
|
|
||||||
.privacy-notice .privacy-notice__buttons .privacy-notice__reject,\
|
|
||||||
.privacy-popup .privacy-popup__buttons .privacy-popup__reject,\
|
|
||||||
.privacy-dialog .privacy-dialog__buttons .privacy-dialog__reject',
|
|
||||||
|
|
||||||
'.consent-banner .consent-banner__buttons .consent-banner__reject,\
|
|
||||||
.consent-modal .consent-modal__buttons .consent-modal__reject,\
|
|
||||||
.consent-notice .consent-notice__buttons .consent-notice__reject,\
|
|
||||||
.consent-popup .consent-popup__buttons .consent-popup__reject,\
|
|
||||||
.consent-dialog .consent-dialog__buttons .consent-dialog__reject,\
|
|
||||||
.tracking-banner .tracking-banner__buttons .tracking-banner__reject,\
|
|
||||||
.tracking-modal .tracking-modal__buttons .tracking-modal__reject,\
|
|
||||||
.tracking-notice .tracking-notice__buttons .tracking-notice__reject,\
|
|
||||||
.tracking-popup .tracking-popup__buttons .tracking-popup__reject,\
|
|
||||||
.tracking-dialog .tracking-dialog__buttons .tracking-dialog__reject',
|
|
||||||
|
|
||||||
'.cookie-settings-modal .cookie-settings__reject,\
|
|
||||||
.cookie-settings-modal .cookie-settings__customize,\
|
|
||||||
.cookie-preferences-modal .cookie-preferences__reject,\
|
|
||||||
.cookie-preferences-modal .cookie-preferences__customize,\
|
|
||||||
.cookie-manager-modal .cookie-manager__reject,\
|
|
||||||
.cookie-manager-modal .cookie-manager__customize,\
|
|
||||||
.cookie-control-modal .cookie-control__reject,\
|
|
||||||
.cookie-control-modal .cookie-control__customize,\
|
|
||||||
.cookie-options-modal .cookie-options__reject,\
|
|
||||||
.cookie-options-modal .cookie-options__customize',
|
|
||||||
|
|
||||||
'.data-privacy-modal .data-privacy__reject,\
|
|
||||||
.data-privacy-modal .data-privacy__customize,\
|
|
||||||
.data-protection-modal .data-protection__reject,\
|
|
||||||
.data-protection-modal .data-protection__customize,\
|
|
||||||
.data-consent-modal .data-consent__reject,\
|
|
||||||
.data-consent-modal .data-consent__customize,\
|
|
||||||
.data-settings-modal .data-settings__reject,\
|
|
||||||
.data-settings-modal .data-settings__customize,\
|
|
||||||
.data-preferences-modal .data-preferences__reject,\
|
|
||||||
.data-preferences-modal .data-preferences__customize',
|
|
||||||
|
|
||||||
'.privacy-manager-modal .privacy-manager__reject,\
|
|
||||||
.privacy-manager-modal .privacy-manager__customize,\
|
|
||||||
.privacy-settings-modal .privacy-settings__reject,\
|
|
||||||
.privacy-settings-modal .privacy-settings__customize,\
|
|
||||||
.privacy-options-modal .privacy-options__reject,\
|
|
||||||
.privacy-options-modal .privacy-options__customize,\
|
|
||||||
.privacy-control-modal .privacy-control__reject,\
|
|
||||||
.privacy-control-modal .privacy-control__customize,\
|
|
||||||
.privacy-preferences-modal .privacy-preferences__reject,\
|
|
||||||
.privacy-preferences-modal .privacy-preferences__customize',
|
|
||||||
|
|
||||||
'.consent-manager-modal .consent-manager__reject,\
|
|
||||||
.consent-manager-modal .consent-manager__customize,\
|
|
||||||
.consent-settings-modal .consent-settings__reject,\
|
|
||||||
.consent-settings-modal .consent-settings__customize,\
|
|
||||||
.consent-options-modal .consent-options__reject,\
|
|
||||||
.consent-options-modal .consent-options__customize,\
|
|
||||||
.consent-control-modal .consent-control__reject,\
|
|
||||||
.consent-control-modal .consent-control__customize,\
|
|
||||||
.consent-preferences-modal .consent-preferences__reject,\
|
|
||||||
.consent-preferences-modal .consent-preferences__customize',
|
|
||||||
|
|
||||||
'.tracking-manager-modal .tracking-manager__reject,\
|
|
||||||
.tracking-manager-modal .tracking-manager__customize,\
|
|
||||||
.tracking-settings-modal .tracking-settings__reject,\
|
|
||||||
.tracking-settings-modal .tracking-settings__customize,\
|
|
||||||
.tracking-options-modal .tracking-options__reject,\
|
|
||||||
.tracking-options-modal .tracking-options__customize,\
|
|
||||||
.tracking-control-modal .tracking-control__reject,\
|
|
||||||
.tracking-control-modal .tracking-control__customize,\
|
|
||||||
.tracking-preferences-modal .tracking-preferences__reject,\
|
|
||||||
.tracking-preferences-modal .tracking-preferences__customize',
|
|
||||||
|
|
||||||
'.gdpr-manager-modal .gdpr-manager__reject,\
|
|
||||||
.gdpr-manager-modal .gdpr-manager__customize,\
|
|
||||||
.gdpr-settings-modal .gdpr-settings__reject,\
|
|
||||||
.gdpr-settings-modal .gdpr-settings__customize,\
|
|
||||||
.gdpr-options-modal .gdpr-options__reject,\
|
|
||||||
.gdpr-options-modal .gdpr-options__customize,\
|
|
||||||
.gdpr-control-modal .gdpr-control__reject,\
|
|
||||||
.gdpr-control-modal .gdpr-control__customize,\
|
|
||||||
.gdpr-preferences-modal .gdpr-preferences__reject,\
|
|
||||||
.gdpr-preferences-modal .gdpr-preferences__customize',
|
|
||||||
|
|
||||||
'div[class*="cookie-banner"] button[class*="reject"],\
|
|
||||||
div[class*="cookie-banner"] button[class*="decline"],\
|
|
||||||
div[class*="cookie-banner"] button[class*="settings"],\
|
|
||||||
div[id*="cookie-banner"] button[class*="reject"],\
|
|
||||||
div[id*="cookie-banner"] button[class*="decline"],\
|
|
||||||
div[id*="cookie-banner"] button[class*="settings"]',
|
|
||||||
|
|
||||||
'div[class*="cookie-consent"] button[class*="reject"],\
|
|
||||||
div[class*="cookie-consent"] button[class*="decline"],\
|
|
||||||
div[class*="cookie-consent"] button[class*="settings"],\
|
|
||||||
div[id*="cookie-consent"] button[class*="reject"],\
|
|
||||||
div[id*="cookie-consent"] button[class*="decline"],\
|
|
||||||
div[id*="cookie-consent"] button[class*="settings"]',
|
|
||||||
|
|
||||||
'div[class*="cookie-notice"] button[class*="reject"],\
|
|
||||||
div[class*="cookie-notice"] button[class*="decline"],\
|
|
||||||
div[class*="cookie-notice"] button[class*="settings"],\
|
|
||||||
div[id*="cookie-notice"] button[class*="reject"],\
|
|
||||||
div[id*="cookie-notice"] button[class*="decline"],\
|
|
||||||
div[id*="cookie-notice"] button[class*="settings"]',
|
|
||||||
|
|
||||||
'[data-*="cookie"] button[data-*="reject"],\
|
|
||||||
[data-*="cookie"] button[data-*="decline"],\
|
|
||||||
[data-*="cookie"] button[data-*="settings"],\
|
|
||||||
[data-*="gdpr"] button[data-*="reject"],\
|
|
||||||
[data-*="gdpr"] button[data-*="decline"],\
|
|
||||||
[data-*="gdpr"] button[data-*="settings"]',
|
|
||||||
|
|
||||||
'div[class*="cookie-layer"] button[class*="reject"],\
|
|
||||||
div[class*="cookie-layer"] button[class*="decline"],\
|
|
||||||
div[class*="cookie-layer"] button[class*="settings"],\
|
|
||||||
div[id*="cookie-layer"] button[class*="reject"],\
|
|
||||||
div[id*="cookie-layer"] button[class*="decline"],\
|
|
||||||
div[id*="cookie-layer"] button[class*="settings"]',
|
|
||||||
|
|
||||||
'div[class*="cookie-section"] button[class*="reject"],\
|
|
||||||
div[class*="cookie-section"] button[class*="decline"],\
|
|
||||||
div[class*="cookie-section"] button[class*="settings"],\
|
|
||||||
div[id*="cookie-section"] button[class*="reject"],\
|
|
||||||
div[id*="cookie-section"] button[class*="decline"],\
|
|
||||||
div[id*="cookie-section"] button[class*="settings"]',
|
|
||||||
|
|
||||||
'div[class*="cookie-container"] button[class*="reject"],\
|
|
||||||
div[class*="cookie-container"] button[class*="decline"],\
|
|
||||||
div[class*="cookie-container"] button[class*="settings"],\
|
|
||||||
div[id*="cookie-container"] button[class*="reject"],\
|
|
||||||
div[id*="cookie-container"] button[class*="decline"],\
|
|
||||||
div[id*="cookie-container"] button[class*="settings"]',
|
|
||||||
|
|
||||||
'[data-purpose*="cookie"] button[data-purpose*="reject"],\
|
|
||||||
[data-purpose*="cookie"] button[data-purpose*="decline"],\
|
|
||||||
[data-purpose*="cookie"] button[data-purpose*="settings"],\
|
|
||||||
[data-ref*="cookie"] button[data-ref*="reject"],\
|
|
||||||
[data-ref*="cookie"] button[data-ref*="decline"],\
|
|
||||||
[data-ref*="cookie"] button[data-ref*="settings"]',
|
|
||||||
|
|
||||||
'[id*="cookie-manager"] button[id*="reject"],\
|
|
||||||
[id*="cookie-manager"] button[id*="decline"],\
|
|
||||||
[id*="cookie-manager"] button[id*="settings"],\
|
|
||||||
[id*="cookie-control"] button[id*="reject"],\
|
|
||||||
[id*="cookie-control"] button[id*="decline"],\
|
|
||||||
[id*="cookie-control"] button[id*="settings"]',
|
|
||||||
|
|
||||||
'div[class*="vn-cookie"] button[class*="reject"],\
|
|
||||||
div[class*="vn-cookie"] button[class*="decline"],\
|
|
||||||
div[class*="vn-cookie"] button[class*="settings"],\
|
|
||||||
div[id*="vn-cookie"] button[class*="reject"],\
|
|
||||||
div[id*="vn-cookie"] button[class*="decline"],\
|
|
||||||
div[id*="vn-cookie"] button[class*="settings"]',
|
|
||||||
|
|
||||||
'div[class*="ecommerce"] button[class*="cookie-reject"],\
|
|
||||||
div[class*="ecommerce"] button[class*="cookie-decline"],\
|
|
||||||
div[class*="ecommerce"] button[class*="cookie-settings"],\
|
|
||||||
div[id*="ecommerce"] button[class*="cookie-reject"],\
|
|
||||||
div[id*="ecommerce"] button[class*="cookie-decline"],\
|
|
||||||
div[id*="ecommerce"] button[class*="cookie-settings"]',
|
|
||||||
|
|
||||||
'div[class*="news"] button[class*="cookie-reject"],\
|
|
||||||
div[class*="news"] button[class*="cookie-decline"],\
|
|
||||||
div[class*="news"] button[class*="cookie-settings"],\
|
|
||||||
div[id*="news"] button[class*="cookie-reject"],\
|
|
||||||
div[id*="news"] button[class*="cookie-decline"],\
|
|
||||||
div[id*="news"] button[class*="cookie-settings"]',
|
|
||||||
|
|
||||||
'div[class*="retail"] button[class*="cookie-reject"],\
|
|
||||||
div[class*="retail"] button[class*="cookie-decline"],\
|
|
||||||
div[class*="retail"] button[class*="cookie-settings"],\
|
|
||||||
div[id*="retail"] button[class*="cookie-reject"],\
|
|
||||||
div[id*="retail"] button[class*="cookie-decline"],\
|
|
||||||
div[id*="retail"] button[class*="cookie-settings"]',
|
|
||||||
|
|
||||||
'div[class*="gdpr"] button[class*="reject"],\
|
|
||||||
div[class*="gdpr"] button[class*="decline"],\
|
|
||||||
div[class*="gdpr"] button[class*="settings"],\
|
|
||||||
div[id*="gdpr"] button[class*="reject"],\
|
|
||||||
div[id*="gdpr"] button[class*="decline"],\
|
|
||||||
div[id*="gdpr"] button[class*="settings"]',
|
|
||||||
|
|
||||||
'div[class*="privacy"] button[class*="reject"],\
|
|
||||||
div[class*="privacy"] button[class*="decline"],\
|
|
||||||
div[class*="privacy"] button[class*="settings"],\
|
|
||||||
div[id*="privacy"] button[class*="reject"],\
|
|
||||||
div[id*="privacy"] button[class*="decline"],\
|
|
||||||
div[id*="privacy"] button[class*="settings"]',
|
|
||||||
|
|
||||||
'div[class*="bank"] button[class*="cookie-reject"],\
|
|
||||||
div[class*="bank"] button[class*="cookie-decline"],\
|
|
||||||
div[class*="bank"] button[class*="cookie-settings"],\
|
|
||||||
div[id*="bank"] button[class*="cookie-reject"],\
|
|
||||||
div[id*="bank"] button[class*="cookie-decline"],\
|
|
||||||
div[id*="bank"] button[class*="cookie-settings"]',
|
|
||||||
|
|
||||||
'div[class*="consent"] button[class*="reject"],\
|
|
||||||
div[class*="consent"] button[class*="decline"],\
|
|
||||||
div[class*="consent"] button[class*="settings"],\
|
|
||||||
div[id*="consent"] button[class*="reject"],\
|
|
||||||
div[id*="consent"] button[class*="decline"],\
|
|
||||||
div[id*="consent"] button[class*="settings"]',
|
|
||||||
|
|
||||||
'div[class*="notice"] button[class*="reject"],\
|
|
||||||
div[class*="notice"] button[class*="decline"],\
|
|
||||||
div[class*="notice"] button[class*="settings"],\
|
|
||||||
div[id*="notice"] button[class*="reject"],\
|
|
||||||
div[id*="notice"] button[class*="decline"],\
|
|
||||||
div[id*="notice"] button[class*="settings"]',
|
|
||||||
|
|
||||||
'div[class*="popup"] button[class*="reject"],\
|
|
||||||
div[class*="popup"] button[class*="decline"],\
|
|
||||||
div[class*="popup"] button[class*="settings"],\
|
|
||||||
div[id*="popup"] button[class*="reject"],\
|
|
||||||
div[id*="popup"] button[class*="decline"],\
|
|
||||||
div[id*="popup"] button[class*="settings"]',
|
|
||||||
|
|
||||||
'div[class*="eu-cookie-banner"] button[class*="reject"],\
|
|
||||||
div[class*="eu-cookie-banner"] button[class*="settings"]',
|
|
||||||
|
|
||||||
'div[class*="gdpr-notice"] button[class*="reject"],\
|
|
||||||
div[class*="gdpr-notice"] button[class*="settings"]',
|
|
||||||
|
|
||||||
'div[class*="privacy-consent"] button[class*="reject"],\
|
|
||||||
div[class*="privacy-consent"] button[class*="settings"]',
|
|
||||||
|
|
||||||
'div[class*="asia"] button[class*="cookie-reject"],\
|
|
||||||
div[class*="asia"] button[class*="cookie-decline"],\
|
|
||||||
div[class*="asia"] button[class*="cookie-settings"]',
|
|
||||||
|
|
||||||
'div[class*="europe"] button[class*="cookie-reject"],\
|
|
||||||
div[class*="europe"] button[class*="cookie-decline"],\
|
|
||||||
div[class*="europe"] button[class*="cookie-settings"]',
|
|
||||||
|
|
||||||
'div[class*="global"] button[class*="cookie-reject"],\
|
|
||||||
div[class*="global"] button[class*="cookie-decline"],\
|
|
||||||
div[class*="global"] button[class*="cookie-settings"]',
|
|
||||||
|
|
||||||
'div[class*="america"] button[class*="cookie-reject"],\
|
|
||||||
div[class*="america"] button[class*="cookie-decline"],\
|
|
||||||
div[class*="america"] button[class*="cookie-settings"]',
|
|
||||||
|
|
||||||
'div[class*="oceania"] button[class*="cookie-reject"],\
|
|
||||||
div[class*="oceania"] button[class*="cookie-decline"],\
|
|
||||||
div[class*="oceania"] button[class*="cookie-settings"]',
|
|
||||||
];
|
|
||||||
|
|
||||||
let currentChainElement = 0;
|
|
||||||
const classname = Math.random()
|
|
||||||
.toString(36)
|
|
||||||
.replace(/[^a-z]+/g, '');
|
|
||||||
|
|
||||||
// Search loop function
|
|
||||||
let searchGroupsLength = searchGroups.length,
|
|
||||||
searchPairsKeys = Object.keys(searchPairs),
|
|
||||||
searchPairsJoinedKeys = searchPairsKeys.join(','),
|
|
||||||
timeoutDuration = 300;
|
|
||||||
|
|
||||||
function querySelectorAllShadowRoot(selector, root = document) {
|
|
||||||
const elements = [];
|
|
||||||
const findElements = node => {
|
|
||||||
if (node.shadowRoot) {
|
|
||||||
node.shadowRoot.querySelectorAll(selector).forEach(el => elements.push(el));
|
|
||||||
node.shadowRoot.querySelectorAll('*').forEach(findElements);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
root.querySelectorAll('*').forEach(findElements);
|
|
||||||
return elements;
|
|
||||||
}
|
|
||||||
|
|
||||||
function searchLoop(counter) {
|
|
||||||
if (document.cookie.indexOf('cookie_consent') !== -1) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const dynamicTimeout = Math.min(timeoutDuration * (counter + 1), 2000);
|
|
||||||
|
|
||||||
setTimeout(function () {
|
|
||||||
document.querySelectorAll(searchPairsJoinedKeys).forEach(function (box) {
|
|
||||||
searchPairsKeys.forEach(function (selector) {
|
|
||||||
if (box.matches(selector)) {
|
|
||||||
const shadowElements = querySelectorAllShadowRoot(searchPairs[selector].join(','), box);
|
|
||||||
shadowElements.forEach(button => {
|
|
||||||
if (button.click && !button.classList.contains(classname)) {
|
|
||||||
button.classList.add(classname);
|
|
||||||
|
|
||||||
if (typeof chrome == 'object' && chrome.runtime) chrome.runtime.sendMessage({ command: 'cookie_warning_dismissed', url: document.location.href });
|
|
||||||
|
|
||||||
button.click();
|
|
||||||
|
|
||||||
if (selector != '.message-container' && button.getAttribute('href') != '#cookieman-settings')
|
|
||||||
setTimeout(function () {
|
|
||||||
if (button) button.click();
|
|
||||||
}, 500);
|
|
||||||
|
|
||||||
timeoutDuration += 500;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
document.querySelectorAll(searchGroups[counter % searchGroupsLength]).forEach(function (element) {
|
|
||||||
if (element.click && !element.classList.contains(classname)) {
|
|
||||||
element.classList.add(classname);
|
|
||||||
|
|
||||||
if (typeof chrome == 'object' && chrome.runtime) chrome.runtime.sendMessage({ command: 'cookie_warning_dismissed', url: document.location.href });
|
|
||||||
|
|
||||||
element.click();
|
|
||||||
|
|
||||||
if (element.getAttribute('aria-pressed') != 'true')
|
|
||||||
setTimeout(function () {
|
|
||||||
if (element) element.click();
|
|
||||||
}, 500);
|
|
||||||
|
|
||||||
timeoutDuration += 500;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
if (counter < 100 * searchGroupsLength) {
|
|
||||||
searchLoop(counter + 1);
|
|
||||||
}
|
|
||||||
}, dynamicTimeout);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Embeds handling
|
|
||||||
function handleEmbeds() {
|
|
||||||
var l = document.location,
|
|
||||||
is_audioboom = false,
|
|
||||||
is_dailymotion = false,
|
|
||||||
is_dailybuzz = false,
|
|
||||||
is_playerclipslaliga = false;
|
|
||||||
|
|
||||||
switch (l.hostname) {
|
|
||||||
case 'embeds.audioboom.com':
|
|
||||||
is_audioboom = true;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 'dailymotion.com':
|
|
||||||
case 'www.dailymotion.com':
|
|
||||||
is_dailymotion = l.pathname.indexOf('/embed') === 0;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 'geo.dailymotion.com':
|
|
||||||
is_dailymotion = l.pathname.indexOf('/player') === 0;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 'dailybuzz.nl':
|
|
||||||
is_dailybuzz = l.pathname.indexOf('/buzz/embed') === 0;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 'playerclipslaliga.tv':
|
|
||||||
is_playerclipslaliga = true;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
function searchEmbeds() {
|
|
||||||
setTimeout(function () {
|
|
||||||
if (is_audioboom) {
|
|
||||||
document.querySelectorAll('div[id^="cookie-modal"] .modal[style*="block"] .btn.mrs:not(.' + classname + ')').forEach(function (button) {
|
|
||||||
button.className += ' ' + classname;
|
|
||||||
button.click();
|
|
||||||
});
|
|
||||||
} else if (is_dailymotion) {
|
|
||||||
document.querySelectorAll('.np_DialogConsent-accept:not(.' + classname + '), .consent_screen-accept:not(.' + classname + ')').forEach(function (button) {
|
|
||||||
button.className += ' ' + classname;
|
|
||||||
button.click();
|
|
||||||
});
|
|
||||||
} else if (is_dailybuzz) {
|
|
||||||
document.querySelectorAll('#ask-consent #accept:not(.' + classname + ')').forEach(function (button) {
|
|
||||||
button.className += ' ' + classname;
|
|
||||||
button.click();
|
|
||||||
});
|
|
||||||
} else if (is_playerclipslaliga) {
|
|
||||||
document.querySelectorAll('#cookies button[onclick*="saveCookiesSelection"]:not(.' + classname + ')').forEach(function (button) {
|
|
||||||
button.className += ' ' + classname;
|
|
||||||
button.click();
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
searchEmbeds();
|
|
||||||
}, 1000);
|
|
||||||
}
|
|
||||||
|
|
||||||
searchEmbeds();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Initialize
|
|
||||||
var start = setInterval(function () {
|
|
||||||
var html = document.querySelector('html');
|
|
||||||
|
|
||||||
if (!html || /idc0_350/.test(html.className)) return;
|
|
||||||
|
|
||||||
clearInterval(start);
|
|
||||||
|
|
||||||
html.className += ' idc0_350';
|
|
||||||
searchLoop(0);
|
|
||||||
handleEmbeds();
|
|
||||||
}, 500);
|
|
||||||
|
|
||||||
var hostname = document.location.hostname.replace(/^w{2,3}\d*\./i, ''),
|
|
||||||
items = getItem(hostname);
|
|
||||||
|
|
||||||
if (items) {
|
|
||||||
(items instanceof Array ? items : [items]).forEach(function (item) {
|
|
||||||
let value = localStorage.getItem(item.key);
|
|
||||||
if (value == null || (item.strict && value != item.value)) {
|
|
||||||
localStorage.setItem(item.key, item.value);
|
|
||||||
counter++;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
if (counter > 0) document.location.reload();
|
|
||||||
}
|
|
||||||
})();
|
|
||||||
@@ -1,704 +0,0 @@
|
|||||||
// ==UserScript==
|
|
||||||
// @name Return YouTube Dislike
|
|
||||||
// @namespace https://www.returnyoutubedislike.com/
|
|
||||||
// @homepage https://www.returnyoutubedislike.com/
|
|
||||||
// @version 3.1.5
|
|
||||||
// @encoding utf-8
|
|
||||||
// @description Return of the YouTube Dislike, Based off https://www.returnyoutubedislike.com/
|
|
||||||
// @icon https://github.com/Anarios/return-youtube-dislike/raw/main/Icons/Return%20Youtube%20Dislike%20-%20Transparent.png
|
|
||||||
// @author Anarios & JRWR
|
|
||||||
// @match *://*.youtube.com/*
|
|
||||||
// @exclude *://music.youtube.com/*
|
|
||||||
// @exclude *://*.music.youtube.com/*
|
|
||||||
// @compatible chrome
|
|
||||||
// @compatible firefox
|
|
||||||
// @compatible opera
|
|
||||||
// @compatible safari
|
|
||||||
// @compatible edge
|
|
||||||
// @grant GM.xmlHttpRequest
|
|
||||||
// @connect youtube.com
|
|
||||||
// @grant GM_addStyle
|
|
||||||
// @run-at document-end
|
|
||||||
// @downloadURL https://update.greasyfork.org/scripts/436115/Return%20YouTube%20Dislike.user.js
|
|
||||||
// @updateURL https://update.greasyfork.org/scripts/436115/Return%20YouTube%20Dislike.meta.js
|
|
||||||
// ==/UserScript==
|
|
||||||
|
|
||||||
const extConfig = {
|
|
||||||
// BEGIN USER OPTIONS
|
|
||||||
// You may change the following variables to allowed values listed in the corresponding brackets (* means default). Keep the style and keywords intact.
|
|
||||||
showUpdatePopup: false, // [true, false*] Show a popup tab after extension update (See what's new)
|
|
||||||
disableVoteSubmission: false, // [true, false*] Disable like/dislike submission (Stops counting your likes and dislikes)
|
|
||||||
disableLogging: true, // [true*, false] Disable Logging API Response in JavaScript Console.
|
|
||||||
coloredThumbs: false, // [true, false*] Colorize thumbs (Use custom colors for thumb icons)
|
|
||||||
coloredBar: false, // [true, false*] Colorize ratio bar (Use custom colors for ratio bar)
|
|
||||||
colorTheme: "classic", // [classic*, accessible, neon] Color theme (red/green, blue/yellow, pink/cyan)
|
|
||||||
numberDisplayFormat: "compactShort", // [compactShort*, compactLong, standard] Number format (For non-English locale users, you may be able to improve appearance with a different option. Please file a feature request if your locale is not covered)
|
|
||||||
numberDisplayRoundDown: true, // [true*, false] Round down numbers (Show rounded down numbers)
|
|
||||||
tooltipPercentageMode: "none", // [none*, dash_like, dash_dislike, both, only_like, only_dislike] Mode of showing percentage in like/dislike bar tooltip.
|
|
||||||
numberDisplayReformatLikes: false, // [true, false*] Re-format like numbers (Make likes and dislikes format consistent)
|
|
||||||
rateBarEnabled: false, // [true, false*] Enables ratio bar under like/dislike buttons
|
|
||||||
// END USER OPTIONS
|
|
||||||
};
|
|
||||||
|
|
||||||
const LIKED_STATE = "LIKED_STATE";
|
|
||||||
const DISLIKED_STATE = "DISLIKED_STATE";
|
|
||||||
const NEUTRAL_STATE = "NEUTRAL_STATE";
|
|
||||||
let previousState = 3; //1=LIKED, 2=DISLIKED, 3=NEUTRAL
|
|
||||||
let likesvalue = 0;
|
|
||||||
let dislikesvalue = 0;
|
|
||||||
let preNavigateLikeButton = null;
|
|
||||||
|
|
||||||
let isMobile = location.hostname == "m.youtube.com";
|
|
||||||
let isShorts = () => location.pathname.startsWith("/shorts");
|
|
||||||
let mobileDislikes = 0;
|
|
||||||
function cLog(text, subtext = "") {
|
|
||||||
if (!extConfig.disableLogging) {
|
|
||||||
subtext = subtext.trim() === "" ? "" : `(${subtext})`;
|
|
||||||
console.log(`[Return YouTube Dislikes] ${text} ${subtext}`);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function isInViewport(element) {
|
|
||||||
const rect = element.getBoundingClientRect();
|
|
||||||
const height = innerHeight || document.documentElement.clientHeight;
|
|
||||||
const width = innerWidth || document.documentElement.clientWidth;
|
|
||||||
return (
|
|
||||||
// When short (channel) is ignored, the element (like/dislike AND short itself) is
|
|
||||||
// hidden with a 0 DOMRect. In this case, consider it outside of Viewport
|
|
||||||
!(rect.top == 0 && rect.left == 0 && rect.bottom == 0 && rect.right == 0) &&
|
|
||||||
rect.top >= 0 &&
|
|
||||||
rect.left >= 0 &&
|
|
||||||
rect.bottom <= height &&
|
|
||||||
rect.right <= width
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
function getButtons() {
|
|
||||||
if (isShorts()) {
|
|
||||||
let elements = document.querySelectorAll(
|
|
||||||
isMobile ? "ytm-like-button-renderer" : "#like-button > ytd-like-button-renderer",
|
|
||||||
);
|
|
||||||
for (let element of elements) {
|
|
||||||
if (isInViewport(element)) {
|
|
||||||
return element;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (isMobile) {
|
|
||||||
return (
|
|
||||||
document.querySelector(".slim-video-action-bar-actions .segmented-buttons") ??
|
|
||||||
document.querySelector(".slim-video-action-bar-actions")
|
|
||||||
);
|
|
||||||
}
|
|
||||||
if (document.getElementById("menu-container")?.offsetParent === null) {
|
|
||||||
return (
|
|
||||||
document.querySelector("ytd-menu-renderer.ytd-watch-metadata > div") ??
|
|
||||||
document.querySelector("ytd-menu-renderer.ytd-video-primary-info-renderer > div")
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
return document.getElementById("menu-container")?.querySelector("#top-level-buttons-computed");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function getDislikeButton() {
|
|
||||||
if (getButtons().children[0].tagName === "YTD-SEGMENTED-LIKE-DISLIKE-BUTTON-RENDERER") {
|
|
||||||
if (getButtons().children[0].children[1] === undefined) {
|
|
||||||
return document.querySelector("#segmented-dislike-button");
|
|
||||||
} else {
|
|
||||||
return getButtons().children[0].children[1];
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if (getButtons().querySelector("segmented-like-dislike-button-view-model")) {
|
|
||||||
const dislikeViewModel = getButtons().querySelector("dislike-button-view-model");
|
|
||||||
if (!dislikeViewModel) cLog("Dislike button wasn't added to DOM yet...");
|
|
||||||
return dislikeViewModel;
|
|
||||||
} else {
|
|
||||||
return getButtons().children[1];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function getLikeButton() {
|
|
||||||
return getButtons().children[0].tagName === "YTD-SEGMENTED-LIKE-DISLIKE-BUTTON-RENDERER"
|
|
||||||
? document.querySelector("#segmented-like-button") !== null
|
|
||||||
? document.querySelector("#segmented-like-button")
|
|
||||||
: getButtons().children[0].children[0]
|
|
||||||
: getButtons().querySelector("like-button-view-model") ?? getButtons().children[0];
|
|
||||||
}
|
|
||||||
|
|
||||||
function getLikeTextContainer() {
|
|
||||||
return (
|
|
||||||
getLikeButton().querySelector("#text") ??
|
|
||||||
getLikeButton().getElementsByTagName("yt-formatted-string")[0] ??
|
|
||||||
getLikeButton().querySelector("span[role='text']")
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
function getDislikeTextContainer() {
|
|
||||||
const dislikeButton = getDislikeButton();
|
|
||||||
let result =
|
|
||||||
dislikeButton?.querySelector("#text") ??
|
|
||||||
dislikeButton?.getElementsByTagName("yt-formatted-string")[0] ??
|
|
||||||
dislikeButton?.querySelector("span[role='text']");
|
|
||||||
if (result === null) {
|
|
||||||
let textSpan = document.createElement("span");
|
|
||||||
textSpan.id = "text";
|
|
||||||
textSpan.style.marginLeft = "6px";
|
|
||||||
dislikeButton?.querySelector("button").appendChild(textSpan);
|
|
||||||
if (dislikeButton) dislikeButton.querySelector("button").style.width = "auto";
|
|
||||||
result = textSpan;
|
|
||||||
}
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
function createObserver(options, callback) {
|
|
||||||
const observerWrapper = new Object();
|
|
||||||
observerWrapper.options = options;
|
|
||||||
observerWrapper.observer = new MutationObserver(callback);
|
|
||||||
observerWrapper.observe = function (element) {
|
|
||||||
this.observer.observe(element, this.options);
|
|
||||||
};
|
|
||||||
observerWrapper.disconnect = function () {
|
|
||||||
this.observer.disconnect();
|
|
||||||
};
|
|
||||||
return observerWrapper;
|
|
||||||
}
|
|
||||||
|
|
||||||
let shortsObserver = null;
|
|
||||||
|
|
||||||
if (isShorts() && !shortsObserver) {
|
|
||||||
cLog("Initializing shorts mutation observer");
|
|
||||||
shortsObserver = createObserver(
|
|
||||||
{
|
|
||||||
attributes: true,
|
|
||||||
},
|
|
||||||
(mutationList) => {
|
|
||||||
mutationList.forEach((mutation) => {
|
|
||||||
if (
|
|
||||||
mutation.type === "attributes" &&
|
|
||||||
mutation.target.nodeName === "TP-YT-PAPER-BUTTON" &&
|
|
||||||
mutation.target.id === "button"
|
|
||||||
) {
|
|
||||||
cLog("Short thumb button status changed");
|
|
||||||
if (mutation.target.getAttribute("aria-pressed") === "true") {
|
|
||||||
mutation.target.style.color =
|
|
||||||
mutation.target.parentElement.parentElement.id === "like-button"
|
|
||||||
? getColorFromTheme(true)
|
|
||||||
: getColorFromTheme(false);
|
|
||||||
} else {
|
|
||||||
mutation.target.style.color = "unset";
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
cLog("Unexpected mutation observer event: " + mutation.target + mutation.type);
|
|
||||||
});
|
|
||||||
},
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
function isVideoLiked() {
|
|
||||||
if (isMobile) {
|
|
||||||
return getLikeButton().querySelector("button").getAttribute("aria-label") == "true";
|
|
||||||
}
|
|
||||||
return getLikeButton().classList.contains("style-default-active");
|
|
||||||
}
|
|
||||||
|
|
||||||
function isVideoDisliked() {
|
|
||||||
if (isMobile) {
|
|
||||||
return getDislikeButton()?.querySelector("button").getAttribute("aria-label") == "true";
|
|
||||||
}
|
|
||||||
return getDislikeButton()?.classList.contains("style-default-active");
|
|
||||||
}
|
|
||||||
|
|
||||||
function isVideoNotLiked() {
|
|
||||||
if (isMobile) {
|
|
||||||
return !isVideoLiked();
|
|
||||||
}
|
|
||||||
return getLikeButton().classList.contains("style-text");
|
|
||||||
}
|
|
||||||
|
|
||||||
function isVideoNotDisliked() {
|
|
||||||
if (isMobile) {
|
|
||||||
return !isVideoDisliked();
|
|
||||||
}
|
|
||||||
return getDislikeButton()?.classList.contains("style-text");
|
|
||||||
}
|
|
||||||
|
|
||||||
function checkForUserAvatarButton() {
|
|
||||||
if (isMobile) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (document.querySelector("#avatar-btn")) {
|
|
||||||
return true;
|
|
||||||
} else {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function getState() {
|
|
||||||
if (isVideoLiked()) {
|
|
||||||
return LIKED_STATE;
|
|
||||||
}
|
|
||||||
if (isVideoDisliked()) {
|
|
||||||
return DISLIKED_STATE;
|
|
||||||
}
|
|
||||||
return NEUTRAL_STATE;
|
|
||||||
}
|
|
||||||
|
|
||||||
function setLikes(likesCount) {
|
|
||||||
if (isMobile) {
|
|
||||||
getButtons().children[0].querySelector(".button-renderer-text").innerText = likesCount;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
getLikeTextContainer().innerText = likesCount;
|
|
||||||
}
|
|
||||||
|
|
||||||
function setDislikes(dislikesCount) {
|
|
||||||
if (isMobile) {
|
|
||||||
mobileDislikes = dislikesCount;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const _container = getDislikeTextContainer();
|
|
||||||
_container?.removeAttribute("is-empty");
|
|
||||||
if (_container?.innerText !== dislikesCount) {
|
|
||||||
_container.innerText = dislikesCount;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function getLikeCountFromButton() {
|
|
||||||
try {
|
|
||||||
if (isShorts()) {
|
|
||||||
//Youtube Shorts don't work with this query. It's not necessary; we can skip it and still see the results.
|
|
||||||
//It should be possible to fix this function, but it's not critical to showing the dislike count.
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
let likeButton =
|
|
||||||
getLikeButton().querySelector("yt-formatted-string#text") ?? getLikeButton().querySelector("button");
|
|
||||||
|
|
||||||
let likesStr = likeButton.getAttribute("aria-label").replace(/\D/g, "");
|
|
||||||
return likesStr.length > 0 ? parseInt(likesStr) : false;
|
|
||||||
} catch {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
(typeof GM_addStyle != "undefined"
|
|
||||||
? GM_addStyle
|
|
||||||
: (styles) => {
|
|
||||||
let styleNode = document.createElement("style");
|
|
||||||
styleNode.type = "text/css";
|
|
||||||
styleNode.innerText = styles;
|
|
||||||
document.head.appendChild(styleNode);
|
|
||||||
})(`
|
|
||||||
#return-youtube-dislike-bar-container {
|
|
||||||
background: var(--yt-spec-icon-disabled);
|
|
||||||
border-radius: 2px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#return-youtube-dislike-bar {
|
|
||||||
background: var(--yt-spec-text-primary);
|
|
||||||
border-radius: 2px;
|
|
||||||
transition: all 0.15s ease-in-out;
|
|
||||||
}
|
|
||||||
|
|
||||||
.ryd-tooltip {
|
|
||||||
position: absolute;
|
|
||||||
display: block;
|
|
||||||
height: 2px;
|
|
||||||
bottom: -10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.ryd-tooltip-bar-container {
|
|
||||||
width: 100%;
|
|
||||||
height: 2px;
|
|
||||||
position: absolute;
|
|
||||||
padding-top: 6px;
|
|
||||||
padding-bottom: 12px;
|
|
||||||
top: -6px;
|
|
||||||
}
|
|
||||||
|
|
||||||
ytd-menu-renderer.ytd-watch-metadata {
|
|
||||||
overflow-y: visible !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
#top-level-buttons-computed {
|
|
||||||
position: relative !important;
|
|
||||||
}
|
|
||||||
`);
|
|
||||||
|
|
||||||
function createRateBar(likes, dislikes) {
|
|
||||||
if (isMobile || !extConfig.rateBarEnabled) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
let rateBar = document.getElementById("return-youtube-dislike-bar-container");
|
|
||||||
|
|
||||||
const widthPx = getLikeButton().clientWidth + (getDislikeButton()?.clientWidth ?? 52);
|
|
||||||
|
|
||||||
const widthPercent = likes + dislikes > 0 ? (likes / (likes + dislikes)) * 100 : 50;
|
|
||||||
|
|
||||||
var likePercentage = parseFloat(widthPercent.toFixed(1));
|
|
||||||
const dislikePercentage = (100 - likePercentage).toLocaleString();
|
|
||||||
likePercentage = likePercentage.toLocaleString();
|
|
||||||
|
|
||||||
var tooltipInnerHTML;
|
|
||||||
switch (extConfig.tooltipPercentageMode) {
|
|
||||||
case "dash_like":
|
|
||||||
tooltipInnerHTML = `${likes.toLocaleString()} / ${dislikes.toLocaleString()} - ${likePercentage}%`;
|
|
||||||
break;
|
|
||||||
case "dash_dislike":
|
|
||||||
tooltipInnerHTML = `${likes.toLocaleString()} / ${dislikes.toLocaleString()} - ${dislikePercentage}%`;
|
|
||||||
break;
|
|
||||||
case "both":
|
|
||||||
tooltipInnerHTML = `${likePercentage}% / ${dislikePercentage}%`;
|
|
||||||
break;
|
|
||||||
case "only_like":
|
|
||||||
tooltipInnerHTML = `${likePercentage}%`;
|
|
||||||
break;
|
|
||||||
case "only_dislike":
|
|
||||||
tooltipInnerHTML = `${dislikePercentage}%`;
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
tooltipInnerHTML = `${likes.toLocaleString()} / ${dislikes.toLocaleString()}`;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!rateBar && !isMobile) {
|
|
||||||
let colorLikeStyle = "";
|
|
||||||
let colorDislikeStyle = "";
|
|
||||||
if (extConfig.coloredBar) {
|
|
||||||
colorLikeStyle = "; background-color: " + getColorFromTheme(true);
|
|
||||||
colorDislikeStyle = "; background-color: " + getColorFromTheme(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
getButtons().insertAdjacentHTML(
|
|
||||||
"beforeend",
|
|
||||||
`
|
|
||||||
<div class="ryd-tooltip" style="width: ${widthPx}px">
|
|
||||||
<div class="ryd-tooltip-bar-container">
|
|
||||||
<div
|
|
||||||
id="return-youtube-dislike-bar-container"
|
|
||||||
style="width: 100%; height: 2px;${colorDislikeStyle}"
|
|
||||||
>
|
|
||||||
<div
|
|
||||||
id="return-youtube-dislike-bar"
|
|
||||||
style="width: ${widthPercent}%; height: 100%${colorDislikeStyle}"
|
|
||||||
></div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<tp-yt-paper-tooltip position="top" id="ryd-dislike-tooltip" class="style-scope ytd-sentiment-bar-renderer" role="tooltip" tabindex="-1">
|
|
||||||
<!--css-build:shady-->${tooltipInnerHTML}
|
|
||||||
</tp-yt-paper-tooltip>
|
|
||||||
</div>
|
|
||||||
`,
|
|
||||||
);
|
|
||||||
let descriptionAndActionsElement = document.getElementById("top-row");
|
|
||||||
descriptionAndActionsElement.style.borderBottom = "1px solid var(--yt-spec-10-percent-layer)";
|
|
||||||
descriptionAndActionsElement.style.paddingBottom = "10px";
|
|
||||||
} else {
|
|
||||||
document.querySelector(".ryd-tooltip").style.width = widthPx + "px";
|
|
||||||
document.getElementById("return-youtube-dislike-bar").style.width = widthPercent + "%";
|
|
||||||
|
|
||||||
if (extConfig.coloredBar) {
|
|
||||||
document.getElementById("return-youtube-dislike-bar-container").style.backgroundColor = getColorFromTheme(false);
|
|
||||||
document.getElementById("return-youtube-dislike-bar").style.backgroundColor = getColorFromTheme(true);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function setState() {
|
|
||||||
cLog("Fetching votes...");
|
|
||||||
let statsSet = false;
|
|
||||||
|
|
||||||
fetch(`https://returnyoutubedislikeapi.com/votes?videoId=${getVideoId()}`).then((response) => {
|
|
||||||
response.json().then((json) => {
|
|
||||||
if (json && !("traceId" in response) && !statsSet) {
|
|
||||||
const { dislikes, likes } = json;
|
|
||||||
cLog(`Received count: ${dislikes}`);
|
|
||||||
likesvalue = likes;
|
|
||||||
dislikesvalue = dislikes;
|
|
||||||
setDislikes(numberFormat(dislikes));
|
|
||||||
if (extConfig.numberDisplayReformatLikes === true) {
|
|
||||||
const nativeLikes = getLikeCountFromButton();
|
|
||||||
if (nativeLikes !== false) {
|
|
||||||
setLikes(numberFormat(nativeLikes));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
createRateBar(likes, dislikes);
|
|
||||||
if (extConfig.coloredThumbs === true) {
|
|
||||||
const dislikeButton = getDislikeButton();
|
|
||||||
if (isShorts()) {
|
|
||||||
// for shorts, leave deactived buttons in default color
|
|
||||||
const shortLikeButton = getLikeButton().querySelector("tp-yt-paper-button#button");
|
|
||||||
const shortDislikeButton = dislikeButton?.querySelector("tp-yt-paper-button#button");
|
|
||||||
if (shortLikeButton.getAttribute("aria-pressed") === "true") {
|
|
||||||
shortLikeButton.style.color = getColorFromTheme(true);
|
|
||||||
}
|
|
||||||
if (shortDislikeButton && shortDislikeButton.getAttribute("aria-pressed") === "true") {
|
|
||||||
shortDislikeButton.style.color = getColorFromTheme(false);
|
|
||||||
}
|
|
||||||
shortsObserver.observe(shortLikeButton);
|
|
||||||
shortsObserver.observe(shortDislikeButton);
|
|
||||||
} else {
|
|
||||||
getLikeButton().style.color = getColorFromTheme(true);
|
|
||||||
if (dislikeButton) dislikeButton.style.color = getColorFromTheme(false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function updateDOMDislikes() {
|
|
||||||
setDislikes(numberFormat(dislikesvalue));
|
|
||||||
createRateBar(likesvalue, dislikesvalue);
|
|
||||||
}
|
|
||||||
|
|
||||||
function likeClicked() {
|
|
||||||
if (checkForUserAvatarButton() == true) {
|
|
||||||
if (previousState == 1) {
|
|
||||||
likesvalue--;
|
|
||||||
updateDOMDislikes();
|
|
||||||
previousState = 3;
|
|
||||||
} else if (previousState == 2) {
|
|
||||||
likesvalue++;
|
|
||||||
dislikesvalue--;
|
|
||||||
updateDOMDislikes();
|
|
||||||
previousState = 1;
|
|
||||||
} else if (previousState == 3) {
|
|
||||||
likesvalue++;
|
|
||||||
updateDOMDislikes();
|
|
||||||
previousState = 1;
|
|
||||||
}
|
|
||||||
if (extConfig.numberDisplayReformatLikes === true) {
|
|
||||||
const nativeLikes = getLikeCountFromButton();
|
|
||||||
if (nativeLikes !== false) {
|
|
||||||
setLikes(numberFormat(nativeLikes));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function dislikeClicked() {
|
|
||||||
if (checkForUserAvatarButton() == true) {
|
|
||||||
if (previousState == 3) {
|
|
||||||
dislikesvalue++;
|
|
||||||
updateDOMDislikes();
|
|
||||||
previousState = 2;
|
|
||||||
} else if (previousState == 2) {
|
|
||||||
dislikesvalue--;
|
|
||||||
updateDOMDislikes();
|
|
||||||
previousState = 3;
|
|
||||||
} else if (previousState == 1) {
|
|
||||||
likesvalue--;
|
|
||||||
dislikesvalue++;
|
|
||||||
updateDOMDislikes();
|
|
||||||
previousState = 2;
|
|
||||||
if (extConfig.numberDisplayReformatLikes === true) {
|
|
||||||
const nativeLikes = getLikeCountFromButton();
|
|
||||||
if (nativeLikes !== false) {
|
|
||||||
setLikes(numberFormat(nativeLikes));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function setInitialState() {
|
|
||||||
setState();
|
|
||||||
}
|
|
||||||
|
|
||||||
function getVideoId() {
|
|
||||||
const urlObject = new URL(window.location.href);
|
|
||||||
const pathname = urlObject.pathname;
|
|
||||||
if (pathname.startsWith("/clip")) {
|
|
||||||
return (document.querySelector("meta[itemprop='videoId']") || document.querySelector("meta[itemprop='identifier']")).content;
|
|
||||||
} else {
|
|
||||||
if (pathname.startsWith("/shorts")) {
|
|
||||||
return pathname.slice(8);
|
|
||||||
}
|
|
||||||
return urlObject.searchParams.get("v");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function isVideoLoaded() {
|
|
||||||
if (isMobile) {
|
|
||||||
return document.getElementById("player").getAttribute("loading") == "false";
|
|
||||||
}
|
|
||||||
const videoId = getVideoId();
|
|
||||||
|
|
||||||
return (
|
|
||||||
// desktop: spring 2024 UI
|
|
||||||
document.querySelector(`ytd-watch-grid[video-id='${videoId}']`) !== null ||
|
|
||||||
// desktop: older UI
|
|
||||||
document.querySelector(`ytd-watch-flexy[video-id='${videoId}']`) !== null ||
|
|
||||||
// mobile: no video-id attribute
|
|
||||||
document.querySelector('#player[loading="false"]:not([hidden])') !== null
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
function roundDown(num) {
|
|
||||||
if (num < 1000) return num;
|
|
||||||
const int = Math.floor(Math.log10(num) - 2);
|
|
||||||
const decimal = int + (int % 3 ? 1 : 0);
|
|
||||||
const value = Math.floor(num / 10 ** decimal);
|
|
||||||
return value * 10 ** decimal;
|
|
||||||
}
|
|
||||||
|
|
||||||
function numberFormat(numberState) {
|
|
||||||
let numberDisplay;
|
|
||||||
if (extConfig.numberDisplayRoundDown === false) {
|
|
||||||
numberDisplay = numberState;
|
|
||||||
} else {
|
|
||||||
numberDisplay = roundDown(numberState);
|
|
||||||
}
|
|
||||||
return getNumberFormatter(extConfig.numberDisplayFormat).format(numberDisplay);
|
|
||||||
}
|
|
||||||
|
|
||||||
function getNumberFormatter(optionSelect) {
|
|
||||||
let userLocales;
|
|
||||||
if (document.documentElement.lang) {
|
|
||||||
userLocales = document.documentElement.lang;
|
|
||||||
} else if (navigator.language) {
|
|
||||||
userLocales = navigator.language;
|
|
||||||
} else {
|
|
||||||
try {
|
|
||||||
userLocales = new URL(
|
|
||||||
Array.from(document.querySelectorAll("head > link[rel='search']"))
|
|
||||||
?.find((n) => n?.getAttribute("href")?.includes("?locale="))
|
|
||||||
?.getAttribute("href"),
|
|
||||||
)?.searchParams?.get("locale");
|
|
||||||
} catch {
|
|
||||||
cLog("Cannot find browser locale. Use en as default for number formatting.");
|
|
||||||
userLocales = "en";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
let formatterNotation;
|
|
||||||
let formatterCompactDisplay;
|
|
||||||
switch (optionSelect) {
|
|
||||||
case "compactLong":
|
|
||||||
formatterNotation = "compact";
|
|
||||||
formatterCompactDisplay = "long";
|
|
||||||
break;
|
|
||||||
case "standard":
|
|
||||||
formatterNotation = "standard";
|
|
||||||
formatterCompactDisplay = "short";
|
|
||||||
break;
|
|
||||||
case "compactShort":
|
|
||||||
default:
|
|
||||||
formatterNotation = "compact";
|
|
||||||
formatterCompactDisplay = "short";
|
|
||||||
}
|
|
||||||
|
|
||||||
const formatter = Intl.NumberFormat(userLocales, {
|
|
||||||
notation: formatterNotation,
|
|
||||||
compactDisplay: formatterCompactDisplay,
|
|
||||||
});
|
|
||||||
return formatter;
|
|
||||||
}
|
|
||||||
|
|
||||||
function getColorFromTheme(voteIsLike) {
|
|
||||||
let colorString;
|
|
||||||
switch (extConfig.colorTheme) {
|
|
||||||
case "accessible":
|
|
||||||
if (voteIsLike === true) {
|
|
||||||
colorString = "dodgerblue";
|
|
||||||
} else {
|
|
||||||
colorString = "gold";
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case "neon":
|
|
||||||
if (voteIsLike === true) {
|
|
||||||
colorString = "aqua";
|
|
||||||
} else {
|
|
||||||
colorString = "magenta";
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case "classic":
|
|
||||||
default:
|
|
||||||
if (voteIsLike === true) {
|
|
||||||
colorString = "lime";
|
|
||||||
} else {
|
|
||||||
colorString = "red";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return colorString;
|
|
||||||
}
|
|
||||||
|
|
||||||
let smartimationObserver = null;
|
|
||||||
|
|
||||||
function setEventListeners(evt) {
|
|
||||||
let jsInitChecktimer;
|
|
||||||
|
|
||||||
function checkForJS_Finish() {
|
|
||||||
//console.log();
|
|
||||||
if (isShorts() || (getButtons()?.offsetParent && isVideoLoaded())) {
|
|
||||||
const buttons = getButtons();
|
|
||||||
const dislikeButton = getDislikeButton();
|
|
||||||
|
|
||||||
if (preNavigateLikeButton !== getLikeButton() && dislikeButton) {
|
|
||||||
cLog("Registering button listeners...");
|
|
||||||
try {
|
|
||||||
getLikeButton().addEventListener("click", likeClicked);
|
|
||||||
dislikeButton?.addEventListener("click", dislikeClicked);
|
|
||||||
getLikeButton().addEventListener("touchstart", likeClicked);
|
|
||||||
dislikeButton?.addEventListener("touchstart", dislikeClicked);
|
|
||||||
dislikeButton?.addEventListener("focusin", updateDOMDislikes);
|
|
||||||
dislikeButton?.addEventListener("focusout", updateDOMDislikes);
|
|
||||||
preNavigateLikeButton = getLikeButton();
|
|
||||||
|
|
||||||
if (!smartimationObserver) {
|
|
||||||
smartimationObserver = createObserver(
|
|
||||||
{
|
|
||||||
attributes: true,
|
|
||||||
subtree: true,
|
|
||||||
childList: true,
|
|
||||||
},
|
|
||||||
updateDOMDislikes,
|
|
||||||
);
|
|
||||||
smartimationObserver.container = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
const smartimationContainer = buttons.querySelector("yt-smartimation");
|
|
||||||
if (smartimationContainer && smartimationObserver.container != smartimationContainer) {
|
|
||||||
cLog("Initializing smartimation mutation observer");
|
|
||||||
smartimationObserver.disconnect();
|
|
||||||
smartimationObserver.observe(smartimationContainer);
|
|
||||||
smartimationObserver.container = smartimationContainer;
|
|
||||||
}
|
|
||||||
} catch {
|
|
||||||
return;
|
|
||||||
} //Don't spam errors into the console
|
|
||||||
}
|
|
||||||
if (dislikeButton) {
|
|
||||||
setInitialState();
|
|
||||||
clearInterval(jsInitChecktimer);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
cLog("Setting up...");
|
|
||||||
jsInitChecktimer = setInterval(checkForJS_Finish, 111);
|
|
||||||
}
|
|
||||||
|
|
||||||
(function () {
|
|
||||||
"use strict";
|
|
||||||
window.addEventListener("yt-navigate-finish", setEventListeners, true);
|
|
||||||
setEventListeners();
|
|
||||||
})();
|
|
||||||
if (isMobile) {
|
|
||||||
let originalPush = history.pushState;
|
|
||||||
history.pushState = function (...args) {
|
|
||||||
window.returnDislikeButtonlistenersSet = false;
|
|
||||||
setEventListeners(args[2]);
|
|
||||||
return originalPush.apply(history, args);
|
|
||||||
};
|
|
||||||
setInterval(() => {
|
|
||||||
const dislikeButton = getDislikeButton();
|
|
||||||
if (dislikeButton?.querySelector(".button-renderer-text") === null) {
|
|
||||||
getDislikeTextContainer().innerText = mobileDislikes;
|
|
||||||
} else {
|
|
||||||
if (dislikeButton) dislikeButton.querySelector(".button-renderer-text").innerText = mobileDislikes;
|
|
||||||
}
|
|
||||||
}, 1000);
|
|
||||||
}
|
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -1,18 +0,0 @@
|
|||||||
// ==UserScript==
|
|
||||||
// @name Startpage - Hide Ads
|
|
||||||
// @match https://www.startpage.com/*
|
|
||||||
// @run-at document-start
|
|
||||||
// ==/UserScript==
|
|
||||||
|
|
||||||
new MutationObserver(function(mutations) {
|
|
||||||
mutations.forEach((mutation) => {
|
|
||||||
if (mutation.type === 'childList') {
|
|
||||||
mutation.addedNodes.forEach((node) => {
|
|
||||||
if (node.nodeType === 1 && node.nodeName === 'DIV' && node.id === 'gcsa-top') {
|
|
||||||
node.remove();
|
|
||||||
this.disconnect();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}).observe(document, { childList: true, subtree: true });
|
|
||||||
@@ -1,191 +0,0 @@
|
|||||||
// ==UserScript==
|
|
||||||
// @name TrackingTokenStripper
|
|
||||||
// @version 1.4
|
|
||||||
// @description Remove most of the annoying tracking token from URL parameters
|
|
||||||
// @license MIT
|
|
||||||
// @homepage https://blog.miniasp.com/
|
|
||||||
// @homepageURL https://blog.miniasp.com/
|
|
||||||
// @website https://www.facebook.com/will.fans
|
|
||||||
// @source https://github.com/doggy8088/TrackingTokenStripper/raw/refs/heads/master/TrackingTokenStripper.user.js
|
|
||||||
// @namespace https://github.com/doggy8088/TrackingTokenStripper
|
|
||||||
// @author Will Huang
|
|
||||||
// @match *://*/*
|
|
||||||
// @run-at document-start
|
|
||||||
// ==/UserScript==
|
|
||||||
|
|
||||||
(function () {
|
|
||||||
'use strict';
|
|
||||||
|
|
||||||
const oldReplaceState = history.replaceState;
|
|
||||||
history.replaceState = function replaceState() {
|
|
||||||
let ret = oldReplaceState.apply(this, arguments);
|
|
||||||
window.dispatchEvent(new Event('replacestate'));
|
|
||||||
window.dispatchEvent(new Event('locationchange'));
|
|
||||||
return ret;
|
|
||||||
};
|
|
||||||
|
|
||||||
window.addEventListener('popstate', () => {
|
|
||||||
window.dispatchEvent(new Event('locationchange'));
|
|
||||||
});
|
|
||||||
|
|
||||||
window.addEventListener('locationchange', function () {
|
|
||||||
executeActions();
|
|
||||||
});
|
|
||||||
|
|
||||||
executeActions();
|
|
||||||
|
|
||||||
let id = setInterval(executeActions, 500);
|
|
||||||
|
|
||||||
setTimeout(() => { clearInterval(id); }, 2000);
|
|
||||||
|
|
||||||
function executeActions() {
|
|
||||||
|
|
||||||
var s = TrackingTokenStripper(location.href)
|
|
||||||
// facebook
|
|
||||||
.remove('fbclid')
|
|
||||||
.removeByDomain('www.facebook.com', 'privacy_mutation_token')
|
|
||||||
.removeByDomain('www.facebook.com', 'acontext')
|
|
||||||
.removeByDomain('www.facebook.com', '__xts__[0]')
|
|
||||||
.removeByDomain('www.facebook.com', 'notif_t')
|
|
||||||
.removeByDomain('www.facebook.com', 'notif_id')
|
|
||||||
.removeByDomain('www.facebook.com', 'notif_ids[0]')
|
|
||||||
.removeByDomain('www.facebook.com', 'notif_ids[1]')
|
|
||||||
.removeByDomain('www.facebook.com', 'notif_ids[2]')
|
|
||||||
.removeByDomain('www.facebook.com', 'notif_ids[3]')
|
|
||||||
.removeByDomain('www.facebook.com', 'ref', 'notif')
|
|
||||||
.removeByDomain('www.facebook.com', 'ref=watch_permalink')
|
|
||||||
|
|
||||||
// Dropbox
|
|
||||||
.removeByDomain('www.dropbox.com', '_ad')
|
|
||||||
.removeByDomain('www.dropbox.com', '_camp')
|
|
||||||
.removeByDomain('www.dropbox.com', '_tk')
|
|
||||||
|
|
||||||
// YouTube
|
|
||||||
// https://youtu.be/4f-Y9G5ENPc?si=SHSu2hEdSbXGy4_Q
|
|
||||||
// https://www.youtube.com/embed/4f-Y9G5ENPc?si=GQFJV_nKMXxpiQb6
|
|
||||||
.removeByDomain('youtu.be', 'si')
|
|
||||||
.removeByDomain('www.youtube.com', 'si')
|
|
||||||
|
|
||||||
// Google Analytics
|
|
||||||
// https://support.google.com/analytics/answer/1033863?hl=en
|
|
||||||
.remove('utm_id')
|
|
||||||
.remove('utm_source')
|
|
||||||
.remove('utm_medium')
|
|
||||||
.remove('utm_campaign')
|
|
||||||
.remove('utm_term')
|
|
||||||
.remove('utm_content')
|
|
||||||
.remove('_ga')
|
|
||||||
|
|
||||||
// GA - others
|
|
||||||
.remove('utm_campaignid')
|
|
||||||
.remove('utm_cid')
|
|
||||||
.remove('utm_reader')
|
|
||||||
.remove('utm_referrer')
|
|
||||||
.remove('utm_name')
|
|
||||||
.remove('utm_social')
|
|
||||||
.remove('utm_social-type')
|
|
||||||
.remove('gclid')
|
|
||||||
.remove('igshid')
|
|
||||||
.remove('_hsenc')
|
|
||||||
.remove('_hsmi')
|
|
||||||
.remove('mc_cid')
|
|
||||||
.remove('mc_eid')
|
|
||||||
.remove('mkt_tok')
|
|
||||||
.remove('yclid')
|
|
||||||
.remove('_openstat')
|
|
||||||
|
|
||||||
// devblogs.microsoft.com
|
|
||||||
.removeByDomain('devblogs.microsoft.com', 'utm_issue')
|
|
||||||
.removeByDomain('devblogs.microsoft.com', 'utm_position')
|
|
||||||
.removeByDomain('devblogs.microsoft.com', 'utm_topic')
|
|
||||||
.removeByDomain('devblogs.microsoft.com', 'utm_section')
|
|
||||||
.removeByDomain('devblogs.microsoft.com', 'utm_cta')
|
|
||||||
.removeByDomain('devblogs.microsoft.com', 'utm_description')
|
|
||||||
.removeByDomain('devblogs.microsoft.com', 'ocid')
|
|
||||||
|
|
||||||
// Microsoft
|
|
||||||
.remove('wt.mc_id')
|
|
||||||
.removeByDomain('learn.microsoft.com', 'ocid')
|
|
||||||
.removeByDomain('learn.microsoft.com', 'redirectedfrom')
|
|
||||||
|
|
||||||
.removeByDomain('azure.microsoft.com', 'OCID')
|
|
||||||
.removeByDomain('azure.microsoft.com', 'ef_id')
|
|
||||||
|
|
||||||
.removeByDomain('www.msn.com', 'ocid')
|
|
||||||
.removeByDomain('www.msn.com', 'cvid')
|
|
||||||
|
|
||||||
// bilibili
|
|
||||||
.removeByDomain('www.bilibili.com', 'share_source')
|
|
||||||
.removeByDomain('www.bilibili.com', 'share_medium')
|
|
||||||
|
|
||||||
// Others
|
|
||||||
.remove('__tn__')
|
|
||||||
.remove('gclsrc')
|
|
||||||
.remove('itm_source')
|
|
||||||
.remove('itm_medium')
|
|
||||||
.remove('itm_campaign')
|
|
||||||
.remove('mc') // sendgrid.com
|
|
||||||
.remove('mcd') // sendgrid.com
|
|
||||||
.remove('cvosrc') // sendgrid.com
|
|
||||||
.remove('cr_cc') // https://blogs.microsoft.com/
|
|
||||||
|
|
||||||
.remove('sc_channel')
|
|
||||||
.remove('sc_campaign')
|
|
||||||
.remove('sc_geo')
|
|
||||||
.remove('trk')
|
|
||||||
.remove('sc_publisher')
|
|
||||||
.remove('trkCampaign')
|
|
||||||
.remove('sc_outcome')
|
|
||||||
.remove('sc_country')
|
|
||||||
|
|
||||||
.remove('__hstc')
|
|
||||||
.remove('__hssc')
|
|
||||||
.remove('__hsfp')
|
|
||||||
.remove('_gl')
|
|
||||||
|
|
||||||
// Yahoo News
|
|
||||||
.remove('guce_referrer')
|
|
||||||
.remove('guce_referrer_sig')
|
|
||||||
|
|
||||||
.toString();
|
|
||||||
|
|
||||||
if (s && location.href !== s) {
|
|
||||||
// console.log('Changing URL', s);
|
|
||||||
// location.href = s;
|
|
||||||
oldReplaceState.apply(history, [{}, '', s]);
|
|
||||||
}
|
|
||||||
|
|
||||||
function TrackingTokenStripper(url) {
|
|
||||||
const parsedUrl = new URL(url);
|
|
||||||
return {
|
|
||||||
remove(name, value) {
|
|
||||||
if (parsedUrl.searchParams.has(name)) {
|
|
||||||
if (value && value === parsedUrl.searchParams.get(name)) {
|
|
||||||
parsedUrl.searchParams.delete(name);
|
|
||||||
}
|
|
||||||
if (!value) {
|
|
||||||
parsedUrl.searchParams.delete(name);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return TrackingTokenStripper(parsedUrl.toString());
|
|
||||||
},
|
|
||||||
removeByDomain(domain, name) {
|
|
||||||
if (parsedUrl.hostname.toLocaleLowerCase() === domain.toLocaleLowerCase()) {
|
|
||||||
if (name.indexOf('=') >= 0) {
|
|
||||||
var [key, value] = name.split("=");
|
|
||||||
return this.remove(key, value);
|
|
||||||
} else {
|
|
||||||
return this.remove(name);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
},
|
|
||||||
toString() {
|
|
||||||
return parsedUrl.toString();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
})();
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
{config, ...}: {
|
|
||||||
programs.qutebrowser.keyBindings = {
|
|
||||||
normal."<Ctrl-w>" = "tab-close";
|
|
||||||
normal."<Ctrl-Tab>" = "tab-next";
|
|
||||||
normal."<Ctrl-Shift-Tab>" = "tab-prev";
|
|
||||||
normal."<Ctrl-b>" = "open file://${config.xdg.dataHome}/qutebrowser/bookmarks.html";
|
|
||||||
|
|
||||||
# Ctrl+c is used to leave the current mode and return to normal mode.
|
|
||||||
insert."<Ctrl-c>" = "mode-leave";
|
|
||||||
hint."<Ctrl-c>" = "mode-leave";
|
|
||||||
caret."<Ctrl-c>" = "mode-leave";
|
|
||||||
command."<Ctrl-c>" = "mode-leave";
|
|
||||||
prompt."<Ctrl-c>" = "mode-leave";
|
|
||||||
yesno."<Ctrl-c>" = "mode-leave";
|
|
||||||
register."<Ctrl-c>" = "mode-leave";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,30 +0,0 @@
|
|||||||
{
|
|
||||||
programs.qutebrowser.searchEngines = rec {
|
|
||||||
startpage = "https://www.startpage.com/sp/search?q={}";
|
|
||||||
|
|
||||||
mynixos = "https://mynixos.com/search?q={}";
|
|
||||||
duckduckgo = "https://duckduckgo.com/?q={}";
|
|
||||||
google = "https://google.com/search?hl=en&q={}";
|
|
||||||
yandex = "https://yandex.com/search/?text={}";
|
|
||||||
bing = "https://bing.com/search?q={}";
|
|
||||||
youtube = "https://youtube.com/results?search_query={}";
|
|
||||||
google-images = "https://google.com/search?hl=en&tbm=isch&q={}";
|
|
||||||
|
|
||||||
# AI
|
|
||||||
chatgpt = "https://chatgpt.com/?q={}";
|
|
||||||
claude = "https://claude.ai/new?q={}";
|
|
||||||
gemini = "https://gemini.google.com/app?q={}";
|
|
||||||
|
|
||||||
# Maps
|
|
||||||
amap = "https://maps.apple.com/?q={}";
|
|
||||||
gmap = "https://www.google.com/maps/search/{}";
|
|
||||||
|
|
||||||
# shortcuts
|
|
||||||
g = google;
|
|
||||||
n = mynixos;
|
|
||||||
gpt = chatgpt;
|
|
||||||
gem = gemini;
|
|
||||||
cla = claude;
|
|
||||||
DEFAULT = startpage;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,51 +0,0 @@
|
|||||||
{config, ...}: {
|
|
||||||
programs.qutebrowser = {
|
|
||||||
settings = {
|
|
||||||
url = rec {
|
|
||||||
default_page = "file://${config.xdg.dataHome}/qutebrowser/bookmarks.html";
|
|
||||||
start_pages = [default_page];
|
|
||||||
};
|
|
||||||
new_instance_open_target = "window";
|
|
||||||
"tabs.last_close" = "close";
|
|
||||||
"statusbar.widgets" = ["keypress" "url" "progress"];
|
|
||||||
|
|
||||||
# Adblock
|
|
||||||
"content.blocking.enabled" = true;
|
|
||||||
"content.blocking.method" = "adblock";
|
|
||||||
"content.blocking.adblock.lists" = [
|
|
||||||
"https://easylist.to/easylist/easylist.txt"
|
|
||||||
"https://easylist.to/easylist/easyprivacy.txt"
|
|
||||||
"https://secure.fanboy.co.nz/fanboy-cookiemonster.txt"
|
|
||||||
];
|
|
||||||
|
|
||||||
# Clipboard access (needed for Excalidraw, Cyberchef, etc.)
|
|
||||||
"content.javascript.clipboard" = "access";
|
|
||||||
|
|
||||||
# Downloads
|
|
||||||
"downloads.location.directory" = "~/Downloads";
|
|
||||||
"downloads.location.prompt" = false;
|
|
||||||
|
|
||||||
# Editor (Ctrl+e in text fields)
|
|
||||||
"editor.command" = ["ghostty" "-e" "nvim" "{}"];
|
|
||||||
|
|
||||||
# Tabs
|
|
||||||
# "tabs.show" = "switching";
|
|
||||||
# "tabs.show_switching_delay" = 3000;
|
|
||||||
|
|
||||||
# Scrollbar
|
|
||||||
"scrolling.bar" = "never";
|
|
||||||
|
|
||||||
# Statusbar
|
|
||||||
"statusbar.show" = "in-mode";
|
|
||||||
|
|
||||||
# Privacy
|
|
||||||
"content.geolocation" = false;
|
|
||||||
"content.cookies.accept" = "no-3rdparty";
|
|
||||||
};
|
|
||||||
|
|
||||||
extraConfig = ''
|
|
||||||
c.statusbar.padding = {'top': 6, 'bottom': 6, 'left': 8, 'right': 8}
|
|
||||||
c.tabs.padding = {'top': 6, 'bottom': 6, 'left': 8, 'right': 8}
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
{
|
|
||||||
xdg.dataFile = {
|
|
||||||
# Startpage - hide sponsored results
|
|
||||||
"qutebrowser/greasemonkey/startpage-no-ads.user.js".source =
|
|
||||||
./greasemonkey/startpage-no-ads.user.js;
|
|
||||||
|
|
||||||
# Return YouTube Dislike
|
|
||||||
"qutebrowser/greasemonkey/return-youtube-dislike.user.js".source =
|
|
||||||
./greasemonkey/return-youtube-dislike.user.js;
|
|
||||||
|
|
||||||
# SponsorBlock Lite - auto-skip sponsors on YouTube
|
|
||||||
"qutebrowser/greasemonkey/sponsorblock-lite.user.js".source =
|
|
||||||
./greasemonkey/sponsorblock-lite.user.js;
|
|
||||||
|
|
||||||
# Don't Track Me Google - remove Google tracking redirects
|
|
||||||
"qutebrowser/greasemonkey/dont-track-me-google.user.js".source =
|
|
||||||
./greasemonkey/dont-track-me-google.user.js;
|
|
||||||
|
|
||||||
# I don't care about cookies - auto-dismiss cookie banners
|
|
||||||
"qutebrowser/greasemonkey/i-dont-care-about-cookies.user.js".source =
|
|
||||||
./greasemonkey/i-dont-care-about-cookies.user.js;
|
|
||||||
|
|
||||||
# TrackingTokenStripper - remove tracking params from URLs (utm_*, fbclid, etc.)
|
|
||||||
"qutebrowser/greasemonkey/tracking-token-stripper.user.js".source =
|
|
||||||
./greasemonkey/tracking-token-stripper.user.js;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -12,10 +12,6 @@ in {
|
|||||||
# Add go binaries to the PATH
|
# Add go binaries to the PATH
|
||||||
home.sessionPath = ["$HOME/go/bin"];
|
home.sessionPath = ["$HOME/go/bin"];
|
||||||
|
|
||||||
home.sessionVariables = {
|
|
||||||
COLORTERM = "truecolor";
|
|
||||||
};
|
|
||||||
|
|
||||||
programs.zsh = {
|
programs.zsh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableCompletion = true;
|
enableCompletion = true;
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
# Spicetify is a spotify client customizer
|
# Spicetify is a spotify client customizer
|
||||||
{
|
{
|
||||||
pkgs,
|
pkgs,
|
||||||
pkgs-stable,
|
|
||||||
config,
|
config,
|
||||||
lib,
|
lib,
|
||||||
inputs,
|
inputs,
|
||||||
@@ -17,7 +16,6 @@ in {
|
|||||||
|
|
||||||
programs.spicetify = {
|
programs.spicetify = {
|
||||||
enable = true;
|
enable = true;
|
||||||
spotifyPackage = pkgs-stable.spotify;
|
|
||||||
theme = lib.mkForce spicePkgs.themes.dribbblish;
|
theme = lib.mkForce spicePkgs.themes.dribbblish;
|
||||||
|
|
||||||
colorScheme = "custom";
|
colorScheme = "custom";
|
||||||
@@ -33,6 +31,7 @@ in {
|
|||||||
|
|
||||||
enabledExtensions = with spicePkgs.extensions; [
|
enabledExtensions = with spicePkgs.extensions; [
|
||||||
playlistIcons
|
playlistIcons
|
||||||
|
lastfm
|
||||||
historyShortcut
|
historyShortcut
|
||||||
hidePodcasts
|
hidePodcasts
|
||||||
adblock
|
adblock
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
# Thunar is a file explorer
|
# Thunar is a file explorer
|
||||||
{
|
{
|
||||||
pkgs,
|
pkgs,
|
||||||
pkgs-stable,
|
|
||||||
config,
|
config,
|
||||||
lib,
|
lib,
|
||||||
...
|
...
|
||||||
@@ -9,24 +8,20 @@
|
|||||||
user = config.var.username;
|
user = config.var.username;
|
||||||
in {
|
in {
|
||||||
# ctrl + m to toggle the menubar
|
# ctrl + m to toggle the menubar
|
||||||
home.packages =
|
home.packages = with pkgs; [
|
||||||
(with pkgs-stable; [
|
thunar
|
||||||
xfce.thunar
|
xfconf
|
||||||
xfce.xfconf
|
tumbler
|
||||||
xfce.tumbler
|
thunar-archive-plugin
|
||||||
xfce.thunar-archive-plugin
|
thunar-volman
|
||||||
xfce.thunar-volman
|
thunar-media-tags-plugin
|
||||||
xfce.thunar-media-tags-plugin
|
p7zip
|
||||||
p7zip
|
xarchiver
|
||||||
xarchiver
|
papirus-icon-theme
|
||||||
])
|
material-icons
|
||||||
++ (with pkgs; [
|
material-design-icons
|
||||||
# Icon themes: keep on global pkgs to avoid conflicts with other modules
|
material-symbols
|
||||||
papirus-icon-theme
|
];
|
||||||
material-icons
|
|
||||||
material-design-icons
|
|
||||||
material-symbols
|
|
||||||
]);
|
|
||||||
|
|
||||||
gtk = {
|
gtk = {
|
||||||
enable = true;
|
enable = true;
|
||||||
@@ -35,8 +30,6 @@ in {
|
|||||||
package = pkgs.papirus-icon-theme;
|
package = pkgs.papirus-icon-theme;
|
||||||
};
|
};
|
||||||
|
|
||||||
gtk4.theme = null;
|
|
||||||
|
|
||||||
# bookmarks for the side pane
|
# bookmarks for the side pane
|
||||||
gtk3.bookmarks = [
|
gtk3.bookmarks = [
|
||||||
"file:///home/${user}/Downloads Downloads"
|
"file:///home/${user}/Downloads Downloads"
|
||||||
|
|||||||
@@ -0,0 +1,15 @@
|
|||||||
|
# TODO: Misc section with VLC, Zathura etc
|
||||||
|
# Zathura is a PDF viewer
|
||||||
|
{
|
||||||
|
programs.zathura = {
|
||||||
|
enable = true;
|
||||||
|
|
||||||
|
options = {
|
||||||
|
guioptions = "v";
|
||||||
|
adjust-open = "width";
|
||||||
|
statusbar-basename = true;
|
||||||
|
render-loading = false;
|
||||||
|
scroll-step = 120;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -47,17 +47,7 @@ in {
|
|||||||
{
|
{
|
||||||
key = "v";
|
key = "v";
|
||||||
desc = "Proton VPN";
|
desc = "Proton VPN";
|
||||||
cmd = "${pkgs.proton-vpn}/bin/protonvpn-app";
|
cmd = "${pkgs.protonvpn-gui}/bin/protonvpn-app";
|
||||||
}
|
|
||||||
{
|
|
||||||
key = "c";
|
|
||||||
desc = "Proton Calendar";
|
|
||||||
cmd = "${pkgs.qutebrowser}/bin/qutebrowser 'https://calendar.proton.me/'";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
key = "m";
|
|
||||||
desc = "Proton Mail";
|
|
||||||
cmd = "${pkgs.qutebrowser}/bin/qutebrowser 'https://mail.proton.me/'";
|
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
key = "o";
|
key = "o";
|
||||||
@@ -76,18 +66,61 @@ in {
|
|||||||
}
|
}
|
||||||
{
|
{
|
||||||
key = "b";
|
key = "b";
|
||||||
desc = "Qutebrowser";
|
desc = "Brave";
|
||||||
cmd = "${pkgs.qutebrowser}/bin/qutebrowser";
|
cmd = "${pkgs.brave}/bin/brave";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
key = "i";
|
key = "i";
|
||||||
desc = "Qutebrowser (Temp session)";
|
desc = "Brave (Private window)";
|
||||||
cmd = "${pkgs.qutebrowser}/bin/qutebrowser --temp-basedir";
|
cmd = "${pkgs.brave}/bin/brave --incognito";
|
||||||
}
|
}
|
||||||
]))
|
]))
|
||||||
|
|
||||||
# Web links
|
# Web links
|
||||||
"$mod,B, exec, uwsm app -- ${pkgs.qutebrowser}/bin/qutebrowser" # Browser (Qutebrowser)
|
"$mod,B, exec, uwsm app -- ${pkgs.brave}/bin/brave" # Browser (Brave)
|
||||||
|
("$shiftMod, B, exec, "
|
||||||
|
+ lib.getExe (mkMenu [
|
||||||
|
{
|
||||||
|
key = "h";
|
||||||
|
desc = "Home";
|
||||||
|
cmd = "${pkgs.brave}/bin/brave 'https://home.hadi.icu'";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
key = "m";
|
||||||
|
desc = "Proton Mail";
|
||||||
|
cmd = "${pkgs.brave}/bin/brave 'https://mail.proton.me/u/2/inbox'";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
key = "c";
|
||||||
|
desc = "Proton Calendar";
|
||||||
|
cmd = "${pkgs.brave}/bin/brave 'https://calendar.proton.me/u/2'";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
key = "l";
|
||||||
|
desc = "Proton Lumo";
|
||||||
|
cmd = "${pkgs.brave}/bin/brave 'https://lumo.proton.me/u/2'";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
key = "d";
|
||||||
|
desc = "Proton Drive";
|
||||||
|
cmd = "${pkgs.brave}/bin/brave 'https://drive.proton.me/u/2/'";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
key = "G";
|
||||||
|
desc = "Google Gemini";
|
||||||
|
cmd = "${pkgs.brave}/bin/brave 'https://gemini.google.com/'";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
key = "g";
|
||||||
|
desc = "Github";
|
||||||
|
cmd = "${pkgs.brave}/bin/brave 'https://github.com/'";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
key = "n";
|
||||||
|
desc = "MyNixos";
|
||||||
|
cmd = "${pkgs.brave}/bin/brave 'https://mynixos.com/'";
|
||||||
|
}
|
||||||
|
]))
|
||||||
|
|
||||||
# Power
|
# Power
|
||||||
"$mod, X, global, caelestia:session" # Powermenu
|
"$mod, X, global, caelestia:session" # Powermenu
|
||||||
|
|||||||
@@ -39,9 +39,13 @@ in {
|
|||||||
wlr-randr
|
wlr-randr
|
||||||
brightnessctl
|
brightnessctl
|
||||||
gnome-themes-extra
|
gnome-themes-extra
|
||||||
|
libva
|
||||||
dconf
|
dconf
|
||||||
wayland-utils
|
wayland-utils
|
||||||
wayland-protocols
|
wayland-protocols
|
||||||
|
glib
|
||||||
|
direnv
|
||||||
|
meson
|
||||||
];
|
];
|
||||||
|
|
||||||
wayland.windowManager.hyprland = {
|
wayland.windowManager.hyprland = {
|
||||||
@@ -70,16 +74,25 @@ in {
|
|||||||
|
|
||||||
env = [
|
env = [
|
||||||
"XDG_CURRENT_DESKTOP,Hyprland"
|
"XDG_CURRENT_DESKTOP,Hyprland"
|
||||||
"XDG_SESSION_TYPE,wayland"
|
"MOZ_ENABLE_WAYLAND,1"
|
||||||
"XDG_SESSION_DESKTOP,Hyprland"
|
|
||||||
"ANKI_WAYLAND,1"
|
"ANKI_WAYLAND,1"
|
||||||
"DISABLE_QT5_COMPAT,0"
|
"DISABLE_QT5_COMPAT,0"
|
||||||
|
"NIXOS_OZONE_WL,1"
|
||||||
|
"XDG_SESSION_TYPE,wayland"
|
||||||
|
"XDG_SESSION_DESKTOP,Hyprland"
|
||||||
"QT_AUTO_SCREEN_SCALE_FACTOR,1"
|
"QT_AUTO_SCREEN_SCALE_FACTOR,1"
|
||||||
"QT_QPA_PLATFORM,wayland;xcb"
|
"QT_QPA_PLATFORM,wayland;xcb"
|
||||||
"QT_QPA_PLATFORMTHEME,gtk3"
|
"QT_QPA_PLATFORMTHEME,gtk3"
|
||||||
"QT_WAYLAND_DISABLE_WINDOWDECORATION,1"
|
"QT_WAYLAND_DISABLE_WINDOWDECORATION,1"
|
||||||
"ELECTRON_OZONE_PLATFORM_HINT,auto"
|
"ELECTRON_OZONE_PLATFORM_HINT,auto"
|
||||||
|
"__GL_GSYNC_ALLOWED,0"
|
||||||
|
"__GL_VRR_ALLOWED,0"
|
||||||
|
"DISABLE_QT5_COMPAT,0"
|
||||||
"DIRENV_LOG_FORMAT,"
|
"DIRENV_LOG_FORMAT,"
|
||||||
|
"WLR_DRM_NO_ATOMIC,1"
|
||||||
|
"WLR_BACKEND,vulkan"
|
||||||
|
"WLR_RENDERER,vulkan"
|
||||||
|
"WLR_NO_HARDWARE_CURSORS,1"
|
||||||
"SDL_VIDEODRIVER,wayland"
|
"SDL_VIDEODRIVER,wayland"
|
||||||
"CLUTTER_BACKEND,wayland"
|
"CLUTTER_BACKEND,wayland"
|
||||||
];
|
];
|
||||||
@@ -117,7 +130,7 @@ in {
|
|||||||
};
|
};
|
||||||
|
|
||||||
master = {
|
master = {
|
||||||
new_status = "slave";
|
new_status = true;
|
||||||
allow_small_split = true;
|
allow_small_split = true;
|
||||||
mfact = 0.5;
|
mfact = 0.5;
|
||||||
};
|
};
|
||||||
@@ -126,6 +139,9 @@ in {
|
|||||||
|
|
||||||
windowrule = [
|
windowrule = [
|
||||||
"match:class .*, suppress_event maximize"
|
"match:class .*, suppress_event maximize"
|
||||||
|
"match:class brave-browser, suppress_event float"
|
||||||
|
|
||||||
|
"match:class brave-browser, sync_fullscreen 0"
|
||||||
|
|
||||||
"match:class proton-authenticator, float on"
|
"match:class proton-authenticator, float on"
|
||||||
"match:class proton-authenticator, center on"
|
"match:class proton-authenticator, center on"
|
||||||
@@ -137,6 +153,7 @@ in {
|
|||||||
];
|
];
|
||||||
|
|
||||||
misc = {
|
misc = {
|
||||||
|
vfr = true;
|
||||||
disable_hyprland_logo = true;
|
disable_hyprland_logo = true;
|
||||||
disable_splash_rendering = true;
|
disable_splash_rendering = true;
|
||||||
disable_autoreload = true;
|
disable_autoreload = true;
|
||||||
@@ -158,10 +175,6 @@ in {
|
|||||||
clickfinger_behavior = true;
|
clickfinger_behavior = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
ecosystem = {
|
|
||||||
no_update_news = true;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,6 +7,7 @@
|
|||||||
with lib; let
|
with lib; let
|
||||||
defaultApps = {
|
defaultApps = {
|
||||||
# check desktop files here: `ls $(echo $XDG_DATA_DIRS| sed "s/:/ /g")`
|
# check desktop files here: `ls $(echo $XDG_DATA_DIRS| sed "s/:/ /g")`
|
||||||
|
browser = ["brave.desktop"];
|
||||||
text = [
|
text = [
|
||||||
# "org.gnome.TextEditor.desktop"
|
# "org.gnome.TextEditor.desktop"
|
||||||
"nvim-ghostty.desktop"
|
"nvim-ghostty.desktop"
|
||||||
@@ -19,6 +20,7 @@ with lib; let
|
|||||||
office = ["libreoffice.desktop"];
|
office = ["libreoffice.desktop"];
|
||||||
pdf = ["zathura.desktop"];
|
pdf = ["zathura.desktop"];
|
||||||
terminal = ["ghostty.desktop"];
|
terminal = ["ghostty.desktop"];
|
||||||
|
discord = ["discord.desktop"];
|
||||||
archive = ["xarchiver.desktop"];
|
archive = ["xarchiver.desktop"];
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -90,6 +92,13 @@ with lib; let
|
|||||||
"video/x-msvideo"
|
"video/x-msvideo"
|
||||||
];
|
];
|
||||||
directory = ["inode/directory"];
|
directory = ["inode/directory"];
|
||||||
|
browser = [
|
||||||
|
"text/html"
|
||||||
|
"x-scheme-handler/about"
|
||||||
|
"x-scheme-handler/http"
|
||||||
|
"x-scheme-handler/https"
|
||||||
|
"x-scheme-handler/unknown"
|
||||||
|
];
|
||||||
office = [
|
office = [
|
||||||
"application/vnd.oasis.opendocument.text"
|
"application/vnd.oasis.opendocument.text"
|
||||||
"application/vnd.oasis.opendocument.spreadsheet"
|
"application/vnd.oasis.opendocument.spreadsheet"
|
||||||
@@ -110,6 +119,7 @@ with lib; let
|
|||||||
"application/7z"
|
"application/7z"
|
||||||
"application/*tar"
|
"application/*tar"
|
||||||
];
|
];
|
||||||
|
discord = ["x-scheme-handler/discord"];
|
||||||
};
|
};
|
||||||
|
|
||||||
nvim-ghostty = pkgs.makeDesktopItem {
|
nvim-ghostty = pkgs.makeDesktopItem {
|
||||||
|
|||||||
@@ -12,6 +12,8 @@
|
|||||||
../../nixos/users.nix
|
../../nixos/users.nix
|
||||||
../../nixos/utils.nix
|
../../nixos/utils.nix
|
||||||
../../nixos/hyprland.nix
|
../../nixos/hyprland.nix
|
||||||
|
../../nixos/docker.nix
|
||||||
|
../../nixos/clamav.nix
|
||||||
|
|
||||||
../../nixos/omen.nix # CHANGEME: For my laptop only, remove this (OMEN 16)
|
../../nixos/omen.nix # CHANGEME: For my laptop only, remove this (OMEN 16)
|
||||||
|
|
||||||
|
|||||||
+55
-8
@@ -1,4 +1,9 @@
|
|||||||
{config, ...}: {
|
{
|
||||||
|
pkgs,
|
||||||
|
config,
|
||||||
|
inputs,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
imports = [
|
imports = [
|
||||||
# Programs
|
# Programs
|
||||||
../../home/programs/brave
|
../../home/programs/brave
|
||||||
@@ -7,20 +12,18 @@
|
|||||||
../../home/programs/ghostty
|
../../home/programs/ghostty
|
||||||
../../home/programs/nvf
|
../../home/programs/nvf
|
||||||
../../home/programs/shell
|
../../home/programs/shell
|
||||||
|
../../home/programs/fetch
|
||||||
../../home/programs/git
|
../../home/programs/git
|
||||||
../../home/programs/git/lazygit.nix
|
../../home/programs/git/lazygit.nix
|
||||||
../../home/programs/git/signing.nix # CHANGEME: Change the key or remove this file
|
../../home/programs/git/signing.nix # Change the key or remove this file
|
||||||
../../home/programs/spicetify
|
../../home/programs/spicetify
|
||||||
../../home/programs/thunar
|
../../home/programs/thunar
|
||||||
|
../../home/programs/discord
|
||||||
../../home/programs/nixy
|
../../home/programs/nixy
|
||||||
|
../../home/programs/zathura
|
||||||
../../home/programs/nightshift
|
../../home/programs/nightshift
|
||||||
../../home/programs/qutebrowser
|
|
||||||
../../home/programs/nix-utils
|
|
||||||
|
|
||||||
../../home/programs/group/basic-apps.nix
|
|
||||||
../../home/programs/group/cybersecurity.nix
|
../../home/programs/group/cybersecurity.nix
|
||||||
../../home/programs/group/dev.nix
|
../../home/programs/nix-utils
|
||||||
../../home/programs/group/misc.nix
|
|
||||||
|
|
||||||
# System (Desktop environment like stuff)
|
# System (Desktop environment like stuff)
|
||||||
../../home/system/hyprland
|
../../home/system/hyprland
|
||||||
@@ -34,8 +37,52 @@
|
|||||||
];
|
];
|
||||||
|
|
||||||
home = {
|
home = {
|
||||||
|
packages = with pkgs; [
|
||||||
|
# Apps
|
||||||
|
vlc # Video player
|
||||||
|
blanket # White-noise app
|
||||||
|
obsidian # Note taking app
|
||||||
|
textpieces # Manipulate texts
|
||||||
|
resources # Ressource monitor
|
||||||
|
gnome-clocks # Clocks app
|
||||||
|
gnome-text-editor # Basic graphic text editor
|
||||||
|
mpv # Video player
|
||||||
|
ticktick # Todo app
|
||||||
|
session-desktop # Session app, private messages
|
||||||
|
signal-desktop # Signal app, private messages
|
||||||
|
stirling-pdf # PDF Editor
|
||||||
|
calibre # Ebooks
|
||||||
|
swappy # Screenshot tool
|
||||||
|
pinta # Image editor
|
||||||
|
notesnook
|
||||||
|
element-desktop
|
||||||
|
clamtk
|
||||||
|
|
||||||
|
# Dev
|
||||||
|
go
|
||||||
|
bun
|
||||||
|
inputs.bun2nix.packages.${system}.default
|
||||||
|
docker
|
||||||
|
nodejs
|
||||||
|
python3
|
||||||
|
jq
|
||||||
|
just
|
||||||
|
air
|
||||||
|
duckdb
|
||||||
|
lazydocker
|
||||||
|
|
||||||
|
# Just cool
|
||||||
|
peaclock
|
||||||
|
cbonsai
|
||||||
|
pipes
|
||||||
|
cmatrix
|
||||||
|
fastfetch
|
||||||
|
];
|
||||||
|
|
||||||
inherit (config.var) username;
|
inherit (config.var) username;
|
||||||
homeDirectory = "/home/" + config.var.username;
|
homeDirectory = "/home/" + config.var.username;
|
||||||
|
|
||||||
|
# Import a profile picture, used by the caelestia dashboard
|
||||||
file.".face" = {source = ./profile_picture.png;};
|
file.".face" = {source = ./profile_picture.png;};
|
||||||
|
|
||||||
sessionVariables = {
|
sessionVariables = {
|
||||||
|
|||||||
@@ -1,31 +1,29 @@
|
|||||||
# Those are my secrets, encrypted with sops
|
# Those are my secrets, encrypted with sops
|
||||||
# You shouldn't import this file, unless you edit it
|
# You shouldn't import this file, unless you edit it
|
||||||
{
|
{
|
||||||
inputs,
|
|
||||||
pkgs,
|
pkgs,
|
||||||
config,
|
inputs,
|
||||||
...
|
...
|
||||||
}: let
|
}: {
|
||||||
home = config.home.homeDirectory;
|
|
||||||
in {
|
|
||||||
imports = [inputs.sops-nix.homeManagerModules.sops];
|
imports = [inputs.sops-nix.homeManagerModules.sops];
|
||||||
|
|
||||||
sops = {
|
sops = {
|
||||||
age.keyFile = "${home}/.config/sops/age/keys.txt";
|
age.keyFile = "/home/hadi/.config/sops/age/keys.txt";
|
||||||
defaultSopsFile = ./secrets.yaml;
|
defaultSopsFile = ./secrets.yaml;
|
||||||
secrets = {
|
secrets = {
|
||||||
ssh-config = {path = "${home}/.ssh/config";};
|
sshconfig = {path = "/home/hadi/.ssh/config";};
|
||||||
github-key = {path = "${home}/.ssh/github";};
|
github-key = {path = "/home/hadi/.ssh/github";};
|
||||||
jack-key = {path = "${home}/.ssh/jack";};
|
gitlab-key = {path = "/home/hadi/.ssh/gitlab";};
|
||||||
signing-key = {path = "${home}/.ssh/key";};
|
netrc = {path = "/home/hadi/.netrc";};
|
||||||
signing-pub-key = {path = "${home}/.ssh/key.pub";};
|
jack-key = {path = "/home/hadi/.ssh/jack";};
|
||||||
|
signing-key = {path = "/home/hadi/.ssh/key";};
|
||||||
|
signing-pub-key = {path = "/home/hadi/.ssh/key.pub";};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
home.file.".config/nixos/.sops.yaml".text = ''
|
home.file.".config/nixos/.sops.yaml".text = ''
|
||||||
keys:
|
keys:
|
||||||
- &primary age12yvtj49pfh3fqzqflscm0ek4yzrjhr6cqhn7x89gdxnlykq0xudq5c7334
|
- &primary age12yvtj49pfh3fqzqflscm0ek4yzrjhr6cqhn7x89gdxnlykq0xudq5c7334
|
||||||
- &work age1c8pawdsxptfslgrz2c56s39mrtnjzc5mm3hfzgr2wdwu2v6vfsdsupjsq6
|
|
||||||
creation_rules:
|
creation_rules:
|
||||||
- path_regex: hosts/laptop/secrets/secrets.yaml$
|
- path_regex: hosts/laptop/secrets/secrets.yaml$
|
||||||
key_groups:
|
key_groups:
|
||||||
@@ -35,10 +33,6 @@ in {
|
|||||||
key_groups:
|
key_groups:
|
||||||
- age:
|
- age:
|
||||||
- *primary
|
- *primary
|
||||||
- path_regex: hosts/work/secrets/secrets.yaml$
|
|
||||||
key_groups:
|
|
||||||
- age:
|
|
||||||
- *work
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
systemd.user.services.mbsync.Unit.After = ["sops-nix.service"];
|
systemd.user.services.mbsync.Unit.After = ["sops-nix.service"];
|
||||||
|
|||||||
@@ -1,5 +1,8 @@
|
|||||||
ssh-config: ENC[AES256_GCM,data:LE468Anl/ri1JBOdNOsMPanhHcasn68NCOHewCLOfU7NpMxCdJ9sdHFxuFJ34F8OB2qPjGTtRCv0d+75aeJNrh1hwUyyD5DBoWgM0vvQit/VpmpNgLPndWo6dIo2Xf1xPJdaADiLBIjsNNgUUmo6N8InT4eLihDOepbHwyVD0qFYFC1vze+V253aodLADfp3YbRI7MvUQrn+vjiDtuyEBMcYBqUQF1DhLYDbM/S6ez6NdscxTJvdM33u4rRehn8p3hE1mOovM/0f7gjvmtXpJqaBQ1aP7CoitI5U/eORQj51KrtIBtwQbDRA9CUWTQmm7Q6EAfDuyPsQYbwvqbl46GpbHaXLXMe04NUnxGxeDoMLw3S348iH5owfAp+NKRxK8QBc6cguIw9fwEzDixvaHzbMuby5Xxlm2O0OtZ3EE/M7Q721rZ2y9mfGksDmIYlYMO8DyrHppFXwoBr7ZSGd3R4CGg==,iv:7w9YqC3Dt7MMnEe0jFRsIhhbU+vMdmxpLM4RPL4viHY=,tag:3Tuccvume125sFgXoqXTRw==,type:str]
|
pia: ENC[AES256_GCM,data:0bnhHeVqKSLHVimd78a94ShHlO3+LUoZ4oiKD3cnBYkaZsw=,iv:S+/IChlFlqdI+PyFF+Ti4AJUkch2MS0qKiqHL1Q3RMk=,tag:+v2kV70ou84eIc01dKnAhA==,type:str]
|
||||||
|
sshconfig: ENC[AES256_GCM,data:+r4RpeGsAGjgwsWMgwQmZnSxwoPLGDQG0hgasm1/xGMA655Q6tLGDOvTD4ypZ6d5TI67cWENJHr1pORzHVdZYB/uS/S7Ejp3VaVEZDRuLtKuq+2mDnp87HH8caE3jmijWSJis+1GM8lgxdyX8sDMz6b/zu76SrZlusf+kMFwQA7svxlA1iHP/wBAN8CFu2XOaGrjXT/Ydwd9GNAXA3VHLf6r9yEzcT1y944/eKGAQdlDFIVEe/bhv5Qxul1AH8TJT/ERMuYdS/OpbqnRLyZHHkREr8y1TllTWdMnGz2sRB7QnZ99ULpyR/h2Qc4XdCiC+qYn0yinXsnPO+NW7ulFn+5lNoyekDveI5pmsv021rnOtJU1SnlEm9xx3dafVdmLpFy6Y8xeJFUeF+nbU3Oc6IHMKHQZoL1ucCsF9qNO38bnyTwVX+wO9g16fcNzR2EfjDCGHj7O8YxdAVzPWvbExKk+2iamkzXrI/P/BdAvy/+QagstPoMz4TxZvw1ir7gd5emk13+t9Cy2vrutbxbouXOAuXKA2021WP7V+aDrwsY1jSGO6oiBFYBwe3wCZ2rPM3+oHxrnyzohhxGRgwN0td//,iv:Wln9pc4ptH7aN2VnBRgO12fKDZiITkIjOJseUW1MZPQ=,tag:BNrMyiDsbu72A9ljdQd3Wg==,type:str]
|
||||||
|
netrc: ENC[AES256_GCM,data:cTaDDI8b9QbUI3zKzraF2R6v1/x+6h8KEQJbqIgdfKnpvIvg816eFhcMqn4rart4Adtayt0GQOYheR0Q9DfR+TtbL0ne/drdlAABOQxc6PUJdLo+O5kx4f5QJbJ4,iv:aZ+nt9qcmIRWyOhq3HfIU3qYHFnf8EjXOp0c0vQ2fQc=,tag:H6ncweCaKMDxq9VHt51qlw==,type:str]
|
||||||
github-key: ENC[AES256_GCM,data:xUgFMlBo8e+3eXqNscxbby1dWug3SgUagDiNUe/IGVbU6cczkaJ3uOaB0OuRBQ8AYhOLkzXj0pIKjUrElHwmYrhURtS1aF4SFEGJsjhhobNA//j3E2/5/nLVjfco+lRzyHdwmsNhEUCqEhsXrrodJMb39H4b5oip3z0rjc729YveiWUKQxXVZVPurp3nq9yNnix9R4CA6XYFRW6T6MNqgPD5qhbcDlhxLb/SN+uI5h+5eZIS24VDWlKaTaCLL5KLhZmfuA37SquOQ+edi9Yg8MnfrZkMrp/3qmAjP2rSQLMOc4QdQCLQBQSf0/snpydgLwY+FoJmMSztwtkqUdIZWOfDUJbJxegEOrAR68jLTNbp+GYiDn3thtOZDiK5p/M1amjCT+A9qeFMed5WS+aZHNTRbR9UcfiP6+48MGZFt1mr7q+/CoL04/DTp0w6tUf6/SZD31NvTJDqngkhpc0ZH9Dh5+2JcnBWpq25AM36kZTn1hIQCLNTr/oGWZXSLA2tksAhQCaUcFj4IIh6Bl96,iv:GEJsAs5NriwENYTV/VShgJF6iMmrtTwNiXOvfXyEP8E=,tag:nfZgsFqaet075GjQAoVZxQ==,type:str]
|
github-key: ENC[AES256_GCM,data:xUgFMlBo8e+3eXqNscxbby1dWug3SgUagDiNUe/IGVbU6cczkaJ3uOaB0OuRBQ8AYhOLkzXj0pIKjUrElHwmYrhURtS1aF4SFEGJsjhhobNA//j3E2/5/nLVjfco+lRzyHdwmsNhEUCqEhsXrrodJMb39H4b5oip3z0rjc729YveiWUKQxXVZVPurp3nq9yNnix9R4CA6XYFRW6T6MNqgPD5qhbcDlhxLb/SN+uI5h+5eZIS24VDWlKaTaCLL5KLhZmfuA37SquOQ+edi9Yg8MnfrZkMrp/3qmAjP2rSQLMOc4QdQCLQBQSf0/snpydgLwY+FoJmMSztwtkqUdIZWOfDUJbJxegEOrAR68jLTNbp+GYiDn3thtOZDiK5p/M1amjCT+A9qeFMed5WS+aZHNTRbR9UcfiP6+48MGZFt1mr7q+/CoL04/DTp0w6tUf6/SZD31NvTJDqngkhpc0ZH9Dh5+2JcnBWpq25AM36kZTn1hIQCLNTr/oGWZXSLA2tksAhQCaUcFj4IIh6Bl96,iv:GEJsAs5NriwENYTV/VShgJF6iMmrtTwNiXOvfXyEP8E=,tag:nfZgsFqaet075GjQAoVZxQ==,type:str]
|
||||||
|
gitlab-key: ENC[AES256_GCM,data:4t25oBtu2oMmVdBnLkRMSXCICbDRiEfFBpZuKiBDskTeOH1JvwKELZ1E2I/sSIjZLn0MRi3o+2DyhkNVZYWqctQAUzBsSxKHMlcoRfvspKnLHd+kDFXkr+ltfJenpu81bK3tKP+VB5kZWmhj4bwEH1tR4BTlDU8nvsAq/l0aR/aGeDFfBtN8GyDwlXt9hta1XRv3X8sefb14wdsgn3CmTAmMSUUK7FePbCR4YwA9L+tVzRoeqw1VdrnXL5X/qX6jARH2G/J7Cqpwl8BhE8Oe/b5HqtJxplu3n1W8fOCpTOCTRV0V3k8UXF1doHwNbUurb1ATKiiq7c/BYqb8nZCodF5upGcFSGx6b3UZuLw28c5QwsdJFMaE3GJLCe3yIFnArVoGlOMdBFpWcmCXCc0WSdS0bOGTaFsmeu71SJ436wDZdcfFHNqaxZ2ex8Pvx8bhs0ORCUiZgFFNIFTDrUP/Hvgn6JdBg0u4srU1imjLorGR5OQ/YTgzAoXUlxwMHb3ssMMc6XApHmftwfQTHmPJvT48VwKsQ+HZNAXz4fFgl6ynmkQzCacD5XtBoPs176igzdcg0uSeGTf60PAfKURLDHNUPY+tcy7sjFwAenl0837/rLgacVCzTTmErFZAwcjLIBrcz3b4o9frqwdKataKtLI4ux45XqlcjLxP8Lk2MMuTQH89ivZYPhvtTGbyCFslfc9Y+dztkis7iQ7oNijpxgBt/b8YZID+uLYqokJ8bHNiIAZh98FrhhaQ4UguZhg572Nuea9CZWXQTX59Toa5kxRN4ACZi4M0S9W8feBd4Y7RaD8ip3iBpqgW9C9CsskUGijxTbImsNK7gRHHcmt54Hrc++2b9ljQOHeuOLn3PJwi2JihphdELdGh0POpZAknp8kVkM+M1e6IKZkTSWpTSFyPimczh7cVhIplfHnm5627H7CiI2bKgRoQ8SCJsMrPpL9v38Ug79HkA0PrbCtrxTO6UnaAqIKG9UPhTyklBnv6q3DrDa3lM4Z8W+rF194tATyvp6NYhcvOP6iE+rEv66ARuk3WLZYnAut0vvaMR7D5PoD6gcoDodBM9HDCa2g5G4ob67TCi8nRFUzHmN3tHTmASGeFvzMiGVIZEkxUafKuOx4dA1eyQBF689jJhnPA/YLSvYFRKwXg08puK0uTvfh2rF4Kdo6pV0IpUnfUsiG4odocCgdQFQJR4FH+E41kNfNYpdUx2ufOBwumpNNYIrGYuHOvWcHW5nPASO4qIhiTy73FvFWg/m9kpXeTfexbVVK31NXHcSXL0MejpRPI2pkbyW5WPP6GtLffRpFQvVBnGMlN4+2863gka/52Y7K+foNs038+GL5SxD87CmIg4e+m8qOa7QL/urb7sI63DBIFmcTY0kSsmcYitH7EC3ESGlZMZqNX2Xnv74M2wxeZ6ACTXRU//cc8HQ6FcRhsMwVwKhrT+r/rtkfK+T4YYT8OMzFgOtY6TwS7kj8MwSzC14EkvqWuTNVVm6HP1vxP6wFCmM/bGtDoXSfh1BRIQPUPxUPC8Na7R42COTr3tSGikviDs3CA/N5QYEFuxNntiNyPU2PzW/aASDtsfq+q4DGIRy5/w67Z7i5M+CyXl1FwYmgP1+SC17CgL6JoiCVUlmYIMq5n5VZN6dv4rUvEUcQSVz1Eovz6DbpHD7ZNMuKRVdhRvTD+DigZ53RxKIfFSlaE8Rhy4VxKDSGJymlYutGvcEOLoYWkPDNUJXb583gq227/GGeRvH1mYYVagNjw3wFhphlrNPO6AC6+sb7C596vlqRGqymPn491bUlVJAcQxTetT/yd0z0eLd9Cd1HWj4RnMgCoqGxgILxEer3YjnPRgnwYG5of8kfo3g6TKxpBeIDk4LVypP4fPMrNwyGtBHCjMmRdqMUsSnLQj0csWfBbjEp5ymeRCGcOKWTgeLFbugw3q+noARrqNNnXjA5aWJl5L13gZJ0QUsYUQhXrY0000WPWDbhNLoT7aRxAQ2HHzoj6pIFOVDT6XUTEw1/TUOuyAFk3URrzi+xOSeCJt5Gb1ggeYzQAwCV05opPq8ZVD+8wpxpb9tTDVN0HTmsbwWdpNKtrDsZCmpgAu6dg2V3MIXsPLp3HsAb7fcjj2MGc1T0BR3Ji01xqLuprafXsqnwgkez2D45NUJbAa4PftevAjDLCvzTpS75yaC66RNE20vNruxG2u5zo9eiOBXRQfrEmqua4t/ApnWjYRfKxEkvHvf9zSOel5UYzFN/5Dq2XVs5t0JRp4Q1x8uLZK803Vsy++RdEtw33JbosAjJECSCs3WFNtsCNDetAhQYPH6G8SVj1q/jZWmp/tk/cbYXLSg76Aej3Rni0Uwd7Q8IOISQ598TJw8mqhUdpfz0wRj/8m0d3deTmY3KOOqzaDu+W0weWc9WV4DIzbhUQUh44IjIdCDurB6hveqvWXMgKTS8RHpAB1T1ZSD5eWsG4ZN6FxeO1kNJVKWzt1MwzcDIkdLI+fWLJMUz8/KNAXqlL6772qYM5rK4imC6LLP4xl6faoyPAcyK+eHiVkEgPDXp5f+8LO9bsw8A1hs8orv1ywZf5CeeR9IfCxFDtSMmR/Xnu6LU+Ih5SpHi3DONCtCT5WDQ9hmZg9UQK7KECSbaWKQKVh3aYbKWfpy7SGfeKS7NIALpS1+eTmmWEP5H0kuNYJZ/hi4EosWX52wXSySMQ2S4y+qsK+6yn2lnw+CB+HxuX9Zr1r0QbIqmKOOKMwMY229WAN/C9CaxvlFFpkNJ0PPZgm7LVIoIExq5eDzeYBn5lKzQb7W3webOMtRtP22u0ynRVh23996lIQ0XSII/3YyR/5GtP5lfP6SNWVC9/8j3QLDJNYHuEJwI/4K3CdxaFhdhwryflRpH5pyvvicuFPyNS05AFXhTzyaJFiY7kiscxm5SmZv+DvH71ij/hmWSJqZPM9V2aPf1wtwZiLiBztEEcQoKlaEBdcn7roYv8aHWowq9zzvSYcOX0PWsvkrdWQ7crh2tMBrwCQ0CPKwayqGfzS1+7ZyhwSXuTBd53bqax4z46vaZWtQ0rD3sFugcD6U+EFMZ6SvryTBp+uj7O5usoiQELG1AVWXc9dLS1c8ZiMjSYXpjFyl2v564xvC4DniAIpBoaq7mFMyz9B2uCTC4szYylmFfsj7HPpN6N3nOQ8NduQxo7QZoDgB0D+I7CAZq38YEFDWy8ZzdMoJb8E+Sa9GCKyX38mVTtbnLnHdoVwnie9JBwJ3QyqiupDYmdy/byCI7weMKInASHdVGbkHvpycbzVdQ8PxVTqBmdPuEe0gVmfFwyDb+lmGji7A9aC3w9J5KBfnC+qoFeRJZ2eGpGuJVn0RfywpTedK9E3r2Vlfp/zxVcjCg+hOptBuyd+KUAEgsj/HSpmKOMlZ7ooGsqqTW23IpOImx5Q7BOMK885k/3Uew1b8iEkJxvb/V6/MlO2Kx3PZZkES/9Yv4XMtVMhM1fy4vJGSU8NtW9bc6VsRqt7zeLqTm2d6N+iDQaM05USUhDHYlMz4YAwTU5ykfgtBkXa8WGW/O8GWzqWVDwRekgJKjMNy9B1BkGFSagFn0iyf+cJtlucmbaxTQpPO15gOAUyXhHUTNT6RG+ywaqM/UMDBTYwZdDSkCFG05QvAVTLC3hSw/DCCm4IkGmVHNq2vTxzOoFUv9HqFatEhQxBke7D7UC+vj2tVbweVTfiagImx3UioNYvcXXTStiUy8mm+NoHmeo0QvYCS6+9W6wFtMHAL7i50WoTuCLIP4AudKY+EHv7U7V8nISPnar526Vjtz4W3Y0XbWXUqrs9orudVsu3r5fMgAZoI85JRWwC/vU8MCK3v96GuUN0WCMv3xXQE8EbwW+IDmbD7hoAc8EnBCXMInLyq6dgVbSAgefVibyrw+XHr2ph2ydgxuBWFGs0KlfLU6hh4wBcaM70gsUwUXPaI4bRMoMrRRxM5fCHBH9pCD0d+YUB1WPl/P0bJ+vRXlYbJyHTZbJgr7F7VGl5b6U36c3wsKYBXUmOunVCvQ7W3Yjuarf+uctPDUnD7nZKHtfCm/EAaMfZk1k/oqn9jbnuEOH4ZPfjEgz5CfcMLiO+Ej3Mmea6ukujlmFQ2MgyVfy8n1rThe6/NJQIs37GV3ATM+dzNBPKWBNcHv4oxNOg2/UOmtzLrYvIUosUKotw74hayf/ZU4NlTULeMz7JF+U/u+ZJlICdRPHbINeJuuMIFFnF+7/U7YV6cmQS1V28RcgHhrHhX9yUKdfrQjOh7yxqVX6eJOppmQ7sTDKKPD5baDKChdgptzprSrbLlZ44AC5xcW3kpIcEKjat9jIeXYTBOo+gmOxS1BVk/gAH1pJpxKJsibsWAHaRsTRykj1s5hHlY4ESf/gQ2O4R0XJSvrwGw0DeXSkQIcdqt1Sgn0jX8S1eZ/+lDm0JQtWGkP1AEOwmo9uJmfgFZuEe9R4GizXqCmdvWtoSsgcVtoHqz8IJjuBrVeV7nOz,iv:g4X2GC/9+je4qkvUT4UJl40+r/FzFY88XtYkthiwGVY=,tag:XFfEzXJEeKXB/QJt2fT4Qw==,type:str]
|
||||||
jack-key: ENC[AES256_GCM,data:VfCl3wH0MMBc8QDyjLDFeSvzSEsf7uGpfJvRjFrmjW+bPRUXBpZhJV8a9VQIAz7z7zZXvzARMfCeI0ydyC57CW81GH5/H5pneJ4b+xreINjVfdLbL1nC1thelo/O64jda/L+xVKhgE+QQi8/zt4JmXGghkP+74nYcTTaMpmcbgWw354J1ybXqyCEY+88nsJ1d2s+M7M2bplx4fGb7sLUs6sqdsad3sENzhH/0HQCFXreHTtgsLbIs8ccmdRgFNKM8/wD0OoW76rOQsJoA9JY4yOTQNVoX5M8+Olj6+wVlt6QBrWrYRuEztGnHrHvzxiHXtmEkMwVNfoPpEflQyRYRa0rVp/66REOkMckGx6/LbxKFgrxnifRlsK3kWd28v2bRGVQOghUluYUtVkaJ+eh6o6ik0NQKx8/H6BznBSDE6MjDwbLv434LHBfDtAqhWN1eMbOlunFivsl5Hb/6rl9kydHlcCS6FY8cUHoKQ90gDaUuDrvUifwmdO5hU0GH5tgvGi1ReK9ndcpQsrHptG6,iv:oC1xU5Tu3The105VYRmxIw4kEwDoqe8T/EH6mmqpqwQ=,tag:Pu8c536u6W7ALrqjRsvXDw==,type:str]
|
jack-key: ENC[AES256_GCM,data:VfCl3wH0MMBc8QDyjLDFeSvzSEsf7uGpfJvRjFrmjW+bPRUXBpZhJV8a9VQIAz7z7zZXvzARMfCeI0ydyC57CW81GH5/H5pneJ4b+xreINjVfdLbL1nC1thelo/O64jda/L+xVKhgE+QQi8/zt4JmXGghkP+74nYcTTaMpmcbgWw354J1ybXqyCEY+88nsJ1d2s+M7M2bplx4fGb7sLUs6sqdsad3sENzhH/0HQCFXreHTtgsLbIs8ccmdRgFNKM8/wD0OoW76rOQsJoA9JY4yOTQNVoX5M8+Olj6+wVlt6QBrWrYRuEztGnHrHvzxiHXtmEkMwVNfoPpEflQyRYRa0rVp/66REOkMckGx6/LbxKFgrxnifRlsK3kWd28v2bRGVQOghUluYUtVkaJ+eh6o6ik0NQKx8/H6BznBSDE6MjDwbLv434LHBfDtAqhWN1eMbOlunFivsl5Hb/6rl9kydHlcCS6FY8cUHoKQ90gDaUuDrvUifwmdO5hU0GH5tgvGi1ReK9ndcpQsrHptG6,iv:oC1xU5Tu3The105VYRmxIw4kEwDoqe8T/EH6mmqpqwQ=,tag:Pu8c536u6W7ALrqjRsvXDw==,type:str]
|
||||||
signing-key: ENC[AES256_GCM,data:NvLqmt7NzrWkbQQqFfosmSMvEv8C8+MDDpxSoDo3zZ3MR6WXr9B+6CnUc6rtevM230wgE17VC9XlmcQxX+PjJsWq6gZteK5THTIcrR5zPJVNlVCEyeLKoFj/6m7qBgyyoN3OjCNjgMkhsm009jwBgNk0qJMAYebOGo8eoP/al+4ytm7dhna+iX5WZabAg0J4z4JMDQonqQl3SaDnCEdHvk9m7ZEP2vUFscPkbLj4ewgFq+bUCHOOQb2uqRJoEgcR/NetRFcQfzcU6lp7JxobaICaO3zdmomUm7oabIUTrc3Kom3Wjw8ryqfqC1/SC0SHr5XGk2ygk0WnlQ4kNshqriL2dwbWAzy1Z/cTX9+aB/KNtC0U6zWG1bpnL3dgSgvhRiocIis/eNg1HWsLWVicmdebL/lXHztxFMdTuX/gWgQBotggTmx+OFGZfP9ZGlF3635mDxM/fEOCtTyA195dMicCUsjEpBegNtXsp+oOtxyRI0jSW47MBcXFP09f5ywELTPyz4eOUHO8sQ6UfJ6X,iv:KNQUlMPaiR4x1Fw+HZe/EOmh/gfsrqlefpq23uflz/8=,tag:illu42HKunQXnijjsUIvnQ==,type:str]
|
signing-key: ENC[AES256_GCM,data:NvLqmt7NzrWkbQQqFfosmSMvEv8C8+MDDpxSoDo3zZ3MR6WXr9B+6CnUc6rtevM230wgE17VC9XlmcQxX+PjJsWq6gZteK5THTIcrR5zPJVNlVCEyeLKoFj/6m7qBgyyoN3OjCNjgMkhsm009jwBgNk0qJMAYebOGo8eoP/al+4ytm7dhna+iX5WZabAg0J4z4JMDQonqQl3SaDnCEdHvk9m7ZEP2vUFscPkbLj4ewgFq+bUCHOOQb2uqRJoEgcR/NetRFcQfzcU6lp7JxobaICaO3zdmomUm7oabIUTrc3Kom3Wjw8ryqfqC1/SC0SHr5XGk2ygk0WnlQ4kNshqriL2dwbWAzy1Z/cTX9+aB/KNtC0U6zWG1bpnL3dgSgvhRiocIis/eNg1HWsLWVicmdebL/lXHztxFMdTuX/gWgQBotggTmx+OFGZfP9ZGlF3635mDxM/fEOCtTyA195dMicCUsjEpBegNtXsp+oOtxyRI0jSW47MBcXFP09f5ywELTPyz4eOUHO8sQ6UfJ6X,iv:KNQUlMPaiR4x1Fw+HZe/EOmh/gfsrqlefpq23uflz/8=,tag:illu42HKunQXnijjsUIvnQ==,type:str]
|
||||||
signing-pub-key: ENC[AES256_GCM,data:XuokZmCsnaNQ0rvVa3k81T4vtxw//r63xp1yHDLaNAMwA2r2bh6addl9WoAmm76g1rweqZrAAIw1PXDb90ubPaBP1iEHSkGZpwUpy/tOTePRdHMW2WtVvidpHQ==,iv:auB/bA89cJK6DnQi1BK2uldXRPyJfo+r7nl5qOLefUk=,tag:/I3kB6El1yesBMGOjJ+oHA==,type:str]
|
signing-pub-key: ENC[AES256_GCM,data:XuokZmCsnaNQ0rvVa3k81T4vtxw//r63xp1yHDLaNAMwA2r2bh6addl9WoAmm76g1rweqZrAAIw1PXDb90ubPaBP1iEHSkGZpwUpy/tOTePRdHMW2WtVvidpHQ==,iv:auB/bA89cJK6DnQi1BK2uldXRPyJfo+r7nl5qOLefUk=,tag:/I3kB6El1yesBMGOjJ+oHA==,type:str]
|
||||||
@@ -14,7 +17,7 @@ sops:
|
|||||||
cmVxVC8rVDlWMUdZaGw3bmdOaWZGS1EKYahBlc8XpB5UdKZQkvxbLcKQ/xkFJjWo
|
cmVxVC8rVDlWMUdZaGw3bmdOaWZGS1EKYahBlc8XpB5UdKZQkvxbLcKQ/xkFJjWo
|
||||||
FSfQWnjhe/a7BJtJEcKZkjOQU0mYqlSu+uT2RA9diCQeRUJPRF+nAw==
|
FSfQWnjhe/a7BJtJEcKZkjOQU0mYqlSu+uT2RA9diCQeRUJPRF+nAw==
|
||||||
-----END AGE ENCRYPTED FILE-----
|
-----END AGE ENCRYPTED FILE-----
|
||||||
lastmodified: "2026-04-17T22:53:33Z"
|
lastmodified: "2026-03-30T15:43:41Z"
|
||||||
mac: ENC[AES256_GCM,data:dA/D1q3t+AA4M7UOSF8lhTtC71D56l6njhh/Oaxnro0zQYRTCHO+K3u43srVzTdwaCAtQtKRcpbrjANpO3sgb9iqZme5asfLFGqDr0bbWXir7BwDyZVgkw8XiYGPtpEYlgdwLwYxejpZtRlE7IeFCRkEmlvWJHq4R3SfbjKkOxE=,iv:0JHoWrQbjzW/gmj6HcBf+2O0cZeBC9kT76ue8ubJwaU=,tag:9fSVDwN2qgsre5yVr7DpMw==,type:str]
|
mac: ENC[AES256_GCM,data:fAn9R6YyyWD/WjA38Me0YLdzSzcuclAr4EkKM4De8Hd7sVrhl7FFI+Smoy3QagwljuUwjc9g8U5K6DYQB+Syu0re8ODCQmpzUKyQHsnN7OHHQk5dhrentC4GhTaEXjb+VGnPVGVjlLBo4ulw5faqu5A7iLHwViT0MjpGfq5egqA=,iv:1rP6wrHzjZvZGei4UljSR//6kL/1qzLskAUVCMA+HqI=,tag:QuhLq3ncHRxKyvHPDnH7VA==,type:str]
|
||||||
unencrypted_suffix: _unencrypted
|
unencrypted_suffix: _unencrypted
|
||||||
version: 3.12.2
|
version: 3.12.2
|
||||||
|
|||||||
@@ -5,11 +5,11 @@
|
|||||||
}: {
|
}: {
|
||||||
imports = [
|
imports = [
|
||||||
# Choose your theme here:
|
# Choose your theme here:
|
||||||
../../themes/darkviolet.nix
|
../../themes/zen.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
config.var = {
|
config.var = {
|
||||||
hostname = "h-laptop";
|
hostname = "nixy";
|
||||||
username = "hadi";
|
username = "hadi";
|
||||||
configDirectory =
|
configDirectory =
|
||||||
"/home/"
|
"/home/"
|
||||||
|
|||||||
@@ -0,0 +1,25 @@
|
|||||||
|
{config, ...}: {
|
||||||
|
imports = [
|
||||||
|
# Mostly system related configuration
|
||||||
|
../../nixos/audio.nix
|
||||||
|
../../nixos/bluetooth.nix
|
||||||
|
../../nixos/fonts.nix
|
||||||
|
../../nixos/home-manager.nix
|
||||||
|
../../nixos/nix.nix
|
||||||
|
../../nixos/systemd-boot.nix
|
||||||
|
../../nixos/sddm.nix
|
||||||
|
../../nixos/users.nix
|
||||||
|
../../nixos/utils.nix
|
||||||
|
../../nixos/hyprland.nix
|
||||||
|
../../nixos/docker.nix
|
||||||
|
|
||||||
|
# You should let those lines as is
|
||||||
|
./hardware-configuration.nix
|
||||||
|
./variables.nix
|
||||||
|
];
|
||||||
|
|
||||||
|
home-manager.users."${config.var.username}" = import ./home.nix;
|
||||||
|
|
||||||
|
# Don't touch this
|
||||||
|
system.stateVersion = "24.05";
|
||||||
|
}
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||||
|
# and may be overwritten by future invocations. Please make changes
|
||||||
|
# to /etc/nixos/configuration.nix instead.
|
||||||
|
{ config, lib, pkgs, modulesPath, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
imports =
|
||||||
|
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||||
|
];
|
||||||
|
|
||||||
|
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
|
||||||
|
boot.initrd.kernelModules = [ ];
|
||||||
|
boot.kernelModules = [ "kvm-intel" ];
|
||||||
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
|
fileSystems."/" =
|
||||||
|
{ device = "/dev/disk/by-uuid/5dbf85d3-d236-4af8-b489-d6066bfe1eb7";
|
||||||
|
fsType = "ext4";
|
||||||
|
};
|
||||||
|
|
||||||
|
fileSystems."/boot" =
|
||||||
|
{ device = "/dev/disk/by-uuid/043E-1755";
|
||||||
|
fsType = "vfat";
|
||||||
|
options = [ "fmask=0077" "dmask=0077" ];
|
||||||
|
};
|
||||||
|
|
||||||
|
swapDevices = [ ];
|
||||||
|
|
||||||
|
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||||
|
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||||
|
}
|
||||||
@@ -0,0 +1,78 @@
|
|||||||
|
{
|
||||||
|
pkgs,
|
||||||
|
config,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
|
imports = [
|
||||||
|
# Programs
|
||||||
|
../../home/programs/brave
|
||||||
|
../../home/programs/ghostty
|
||||||
|
../../home/programs/nvf
|
||||||
|
../../home/programs/shell
|
||||||
|
../../home/programs/fetch
|
||||||
|
../../home/programs/git
|
||||||
|
../../home/programs/git/lazygit.nix
|
||||||
|
../../home/programs/thunar
|
||||||
|
../../home/programs/nixy
|
||||||
|
../../home/programs/zathura
|
||||||
|
../../home/programs/nightshift
|
||||||
|
../../home/programs/group/cybersecurity.nix
|
||||||
|
../../home/programs/proton
|
||||||
|
../../home/programs/nix-utils
|
||||||
|
|
||||||
|
# System (Desktop environment like stuff)
|
||||||
|
../../home/system/hyprland
|
||||||
|
../../home/system/caelestia-shell
|
||||||
|
../../home/system/hyprpaper
|
||||||
|
../../home/system/mime
|
||||||
|
../../home/system/udiskie
|
||||||
|
|
||||||
|
./variables.nix # Mostly user-specific configuration
|
||||||
|
./secrets
|
||||||
|
];
|
||||||
|
|
||||||
|
home = {
|
||||||
|
packages = with pkgs; [
|
||||||
|
# Apps
|
||||||
|
vlc # Video player
|
||||||
|
blanket # White-noise app
|
||||||
|
obsidian # Note taking app
|
||||||
|
textpieces # Manipulate texts
|
||||||
|
resources # Ressource monitor
|
||||||
|
gnome-clocks # Clocks app
|
||||||
|
gnome-text-editor # Basic graphic text editor
|
||||||
|
mpv # Video player
|
||||||
|
swappy # Screenshot tool
|
||||||
|
pinta # Image editor
|
||||||
|
libreoffice
|
||||||
|
notesnook
|
||||||
|
|
||||||
|
# Dev
|
||||||
|
go
|
||||||
|
bun
|
||||||
|
docker
|
||||||
|
nodejs
|
||||||
|
python3
|
||||||
|
jq
|
||||||
|
just
|
||||||
|
air
|
||||||
|
duckdb
|
||||||
|
lazydocker
|
||||||
|
|
||||||
|
# Just cool
|
||||||
|
peaclock
|
||||||
|
cbonsai
|
||||||
|
pipes
|
||||||
|
cmatrix
|
||||||
|
fastfetch
|
||||||
|
];
|
||||||
|
|
||||||
|
inherit (config.var) username;
|
||||||
|
homeDirectory = "/home/" + config.var.username;
|
||||||
|
|
||||||
|
# Don't touch this
|
||||||
|
stateVersion = "24.05";
|
||||||
|
};
|
||||||
|
|
||||||
|
programs.home-manager.enable = true;
|
||||||
|
}
|
||||||
@@ -0,0 +1,43 @@
|
|||||||
|
# Those are my secrets, encrypted with sops
|
||||||
|
# You shouldn't import this file, unless you edit it
|
||||||
|
{
|
||||||
|
pkgs,
|
||||||
|
inputs,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
|
imports = [inputs.sops-nix.homeManagerModules.sops];
|
||||||
|
|
||||||
|
sops = {
|
||||||
|
age.keyFile = "/home/hadrien/.config/sops/age/keys.txt";
|
||||||
|
defaultSopsFile = ./secrets.yaml;
|
||||||
|
secrets = {
|
||||||
|
ssh-config = {path = "/home/hadrien/.ssh/config";};
|
||||||
|
github-key = {path = "/home/hadrien/.ssh/github";};
|
||||||
|
gitlab-key = {path = "/home/hadrien/.ssh/gitlab";};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
home.file.".config/nixos/.sops.yaml".text = ''
|
||||||
|
keys:
|
||||||
|
- &primary age12yvtj49pfh3fqzqflscm0ek4yzrjhr6cqhn7x89gdxnlykq0xudq5c7334
|
||||||
|
- &work age1c8pawdsxptfslgrz2c56s39mrtnjzc5mm3hfzgr2wdwu2v6vfsdsupjsq6
|
||||||
|
creation_rules:
|
||||||
|
- path_regex: hosts/laptop/secrets/secrets.yaml$
|
||||||
|
key_groups:
|
||||||
|
- age:
|
||||||
|
- *primary
|
||||||
|
- path_regex: hosts/server/secrets/secrets.yaml$
|
||||||
|
key_groups:
|
||||||
|
- age:
|
||||||
|
- *primary
|
||||||
|
- path_regex: hosts/pph/secrets/secrets.yaml$
|
||||||
|
key_groups:
|
||||||
|
- age:
|
||||||
|
- *work
|
||||||
|
'';
|
||||||
|
|
||||||
|
systemd.user.services.mbsync.Unit.After = ["sops-nix.service"];
|
||||||
|
home.packages = with pkgs; [sops age];
|
||||||
|
|
||||||
|
wayland.windowManager.hyprland.settings.exec-once = ["systemctl --user start sops-nix"];
|
||||||
|
}
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
ssh-config: ENC[AES256_GCM,data:jtot9nSlaS/zmVqGEDACG4HarHFnpw3QMLdYGOvHI1rzjFm+FuIw+MXtPBaDT2rWO59XKchp31X2rik6igNoY9iuQ/uncFWonkb8RTOV6zG/BC32cFf08nNmp75slr1y/YA8rc2kM4An81Zq27g0e9AKyRVRqmvI3HEQq/1mpWF8OJpSfdggCIylGQezB2Vy3Ik2hJyoJaf7BSaikN1/jPzaImpPi2OOrREydePuZjX8D0DqM2xm+LUSsUpXutsKWDaaeuMAqWfjH1svOvT4+oyMBoqrp2+ijP7vRjFeuYrxaU858YzDi0+bTdzn8umlAr6rjLZW+9JUKDog5Fja5j/WvIk1PClqfXCX1+hCX4GlAdV3FYTn,iv:vQuRDKuidQFl4u7bQlAEAf3s8kYBdNwmXO6JbcRV32k=,tag:yv7NHfncDwjy9OGrTZI57A==,type:str]
|
||||||
|
github-key: ENC[AES256_GCM,data:GmZfleQssslbVIiqyzhszhsfXHZcuBgkCREna7AHtP95lyG2F/0u8LUmliQePxwMirJLHCMnl5z0QIvAIsOtXsb6oKEk+Zc9BRapE/d+vmaKqWH06ip5TIEkGHOzxPziR1KmaLPw6RpgyC84p00jiNy6uNPq8iEibdsLA/YPSxfiYCon+i3qZ4qEDws2ZBacEvYCt6A/vyXSTpv3mZCpAUP2Ageghy4mYioIxjt/AG/QwJaN3excyoPPITZ7kMrnJ1t/6vSu0rb15i0sWULFIuOLaniTpp3N3mw7A9t5W+z9POBUIoL9L/m3DMRKsl6Fck8s/Fp+5XvpkSCTZIqG+lJVz/eemZcsr/mR9rvsFmCKNjS7Fa54WZ8O/yABWjIV2e4DCdMgUnq/MlOePmPWJROTqjIjRACrgzco2s9KwCvBAfZJIOenc0sMIhgn0VA1gnxTHC1ycJp5T5awTfTVTImxCACnUZK8nChCEpiK1QGSpnxTD3a9RoaHiE3pBiINmYVK7eU3VWqVh1K9wvIODfTK1zASr3ere8Rvx3xmIiK6NKx5GFQ4DazZsyv1zDZYb/kOVu33sSlmGuoMvJ9QadN0+fu8sTj0hi9OBH6qpTIrSw9SWhJnX4fXMN6mbwC2QJB+jJYrh/G10J3xAZwxlrujVz9t7fFzv31Xitk8zSkvFpfJFbJWcGZArvyvTP4xPDh/2+eXqK01nQ002puv7XIIEJaF0kOcASR0w7qjDXG598IGBwypFyj+oljBWluMkjNV+M9Gc+YhbsDYSyI56fqqraC3Vqek8dXK8PmNFfQ62zZtZ3OMBzMjwe+tq0Q6LKdzaJR3N4pF2wqj9df37S/onJFCpU3+XkU5Ur9fk94bs8McvY5Y5k0r6TZNbz6Ye08yHVZa/MzPQG9dXpc38hHdfldDj6gz87XkHQDbABzqQ+j1RL0N7NUMsa9tR3hJZPV2lZYm5TNQYfAa8jDnuO2NwhGrGoD/jFycVElulyHV2F1goMag9MRGK7obpoVUN2RtnSj1eYlH0E6uGuCwBe8GAjhIVCnXQIn5hErJjh7VWeeastdfMlw5z3JzKMaTPXusLY0BoGejDIvRh8NE+R9vv4kO4PDJk/dTYTGfBhgcjdD+nD/uf1mdpzlV/ojaGbH2JxylQ8LkWVd7rwIhS4skLwcE+9NHuBVTkc2eP9i0FnTxsJOlX1RWQn3OewxrcnNuVaGMnZisIk/hXz4Qj1I32+5vD1w5vzRZyXy9QZBGlED6ggbj7SDuSBKze6KYq2saIf4d0n8pScyiziSjGzaKdjW9k7T15XOg6O4kbwuG+fOQSOLGB0lY173gA5P5hy4SRF12Yyk4fK1N/T80SudI/DTy5Zj+e1uvPcBseAw0EGDUoyWeqSTCMSdk4q+B6mdvFPx3002EuhVKE6saNMzTZ/5CweLQlYFSp4fmIVhkih7XKcNSOamjsUFFVjjg5QNY9lDuvJ25DTIhvD9xhr7VHgyVSV6CoyUUkOpOA0GWW4Qx+xvv+NrDjsVVlmKUlGRsX7HNPZIyS4RiR7ikP/jLVNYYig63vXqvuIqXeLLAdyrO6DwfcnM51u0Q6Dpsb9OJbNR1zjxK9MSyVyHMP6RNs1oQgPfypa67eQMJ7Tw9JEHIH/VMVL/Ha7dfThB3mkAM5HRbnUA6eSMkwYdBjRF27ERXLSywCitIVx9xsN//FcR8yg0iDQvmp+HPWQkL4zJo6lPLblIhgNWsp7i23F554G4KpbosKZU6RwG7xNaqMF0ATAxt2l0oIU7DGmO6iH7W1kyiLmBBAqFOR+43ikSZOqgJh/PjlFLE0hdoDzL3jerFPA7CCU4bmcspBO3afS/wLO1AaQ6i9rLlRpjY+8HRpB6PKEPOVUrAoaef88vICQDN39/Z3a4IfUIqJ6bEYZRhoVrMJF0FXGDpO7hk0cfXabj3VKG7n0LtDFD6vzydhfh2E3sIY6sSUNtSWJ9DOWk0MtrVhuZoHB9XPiXPShm25BitaHJsB6tin+8AUMhLz1kfDO1Qo6FUpNKnFXBVuYL05J2nqG7RRYwXZq9mqwhHLmsUtVjhndpwHK929WeQ/PR1A2OOJPuXWARjp2XhhBlrbrYy1RnY528joLc8wWtQGQVx4LmJKA8lxFtdb3Ina57N8R/U1Vvf//vBBb1blfgYY7w6zfwxeAjtbqnGVhWb3pdM2hAou/5M9rMOJxE+CyUtLibahO7sfZ9nnMb4gltQfKmN4LnwXPmaILz0xx0eJvsbN/yV+CLnmBqJ8D+dJg6ANGrTbMSveWvgIifr3NIIy1t2l6hQyYRava8XhoRCW7xmxTNzQzUh3xY17Z4cw5YJ4ac139Le836mzCKl9yscI5R2a97g7tnGOruQP/PCu6DIUaLRoitfpnEorZBLuVwUU00QW1RUb4ooKrvGap5/GjqglsVdiZQJrml+REmZyJRtoBT29zXU/JI6UYZrwRvXhRu4mWaxrLEmrrqQ5ABqpwy4ednuxQbHZPY3Hy1tXEtc3zeloT877cLgmgJ5CaYHnyXindpHzQBtPBMmbE8zHHs1lyZ11Jz1hfGc5h48U5YjyrXQqpbLSf6DC53ysXDl/JE4lD0WElqUmq15VpTZ2Ue43CEfasbXbP4mAZ7ixQXj3qVZZNz1tZ8Y5MZYqvtZC1YDn/tAWtd0SuUwK5qdq7mRo7d/dLASnkTGQfdg7QD2+EsWPtT2wtmVsPVQyatP3isM6wLO8LY+h/1hZyPyyJ6X9LXbac+/SGXECP6nvxbDkhzbcwQBZDHNopAeVbLQ9TyruvIxqDlyOjBgygigJlOiWA2zihf7ujn+bBjQVV/wNROfFS9IrKgITgWgeInGeWs0fXW4KoJNMqI7ftk7VWcKBonoNItanEHin2pwDRZM+v5xxjbjA5K4ZOqSMnwIPMr7WceKy14OMZN0o1MRmFOV9i128KkcppZAKt5++CmndtLsHfJ4sl+AfoYhLJcX9JTPLMD9sKqtZl086I+dI+rS3RAFkKdzgkY2BMXaOCWg33fC3S8olno4y8qFTnI+6UT/M+EZtsIoh1rG2MX3TdVNH1yppPK+1UluYxmPZxNSLJajUmFgAixq7AqFd40ULrHs/nCozoIgs772ttzo55Ri/7BCO+INtnyBp0MeNCHWC8g+UOwH/vGqdsRIQE28udwrmDIdt3Bh+tK9r5+6GvZN8gC89ZaorI+5uaLxFsjwMM3pNpIMfilahN47tbfcqXKRWpOSNbWo75L9bv0I1U2YPQ5JpKTjPveM5gL5l/8dMARrGfQ7qLB54x7kQRG6HCQmAnQr3t6HWU5bTKL1NKbb4HlqUai11k4/yAAPu8JrJjvDkIcNXILKQkN8wNQYZE91ALo/EsvnFO57+ev9jy1bYfkJkwp+qbirh7w/150qGZpADIWU4u8sirPofqj0aTZQI/53iPiuvhV8B50ZATCL8So3dFV8iQjfHp4jJdjoc6HatQMfuAsSi4PUBDv9Deh7NXRdfjXGwjvDZj03EnTty13qUE/caYxKKcUwbxzlmxLU/BxWL4/Zn6/MK9fCjcT4EBvSQQPNvYgmLUZrAEzL46X4sO7dKaZxvEelHzO2SeNbeW9fYUqL2tQ4ChnC46oKvIF+XT5xfGS1er7Mske6Y2JVs7loOMNpDfzIHZEWNA3iSmFGnhGU51itsWP3DmJAE+/dVRA/lkPiQmP/XofZtuLPyY3JKD/CHmKMvkuDrB+Q6ZZjUONfH7KZcTrBPM0RcNze2xJEk8xjUtL6XQm5tUYyy2RDYl7yVPDn5a1olgATkv+4BroxOLBpQ0HkQpnsj549sa+40IEMOZUDNoExjvs6ukEgax4/Fi8slTc++vRCv7kyMGl6DeFV3oAVzvkTK/vQfG0C8yXwuYG9wN9Ihn9GSgPejXBb4uxuZoFpa0/BfJBa5xYM1c+ewf7qIQA5I0Tnm3W9YXqZ6XHK+TaduqJ6xQcD9MrD79sJpeR7GoMIi7vHGEJU8ZN8AGX1/qpM5dwbB4CfgYk0AQauHhdaVzgYym2AueywyUaaRzit2dn9oIvDfksHqXV+QVfXXBuLbt6x5O7KNGZwuQhaRamPHl/SckxW5Tm+tZjsizs3hB2f+JWCO+BuboxDbO0YfolasX2YUDBfrvtqeCZ/WAt+VQYLJ3fzXtmVafeIWDWmNhi6FfkuZ1gCwmubQzSBMYG4Usc2T6OTUN51cbSx/IGSCIBeJ+goOWCc1hpjyqrvaoH+brTgR0gwbczI5h5ukfi1ZrXuL5Bwqj9mwyK1vkLYBcF2uNL2KDrRTgGBVMbHwc2/5KdCnMTmjmghDtRJxzFkaSsHODjapW8or7wJpMYDDaTLQgGWQ+weUDNrilhWau3HWo2T/V8SlyFRcrGvs2WLhF2o5/4a5lpnZZGcnp22iX5GVU4jBaqraSd9W5DuXIxXGRLCkONrxz82Vw3rzB3hop362O1zSS2ygFLxF/QPk3tspWWNyMMKlXByLne6oqmVRK5etxoNbqYeOiO80fWqXNv7FAG8zjIj+gpQfIQEGQsmpeufKAVgQlczPzglzpR0hcA=,iv:7SuHnThyDeOMpDMZ5/LCiyxsFvzkNwEV8xpL56FI/qw=,tag:4CLUrclfHQU+2M1OxLtw7w==,type:str]
|
||||||
|
gitlab-key: ENC[AES256_GCM,data:ya9GvFTcPuIGlQ23zrdbfat8JJS4QFiIyvYvHJwQ6xBbLIDMrl17RKtUZAb0p1ZVgMZIrMdI98Dwx5ApLF/cmizeM2nqhFZMUSTK+hTjzKRf6beHJuYKIWexlBHFFhxoMYHpx1Wmf/wlmwcEohkwSG07hyeB7CdRSnClMucv8gl/vtzRZJrKIIdMwFF1opj2ELr+q8a4iKQNFcCbX8TJxBg8UtE9axa4uenZ4XVN5w801tEWrBJjlG6QU/krqFmylOjyXgcUUP4lAyEGRBH8PbgwjKjhJr6wqYuCFO0tkqJcfmd4fZiZOFtrWuuyJ49rDcie3LpR0mK3fZkYm4/Ymt3BDqLP2bTuwKIeCRvr6tKMNv/pXbyQhoVmnE7Ku2qVhUl4R7X5IH6grLlenwJz4rGZgeJz7zHRZsk7mJc+zjtWxewFeKRNMKwD7/es9dPK5lnArXeHi01pFAgkybPG0HYLT0Y89BZcp5/Gg5N5dXyAU86Y4P6SADMD6pzoasrwGK5Pr0Qbxqt0ygyTpajuDalaFtgi2+GdWZC2noiD4ViWDKe5IRSjLr0PPFSBOXXp7PnAKn89mJTlhyuGlY8qc1RI4aipW2K3SO3s2EvPXeN5PT7emWiicG/a7X08OdE4/7zeDbov1RosQj8rHcQt6rUeW5mj1V3sah0x6Z3Vzt9tmsk4vnCmHDp+VHPccH7w1yUilfOufyqgNWIQFtMpOWt0yhOLEbokHtpuN8zXXfzqaCurTS8jIEBgUPnTB5TIf7Sp20a8sy9nSgucRarbpvzxi6MrQXautaB9NjsfuZatJEC0TxzXHO3VMEOihJeZyY2OtDA279hMjYdd8oJjlqS07TrlqKnP71Zo5eJorUjKw2AK49NxzKsRrItvRPS1YhHxQ3Rauu0BQ2ymAy/KZNdnLN+I4F3EERR2PUa8KWnprGOHox3mgqEdwhQOoKM98RiVl12itNb57obtIXejOkAG6tyEyFu6ffL4EAu7ibqrdzsVafWlvWz4H9qtiueyCm0nsMVzsh1pRnJidPG+7kWUIA/wUBF2N8BaNi4WwdQInMSPm9iVYvkkH9OmeX3xS3L61z5Dpok5vwGeNzPEqQrJvRs3fySCFL/UF6N0Y45nEji3sgq9Hg/x/b34UHN23PvzhQZMs0hEpmq5rEkKhfVBNqaF7uykqqt3aWCL+lUdX7PwursWKDbJ6TWFUqy1ahpe3za89QtiW7LZaTw49WwsENRliDa818UGYCAp8+EHCcUR+IguPBPYo+zT6qpieM4P8RZKmfXZGvdsLcgTBpHqLGSWKPD8BYFQeVdWdJOjqEmFtY20eUrLK3sC2ajGRnV0yI2aoxGeTTIKH9Gq5fEhaVCuTuKxfNL/S6BF5fZr8VwRF7qJ4Mi1kRDepe74SPdqo09jHZuytsRkgYZMk8EMoINMSWWRcdWhqEBq5/R7qORkXi0kjsjcCqnuVL7RjJ3cd6XGy/OpdLWz3kSDb2ai58GbJeovPtyTe6gUDbnuPnVN79ChJLGIViQzeg94LZw68b9Jas8CPI5JJxq9FJhNQe6YK/qEsOldfSignQwUhFuijbFvGwxrwTu5cuOHE9r8XM/k2FL2eUL3pxdbmglibuB12IzFFDhRoBtBDI0SY4FlR/4JaT9O81QIQkJzKJTPdTkiNw4rnDFxzZNKvpDMfHSABdm0ODunLVXVCpLhQ9B16zsFj3u5yvWrhpJdu2RisyPLNRSQHY3XWHreCmF3PKw5f3gCktCVraJxf3AZJc5VE37tn/XMU5HWVlIcnxijgBLekL/mijb1Tje+7hFWP+q2jGxnQPR84cQ8mcSVR0mJTPcAMI87jPG85MQl/bjk6cJqJgg0Kzsug086gRZKfbE4p349aPuUTZ2I/dXVft2FLPaPdJg6WrqE5B3LI0e0zo3uM0aNvx0BbRGFsSxNqb/YnL9P3dnCXzpKcFH1tmkfQO0bXR9t6fGLegf8qfUAwn6GEpWC0/ABGVHQ743NGYdNFXaEzQXrKFqbpIkGAl72qz4OP+6Svff3j50t5LGpvavwODzPM8qHvat0GC77H8pDp/NTHAryGM/LNjmBsZ9PdP0zqA/zjtVWnBNE5ExmBatbvTJMb+aPryQtV82gGodbPvYreK3/krGfGnzkmHccOk2YheuG0p5XKuLrm+JNLWO+54Mem/uYu9TLYQ9I9lKAqWlQCOGEEanV5bTsP7oyjEBbvhNzP1IG8GqUSdFpcmSVk33TLrRJQn73A+4TDJUuP1BjU4aJGbMKOXZSELu/+tMgpZHWwJxj5XrEnkdHwHkiVY4EsPizZvifPJJ1te/2Ru2oSdkjbVUTVqjoHq/FJicG+EdCsyXTYvAjGSXapQyM9b7oiYrhojzxSJ2+ck8zOGGxlarjmw/Z7zRzjVg5lHApBvnyFYgruCoUVcojmOfXROs5J+UFTCKMoN6iB9ZXt8YZLB6mb0SS9VD91epo4Ui+oYyB7gKDPpDN3HD5XbXmdTkCVsxCqNYuz5cEsDLpqtH+pZfrDV6qzBIoj+mB+UaC6mjyCF4/0qarGax1VfFJHeWCivLAC+io7TsblEC72bwO2x05PjyhqMlKEGVoPrxLEsq6o/KRqkprYfpkgZEbawmmK8qWqpd/t1OfRbPMYQpBg1zTCmULG5zLQKS7eSHmMMOAbRudud++8ntUKrEmr31rS0A0lZ3YNWshMxhMfYIOdcXWYiSrH88rPnQRFwViRBc6iwXU5u3oUNb9tKamdZYy/nqHIrs33pb1raNiNMyMGUw1CEQDMSnRDFs7Xh9wmO6yKQcAhUok8ym2b3mR+4+7+ZxFarUB8QO8uT31JFRdeUOa42GmRQV0SexpBX/bHXLD0BDtoSa5+wlo2jVjhxMgB9DpSC5VcrCTFHbP543RI2oFkn4MdA2hcd4eh8a0jKCrvfZYXIcxXMVVZq91JdjC97Iy+iMFS3CNH9kaZHd3EE+QoGt75HQDyF8IAoE2J688hnP+3j6NnQ2TV4Sk7oAoZatp7F0L1axy4/zxi19Kyckh1UBw1u2xhDhO9FxEcll6WujMS7TiWsKih2cnT9ggNZuk7gZsYXzK8VS31H8d5r/0VIaA5MwC+UhOdakvnc2RD8D5ghpeuPe07MXpl+drqe1lt1DnF9uSqescjNYx33a+7FL/Xc26+Ywhp8b35r2Gr+ve8utpGZbhzZ7r1NxC9fHk0yNs9UIZEQSSfV63KUX+E/SEuktgQFBJYvKfuClOA/56kC7OCDYTjIEr125mYiSBmsCoDbLtz7dGh0f8Wes7mPu8gLHreuzeUaFC0Yt8uwoTYfEy/2oHtHvzj/LciXkYcqSt4dSkfd9WoAJgUCgPnGEAw41q2Fa2C2aVW0KZpWqgijcQyw2oN+K12xZU0qLXYVUV7J+xoRHcENKmhRROj8yHVwYgyNyuPmg0rkfhx2S83hw+TPt1fwoyNWe+VhA8ZlYABEihN31986XWj5zWqGCNJham8gQx5RcCt+TW1K2T4zYw4XneJHksmaj0GEqdFhKdWfdZ8njrKkMT+Qw1cB4ocGyhr6lAUdvhYSQUaislLp/BsmvQA0g0ENsisP4R0ifzE7MdUYbPA6vw7OeoCfOS3sFio1KhFL6wbVEGn3KhVyGYQlEntYduKPUBag0di8SAxvYTWPZ9VrEAoPVeLiIyQUUaQAxZOByoUVL64aJJOFhJ0Md0lkp4Ioc+EnnbJVmtohWxdcUk9EinhO5hx7UemWkPe7pQ3ufLeDbqW0OpV4n+rGmZXeZjECo7RRnxoQcKfQw6Ii6qU5S8ouLvzKFTuwa0WWoMTQdE9//mIm+uVhbkoZVCTnVkIIxxzNGfpvUq0eNyXa6mh+Mpo2eSBKzfXfbOzKT4sSvQct9QBT1otWn34GScV4k3iLgq1XWonbEBn1juaPTPO/fdLvXJmV7X3xivWmM6zOYQrNecEcf3yFidQe7xdTQ+VGFSeFb90KYuI4ajgdtM5EQ7rxpwcW+7kjAk95DcplizZBHptKvBOrwqxVBZ6NSrYrna3SqsocItUsCGun2ErOXdz5MdLG4U4u5w+L5Cg3IhTEG3Si3HU8o2Ue0fnQA/CsN4VWVPEYYHUNhQ36rA7qhuvuKI3n7dYtqEXUuO5y9169c8AK+efEXFcusack153QM1RoeioGsAt02UXRXKJF8pQKqamt97UmiCjZpTkxQDV/u4zglOcMbH3lY3vJgFZkQ+qEcU+lXGWSyuwWafjeFn2RGg+yjjE1OJcxBGJLxlGuwaqvpfIjtVlQf2fy1qoGxnBhps8vzAi0Zuqeo3b/5oUMhU2K7L8w/+gRXP1nBloA/iGGJL6kjz2YqeBe8jsImX9pt25mjzFx6SQekRL+yXU8wBQzhRNRXmg6gEtDWlMDCKEyGKYe6dk+pFb94Uv7UcavcG7JfFsI6StJYqdnI/FNZrc75w1Sf2/qGCBzPQJpylhSbnFsT9erqclsrirjUX,iv:IKHMuKQt7rsbUfzosTloCS5YF8Xt9RhCaw5qM9wt0HE=,tag:cgMQRQzix3HnO0lEwh4Q2g==,type:str]
|
||||||
|
sops:
|
||||||
|
age:
|
||||||
|
- recipient: age1c8pawdsxptfslgrz2c56s39mrtnjzc5mm3hfzgr2wdwu2v6vfsdsupjsq6
|
||||||
|
enc: |
|
||||||
|
-----BEGIN AGE ENCRYPTED FILE-----
|
||||||
|
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBvelBDQ2FYR3dvRHl6dUc4
|
||||||
|
UmwyZXhKL3JyS09JSUxZUFEzdmlTQk4xZFJRCm9vQmlzUzlZelZCWlVTVzJEN3N1
|
||||||
|
MXV1RGZSTHN2KzBRVDdvQURGTE1PZUUKLS0tIEp6UlZsZlFORUVSb0w0ZERsQ1pB
|
||||||
|
Szd1TDFqQ016WWd1SFowN0ptcGlyRGcKRH424S/7enLTuACcJyFUdbIgsUl0U/5i
|
||||||
|
6WRrU0kHesh0gcxU1QMvLKiUZdYwo+pFoDWZiocNUKlEt49isncMrQ==
|
||||||
|
-----END AGE ENCRYPTED FILE-----
|
||||||
|
lastmodified: "2026-03-16T08:42:01Z"
|
||||||
|
mac: ENC[AES256_GCM,data:RbYlNcntZ9k4t469eq5AO4CJQ2zSWetFYz3K14sN4vwAvYgErkvVZSQvzaTPuBpfNCFxTnfSH/d73EZvqTskfBElef6TgPK6EiDV5hMfz5sdnZmc97+le+Uvzs0c6Y38faKfs4ZrqtbMRIH1YuWpnLKfJmfCPIFayeEoockgbTs=,iv:P32AWbPLsV68Ee4G+AiBkDdKHm3vZngtJGz0D+lz58Y=,tag:AQYyAoxY+CpT6GawCQw+xw==,type:str]
|
||||||
|
unencrypted_suffix: _unencrypted
|
||||||
|
version: 3.11.0
|
||||||
@@ -0,0 +1,42 @@
|
|||||||
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
|
imports = [
|
||||||
|
# Choose your theme here:
|
||||||
|
../../themes/zen.nix
|
||||||
|
];
|
||||||
|
|
||||||
|
config.var = {
|
||||||
|
hostname = "pph";
|
||||||
|
username = "hadrien";
|
||||||
|
configDirectory =
|
||||||
|
"/home/"
|
||||||
|
+ config.var.username
|
||||||
|
+ "/.config/nixos"; # The path of the nixos configuration directory
|
||||||
|
|
||||||
|
keyboardLayout = "fr";
|
||||||
|
|
||||||
|
location = "Paris";
|
||||||
|
timeZone = "Europe/Paris";
|
||||||
|
defaultLocale = "en_US.UTF-8";
|
||||||
|
extraLocale = "fr_FR.UTF-8";
|
||||||
|
|
||||||
|
git = {
|
||||||
|
username = "pph";
|
||||||
|
email = "pph@pph.pph";
|
||||||
|
};
|
||||||
|
|
||||||
|
autoUpgrade = false;
|
||||||
|
autoGarbageCollector = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
# DON'T TOUCH THIS
|
||||||
|
options = {
|
||||||
|
var = lib.mkOption {
|
||||||
|
type = lib.types.attrs;
|
||||||
|
default = {};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -6,6 +6,7 @@
|
|||||||
../../nixos/systemd-boot.nix
|
../../nixos/systemd-boot.nix
|
||||||
../../nixos/users.nix
|
../../nixos/users.nix
|
||||||
../../nixos/utils.nix
|
../../nixos/utils.nix
|
||||||
|
../../nixos/docker.nix
|
||||||
../../nixos/amd-graphics.nix
|
../../nixos/amd-graphics.nix
|
||||||
|
|
||||||
# NixOS server modules
|
# NixOS server modules
|
||||||
@@ -15,18 +16,17 @@
|
|||||||
../../server-modules/glance
|
../../server-modules/glance
|
||||||
../../server-modules/adguardhome.nix
|
../../server-modules/adguardhome.nix
|
||||||
../../server-modules/arr.nix
|
../../server-modules/arr.nix
|
||||||
|
# ../../server-modules/eleakxir.nix
|
||||||
../../server-modules/blog.nix
|
../../server-modules/blog.nix
|
||||||
../../server-modules/awesome-wallpapers.nix
|
../../server-modules/awesome-wallpapers.nix
|
||||||
../../server-modules/iknowyou.nix
|
|
||||||
../../server-modules/stirling-pdf.nix
|
../../server-modules/stirling-pdf.nix
|
||||||
../../server-modules/cyberchef.nix
|
../../server-modules/cyberchef.nix
|
||||||
../../server-modules/mazanoke.nix
|
../../server-modules/mazanoke.nix
|
||||||
../../server-modules/kernel-hardening.nix
|
../../server-modules/nginx.nix
|
||||||
../../server-modules/fail2ban.nix
|
../../server-modules/fail2ban.nix
|
||||||
../../server-modules/default-creds.nix
|
../../server-modules/default-creds.nix
|
||||||
../../server-modules/umami.nix
|
../../server-modules/umami.nix
|
||||||
../../server-modules/gitea.nix
|
../../server-modules/gitea.nix
|
||||||
../../server-modules/mealie.nix
|
|
||||||
|
|
||||||
# You should let those lines as is
|
# You should let those lines as is
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
|
|||||||
+24
-3
@@ -1,4 +1,8 @@
|
|||||||
{config, ...}: {
|
{
|
||||||
|
pkgs,
|
||||||
|
config,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
imports = [
|
imports = [
|
||||||
# Mostly user-specific configuration
|
# Mostly user-specific configuration
|
||||||
./variables.nix
|
./variables.nix
|
||||||
@@ -6,18 +10,35 @@
|
|||||||
# Programs
|
# Programs
|
||||||
../../home/programs/nvf
|
../../home/programs/nvf
|
||||||
../../home/programs/shell
|
../../home/programs/shell
|
||||||
|
../../home/programs/fetch
|
||||||
../../home/programs/git
|
../../home/programs/git
|
||||||
../../home/programs/git/lazygit.nix
|
../../home/programs/git/lazygit.nix
|
||||||
../../home/programs/nixy
|
../../home/programs/nixy
|
||||||
../../home/programs/nix-utils
|
../../home/programs/nix-utils
|
||||||
|
|
||||||
../../home/programs/group/dev.nix
|
|
||||||
];
|
];
|
||||||
|
|
||||||
home = {
|
home = {
|
||||||
inherit (config.var) username;
|
inherit (config.var) username;
|
||||||
homeDirectory = "/home/" + config.var.username;
|
homeDirectory = "/home/" + config.var.username;
|
||||||
|
|
||||||
|
packages = with pkgs; [
|
||||||
|
# Dev
|
||||||
|
go
|
||||||
|
nodejs
|
||||||
|
python3
|
||||||
|
jq
|
||||||
|
just
|
||||||
|
pnpm
|
||||||
|
wireguard-tools
|
||||||
|
duckdb
|
||||||
|
|
||||||
|
# Utils
|
||||||
|
zip
|
||||||
|
unzip
|
||||||
|
btop
|
||||||
|
fastfetch
|
||||||
|
];
|
||||||
|
|
||||||
# Don't touch this
|
# Don't touch this
|
||||||
stateVersion = "24.05";
|
stateVersion = "24.05";
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
umami-secret: ENC[AES256_GCM,data:tImpd4sD92Omf/YFB8YE4gxAu+g801wQNR+k5rhY6AbzIIYOzpVmQL4XGjfp9Teky3olii4s3XTcmTyuMoxMWg==,iv:QFAEzYnAnxOOtrHWiM2IkvSs0Aqk3s1T5X7j5WC+tO8=,tag:FIbgHLfRVMJ2qZ6dOJ8zLw==,type:str]
|
umami-secret: ENC[AES256_GCM,data:tImpd4sD92Omf/YFB8YE4gxAu+g801wQNR+k5rhY6AbzIIYOzpVmQL4XGjfp9Teky3olii4s3XTcmTyuMoxMWg==,iv:QFAEzYnAnxOOtrHWiM2IkvSs0Aqk3s1T5X7j5WC+tO8=,tag:FIbgHLfRVMJ2qZ6dOJ8zLw==,type:str]
|
||||||
sshconfig: ENC[AES256_GCM,data:R54HVxqAyj9yGO/AYL8p6cnXgYxkQKW9XveHlBMTnDXBJ7r/4HgnefdymprnXmdlbNWcWrRqmaLEuzJs/0BfixXfMvmGTUrmJ0ASVuDrz9k6rOLADAKFikQh0dib7NU4JmPgmUzMncXc2WuCd3BCG3kwBQ==,iv:Ro9FA+MzTAp+ERQMT88z8ioCox/dTj2vWcqCDOSLag4=,tag:5XiXIyz5/pjGFOB5ZjdOVg==,type:str]
|
sshconfig: ENC[AES256_GCM,data:R54HVxqAyj9yGO/AYL8p6cnXgYxkQKW9XveHlBMTnDXBJ7r/4HgnefdymprnXmdlbNWcWrRqmaLEuzJs/0BfixXfMvmGTUrmJ0ASVuDrz9k6rOLADAKFikQh0dib7NU4JmPgmUzMncXc2WuCd3BCG3kwBQ==,iv:Ro9FA+MzTAp+ERQMT88z8ioCox/dTj2vWcqCDOSLag4=,tag:5XiXIyz5/pjGFOB5ZjdOVg==,type:str]
|
||||||
github-key: ENC[AES256_GCM,data:NRYhcBIwGJEV13+YECLR+2IErsn/7clbnkx0Mltr7dQajSb5WHZ3QDH0KQPylEHhplE5IVS0h4I0z+Pb1B0UteCxFmJ5wZq+2BKZkvE7G3dojqBpgHcVqJV2GLEJkRjlHfRgsbq/OBe8xcsPh20P1KUyP0WIwVbpt+9dFWGxEGYkp2uSyuBIJ98kElt0zuVgl7WcYoDO7v5WmGzZfla+yZwURvMk8zcM3gopo+4KL6YnYUs+UA3VlBBn6VK4Nvbqy6X0R0+ZA5HHAXg+OFgGmfWnENZmsyQJHXEchGGgEldzThkQ4r8yMkgN/ax+AGouLyzbITapGE4sE11FFgL6Hmp4pSXxl3UAGF+cvV5pIujbb28CXmSPRMyYpoNxI93PSYz/txAzE6Cr2dgwxR4zpMelv4i6IaGnY8NgpY8jp2Y6C0uuJxJCN0RtnjQw1rM2uRnm7vMGyU7XXz9DEVfGnYpTWnykXsEjHE5DVGy80ejYQlc6dtmf3vdTWpt+YYdCPw8/cd0PIx2D6geh1c28,iv:wl+RG24mXYMklD8CBGXVD36DMhlWT/7zh8ZMvr7vgOk=,tag:OJhqF8PoXotr7IsyFW6q1g==,type:str]
|
github-key: ENC[AES256_GCM,data:NRYhcBIwGJEV13+YECLR+2IErsn/7clbnkx0Mltr7dQajSb5WHZ3QDH0KQPylEHhplE5IVS0h4I0z+Pb1B0UteCxFmJ5wZq+2BKZkvE7G3dojqBpgHcVqJV2GLEJkRjlHfRgsbq/OBe8xcsPh20P1KUyP0WIwVbpt+9dFWGxEGYkp2uSyuBIJ98kElt0zuVgl7WcYoDO7v5WmGzZfla+yZwURvMk8zcM3gopo+4KL6YnYUs+UA3VlBBn6VK4Nvbqy6X0R0+ZA5HHAXg+OFgGmfWnENZmsyQJHXEchGGgEldzThkQ4r8yMkgN/ax+AGouLyzbITapGE4sE11FFgL6Hmp4pSXxl3UAGF+cvV5pIujbb28CXmSPRMyYpoNxI93PSYz/txAzE6Cr2dgwxR4zpMelv4i6IaGnY8NgpY8jp2Y6C0uuJxJCN0RtnjQw1rM2uRnm7vMGyU7XXz9DEVfGnYpTWnykXsEjHE5DVGy80ejYQlc6dtmf3vdTWpt+YYdCPw8/cd0PIx2D6geh1c28,iv:wl+RG24mXYMklD8CBGXVD36DMhlWT/7zh8ZMvr7vgOk=,tag:OJhqF8PoXotr7IsyFW6q1g==,type:str]
|
||||||
adguard-pwd: ENC[AES256_GCM,data:CAmZFpKN6FFRlCk=,iv:cz45T/z2ZYHNC46FNVp2YHmdhXD4ERhM31+Jo+9PkSk=,tag:GTUvzkYSP4flXs/HUNGYhw==,type:str]
|
adguard-pwd: ENC[AES256_GCM,data:dOFEyLRG3yG9h74J,iv:S/TpCjqakvK5NgSzDukDyI58Y6SLl7NkuutUOY/SrY8=,tag:I9Rv3XYBG8T492ozHoCOWQ==,type:str]
|
||||||
recyclarr: ENC[AES256_GCM,data:eJNbGHb4SZvbF7FAHMrpRynmpVyPiTpyZqNx40Fo+lanqdm7d7oRhkLD2PfqxpTcIyV6BxJk12wGUC0uWVuAihmToL/Ih2FJWIQFUOdbaov/xNWHE9mtoRX/A3gIwD8e3DoFMK/dAk2/TyvvAfxi2eYTDJvxecEttHQGxafq1jveHFDcC9e1aFk3M8O8YlX5yF3zl90mugsUVP+iaSURnY/nglZuEDzfJ6Edge7r5OSL6WYh3OUIu1yzuuKXRZ47B/gpXO/cP89JMmxdPj3FUJkk7Htf0s9ALzpVE9fRohDGcpPIkR6COCLTL+mqvVmyopA1zPoX8/X8eiuocpaT3vqJit7Bc6InzflY/5rlg1x0SyoXWQfEsperfNBeiZGngp382I7rrZ8QSwF4AIsmngNeyDRAnfasAU5OVwK+yPIVhRueEFLNrJPG3j2hpArlzpvY2EPBVJDrYwFslis8CASoUdvu6C7VxtJXFcOZR8QemwJarJFU7v1bVhQoIkarn3V7FfAXg/8RfYrn9HAIq5AiFFbQRNHWXzIceIgNKQFb5yfagtMtMq6XKhjsV07jeYt9X/YU80XRfkPm05yiLdLQHcDNmlB3R+SFPD7qjTE7LuSH1Kdc3DvxwrKfHJLsJ+nSIL1po8gDMW8BPc0g4n4dpQ6CFK5BaDFK4eovNpgAXoRC9orkGw/16YmMozp6J78VJLzu3jcYMFbySFznDUuWcFf/7dVV+7pLAj2ffWXzScLISRBhZ9RNUMaZAKAk7WTmxBhw0yzNiih8OFUkbpp1FFLuU0bnBY0iEz+8/OSwv8H7t0HYe29HO61p1huH34B/ZkPA5VLKivFh2mOPNzbvMqtIAkq1ro82Psvc6t88gVIc+VAOZ9zDLohp0FXrNVXwnrs7fxevQa0pUClDivO1ib5G4Znor7q+13jZglmh3G7nHiniO607dRoxszzVEQdTn8ku3XAfIPStsSfQwH46nXhr2kDkspcA7BqwJph0dsKKlfzf22C0OJkDY0L1DgKFvJRmmKAhOdB6XxXYwS+BcDT+8ugejTKpulyPSsbdb0m9p9lVAVu0GMxFEbUsuE+QHiAAP5Vle7swpl4h3i8uHSfKFra3qEswwRnPAHhPSdLSaSU6O6T5gN/b0hhO6dAiNR0UOkOG59fPasL0MRpeb3SkM4Nd6g5b/hY8dXaXR7pQHvh+4GmfJFWYaWm/cZ8k9JAYAw9Sn/spWnjRmpv9bnSxADGbkdV8NDHquDDDFVIIoDnWhQJpqrL61KZITx2Ete1SYdNiy++p3mOYisJgHDsRR1RNQNxhRW4EY8c5nCzgc8x+rU432pCOfMbAuGEfQXMwMGFGeoUg6EL5xEyUEJ/aqymxI+Vjk8h7KfDnOyyL/+1BKEd/GccrjeQfeZGRLI0Tu5gVgL6twc+u4av6inNMMhPFzZuVrfeo6bip5C8R0dK6Pbdz2L/fsgn3E4NNi14NM/DgLLhJRLvKQdCQx+BT+3soNRw5htTzuNS48MD2YDwZYvNfu6mo0r4j4I7Tj8zuCjddbGVa2/5XnhcfdUBx1VOd90H1RKkk8kgSoR0bgo7mLls=,iv:HT3a2YnFy0cF9qUO671kwqxuzFfNnfqynCUVGHf+3dM=,tag:nrA++7fsnc4Cx0OPSDKaRw==,type:str]
|
recyclarr: ENC[AES256_GCM,data:eJNbGHb4SZvbF7FAHMrpRynmpVyPiTpyZqNx40Fo+lanqdm7d7oRhkLD2PfqxpTcIyV6BxJk12wGUC0uWVuAihmToL/Ih2FJWIQFUOdbaov/xNWHE9mtoRX/A3gIwD8e3DoFMK/dAk2/TyvvAfxi2eYTDJvxecEttHQGxafq1jveHFDcC9e1aFk3M8O8YlX5yF3zl90mugsUVP+iaSURnY/nglZuEDzfJ6Edge7r5OSL6WYh3OUIu1yzuuKXRZ47B/gpXO/cP89JMmxdPj3FUJkk7Htf0s9ALzpVE9fRohDGcpPIkR6COCLTL+mqvVmyopA1zPoX8/X8eiuocpaT3vqJit7Bc6InzflY/5rlg1x0SyoXWQfEsperfNBeiZGngp382I7rrZ8QSwF4AIsmngNeyDRAnfasAU5OVwK+yPIVhRueEFLNrJPG3j2hpArlzpvY2EPBVJDrYwFslis8CASoUdvu6C7VxtJXFcOZR8QemwJarJFU7v1bVhQoIkarn3V7FfAXg/8RfYrn9HAIq5AiFFbQRNHWXzIceIgNKQFb5yfagtMtMq6XKhjsV07jeYt9X/YU80XRfkPm05yiLdLQHcDNmlB3R+SFPD7qjTE7LuSH1Kdc3DvxwrKfHJLsJ+nSIL1po8gDMW8BPc0g4n4dpQ6CFK5BaDFK4eovNpgAXoRC9orkGw/16YmMozp6J78VJLzu3jcYMFbySFznDUuWcFf/7dVV+7pLAj2ffWXzScLISRBhZ9RNUMaZAKAk7WTmxBhw0yzNiih8OFUkbpp1FFLuU0bnBY0iEz+8/OSwv8H7t0HYe29HO61p1huH34B/ZkPA5VLKivFh2mOPNzbvMqtIAkq1ro82Psvc6t88gVIc+VAOZ9zDLohp0FXrNVXwnrs7fxevQa0pUClDivO1ib5G4Znor7q+13jZglmh3G7nHiniO607dRoxszzVEQdTn8ku3XAfIPStsSfQwH46nXhr2kDkspcA7BqwJph0dsKKlfzf22C0OJkDY0L1DgKFvJRmmKAhOdB6XxXYwS+BcDT+8ugejTKpulyPSsbdb0m9p9lVAVu0GMxFEbUsuE+QHiAAP5Vle7swpl4h3i8uHSfKFra3qEswwRnPAHhPSdLSaSU6O6T5gN/b0hhO6dAiNR0UOkOG59fPasL0MRpeb3SkM4Nd6g5b/hY8dXaXR7pQHvh+4GmfJFWYaWm/cZ8k9JAYAw9Sn/spWnjRmpv9bnSxADGbkdV8NDHquDDDFVIIoDnWhQJpqrL61KZITx2Ete1SYdNiy++p3mOYisJgHDsRR1RNQNxhRW4EY8c5nCzgc8x+rU432pCOfMbAuGEfQXMwMGFGeoUg6EL5xEyUEJ/aqymxI+Vjk8h7KfDnOyyL/+1BKEd/GccrjeQfeZGRLI0Tu5gVgL6twc+u4av6inNMMhPFzZuVrfeo6bip5C8R0dK6Pbdz2L/fsgn3E4NNi14NM/DgLLhJRLvKQdCQx+BT+3soNRw5htTzuNS48MD2YDwZYvNfu6mo0r4j4I7Tj8zuCjddbGVa2/5XnhcfdUBx1VOd90H1RKkk8kgSoR0bgo7mLls=,iv:HT3a2YnFy0cF9qUO671kwqxuzFfNnfqynCUVGHf+3dM=,tag:nrA++7fsnc4Cx0OPSDKaRw==,type:str]
|
||||||
wireguard-pia: ENC[AES256_GCM,data:2IvJARGhesMuH9RdWzsyrwA7eqrhLyacQqZ1RNEkGOPUkQGX4uimKBSzkxXRy/haZ4V2k73JdLSaB9rAuI0n65GmWHmarwZekOyhRZSNb+zvFgw5BPZmywG1wR2HiTGR/qILovAaz47q/VnohUnjbbMCUvarC4PytWGxMUH96GIgZar8HjHFtK8grCSxlvpHKiDeKx8VSXnY/Pxj1EplBtIqwmtAeZdf/VjtwOL0nY54doPwHdIAvJ0B8Cu0a1zJIGEbV1NlKIHEJ1YA7rmv1ODkBnbXbIHMxAR3jeqR/UDqhDmXe41KujhiJI7nNeO7FKo2v92jK3fSbxYKatLrzXktHpE9JsMYVBXzTK7yAXPgoDdgLXzWH0OrJGBSisPrvqmxUko7MPreuwVYfFlKpll6JLifk8sML4A+94UPR8b89guXn7kBkLg1Y1oIAyguCdKpNOD31nXBMFF0nTcmCwyshDySaGTfJDgox65/77AiN1wH,iv:cdu6lBjLnEEfSFmWMC4Vn2sLKsvpCaatzXlgRNkEMeA=,tag:y1rAeNPB+DNGTpnP94iQrA==,type:str]
|
wireguard-pia: ENC[AES256_GCM,data:2IvJARGhesMuH9RdWzsyrwA7eqrhLyacQqZ1RNEkGOPUkQGX4uimKBSzkxXRy/haZ4V2k73JdLSaB9rAuI0n65GmWHmarwZekOyhRZSNb+zvFgw5BPZmywG1wR2HiTGR/qILovAaz47q/VnohUnjbbMCUvarC4PytWGxMUH96GIgZar8HjHFtK8grCSxlvpHKiDeKx8VSXnY/Pxj1EplBtIqwmtAeZdf/VjtwOL0nY54doPwHdIAvJ0B8Cu0a1zJIGEbV1NlKIHEJ1YA7rmv1ODkBnbXbIHMxAR3jeqR/UDqhDmXe41KujhiJI7nNeO7FKo2v92jK3fSbxYKatLrzXktHpE9JsMYVBXzTK7yAXPgoDdgLXzWH0OrJGBSisPrvqmxUko7MPreuwVYfFlKpll6JLifk8sML4A+94UPR8b89guXn7kBkLg1Y1oIAyguCdKpNOD31nXBMFF0nTcmCwyshDySaGTfJDgox65/77AiN1wH,iv:cdu6lBjLnEEfSFmWMC4Vn2sLKsvpCaatzXlgRNkEMeA=,tag:y1rAeNPB+DNGTpnP94iQrA==,type:str]
|
||||||
signing-key: ENC[AES256_GCM,data:FrJzuTgH/ooZkcnYL55uQcc4u+QzNnFvNVs2wDSE4nnwku+EuCJBlb8pd/6W0KPwIXzcki/8CY0YfRcRrzjExMgMa4hwxrlxS9bk3LNPzJsrRK5RJgPg3iA8L791f1zcDxNf8RuWatIqm1TCK+Vhdk/p+221zy1Gcq1dW8X+o4XzbPBzHdLagcIdB0wpjYTtIoGP2X8GoL/NJpuzIiQBK1HdGNKvUI2+ztqCQZOsxm+Fki57NteX3/Llw8AwABjdZvviOBZ62OvJ/SsOQ9NYAvKfAkog5zCn8DLvaqAPGSxRBQEYWM8GyL2imgs54YfEsOpGa4DzMiv4Sc5m398E/asaPq357eksUqh3EYpzoKZ5bIbd5+Vs3KBWKHltUCzXLHaLrIX0CuJFQFi7DCxEbYqlb04x5t3jc/c+/7uwqBHv1Y5gwAjd8JswDWmE7Q3xSk96Za57SCxWPYTo2ErsA2XdL+yxXdhmqkhDZKtUzrcHExhnYe7YLpSlBEclJ/G2BeTOFIWoAmN+1y4rh21R,iv:VaZrv5/41ZyIax702Yae4QmFKpcEaWwPmTo2Mxao3bU=,tag:HC0eqDNit7jQKeeDAKWXKg==,type:str]
|
signing-key: ENC[AES256_GCM,data:FrJzuTgH/ooZkcnYL55uQcc4u+QzNnFvNVs2wDSE4nnwku+EuCJBlb8pd/6W0KPwIXzcki/8CY0YfRcRrzjExMgMa4hwxrlxS9bk3LNPzJsrRK5RJgPg3iA8L791f1zcDxNf8RuWatIqm1TCK+Vhdk/p+221zy1Gcq1dW8X+o4XzbPBzHdLagcIdB0wpjYTtIoGP2X8GoL/NJpuzIiQBK1HdGNKvUI2+ztqCQZOsxm+Fki57NteX3/Llw8AwABjdZvviOBZ62OvJ/SsOQ9NYAvKfAkog5zCn8DLvaqAPGSxRBQEYWM8GyL2imgs54YfEsOpGa4DzMiv4Sc5m398E/asaPq357eksUqh3EYpzoKZ5bIbd5+Vs3KBWKHltUCzXLHaLrIX0CuJFQFi7DCxEbYqlb04x5t3jc/c+/7uwqBHv1Y5gwAjd8JswDWmE7Q3xSk96Za57SCxWPYTo2ErsA2XdL+yxXdhmqkhDZKtUzrcHExhnYe7YLpSlBEclJ/G2BeTOFIWoAmN+1y4rh21R,iv:VaZrv5/41ZyIax702Yae4QmFKpcEaWwPmTo2Mxao3bU=,tag:HC0eqDNit7jQKeeDAKWXKg==,type:str]
|
||||||
@@ -18,7 +18,7 @@ sops:
|
|||||||
TEc5d01RaVFGNXc3dlljM0FTTHpENjQKOqwI+pl8UxVIVl43glnOYvW660/PsDGY
|
TEc5d01RaVFGNXc3dlljM0FTTHpENjQKOqwI+pl8UxVIVl43glnOYvW660/PsDGY
|
||||||
yefODJGVtHrOm3yeXC2xlTi3sFW+c5wUl2yPqddbvcBt5Ud/yd4iXQ==
|
yefODJGVtHrOm3yeXC2xlTi3sFW+c5wUl2yPqddbvcBt5Ud/yd4iXQ==
|
||||||
-----END AGE ENCRYPTED FILE-----
|
-----END AGE ENCRYPTED FILE-----
|
||||||
lastmodified: "2026-04-12T18:24:10Z"
|
lastmodified: "2026-03-25T19:14:13Z"
|
||||||
mac: ENC[AES256_GCM,data:D7gWC1fxZkpG8dCr7aWhcyLT92NK1OefS4SIAq5ZImMYRJzzvhXtyJM9tzUYVWPU0ojhgOJyawlWEFk1P/DWjOrafBsBHdxUl5FtZrRb4Z/rquODhR8OT8UYFVKyAmjSfomUEDzYetJdXdAxhX3eNlT+eKI51IjqD9y1dYqcjMw=,iv:ZPIkMf/fUETeUYQdqu4TpS/ZE752079jIW9BlehhWlw=,tag:Z3i/Zc0zkEF5rsNnkmUB9A==,type:str]
|
mac: ENC[AES256_GCM,data:x1OqP6JxTExZm+J75hbLsbZ3X2/WO/ncAF0U+vvI7da+ft+yjT7zf7+nGlaTL3Aus1QBrDBI0WElyemILsRlLZ6dN5tZNBPivsec1HCoJ9wb5hKtM3poZiQWYZDyFUqbFvBiXShJZI8gC7wPKxkycPe8IFLzpJhf2B/WPCBKjUc=,iv:oUZb8hZkEX3APUMllJEZ6c1wdVUJaOuZT4M7ZjW1bZY=,tag:sF/gB8qizWJRliR8PWAoMA==,type:str]
|
||||||
unencrypted_suffix: _unencrypted
|
unencrypted_suffix: _unencrypted
|
||||||
version: 3.12.2
|
version: 3.12.1
|
||||||
|
|||||||
@@ -30,10 +30,6 @@
|
|||||||
|
|
||||||
autoUpgrade = false;
|
autoUpgrade = false;
|
||||||
autoGarbageCollector = true;
|
autoGarbageCollector = true;
|
||||||
|
|
||||||
domain = "hadi.icu";
|
|
||||||
tunnelId = "a1dfa315-7fc3-4a65-8c02-8387932c35c3";
|
|
||||||
networkInterface = "enp3s0";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# Let this here
|
# Let this here
|
||||||
|
|||||||
@@ -0,0 +1,12 @@
|
|||||||
|
{pkgs, ...}: {
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
clamav
|
||||||
|
];
|
||||||
|
|
||||||
|
services.clamav = {
|
||||||
|
daemon.enable = true;
|
||||||
|
updater.enable = true;
|
||||||
|
scanner.enable = true;
|
||||||
|
fangfrisch.enable = true;
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -1,15 +1,9 @@
|
|||||||
# Home-manager configuration for NixOS
|
# Home-manager configuration for NixOS
|
||||||
{inputs, pkgs, ...}: {
|
{inputs, ...}: {
|
||||||
home-manager = {
|
home-manager = {
|
||||||
useGlobalPkgs = true;
|
useGlobalPkgs = true;
|
||||||
useUserPackages = true;
|
useUserPackages = true;
|
||||||
backupFileExtension = "hm-backup";
|
backupFileExtension = "hm-backup";
|
||||||
extraSpecialArgs = {
|
extraSpecialArgs = {inherit inputs;};
|
||||||
inherit inputs;
|
|
||||||
pkgs-stable = import inputs.nixpkgs-stable {
|
|
||||||
system = pkgs.stdenv.hostPlatform.system;
|
|
||||||
config.allowUnfree = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-6
@@ -6,11 +6,6 @@
|
|||||||
}: let
|
}: let
|
||||||
autoGarbageCollector = config.var.autoGarbageCollector;
|
autoGarbageCollector = config.var.autoGarbageCollector;
|
||||||
in {
|
in {
|
||||||
# Ask for password once per SSH session (tied to the tty, expires when session closes)
|
|
||||||
security.sudo.extraConfig = ''
|
|
||||||
Defaults timestamp_type=tty,timestamp_timeout=-1
|
|
||||||
'';
|
|
||||||
|
|
||||||
security.sudo.extraRules = [
|
security.sudo.extraRules = [
|
||||||
{
|
{
|
||||||
users = [config.var.username];
|
users = [config.var.username];
|
||||||
@@ -24,7 +19,7 @@ in {
|
|||||||
];
|
];
|
||||||
nixpkgs.config = {
|
nixpkgs.config = {
|
||||||
allowUnfree = true;
|
allowUnfree = true;
|
||||||
allowBroken = false;
|
allowBroken = true;
|
||||||
};
|
};
|
||||||
nix = {
|
nix = {
|
||||||
nixPath = ["nixpkgs=${inputs.nixpkgs}"];
|
nixPath = ["nixpkgs=${inputs.nixpkgs}"];
|
||||||
|
|||||||
+6
-1
@@ -15,6 +15,7 @@ in {
|
|||||||
boot.kernelParams = [
|
boot.kernelParams = [
|
||||||
"nvidia-drm.modeset=1" # Enable mode setting for Wayland
|
"nvidia-drm.modeset=1" # Enable mode setting for Wayland
|
||||||
"nvidia.NVreg_PreserveVideoMemoryAllocations=1" # Improves resume after sleep
|
"nvidia.NVreg_PreserveVideoMemoryAllocations=1" # Improves resume after sleep
|
||||||
|
"nvidia.NVreg_RegistryDwords=PowerMizerEnable=0x1;PerfLevelSrc=0x2222;PowerMizerLevel=0x3;PowerMizerDefault=0x3;PowerMizerDefaultAC=0x3" # Performance/power optimizations
|
||||||
];
|
];
|
||||||
|
|
||||||
# Blacklist nouveau to avoid conflicts
|
# Blacklist nouveau to avoid conflicts
|
||||||
@@ -23,11 +24,14 @@ in {
|
|||||||
# Environment variables for better compatibility
|
# Environment variables for better compatibility
|
||||||
environment.variables = {
|
environment.variables = {
|
||||||
LIBVA_DRIVER_NAME = "nvidia"; # Hardware video acceleration
|
LIBVA_DRIVER_NAME = "nvidia"; # Hardware video acceleration
|
||||||
|
XDG_SESSION_TYPE = "wayland"; # Force Wayland
|
||||||
GBM_BACKEND = "nvidia-drm"; # Graphics backend for Wayland
|
GBM_BACKEND = "nvidia-drm"; # Graphics backend for Wayland
|
||||||
__GLX_VENDOR_LIBRARY_NAME = "nvidia"; # Use Nvidia driver for GLX
|
__GLX_VENDOR_LIBRARY_NAME = "nvidia"; # Use Nvidia driver for GLX
|
||||||
|
WLR_NO_HARDWARE_CURSORS = "1"; # Fix for cursors on Wayland
|
||||||
NIXOS_OZONE_WL = "1"; # Wayland support for Electron apps
|
NIXOS_OZONE_WL = "1"; # Wayland support for Electron apps
|
||||||
__GL_GSYNC_ALLOWED = "1"; # Enable G-Sync if available
|
__GL_GSYNC_ALLOWED = "1"; # Enable G-Sync if available
|
||||||
__GL_VRR_ALLOWED = "1"; # Enable VRR (Variable Refresh Rate)
|
__GL_VRR_ALLOWED = "1"; # Enable VRR (Variable Refresh Rate)
|
||||||
|
WLR_DRM_NO_ATOMIC = "1"; # Fix for some issues with Hyprland
|
||||||
NVD_BACKEND = "direct"; # Configuration for new driver
|
NVD_BACKEND = "direct"; # Configuration for new driver
|
||||||
MOZ_ENABLE_WAYLAND = "1"; # Wayland support for Firefox
|
MOZ_ENABLE_WAYLAND = "1"; # Wayland support for Firefox
|
||||||
};
|
};
|
||||||
@@ -69,6 +73,7 @@ in {
|
|||||||
# Enhanced graphics support
|
# Enhanced graphics support
|
||||||
graphics = {
|
graphics = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
package = nvidiaDriverChannel;
|
||||||
enable32Bit = true;
|
enable32Bit = true;
|
||||||
extraPackages = with pkgs; [
|
extraPackages = with pkgs; [
|
||||||
nvidia-vaapi-driver
|
nvidia-vaapi-driver
|
||||||
@@ -99,5 +104,5 @@ in {
|
|||||||
];
|
];
|
||||||
|
|
||||||
# Enable Nvidia container toolkit for GPU acceleration in containers (docker)
|
# Enable Nvidia container toolkit for GPU acceleration in containers (docker)
|
||||||
hardware.nvidia-container-toolkit.enable = false;
|
hardware.nvidia-container-toolkit.enable = true;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -57,6 +57,9 @@ in {
|
|||||||
XDG_DATA_HOME = "$HOME/.local/share";
|
XDG_DATA_HOME = "$HOME/.local/share";
|
||||||
PASSWORD_STORE_DIR = "$HOME/.local/share/password-store";
|
PASSWORD_STORE_DIR = "$HOME/.local/share/password-store";
|
||||||
EDITOR = "nvim";
|
EDITOR = "nvim";
|
||||||
|
TERMINAL = "ghostty";
|
||||||
|
TERM = "ghostty";
|
||||||
|
BROWSER = "zen-beta";
|
||||||
};
|
};
|
||||||
|
|
||||||
services.libinput.enable = true;
|
services.libinput.enable = true;
|
||||||
|
|||||||
@@ -9,14 +9,7 @@
|
|||||||
networking.firewall = {
|
networking.firewall = {
|
||||||
allowedTCPPorts = [53];
|
allowedTCPPorts = [53];
|
||||||
allowedUDPPorts = [53];
|
allowedUDPPorts = [53];
|
||||||
# Allow containers to reach adguard UI (for glance dns-stats widget)
|
|
||||||
extraCommands = ''
|
|
||||||
iptables -I INPUT 1 -s 10.233.0.0/16 -p tcp --dport 3000 -j ACCEPT
|
|
||||||
'';
|
|
||||||
extraStopCommands = ''
|
|
||||||
iptables -D INPUT -s 10.233.0.0/16 -p tcp --dport 3000 -j ACCEPT 2>/dev/null || true
|
|
||||||
'';
|
|
||||||
};
|
};
|
||||||
|
|
||||||
services.cloudflared.tunnels."${config.var.tunnelId}".ingress."adguard.${config.var.domain}" = "http://localhost:${toString config.services.adguardhome.port}";
|
services.cloudflared.tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3".ingress."adguard.hadi.icu" = "http://localhost:${toString config.services.adguardhome.port}";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -51,13 +51,13 @@ in {
|
|||||||
|
|
||||||
users.users.jellyfin.extraGroups = ["video" "render"];
|
users.users.jellyfin.extraGroups = ["video" "render"];
|
||||||
|
|
||||||
services.cloudflared.tunnels."${config.var.tunnelId}".ingress = {
|
services.cloudflared.tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3".ingress = {
|
||||||
"media.${config.var.domain}" = "http://localhost:8096";
|
"media.hadi.icu" = "http://localhost:8096";
|
||||||
"demandemedia.${config.var.domain}" = "http://localhost:5055";
|
"demandemedia.hadi.icu" = "http://localhost:5055";
|
||||||
"bazarr.${config.var.domain}" = "http://localhost:6767";
|
"bazarr.hadi.icu" = "http://localhost:6767";
|
||||||
"prowlarr.${config.var.domain}" = "http://localhost:9696";
|
"prowlarr.hadi.icu" = "http://localhost:9696";
|
||||||
"radarr.${config.var.domain}" = "http://localhost:7878";
|
"radarr.hadi.icu" = "http://localhost:7878";
|
||||||
"sonarr.${config.var.domain}" = "http://localhost:8989";
|
"sonarr.hadi.icu" = "http://localhost:8989";
|
||||||
"transmission.${config.var.domain}" = "http://localhost:9091";
|
"transmission.hadi.icu" = "http://localhost:9091";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,33 +1,25 @@
|
|||||||
{ config, inputs, lib, ... }:
|
|
||||||
let
|
|
||||||
inherit (import ./mk-container.nix { inherit lib config; }) mkContainer;
|
|
||||||
in
|
|
||||||
{
|
{
|
||||||
imports = [
|
inputs,
|
||||||
(mkContainer {
|
pkgs,
|
||||||
name = "wallpapers";
|
...
|
||||||
hostIp = "10.233.4.1";
|
}: {
|
||||||
containerIp = "10.233.4.2";
|
services = {
|
||||||
nixosConfig = { pkgs, ... }: {
|
nginx.virtualHosts."wall.local" = {
|
||||||
services.nginx = {
|
root = "${inputs.awesome-wallpapers.packages.${pkgs.system}.default}/share/awesome-wallpapers";
|
||||||
enable = true;
|
listen = [
|
||||||
virtualHosts."wallpapers" = {
|
{
|
||||||
root = "${inputs.awesome-wallpapers.packages.${pkgs.system}.default}/share/awesome-wallpapers";
|
addr = "127.0.0.1";
|
||||||
listen = [{ addr = "0.0.0.0"; port = 8080; }];
|
port = 8759;
|
||||||
locations."/" = {
|
}
|
||||||
tryFiles = "$uri $uri/ /index.html";
|
];
|
||||||
};
|
locations."/" = {
|
||||||
extraConfig = ''
|
tryFiles = "$uri $uri/ /index.html";
|
||||||
port_in_redirect off;
|
|
||||||
absolute_redirect off;
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
|
||||||
networking.firewall.allowedTCPPorts = [ 8080 ];
|
|
||||||
system.stateVersion = "24.05";
|
|
||||||
};
|
};
|
||||||
})
|
extraConfig = ''
|
||||||
];
|
port_in_redirect off;
|
||||||
|
absolute_redirect off;
|
||||||
services.cloudflared.tunnels."${config.var.tunnelId}".ingress."wallpapers.${config.var.domain}" = "http://10.233.4.2:8080";
|
'';
|
||||||
|
};
|
||||||
|
cloudflared.tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3".ingress."wallpapers.hadi.icu" = "http://127.0.0.1:8759";
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
+36
-49
@@ -1,57 +1,44 @@
|
|||||||
{
|
{
|
||||||
config,
|
|
||||||
inputs,
|
inputs,
|
||||||
lib,
|
pkgs,
|
||||||
...
|
...
|
||||||
}: let
|
}: {
|
||||||
inherit (import ./mk-container.nix {inherit lib config;}) mkContainer;
|
services = {
|
||||||
domain = config.var.domain;
|
nginx.virtualHosts = {
|
||||||
in {
|
"blog.local" = {
|
||||||
imports = [
|
root = "${inputs.blog.packages.${pkgs.system}.default}/share/blog";
|
||||||
(mkContainer {
|
listen = [
|
||||||
name = "blog";
|
{
|
||||||
hostIp = "10.233.3.1";
|
addr = "127.0.0.1";
|
||||||
containerIp = "10.233.3.2";
|
port = 8758;
|
||||||
nixosConfig = {pkgs, ...}: {
|
}
|
||||||
services.nginx = {
|
];
|
||||||
enable = true;
|
locations."/" = {
|
||||||
virtualHosts = {
|
tryFiles = "$uri $uri/ /index.html";
|
||||||
"blog" = {
|
|
||||||
root = "${inputs.blog.packages.${pkgs.system}.default}/share/blog";
|
|
||||||
listen = [
|
|
||||||
{
|
|
||||||
addr = "0.0.0.0";
|
|
||||||
port = 8080;
|
|
||||||
}
|
|
||||||
];
|
|
||||||
locations."/" = {
|
|
||||||
tryFiles = "$uri $uri/ /index.html";
|
|
||||||
};
|
|
||||||
extraConfig = ''
|
|
||||||
port_in_redirect off;
|
|
||||||
absolute_redirect off;
|
|
||||||
add_header Content-Security-Policy "default-src 'self'; script-src 'self' 'unsafe-inline' data: https://umami.${domain}; style-src 'self' 'unsafe-inline'; img-src 'self' data: https://git.${domain}; connect-src 'self' https://umami.${domain};" always;
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
"www-redirect" = {
|
|
||||||
listen = [
|
|
||||||
{
|
|
||||||
addr = "0.0.0.0";
|
|
||||||
port = 8081;
|
|
||||||
}
|
|
||||||
];
|
|
||||||
extraConfig = "return 301 https://${domain}$request_uri;";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
networking.firewall.allowedTCPPorts = [8080 8081];
|
extraConfig = ''
|
||||||
system.stateVersion = "24.05";
|
port_in_redirect off;
|
||||||
|
absolute_redirect off;
|
||||||
|
add_header Content-Security-Policy "default-src 'self'; script-src 'self' 'unsafe-inline' data: https://umami.hadi.icu; style-src 'self' 'unsafe-inline'; img-src 'self' data: https://git.hadi.icu; connect-src 'self' https://umami.hadi.icu;" always;
|
||||||
|
'';
|
||||||
};
|
};
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
services.cloudflared.tunnels."${config.var.tunnelId}".ingress = {
|
"www.blog.local" = {
|
||||||
"${config.var.domain}" = "http://10.233.3.2:8080";
|
listen = [
|
||||||
"www.${config.var.domain}" = "http://10.233.3.2:8081";
|
{
|
||||||
|
addr = "127.0.0.1";
|
||||||
|
port = 8189;
|
||||||
|
}
|
||||||
|
];
|
||||||
|
extraConfig = ''
|
||||||
|
return 301 https://hadi.icu$request_uri;
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
cloudflared.tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3".ingress = {
|
||||||
|
"hadi.icu" = "http://127.0.0.1:8758";
|
||||||
|
"www.hadi.icu" = "http://127.0.0.1:8189";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
# This will create a credentials file & give you the tunnel ID to use below.
|
# This will create a credentials file & give you the tunnel ID to use below.
|
||||||
services.cloudflared = {
|
services.cloudflared = {
|
||||||
enable = true;
|
enable = true;
|
||||||
tunnels."${config.var.tunnelId}" = {
|
tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3" = {
|
||||||
credentialsFile = config.sops.secrets."cloudflared-token".path;
|
credentialsFile = config.sops.secrets."cloudflared-token".path;
|
||||||
default = "http_status:404";
|
default = "http_status:404";
|
||||||
};
|
};
|
||||||
@@ -24,7 +24,7 @@
|
|||||||
cloudflared
|
cloudflared
|
||||||
];
|
];
|
||||||
|
|
||||||
systemd.services."cloudflared-tunnel-${config.var.tunnelId}" = {
|
systemd.services."cloudflared-tunnel-a1dfa315-7fc3-4a65-8c02-8387932c35c3" = {
|
||||||
wantedBy = ["multi-user.target"];
|
wantedBy = ["multi-user.target"];
|
||||||
after = ["network-online.target"];
|
after = ["network-online.target"];
|
||||||
wants = ["network-online.target"];
|
wants = ["network-online.target"];
|
||||||
|
|||||||
@@ -1,26 +1,15 @@
|
|||||||
{ config, lib, ... }:
|
# Cyberchef is a web app for analyzing and decoding data.
|
||||||
let
|
{pkgs, ...}: {
|
||||||
inherit (import ./mk-container.nix { inherit lib config; }) mkContainer;
|
services = {
|
||||||
in
|
nginx.virtualHosts."cyberchef.local" = {
|
||||||
{
|
root = "${pkgs.cyberchef}/share/cyberchef";
|
||||||
imports = [
|
listen = [
|
||||||
(mkContainer {
|
{
|
||||||
name = "cyberchef";
|
addr = "127.0.0.1";
|
||||||
hostIp = "10.233.5.1";
|
port = 8754;
|
||||||
containerIp = "10.233.5.2";
|
}
|
||||||
nixosConfig = { pkgs, ... }: {
|
];
|
||||||
services.nginx = {
|
};
|
||||||
enable = true;
|
cloudflared.tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3".ingress."cyberchef.hadi.icu" = "http://localhost:8754";
|
||||||
virtualHosts."cyberchef" = {
|
};
|
||||||
root = "${pkgs.cyberchef}/share/cyberchef";
|
|
||||||
listen = [{ addr = "0.0.0.0"; port = 8080; }];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
networking.firewall.allowedTCPPorts = [ 8080 ];
|
|
||||||
system.stateVersion = "24.05";
|
|
||||||
};
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
services.cloudflared.tunnels."${config.var.tunnelId}".ingress."cyberchef.${config.var.domain}" = "http://10.233.5.2:8080";
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,33 +1,8 @@
|
|||||||
{ config, inputs, lib, ... }:
|
{config, ...}: {
|
||||||
let
|
services.default-creds = {
|
||||||
inherit (import ./mk-container.nix { inherit lib config; }) mkContainer;
|
enable = true;
|
||||||
domain = config.var.domain;
|
port = 8087;
|
||||||
in
|
};
|
||||||
{
|
|
||||||
imports = [
|
|
||||||
(mkContainer {
|
|
||||||
name = "def-creds";
|
|
||||||
hostIp = "10.233.6.1";
|
|
||||||
containerIp = "10.233.6.2";
|
|
||||||
nixosConfig = { ... }: {
|
|
||||||
imports = [ inputs.default-creds.nixosModules.default ];
|
|
||||||
services.default-creds = {
|
|
||||||
enable = true;
|
|
||||||
port = 8087;
|
|
||||||
};
|
|
||||||
networking.firewall.allowedTCPPorts = [ 8087 ];
|
|
||||||
systemd.services.default-creds.environment = {
|
|
||||||
HOST = lib.mkForce "0.0.0.0";
|
|
||||||
PUBLIC_UMAMI_URL = "https://umami.${domain}";
|
|
||||||
PUBLIC_UMAMI_WEBSITE_ID = "7197484c-01ad-488e-9caa-5ab7b7595f08";
|
|
||||||
UMAMI_URL = "https://umami.${domain}";
|
|
||||||
UMAMI_WEBSITE_ID = "7197484c-01ad-488e-9caa-5ab7b7595f08";
|
|
||||||
};
|
|
||||||
system.stateVersion = "24.05";
|
|
||||||
};
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
services.default-creds.enable = lib.mkForce false;
|
services.cloudflared.tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3".ingress."default-creds.hadi.icu" = "http://localhost:${toString config.services.default-creds.port}";
|
||||||
services.cloudflared.tunnels."${config.var.tunnelId}".ingress."default-creds.${config.var.domain}" = "http://10.233.6.2:8087";
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,26 @@
|
|||||||
|
# Eleakxir is a search engine for leaked data.
|
||||||
|
{
|
||||||
|
config,
|
||||||
|
inputs,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
|
users.groups.eleakxir = {};
|
||||||
|
users.users.hadi.extraGroups = ["eleakxir"];
|
||||||
|
|
||||||
|
services.eleakxir = {
|
||||||
|
enable = true;
|
||||||
|
port = 9198;
|
||||||
|
user = "eleakxir";
|
||||||
|
group = "eleakxir";
|
||||||
|
limit = 1000;
|
||||||
|
folders = ["/var/lib/eleakxir/leaks/" "/mnt/data/big-leaks/"];
|
||||||
|
debug = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
environment.systemPackages = [
|
||||||
|
inputs.eleakxir.packages.${pkgs.stdenv.hostPlatform.system}.leak-utils
|
||||||
|
];
|
||||||
|
|
||||||
|
services.cloudflared.tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3".ingress."eleakxir-back.hadi.icu" = "http://localhost:${toString config.services.eleakxir.port}";
|
||||||
|
}
|
||||||
+57
-68
@@ -1,79 +1,68 @@
|
|||||||
{ config, pkgs, lib, ... }:
|
{
|
||||||
let
|
config,
|
||||||
inherit (import ./mk-container.nix { inherit lib config; }) mkContainer;
|
pkgs,
|
||||||
domain = config.var.domain;
|
lib,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
catppuccin-gitea = pkgs.fetchzip {
|
catppuccin-gitea = pkgs.fetchzip {
|
||||||
url = "https://github.com/catppuccin/gitea/releases/download/v1.0.2/catppuccin-gitea.tar.gz";
|
url = "https://github.com/catppuccin/gitea/releases/download/v1.0.2/catppuccin-gitea.tar.gz";
|
||||||
sha256 = "sha256-rZHLORwLUfIFcB6K9yhrzr+UwdPNQVSadsw6rg8Q7gs=";
|
sha256 = "sha256-rZHLORwLUfIFcB6K9yhrzr+UwdPNQVSadsw6rg8Q7gs=";
|
||||||
stripRoot = false;
|
stripRoot = false;
|
||||||
};
|
};
|
||||||
in
|
in {
|
||||||
{
|
services = {
|
||||||
imports = [
|
postgresql = {
|
||||||
(mkContainer {
|
enable = true;
|
||||||
name = "gitea";
|
ensureDatabases = [config.services.gitea.user]; # "gitea" par défaut
|
||||||
hostIp = "10.233.11.1";
|
ensureUsers = [
|
||||||
containerIp = "10.233.11.2";
|
{
|
||||||
internet = true;
|
name = config.services.gitea.database.user;
|
||||||
bindMounts."/var/lib/gitea" = {
|
ensureDBOwnership = true;
|
||||||
hostPath = "/var/lib/gitea";
|
}
|
||||||
isReadOnly = false;
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
gitea = {
|
||||||
|
enable = true;
|
||||||
|
database = {
|
||||||
|
type = "postgres";
|
||||||
};
|
};
|
||||||
nixosConfig = { lib, ... }: {
|
settings = {
|
||||||
users.users.gitea.uid = lib.mkForce 978;
|
server = {
|
||||||
users.groups.gitea.gid = lib.mkForce 968;
|
HTTP_ADDR = "127.0.0.1";
|
||||||
|
HTTP_PORT = 3002;
|
||||||
services.postgresql = {
|
ROOT_URL = "https://git.hadi.icu/";
|
||||||
enable = true;
|
DOMAIN = "git.hadi.icu";
|
||||||
ensureDatabases = [ "gitea" ];
|
LANDING_PAGE = "/anotherhadi";
|
||||||
ensureUsers = [{
|
|
||||||
name = "gitea";
|
|
||||||
ensureDBOwnership = true;
|
|
||||||
}];
|
|
||||||
};
|
};
|
||||||
|
service = {
|
||||||
services.gitea = {
|
REGISTER_MANUAL_CONFIRM = true;
|
||||||
enable = true;
|
DISABLE_REGISTRATION = true;
|
||||||
database.type = "postgres";
|
DEFAULT_KEEP_EMAIL_PRIVATE = true;
|
||||||
settings = {
|
SHOW_REGISTRATION_BUTTON = false;
|
||||||
server = {
|
|
||||||
HTTP_ADDR = "0.0.0.0";
|
|
||||||
HTTP_PORT = 3002;
|
|
||||||
ROOT_URL = "https://git.${domain}/";
|
|
||||||
DOMAIN = "git.${domain}";
|
|
||||||
LANDING_PAGE = "/anotherhadi";
|
|
||||||
};
|
|
||||||
service = {
|
|
||||||
REGISTER_MANUAL_CONFIRM = true;
|
|
||||||
DISABLE_REGISTRATION = true;
|
|
||||||
DEFAULT_KEEP_EMAIL_PRIVATE = true;
|
|
||||||
SHOW_REGISTRATION_BUTTON = false;
|
|
||||||
};
|
|
||||||
ui = {
|
|
||||||
DEFAULT_THEME = "catppuccin-mocha-mauve";
|
|
||||||
THEMES = "catppuccin-latte-mauve,catppuccin-frappe-mauve,catppuccin-macchiato-mauve,catppuccin-mocha-mauve";
|
|
||||||
};
|
|
||||||
explore = {
|
|
||||||
DISABLE_USERS_PAGE = true;
|
|
||||||
DISABLE_ORGANIZATIONS_PAGE = true;
|
|
||||||
};
|
|
||||||
repository.DISABLE_STARS = true;
|
|
||||||
mailer.ENABLED = false;
|
|
||||||
api.ENABLE_SWAGGER = false;
|
|
||||||
other.SHOW_FOOTER_VERSION = false;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
ui = {
|
||||||
systemd.services.gitea.preStart = lib.mkAfter ''
|
DEFAULT_THEME = "catppuccin-mocha-mauve";
|
||||||
mkdir -p /var/lib/gitea/custom/public/assets
|
THEMES = "catppuccin-latte-mauve,catppuccin-frappe-mauve,catppuccin-macchiato-mauve,catppuccin-mocha-mauve";
|
||||||
ln -sfn ${catppuccin-gitea} /var/lib/gitea/custom/public/assets/css
|
};
|
||||||
'';
|
explore = {
|
||||||
|
DISABLE_USERS_PAGE = true;
|
||||||
networking.firewall.allowedTCPPorts = [ 3002 ];
|
DISABLE_ORGANIZATIONS_PAGE = true;
|
||||||
system.stateVersion = "24.05";
|
};
|
||||||
|
repository = {
|
||||||
|
DISABLE_STARS = true;
|
||||||
|
};
|
||||||
|
mailer = {ENABLED = false;};
|
||||||
|
api = {ENABLE_SWAGGER = false;};
|
||||||
|
other = {SHOW_FOOTER_VERSION = false;};
|
||||||
};
|
};
|
||||||
})
|
};
|
||||||
];
|
|
||||||
|
|
||||||
services.cloudflared.tunnels."${config.var.tunnelId}".ingress."git.${domain}" = "http://10.233.11.2:3002";
|
cloudflared.tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3".ingress."git.hadi.icu" = "http://localhost:3002";
|
||||||
|
};
|
||||||
|
|
||||||
|
systemd.services.gitea.preStart = lib.mkAfter ''
|
||||||
|
mkdir -p ${config.services.gitea.stateDir}/custom/public/assets
|
||||||
|
ln -sfn ${catppuccin-gitea} ${config.services.gitea.stateDir}/custom/public/assets/css
|
||||||
|
'';
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,100 +1,56 @@
|
|||||||
{ config, lib, ... }:
|
# Glance is a self-hosted homepage/dashboard service.
|
||||||
let
|
|
||||||
inherit (import ../mk-container.nix { inherit lib config; }) mkContainer;
|
|
||||||
domain = config.var.domain;
|
|
||||||
hostIp = "10.233.12.1";
|
|
||||||
|
|
||||||
# Convert 6-char hex color to "H S L" string for glance (integers, no % sign)
|
|
||||||
hexToGlanceHsl = hex:
|
|
||||||
let
|
|
||||||
h = lib.toLower hex;
|
|
||||||
d = c:
|
|
||||||
if c == "a" then 10 else if c == "b" then 11 else if c == "c" then 12
|
|
||||||
else if c == "d" then 13 else if c == "e" then 14 else if c == "f" then 15
|
|
||||||
else lib.toInt c;
|
|
||||||
byte = pos: d (builtins.substring pos 1 h) * 16 + d (builtins.substring (pos + 1) 1 h);
|
|
||||||
ri = byte 0; gi = byte 2; bi = byte 4;
|
|
||||||
r = ri * 1.0 / 255.0;
|
|
||||||
g = gi * 1.0 / 255.0;
|
|
||||||
b = bi * 1.0 / 255.0;
|
|
||||||
mx = if r >= g && r >= b then "r" else if g >= b then "g" else "b";
|
|
||||||
mn = if r <= g && r <= b then "r" else if g <= b then "g" else "b";
|
|
||||||
cmax = if mx == "r" then r else if mx == "g" then g else b;
|
|
||||||
cmin = if mn == "r" then r else if mn == "g" then g else b;
|
|
||||||
delta = cmax - cmin;
|
|
||||||
l = (cmax + cmin) / 2.0;
|
|
||||||
s = if delta < 0.0001 then 0.0
|
|
||||||
else if l <= 0.5 then delta / (cmax + cmin)
|
|
||||||
else delta / (2.0 - cmax - cmin);
|
|
||||||
hue =
|
|
||||||
if delta < 0.0001 then 0.0
|
|
||||||
else if mx == "r" then let raw = 60.0 * (g - b) / delta; in if raw < 0.0 then raw + 360.0 else raw
|
|
||||||
else if mx == "g" then 60.0 * ((b - r) / delta + 2.0)
|
|
||||||
else 60.0 * ((r - g) / delta + 4.0);
|
|
||||||
in "${toString (builtins.floor (hue + 0.5))} ${toString (builtins.floor (s * 100.0 + 0.5))} ${toString (builtins.floor (l * 100.0 + 0.5))}";
|
|
||||||
|
|
||||||
c = config.stylix.base16Scheme;
|
|
||||||
in
|
|
||||||
{
|
{
|
||||||
# 0444 so the glance user inside the container can read the bind-mounted file
|
config,
|
||||||
sops.secrets.adguard-pwd.mode = "0444";
|
lib,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
|
imports = [./home.nix ./server.nix];
|
||||||
|
|
||||||
imports = [
|
services = {
|
||||||
(mkContainer {
|
glance = {
|
||||||
name = "glance";
|
enable = true;
|
||||||
hostIp = hostIp;
|
settings = {
|
||||||
containerIp = "10.233.12.2";
|
# theme.contrast-multiplier = lib.mkForce 1.4;
|
||||||
internet = true;
|
server.port = 5678;
|
||||||
bindMounts."/run/secrets/adguard-pwd" = {
|
|
||||||
hostPath = config.sops.secrets.adguard-pwd.path;
|
|
||||||
isReadOnly = true;
|
|
||||||
};
|
};
|
||||||
nixosConfig = { lib, ... }: {
|
};
|
||||||
_module.args.domain = domain;
|
cloudflared.tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3".ingress."home.hadi.icu" = "http://localhost:8755";
|
||||||
_module.args.adguardUrl = "http://${hostIp}:3000";
|
|
||||||
imports = [ ./home.nix ./server.nix ];
|
|
||||||
|
|
||||||
services.glance = {
|
nginx.virtualHosts."glance.local" = {
|
||||||
enable = true;
|
listen = [
|
||||||
settings = {
|
{
|
||||||
server = {
|
addr = "127.0.0.1";
|
||||||
port = 5678;
|
port = 8755;
|
||||||
host = "127.0.0.1";
|
}
|
||||||
};
|
];
|
||||||
theme = {
|
locations."/" = {
|
||||||
light = false;
|
proxyPass = "http://127.0.0.1:${toString config.services.glance.settings.server.port}";
|
||||||
background-color = hexToGlanceHsl c.base00; # background
|
extraConfig = ''
|
||||||
primary-color = hexToGlanceHsl c.base0D; # accent (iris/purple)
|
proxy_cache_valid 200 30m;
|
||||||
positive-color = hexToGlanceHsl c.base0B; # positive (pine/teal)
|
proxy_cache_use_stale error timeout updating http_500 http_502 http_503 http_504;
|
||||||
negative-color = hexToGlanceHsl c.base08; # negative (love/rose)
|
add_header X-Cache-Status $upstream_cache_status;
|
||||||
};
|
'';
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
services.nginx = {
|
|
||||||
enable = true;
|
|
||||||
appendHttpConfig = ''
|
|
||||||
proxy_cache_path /var/cache/nginx/glance levels=1:2 keys_zone=glance:1m inactive=30m max_size=100m;
|
|
||||||
'';
|
|
||||||
virtualHosts."glance" = {
|
|
||||||
listen = [{ addr = "0.0.0.0"; port = 8080; }];
|
|
||||||
locations."/" = {
|
|
||||||
proxyPass = "http://127.0.0.1:5678";
|
|
||||||
extraConfig = ''
|
|
||||||
proxy_cache glance;
|
|
||||||
proxy_cache_valid 200 30m;
|
|
||||||
proxy_cache_use_stale error timeout updating http_500 http_502 http_503 http_504;
|
|
||||||
add_header X-Cache-Status $upstream_cache_status;
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
networking.firewall.allowedTCPPorts = [ 8080 ];
|
|
||||||
system.stateVersion = "24.05";
|
|
||||||
};
|
};
|
||||||
})
|
};
|
||||||
];
|
};
|
||||||
|
|
||||||
services.cloudflared.tunnels."${config.var.tunnelId}".ingress."home.${domain}" = "http://10.233.12.2:8080";
|
systemd.services.glance.serviceConfig = {
|
||||||
|
DynamicUser = lib.mkForce false;
|
||||||
|
User = "glance";
|
||||||
|
Group = "glance";
|
||||||
|
};
|
||||||
|
|
||||||
|
users = {
|
||||||
|
groups.glance = {};
|
||||||
|
users.glance = {
|
||||||
|
isSystemUser = true;
|
||||||
|
description = "Glance user";
|
||||||
|
group = "glance";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
sops.secrets.adguard-pwd = {
|
||||||
|
owner = "glance";
|
||||||
|
mode = "0600";
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
{ domain, ... }: {
|
{config, ...}: {
|
||||||
services.glance.settings.pages = [
|
services.glance.settings.pages = [
|
||||||
{
|
{
|
||||||
name = "Home";
|
name = "Home";
|
||||||
@@ -97,11 +97,11 @@
|
|||||||
}
|
}
|
||||||
{
|
{
|
||||||
title = "Mazanoke (image downgrading)";
|
title = "Mazanoke (image downgrading)";
|
||||||
url = "https://mazanoke.${domain}";
|
url = "https://mazanoke.hadi.icu";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
title = "Stirling PDF";
|
title = "Stirling PDF";
|
||||||
url = "https://pdf.${domain}";
|
url = "https://pdf.hadi.icu";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
title = "Vert (file converter)";
|
title = "Vert (file converter)";
|
||||||
@@ -200,11 +200,11 @@
|
|||||||
links = [
|
links = [
|
||||||
{
|
{
|
||||||
title = "Nix 4 Cyber";
|
title = "Nix 4 Cyber";
|
||||||
url = "https://n4c.${domain}";
|
url = "https://n4c.hadi.icu";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
title = "Cyberchef";
|
title = "Cyberchef";
|
||||||
url = "https://cyberchef.${domain}";
|
url = "https://cyberchef.hadi.icu";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
title = "TryHackMe";
|
title = "TryHackMe";
|
||||||
|
|||||||
@@ -1,8 +1,4 @@
|
|||||||
{
|
{config, ...}: {
|
||||||
domain,
|
|
||||||
adguardUrl,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
services.glance.settings.pages = [
|
services.glance.settings.pages = [
|
||||||
{
|
{
|
||||||
name = "Server";
|
name = "Server";
|
||||||
@@ -30,62 +26,42 @@
|
|||||||
sites = [
|
sites = [
|
||||||
{
|
{
|
||||||
title = "Adguard";
|
title = "Adguard";
|
||||||
url = "https://adguard.${domain}";
|
url = "https://adguard.hadi.icu";
|
||||||
icon = "si:adguard";
|
icon = "si:adguard";
|
||||||
}
|
}
|
||||||
{
|
|
||||||
title = "Blog";
|
|
||||||
url = "https://${domain}";
|
|
||||||
icon = "si:blogger";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
title = "Gitea";
|
|
||||||
url = "https://git.${domain}";
|
|
||||||
icon = "si:gitea";
|
|
||||||
}
|
|
||||||
{
|
{
|
||||||
title = "Mealie";
|
title = "Mealie";
|
||||||
url = "https://mealie.${domain}";
|
url = "https://mealie.hadi.icu";
|
||||||
icon = "si:mealie";
|
icon = "si:mealie";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
title = "Umami";
|
title = "Linkding";
|
||||||
url = "https://umami.${domain}";
|
url = "https://linkding.hadi.icu";
|
||||||
icon = "si:umami";
|
icon = "sh:linkding";
|
||||||
}
|
|
||||||
{
|
|
||||||
title = "Iknowyou";
|
|
||||||
url = "https://iknowyou.${domain}";
|
|
||||||
icon = "sh:iknowyou";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
title = "Iknowyou Prod";
|
|
||||||
url = "https://iknowyou-prod.${domain}";
|
|
||||||
icon = "sh:iknowyou";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
title = "Wallpapers";
|
|
||||||
url = "https://wallpapers.${domain}";
|
|
||||||
icon = "si:unsplash";
|
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
title = "Mazanoke";
|
title = "Mazanoke";
|
||||||
url = "https://mazanoke.${domain}";
|
url = "https://mazanoke.hadi.icu";
|
||||||
icon = "sh:mazanoke";
|
icon = "sh:mazanoke";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
title = "Stirling PDF";
|
title = "Stirling PDF";
|
||||||
url = "https://pdf.${domain}";
|
url = "https://pdf.hadi.icu";
|
||||||
icon = "sh:stirling-pdf";
|
icon = "sh:stirling-pdf";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
title = "Default-creds";
|
title = "Default-creds";
|
||||||
url = "https://default-creds.${domain}";
|
url = "https://default-creds.hadi.icu";
|
||||||
icon = "si:passbolt";
|
icon = "si:passbolt";
|
||||||
}
|
}
|
||||||
|
{
|
||||||
|
title = "Blog";
|
||||||
|
url = "https://hadi.icu";
|
||||||
|
icon = "si:blogger";
|
||||||
|
}
|
||||||
{
|
{
|
||||||
title = "Cyberchef";
|
title = "Cyberchef";
|
||||||
url = "https://cyberchef.${domain}";
|
url = "https://cyberchef.hadi.icu";
|
||||||
icon = "si:codechef";
|
icon = "si:codechef";
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
@@ -97,37 +73,37 @@
|
|||||||
sites = [
|
sites = [
|
||||||
{
|
{
|
||||||
title = "Jellyfin";
|
title = "Jellyfin";
|
||||||
url = "https://media.${domain}";
|
url = "https://media.hadi.icu";
|
||||||
icon = "si:jellyfin";
|
icon = "si:jellyfin";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
title = "Jellyseerr";
|
title = "Jellyseerr";
|
||||||
url = "https://demandemedia.${domain}";
|
url = "https://demandemedia.hadi.icu";
|
||||||
icon = "si:odysee";
|
icon = "si:odysee";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
title = "Radarr";
|
title = "Radarr";
|
||||||
url = "https://radarr.${domain}";
|
url = "https://radarr.hadi.icu";
|
||||||
icon = "si:radarr";
|
icon = "si:radarr";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
title = "Sonarr";
|
title = "Sonarr";
|
||||||
url = "https://sonarr.${domain}";
|
url = "https://sonarr.hadi.icu";
|
||||||
icon = "si:sonarr";
|
icon = "si:sonarr";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
title = "Bazarr";
|
title = "Bazarr";
|
||||||
url = "https://bazarr.${domain}";
|
url = "https://bazarr.hadi.icu";
|
||||||
icon = "si:subtitleedit";
|
icon = "si:subtitleedit";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
title = "Prowlarr";
|
title = "Prowlarr";
|
||||||
url = "https://prowlarr.${domain}";
|
url = "https://prowlarr.hadi.icu";
|
||||||
icon = "si:podcastindex";
|
icon = "si:podcastindex";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
title = "Transmission";
|
title = "Transmission";
|
||||||
url = "https://transmission.${domain}";
|
url = "https://transmission.hadi.icu";
|
||||||
icon = "si:transmission";
|
icon = "si:transmission";
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
@@ -138,7 +114,7 @@
|
|||||||
{
|
{
|
||||||
type = "dns-stats";
|
type = "dns-stats";
|
||||||
service = "adguard";
|
service = "adguard";
|
||||||
url = adguardUrl;
|
url = "http://localhost:${toString config.services.adguardhome.port}";
|
||||||
username = "hadi";
|
username = "hadi";
|
||||||
password = "\${secret:adguard-pwd}";
|
password = "\${secret:adguard-pwd}";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,64 +0,0 @@
|
|||||||
{
|
|
||||||
config,
|
|
||||||
inputs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
inherit (import ./mk-container.nix {inherit lib config;}) mkContainer;
|
|
||||||
in {
|
|
||||||
imports = [
|
|
||||||
(mkContainer {
|
|
||||||
name = "iky-prod";
|
|
||||||
hostIp = "10.233.1.1";
|
|
||||||
containerIp = "10.233.1.2";
|
|
||||||
internet = true;
|
|
||||||
bindMounts."/etc/iky/config.yaml" = {
|
|
||||||
hostPath = "/var/lib/iknowyou-prod/config.yaml";
|
|
||||||
isReadOnly = false;
|
|
||||||
};
|
|
||||||
nixosConfig = {...}: {
|
|
||||||
imports = [inputs.iknowyou.nixosModules.default];
|
|
||||||
users.users.iknowyou.uid = 999;
|
|
||||||
users.groups.iknowyou.gid = 999;
|
|
||||||
services.iknowyou = {
|
|
||||||
enable = true;
|
|
||||||
port = 8080;
|
|
||||||
openFirewall = true;
|
|
||||||
};
|
|
||||||
system.stateVersion = "24.05";
|
|
||||||
};
|
|
||||||
})
|
|
||||||
|
|
||||||
(mkContainer {
|
|
||||||
name = "iky-demo";
|
|
||||||
hostIp = "10.233.2.1";
|
|
||||||
containerIp = "10.233.2.2";
|
|
||||||
nixosConfig = {...}: {
|
|
||||||
imports = [inputs.iknowyou.nixosModules.default];
|
|
||||||
services.iknowyou = {
|
|
||||||
enable = true;
|
|
||||||
port = 8080;
|
|
||||||
openFirewall = true;
|
|
||||||
};
|
|
||||||
systemd.services.iknowyou.environment.IKY_DEMO = "true";
|
|
||||||
system.stateVersion = "24.05";
|
|
||||||
};
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
users.users.iknowyou = {
|
|
||||||
isSystemUser = true;
|
|
||||||
group = "iknowyou";
|
|
||||||
uid = 999;
|
|
||||||
};
|
|
||||||
users.groups.iknowyou.gid = 999;
|
|
||||||
|
|
||||||
systemd.tmpfiles.rules = [
|
|
||||||
"f /var/lib/iknowyou-prod/config.yaml 0600 iknowyou iknowyou -"
|
|
||||||
];
|
|
||||||
|
|
||||||
services.cloudflared.tunnels."${config.var.tunnelId}".ingress = {
|
|
||||||
"iknowyou-prod.${config.var.domain}" = "http://10.233.1.2:8080";
|
|
||||||
"iknowyou.${config.var.domain}" = "http://10.233.2.2:8080";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,35 +0,0 @@
|
|||||||
# Kernel hardening for the server
|
|
||||||
{
|
|
||||||
boot.kernel.sysctl = {
|
|
||||||
# Restrict access to kernel logs and pointers
|
|
||||||
"kernel.dmesg_restrict" = 1;
|
|
||||||
"kernel.kptr_restrict" = 2;
|
|
||||||
|
|
||||||
# BPF hardening
|
|
||||||
"net.core.bpf_jit_harden" = 2;
|
|
||||||
"kernel.unprivileged_bpf_disabled" = 1;
|
|
||||||
|
|
||||||
# Reverse path filtering (anti-spoofing)
|
|
||||||
"net.ipv4.conf.all.rp_filter" = 1;
|
|
||||||
"net.ipv4.conf.default.rp_filter" = 1;
|
|
||||||
|
|
||||||
# SYN flood protection
|
|
||||||
"net.ipv4.tcp_syncookies" = 1;
|
|
||||||
|
|
||||||
# Disable IP source routing
|
|
||||||
"net.ipv4.conf.all.accept_source_route" = 0;
|
|
||||||
"net.ipv4.conf.default.accept_source_route" = 0;
|
|
||||||
|
|
||||||
# Ignore ICMP redirects (prevent MITM)
|
|
||||||
"net.ipv4.conf.all.accept_redirects" = 0;
|
|
||||||
"net.ipv4.conf.default.accept_redirects" = 0;
|
|
||||||
"net.ipv4.conf.all.secure_redirects" = 0;
|
|
||||||
"net.ipv6.conf.all.accept_redirects" = 0;
|
|
||||||
|
|
||||||
# Don't send ICMP redirects
|
|
||||||
"net.ipv4.conf.all.send_redirects" = 0;
|
|
||||||
|
|
||||||
# Restrict ptrace to parent processes only
|
|
||||||
"kernel.yama.ptrace_scope" = 1;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
+33
-43
@@ -1,45 +1,35 @@
|
|||||||
{ config, lib, ... }:
|
# Mazanoke is a self-hosted image downgrader
|
||||||
let
|
{pkgs, ...}: let
|
||||||
inherit (import ./mk-container.nix { inherit lib config; }) mkContainer;
|
version = "1.1.5";
|
||||||
in
|
mazanoke-pkg = pkgs.stdenv.mkDerivation {
|
||||||
{
|
inherit version;
|
||||||
imports = [
|
pname = "mazanoke";
|
||||||
(mkContainer {
|
src = pkgs.fetchFromGitHub {
|
||||||
name = "mazanoke";
|
owner = "civilblur";
|
||||||
hostIp = "10.233.7.1";
|
repo = "mazanoke";
|
||||||
containerIp = "10.233.7.2";
|
rev = "v${version}";
|
||||||
nixosConfig = { pkgs, ... }:
|
hash = "sha256-B/AF4diMNxN94BzpZP/C+K8kNj9q+4SDKWa/qd4LrVU=";
|
||||||
let
|
};
|
||||||
version = "1.1.5";
|
|
||||||
mazanoke-pkg = pkgs.stdenv.mkDerivation {
|
|
||||||
inherit version;
|
|
||||||
pname = "mazanoke";
|
|
||||||
src = pkgs.fetchFromGitHub {
|
|
||||||
owner = "civilblur";
|
|
||||||
repo = "mazanoke";
|
|
||||||
rev = "v${version}";
|
|
||||||
hash = "sha256-B/AF4diMNxN94BzpZP/C+K8kNj9q+4SDKWa/qd4LrVU=";
|
|
||||||
};
|
|
||||||
installPhase = ''
|
|
||||||
mkdir -p $out/share/mazanoke
|
|
||||||
cp -r ./index.html ./favicon.ico ./manifest.json ./service-worker.js ./assets $out/share/mazanoke/
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
in
|
|
||||||
{
|
|
||||||
services.nginx = {
|
|
||||||
enable = true;
|
|
||||||
virtualHosts."mazanoke" = {
|
|
||||||
root = "${mazanoke-pkg}/share/mazanoke";
|
|
||||||
listen = [{ addr = "0.0.0.0"; port = 8080; }];
|
|
||||||
locations."/" = { index = "index.html"; };
|
|
||||||
};
|
|
||||||
};
|
|
||||||
networking.firewall.allowedTCPPorts = [ 8080 ];
|
|
||||||
system.stateVersion = "24.05";
|
|
||||||
};
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
services.cloudflared.tunnels."${config.var.tunnelId}".ingress."mazanoke.${config.var.domain}" = "http://10.233.7.2:8080";
|
installPhase = ''
|
||||||
|
mkdir -p $out/share/mazanoke
|
||||||
|
cp -r ./index.html ./favicon.ico ./manifest.json ./service-worker.js ./assets $out/share/mazanoke/
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
in {
|
||||||
|
services = {
|
||||||
|
nginx.virtualHosts."mazanoke.local" = {
|
||||||
|
root = "${mazanoke-pkg}/share/mazanoke";
|
||||||
|
locations."/" = {
|
||||||
|
index = "index.html";
|
||||||
|
};
|
||||||
|
listen = [
|
||||||
|
{
|
||||||
|
addr = "127.0.0.1";
|
||||||
|
port = 8755;
|
||||||
|
}
|
||||||
|
];
|
||||||
|
};
|
||||||
|
cloudflared.tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3".ingress."mazanoke.hadi.icu" = "http://localhost:8755";
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,24 +1,9 @@
|
|||||||
{ config, lib, ... }:
|
# Mealie is a recipe management and meal planning application.
|
||||||
let
|
{config, ...}: {
|
||||||
inherit (import ./mk-container.nix { inherit lib config; }) mkContainer;
|
services.mealie = {
|
||||||
in
|
enable = true;
|
||||||
{
|
port = 8092;
|
||||||
imports = [
|
};
|
||||||
(mkContainer {
|
|
||||||
name = "mealie";
|
|
||||||
hostIp = "10.233.8.1";
|
|
||||||
containerIp = "10.233.8.2";
|
|
||||||
internet = true;
|
|
||||||
nixosConfig = { ... }: {
|
|
||||||
services.mealie = {
|
|
||||||
enable = true;
|
|
||||||
port = 8080;
|
|
||||||
};
|
|
||||||
networking.firewall.allowedTCPPorts = [ 8080 ];
|
|
||||||
system.stateVersion = "24.05";
|
|
||||||
};
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
services.cloudflared.tunnels."${config.var.tunnelId}".ingress."mealie.${config.var.domain}" = "http://10.233.8.2:8080";
|
services.cloudflared.tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3".ingress."mealie.hadi.icu" = "http://localhost:${toString config.services.mealie.port}";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,68 +0,0 @@
|
|||||||
{ lib, config }:
|
|
||||||
|
|
||||||
# Returns a NixOS module (attrset), to be used in `imports`.
|
|
||||||
#
|
|
||||||
# Options:
|
|
||||||
# internet - allow outbound internet access via NAT (default: false)
|
|
||||||
# externalInterface - WAN interface for NAT, required when internet = true
|
|
||||||
# bindMounts - host paths to mount into the container (see containers.<name>.bindMounts)
|
|
||||||
# config - NixOS module for the container
|
|
||||||
|
|
||||||
let
|
|
||||||
nginxHardening = { config, ... }: lib.mkIf config.services.nginx.enable {
|
|
||||||
services.nginx.serverTokens = false;
|
|
||||||
};
|
|
||||||
in
|
|
||||||
|
|
||||||
{
|
|
||||||
mkContainer =
|
|
||||||
{
|
|
||||||
name,
|
|
||||||
hostIp,
|
|
||||||
containerIp,
|
|
||||||
internet ? false,
|
|
||||||
externalInterface ? config.var.networkInterface,
|
|
||||||
bindMounts ? {},
|
|
||||||
nixosConfig,
|
|
||||||
}:
|
|
||||||
assert lib.assertMsg
|
|
||||||
(lib.stringLength "ve-${name}" <= 15)
|
|
||||||
"mkContainer: interface name 've-${name}' is ${toString (lib.stringLength "ve-${name}")} chars, max is 15";
|
|
||||||
{
|
|
||||||
containers.${name} = {
|
|
||||||
autoStart = true;
|
|
||||||
privateNetwork = true;
|
|
||||||
hostAddress = hostIp;
|
|
||||||
localAddress = containerIp;
|
|
||||||
inherit bindMounts;
|
|
||||||
config = { ... }: {
|
|
||||||
imports = [ nixosConfig nginxHardening ];
|
|
||||||
networking.nameservers = lib.mkIf internet [ "1.1.1.1" "1.0.0.1" ];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
// (lib.optionalAttrs internet {
|
|
||||||
boot.kernel.sysctl."net.ipv4.ip_forward" = lib.mkDefault true;
|
|
||||||
networking.nat = {
|
|
||||||
enable = true;
|
|
||||||
externalInterface = externalInterface;
|
|
||||||
internalInterfaces = [ "ve-${name}" ];
|
|
||||||
};
|
|
||||||
# CONTAINER-FWD (defined by another module) blocks all forwarding by default.
|
|
||||||
# Insert rules in FORWARD before it: allow return traffic, block LAN, allow internet.
|
|
||||||
networking.firewall.extraCommands = ''
|
|
||||||
iptables -I FORWARD 1 -s ${containerIp} -m conntrack --ctstate NEW -j ACCEPT
|
|
||||||
iptables -I FORWARD 1 -s ${containerIp} -d 192.168.0.0/16 -j DROP
|
|
||||||
iptables -I FORWARD 1 -s ${containerIp} -d 172.16.0.0/12 -j DROP
|
|
||||||
iptables -I FORWARD 1 -s ${containerIp} -d 10.0.0.0/8 -j DROP
|
|
||||||
iptables -I FORWARD 1 -d ${containerIp} -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT
|
|
||||||
'';
|
|
||||||
networking.firewall.extraStopCommands = ''
|
|
||||||
iptables -D FORWARD -s ${containerIp} -m conntrack --ctstate NEW -j ACCEPT 2>/dev/null || true
|
|
||||||
iptables -D FORWARD -s ${containerIp} -d 192.168.0.0/16 -j DROP 2>/dev/null || true
|
|
||||||
iptables -D FORWARD -s ${containerIp} -d 172.16.0.0/12 -j DROP 2>/dev/null || true
|
|
||||||
iptables -D FORWARD -s ${containerIp} -d 10.0.0.0/8 -j DROP 2>/dev/null || true
|
|
||||||
iptables -D FORWARD -d ${containerIp} -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT 2>/dev/null || true
|
|
||||||
'';
|
|
||||||
});
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
{
|
||||||
|
services.nginx = {
|
||||||
|
enable = true;
|
||||||
|
};
|
||||||
|
}
|
||||||
+1
-10
@@ -10,15 +10,6 @@ in {
|
|||||||
PermitRootLogin = "no";
|
PermitRootLogin = "no";
|
||||||
PasswordAuthentication = false;
|
PasswordAuthentication = false;
|
||||||
AllowUsers = [username];
|
AllowUsers = [username];
|
||||||
MaxAuthTries = 3;
|
|
||||||
LoginGraceTime = 20;
|
|
||||||
X11Forwarding = false;
|
|
||||||
AllowAgentForwarding = false;
|
|
||||||
AllowTcpForwarding = false;
|
|
||||||
ClientAliveInterval = 300;
|
|
||||||
ClientAliveCountMax = 2;
|
|
||||||
KexAlgorithms = ["curve25519-sha256" "curve25519-sha256@libssh.org"];
|
|
||||||
Ciphers = ["chacha20-poly1305@openssh.com" "aes256-gcm@openssh.com"];
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -27,5 +18,5 @@ in {
|
|||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPG9SE80ZyBcXZK/f5ypSKudaM5Jo3XtQikCnGo0jI5E hadi@nixy"
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPG9SE80ZyBcXZK/f5ypSKudaM5Jo3XtQikCnGo0jI5E hadi@nixy"
|
||||||
];
|
];
|
||||||
|
|
||||||
services.cloudflared.tunnels."${config.var.tunnelId}".ingress."ssh.${config.var.domain}" = "ssh://localhost:22";
|
services.cloudflared.tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3".ingress."ssh.hadi.icu" = "ssh://localhost:22";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,23 +1,9 @@
|
|||||||
{ config, lib, ... }:
|
# Stirling-pdf is a high-performance PDF editor and viewer service.
|
||||||
let
|
{config, ...}: {
|
||||||
inherit (import ./mk-container.nix { inherit lib config; }) mkContainer;
|
services.stirling-pdf = {
|
||||||
in
|
enable = true;
|
||||||
{
|
environment."SERVER_PORT" = "8083";
|
||||||
imports = [
|
};
|
||||||
(mkContainer {
|
|
||||||
name = "stirling-pdf";
|
|
||||||
hostIp = "10.233.9.1";
|
|
||||||
containerIp = "10.233.9.2";
|
|
||||||
nixosConfig = { ... }: {
|
|
||||||
services.stirling-pdf = {
|
|
||||||
enable = true;
|
|
||||||
environment."SERVER_PORT" = "8080";
|
|
||||||
};
|
|
||||||
networking.firewall.allowedTCPPorts = [ 8080 ];
|
|
||||||
system.stateVersion = "24.05";
|
|
||||||
};
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
services.cloudflared.tunnels."${config.var.tunnelId}".ingress."pdf.${config.var.domain}" = "http://10.233.9.2:8080";
|
services.cloudflared.tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3".ingress."pdf.hadi.icu" = "http://localhost:${toString config.services.stirling-pdf.environment.SERVER_PORT}";
|
||||||
}
|
}
|
||||||
|
|||||||
+23
-36
@@ -1,37 +1,24 @@
|
|||||||
{ config, lib, ... }:
|
{config, ...}: {
|
||||||
let
|
sops.secrets = {
|
||||||
inherit (import ./mk-container.nix { inherit lib config; }) mkContainer;
|
umami-secret = {
|
||||||
in
|
mode = "0600";
|
||||||
{
|
};
|
||||||
sops.secrets.umami-secret.mode = "0400";
|
};
|
||||||
|
services.umami = {
|
||||||
imports = [
|
enable = true;
|
||||||
(mkContainer {
|
settings = {
|
||||||
name = "umami";
|
PORT = 8097;
|
||||||
hostIp = "10.233.10.1";
|
APP_SECRET_FILE = config.sops.secrets.umami-secret.path;
|
||||||
containerIp = "10.233.10.2";
|
DISABLE_TELEMETRY = true;
|
||||||
bindMounts."/run/secrets/umami-secret" = {
|
DISABLE_BOT_CHECK = true;
|
||||||
hostPath = config.sops.secrets.umami-secret.path;
|
};
|
||||||
isReadOnly = true;
|
};
|
||||||
};
|
services.cloudflared.tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3".ingress."umami.hadi.icu" = "http://localhost:${toString config.services.umami.settings.PORT}";
|
||||||
nixosConfig = { ... }: {
|
systemd.services.default-creds.environment = {
|
||||||
services.umami = {
|
PUBLIC_UMAMI_URL = "https://umami.hadi.icu";
|
||||||
enable = true;
|
# FIXME:
|
||||||
settings = {
|
PUBLIC_UMAMI_WEBSITE_ID = "7197484c-01ad-488e-9caa-5ab7b7595f08";
|
||||||
PORT = 8080;
|
UMAMI_URL = "http://localhost:8097";
|
||||||
HOSTNAME = "0.0.0.0";
|
UMAMI_WEBSITE_ID = "7197484c-01ad-488e-9caa-5ab7b7595f08";
|
||||||
APP_SECRET_FILE = "/run/secrets/umami-secret";
|
};
|
||||||
DISABLE_TELEMETRY = true;
|
|
||||||
DISABLE_BOT_CHECK = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
# PrivateUsers breaks systemd-creds inside nspawn containers (nested user namespaces)
|
|
||||||
systemd.services.umami.serviceConfig.PrivateUsers = lib.mkForce false;
|
|
||||||
networking.firewall.allowedTCPPorts = [ 8080 ];
|
|
||||||
system.stateVersion = "24.05";
|
|
||||||
};
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
services.cloudflared.tunnels."${config.var.tunnelId}".ingress."umami.${config.var.domain}" = "http://10.233.10.2:8080";
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,82 +0,0 @@
|
|||||||
{
|
|
||||||
lib,
|
|
||||||
pkgs,
|
|
||||||
config,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
options.theme = lib.mkOption {
|
|
||||||
type = lib.types.attrs;
|
|
||||||
default = {
|
|
||||||
rounding = 25;
|
|
||||||
gaps-in = 10;
|
|
||||||
gaps-out = 10 * 2;
|
|
||||||
active-opacity = 0.99;
|
|
||||||
inactive-opacity = 0.97;
|
|
||||||
blur = true;
|
|
||||||
border-size = 2;
|
|
||||||
animation-speed = "medium"; # "fast" | "medium" | "slow"
|
|
||||||
fetch = "none"; # "nerdfetch" | "neofetch" | "pfetch" | "none"
|
|
||||||
textColorOnWallpaper =
|
|
||||||
config.lib.stylix.colors.base00; # Color of the text displayed on the wallpaper (Lockscreen, display manager, ...)
|
|
||||||
};
|
|
||||||
description = "Theme configuration options";
|
|
||||||
};
|
|
||||||
|
|
||||||
config.stylix = {
|
|
||||||
enable = true;
|
|
||||||
|
|
||||||
# See https://tinted-theming.github.io/tinted-gallery/ for more schemes
|
|
||||||
base16Scheme = {
|
|
||||||
base00 = "110F12"; # Default Background
|
|
||||||
base01 = "1C1920"; # Lighter Background (Used for status bars, line number and folding marks)
|
|
||||||
base02 = "2D2A36"; # Selection Background
|
|
||||||
base03 = "514D63"; # Comments, Invisibles, Line Highlighting
|
|
||||||
base04 = "8E8AA0"; # Dark Foreground (Used for status bars)
|
|
||||||
base05 = "C2BED6"; # Default Foreground, Caret, Delimiters, Operators
|
|
||||||
base06 = "D8D5EA"; # Light Foreground (Not often used)
|
|
||||||
base07 = "EAE7F7"; # Light Background (Not often used)
|
|
||||||
base08 = "E07080"; # Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted
|
|
||||||
base09 = "D49070"; # Integers, Boolean, Constants, XML Attributes, Markup Link Url
|
|
||||||
base0A = "C4B060"; # Classes, Markup Bold, Search Text Background
|
|
||||||
base0B = "80B880"; # Strings, Inherited Class, Markup Code, Diff Inserted
|
|
||||||
base0C = "70B8C0"; # Support, Regular Expressions, Escape Characters, Markup Quotes
|
|
||||||
base0D = "9E97F8"; # Functions, Methods, Attribute IDs, Headings, Accent color
|
|
||||||
base0E = "C090E8"; # Keywords, Storage, Selector, Markup Italic, Diff Changed
|
|
||||||
base0F = "D080A0"; # Deprecated, Opening/Closing Embedded Language Tags, e.g. <?php ?>
|
|
||||||
};
|
|
||||||
|
|
||||||
cursor = {
|
|
||||||
name = "BreezeX-RosePine-Linux";
|
|
||||||
package = pkgs.rose-pine-cursor;
|
|
||||||
size = 20;
|
|
||||||
};
|
|
||||||
|
|
||||||
fonts = {
|
|
||||||
monospace = {
|
|
||||||
package = pkgs.maple-mono.NF;
|
|
||||||
name = "Maple Mono NF";
|
|
||||||
};
|
|
||||||
sansSerif = {
|
|
||||||
package = pkgs.source-sans-pro;
|
|
||||||
name = "Source Sans Pro";
|
|
||||||
};
|
|
||||||
serif = config.stylix.fonts.sansSerif;
|
|
||||||
emoji = {
|
|
||||||
package = pkgs.noto-fonts-color-emoji;
|
|
||||||
name = "Noto Color Emoji";
|
|
||||||
};
|
|
||||||
sizes = {
|
|
||||||
applications = 13;
|
|
||||||
desktop = 13;
|
|
||||||
popups = 13;
|
|
||||||
terminal = 13;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
polarity = "dark";
|
|
||||||
image = pkgs.fetchurl {
|
|
||||||
url = "https://raw.githubusercontent.com/anotherhadi/awesome-wallpapers/refs/heads/main/app/static/wallpapers/white-snow-and-a-tree_light.png";
|
|
||||||
sha256 = "sha256-HKqDY/iCcV++WwNuNIWZEyXuxYuGWG+krn2vPTe58HQ=";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user