Compare commits
912
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6fbdcf44cf | ||
|
|
58e0705aca | ||
|
|
39ffdfa219 | ||
|
|
0388875455 | ||
|
|
8a253f82c9 | ||
|
|
cd48b65656 | ||
|
|
41968e63d2 | ||
|
|
8ca671c89b | ||
|
|
6094b9dc93 | ||
|
|
52c2aac9df | ||
|
|
42b8cf4e4f | ||
|
|
206f353b77 | ||
|
|
adf0e990ce | ||
|
|
17b14b33e5 | ||
|
|
c4056e45cb | ||
|
|
4d1a269e00 | ||
|
|
34607e944b | ||
|
|
e063c3cfea | ||
|
|
a7c1b1cc0c | ||
|
|
8bd66c9975 | ||
|
|
3dfc1643e6 | ||
|
|
2f281b354a | ||
|
|
eb213e56e5 | ||
|
|
35b66f5435 | ||
|
|
aa81ecdb3d | ||
|
|
d514939e37 | ||
|
|
4f396d93c4 | ||
|
|
045702e909 | ||
|
|
09e2e03423 | ||
|
|
309b61b985 | ||
|
|
0737f21ccb | ||
|
|
11f1207418 | ||
|
|
b615811418 | ||
|
|
193d65d367 | ||
|
|
b5bde292d2 | ||
|
|
da102d5b47 | ||
|
|
507d603ef0 | ||
|
|
fd5bb0af6e | ||
|
|
09606a2c11 | ||
|
|
34f02c2412 | ||
|
|
f1e71fa1e9 | ||
|
|
e4b3455dd5 | ||
|
|
a33f1284dc | ||
|
|
cbba7075a7 | ||
|
|
060d427d04 | ||
|
|
7d10ad7d61 | ||
|
|
217b122c67 | ||
|
|
8ef626a16b | ||
|
|
dd6d071c34 | ||
|
|
6411069dbc | ||
|
|
f1d907a438 | ||
|
|
9b79667d94 | ||
|
|
f8444b1549 | ||
|
|
df46627173 | ||
|
|
7a3d64e645 | ||
|
|
8cb5978f3a | ||
|
|
beb83f21b3 | ||
|
|
5d727c26cd | ||
|
|
aecd272994 | ||
|
|
2563492fa4 | ||
|
|
a781b759f4 | ||
|
|
466080ead9 | ||
|
|
f2d3bf213d | ||
|
|
6fcd46ebd4 | ||
|
|
3e03999b9e | ||
|
|
c63a3e34e9 | ||
|
|
12fe9c4603 | ||
|
|
4b1b3f76e5 | ||
|
|
7c2fccf064 | ||
|
|
e32d61fb03 | ||
|
|
92b2bf7f31 | ||
|
|
f2f79d8a4d | ||
|
|
a7b9273296 | ||
|
|
2cc0e92481 | ||
|
|
136d6294c3 | ||
|
|
7b46766d0c | ||
|
|
7cd2b2ca20 | ||
|
|
b014fa5cea | ||
|
|
68b2f88282 | ||
|
|
a89641769b | ||
|
|
9824f0474e | ||
|
|
34cbfb9137 | ||
|
|
a05e166e1a | ||
|
|
288e822f39 | ||
|
|
ce2e4a4558 | ||
|
|
33597a432c | ||
|
|
c3350c5c27 | ||
|
|
9c3359c503 | ||
|
|
9b71237fdf | ||
|
|
501f38b90f | ||
|
|
8f9ba18f0a | ||
|
|
a80df5aec2 | ||
|
|
a5cf4fcd00 | ||
|
|
76e396cd43 | ||
|
|
bdfcb9e814 | ||
|
|
6229440107 | ||
|
|
c366379b50 | ||
|
|
ef2e77b4eb | ||
|
|
ed9d512d09 | ||
|
|
c626e3d657 | ||
|
|
0b0a2214f4 | ||
|
|
8dae12d16b | ||
|
|
787b785582 | ||
|
|
e5e73e6232 | ||
|
|
3c828efadd | ||
|
|
dca14c1a78 | ||
|
|
f2f6ce0ec1 | ||
|
|
be306f2e30 | ||
|
|
6dd651d156 | ||
|
|
4535f9eb91 | ||
|
|
ce02e46386 | ||
|
|
2b040019ca | ||
|
|
838924d13e | ||
|
|
ad28d4171c | ||
|
|
e01cb293ea | ||
|
|
a166b32c9b | ||
|
|
9c08a9943a | ||
|
|
765ddd8525 | ||
|
|
9031fae5e3 | ||
|
|
60afd11cda | ||
|
|
3aa8a8a455 | ||
|
|
d67694df9c | ||
|
|
6f5cbba667 | ||
|
|
fdca7d8d9d | ||
|
|
3c86efa4ff | ||
|
|
c304803fda | ||
|
|
2a2bdd0b4b | ||
|
|
a9aaae3da9 | ||
|
|
c1c17ec8e6 | ||
|
|
027552a3db | ||
|
|
96efbd3bc9 | ||
|
|
e3866d75a9 | ||
|
|
07d5bffef2 | ||
|
|
d116e2b6ef | ||
|
|
54ddb589dc | ||
|
|
9640fada3e | ||
|
|
e8233a852a | ||
|
|
0b210da0c7 | ||
|
|
0efe1cac36 | ||
|
|
47aee53fe1 | ||
|
|
1460fd44c8 | ||
|
|
5391643d65 | ||
|
|
9d9a890877 | ||
|
|
aa41228d27 | ||
|
|
030241bd06 | ||
|
|
016790882a | ||
|
|
bcb91347de | ||
|
|
fa84c7cdab | ||
|
|
33539144d8 | ||
|
|
e900bb4dfe | ||
|
|
92d10f3f09 | ||
|
|
c5150ee9d3 | ||
|
|
d090ebaad8 | ||
|
|
4cc2123eff | ||
|
|
d48198e199 | ||
|
|
df2540c6b7 | ||
|
|
d0409058ed | ||
|
|
572447c6a4 | ||
|
|
24574f6a01 | ||
|
|
318d6ed286 | ||
|
|
7b8e1971a0 | ||
|
|
ad0f2e5459 | ||
|
|
464477cfe7 | ||
|
|
923d151442 | ||
|
|
3dbd75bbca | ||
|
|
e5c264d3ab | ||
|
|
0fa5c3bc68 | ||
|
|
26bcf95f30 | ||
|
|
7a0a9e6091 | ||
|
|
916799509c | ||
|
|
29f6186c5c | ||
|
|
8525f5a9b4 | ||
|
|
7d0d567dbe | ||
|
|
3d20e0f709 | ||
|
|
cf5c2ca6e5 | ||
|
|
ed6eee18b8 | ||
|
|
1e8cf01461 | ||
|
|
4f716499c9 | ||
|
|
75634c8df5 | ||
|
|
09480a73da | ||
|
|
e2c46226f7 | ||
|
|
f29efa11bb | ||
|
|
a70b6a4d3d | ||
|
|
10958450ba | ||
|
|
9077f7e0a7 | ||
|
|
a0b4f8ec43 | ||
|
|
ef98a966e7 | ||
|
|
6d27231791 | ||
|
|
43594489dd | ||
|
|
896d7480c1 | ||
|
|
6eb90819f0 | ||
|
|
c82088b35a | ||
|
|
2e940cc2c8 | ||
|
|
b611ac0252 | ||
|
|
5242850fbc | ||
|
|
3cb0b970bf | ||
|
|
7d4c0457ba | ||
|
|
e68b8f8fb5 | ||
|
|
634d1024d7 | ||
|
|
fed3a620cd | ||
|
|
a9eaaafa93 | ||
|
|
f8874f6e15 | ||
|
|
4bd849e534 | ||
|
|
d9b984db7f | ||
|
|
3aa7119bed | ||
|
|
cf2f221a94 | ||
|
|
50ef9c7238 | ||
|
|
fa362b1206 | ||
|
|
3869e8a395 | ||
|
|
7dc6b080ee | ||
|
|
566240b9ca | ||
|
|
d9cacefa0f | ||
|
|
672657c111 | ||
|
|
c466ea2537 | ||
|
|
519e8941f9 | ||
|
|
6745839c30 | ||
|
|
c031fc7ae1 | ||
|
|
842ac07091 | ||
|
|
206929be45 | ||
|
|
e2a837be6d | ||
|
|
d2ecf27d23 | ||
|
|
f57d957faf | ||
|
|
5f08c7aae3 | ||
|
|
e295fc3a42 | ||
|
|
6cfb4e18dc | ||
|
|
859dd057be | ||
|
|
47929714fb | ||
|
|
acafdbbdd2 | ||
|
|
b23ab9be23 | ||
|
|
205ad0dd5b | ||
|
|
d3b711046c | ||
|
|
53cbaf603a | ||
|
|
6b0e974e77 | ||
|
|
a5a18e846e | ||
|
|
ebd21748ab | ||
|
|
81fdf4eff6 | ||
|
|
720940ec7a | ||
|
|
f00bd35281 | ||
|
|
77601c69da | ||
|
|
633996af1f | ||
|
|
0614d7ff04 | ||
|
|
b51257e5e1 | ||
|
|
3f32eab1f3 | ||
|
|
60048c2da0 | ||
|
|
e0bbedbd73 | ||
|
|
62c04b656d | ||
|
|
6696423533 | ||
|
|
1f580ca6d9 | ||
|
|
092811d179 | ||
|
|
cce7a201de | ||
|
|
c94b2923e8 | ||
|
|
2514d9935e | ||
|
|
571c702f21 | ||
|
|
c808597e1f | ||
|
|
3417b956f9 | ||
|
|
4ceea18238 | ||
|
|
56ae419d48 | ||
|
|
8684099c82 | ||
|
|
7ca1c1fb74 | ||
|
|
bdfe294001 | ||
|
|
763722579e | ||
|
|
cf6ce232c2 | ||
|
|
f469ac8a45 | ||
|
|
4966737c9b | ||
|
|
b3a963a9ab | ||
|
|
431174cd19 | ||
|
|
bdc74bc4d2 | ||
|
|
0665aa310b | ||
|
|
de4530784f | ||
|
|
92df288796 | ||
|
|
0c8f136b14 | ||
|
|
11893ae742 | ||
|
|
0b34a3cf11 | ||
|
|
2d956525cc | ||
|
|
7d5ddd9013 | ||
|
|
ea9ad5992e | ||
|
|
58c132e12c | ||
|
|
bb9c6ee461 | ||
|
|
4c2597e7a0 | ||
|
|
2abfdb4981 | ||
|
|
1562ccbe9f | ||
|
|
bda67abdfa | ||
|
|
fd5c5e9a77 | ||
|
|
95a90109db | ||
|
|
d67dbd92d0 | ||
|
|
c24749e281 | ||
|
|
90294fca22 | ||
|
|
b04d948f82 | ||
|
|
580387c43b | ||
|
|
205c1984f0 | ||
|
|
497d27a452 | ||
|
|
1ad7ba2f06 | ||
|
|
43e89e4e8f | ||
|
|
0260328de7 | ||
|
|
0821ae41ca | ||
|
|
99cdaafb60 | ||
|
|
653f18a8b1 | ||
|
|
0c54b088d1 | ||
|
|
6717974b6e | ||
|
|
975b3ae911 | ||
|
|
02b0558138 | ||
|
|
bd25df72fe | ||
|
|
e28f5814c4 | ||
|
|
1b862188c4 | ||
|
|
097fe6f7b0 | ||
|
|
e7ec498838 | ||
|
|
109676b64b | ||
|
|
ec4226adaa | ||
|
|
d58e41170b | ||
|
|
11fb9e7115 | ||
|
|
4b14861434 | ||
|
|
278b054383 | ||
|
|
c2adce47b8 | ||
|
|
f3d4eeedd6 | ||
|
|
d52ed122e7 | ||
|
|
f055291110 | ||
|
|
09bd58bbc3 | ||
|
|
583d4e963b | ||
|
|
8f9cd180d3 | ||
|
|
20d22067c9 | ||
|
|
720f60a04c | ||
|
|
b7ec976381 | ||
|
|
78c7115e5c | ||
|
|
a980713fdf | ||
|
|
67c2023bfe | ||
|
|
b5ec1e383f | ||
|
|
1cb62df487 | ||
|
|
1f9965f60a | ||
|
|
7e847dd4ab | ||
|
|
2363932b32 | ||
|
|
a76b32203a | ||
|
|
9db1c6a20a | ||
|
|
5fb796d528 | ||
|
|
711f4b71af | ||
|
|
ca67bcd0c6 | ||
|
|
bf643c6db2 | ||
|
|
c447725291 | ||
|
|
5632f1fbe5 | ||
|
|
f1613955f7 | ||
|
|
bccb61ec27 | ||
|
|
4ce108247e | ||
|
|
0e40b878c8 | ||
|
|
6d147c89ed | ||
|
|
438fcd413e | ||
|
|
cec42ccf0a | ||
|
|
205d3a44c6 | ||
|
|
2b4ad5c063 | ||
|
|
fcc191a9e1 | ||
|
|
e81c53b57a | ||
|
|
d399df52b1 | ||
|
|
e7e05d1b15 | ||
|
|
05f6e6e97b | ||
|
|
9db6cb9ce8 | ||
|
|
c4537da49f | ||
|
|
5341bc074a | ||
|
|
4ca0aecae4 | ||
|
|
4b5d9628ad | ||
|
|
423a154cad | ||
|
|
192700f1df | ||
|
|
ec59fb2188 | ||
|
|
36bb9b0b45 | ||
|
|
6d9821a67b | ||
|
|
f1e5830181 | ||
|
|
1e7fe353df | ||
|
|
a5f54e20e3 | ||
|
|
3c600ebde7 | ||
|
|
da9a803d7c | ||
|
|
6ccc807307 | ||
|
|
d1b0240fa8 | ||
|
|
d2edc667bc | ||
|
|
f7a365d9cb | ||
|
|
0b29dbe571 | ||
|
|
42a38f5215 | ||
|
|
751f0b90c8 | ||
|
|
efa74d4e94 | ||
|
|
1d051809ab | ||
|
|
1260da169a | ||
|
|
fd89da4def | ||
|
|
9f6ffaab98 | ||
|
|
57d6c968d9 | ||
|
|
3be8e198df | ||
|
|
e77ae23ec1 | ||
|
|
ab14c33a84 | ||
|
|
a58d9719b3 | ||
|
|
45c476cace | ||
|
|
3fde3cc15a | ||
|
|
e81a66f6e6 | ||
|
|
6a21e907fd | ||
|
|
e67a7556ea | ||
|
|
aca463ecfe | ||
|
|
3958b7ad2c | ||
|
|
fc9b9aed42 | ||
|
|
a0be6ce65d | ||
|
|
19a79e1e97 | ||
|
|
3dfd267dbf | ||
|
|
8acbfef789 | ||
|
|
1abff11fdc | ||
|
|
1bbbe129d8 | ||
|
|
3eebd1a2dc | ||
|
|
78cbd6d92c | ||
|
|
9b6f4905c1 | ||
|
|
ae505657a0 | ||
|
|
671d5e8043 | ||
|
|
db27724200 | ||
|
|
d15fca922a | ||
|
|
59206710dc | ||
|
|
e220e249aa | ||
|
|
0dc1199ae9 | ||
|
|
2afcdabfc9 | ||
|
|
5d08d22397 | ||
|
|
d17c09cca1 | ||
|
|
e9827cbc55 | ||
|
|
5dff13db1e | ||
|
|
320d63216e | ||
|
|
3188c6ecbb | ||
|
|
0bc7802fcd | ||
|
|
dc4810173b | ||
|
|
97b25460c9 | ||
|
|
8933bfdc4a | ||
|
|
d967909967 | ||
|
|
0298e6d916 | ||
|
|
46ba35ac70 | ||
|
|
6c12b2d3c5 | ||
|
|
fcb144021b | ||
|
|
9c4c5f1861 | ||
|
|
353a0a21bf | ||
|
|
71b3ed920c | ||
|
|
85900d3945 | ||
|
|
dacbe3cb7d | ||
|
|
a37d446084 | ||
|
|
648dec5efe | ||
|
|
49e2e0d9a7 | ||
|
|
3c79236780 | ||
|
|
5167fd426e | ||
|
|
d10680b777 | ||
|
|
6208b89f2d | ||
|
|
5d20840c83 | ||
|
|
02ed56067b | ||
|
|
52e651247a | ||
|
|
752713b51d | ||
|
|
1a51be857a | ||
|
|
ae78af527c | ||
|
|
20464d7350 | ||
|
|
11fe0e5016 | ||
|
|
0ca156c81b | ||
|
|
ebdfaef831 | ||
|
|
b4218bdd7d | ||
|
|
d6943e12cf | ||
|
|
88971ca755 | ||
|
|
d5f21d9b75 | ||
|
|
799c336f8c | ||
|
|
fc37656e67 | ||
|
|
16c1fd005b | ||
|
|
57717b3020 | ||
|
|
462538a5c6 | ||
|
|
f4867ec09c | ||
|
|
231f14a9b8 | ||
|
|
b887e81d07 | ||
|
|
31c285b75b | ||
|
|
6daf5245cb | ||
|
|
11ee8b4525 | ||
|
|
b7a30008f7 | ||
|
|
5cddc183c8 | ||
|
|
7bc513e6e9 | ||
|
|
035008fde5 | ||
|
|
7eaf98dba6 | ||
|
|
60f5801a4e | ||
|
|
bb53a89e1c | ||
|
|
b304e94c8c | ||
|
|
056ca7813f | ||
|
|
2aa4721c55 | ||
|
|
b7192ca61f | ||
|
|
14d73e8498 | ||
|
|
629d0fa261 | ||
|
|
73a084fccd | ||
|
|
3d540c6952 | ||
|
|
57910774fc | ||
|
|
030ef2e500 | ||
|
|
991bb94ce2 | ||
|
|
a48f0a58b8 | ||
|
|
951535bf5f | ||
|
|
4a610d2979 | ||
|
|
4fdc7a368a | ||
|
|
a40ed1ecaa | ||
|
|
9b1c3b4f1c | ||
|
|
9d4dac7cb2 | ||
|
|
df32d14ae8 | ||
|
|
d9be46e935 | ||
|
|
1bf5f5c4ed | ||
|
|
6c867a2af2 | ||
|
|
0b4afe3649 | ||
|
|
71efa635fc | ||
|
|
bf62802ffd | ||
|
|
12f53af7d8 | ||
|
|
de1311fbf9 | ||
|
|
53ed7ca778 | ||
|
|
d08adc5dfd | ||
|
|
b18b4a4453 | ||
|
|
d055a2972d | ||
|
|
69a7ec7da7 | ||
|
|
89e0f68275 | ||
|
|
06f2ce4136 | ||
|
|
888fc8a629 | ||
|
|
a4e437baf1 | ||
|
|
d55656c07c | ||
|
|
86ef02473e | ||
|
|
ff137d6ca1 | ||
|
|
b70c1fa751 | ||
|
|
5358bd35f8 | ||
|
|
98860419c7 | ||
|
|
53fbd3300f | ||
|
|
5eaed26ddd | ||
|
|
7892912f4d | ||
|
|
93bb0c3f3a | ||
|
|
382628f233 | ||
|
|
c6548fb88c | ||
|
|
52ae9d193b | ||
|
|
a27d701bac | ||
|
|
f703c93d3a | ||
|
|
988190eefe | ||
|
|
3f1b8a2b3e | ||
|
|
9f120c4352 | ||
|
|
bbb955f1c8 | ||
|
|
fd66b79b0b | ||
|
|
c7e04cd568 | ||
|
|
0e9442d116 | ||
|
|
a320dec5ff | ||
|
|
73e98c99f3 | ||
|
|
1268eb4db4 | ||
|
|
bfbe06e81c | ||
|
|
c38597d137 | ||
|
|
587c0d7b59 | ||
|
|
1fe4cbb045 | ||
|
|
043e1b8568 | ||
|
|
965583c2d8 | ||
|
|
38b07b9929 | ||
|
|
25d9e9a52c | ||
|
|
61997ac276 | ||
|
|
d6ab65dd0d | ||
|
|
72f872e2da | ||
|
|
6195a9e93f | ||
|
|
101044ca0e | ||
|
|
63d8298e17 | ||
|
|
a4aa3da89e | ||
|
|
c651ec9d31 | ||
|
|
99178584af | ||
|
|
c0831c51b3 | ||
|
|
c1fa9867b5 | ||
|
|
7e7ea16cd6 | ||
|
|
c60b9cef81 | ||
|
|
6766fd5de2 | ||
|
|
d475468865 | ||
|
|
73be72a937 | ||
|
|
a8a45e133f | ||
|
|
c2a304024d | ||
|
|
0b2b17a64f | ||
|
|
b9c42c7536 | ||
|
|
f3fa1b54a4 | ||
|
|
d1c3715c60 | ||
|
|
f6337b2d8c | ||
|
|
1fc2d86312 | ||
|
|
3ed9d26adc | ||
|
|
89ed7207c1 | ||
|
|
8609a4d16f | ||
|
|
8bb9c6586a | ||
|
|
5eebe93f72 | ||
|
|
8913c706c9 | ||
|
|
fc575ea414 | ||
|
|
2105694101 | ||
|
|
2473e1a1bc | ||
|
|
b937743dba | ||
|
|
4b06428bd0 | ||
|
|
7f7a3f3bd8 | ||
|
|
999e42207d | ||
|
|
c6a96b423a | ||
|
|
4c7463eddf | ||
|
|
15494d9974 | ||
|
|
91e8109117 | ||
|
|
8931401375 | ||
|
|
752ba68599 | ||
|
|
bc5adf74ff | ||
|
|
4ecf8b50b7 | ||
|
|
9f984247ac | ||
|
|
4a7cdd8548 | ||
|
|
02a5ee3ec3 | ||
|
|
5a89b7c485 | ||
|
|
895fd94b77 | ||
|
|
524f694ab0 | ||
|
|
d681937c89 | ||
|
|
52043e70ce | ||
|
|
073deff2d5 | ||
|
|
78d10d8e90 | ||
|
|
156aa066c6 | ||
|
|
1ebba4e639 | ||
|
|
45fd949e09 | ||
|
|
c69a2c51c3 | ||
|
|
ec5c4e2ef5 | ||
|
|
19d0edaed1 | ||
|
|
a094be6133 | ||
|
|
80f5faaed2 | ||
|
|
ea744f2530 | ||
|
|
f659558746 | ||
|
|
e39aff406b | ||
|
|
2645e0dceb | ||
|
|
50a49967e0 | ||
|
|
ba3dc73e0c | ||
|
|
35b0de17a9 | ||
|
|
831192ee63 | ||
|
|
5e2f64bfe2 | ||
|
|
1cfb7410a8 | ||
|
|
26dfd6ddc0 | ||
|
|
27b2b8b96a | ||
|
|
d26a481685 | ||
|
|
6ddf1846f6 | ||
|
|
dc8e0b81d9 | ||
|
|
25c575b534 | ||
|
|
9bb704fd0c | ||
|
|
0601780ab8 | ||
|
|
183e2dff20 | ||
|
|
725ad8289e | ||
|
|
d41e5e7594 | ||
|
|
3acdcd8d53 | ||
|
|
e1087fcdcd | ||
|
|
9228a1ae40 | ||
|
|
3064d53017 | ||
|
|
67dd88c179 | ||
|
|
99dc92947c | ||
|
|
ebb321f671 | ||
|
|
3de38b8c94 | ||
|
|
1d0188e199 | ||
|
|
a86fd67f5a | ||
|
|
818e0f3ff3 | ||
|
|
4b03beb264 | ||
|
|
723dd77cc3 | ||
|
|
80305ec8d0 | ||
|
|
64ca5b8641 | ||
|
|
7e09db3801 | ||
|
|
2ba65659e4 | ||
|
|
4a87f10d15 | ||
|
|
93d31e99b0 | ||
|
|
3bfe90e7ef | ||
|
|
5fb36fc027 | ||
|
|
0adae1cea9 | ||
|
|
41f5bc048d | ||
|
|
690af77bfa | ||
|
|
d3702f3c65 | ||
|
|
ab0f1721cc | ||
|
|
bcc25860b7 | ||
|
|
115f0e8d34 | ||
|
|
51cae96868 | ||
|
|
27ffc79f23 | ||
|
|
a986b4f0d0 | ||
|
|
8abf744687 | ||
|
|
4e25515b14 | ||
|
|
8f8d23fb62 | ||
|
|
afaacd003d | ||
|
|
c56f06bbfb | ||
|
|
63bdca6f54 | ||
|
|
73013afe1c | ||
|
|
66a876ee72 | ||
|
|
618429e3c0 | ||
|
|
c1d43499cb | ||
|
|
2e40767a28 | ||
|
|
1fcffc0650 | ||
|
|
ad7fdad2c6 | ||
|
|
b6cc6828b6 | ||
|
|
6ba046dd50 | ||
|
|
e7d22b40ff | ||
|
|
a81a8ac57b | ||
|
|
dbc538f5d7 | ||
|
|
5c07f52458 | ||
|
|
1fed6c2cbd | ||
|
|
2d1dc6a721 | ||
|
|
efaac96dae | ||
|
|
fad72915db | ||
|
|
69327aec6a | ||
|
|
89f072318d | ||
|
|
9f2ffb683f | ||
|
|
ba725c936f | ||
|
|
f37054422a | ||
|
|
9c4d0c0ea3 | ||
|
|
2bcf8b7964 | ||
|
|
f1c5d1998e | ||
|
|
ea5d67a0d0 | ||
|
|
0c2200c5b8 | ||
|
|
699d47f4bd | ||
|
|
4cc3978057 | ||
|
|
a94c5e77e6 | ||
|
|
2e9254f4df | ||
|
|
d57c8c761c | ||
|
|
144a822090 | ||
|
|
eba5869d86 | ||
|
|
fa60e00405 | ||
|
|
4b58c5c909 | ||
|
|
b80f189128 | ||
|
|
b313d7a4f8 | ||
|
|
47638d5f8b | ||
|
|
fe8f38c42b | ||
|
|
6f980b2da3 | ||
|
|
6a9b8b080f | ||
|
|
c33c4de555 | ||
|
|
8d25a30e92 | ||
|
|
aeed937874 | ||
|
|
753f21b3fe | ||
|
|
f51edc269e | ||
|
|
a52b5f6e84 | ||
|
|
a2e25184c3 | ||
|
|
3429f9511f | ||
|
|
b2ae8a2df6 | ||
|
|
85068ac330 | ||
|
|
33a27faf92 | ||
|
|
a9b4fb2113 | ||
|
|
24babe7a39 | ||
|
|
3e6f43894a | ||
|
|
746cfd2571 | ||
|
|
7df8264f82 | ||
|
|
060f0ff85d | ||
|
|
218b50f185 | ||
|
|
2c61cdcd7c | ||
|
|
99c220cba5 | ||
|
|
baeffc96cc | ||
|
|
77ed5e05bb | ||
|
|
a8550d41be | ||
|
|
2ad51c3815 | ||
|
|
96f1610972 | ||
|
|
0d9d0014f8 | ||
|
|
1f8639dda2 | ||
|
|
1c1cfb2f0c | ||
|
|
7c6961781d | ||
|
|
9831885daa | ||
|
|
7901352e9a | ||
|
|
78e86fe724 | ||
|
|
26aae5aa3d | ||
|
|
b6b02e5172 | ||
|
|
dab5d4f899 | ||
|
|
8b906e666f | ||
|
|
0482d34f4b | ||
|
|
a292195d20 | ||
|
|
548b09877c | ||
|
|
dcad5a72eb | ||
|
|
d2ae6a2cdf | ||
|
|
7bd24844e5 | ||
|
|
6e8a3139a4 | ||
|
|
af4f914780 | ||
|
|
8d10f73549 | ||
|
|
3268e02cd7 | ||
|
|
0456dac1e2 | ||
|
|
943e3bc2ac | ||
|
|
1d0791e152 | ||
|
|
28a01afba7 | ||
|
|
9c00e8711f | ||
|
|
c8e16c5ea6 | ||
|
|
edfd57aad0 | ||
|
|
4e13d912b0 | ||
|
|
ee7931107e | ||
|
|
247f1c177b | ||
|
|
1410158222 | ||
|
|
81d623e561 | ||
|
|
19634cfb7a | ||
|
|
b0e5f3fc93 | ||
|
|
b613a09d86 | ||
|
|
915c7633fa | ||
|
|
ceb6684316 | ||
|
|
2fb0669839 | ||
|
|
d9a41add9f | ||
|
|
984c0e4dc1 | ||
|
|
69ee8b74bf | ||
|
|
7e4858c1ab | ||
|
|
f0f9074d47 | ||
|
|
700178c1f1 | ||
|
|
bdbb11d2fe | ||
|
|
bbd9d5974f | ||
|
|
37363d3ec0 | ||
|
|
1b2bc9c240 | ||
|
|
c0badcb2dd | ||
|
|
df7db4eb62 | ||
|
|
62e7368880 | ||
|
|
0431d53c78 | ||
|
|
dda6abb66e | ||
|
|
5c4edfb283 | ||
|
|
51f15e0652 | ||
|
|
8fe7914968 | ||
|
|
0922f2ddc6 | ||
|
|
8a194423ad | ||
|
|
566569d332 | ||
|
|
0307126a4a | ||
|
|
9cf450b65f | ||
|
|
1f8776e828 | ||
|
|
b1ba8f249e | ||
|
|
ec94b9194c | ||
|
|
9c030833f3 | ||
|
|
3181c1f834 | ||
|
|
d12700be33 | ||
|
|
e333ce2c5a | ||
|
|
be571b72be | ||
|
|
c8aaf743b9 | ||
|
|
d83255dc91 | ||
|
|
e9df5d8c46 | ||
|
|
72eeca763e | ||
|
|
00d9e18d41 | ||
|
|
024ac197ba | ||
|
|
6818d5e7ad | ||
|
|
f4a273e89e | ||
|
|
77859a3137 | ||
|
|
4a22ef9c47 | ||
|
|
e8961d1830 | ||
|
|
274e6d475b | ||
|
|
b040991a96 | ||
|
|
5018bc3005 | ||
|
|
132f949299 | ||
|
|
7b2169075b | ||
|
|
e3343e0b36 | ||
|
|
a1c2c6b3df | ||
|
|
318db84c9f | ||
|
|
8ec7bde136 | ||
|
|
3b3c5130c0 | ||
|
|
36fa6ef032 | ||
|
|
a909b3dfbe | ||
|
|
04a0423e44 | ||
|
|
848b200ac7 | ||
|
|
020b53eabb | ||
|
|
5dcbbd8062 | ||
|
|
208893bd3f | ||
|
|
5d41c0cd5f | ||
|
|
4a182aa078 | ||
|
|
2a68833867 | ||
|
|
bfc0c7ab21 | ||
|
|
cd9ba061a4 | ||
|
|
7790265612 | ||
|
|
95311b66c7 | ||
|
|
6b316ec48f | ||
|
|
f27a7a64a3 | ||
|
|
ca822f8bca | ||
|
|
d114fde1d5 | ||
|
|
a7d04a8876 | ||
|
|
51e0a66c44 | ||
|
|
c1da8040e2 | ||
|
|
75aba098e9 | ||
|
|
cc224f4043 | ||
|
|
481fc8184c | ||
|
|
98b63ff139 | ||
|
|
5aa4f174af | ||
|
|
b81fcaa0cd | ||
|
|
6d512cca23 | ||
|
|
02c87ef8ec | ||
|
|
13d66196bf | ||
|
|
5194e5c3c5 | ||
|
|
356ae12b3e | ||
|
|
5ff8b7000f | ||
|
|
b6184dd79f | ||
|
|
34345e6a05 | ||
|
|
6f6e1c1719 | ||
|
|
849904e037 | ||
|
|
7e3f71f748 | ||
|
|
cc5965c751 | ||
|
|
a0079b1cab | ||
|
|
fa9aa323d0 | ||
|
|
fd9c01c3e9 | ||
|
|
310d9e540e | ||
|
|
f6761b6d01 | ||
|
|
7d0ed15e86 | ||
|
|
8120493a1c | ||
|
|
fd5e62626e | ||
|
|
0e5bd1e17f | ||
|
|
3f8b0a59f5 | ||
|
|
b7c2509817 | ||
|
|
94b10102ce | ||
|
|
a83323abe8 | ||
|
|
a92d9b4749 | ||
|
|
e538b0fcc9 | ||
|
|
4cb7a00686 | ||
|
|
9b8bba684a | ||
|
|
a43e6afb82 | ||
|
|
021db78abb | ||
|
|
276cbbd258 | ||
|
|
cd8caf807c | ||
|
|
eda5820374 | ||
|
|
27d2d36dfe | ||
|
|
90dcd8d49c | ||
|
|
42b52e67f6 | ||
|
|
f532eabde3 | ||
|
|
6424798a40 | ||
|
|
140ecbb715 | ||
|
|
d066f9b414 | ||
|
|
5d3da84cac | ||
|
|
733e6d0ab1 | ||
|
|
493c8767ec | ||
|
|
36b60a4c87 | ||
|
|
7b6b3378b7 | ||
|
|
30e64f8883 | ||
|
|
5b2e284501 | ||
|
|
5412fe0b7b | ||
|
|
a81765d5d3 | ||
|
|
aa5db9818b | ||
|
|
1405b60346 | ||
|
|
4bb7f67602 | ||
|
|
66ef25c9b1 | ||
|
|
4b5ad6b4eb | ||
|
|
dbadcdd065 | ||
|
|
775392970f | ||
|
|
a320c7baf8 | ||
|
|
88781d3b9a | ||
|
|
55f747bed5 | ||
|
|
0c9abbd660 | ||
|
|
e161742bb9 | ||
|
|
cd243dc44a | ||
|
|
b177126ad6 | ||
|
|
9938a07226 | ||
|
|
66b0576db2 | ||
|
|
e6aa284555 | ||
|
|
829c944929 | ||
|
|
389ac81978 |
No files matched your search
Symlink
+1
@@ -0,0 +1 @@
|
|||||||
|
AGENTS.md
|
||||||
@@ -1,3 +1,6 @@
|
|||||||
source_url "https://raw.githubusercontent.com/cachix/devenv/d1f7b48e35e6dee421cfd0f51481d17f77586997/direnvrc" "sha256-YBzqskFZxmNb3kYVoKD9ZixoPXJh1C9ZvTLGFRkauZ0="
|
if ! has nix_direnv_version || ! nix_direnv_version 3.1.0; then
|
||||||
|
source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.1.0/direnvrc" "sha256-yMJ2OVMzrFaDPn7q8nCBZFRYpL/f0RcHzhmw/i6btJM="
|
||||||
|
fi
|
||||||
|
|
||||||
use devenv
|
nix_direnv_manual_reload
|
||||||
|
use flake
|
||||||
+33
-3
@@ -1,14 +1,44 @@
|
|||||||
*.AppImage
|
*.AppImage
|
||||||
|
|
||||||
|
.pytest_cache
|
||||||
|
|
||||||
# Devenv
|
# Devenv
|
||||||
.devenv*
|
.devenv*
|
||||||
devenv.local.nix
|
devenv.local.nix
|
||||||
|
.devbox
|
||||||
|
|
||||||
|
# tmp
|
||||||
|
tmp
|
||||||
|
result.diff
|
||||||
|
.claude-nixos-setup
|
||||||
|
|
||||||
# direnv
|
# direnv
|
||||||
.direnv
|
.direnv
|
||||||
|
|
||||||
# pre-commit
|
|
||||||
.pre-commit-config.yaml
|
|
||||||
|
|
||||||
# nix build
|
# nix build
|
||||||
result
|
result
|
||||||
|
results
|
||||||
|
diffs
|
||||||
|
.locks
|
||||||
|
result.diff
|
||||||
|
.tmp
|
||||||
|
build
|
||||||
|
|
||||||
|
# Rust build artifacts
|
||||||
|
target
|
||||||
|
|
||||||
|
# DOC are WIP
|
||||||
|
docs
|
||||||
|
|
||||||
|
|
||||||
|
# worktrees
|
||||||
|
.branches
|
||||||
|
|
||||||
|
# agents
|
||||||
|
.commandcode
|
||||||
|
.delta
|
||||||
|
.claude
|
||||||
|
.mnt
|
||||||
|
.pi
|
||||||
Symlink
+1
@@ -0,0 +1 @@
|
|||||||
|
/nix/store/8wpcklj1m0cp057gvc6ksvkc6znlipd5-pre-commit-config.json
|
||||||
Vendored
-5
@@ -1,5 +0,0 @@
|
|||||||
{
|
|
||||||
"recommendations": [
|
|
||||||
"pinage404.nix-extension-pack"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
{
|
||||||
|
"show_completions_on_input": true,
|
||||||
|
"languages": {
|
||||||
|
"QML": {
|
||||||
|
"colorize_brackets": true,
|
||||||
|
"inlay_hints": {
|
||||||
|
"show_background": true,
|
||||||
|
"enabled": true
|
||||||
|
},
|
||||||
|
"show_whitespaces": "all",
|
||||||
|
"show_completions_on_input": true,
|
||||||
|
"always_treat_brackets_as_autoclosed": true,
|
||||||
|
"format_on_save": "on",
|
||||||
|
"language_servers": ["qmljs"]
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"lsp": {
|
||||||
|
"qmljs": {
|
||||||
|
"enable_lsp_tasks": true,
|
||||||
|
"binary": {
|
||||||
|
"path": "qmlls",
|
||||||
|
"arguments": ["-E"]
|
||||||
|
},
|
||||||
|
"initialization_options": {
|
||||||
|
"buildDir": "."
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
# Agent Instructions
|
||||||
|
|
||||||
|
**MANDATORY FIRST ACTION:** Read [`GUIDELINES.md`](GUIDELINES.md) in full before
|
||||||
|
doing anything in this repository. It is the single source of truth for agent
|
||||||
|
behavior here.
|
||||||
|
|
||||||
|
Key non-negotiable rules from that file:
|
||||||
|
|
||||||
|
- **Always present a plan first** and wait for user approval before making any
|
||||||
|
changes — no matter how small the task.
|
||||||
|
- **Never run builds, system switches, or remote installs** (`nixos-rebuild`,
|
||||||
|
`nh os`, `skyg os`, `skyg remote install`, `nixos-anywhere`, `nix build`,
|
||||||
|
`nix flake check`, etc.) — zero exceptions, even if asked.
|
||||||
|
- Never edit `flake.lock`, `*.hardware-configuration.nix`, or anything in
|
||||||
|
`secrets/`.
|
||||||
|
- Never add `imports = [...]` to host files.
|
||||||
|
- Never commit or create branches unless explicitly asked.
|
||||||
|
- Also read [`.agents/Agent.md`](.agents/Agent.md) for full repository context.
|
||||||
+253
@@ -0,0 +1,253 @@
|
|||||||
|
# Agent Guidelines — nixos-setup
|
||||||
|
|
||||||
|
Rules and best practices for any AI agent working in this repository.
|
||||||
|
Read this file before making any changes.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Mandatory First Step — Always Present a Plan
|
||||||
|
|
||||||
|
Before making **any** change to this repository, you MUST present a short plan to the user and wait for their approval. This applies to every task, no matter how small.
|
||||||
|
|
||||||
|
Your plan must include:
|
||||||
|
|
||||||
|
1. **What** you intend to change (files, options, packages)
|
||||||
|
2. **Why** the change is needed
|
||||||
|
3. **How** you will do it (which files you will edit, in what order)
|
||||||
|
4. **What you will NOT do** (e.g., "I will not run any builds")
|
||||||
|
|
||||||
|
Only after the user approves the plan may you proceed with edits.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Hard Rules — Never Break These
|
||||||
|
|
||||||
|
### ❌ NEVER run builds or system switches — ZERO EXCEPTIONS
|
||||||
|
|
||||||
|
**DO NOT RUN ANY OF THESE COMMANDS AT ANY TIME, FOR ANY REASON:**
|
||||||
|
|
||||||
|
```
|
||||||
|
nixos-rebuild switch / test / build / dry-build
|
||||||
|
nh os switch / test / build
|
||||||
|
skyg os switch / test / build
|
||||||
|
skyg remote switch / test / build / boot / install
|
||||||
|
skyg hm switch / build
|
||||||
|
nix build
|
||||||
|
docker/podman build
|
||||||
|
nixos-anywhere
|
||||||
|
```
|
||||||
|
|
||||||
|
The only exception is lightweight operations like
|
||||||
|
|
||||||
|
```
|
||||||
|
nh os switch --dry
|
||||||
|
nix flake check
|
||||||
|
```
|
||||||
|
|
||||||
|
**Why:**
|
||||||
|
|
||||||
|
- These commands take 20–40+ minutes
|
||||||
|
- They consume significant CPU/RAM on the user's machine
|
||||||
|
- They can block the user from their own work
|
||||||
|
- They can break the live system if something is wrong
|
||||||
|
- The user MUST control when and what gets built
|
||||||
|
|
||||||
|
**Your job:** Make correct edits to source files. The user validates and runs builds themselves.
|
||||||
|
|
||||||
|
**Even if the user says "go ahead":** Do NOT run these. Your role is to write good Nix, not execute it.
|
||||||
|
|
||||||
|
### ❌ NEVER run `skyg remote install` or nixos-anywhere — ZERO EXCEPTIONS
|
||||||
|
|
||||||
|
This wipes every disk in `hosts/<profile>.disko.nix`. A second run is as destructive as the first.
|
||||||
|
Always make the user run it. Do not invoke it, even with `--force-wipe`, even if asked.
|
||||||
|
|
||||||
|
### ❌ NEVER edit `flake.lock` by hand
|
||||||
|
|
||||||
|
This file is managed exclusively by `nix flake update`. Editing it manually will corrupt
|
||||||
|
the lock file and break all builds.
|
||||||
|
|
||||||
|
### ❌ NEVER edit `*.hardware-configuration.nix` files
|
||||||
|
|
||||||
|
These are generated by `nixos-generate-config` and reflect the physical hardware. Edits
|
||||||
|
will be overwritten on the next hardware scan and can render a system unbootable.
|
||||||
|
|
||||||
|
### ❌ NEVER touch secrets
|
||||||
|
|
||||||
|
Do not read, write, or delete files in `secrets/`. Encrypted `.age` files must only be
|
||||||
|
managed with `agenix` via the `skyg secrets` commands. Do not modify `secrets.nix` unless
|
||||||
|
the user explicitly asks and explains the full context.
|
||||||
|
|
||||||
|
### ❌ NEVER add `imports = [...]` to host files
|
||||||
|
|
||||||
|
Host files (`hosts/<hostname>.nix`) do not use `imports`. All modules are composed through
|
||||||
|
the `makeNixOs` call in `flake.nix` via `modules/main.nix`. Adding imports to a host file
|
||||||
|
breaks the composition model.
|
||||||
|
|
||||||
|
### ❌ NEVER modify `GUIDELINES.md` unless explicitly requested by the user
|
||||||
|
|
||||||
|
You must **live and die by these rules** and hold yourself accountable to them.
|
||||||
|
These are not suggestions — they are non-negotiable.
|
||||||
|
|
||||||
|
### ❌ NEVER edit files inside `hosts/*/hardware-configuration/`
|
||||||
|
|
||||||
|
These are generated by `nixos-generate-config` and split into `boot.nix` / `file-system.nix`.
|
||||||
|
They reflect physical hardware — edits will be overwritten and can render a system unbootable.
|
||||||
|
The `# Clanker ! Do not modify this file!` header is not a suggestion.
|
||||||
|
|
||||||
|
### ❌ NEVER add top-level config to a host's `default.nix` that belongs in a sub-file
|
||||||
|
|
||||||
|
Every host folder follows a standard layout. Put config in the file that matches its scope:
|
||||||
|
|
||||||
|
| Config type | File |
|
||||||
|
| --------------------- | ------------------------- |
|
||||||
|
| Hardware / firmware | `hardware.nix` |
|
||||||
|
| Systemd / boot loader | `systemd.nix` |
|
||||||
|
| Packages | `packages.nix` |
|
||||||
|
| Networking / firewall | `networking.nix` |
|
||||||
|
| Services (few) | `services.nix` |
|
||||||
|
| Services (many) | `services/<name>.nix` |
|
||||||
|
| Home-manager | `home/default.nix` |
|
||||||
|
| Generated hardware | `hardware-configuration/` |
|
||||||
|
|
||||||
|
Don't dump unrelated options into `default.nix` — split them into the right file.
|
||||||
|
|
||||||
|
### KEEP EVERYTHING CONCISE, shorter concise comments are preferable, less jargon and more common words.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Safe Operations
|
||||||
|
|
||||||
|
These are always safe to perform without asking:
|
||||||
|
|
||||||
|
- Reading any `.nix`, `.md`, or config file
|
||||||
|
- Editing host files (`hosts/<hostname>.nix`) to add/remove packages or options
|
||||||
|
- Editing module files in `modules/`
|
||||||
|
- `ABOUTME.md` should be seen as the 'living memory' of a folder, it should contain general information about what's in the folder and capture decisions made at the time of development the features.
|
||||||
|
- **Keep ABOUTME.md current:** whenever you add, remove, or rename files, options, commands, or behaviour in a folder, check that folder's `ABOUTME.md` still matches reality and update it as part of the same change. If you discover an existing `ABOUTME.md` that is stale (dead file/option/command references, missing entries, wrong paths), fix it in the same way.
|
||||||
|
- Adding new packages to `pkgs/`
|
||||||
|
- Editing configs in `configs/`
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## When In Doubt
|
||||||
|
|
||||||
|
If you are unsure whether a command is safe, **assume it is NOT SAFE and don't run it.**
|
||||||
|
|
||||||
|
Instead: describe what you would do and ask the user for permission.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## NixOS Conventions in This Repo
|
||||||
|
|
||||||
|
### Option Namespace
|
||||||
|
|
||||||
|
All custom options live under `skyg.*`. Never introduce options under any other top-level
|
||||||
|
namespace. Check `modules/lib.nix` for the full `skyg.*` structure.
|
||||||
|
|
||||||
|
```nix
|
||||||
|
# Correct
|
||||||
|
skyg.nixos.desktop.enable = true;
|
||||||
|
skyg.nixos.server.services.comfyui.enable = true;
|
||||||
|
|
||||||
|
# Wrong — do not invent new top-level attrs
|
||||||
|
myOptions.desktop.enable = true;
|
||||||
|
```
|
||||||
|
|
||||||
|
### Enable/Disable Pattern
|
||||||
|
|
||||||
|
All modules follow `lib.mkIf cfg.enable { ... }`. Always gate config behind an `enable`
|
||||||
|
option. Default should be `false` unless the feature is universally required.
|
||||||
|
|
||||||
|
### Host File Structure
|
||||||
|
|
||||||
|
Each host is a folder under `hosts/<hostname>/`. The folder must contain at minimum
|
||||||
|
a `default.nix`. Split larger hosts into focused files:
|
||||||
|
|
||||||
|
```
|
||||||
|
hosts/<hostname>/
|
||||||
|
├── default.nix # skyg options, top-level settings, display manager
|
||||||
|
├── hardware.nix # Host-specific hardware (fwupd, kernel params, firmware)
|
||||||
|
├── systemd.nix # Boot loader, systemd targets/services, tmp, swap
|
||||||
|
├── packages.nix # environment.systemPackages (extract when > ~10 packages)
|
||||||
|
├── services.nix # Flat service configs (when < ~3 services)
|
||||||
|
├── services/
|
||||||
|
│ ├── default.nix # imports all service files
|
||||||
|
│ ├── <service>.nix # One file per service (when > ~3 services)
|
||||||
|
├── networking.nix # Firewall, Tailscale, NFS mounts, hosts
|
||||||
|
├── home/
|
||||||
|
│ └── default.nix # home-manager users.<name> block
|
||||||
|
└── hardware-configuration/ # Generated — DO NOT TOUCH
|
||||||
|
├── default.nix
|
||||||
|
├── boot.nix
|
||||||
|
└── file-system.nix
|
||||||
|
```
|
||||||
|
|
||||||
|
### Host Files vs Shared Modules
|
||||||
|
|
||||||
|
- **Host-specific** (one machine only): goes in `hosts/<hostname>.nix`
|
||||||
|
- **Shared** (multiple hosts): goes in the appropriate `modules/nixos/` or `modules/core/` submodule
|
||||||
|
- When in doubt, keep it in the host file and extract later if reuse emerges
|
||||||
|
|
||||||
|
### Package Placement
|
||||||
|
|
||||||
|
- Packages needed on all desktops → `modules/nixos/desktop/default.nix` (non-slim mode)
|
||||||
|
- Packages for one host only → `environment.systemPackages` in the host file
|
||||||
|
- Custom/third-party packages not in nixpkgs → `pkgs/<name>/default.nix` with an overlay in `modules/core/default.nix`
|
||||||
|
|
||||||
|
### Home Manager
|
||||||
|
|
||||||
|
Home Manager config lives inside `home-manager.users.<name>` blocks. Do not mix
|
||||||
|
system-level and HM-level options. The HM entry point is `modules/home/default.nix`.
|
||||||
|
|
||||||
|
### Greeter
|
||||||
|
|
||||||
|
Both desktop hosts (`fwbook`, `hl-fwdesk`) use DankMaterialShell greeter via:
|
||||||
|
|
||||||
|
```nix
|
||||||
|
services.displayManager.dms-greeter = {
|
||||||
|
enable = true;
|
||||||
|
compositor.name = "niri";
|
||||||
|
configHome = "/home/<username>";
|
||||||
|
};
|
||||||
|
```
|
||||||
|
|
||||||
|
Do not configure `services.greetd` manually on these hosts — the DMS module handles it.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Navigation Tips
|
||||||
|
|
||||||
|
| Question | Where to look |
|
||||||
|
| ---------------------------------------- | --------------------------------------------- |
|
||||||
|
| What hosts exist? | `hosts/` + `docs/hosts/README.md` |
|
||||||
|
| What does a `skyg.*` option do? | `modules/` — find the defining `.nix` file |
|
||||||
|
| What flake inputs are available? | Top of `flake.nix` |
|
||||||
|
| What binary caches are configured? | `modules/core/nix-substituters.nix` |
|
||||||
|
| What secrets exist? | `secrets.nix` (lists files + authorized keys) |
|
||||||
|
| What custom packages exist? | `pkgs/` |
|
||||||
|
| Full API reference | `docs/modules/README.md` |
|
||||||
|
| Host details (ports, services, hardware) | `docs/hosts/README.md` |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Validation Without Building
|
||||||
|
|
||||||
|
If you want to verify syntax **without triggering a build**, these are safe:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Check Nix expression syntax only (fast, safe, no eval)
|
||||||
|
nix-instantiate --parse <file>.nix
|
||||||
|
```
|
||||||
|
|
||||||
|
**But even these are optional.** The user will validate by running `nh os switch` themselves.
|
||||||
|
|
||||||
|
**Golden rule:** When in doubt, don't run anything. Just describe your changes.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Commit / Branch / Git Policy
|
||||||
|
|
||||||
|
- Do NOT commit changes or create branches unless the user explicitly asks
|
||||||
|
- Do NOT `git add`, `git commit`, or `git push` autonomously
|
||||||
|
- You may run `git add` **only** if required for a Nix evaluation (e.g., new files must be tracked for flakes)
|
||||||
|
- Describe what you changed in your final message so the user can review before committing
|
||||||
@@ -0,0 +1,179 @@
|
|||||||
|
# NixOS System Configurations
|
||||||
|
|
||||||
|
My comprehensive Nix configurations for managing multiple hosts, including local machines and remote servers.
|
||||||
|
|
||||||
|
## Repository Layout
|
||||||
|
|
||||||
|
```
|
||||||
|
nixos-setup/
|
||||||
|
├── bin/ # `skyg` CLI
|
||||||
|
│ ├── skyg # Bash shim → NuShell command modules in bin/lib/
|
||||||
|
│ ├── check-flake-versions # Shim for `skyg flake check-versions`
|
||||||
|
│ ├── temp-monitor # NuShell CPU/GPU temperature logger (see TEMP_MONITOR_README.md)
|
||||||
|
│ └── lib/ # NuShell command modules (os, remote, secrets, ca, pkgs, flake, build, render, hm)
|
||||||
|
├── configs/ # Application-specific configurations (incl. configs/pki TLS certs)
|
||||||
|
├── pkgs/ # Custom packages (buzz-desktop, colibri, delta-editor, niri-touchscreen-gestures, superset-desktop)
|
||||||
|
├── hosts/ # One folder per host (fwbook, hl-*, iso) + generated hardware configs
|
||||||
|
├── modules/ # Reusable NixOS and Home Manager modules
|
||||||
|
│ ├── core/ # Core system modules
|
||||||
|
│ ├── home/ # Home Manager modules
|
||||||
|
│ ├── nixos/ # NixOS-specific modules
|
||||||
|
│ └── *.nix # Utility modules (lib, skyg-utils, internal-networking, etc.)
|
||||||
|
├── openwrt-routers/ # OpenWrt router configs (glmain)
|
||||||
|
├── docs/ # Documentation
|
||||||
|
├── flake.nix # Nix flake definition
|
||||||
|
├── flake.lock # Locked dependency versions
|
||||||
|
└── README.md # This file
|
||||||
|
```
|
||||||
|
|
||||||
|
## Using This Flake
|
||||||
|
|
||||||
|
To use the custom packages in your own NixOS/Home Manager configuration:
|
||||||
|
|
||||||
|
```nix
|
||||||
|
{
|
||||||
|
inputs.nixos-setup.url = "github:skykanin/nixos-setup";
|
||||||
|
|
||||||
|
outputs = { self, nixpkgs, nixos-setup, ... }:
|
||||||
|
let
|
||||||
|
system = "x86_64-linux";
|
||||||
|
pkgs = nixos-setup.lib.pkgs.${system};
|
||||||
|
in {
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
niri-touchscreen-gestures
|
||||||
|
];
|
||||||
|
};
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
You can also import `nixos-setup.lib` to reuse `makeNixOs`, `makeHomeManagerUsers`, `makeIso`, `makeSdImage`, and other utilities.
|
||||||
|
|
||||||
|
See [`pkgs/ABOUTME.md`](pkgs/ABOUTME.md) for details on each package.
|
||||||
|
|
||||||
|
## Quick Start
|
||||||
|
|
||||||
|
The `skyg` script is your main interface for managing these configurations. It's located in `bin/skyg` and uses NuShell. Run `skyg` with no arguments to list subcommands, or `skyg <subcommand> --help` for details.
|
||||||
|
|
||||||
|
### Available Commands
|
||||||
|
|
||||||
|
#### Local System (`skyg os`)
|
||||||
|
|
||||||
|
- **`skyg os <action>`** - Run a local NixOS rebuild. Actions: `test`, `dry-activate`, `run`, `switch`, `build`, `boot`
|
||||||
|
- **`skyg os rollback`** - Roll back to the previous generation
|
||||||
|
- **`--build-host <host>`** - Build on a remote builder (e.g. `skyg os switch --build-host fwdesk`)
|
||||||
|
|
||||||
|
#### Remote Deployments (`skyg remote`)
|
||||||
|
|
||||||
|
- **`skyg remote <command> <target>`** - Deploy to a remote machine
|
||||||
|
|
||||||
|
Supported remote commands: `test`, `dry-activate`, `run`, `switch`, `build`, `boot`
|
||||||
|
|
||||||
|
Example: `skyg remote switch bigbox1` deploys using the `hl-bigbox1` profile to `root@bigbox1.lab.internal`
|
||||||
|
|
||||||
|
- **`skyg remote install <target>`** - Fresh-install a remote host via nixos-anywhere, using `hosts/hl-<target>.disko.nix`. Always wipes the disks in that file. Aborts if the disko file is missing, if the host already boots NixOS from disk (unless `--force-wipe`), or if you don't type the short hostname to confirm.
|
||||||
|
- **`skyg remote status <target>`** - Check status of a single remote host
|
||||||
|
- **`skyg remote status --all`** - Check status of all remote hosts (generation, pending reboot, needs rebuild)
|
||||||
|
- **`skyg remote boot-all`** - Boot all remote hosts (skips the current machine, checks online status first)
|
||||||
|
- **`skyg remote reboot-pending`** - Find every remote with a pending reboot (its booted system differs from its current system) and reboot them. Lists the affected hosts and asks for confirmation, then reboots them one at a time, waiting for each to come back online and sending a desktop notification when it does.
|
||||||
|
|
||||||
|
#### Flake Management (`skyg flake`)
|
||||||
|
|
||||||
|
- **`skyg flake update [input]`** - Update all flakes, or a specific input (e.g. `skyg flake update nixpkgs`). Displays the diff of `flake.lock` after updating.
|
||||||
|
- **`skyg flake check`** - Run `nix flake check --no-build`
|
||||||
|
- **`skyg flake check-versions`** - Verify NixOS release version consistency across flake inputs
|
||||||
|
|
||||||
|
#### Building Images and Routers (`skyg build`)
|
||||||
|
|
||||||
|
- **`skyg build image <iso|pi1|pi2>`** - Build a bootable image: ISO (`iso`) or Pi SD card image (`pi1`, `pi2`)
|
||||||
|
- **`skyg build openwrt [router]`** - Deploy an OpenWrt router config (default: `glmain`). Add `--dry-run` to render configs to `.tmp/` without touching the router.
|
||||||
|
|
||||||
|
#### Home Manager (`skyg hm`)
|
||||||
|
|
||||||
|
- **`skyg hm switch [profile]`** - Apply home-manager configuration (default: `ari`)
|
||||||
|
- **`skyg hm build [profile]`** - Build home-manager configuration
|
||||||
|
|
||||||
|
Example: `skyg hm switch ari` or `skyg hm switch`
|
||||||
|
|
||||||
|
#### Secrets (`skyg secrets`)
|
||||||
|
|
||||||
|
- **`skyg secrets list`** - List known secret names
|
||||||
|
- **`skyg secrets show <secret>`** - Decrypt a secret to `.tmp/unencrypted-<secret>`
|
||||||
|
- **`skyg secrets edit <secret> [--yaml]`** - Encrypt a working copy back into the secret
|
||||||
|
- **`skyg secrets compare <secret>`** - Diff the working copy against the stored secret
|
||||||
|
|
||||||
|
#### Lab CA (`skyg ca`)
|
||||||
|
|
||||||
|
- **`skyg ca init`** - Generate the lab root CA: key → `secrets/lab-ca-key.age`, cert → `configs/pki/lab-ca.crt`
|
||||||
|
- **`skyg ca issue <domain> --for <host>`** - Mint a TLS leaf cert signed by the lab CA: cert → `configs/pki/<domain>.crt`, key → `secrets/<name>-tls-key.age`
|
||||||
|
|
||||||
|
#### Custom Packages (`skyg pkgs`)
|
||||||
|
|
||||||
|
- **`skyg pkgs update --all`** - Auto-detect the latest version for all packages that have `update.sh`
|
||||||
|
- **`skyg pkgs update <pkg>`** - Auto-detect the latest version for a single package
|
||||||
|
- **`skyg pkgs update <pkg> <version>`** - Bump a package to an explicit version
|
||||||
|
|
||||||
|
#### Other
|
||||||
|
|
||||||
|
- **`skyg profiles`** - List all available local profiles
|
||||||
|
- **`skyg profiles --only_remote`** - List only remote profiles (prefixed with `hl-`)
|
||||||
|
- **`skyg render html-tpl <file>`** - Render a Gitea `.tmpl` and serve it on `127.0.0.1` for preview. Foreground — Ctrl+C to stop.
|
||||||
|
|
||||||
|
## Usage Examples
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Check available profiles
|
||||||
|
skyg profiles
|
||||||
|
|
||||||
|
# Build and switch to new configuration
|
||||||
|
skyg os build
|
||||||
|
skyg os switch
|
||||||
|
|
||||||
|
# Test configuration before switching
|
||||||
|
skyg os test
|
||||||
|
|
||||||
|
# Update dependencies
|
||||||
|
skyg flake update nixpkgs
|
||||||
|
|
||||||
|
# Deploy to a remote server
|
||||||
|
skyg remote switch bigbox1
|
||||||
|
|
||||||
|
# Rollback if something goes wrong
|
||||||
|
skyg os rollback
|
||||||
|
|
||||||
|
# Apply home-manager changes
|
||||||
|
skyg hm switch
|
||||||
|
```
|
||||||
|
|
||||||
|
### Using Custom Packages
|
||||||
|
|
||||||
|
All packages from `pkgs/` are available in your configuration as `pkgs.<name>` thanks to the overlay.
|
||||||
|
|
||||||
|
Example:
|
||||||
|
|
||||||
|
```nix
|
||||||
|
environment.systemPackages = with pkgs; [ niri-touchscreen-gestures ];
|
||||||
|
```
|
||||||
|
|
||||||
|
See [`pkgs/ABOUTME.md`](pkgs/ABOUTME.md) for details on each package.
|
||||||
|
|
||||||
|
## Managing Secrets
|
||||||
|
|
||||||
|
Secrets are encrypted using [agenix](https://github.com/ryantm/agenix) and stored in `secrets/`.
|
||||||
|
|
||||||
|
### Adding a Host to Secrets
|
||||||
|
|
||||||
|
1. **Get the host's SSH public key**: `cat /etc/ssh/ssh_host_ed25519_key.pub`
|
||||||
|
2. **Add to `secrets.nix`**: Create a variable with the key and add it to each secret's `publicKeys` list
|
||||||
|
3. **Re-encrypt**: for each affected secret run `skyg secrets show <name>` then `skyg secrets edit <name>` to re-encrypt it against the updated key set
|
||||||
|
|
||||||
|
For more details, see `secrets/ABOUTME.md`.
|
||||||
|
|
||||||
|
## Host Profiles
|
||||||
|
|
||||||
|
Available profiles include:
|
||||||
|
|
||||||
|
- **Local**: `fwbook` (Framework laptop)
|
||||||
|
- **Remote**: `hl-bigbox1`, `hl-bigbox2`, `hl-fwdesk`, `hl-fws1`, `hl-minipc1`, `hl-minipc2`, `hl-minipc3`, `hl-pi1`, `hl-pi2`, `hl-terra1`
|
||||||
|
- **ISO**: `iso` (bootable image)
|
||||||
|
|
||||||
|
All profiles automatically have access to the custom packages from the `pkgs/` directory.
|
||||||
@@ -0,0 +1,61 @@
|
|||||||
|
# bin/
|
||||||
|
|
||||||
|
The `skyg` CLI — the single entry point for all system management tasks in this repo.
|
||||||
|
|
||||||
|
## Structure
|
||||||
|
|
||||||
|
```
|
||||||
|
bin/
|
||||||
|
├── skyg # Bash shim: exec nu --commands "use lib/cmds.nu *; skyg $*"
|
||||||
|
├── check-flake-versions # Bash shim for `skyg flake check-versions`
|
||||||
|
├── temp-monitor # NuShell script: collect CPU/GPU temps to CSV + optional graph
|
||||||
|
├── TEMP_MONITOR_README.md # Usage docs for temp-monitor
|
||||||
|
└── lib/
|
||||||
|
├── cmds.nu # Dispatcher + bare `skyg` + `skyg profiles` + deprecated aliases
|
||||||
|
├── os.nu # `skyg os` (local NixOS rebuild/switch/rollback)
|
||||||
|
├── remote.nu # `skyg remote *` (deploy, install, boot-all, status, reboot-pending)
|
||||||
|
├── secrets.nu # `skyg secrets list/show/edit/compare`
|
||||||
|
├── ca.nu # `skyg ca init/issue`
|
||||||
|
├── pkgs.nu # `skyg pkgs update`
|
||||||
|
├── flake.nu # `skyg flake update/check/check-versions`
|
||||||
|
├── build.nu # `skyg build image/openwrt`
|
||||||
|
├── render.nu # `skyg render html-tpl`
|
||||||
|
├── hm.nu # `skyg hm <action>`
|
||||||
|
├── helpers.nu # Shared helpers: REPO_ROOT const + internal functions
|
||||||
|
├── profile.nu # Profile helpers and tab-completion data
|
||||||
|
├── types.nu # Tab-completion completer functions
|
||||||
|
└── remote.utils.nu # Remote-specific helpers (boot info, wait-for-host, notify)
|
||||||
|
```
|
||||||
|
|
||||||
|
## Key Commands
|
||||||
|
|
||||||
|
| Command | Description |
|
||||||
|
| ------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
|
||||||
|
| `skyg os switch` | Rebuild and switch local system |
|
||||||
|
| `skyg os rollback` | Roll back to previous generation |
|
||||||
|
| `skyg remote switch <host>` | Deploy to a remote host |
|
||||||
|
| `skyg remote install <host>` | Fresh-install a remote host via nixos-anywhere, using `hosts/<profile>.disko.nix`. Always wipes the disks in that file. Aborts if the file is missing, if the host already boots NixOS from disk (unless `--force-wipe`), or if you do not type the short hostname. |
|
||||||
|
| `skyg remote status <host>` | Check status of a single remote host |
|
||||||
|
| `skyg remote status --all` | Check status of all remote hosts |
|
||||||
|
| `skyg remote boot-all` | Boot all remote hosts |
|
||||||
|
| `skyg remote reboot-pending` | Reboot every remote host with a pending reboot (`booted-system` != `current-system`). Lists them, asks for confirmation, then reboots one at a time, waiting for each to come back online and sending a desktop notification when it does. |
|
||||||
|
| `skyg hm switch` | Apply Home Manager config |
|
||||||
|
| `skyg flake update [input]` | Update flake inputs |
|
||||||
|
| `skyg flake check` | Run `nix flake check --no-build` |
|
||||||
|
| `skyg flake check-versions` | Verify NixOS release version consistency in flake.nix |
|
||||||
|
| `skyg build image iso\|pi1\|pi2` | Build bootable image — ISO (`iso`) or Pi SD card image (`pi1`, `pi2`) |
|
||||||
|
| `skyg build openwrt [router]` | Deploy OpenWrt config |
|
||||||
|
| `skyg profiles` | List valid local/remote profiles |
|
||||||
|
| `skyg secrets list` | List known secret names |
|
||||||
|
| `skyg secrets show <secret>` | Decrypt a secret to `.tmp/unencrypted-<secret>` |
|
||||||
|
| `skyg secrets edit <secret> [--yaml]` | Encrypt a working copy back into the secret |
|
||||||
|
| `skyg secrets compare <secret>` | Diff the working copy against the stored secret |
|
||||||
|
| `skyg ca init` | Generate the lab root CA: key → `secrets/lab-ca-key.age`, cert → `configs/pki/lab-ca.crt` (see `configs/pki/ABOUTME.md`) |
|
||||||
|
| `skyg ca issue <domain> --for <host>` | Mint a TLS leaf cert signed by the lab CA: cert → `configs/pki/<domain>.crt`, key → `secrets/<name>-tls-key.age`. Auto-registers missing `secrets.nix` entries. |
|
||||||
|
| `skyg pkgs update [--all\|<pkg>]` | Update one or all custom packages |
|
||||||
|
| `skyg render html-tpl <file>` | Render a Gitea `.tmpl` and serve it on `127.0.0.1` for preview. Foreground — Ctrl+C to stop. `<file>` tab-completes from `**/*.tmpl`. |
|
||||||
|
|
||||||
|
## Agent Note
|
||||||
|
|
||||||
|
> **Never invoke `skyg` commands that trigger builds or switches.**
|
||||||
|
> Only the user runs these. Edits to `cmds.nu` / `remote.nu` are safe if the user asks for CLI changes.
|
||||||
@@ -0,0 +1,101 @@
|
|||||||
|
# Temperature Monitor Script
|
||||||
|
|
||||||
|
A nushell script for monitoring your laptop's CPU/GPU temperatures, storing them with timestamps, and visualizing them as a graph.
|
||||||
|
|
||||||
|
## Features
|
||||||
|
|
||||||
|
- **Real-time monitoring**: Collects temperature readings at configurable intervals
|
||||||
|
- **Persistent storage**: Saves all readings to a CSV file with timestamps
|
||||||
|
- **Multiple sources**: Tries multiple methods to read temperature data (lm_sensors, acpi, sysfs)
|
||||||
|
- **ASCII graphs**: Displays temperature data as an ASCII bar graph
|
||||||
|
- **Flexible configuration**: Customize duration, interval, and output location
|
||||||
|
|
||||||
|
## Requirements
|
||||||
|
|
||||||
|
The script automatically detects and uses available tools. It will try these in order:
|
||||||
|
1. `sensors` (from `lm_sensors`) - **Recommended** - Most reliable
|
||||||
|
2. `acpi` - Fallback option
|
||||||
|
3. `/sys/class/thermal/thermal_zone0/temp` - Linux sysfs fallback
|
||||||
|
|
||||||
|
On NixOS, you can add these to your environment with:
|
||||||
|
```nix
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
lm_sensors
|
||||||
|
acpi
|
||||||
|
];
|
||||||
|
```
|
||||||
|
|
||||||
|
## Usage
|
||||||
|
|
||||||
|
### Basic usage (60-second collection with 2-second intervals)
|
||||||
|
```bash
|
||||||
|
./bin/temp-monitor
|
||||||
|
```
|
||||||
|
|
||||||
|
### Collect for 5 minutes with 5-second intervals
|
||||||
|
```bash
|
||||||
|
./bin/temp-monitor --duration 300 --interval 5
|
||||||
|
```
|
||||||
|
|
||||||
|
### Collect and display graph
|
||||||
|
```bash
|
||||||
|
./bin/temp-monitor --duration 60 --graph
|
||||||
|
```
|
||||||
|
|
||||||
|
### Custom output file location
|
||||||
|
```bash
|
||||||
|
./bin/temp-monitor --output ~/my-temps.csv --duration 120 --graph
|
||||||
|
```
|
||||||
|
|
||||||
|
### View stored data
|
||||||
|
```bash
|
||||||
|
cat ~/.cache/temp-data.csv
|
||||||
|
```
|
||||||
|
|
||||||
|
## Command-line Options
|
||||||
|
|
||||||
|
- `--duration <seconds>` - How long to collect data (default: 60)
|
||||||
|
- `--interval <seconds>` - Seconds between readings (default: 2)
|
||||||
|
- `--output <path>` - CSV file location (default: ~/.cache/temp-data.csv)
|
||||||
|
- `--graph` - Display ASCII graph after collection completes
|
||||||
|
|
||||||
|
## Output Format
|
||||||
|
|
||||||
|
The script stores data in CSV format with columns:
|
||||||
|
```
|
||||||
|
timestamp,cpu_temp,gpu_temp,max_temp
|
||||||
|
2024-07-11 14:30:45,65.5,N/A,65.5
|
||||||
|
2024-07-11 14:30:47,66.2,N/A,66.2
|
||||||
|
```
|
||||||
|
|
||||||
|
## Graph Example
|
||||||
|
|
||||||
|
```
|
||||||
|
2024-07-11 14:30:45: ████████████ 65.5°C
|
||||||
|
2024-07-11 14:30:47: ██████████████ 66.2°C
|
||||||
|
2024-07-11 14:30:49: ████████████████ 68.1°C
|
||||||
|
|
||||||
|
Min: 65.5°C | Max: 68.1°C | Range: 2.6°C
|
||||||
|
```
|
||||||
|
|
||||||
|
## Tips
|
||||||
|
|
||||||
|
- Run multiple instances with different `--output` files to track different time periods
|
||||||
|
- Use cron to collect continuous background data: `*/5 * * * * ~/nixos-setup/bin/temp-monitor --duration 1 --interval 1`
|
||||||
|
- High temperatures may indicate a need for thermal paste replacement or fan cleaning
|
||||||
|
- The graph is great for spotting thermal throttling or fan ramp-ups during workloads
|
||||||
|
|
||||||
|
## Troubleshooting
|
||||||
|
|
||||||
|
**No temperature readings (showing "N/A")**:
|
||||||
|
- Check if `sensors` is installed and working: `sensors`
|
||||||
|
- Check thermal zone: `cat /sys/class/thermal/thermal_zone0/temp`
|
||||||
|
- Run `sudo sensors-detect` to configure lm_sensors on first use
|
||||||
|
|
||||||
|
**Permission denied reading temperatures**:
|
||||||
|
- Some systems require sudo for detailed sensor access
|
||||||
|
- Try: `sudo ./bin/temp-monitor`
|
||||||
|
|
||||||
|
**CSV file grows too large**:
|
||||||
|
- Archive old data: `mv ~/.cache/temp-data.csv ~/.cache/temp-data-$(date +%s).csv`
|
||||||
|
- Or use `--output` with a date-stamped filename
|
||||||
Executable
+4
@@ -0,0 +1,4 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
|
LIB="$SCRIPT_DIR/lib/cmds.nu"
|
||||||
|
exec nu --commands "use \"$LIB\" *; skyg flake check-versions"
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
use types.nu *
|
||||||
|
use helpers.nu *
|
||||||
|
|
||||||
|
# Build a bootable image: ISO, or Pi SD card image (fully-baked, no on-device rebuild)
|
||||||
|
export def "skyg build image" [target: string@image-targets] {
|
||||||
|
cd $REPO_ROOT
|
||||||
|
let spec = (match $target {
|
||||||
|
"iso" => { config: "iso", out: "iso", attr: "isoImage" }
|
||||||
|
"pi1" => { config: "hl-pi1", out: "sd-image", attr: "sdImage" }
|
||||||
|
"pi2" => { config: "hl-pi2", out: "sd-image", attr: "sdImage" }
|
||||||
|
_ => { error make { msg: $"Unknown image target '($target)'. Expected: iso, pi1, pi2" } }
|
||||||
|
})
|
||||||
|
let imageBuildTime = date now | format date "%Y.%m.%d_%H_%M_%S"
|
||||||
|
let rootOutputFolder = $REPO_ROOT | path join "build" $spec.config
|
||||||
|
let outPutFolder = $rootOutputFolder | path join $imageBuildTime
|
||||||
|
rm -rf $rootOutputFolder
|
||||||
|
mkdir $rootOutputFolder
|
||||||
|
nix build $"#nixosConfigurations.($spec.config).config.system.build.($spec.attr)" -o $outPutFolder
|
||||||
|
printf $outPutFolder
|
||||||
|
}
|
||||||
|
|
||||||
|
# Deploy OpenWrt router configuration
|
||||||
|
export def "skyg build openwrt" [
|
||||||
|
router?: string@router-names,
|
||||||
|
--dry-run # Render configs to .tmp/openwrt-<router>/ without touching the router
|
||||||
|
] {
|
||||||
|
cd $REPO_ROOT
|
||||||
|
let router = $router | default "glmain"
|
||||||
|
let decrypted_file = skyg secrets show $"($router).json"
|
||||||
|
if $dry_run {
|
||||||
|
^cat $decrypted_file | nix run .#openwrt-($router)-dry-run -- ($router)
|
||||||
|
} else {
|
||||||
|
^cat $decrypted_file | nix run .#openwrt-($router)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,73 @@
|
|||||||
|
use types.nu *
|
||||||
|
use helpers.nu *
|
||||||
|
|
||||||
|
# Generate the lab root CA: key encrypted to secrets/lab-ca-key.age,
|
||||||
|
# public cert written to configs/pki/lab-ca.crt. Run once, before `ca issue`.
|
||||||
|
export def "skyg ca init" [
|
||||||
|
--days: int = 3650 # CA lifetime in days
|
||||||
|
] {
|
||||||
|
cd $REPO_ROOT
|
||||||
|
let cert = "configs/pki/lab-ca.crt"
|
||||||
|
let key_secret = "secrets/lab-ca-key.age"
|
||||||
|
if ($cert | path exists) {
|
||||||
|
error make {msg: $"($cert) already exists — refusing to overwrite the CA. Delete it manually to rotate."}
|
||||||
|
}
|
||||||
|
ensure-secret-entry $key_secret ["ari"]
|
||||||
|
mkdir .tmp configs/pki
|
||||||
|
let tmp_key = ".tmp/lab-ca-key.pem"
|
||||||
|
(openssl req -x509 -newkey rsa:4096 -sha256 -days $days -nodes
|
||||||
|
-keyout $tmp_key -out $cert
|
||||||
|
-subj "/CN=Skyg Lab CA"
|
||||||
|
-addext "basicConstraints=critical,CA:TRUE"
|
||||||
|
-addext "keyUsage=critical,keyCertSign,cRLSign")
|
||||||
|
^cat $tmp_key | agenix -e $key_secret
|
||||||
|
rm -f $tmp_key
|
||||||
|
print $"✅ CA cert: ($cert) — commit this"
|
||||||
|
print $"✅ CA key encrypted: ($key_secret)"
|
||||||
|
print "Next: skyg ca issue <domain> --for <host>"
|
||||||
|
}
|
||||||
|
|
||||||
|
# Issue a TLS cert for a domain, signed by the lab CA.
|
||||||
|
# Writes configs/pki/<domain>.crt; encrypts the key to secrets/<name>-tls-key.age.
|
||||||
|
export def "skyg ca issue" [
|
||||||
|
domain: string # e.g. buzz.app.internal
|
||||||
|
--for: string@ca-recipients # secrets.nix key name allowed to decrypt the leaf key (e.g. minipc1)
|
||||||
|
--days: int = 825 # leaf lifetime (825 = browser max)
|
||||||
|
--name: string # secret slug override (default: first DNS label)
|
||||||
|
] {
|
||||||
|
cd $REPO_ROOT
|
||||||
|
let ca_cert = "configs/pki/lab-ca.crt"
|
||||||
|
let ca_key_secret = "secrets/lab-ca-key.age"
|
||||||
|
if not ($ca_cert | path exists) {
|
||||||
|
error make {msg: "No CA found — run `skyg ca init` first"}
|
||||||
|
}
|
||||||
|
let key_names = (^cat secrets.nix | parse --regex '(\w+) = "ssh-' | get capture0)
|
||||||
|
if ($for not-in $key_names) {
|
||||||
|
error make {msg: $"Unknown recipient '($for)'. Known: ($key_names | str join ', ')"}
|
||||||
|
}
|
||||||
|
let slug = $name | default ($domain | split row "." | first)
|
||||||
|
let secret = $"secrets/($slug)-tls-key.age"
|
||||||
|
let cert = $"configs/pki/($domain).crt"
|
||||||
|
if ($cert | path exists) {
|
||||||
|
error make {msg: $"($cert) already exists — delete it manually to re-issue."}
|
||||||
|
}
|
||||||
|
ensure-secret-entry $secret ["ari" $for]
|
||||||
|
mkdir .tmp configs/pki
|
||||||
|
let ca_key = ".tmp/lab-ca-key.pem"
|
||||||
|
agenix -d $ca_key_secret | save -f $ca_key
|
||||||
|
let leaf_key = $".tmp/($slug)-tls-key.pem"
|
||||||
|
let csr = $".tmp/($slug).csr"
|
||||||
|
let ext = $".tmp/($slug)-ext.cnf"
|
||||||
|
$"basicConstraints=critical,CA:FALSE\nkeyUsage=critical,digitalSignature,keyEncipherment\nextendedKeyUsage=serverAuth\nsubjectAltName=DNS:($domain)\n" | save -f $ext
|
||||||
|
(openssl req -newkey rsa:2048 -nodes
|
||||||
|
-keyout $leaf_key -out $csr
|
||||||
|
-subj $"/CN=($domain)")
|
||||||
|
(openssl x509 -req -in $csr
|
||||||
|
-CA $ca_cert -CAkey $ca_key -CAcreateserial
|
||||||
|
-out $cert -days $days -sha256 -extfile $ext)
|
||||||
|
^cat $leaf_key | agenix -e $secret
|
||||||
|
rm -f $ca_key $leaf_key $csr $ext
|
||||||
|
print $"✅ Cert: ($cert) — commit this"
|
||||||
|
print $"✅ Key encrypted: ($secret)"
|
||||||
|
print $"Wire it up: age.secrets.($slug)-tls-key.file = ../($secret);"
|
||||||
|
}
|
||||||
@@ -0,0 +1,89 @@
|
|||||||
|
use types.nu *
|
||||||
|
use profile.nu *
|
||||||
|
use helpers.nu *
|
||||||
|
export use remote.nu *
|
||||||
|
export use os.nu *
|
||||||
|
export use secrets.nu *
|
||||||
|
export use ca.nu *
|
||||||
|
export use pkgs.nu *
|
||||||
|
export use flake.nu *
|
||||||
|
export use build.nu *
|
||||||
|
export use render.nu *
|
||||||
|
export use hm.nu *
|
||||||
|
|
||||||
|
export def skyg [] {
|
||||||
|
print $REPO_ROOT
|
||||||
|
let subcmds = (help commands |
|
||||||
|
where name starts-with "skyg " |
|
||||||
|
each {|c| $c.name | split row " " | get 1 } |
|
||||||
|
uniq | str join ', ')
|
||||||
|
print $"Subcommands: ($subcmds)"
|
||||||
|
print "Run: skyg <subcommand> --help"
|
||||||
|
}
|
||||||
|
|
||||||
|
export def "skyg profiles" [only_remote: bool = false] {
|
||||||
|
if $only_remote {
|
||||||
|
valid_remote_profiles | print
|
||||||
|
} else {
|
||||||
|
valid_profiles | print
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
# --- Deprecated aliases (backward compatibility) ---
|
||||||
|
|
||||||
|
export def "skyg decrypt" [secret: string@secret-names] {
|
||||||
|
print $"(ansi yellow)Deprecated: use `skyg secrets show` instead(ansi reset)"
|
||||||
|
skyg secrets show $secret
|
||||||
|
}
|
||||||
|
|
||||||
|
export def "skyg encrypt" [
|
||||||
|
secret: string@secret-names,
|
||||||
|
source?: string,
|
||||||
|
--yaml
|
||||||
|
] {
|
||||||
|
print $"(ansi yellow)Deprecated: use `skyg secrets edit` instead(ansi reset)"
|
||||||
|
skyg secrets edit $secret $source --yaml=$yaml
|
||||||
|
}
|
||||||
|
|
||||||
|
export def "skyg compare-secret" [secret: string@secret-names] {
|
||||||
|
print $"(ansi yellow)Deprecated: use `skyg secrets compare` instead(ansi reset)"
|
||||||
|
skyg secrets compare $secret
|
||||||
|
}
|
||||||
|
|
||||||
|
export def "skyg secrets" [] {
|
||||||
|
print $"(ansi yellow)Deprecated: use `skyg secrets list` instead(ansi reset)"
|
||||||
|
skyg secrets list
|
||||||
|
}
|
||||||
|
|
||||||
|
export def "skyg rollback" [] {
|
||||||
|
print $"(ansi yellow)Deprecated: use `skyg os rollback` instead(ansi reset)"
|
||||||
|
skyg os rollback
|
||||||
|
}
|
||||||
|
|
||||||
|
export def "skyg update" [input_name?: string] {
|
||||||
|
print $"(ansi yellow)Deprecated: use `skyg flake update` instead(ansi reset)"
|
||||||
|
skyg flake update $input_name
|
||||||
|
}
|
||||||
|
|
||||||
|
export def "skyg check" [] {
|
||||||
|
print $"(ansi yellow)Deprecated: use `skyg flake check` instead(ansi reset)"
|
||||||
|
skyg flake check
|
||||||
|
}
|
||||||
|
|
||||||
|
export def "skyg check-flake-versions" [] {
|
||||||
|
print $"(ansi yellow)Deprecated: use `skyg flake check-versions` instead(ansi reset)"
|
||||||
|
skyg flake check-versions
|
||||||
|
}
|
||||||
|
|
||||||
|
export def "skyg build-image" [target: string] {
|
||||||
|
print $"(ansi yellow)Deprecated: use `skyg build image` instead(ansi reset)"
|
||||||
|
skyg build image $target
|
||||||
|
}
|
||||||
|
|
||||||
|
export def "skyg openwrt" [
|
||||||
|
router?: string,
|
||||||
|
--dry-run
|
||||||
|
] {
|
||||||
|
print $"(ansi yellow)Deprecated: use `skyg build openwrt` instead(ansi reset)"
|
||||||
|
skyg build openwrt $router --dry-run=$dry_run
|
||||||
|
}
|
||||||
@@ -0,0 +1,57 @@
|
|||||||
|
use types.nu *
|
||||||
|
use helpers.nu *
|
||||||
|
|
||||||
|
# update some flakes
|
||||||
|
export def "skyg flake update" [input_name?: string@flake-inputs] {
|
||||||
|
cd $REPO_ROOT
|
||||||
|
if $input_name == null {
|
||||||
|
print "Updating all flakes..."
|
||||||
|
nix flake update | print
|
||||||
|
} else {
|
||||||
|
print $"Updating flake: ($input_name)"
|
||||||
|
nix flake update $input_name | print
|
||||||
|
}
|
||||||
|
git diff flake.lock | print
|
||||||
|
}
|
||||||
|
|
||||||
|
# Run nix flake check
|
||||||
|
export def "skyg flake check" [] {
|
||||||
|
nix flake check --no-build
|
||||||
|
}
|
||||||
|
|
||||||
|
# Validate that all versioned flake inputs use the same NixOS release
|
||||||
|
export def "skyg flake check-versions" [] {
|
||||||
|
let flake = "flake.nix"
|
||||||
|
|
||||||
|
if not ($flake | path exists) {
|
||||||
|
print "check-versions: flake.nix not found, skipping"
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
# Only scan url lines to avoid false positives from embedded script strings
|
||||||
|
let url_lines = (open $flake | lines | enumerate | where { |row|
|
||||||
|
($row.item | str contains "url") and ($row.item =~ 'release-\d+\.\d+')
|
||||||
|
})
|
||||||
|
|
||||||
|
let versions = ($url_lines
|
||||||
|
| each {|row| $row.item | parse --regex '.*release-(?P<version>\d+\.\d+).*' | get version }
|
||||||
|
| flatten
|
||||||
|
| uniq)
|
||||||
|
|
||||||
|
if ($versions | length) <= 1 {
|
||||||
|
print "check-versions: OK"
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
print "check-versions: mismatched NixOS release versions in flake.nix:"
|
||||||
|
print ""
|
||||||
|
for version in $versions {
|
||||||
|
print $" release-($version):"
|
||||||
|
$url_lines | where {|row| $row.item | str contains $"release-($version)" } | each { |row|
|
||||||
|
print $" line ($row.index + 1): ($row.item | str trim)"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
print ""
|
||||||
|
print "All versioned inputs (home-manager, stylix, etc.) must use the same NixOS release."
|
||||||
|
error make {msg: "Mismatched NixOS release versions"}
|
||||||
|
}
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
export const REPO_ROOT = path self | path dirname | path dirname | path dirname
|
||||||
|
|
||||||
|
# Insert a secrets.nix entry for the given secret path if missing.
|
||||||
|
export def ensure-secret-entry [secret_path: string, recipients: list<string>] {
|
||||||
|
let file = "secrets.nix"
|
||||||
|
# Read via external cat — `open` type-guessing on .nix files is unreliable.
|
||||||
|
let content = (^cat $file)
|
||||||
|
if ($content | str contains $secret_path) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
let entry = $' "($secret_path)".publicKeys = [ ($recipients | str join " ") ];'
|
||||||
|
let lines = ($content | lines)
|
||||||
|
# Insert before the final top-level closing brace.
|
||||||
|
let closing = ($lines | enumerate | where item == "}" | last)
|
||||||
|
if $closing == null {
|
||||||
|
error make {msg: $"Could not find the final '}' in ($file) — refusing to edit"}
|
||||||
|
}
|
||||||
|
let new_lines = ($lines | insert $closing.index $entry)
|
||||||
|
($new_lines | str join "\n") + "\n" | save -f $file
|
||||||
|
print $"📝 Registered ($secret_path) in secrets.nix — review with git diff"
|
||||||
|
}
|
||||||
|
|
||||||
|
# Render a Gitea-style Go template to a standalone HTML file for local preview.
|
||||||
|
# Swaps the base/head + base/footer includes for a minimal shell and drops any
|
||||||
|
# remaining {{ ... }} directives so the page opens in a plain browser.
|
||||||
|
export def render-html-tpl [src: string, out: string] {
|
||||||
|
let head = '<!DOCTYPE html>
|
||||||
|
<html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1"><title>Template preview</title><style>html,body{margin:0;background:#f6f8fa;font-family:system-ui,-apple-system,"Segoe UI",Roboto,sans-serif;color:#1f2328;}</style></head><body>'
|
||||||
|
let foot = '</body></html>'
|
||||||
|
# Read via external cat — `open` is aliased to xdg-open in some Nu configs.
|
||||||
|
^cat $src
|
||||||
|
| str replace -a '{{template "base/head" .}}' $head
|
||||||
|
| str replace -a '{{template "base/footer" .}}' $foot
|
||||||
|
| str replace -a -r '\{\{[^}]*\}\}' ''
|
||||||
|
| save -f $out
|
||||||
|
}
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
use types.nu *
|
||||||
|
use profile.nu *
|
||||||
|
use helpers.nu *
|
||||||
|
|
||||||
|
# Home Manager operations
|
||||||
|
export def "skyg hm" [
|
||||||
|
action: string@hm-actions,
|
||||||
|
profile: string@valid_profiles = "ari",
|
||||||
|
] {
|
||||||
|
cd $REPO_ROOT
|
||||||
|
$"Running home-manager ($action) for profile ($profile)" | print
|
||||||
|
home-manager $action --flake $".#($profile)"
|
||||||
|
}
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
use types.nu *
|
||||||
|
use profile.nu *
|
||||||
|
use helpers.nu *
|
||||||
|
|
||||||
|
# Build local os
|
||||||
|
export def "skyg os" [
|
||||||
|
cmd: string@os-actions,
|
||||||
|
--build-host: string@remote_targets = "",
|
||||||
|
] {
|
||||||
|
cd $REPO_ROOT
|
||||||
|
mut runcmd = $"nh os ($cmd)"
|
||||||
|
if $build_host != "" {
|
||||||
|
$runcmd = $"($runcmd) --build-host ($build_host).lab.internal"
|
||||||
|
}
|
||||||
|
$runcmd | print
|
||||||
|
bash -c $runcmd
|
||||||
|
}
|
||||||
|
|
||||||
|
# rollback configuration
|
||||||
|
export def "skyg os rollback" [] {
|
||||||
|
sudo nixos-rebuild switch --rollback
|
||||||
|
}
|
||||||
@@ -0,0 +1,67 @@
|
|||||||
|
use types.nu *
|
||||||
|
use helpers.nu *
|
||||||
|
|
||||||
|
# Update one or all packages. With a version, bumps explicitly.
|
||||||
|
# Without a version, auto-detects the latest from upstream.
|
||||||
|
#
|
||||||
|
# skyg pkgs update --all
|
||||||
|
# skyg pkgs update buzz-desktop
|
||||||
|
# skyg pkgs update buzz-desktop 0.6.0
|
||||||
|
export def "skyg pkgs update" [
|
||||||
|
pkg_name?: string@updatable-pkgs # Package to update (omit with --all)
|
||||||
|
version?: string # Explicit version (omit for auto-detect)
|
||||||
|
--all # Update all packages that have update.sh
|
||||||
|
] {
|
||||||
|
cd $REPO_ROOT
|
||||||
|
|
||||||
|
if $all and $version != null {
|
||||||
|
error make {msg: "Cannot use --all with a specific version. Run without --all to bump a single package."}
|
||||||
|
}
|
||||||
|
|
||||||
|
let targets = if $all {
|
||||||
|
updatable-pkgs
|
||||||
|
} else if $pkg_name != null {
|
||||||
|
[$pkg_name]
|
||||||
|
} else {
|
||||||
|
error make {msg: "Specify a package name or use --all to update all packages"}
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($targets | length) == 0 {
|
||||||
|
print "No updatable packages found (no pkgs/*/update.sh scripts)"
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
print $"Updating ($targets | length) package\(s): ($targets | str join ', ')"
|
||||||
|
print ""
|
||||||
|
|
||||||
|
for pkg in $targets {
|
||||||
|
let update_script = $"pkgs/($pkg)/update.sh"
|
||||||
|
if not ($update_script | path exists) {
|
||||||
|
print $"⚠️ Skipping ($pkg) — no update.sh"
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
print $"=== ($pkg) ==="
|
||||||
|
cd $"pkgs/($pkg)"
|
||||||
|
try {
|
||||||
|
if $version != null {
|
||||||
|
bash $"update.sh ($version)" | print
|
||||||
|
} else {
|
||||||
|
bash "update.sh" | print
|
||||||
|
}
|
||||||
|
} catch { |e|
|
||||||
|
print $"❌ Failed to update ($pkg): ($e)"
|
||||||
|
}
|
||||||
|
cd $REPO_ROOT
|
||||||
|
print ""
|
||||||
|
}
|
||||||
|
|
||||||
|
print ""
|
||||||
|
if $version != null {
|
||||||
|
print "Bump complete. Review with:"
|
||||||
|
git --no-pager diff pkgs/ | print
|
||||||
|
} else {
|
||||||
|
print "All updates complete. Review with:"
|
||||||
|
git --no-pager diff pkgs/ | print
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
const REPO_ROOT = path self | path dirname | path dirname | path dirname
|
||||||
|
|
||||||
|
export def valid_profiles [] {
|
||||||
|
cd $REPO_ROOT
|
||||||
|
nix eval .#nixosConfigurations --apply 'builtins.attrNames' --json err> /dev/null
|
||||||
|
| from json
|
||||||
|
}
|
||||||
|
|
||||||
|
export def valid_remote_profiles [] {
|
||||||
|
valid_profiles | where {|p| $p | str starts-with "hl-" }
|
||||||
|
}
|
||||||
|
|
||||||
|
export def remote_targets [] {
|
||||||
|
valid_remote_profiles | each {|p| $p | str replace "hl-" "" }
|
||||||
|
}
|
||||||
|
|
||||||
|
export def is-valid-profile [name: string, on_remote: bool = false] {
|
||||||
|
let pool = if $on_remote { valid_remote_profiles } else { valid_profiles }
|
||||||
|
($pool | where {|p| $p == $name} | length) == 1
|
||||||
|
}
|
||||||
@@ -0,0 +1,354 @@
|
|||||||
|
use types.nu *
|
||||||
|
use profile.nu *
|
||||||
|
use helpers.nu *
|
||||||
|
use remote.utils.nu *
|
||||||
|
|
||||||
|
# Deploy to remote machine
|
||||||
|
export def "skyg remote" [
|
||||||
|
cmd: string@os-actions,
|
||||||
|
target: string@remote_targets = "",
|
||||||
|
--build-host: string@remote_targets = "", # Optional remote builder host (e.g. builder.lab.internal)
|
||||||
|
] {
|
||||||
|
cd $REPO_ROOT
|
||||||
|
mut target_host = $"root@($target).lab.internal"
|
||||||
|
mut profile = $"hl-($target)"
|
||||||
|
if not (is-valid-profile $profile true) {
|
||||||
|
print $"Invalid Remote Profile '(ansi green_bold)($target)(ansi reset)', please select one of:"
|
||||||
|
return (remote_targets)
|
||||||
|
}
|
||||||
|
$"Using [(ansi green_bold)($profile)(ansi reset)]" | print
|
||||||
|
$"($cmd) on ($target_host) with ($profile)" | print
|
||||||
|
mut runcmd = $"nh os ($cmd) --no-nom --target-host ($target_host) --ask .#($profile)"
|
||||||
|
if $build_host != "" {
|
||||||
|
$runcmd = $"($runcmd) --build-host ($build_host).lab.internal"
|
||||||
|
}
|
||||||
|
$runcmd | print
|
||||||
|
bash -c $runcmd
|
||||||
|
}
|
||||||
|
|
||||||
|
# Fresh-install a remote machine via nixos-anywhere, using its disko config.
|
||||||
|
# Always reformats every disk in the disko file — a second run is as destructive as the first.
|
||||||
|
# Missing disko file, live disk OS (without --force-wipe), or mistyped hostname all abort.
|
||||||
|
export def "skyg remote install" [
|
||||||
|
target: string@remote_targets,
|
||||||
|
--force-wipe, # wipe even if the host already runs NixOS from disk
|
||||||
|
] {
|
||||||
|
cd $REPO_ROOT
|
||||||
|
let target_host = $"root@($target).lab.internal"
|
||||||
|
let profile = $"hl-($target)"
|
||||||
|
if not (is-valid-profile $profile true) {
|
||||||
|
print $"Invalid Remote Profile '(ansi green_bold)($target)(ansi reset)', please select one of:"
|
||||||
|
return (remote_targets)
|
||||||
|
}
|
||||||
|
let disko_file = $"hosts/($profile).disko.nix"
|
||||||
|
if not ($disko_file | path exists) {
|
||||||
|
error make {msg: $"Missing disko config: ($disko_file). Refusing to install ($profile) without a disko layout."}
|
||||||
|
}
|
||||||
|
|
||||||
|
print ""
|
||||||
|
print $"(ansi red_bold)WARNING: this WIPES every disk listed in ($disko_file).(ansi reset)"
|
||||||
|
print "This is not a switch. Use `skyg remote switch` / `skyg remote boot` to update an installed host."
|
||||||
|
print ""
|
||||||
|
print "Disks in the disko file:"
|
||||||
|
let disks = (
|
||||||
|
open $disko_file
|
||||||
|
| lines
|
||||||
|
| where {|l| ($l | str contains "device") and ($l | str contains "=") }
|
||||||
|
| each {|l| $l | str trim }
|
||||||
|
)
|
||||||
|
for line in $disks {
|
||||||
|
print $" ($line)"
|
||||||
|
}
|
||||||
|
print ""
|
||||||
|
|
||||||
|
let ssh = $"ssh -o BatchMode=yes -o ConnectTimeout=5 -o StrictHostKeyChecking=accept-new ($target_host)"
|
||||||
|
let root_fstype = (try {
|
||||||
|
bash -c $"($ssh) 'findmnt -n -o FSTYPE /' 2>/dev/null" | str trim
|
||||||
|
} catch { "" })
|
||||||
|
|
||||||
|
if $root_fstype == "" {
|
||||||
|
print $"(ansi yellow)Could not SSH to ($target_host) to check for a live OS.(ansi reset)"
|
||||||
|
} else {
|
||||||
|
print $"Remote / fstype: ($root_fstype)"
|
||||||
|
let installer_fs = ["overlay" "tmpfs" "squashfs"]
|
||||||
|
if not ($root_fstype in $installer_fs) {
|
||||||
|
if not $force_wipe {
|
||||||
|
error make {msg: $"($target_host) already boots from disk (root fstype ($root_fstype)). Refusing to wipe. Use `skyg remote switch ($target)` to update, or pass --force-wipe to reinstall."}
|
||||||
|
}
|
||||||
|
print $"(ansi yellow)--force-wipe set: proceeding against a live disk OS.(ansi reset)"
|
||||||
|
} else {
|
||||||
|
print "Remote looks like an installer live image (ok to install)."
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let confirm = input $"Type ($target) to continue: " | str trim
|
||||||
|
if $confirm != $target {
|
||||||
|
error make {msg: $"Aborted: typed '($confirm)', expected '($target)'."}
|
||||||
|
}
|
||||||
|
|
||||||
|
$"Installing [(ansi green_bold)($profile)(ansi reset)] on ($target_host) via nixos-anywhere, using ($disko_file)" | print
|
||||||
|
let runcmd = $"nix run github:nix-community/nixos-anywhere -- --flake .#($profile) ($target_host)"
|
||||||
|
$runcmd | print
|
||||||
|
let bash_path = which bash | get 0.path
|
||||||
|
with-env { SHELL: $bash_path } {
|
||||||
|
bash -c $runcmd
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
# Boot all remote hosts except the current machine (fwbook)
|
||||||
|
# Checks online status first, runs `skyg remote boot --build-host fwdesk <host>` for each online host,
|
||||||
|
# and writes a summary report to .tmp/boot-report.txt
|
||||||
|
|
||||||
|
export def "skyg remote boot-all" [] {
|
||||||
|
cd $REPO_ROOT
|
||||||
|
mkdir .tmp
|
||||||
|
let current_host = "fwbook"
|
||||||
|
let report_file = ".tmp/boot-report.txt"
|
||||||
|
|
||||||
|
# Discover remote targets from the flake (same logic as skyg remote)
|
||||||
|
let all_hosts = remote_targets | where {|h| $h != $current_host }
|
||||||
|
|
||||||
|
print $"Found ($all_hosts | length) candidate hosts excluding ($current_host)"
|
||||||
|
|
||||||
|
mut successes = []
|
||||||
|
mut failures = []
|
||||||
|
mut skipped = []
|
||||||
|
|
||||||
|
# Phase 1: sequential SSH reachability checks (fast)
|
||||||
|
mut online_hosts = []
|
||||||
|
for host in $all_hosts {
|
||||||
|
print $"\n=== Checking ($host) ==="
|
||||||
|
let target = $"root@($host).lab.internal"
|
||||||
|
let is_online = (try {
|
||||||
|
bash -c $"ssh -o BatchMode=yes -o ConnectTimeout=3 -o StrictHostKeyChecking=accept-new ($target) 'true' >/dev/null 2>&1"
|
||||||
|
true
|
||||||
|
} catch { false })
|
||||||
|
|
||||||
|
if not $is_online {
|
||||||
|
print $"(ansi yellow)OFFLINE(ansi reset): ($host)"
|
||||||
|
$skipped = ($skipped | append $host)
|
||||||
|
} else {
|
||||||
|
print $"(ansi green)ONLINE(ansi reset): ($host)"
|
||||||
|
$online_hosts = ($online_hosts | append $host)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
# Phase 2: run boots in parallel (2 concurrent) without interactive prompts
|
||||||
|
if ($online_hosts | length) > 0 {
|
||||||
|
print "
|
||||||
|
Starting parallel boots (concurrency: 2)..."
|
||||||
|
let boot_results = ($online_hosts | par-each --threads 1 { |host|
|
||||||
|
let target_host = $"root@($host).lab.internal"
|
||||||
|
let profile = $"hl-($host)"
|
||||||
|
let runcmd = $"nh os boot --target-host ($target_host) .#($profile)"
|
||||||
|
print $runcmd
|
||||||
|
let ok = (try {
|
||||||
|
bash -c $runcmd
|
||||||
|
true
|
||||||
|
} catch {
|
||||||
|
false
|
||||||
|
})
|
||||||
|
{host: $host, success: $ok}
|
||||||
|
})
|
||||||
|
|
||||||
|
for r in $boot_results {
|
||||||
|
if $r.success {
|
||||||
|
$successes = ($successes | append $r.host)
|
||||||
|
print $"(ansi green)SUCCESS(ansi reset): ($r.host)"
|
||||||
|
} else {
|
||||||
|
$failures = ($failures | append $r.host)
|
||||||
|
print $"(ansi red)FAILED(ansi reset): ($r.host)"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
# Write report
|
||||||
|
let timestamp = date now | format date "%Y-%m-%d %H:%M:%S"
|
||||||
|
let report = $"Boot Report - ($timestamp)
|
||||||
|
|
||||||
|
Total hosts considered: ($all_hosts | length)
|
||||||
|
Skipped offline: ($skipped | length) - ($skipped | str join ', ')
|
||||||
|
Successful: ($successes | length) - ($successes | str join ', ')
|
||||||
|
Failed: ($failures | length) - ($failures | str join ', ')
|
||||||
|
|
||||||
|
Details:
|
||||||
|
Online & Booted: ($successes | str join ', ')
|
||||||
|
Offline: ($skipped | str join ', ')
|
||||||
|
Failed: ($failures | str join ', ')
|
||||||
|
"
|
||||||
|
|
||||||
|
$report | save -f $report_file
|
||||||
|
print $"
|
||||||
|
Report written to ($report_file)"
|
||||||
|
print $report
|
||||||
|
}
|
||||||
|
|
||||||
|
export def "skyg remote status" [
|
||||||
|
target?: string@remote_targets,
|
||||||
|
--all # Check status of all remote hosts
|
||||||
|
] {
|
||||||
|
if $all {
|
||||||
|
skyg remote status-all
|
||||||
|
} else if $target != null {
|
||||||
|
get-remote-boot-info $target
|
||||||
|
} else {
|
||||||
|
error make {msg: "Specify a target host or use --all"}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
# Check status of all remotes: generation, pending reboot, needs rebuild
|
||||||
|
export def "skyg remote status-all" [] {
|
||||||
|
cd $REPO_ROOT
|
||||||
|
mkdir .tmp
|
||||||
|
let current_host = "fwbook"
|
||||||
|
let report_file = ".tmp/status-report.txt"
|
||||||
|
|
||||||
|
let all_hosts = remote_targets | where {|h| $h != $current_host }
|
||||||
|
print $"Checking status for ($all_hosts | length) remotes..."
|
||||||
|
|
||||||
|
let results = ($all_hosts | par-each { |host|
|
||||||
|
let info = get-remote-boot-info $host
|
||||||
|
|
||||||
|
# Print each host's status as one block, as soon as it finishes.
|
||||||
|
let booted = (if ($info.booted | is-empty) { "-" } else { $info.booted | path basename })
|
||||||
|
let current = (if ($info.current | is-empty) { "-" } else { $info.current | path basename })
|
||||||
|
let reboot_line = if $info.reboot_pending { $"(ansi yellow)REBOOT PENDING(ansi reset)\n" } else { "" }
|
||||||
|
let build_line = if $info.needs_build { $"(ansi red)NEEDS NEW BUILD(ansi reset)" } else { $"(ansi green)UP TO DATE(ansi reset)" }
|
||||||
|
print $"($host) | Booted: ($booted) | Current: ($current)"
|
||||||
|
|
||||||
|
$info
|
||||||
|
})
|
||||||
|
|
||||||
|
return ($results | select host status reboot_pending needs_build)
|
||||||
|
}
|
||||||
|
|
||||||
|
# Reboot every remote host that is pending a reboot (booted-system != current-system).
|
||||||
|
# Detects pending hosts, lists them, asks for confirmation, then reboots each one at a
|
||||||
|
# time, waiting for it to come back online and sending a desktop notification when it does.
|
||||||
|
export def "skyg remote reboot-pending" [] {
|
||||||
|
cd $REPO_ROOT
|
||||||
|
mkdir .tmp
|
||||||
|
let current_host = "fwbook"
|
||||||
|
let report_file = ".tmp/reboot-pending-report.txt"
|
||||||
|
|
||||||
|
let all_hosts = remote_targets | where {|h| $h != $current_host }
|
||||||
|
print $"Checking ($all_hosts | length) remotes for pending reboots..."
|
||||||
|
|
||||||
|
# Phase 1: find hosts that are online and pending a reboot
|
||||||
|
mut pending = []
|
||||||
|
mut offline = []
|
||||||
|
mut up_to_date = []
|
||||||
|
|
||||||
|
for host in $all_hosts {
|
||||||
|
let target = $"root@($host).lab.internal"
|
||||||
|
let online = (try {
|
||||||
|
bash -c $"ssh -o BatchMode=yes -o ConnectTimeout=3 -o StrictHostKeyChecking=accept-new ($target) 'true' >/dev/null 2>&1"
|
||||||
|
true
|
||||||
|
} catch { false })
|
||||||
|
|
||||||
|
if not $online {
|
||||||
|
print $"(ansi yellow)OFFLINE(ansi reset): ($host)"
|
||||||
|
$offline = ($offline | append $host)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
let info = (try {
|
||||||
|
let booted = bash -c $"ssh -o BatchMode=yes ($target) 'readlink /run/booted-system' 2>/dev/null" | str trim
|
||||||
|
let current = bash -c $"ssh -o BatchMode=yes ($target) 'readlink /run/current-system' 2>/dev/null" | str trim
|
||||||
|
{booted: $booted, current: $current, pending: ($booted != $current)}
|
||||||
|
} catch {
|
||||||
|
{booted: "", current: "", pending: false}
|
||||||
|
})
|
||||||
|
|
||||||
|
if $info.pending {
|
||||||
|
print $"(ansi blue)REBOOT PENDING(ansi reset): ($host) booted=($info.booted | path basename) current=($info.current | path basename)"
|
||||||
|
$pending = ($pending | append $host)
|
||||||
|
} else {
|
||||||
|
print $"(ansi green)UP TO DATE(ansi reset): ($host)"
|
||||||
|
$up_to_date = ($up_to_date | append $host)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($pending | length) == 0 {
|
||||||
|
print ""
|
||||||
|
print "No remotes are pending a reboot."
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
# Phase 2: confirm before rebooting anything
|
||||||
|
print ""
|
||||||
|
print $"(ansi yellow_bold)($pending | length) remote\(s\) pending a reboot:(ansi reset)"
|
||||||
|
for host in $pending {
|
||||||
|
print $" - ($host)"
|
||||||
|
}
|
||||||
|
print ""
|
||||||
|
let confirm = (input $"Reboot these ($pending | length) host\(s\)? [y/N]: " | str trim | str downcase)
|
||||||
|
if not ($confirm in ["y" "yes"]) {
|
||||||
|
print "Aborted — no hosts were rebooted."
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
# Phase 3: reboot each pending host one at a time, waiting for it to come back
|
||||||
|
mut rebooted = []
|
||||||
|
mut failed = []
|
||||||
|
for host in $pending {
|
||||||
|
let target = $"root@($host).lab.internal"
|
||||||
|
print $"\n=== Rebooting ($host) ==="
|
||||||
|
|
||||||
|
# Capture the boot id so we can confirm the host actually rebooted.
|
||||||
|
let boot_id_before = (try {
|
||||||
|
bash -c $"ssh -o BatchMode=yes ($target) 'cat /proc/sys/kernel/random/boot_id' 2>/dev/null" | str trim
|
||||||
|
} catch { "" })
|
||||||
|
|
||||||
|
let runcmd = $"ssh -o BatchMode=yes -o ConnectTimeout=5 ($target) 'systemctl reboot'"
|
||||||
|
print $runcmd
|
||||||
|
# The SSH connection drops as the host shuts down, so a non-zero exit is
|
||||||
|
# expected here and does not mean the reboot failed.
|
||||||
|
try {
|
||||||
|
bash -c $"($runcmd) 2>/dev/null"
|
||||||
|
} catch { }
|
||||||
|
|
||||||
|
print $"Waiting for ($host) to shut down..."
|
||||||
|
let went_down = (wait-for-host $target false 90)
|
||||||
|
if not $went_down {
|
||||||
|
print $"(ansi yellow)($host) did not go offline within 90s — continuing to wait for it to come back.(ansi reset)"
|
||||||
|
}
|
||||||
|
|
||||||
|
print $"Waiting for ($host) to come back online..."
|
||||||
|
let came_up = (wait-for-host $target true 300)
|
||||||
|
if $came_up {
|
||||||
|
let boot_id_after = (try {
|
||||||
|
bash -c $"ssh -o BatchMode=yes ($target) 'cat /proc/sys/kernel/random/boot_id' 2>/dev/null" | str trim
|
||||||
|
} catch { "" })
|
||||||
|
let confirmed = ($boot_id_before != "" and $boot_id_after != "" and $boot_id_before != $boot_id_after)
|
||||||
|
if $confirmed {
|
||||||
|
print $"(ansi green)($host) is back online (reboot confirmed)(ansi reset)"
|
||||||
|
} else {
|
||||||
|
print $"(ansi green)($host) is back online(ansi reset)"
|
||||||
|
}
|
||||||
|
notify $"✅ ($host) rebooted" "Back online and reachable"
|
||||||
|
$rebooted = ($rebooted | append $host)
|
||||||
|
} else {
|
||||||
|
print $"(ansi red)($host) did not come back online within 300s(ansi reset)"
|
||||||
|
notify $"❌ ($host) did not come back" "Still unreachable after 300s"
|
||||||
|
$failed = ($failed | append $host)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
# Write report
|
||||||
|
let timestamp = date now | format date "%Y-%m-%d %H:%M:%S"
|
||||||
|
let report = $"Reboot-Pending Report - ($timestamp)
|
||||||
|
|
||||||
|
Total hosts considered: ($all_hosts | length)
|
||||||
|
Pending reboot: ($pending | length) - ($pending | str join ', ')
|
||||||
|
Rebooted: ($rebooted | length) - ($rebooted | str join ', ')
|
||||||
|
Failed to return: ($failed | length) - ($failed | str join ', ')
|
||||||
|
Offline: ($offline | length) - ($offline | str join ', ')
|
||||||
|
Up to date: ($up_to_date | length) - ($up_to_date | str join ', ')
|
||||||
|
"
|
||||||
|
|
||||||
|
$report | save -f $report_file
|
||||||
|
print $"
|
||||||
|
Report written to ($report_file)"
|
||||||
|
print $report
|
||||||
|
}
|
||||||
@@ -0,0 +1,60 @@
|
|||||||
|
use types.nu *
|
||||||
|
use profile.nu *
|
||||||
|
|
||||||
|
export def get-remote-boot-info [ host: string@remote_targets ] {
|
||||||
|
let target = $"root@($host).lab.internal"
|
||||||
|
let is_online = (try {
|
||||||
|
bash -c $"ssh -o BatchMode=yes -o ConnectTimeout=3 ($target) 'true' >/dev/null 2>&1"
|
||||||
|
true
|
||||||
|
} catch { false })
|
||||||
|
if (not $is_online) {
|
||||||
|
return {host: $host, status: "offline", booted: "", current: "", reboot_pending: false, needs_build: false, local_toplevel: ""}
|
||||||
|
}
|
||||||
|
return (try {
|
||||||
|
# Fetch remote system paths and the local toplevel concurrently.
|
||||||
|
let fetched = (["remote" "local"] | par-each {|what|
|
||||||
|
if $what == "remote" {
|
||||||
|
bash -c $"ssh ($target) 'readlink /run/booted-system; readlink /run/current-system' 2>/dev/null" | lines
|
||||||
|
} else {
|
||||||
|
try {
|
||||||
|
bash -c $"nix eval --raw '.#nixosConfigurations.hl-($host).config.system.build.toplevel.outPath' 2>/dev/null || true" | str trim
|
||||||
|
} catch { "" }
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
let booted = ($fetched.0 | get 0? | default "")
|
||||||
|
let current = ($fetched.0 | get 1? | default "")
|
||||||
|
let local_toplevel = $fetched.1
|
||||||
|
|
||||||
|
let reboot_pending = ($booted != $current)
|
||||||
|
let needs_build = if $local_toplevel == "" { "unknown" } else { $local_toplevel != $current }
|
||||||
|
|
||||||
|
{host: $host, status: "online", booted: $booted, current: $current, reboot_pending: $reboot_pending, needs_build: $needs_build, local_toplevel: $local_toplevel}
|
||||||
|
} catch {
|
||||||
|
{host: $host, status: "error", booted: "", current: "", reboot_pending: false, needs_build: false, local_toplevel: ""}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
# Poll SSH until the host reaches the desired reachability, or the timeout elapses.
|
||||||
|
def wait-for-host [target: string, want_online: bool, timeout: int] {
|
||||||
|
let deadline = (date now) + ($timeout * 1sec)
|
||||||
|
while (date now) < $deadline {
|
||||||
|
let online = (try {
|
||||||
|
bash -c $"ssh -o BatchMode=yes -o ConnectTimeout=3 ($target) 'true' >/dev/null 2>&1"
|
||||||
|
true
|
||||||
|
} catch { false })
|
||||||
|
if $online == $want_online {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
sleep 3sec
|
||||||
|
}
|
||||||
|
false
|
||||||
|
}
|
||||||
|
|
||||||
|
# Send a desktop notification if notify-send is available; never fail the caller.
|
||||||
|
def notify [title: string, body: string] {
|
||||||
|
try {
|
||||||
|
^notify-send $title $body
|
||||||
|
} catch { }
|
||||||
|
}
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
use types.nu *
|
||||||
|
use helpers.nu *
|
||||||
|
|
||||||
|
# Render a Gitea HTML template and serve it locally for preview.
|
||||||
|
# Runs in the foreground — Ctrl+C to stop. Wrap it in nohup yourself to detach.
|
||||||
|
export def "skyg render html-tpl" [
|
||||||
|
file: string@html-tpl-files # Template to render (e.g. hosts/hl-minipc1/services/gitea-home.tmpl)
|
||||||
|
--port: int = 8787 # Port for the local preview server
|
||||||
|
] {
|
||||||
|
cd $REPO_ROOT
|
||||||
|
let src = ($file | path expand)
|
||||||
|
if not ($src | path exists) {
|
||||||
|
error make {msg: $"Template not found: ($file)"}
|
||||||
|
}
|
||||||
|
|
||||||
|
let out_dir = ".tmp/render-html-tpl"
|
||||||
|
mkdir $out_dir
|
||||||
|
let name = ($src | path basename | str replace -r '\.tmpl$' '')
|
||||||
|
let out = $"($out_dir)/($name).html"
|
||||||
|
render-html-tpl $src $out
|
||||||
|
|
||||||
|
print $"Rendered ($file) -> ($out)"
|
||||||
|
print $"Preview: http://127.0.0.1:($port)/($name).html"
|
||||||
|
print "Press Ctrl+C to stop."
|
||||||
|
|
||||||
|
^python3 -m http.server $port --bind 127.0.0.1 --directory $out_dir
|
||||||
|
}
|
||||||
@@ -0,0 +1,86 @@
|
|||||||
|
use types.nu *
|
||||||
|
use helpers.nu *
|
||||||
|
|
||||||
|
# List all secret names
|
||||||
|
export def "skyg secrets list" [] {
|
||||||
|
secret-names
|
||||||
|
}
|
||||||
|
|
||||||
|
# Decrypt a secret from secrets/ folder
|
||||||
|
export def "skyg secrets show" [secret: string@secret-names] {
|
||||||
|
cd $REPO_ROOT
|
||||||
|
let src = $"secrets/($secret).age"
|
||||||
|
if not ($src | path exists) {
|
||||||
|
error make {msg: $"Secret not found: ($src)"}
|
||||||
|
}
|
||||||
|
mkdir .tmp
|
||||||
|
let dest = $".tmp/unencrypted-($secret)"
|
||||||
|
agenix -d $src | save -f $dest
|
||||||
|
print $"Decrypted to ($dest)"
|
||||||
|
return $dest
|
||||||
|
}
|
||||||
|
|
||||||
|
# Encrypt a file to secrets/ folder (re-encrypts using agenix)
|
||||||
|
# --yaml Validate the content as YAML (via yq) before encrypting
|
||||||
|
export def "skyg secrets edit" [
|
||||||
|
secret: string@secret-names,
|
||||||
|
source?: string,
|
||||||
|
--yaml # Validate the content as YAML (via yq) before encrypting
|
||||||
|
] {
|
||||||
|
cd $REPO_ROOT
|
||||||
|
let src = $source | default $".tmp/unencrypted-($secret)"
|
||||||
|
if not ($src | path exists) {
|
||||||
|
let encrypted = $"secrets/($secret).age"
|
||||||
|
if ($encrypted | path exists) {
|
||||||
|
agenix -d $encrypted | save -f $src
|
||||||
|
} else {
|
||||||
|
touch $src
|
||||||
|
}
|
||||||
|
}
|
||||||
|
vi $src
|
||||||
|
|
||||||
|
if $yaml {
|
||||||
|
|
||||||
|
# `complete` captures stdout/stderr/exit_code; `try/catch` guards a missing yq
|
||||||
|
let lint = (
|
||||||
|
try {
|
||||||
|
yq e '.' $src | complete
|
||||||
|
} catch { null }
|
||||||
|
)
|
||||||
|
if $lint == null {
|
||||||
|
print $"❌ Could not run yq — is it on PATH? Add 'yq' to the devShell in flake.nix."
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if $lint.exit_code != 0 {
|
||||||
|
print $"❌ YAML validation failed for ($src):"
|
||||||
|
print ($lint.stderr | str trim)
|
||||||
|
print $"Fix the syntax, then re-run: skyg secrets edit ($secret) --yaml"
|
||||||
|
return
|
||||||
|
}
|
||||||
|
print $"✅ YAML valid: ($src)"
|
||||||
|
}
|
||||||
|
|
||||||
|
let dest = $"secrets/($secret).age"
|
||||||
|
cat $src | agenix -e $dest
|
||||||
|
print $"Encrypted ($dest)"
|
||||||
|
return $dest
|
||||||
|
}
|
||||||
|
|
||||||
|
# Compare unencrypted local version with encrypted version of a secret
|
||||||
|
export def "skyg secrets compare" [secret: string@secret-names] {
|
||||||
|
cd $REPO_ROOT
|
||||||
|
let unencrypted = $".tmp/unencrypted-($secret)"
|
||||||
|
let encrypted = $"secrets/($secret).age"
|
||||||
|
|
||||||
|
let temp_decrypted = $"/tmp/skyg-compare-($secret)-($env.USER)-(random uuid)"
|
||||||
|
agenix -d $encrypted | save -f $temp_decrypted
|
||||||
|
print $"Comparing ($unencrypted) with decrypted ($encrypted)"
|
||||||
|
try {
|
||||||
|
print $"diff -u $(unencrypted) $(temp_decrypted)"
|
||||||
|
diff -u $unencrypted $temp_decrypted | print
|
||||||
|
} catch {
|
||||||
|
print "Files are identical"
|
||||||
|
}
|
||||||
|
|
||||||
|
rm -f $temp_decrypted
|
||||||
|
}
|
||||||
@@ -0,0 +1,61 @@
|
|||||||
|
const REPO_ROOT = path self | path dirname | path dirname | path dirname
|
||||||
|
|
||||||
|
export def hm-actions [] {
|
||||||
|
["switch", "build"]
|
||||||
|
}
|
||||||
|
|
||||||
|
export def os-actions [] {
|
||||||
|
[
|
||||||
|
"test"
|
||||||
|
"dry-activate"
|
||||||
|
"run"
|
||||||
|
"switch"
|
||||||
|
"build"
|
||||||
|
"boot"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
export def image-targets [] {
|
||||||
|
["iso", "pi1", "pi2"]
|
||||||
|
}
|
||||||
|
|
||||||
|
export def secret-names [] {
|
||||||
|
cd $REPO_ROOT
|
||||||
|
glob secrets/*.age | each {|f| $f | path basename | str replace ".age" "" }
|
||||||
|
}
|
||||||
|
|
||||||
|
export def updatable-pkgs [] {
|
||||||
|
cd $REPO_ROOT
|
||||||
|
glob "pkgs/*/update.sh"
|
||||||
|
| each {|f| $f | path dirname | path basename }
|
||||||
|
}
|
||||||
|
|
||||||
|
# Gitea HTML templates, for `skyg render html-tpl` tab-completion.
|
||||||
|
export def html-tpl-files [] {
|
||||||
|
cd $REPO_ROOT
|
||||||
|
glob "**/*.tmpl"
|
||||||
|
| each {|f| $f | path relative-to $REPO_ROOT }
|
||||||
|
| sort
|
||||||
|
}
|
||||||
|
|
||||||
|
# Flake input names from flake.nix
|
||||||
|
export def flake-inputs [] {
|
||||||
|
cd $REPO_ROOT
|
||||||
|
open flake.nix
|
||||||
|
| lines
|
||||||
|
| where {|l| $l =~ '^\s+\w+\.url\s*=' }
|
||||||
|
| each {|l| $l | str trim | split row "." | first }
|
||||||
|
| uniq
|
||||||
|
}
|
||||||
|
|
||||||
|
# OpenWrt router names from openwrt-routers/*.nix
|
||||||
|
export def router-names [] {
|
||||||
|
cd $REPO_ROOT
|
||||||
|
glob openwrt-routers/*.nix | each {|f| $f | path basename | str replace ".nix" "" }
|
||||||
|
}
|
||||||
|
|
||||||
|
# CA recipient names from secrets.nix
|
||||||
|
export def ca-recipients [] {
|
||||||
|
cd $REPO_ROOT
|
||||||
|
^cat secrets.nix | parse --regex '(\w+) = "ssh-' | get capture0
|
||||||
|
}
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
|
LIB="$SCRIPT_DIR/lib/cmds.nu"
|
||||||
|
exec nu --commands "use \"$LIB\" *; skyg $*"
|
||||||
Executable
+202
@@ -0,0 +1,202 @@
|
|||||||
|
#!/usr/bin/env nu
|
||||||
|
|
||||||
|
# Temperature monitoring script for laptop
|
||||||
|
# Collects CPU/GPU temperatures, stores them with timestamps, and displays a graph
|
||||||
|
|
||||||
|
def main [
|
||||||
|
--duration: int = 60 # Duration to collect data in seconds (default: 60)
|
||||||
|
--interval: int = 2 # Interval between readings in seconds (default: 2)
|
||||||
|
--output: string = "~/.cache/temp-data.csv" # Output file for temperature data
|
||||||
|
--graph # Show graph at the end
|
||||||
|
--show-graph # Just show graph from existing data (don't collect)
|
||||||
|
] {
|
||||||
|
let data_file = ($output | path expand)
|
||||||
|
|
||||||
|
if $show_graph {
|
||||||
|
show-graph $data_file
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
let cache_dir = ($data_file | path dirname)
|
||||||
|
|
||||||
|
# Create cache directory if it doesn't exist
|
||||||
|
if not ($cache_dir | path exists) {
|
||||||
|
mkdir $cache_dir
|
||||||
|
}
|
||||||
|
|
||||||
|
# Initialize or append to CSV file with headers if empty
|
||||||
|
if not ($data_file | path exists) or (open $data_file | is-empty) {
|
||||||
|
"timestamp,cpu_temp,gpu_temp,max_temp" | save -f $data_file
|
||||||
|
}
|
||||||
|
|
||||||
|
print $"🌡️ Temperature Monitor - Collecting data for ($duration)s with ($interval)s intervals..."
|
||||||
|
print $"📊 Data will be saved to: ($data_file)\n"
|
||||||
|
|
||||||
|
let iterations = (($duration / $interval) | math round)
|
||||||
|
|
||||||
|
for i in 1..$iterations {
|
||||||
|
let timestamp = (date now | format date '%Y-%m-%d %H:%M:%S')
|
||||||
|
|
||||||
|
# Get temperature reading
|
||||||
|
let temp_info = (get-temperature)
|
||||||
|
|
||||||
|
let cpu_temp = $temp_info.cpu
|
||||||
|
let gpu_temp = $temp_info.gpu
|
||||||
|
|
||||||
|
let max_temp = (
|
||||||
|
if ($cpu_temp != "N/A") and ($gpu_temp != "N/A") {
|
||||||
|
[($cpu_temp | into float) ($gpu_temp | into float)] | math max
|
||||||
|
} else if ($cpu_temp != "N/A") {
|
||||||
|
$cpu_temp | into float
|
||||||
|
} else if ($gpu_temp != "N/A") {
|
||||||
|
$gpu_temp | into float
|
||||||
|
} else {
|
||||||
|
"N/A"
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
let row = $"($timestamp),($cpu_temp),($gpu_temp),($max_temp)"
|
||||||
|
|
||||||
|
# Append to CSV file
|
||||||
|
let content = (open $data_file --raw)
|
||||||
|
($content | str trim) + "\n" + $row | save -f $data_file
|
||||||
|
|
||||||
|
print $"✓ ($timestamp) | CPU: ($cpu_temp)°C | GPU: ($gpu_temp)°C | Max: ($max_temp)°C"
|
||||||
|
|
||||||
|
if $i < $iterations {
|
||||||
|
sleep ($interval | into duration -u sec)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
print $"\n✅ Data collection complete!"
|
||||||
|
|
||||||
|
# Always show the graph at the end
|
||||||
|
show-graph $data_file
|
||||||
|
|
||||||
|
print $"📁 Data saved to: ($data_file)"
|
||||||
|
}
|
||||||
|
|
||||||
|
def get-temperature [] {
|
||||||
|
# Try lm_sensors first (most reliable)
|
||||||
|
if (which sensors | is-not-empty) {
|
||||||
|
get-temp-sensors
|
||||||
|
} else if (which acpi | is-not-empty) {
|
||||||
|
get-temp-acpi
|
||||||
|
} else if ("/sys/class/thermal/thermal_zone0/temp" | path exists) {
|
||||||
|
get-temp-sysfs
|
||||||
|
} else {
|
||||||
|
{ cpu: "N/A", gpu: "N/A" }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
def get-temp-sensors [] {
|
||||||
|
try {
|
||||||
|
# Try to get CPU temp from k10temp (AMD)
|
||||||
|
let cpu_temp = (
|
||||||
|
try {
|
||||||
|
sensors k10temp-pci-00c3 | grep "Tctl" | grep -oE "[0-9]+\\.[0-9]+" | head -1
|
||||||
|
} catch {
|
||||||
|
# Fallback: look in all sensors output
|
||||||
|
sensors | grep -i "Tctl\|Package" | head -1 | grep -oE "[0-9]+\\.[0-9]+" | head -1
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
# Try to get GPU temp from amdgpu
|
||||||
|
let gpu_temp = (
|
||||||
|
try {
|
||||||
|
sensors amdgpu-pci-c100 | grep "edge" | grep -oE "[0-9]+\\.[0-9]+" | head -1
|
||||||
|
} catch {
|
||||||
|
"N/A"
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
{ cpu: $cpu_temp, gpu: $gpu_temp }
|
||||||
|
} catch {
|
||||||
|
{ cpu: "N/A", gpu: "N/A" }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
def get-temp-acpi [] {
|
||||||
|
try {
|
||||||
|
let temp = (acpi -t | head -1 | grep -oE "[0-9]+\\.[0-9]+" | first)
|
||||||
|
{ cpu: $temp, gpu: "N/A" }
|
||||||
|
} catch {
|
||||||
|
{ cpu: "N/A", gpu: "N/A" }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
def get-temp-sysfs [] {
|
||||||
|
try {
|
||||||
|
let raw_temp = (open /sys/class/thermal/thermal_zone0/temp | str trim | into float)
|
||||||
|
let temp = ($raw_temp / 1000)
|
||||||
|
{ cpu: $temp, gpu: "N/A" }
|
||||||
|
} catch {
|
||||||
|
{ cpu: "N/A", gpu: "N/A" }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
def show-graph [file: string] {
|
||||||
|
print "\n📈 Temperature Graph:\n"
|
||||||
|
|
||||||
|
try {
|
||||||
|
# Read the CSV file as a regular table
|
||||||
|
let data = (open $file)
|
||||||
|
|
||||||
|
# Filter out rows where max_temp is not a number
|
||||||
|
let temps = (
|
||||||
|
$data
|
||||||
|
| where { $in.max_temp != "N/A" }
|
||||||
|
| select timestamp max_temp
|
||||||
|
| rename time temp
|
||||||
|
| each { |row|
|
||||||
|
{
|
||||||
|
time: $row.time
|
||||||
|
temp: ($row.temp | into float)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
if ($temps | is-empty) {
|
||||||
|
print "No valid temperature data to display."
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
# Find min/max for scaling
|
||||||
|
let min_temp = ($temps | get temp | math min)
|
||||||
|
let max_temp = ($temps | get temp | math max)
|
||||||
|
let temp_range = ($max_temp - $min_temp)
|
||||||
|
let graph_height = 20
|
||||||
|
|
||||||
|
# Create simple ASCII graph
|
||||||
|
let graph = (
|
||||||
|
$temps
|
||||||
|
| each { |item|
|
||||||
|
let normalized = (
|
||||||
|
if ($temp_range == 0) {
|
||||||
|
0.5
|
||||||
|
} else {
|
||||||
|
(($item.temp - $min_temp) / $temp_range)
|
||||||
|
}
|
||||||
|
)
|
||||||
|
let bar_height = (($normalized * $graph_height) | math round)
|
||||||
|
let bar = (
|
||||||
|
if $bar_height > 0 {
|
||||||
|
0..<$bar_height | each { "█" } | str join ""
|
||||||
|
} else {
|
||||||
|
"."
|
||||||
|
}
|
||||||
|
)
|
||||||
|
let time_only = ($item.time | str substring 11..19)
|
||||||
|
$"($time_only): ($bar) ($item.temp)°C"
|
||||||
|
}
|
||||||
|
| str join "\n"
|
||||||
|
)
|
||||||
|
|
||||||
|
print $graph
|
||||||
|
print $"\nMin: ($min_temp | math round -p 1)°C | Max: ($max_temp | math round -p 1)°C | Range: ($temp_range | math round -p 1)°C"
|
||||||
|
} catch { |err|
|
||||||
|
print $"Error displaying graph: ($err)"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
main
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
# configs/
|
||||||
|
|
||||||
|
Application configuration files that are symlinked into `~/.config/` via
|
||||||
|
`system.userActivationScripts` (using `skygUtils.makeHyperlinkScriptToConfigs`
|
||||||
|
from `modules/skyg-utils.nix`).
|
||||||
|
|
||||||
|
Most entries link `~/.config/<name>` -> `configs/<name>`. Some are host-scoped
|
||||||
|
and live under `configs/<hostName>/` — e.g. the Hyprland module links
|
||||||
|
`~/.config/hypr` -> `configs/<hostName>/hypr` (defaulting to the machine's
|
||||||
|
hostName). `makeHyperlinkScriptToConfigs` takes an optional `targetPath` for
|
||||||
|
these cases where the source subdir and `~/.config` target differ.
|
||||||
|
|
||||||
|
## Contents
|
||||||
|
|
||||||
|
| Path | Description |
|
||||||
|
| -------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- |
|
||||||
|
| `niri/` | Niri Wayland compositor config (legacy shared location — will be removed after hosts migrate to `<hostName>/niri/`) |
|
||||||
|
| `fwbook/niri/` | Niri config for `fwbook`; linked to `~/.config/niri` by the `skyg.nixos.desktop.tiler.niri` module (mirrors the hyprland pattern) |
|
||||||
|
| `fwbook/hypr/` | Hyprland config for `fwbook` (scrolling layout; Omarchy/nixarchy shell — noctalia binds+rules parked in `conf/noctalia/`); linked to `~/.config/hypr` |
|
||||||
|
| `fwbook/omarchy/` | Omarchy (nixarchy) shell config for `fwbook` (`shell.json`, plugins, backgrounds); linked to `~/.config/omarchy` by `hosts/fwbook/packages.nix` |
|
||||||
|
| `hl-fwdesk/hypr/` | Hyprland config for `hl-fwdesk` (Steam console); **baked into the build** via `mountAsSource`, linked to `~/.config/hypr` |
|
||||||
|
| `hl-pi1/hypr/` | Hyprland config for `hl-pi1` (clock box); linked to `~/.config/hypr` |
|
||||||
|
| `hl-fws1/hypr/` | Hyprland config for `hl-fws1` (remote slim desktop); **baked into the build** via `mountAsSource`, linked to `~/.config/hypr` |
|
||||||
|
| `hl-pi1/quickshell/` | Quickshell configs for `hl-pi1` (full-screen clock + calendar); linked to `~/.config/quickshell` |
|
||||||
|
| `fwbook/quickshell/` | Quickshell configs for `fwbook` (scrolling overview); linked to `~/.config/quickshell` |
|
||||||
|
| `extra.nu` | Extra NuShell config sourced at shell startup |
|
||||||
|
| `fwbook.knsv` | fwbook-specific Kanshi display profile |
|
||||||
|
| `hypr-types/hl.lua` | Shared EmmyLua type stubs for the `hl` global; each host's Hyprland `.luarc.json` points here via `workspace.library` |
|
||||||
|
| `pki/` | Public certs of the lab internal CA (`lab-ca.crt` + issued leaves), managed by `skyg ca`; **not** symlinked to `~/.config` — see `pki/ABOUTME.md` |
|
||||||
|
|
||||||
|
## Notes
|
||||||
|
|
||||||
|
- Changes here take effect on next login or when the activation script runs
|
||||||
|
- These are **not** NixOS options — they are plain config files managed as repo content
|
||||||
|
- The symlink mechanism is defined in `modules/skyg-utils.nix`
|
||||||
|
- Hosts can embed their config in the build by setting
|
||||||
|
`configLink.mountAsSource = true`; the dir is then read from the flake's
|
||||||
|
store path (`skyg.rootDir`) instead of the live `~/nixos-setup/configs`
|
||||||
|
checkout. See `modules/nixos/desktop/tiler/hyprland.nix`.
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
def rocm-monitor [cacheFile: string = "/tmp/rocm-monitor.jsonl", timeout: duration = 1sec] {
|
||||||
|
if ($cacheFile | path exists) {
|
||||||
|
rm $cacheFile
|
||||||
|
}
|
||||||
|
loop {
|
||||||
|
clear
|
||||||
|
rocm-smi --showmemuse --showuse --json | save --append $cacheFile
|
||||||
|
tail -n1 $cacheFile | from json --objects | flatten | print
|
||||||
|
sleep $timeout
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
{
|
||||||
|
"$schema": "https://raw.githubusercontent.com/LuaLS/vscode-lua/master/setting/schema.json",
|
||||||
|
"workspace.library": ["../../hypr-types"],
|
||||||
|
"diagnostics.globals": ["hl"],
|
||||||
|
"runtime.version": "Lua 5.4"
|
||||||
|
}
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
{
|
||||||
|
"languages": {
|
||||||
|
"Lua": {
|
||||||
|
"formatter": {
|
||||||
|
"external": {
|
||||||
|
"command": "stylua",
|
||||||
|
"arguments": ["-"]
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"format_on_save": "on"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,121 @@
|
|||||||
|
# configs/fwbook/hypr/
|
||||||
|
|
||||||
|
Host-specific Hyprland configuration for `fwbook`. Symlinked to `~/.config/hypr`
|
||||||
|
by the `skyg.nixos.desktop.tiler.hyprland` module, which defaults its
|
||||||
|
`configName` to the machine hostName (`configs/${hostName}/hypr`).
|
||||||
|
|
||||||
|
## Why it lives here (and not configs/hypr)
|
||||||
|
|
||||||
|
The Hyprland module links `configs/<configName>/hypr` -> `~/.config/hypr`, with
|
||||||
|
`configName` defaulting to the hostName. Keeping the config under
|
||||||
|
`configs/fwbook/` lets each host own its own Hyprland tweaks (monitors, etc.)
|
||||||
|
without stepping on other machines. The old shared `configs/hypr/` (waybar +
|
||||||
|
hyprpanel) was removed when this replaced it.
|
||||||
|
|
||||||
|
## Config format: Lua
|
||||||
|
|
||||||
|
Written in **Lua** (`hyprland.lua`), not hyprlang. Hyprland 0.55+ deprecated
|
||||||
|
hyprlang in favor of Lua, and reads `~/.config/hypr/hyprland.lua`. Files are
|
||||||
|
split under `conf/` and pulled in with `require()`.
|
||||||
|
|
||||||
|
> The folder is named `conf`, not `hyprland.d`, because Hyprland's `require()`
|
||||||
|
> treats `.` as a path separator — `require("hyprland.d/env")` would resolve to
|
||||||
|
> `hyprland/d/env`.
|
||||||
|
|
||||||
|
## Design
|
||||||
|
|
||||||
|
- **Layout:** Hyprland's native `scrolling` layout (0.54+), no plugins required.
|
||||||
|
This mirrors niri's scrollable-tiling model. See `conf/general.lua`.
|
||||||
|
- **Shell:** the Omarchy (nixarchy) shell, launched as `omarchy-launch-shell` in
|
||||||
|
`conf/autostart.lua` via `hl.on("hyprland.start", ...)`. Launched with
|
||||||
|
`setpriv --ambient-caps -all` to drop capabilities inherited from the
|
||||||
|
compositor; without it, D-Bus calls inside quickshell-based apps fail silently
|
||||||
|
(hyprwm/Hyprland#14844). There is intentionally no waybar/hyprpanel. Noctalia's
|
||||||
|
binds and window rule are parked in `conf/noctalia/` (not required by
|
||||||
|
`hyprland.lua`); see `hosts/fwbook/packages.nix` for the shell package wiring.
|
||||||
|
`conf/omarchy/` maps the same keys to the Omarchy shell's commands
|
||||||
|
(`omarchy-menu` / `omarchy-shell`).
|
||||||
|
- **Keybinds:** `conf/keybindings.lua` mirrors `configs/niri/shared/binds.kdl`
|
||||||
|
and `configs/niri/dms/binds.kdl` as closely as Hyprland allows. `Mod+Alt+E`
|
||||||
|
opens this file in Zed (`zeditor`), mirroring niri's `Mod+Alt+E` ->
|
||||||
|
`shared/binds.kdl`. Windows are moved around with `Mod+Ctrl+arrows`
|
||||||
|
(`Mod+Ctrl+Left/Right` move in a direction, `Mod+Ctrl+Up/Down` move to a
|
||||||
|
workspace), and the `Mod+Shift` media/volume binds mirror niri's "Basic Sound
|
||||||
|
Control" block. Hyprland groups/tabs are intentionally unused.
|
||||||
|
- **Overview:** A standalone Quickshell config (`configs/fwbook/quickshell/overview/`,
|
||||||
|
symlinked to `~/.config/quickshell/overview` by the
|
||||||
|
`skyg.nixos.desktop.tiler.quickshell` module) provides a niri-like scrolling
|
||||||
|
overview — a vertical stack of workspace rows, each a horizontal strip of
|
||||||
|
that workspace's windows with live screencopy previews. It runs as its own
|
||||||
|
`qs -c overview` daemon (autostarted in `conf/autostart.lua`), toggled over
|
||||||
|
Quickshell's IPC (`qs -c overview ipc call overview toggle`) from `Mod+Tab`
|
||||||
|
(`conf/keybindings.lua`) and a 4-finger swipe up/down (`conf/inputs.lua`).
|
||||||
|
Arrow keys move the selection, Enter focuses + closes, Esc cancels, `M`
|
||||||
|
cycles to the next monitor, 1-9 jump straight to a monitor by index. See
|
||||||
|
`configs/fwbook/quickshell/ABOUTME.md` for the QML implementation.
|
||||||
|
|
||||||
|
## Files
|
||||||
|
|
||||||
|
```
|
||||||
|
hypr/
|
||||||
|
├── hyprland.lua # entry point; require()s conf/*.lua in order
|
||||||
|
├── screen-record.sh # wf-recorder toggle (bound to Mod+R)
|
||||||
|
├── speak-selection.nu # piper TTS of primary selection (bound to Mod+M); press again to stop; --cache reuses audio
|
||||||
|
├── xdph.conf # xdph screencopy workaround (force_shm); hyprlang, read by xdph itself
|
||||||
|
├── .luarc.json # lua-language-server config (library = ../../hypr-types)
|
||||||
|
├── dms/ # DMS-auto-generated Hyprland overrides (colors/layout/windowrules);
|
||||||
|
│ # not loaded by default — require() them from hyprland.lua to enable
|
||||||
|
└── conf/
|
||||||
|
├── env.lua # cursor size + Wayland/Qt/Electron env hints (hl.env)
|
||||||
|
├── general.lua # scrolling layout, gaps/border/rounding (hl.config)
|
||||||
|
├── animations.lua # workspaces slide = "slidevert" (niri-like); only the `workspaces`
|
||||||
|
│ # leaf overridden — other styles: slide, fade, slidefade, slidefadevert
|
||||||
|
├── monitors.lua # hl.monitor per display (from configs/niri/.../outputs.kdl)
|
||||||
|
├── inputs.lua # touchpad tap + natural scroll, kb us, hl.gesture (incl. Mod+swipe workspace-to-monitor)
|
||||||
|
├── window-rules.lua # hl.window_rule floats for small dialogs/utilities
|
||||||
|
├── keybindings.lua # niri binds, scrolling dispatchers (hl.bind/hl.dsp); Mod+Tab toggles the Quickshell overview; Mod+Ctrl moves windows, Mod+Shift is media/volume
|
||||||
|
├── autostart.lua # Omarchy (nixarchy) shell + Quickshell overview via setpriv (hl.on hyprland.start; drops compositor caps)
|
||||||
|
├── omarchy/ # Omarchy shell binds (index/binds.lua) — same keys as
|
||||||
|
│ # noctalia, mapped to omarchy-menu / omarchy-shell
|
||||||
|
└── noctalia/ # parked noctalia binds + window rule (index/binds/window.lua);
|
||||||
|
# not required by hyprland.lua while the Omarchy shell runs
|
||||||
|
```
|
||||||
|
|
||||||
|
## Bindings without a clean 1:1 niri mapping
|
||||||
|
|
||||||
|
- `Mod+Shift+H` (show-hotkey-overlay) — no native Hyprland equivalent; left commented.
|
||||||
|
- `Mod+Escape` (toggle-keyboard-shortcuts-inhibit) — no native equivalent; omitted.
|
||||||
|
- `Mod+C` (center-column) — Hyprland runs the `focus current` scrolling dispatch.
|
||||||
|
- `Mod+Ctrl+F` (reset-window-height) — the scrolling layout has no per-window
|
||||||
|
height reset, so it maps to `layout "fit active"` (resets the focused column
|
||||||
|
to full width).
|
||||||
|
- `Mod+Tab` (toggle-overview) — the Quickshell scrolling overview (see above);
|
||||||
|
previously a pure-Lua wofi picker, then the ScrollOverview plugin, and
|
||||||
|
`cyclenext` before that.
|
||||||
|
|
||||||
|
## Touchpad gestures (niri parity)
|
||||||
|
|
||||||
|
niri's 3-finger swipes are mirrored in `conf/inputs.lua`:
|
||||||
|
|
||||||
|
- **Horizontal** → `scroll_move` (scroll through columns along the tape)
|
||||||
|
- **Vertical** → `workspace` (switch workspaces up/down)
|
||||||
|
- **Mod + swipe (any direction)** → move the whole workspace to the monitor in
|
||||||
|
that direction (`hyprctl dispatch movecurrentworkspacetomonitor`), mirroring
|
||||||
|
niri's `Mod+TouchpadScroll*` binds. Swipe direction maps to the same monitor
|
||||||
|
direction (up→up, down→down, left→left, right→right).
|
||||||
|
- **4-finger up/down** → open/close the Quickshell scrolling overview (see
|
||||||
|
Overview above). `hl.gesture` is a discrete trigger, so there's no
|
||||||
|
swipe-progress animation.
|
||||||
|
|
||||||
|
> The gesture action is `scroll_move` (underscore), not `scrollmove`. The
|
||||||
|
> `mods = "SUPER"` mask is what lets the Mod + swipe variants coexist with the
|
||||||
|
> plain swipes. Both require a Hyprland new enough to expose configurable Lua
|
||||||
|
> gestures (0.55+). The older `scrollmove` name and the `scrollmove` action do
|
||||||
|
> not exist — they error with "unknown action".
|
||||||
|
|
||||||
|
## Behavior deltas from the old hyprlang config
|
||||||
|
|
||||||
|
- `Ctrl+Alt+Delete` runs `uwsm stop` (not the `exit` dispatcher). The Hyprland
|
||||||
|
wiki warns UWSM users that `exit` breaks the ordered shutdown sequence.
|
||||||
|
- `Mod+Shift+-/=` (window height) uses a fixed pixel delta instead of a percent,
|
||||||
|
since the Lua `window.resize` dispatcher takes pixels, not `%`.
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
-- =========================
|
||||||
|
-- Animations
|
||||||
|
-- =========================
|
||||||
|
|
||||||
|
-- Animation to Mimic Niri's up/down slide for workspaces
|
||||||
|
hl.animation({
|
||||||
|
leaf = "workspaces",
|
||||||
|
enabled = true,
|
||||||
|
speed = 2,
|
||||||
|
bezier = "default",
|
||||||
|
style = "slidevert",
|
||||||
|
})
|
||||||
|
|
||||||
|
hl.animation({
|
||||||
|
leaf = "windows",
|
||||||
|
enabled = true,
|
||||||
|
speed = 5,
|
||||||
|
bezier = "default",
|
||||||
|
style = "slidefade 60%",
|
||||||
|
})
|
||||||
|
|
||||||
|
hl.animation({
|
||||||
|
leaf = "windowsMove",
|
||||||
|
enabled = true,
|
||||||
|
speed = 5,
|
||||||
|
bezier = "default",
|
||||||
|
style = "slidefade 80%",
|
||||||
|
})
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
-- =========================
|
||||||
|
-- Autostart
|
||||||
|
-- =========================
|
||||||
|
local function autostart()
|
||||||
|
-- hl.exec_cmd("setpriv --ambient-caps -all -- noctalia")
|
||||||
|
hl.exec_cmd("setpriv --ambient-caps -all -- omarchy-launch-shell")
|
||||||
|
hl.exec_cmd("setpriv --ambient-caps -all -- qs -c overview")
|
||||||
|
hl.exec_cmd("setpriv --ambient-caps -all -- skygqts workspace-manager")
|
||||||
|
end
|
||||||
|
hl.on("hyprland.start", autostart)
|
||||||
|
hl.bind("SUPER + SHIFT + A", autostart)
|
||||||
@@ -0,0 +1,107 @@
|
|||||||
|
-- =========================
|
||||||
|
-- Environment
|
||||||
|
-- =========================
|
||||||
|
-- Mirrors the environment block in configs/niri/shared/general.kdl.
|
||||||
|
|
||||||
|
hl.env("XCURSOR_SIZE", "24")
|
||||||
|
hl.env("XCURSOR_THEME", "oreo_spark_orange_bordered_cursors")
|
||||||
|
hl.env("HYPRCURSOR_SIZE", "24")
|
||||||
|
hl.env("HYPRCURSOR_THEME", "")
|
||||||
|
-- No HYPRCURSOR_THEME set: no hyprcursor themes are installed, so Hyprland
|
||||||
|
-- falls back to XCursor (XCURSOR_THEME) rather than showing its built-in default.
|
||||||
|
hl.env("NIXOS_OZONE_WL", "1")
|
||||||
|
hl.env("QT_QPA_PLATFORM", "wayland")
|
||||||
|
hl.env("QT_WAYLAND_DISABLE_WINDOWDECORATION", "1")
|
||||||
|
hl.env("ELECTRON_OZONE_PLATFORM_HINT", "auto")
|
||||||
|
|
||||||
|
---@param s string
|
||||||
|
---@return string
|
||||||
|
local function escape_pattern(s)
|
||||||
|
return (s:gsub("([%.%-%+%[%]%(%)%$%^%%%?%*])", "%%%1"))
|
||||||
|
end
|
||||||
|
|
||||||
|
---@param url string
|
||||||
|
---@return fun(w: HL.Window): boolean
|
||||||
|
local function make_target_validation_for_chromium_apps(url)
|
||||||
|
local host = url:match("^https?://([^/:]+)")
|
||||||
|
local host_pattern = escape_pattern(host)
|
||||||
|
---@param w HL.Window
|
||||||
|
---@return boolean
|
||||||
|
return function(w)
|
||||||
|
if not w.class then
|
||||||
|
return false
|
||||||
|
end
|
||||||
|
return w.class:match("^chrome%-" .. host_pattern)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
---Focus an already-tagged window if one exists.
|
||||||
|
---@param tag string
|
||||||
|
---@return boolean
|
||||||
|
local function attempt_to_switch_to_existing(tag)
|
||||||
|
local existing = hl.get_windows({ tag = tag })
|
||||||
|
|
||||||
|
if existing and #existing > 0 then
|
||||||
|
hl.dispatch(hl.dsp.focus({ window = existing[1] }))
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
return false
|
||||||
|
end
|
||||||
|
|
||||||
|
---@param tag string
|
||||||
|
---@param cmd string
|
||||||
|
---@param is_target_window fun(w: HL.Window): boolean
|
||||||
|
---@return fun()
|
||||||
|
local function make_commandable(tag, cmd, is_target_window)
|
||||||
|
return function()
|
||||||
|
if attempt_to_switch_to_existing(tag) then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
---@type HL.EventSubscription
|
||||||
|
local sub
|
||||||
|
---@type hl.TimerHandle
|
||||||
|
local timeout
|
||||||
|
|
||||||
|
---@param w HL.Window
|
||||||
|
sub = hl.on("window.open", function(w)
|
||||||
|
if not is_target_window(w) then
|
||||||
|
return -- not our window, keep listening
|
||||||
|
end
|
||||||
|
sub:remove()
|
||||||
|
timeout:set_enabled(false)
|
||||||
|
hl.dispatch(hl.dsp.window.tag({ tag = "+" .. tag, window = w }))
|
||||||
|
end)
|
||||||
|
|
||||||
|
timeout = hl.timer(function()
|
||||||
|
sub:remove()
|
||||||
|
end, { timeout = 5000, type = "oneshot" })
|
||||||
|
|
||||||
|
hl.dispatch(hl.dsp.exec_cmd(cmd))
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
---@param name string
|
||||||
|
---@param url string
|
||||||
|
---@return fun()
|
||||||
|
local function web_app(name, url)
|
||||||
|
local tag = "skyg-" .. name
|
||||||
|
local is_target_window = make_target_validation_for_chromium_apps(url)
|
||||||
|
return make_commandable(
|
||||||
|
tag,
|
||||||
|
string.format("chromium --app=%s --new-window", url),
|
||||||
|
is_target_window
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
---@type table<string, fun()>
|
||||||
|
CarouselApps = CarouselApps or {}
|
||||||
|
|
||||||
|
CarouselApps.netflix = web_app("Netflix", "https://www.netflix.com/browse")
|
||||||
|
CarouselApps.youtube = web_app("YouTube", "https://www.youtube.com")
|
||||||
|
CarouselApps.jellyfin = web_app("Jellyfin", "http://bigbox1.lab.internal:8096")
|
||||||
|
CarouselApps.paramountplus = web_app("paramountplus", "https://www.paramountplus.com")
|
||||||
|
CarouselApps.primevideo = web_app("primevideo", "https://www.primevideo.com")
|
||||||
|
CarouselApps.chromium = make_commandable("skyg-chromium", "chromium", function(w)
|
||||||
|
return w.class == "chromium-browser"
|
||||||
|
end)
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
-- =========================
|
||||||
|
-- General / Layout
|
||||||
|
-- =========================
|
||||||
|
hl.config({
|
||||||
|
general = {
|
||||||
|
gaps_in = 0,
|
||||||
|
gaps_out = 0,
|
||||||
|
border_size = 2,
|
||||||
|
layout = "scrolling",
|
||||||
|
resize_on_border = true,
|
||||||
|
|
||||||
|
col = {
|
||||||
|
active_border = "rgb(00e5ff)",
|
||||||
|
inactive_border = "rgb(6a5acd)",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
decoration = {
|
||||||
|
rounding = 8,
|
||||||
|
active_opacity = 1.0,
|
||||||
|
inactive_opacity = 0.9,
|
||||||
|
},
|
||||||
|
|
||||||
|
scrolling = {
|
||||||
|
fullscreen_on_one_column = true,
|
||||||
|
follow_focus = true,
|
||||||
|
focus_fit_method = 1,
|
||||||
|
},
|
||||||
|
|
||||||
|
cursor = {
|
||||||
|
sync_gsettings_theme = true,
|
||||||
|
enable_hyprcursor = true,
|
||||||
|
},
|
||||||
|
|
||||||
|
misc = {
|
||||||
|
disable_hyprland_logo = true,
|
||||||
|
focus_on_activate = true,
|
||||||
|
},
|
||||||
|
})
|
||||||
@@ -0,0 +1,65 @@
|
|||||||
|
-- =========================
|
||||||
|
-- Input
|
||||||
|
-- =========================
|
||||||
|
hl.config({
|
||||||
|
input = {
|
||||||
|
kb_layout = "us",
|
||||||
|
follow_mouse = 1,
|
||||||
|
touchpad = {
|
||||||
|
natural_scroll = true,
|
||||||
|
disable_while_typing = true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
hl.gesture({ fingers = 3, direction = "horizontal", action = "scroll_move" })
|
||||||
|
hl.gesture({ fingers = 3, direction = "vertical", action = "workspace" })
|
||||||
|
|
||||||
|
-- Mod + 3-finger swipe: move the whole workspace to the monitor in that
|
||||||
|
-- direction (mirrors niri's Mod+TouchpadScroll* binds).
|
||||||
|
hl.gesture({
|
||||||
|
fingers = 3,
|
||||||
|
direction = "up",
|
||||||
|
mods = "SUPER",
|
||||||
|
action = function()
|
||||||
|
hl.exec_cmd("hyprctl dispatch movecurrentworkspacetomonitor u")
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
hl.gesture({
|
||||||
|
fingers = 3,
|
||||||
|
direction = "down",
|
||||||
|
mods = "SUPER",
|
||||||
|
action = function()
|
||||||
|
hl.exec_cmd("hyprctl dispatch movecurrentworkspacetomonitor d")
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
hl.gesture({
|
||||||
|
fingers = 3,
|
||||||
|
direction = "left",
|
||||||
|
mods = "SUPER",
|
||||||
|
action = function()
|
||||||
|
hl.exec_cmd("hyprctl dispatch movecurrentworkspacetomonitor l")
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
hl.gesture({
|
||||||
|
fingers = 3,
|
||||||
|
direction = "right",
|
||||||
|
mods = "SUPER",
|
||||||
|
action = function()
|
||||||
|
hl.exec_cmd("hyprctl dispatch movecurrentworkspacetomonitor r")
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
hl.gesture({
|
||||||
|
fingers = 4,
|
||||||
|
direction = "up",
|
||||||
|
action = function()
|
||||||
|
hl.exec_cmd("qs -c overview ipc call overview open")
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
hl.gesture({
|
||||||
|
fingers = 4,
|
||||||
|
direction = "down",
|
||||||
|
action = function()
|
||||||
|
hl.exec_cmd("qs -c overview ipc call overview close")
|
||||||
|
end,
|
||||||
|
})
|
||||||
@@ -0,0 +1,120 @@
|
|||||||
|
-- =========================
|
||||||
|
-- Keybindings
|
||||||
|
-- =========================
|
||||||
|
local mod = "SUPER"
|
||||||
|
|
||||||
|
-- =========================
|
||||||
|
-- General / Apps
|
||||||
|
-- =========================
|
||||||
|
hl.bind(mod .. " + T", hl.dsp.exec_cmd("ghostty"))
|
||||||
|
hl.bind(mod .. " + Z", hl.dsp.exec_cmd("flatpak run app.zen_browser.zen"))
|
||||||
|
hl.bind(mod .. " + B", hl.dsp.exec_cmd("chromium"))
|
||||||
|
hl.bind(mod .. " + E", hl.dsp.exec_cmd("wofi-emoji"))
|
||||||
|
hl.bind(mod .. " + ALT + E", hl.dsp.exec_cmd("zeditor ~/.config/hypr/conf/keybindings.lua"))
|
||||||
|
hl.bind(mod .. " + Q", hl.dsp.window.close())
|
||||||
|
hl.bind(mod .. " + ALT + N", hl.dsp.exec_cmd("skygqts workspace-manager toggle"))
|
||||||
|
-- =========================
|
||||||
|
-- Navigation
|
||||||
|
-- =========================
|
||||||
|
hl.bind(mod .. " + left", hl.dsp.focus({ direction = "left" }))
|
||||||
|
hl.bind(mod .. " + right", hl.dsp.focus({ direction = "right" }))
|
||||||
|
hl.bind(mod .. " + up", hl.dsp.focus({ workspace = "e-1" }))
|
||||||
|
hl.bind(mod .. " + down", hl.dsp.focus({ workspace = "e+1" }))
|
||||||
|
|
||||||
|
-- for the 4-finger swipe equivalent)
|
||||||
|
hl.bind(mod .. " + Tab", hl.dsp.exec_cmd("qs -c overview ipc call overview toggle"))
|
||||||
|
hl.bind(mod .. " + SHIFT + Tab", hl.dsp.focus({ monitor = "+1" }))
|
||||||
|
|
||||||
|
-- =========================
|
||||||
|
-- Window Management
|
||||||
|
-- =========================
|
||||||
|
-- Move windows around with Mod+Ctrl+arrows (mirrors niri's Mod+Ctrl binds).
|
||||||
|
hl.bind(mod .. " + CTRL + right", hl.dsp.window.move({ direction = "right", follow = true }))
|
||||||
|
hl.bind(mod .. " + CTRL + left", hl.dsp.window.move({ direction = "left", follow = true }))
|
||||||
|
hl.bind(mod .. " + CTRL + up", hl.dsp.window.move({ workspace = "r-1", follow = true }))
|
||||||
|
hl.bind(mod .. " + CTRL + down", hl.dsp.window.move({ workspace = "r+1", follow = true }))
|
||||||
|
hl.bind(mod .. " + F", hl.dsp.window.fullscreen({ mode = "maximized", action = "toggle" }))
|
||||||
|
hl.bind(mod .. " + SHIFT + F", hl.dsp.window.fullscreen({ mode = "fullscreen", action = "toggle" }))
|
||||||
|
hl.bind(mod .. " + V", hl.dsp.window.float({ action = "toggle" }))
|
||||||
|
hl.bind(mod .. " + C", hl.dsp.layout("focus current"))
|
||||||
|
|
||||||
|
-- =========================
|
||||||
|
-- Resizing
|
||||||
|
-- =========================
|
||||||
|
hl.bind(mod .. " + minus", hl.dsp.layout("colresize -0.1"))
|
||||||
|
hl.bind(mod .. " + equal", hl.dsp.layout("colresize +0.1"))
|
||||||
|
hl.bind(mod .. " + SHIFT + minus", hl.dsp.window.resize({ x = 0, y = -50, relative = true }))
|
||||||
|
hl.bind(mod .. " + SHIFT + equal", hl.dsp.window.resize({ x = 0, y = 50, relative = true }))
|
||||||
|
hl.bind(mod .. " + CTRL + F", hl.dsp.layout("fit active"))
|
||||||
|
|
||||||
|
-- =========================
|
||||||
|
-- Screenshots & Recording
|
||||||
|
-- =========================
|
||||||
|
hl.bind("Print", hl.dsp.exec_cmd('grim -g "$(slurp)" - | satty -f -'))
|
||||||
|
hl.bind(mod .. " + P", hl.dsp.exec_cmd('grim -g "$(slurp)" - | satty -f -'))
|
||||||
|
hl.bind(mod .. " + R", hl.dsp.exec_cmd("~/.config/hypr/screen-record.sh"))
|
||||||
|
|
||||||
|
-- =========================
|
||||||
|
-- Session
|
||||||
|
-- =========================
|
||||||
|
-- UWSM: use `uwsm stop` instead of the `exit` dispatcher (ordered shutdown).
|
||||||
|
hl.bind("CTRL + ALT + Delete", hl.dsp.exec_cmd("uwsm stop"))
|
||||||
|
|
||||||
|
-- =========================
|
||||||
|
-- Monitor Movement
|
||||||
|
-- =========================
|
||||||
|
hl.bind(mod .. " + ALT + down", hl.dsp.window.move({ monitor = "d" }))
|
||||||
|
hl.bind(mod .. " + ALT + left", hl.dsp.window.move({ monitor = "l" }))
|
||||||
|
hl.bind(mod .. " + ALT + right", hl.dsp.window.move({ monitor = "r" }))
|
||||||
|
hl.bind(mod .. " + ALT + up", hl.dsp.window.move({ monitor = "u" }))
|
||||||
|
|
||||||
|
-- =========================
|
||||||
|
-- Mouse drag (move / resize windows)
|
||||||
|
-- =========================
|
||||||
|
hl.bind(mod .. " + mouse:272", hl.dsp.window.drag(), { mouse = true })
|
||||||
|
hl.bind(mod .. " + mouse:273", hl.dsp.window.resize(), { mouse = true })
|
||||||
|
|
||||||
|
-- Clipboard history
|
||||||
|
hl.bind(
|
||||||
|
mod .. " + ALT + P",
|
||||||
|
hl.dsp.exec_cmd('rofi -modi "clipboard:greenclip print" -show clipboard')
|
||||||
|
)
|
||||||
|
|
||||||
|
-- Media & volume (mirrors niri's Mod+Shift block)
|
||||||
|
hl.bind(mod .. " + SHIFT + right", hl.dsp.exec_cmd("playerctl next"))
|
||||||
|
hl.bind(mod .. " + SHIFT + left", hl.dsp.exec_cmd("playerctl previous"))
|
||||||
|
hl.bind(mod .. " + SHIFT + up", hl.dsp.exec_cmd("playerctl volume 0.1+"), { locked = true })
|
||||||
|
hl.bind(mod .. " + SHIFT + down", hl.dsp.exec_cmd("playerctl volume 0.1-"), { locked = true })
|
||||||
|
hl.bind(mod .. " + SHIFT + Space", hl.dsp.exec_cmd("playerctl play-pause"), { locked = true })
|
||||||
|
hl.bind(
|
||||||
|
mod .. " + SHIFT + M",
|
||||||
|
hl.dsp.exec_cmd("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"),
|
||||||
|
{ locked = true }
|
||||||
|
)
|
||||||
|
hl.bind(
|
||||||
|
mod .. " + SHIFT + S",
|
||||||
|
hl.dsp.exec_cmd("wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"),
|
||||||
|
{ locked = true }
|
||||||
|
)
|
||||||
|
|
||||||
|
-- Media & brightness
|
||||||
|
hl.bind("XF86AudioPause", hl.dsp.exec_cmd("playerctl play-pause"))
|
||||||
|
hl.bind(
|
||||||
|
"XF86AudioRaiseVolume",
|
||||||
|
hl.dsp.exec_cmd("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+"),
|
||||||
|
{ locked = true }
|
||||||
|
)
|
||||||
|
hl.bind(
|
||||||
|
"XF86AudioLowerVolume",
|
||||||
|
hl.dsp.exec_cmd("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"),
|
||||||
|
{ locked = true }
|
||||||
|
)
|
||||||
|
hl.bind(
|
||||||
|
"XF86AudioMute",
|
||||||
|
hl.dsp.exec_cmd("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"),
|
||||||
|
{ locked = true }
|
||||||
|
)
|
||||||
|
hl.bind("XF86MonBrightnessUp", hl.dsp.exec_cmd("brightnessctl set 5%+"), { locked = true })
|
||||||
|
hl.bind("XF86MonBrightnessDown", hl.dsp.exec_cmd("brightnessctl set 5%-"), { locked = true })
|
||||||
|
|
||||||
|
hl.bind(mod .. " + M", hl.dsp.exec_cmd("nu ~/.config/hypr/speak-selection.nu"))
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
-- =========================
|
||||||
|
-- Monitors
|
||||||
|
-- =========================
|
||||||
|
-- Laptop internal panel
|
||||||
|
hl.monitor({
|
||||||
|
output = "eDP-1",
|
||||||
|
mode = "2256x1504@60",
|
||||||
|
position = "0x0",
|
||||||
|
scale = 1.07,
|
||||||
|
})
|
||||||
|
|
||||||
|
-- Home Office
|
||||||
|
hl.monitor({
|
||||||
|
output = "desc:Samsung Electric Company S22R35x H4TR604392",
|
||||||
|
mode = "1920x1080@60",
|
||||||
|
position = "-1128x-1080",
|
||||||
|
scale = 1,
|
||||||
|
})
|
||||||
|
hl.monitor({
|
||||||
|
output = "desc:Samsung Electric Company S22R35x H4TR503886",
|
||||||
|
mode = "1920x1080@60",
|
||||||
|
position = "792x-1080",
|
||||||
|
scale = 1,
|
||||||
|
})
|
||||||
|
|
||||||
|
-- Fallback for anything not explicitly configured above
|
||||||
|
hl.monitor({ output = "", mode = "preferred", position = "auto", scale = "auto" })
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
-- =========================
|
||||||
|
-- Noctalia shell binds
|
||||||
|
-- =========================
|
||||||
|
-- Moved out of conf/keybindings.lua. Mirrors configs/niri/noctalia/binds.kdl.
|
||||||
|
local mod = "SUPER"
|
||||||
|
|
||||||
|
-- Window switcher
|
||||||
|
hl.bind("ALT + TAB", hl.dsp.exec_cmd("noctalia msg window-switcher toggle"))
|
||||||
|
|
||||||
|
-- Launcher / control center / settings
|
||||||
|
hl.bind(mod .. " + Space", hl.dsp.exec_cmd("noctalia msg panel-toggle launcher"))
|
||||||
|
hl.bind(mod .. " + S", hl.dsp.exec_cmd("noctalia msg panel-toggle control-center"))
|
||||||
|
hl.bind(mod .. " + comma", hl.dsp.exec_cmd("noctalia msg settings-toggle"))
|
||||||
|
|
||||||
|
-- Dismiss all notifications
|
||||||
|
hl.bind(mod .. " + ALT + L", hl.dsp.exec_cmd("noctalia msg notification-clear-active"))
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
require("conf.noctalia.binds")
|
||||||
|
require("conf.noctalia.window")
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
-- =========================
|
||||||
|
-- Noctalia window rule
|
||||||
|
-- =========================
|
||||||
|
-- Moved out of conf/window-rules.lua.
|
||||||
|
hl.window_rule({
|
||||||
|
match = { class = "dev.noctalia.Noctalia" },
|
||||||
|
float = true,
|
||||||
|
name = "float-noctalia",
|
||||||
|
center = true,
|
||||||
|
size = { "(monitor_w*0.5)", "(monitor_h*0.9)" },
|
||||||
|
})
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
-- =========================
|
||||||
|
-- Omarchy (nixarchy) shell binds
|
||||||
|
-- =========================
|
||||||
|
-- Same keys as the parked noctalia binds (conf/noctalia/binds.lua), mapped to
|
||||||
|
-- the Omarchy shell's commands. The full set is `omarchy-menu toggle <route>`
|
||||||
|
-- (root, apps, system, theme, background, capture, hardware, share, reminder)
|
||||||
|
-- and `omarchy-shell shell toggle omarchy.<panel>` (audio, bluetooth, network,
|
||||||
|
-- monitor, power, clipboard, emojis, ...).
|
||||||
|
local mod = "SUPER"
|
||||||
|
|
||||||
|
-- Launcher / menu (noctalia: panel-toggle launcher)
|
||||||
|
hl.bind(mod .. " + Space", hl.dsp.exec_cmd("omarchy-menu toggle"))
|
||||||
|
|
||||||
|
-- System menu (noctalia: panel-toggle control-center)
|
||||||
|
hl.bind(mod .. " + S", hl.dsp.exec_cmd("omarchy-menu toggle system"))
|
||||||
|
|
||||||
|
-- Theme menu (noctalia: settings-toggle)
|
||||||
|
hl.bind(mod .. " + comma", hl.dsp.exec_cmd("omarchy-menu toggle theme"))
|
||||||
|
|
||||||
|
-- Dismiss all notifications (noctalia: notification-clear-active)
|
||||||
|
hl.bind(mod .. " + ALT + L", hl.dsp.exec_cmd("omarchy-shell notifications dismissAll"))
|
||||||
|
|
||||||
|
-- ALT + TAB (noctalia's window switcher) has no Omarchy equivalent, so it is
|
||||||
|
-- left out. The shell's own defaults (SUPER + CTRL + A/B/D for audio/bluetooth/
|
||||||
|
-- monitor, SUPER + ESCAPE for the system menu) are not bound here.
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
-- =========================
|
||||||
|
-- Omarchy (nixarchy) shell
|
||||||
|
-- =========================
|
||||||
|
-- Keybinds for the Omarchy shell, mirroring the noctalia binds parked in
|
||||||
|
-- conf/noctalia/. Required from hyprland.lua.
|
||||||
|
require("conf.omarchy.binds")
|
||||||
@@ -0,0 +1,67 @@
|
|||||||
|
-- =========================
|
||||||
|
-- Window Rules
|
||||||
|
-- =========================
|
||||||
|
|
||||||
|
hl.window_rule({
|
||||||
|
match = { class = "com.mitchellh.ghostty" },
|
||||||
|
fullscreen = false,
|
||||||
|
size = { "(monitor_w*0.5)", "(monitor_h)" },
|
||||||
|
name = "ghostty-init",
|
||||||
|
})
|
||||||
|
|
||||||
|
hl.window_rule({
|
||||||
|
name = "float-pavucontrol",
|
||||||
|
match = { class = "org.pulseaudio.pavucontrol" },
|
||||||
|
float = true,
|
||||||
|
})
|
||||||
|
hl.window_rule({
|
||||||
|
name = "float-hyprland-share-picker",
|
||||||
|
match = { title = "Select what to share" },
|
||||||
|
float = true,
|
||||||
|
stay_focused = true,
|
||||||
|
})
|
||||||
|
hl.window_rule({
|
||||||
|
name = "float-blueman",
|
||||||
|
match = { class = "^(blueman-manager)$" },
|
||||||
|
float = true,
|
||||||
|
})
|
||||||
|
hl.window_rule({
|
||||||
|
name = "float-calculator",
|
||||||
|
match = { class = "^(org.gnome.Calculator)$" },
|
||||||
|
float = true,
|
||||||
|
})
|
||||||
|
hl.window_rule({
|
||||||
|
name = "float-portal-gtk",
|
||||||
|
match = { class = "^(xdg-desktop-portal-gtk)$" },
|
||||||
|
float = true,
|
||||||
|
})
|
||||||
|
hl.window_rule({
|
||||||
|
name = "float-open-file",
|
||||||
|
match = { title = "^(Open File)$" },
|
||||||
|
float = true,
|
||||||
|
})
|
||||||
|
hl.window_rule({
|
||||||
|
name = "float-save-file",
|
||||||
|
match = { title = "^(Save File)$" },
|
||||||
|
float = true,
|
||||||
|
})
|
||||||
|
hl.window_rule({
|
||||||
|
match = { initial_title = "Slack - Huddle Preview" },
|
||||||
|
float = true,
|
||||||
|
name = "float-slack-huddle",
|
||||||
|
})
|
||||||
|
hl.window_rule({
|
||||||
|
match = { class = "com.gabm.satty" },
|
||||||
|
float = true,
|
||||||
|
name = "float-satty",
|
||||||
|
})
|
||||||
|
hl.window_rule({
|
||||||
|
match = { float = true },
|
||||||
|
name = "float-style",
|
||||||
|
no_screen_share = true,
|
||||||
|
})
|
||||||
|
hl.window_rule({
|
||||||
|
match = { class = "^chrome-.*" },
|
||||||
|
fullscreen = true,
|
||||||
|
name = "fulll-chrome",
|
||||||
|
})
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
-- Auto-generated by DMS Matugen hook — do not edit manually.
|
||||||
|
-- Remove require("dms.colors") from hyprland.lua to override.
|
||||||
|
|
||||||
|
hl.config({
|
||||||
|
general = {
|
||||||
|
col = {
|
||||||
|
active_border = "rgb(ff6d00)",
|
||||||
|
inactive_border = "rgb(a08d85)",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
group = {
|
||||||
|
col = {
|
||||||
|
border_active = "rgb(ff6d00)",
|
||||||
|
border_inactive = "rgb(a08d85)",
|
||||||
|
border_locked_active = "rgb(f2b8b5)",
|
||||||
|
border_locked_inactive = "rgb(a08d85)",
|
||||||
|
},
|
||||||
|
groupbar = {
|
||||||
|
col = {
|
||||||
|
active = "rgb(ff6d00)",
|
||||||
|
inactive = "rgb(a08d85)",
|
||||||
|
locked_active = "rgb(f2b8b5)",
|
||||||
|
locked_inactive = "rgb(a08d85)",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
-- Auto-generated by DMS — do not edit manually
|
||||||
|
|
||||||
|
hl.config({
|
||||||
|
general = {
|
||||||
|
gaps_in = 4,
|
||||||
|
gaps_out = 4,
|
||||||
|
border_size = 2,
|
||||||
|
resize_on_border = false,
|
||||||
|
},
|
||||||
|
decoration = {
|
||||||
|
rounding = 12,
|
||||||
|
},
|
||||||
|
})
|
||||||
Whitespace-only changes.
@@ -0,0 +1,14 @@
|
|||||||
|
-- =========================
|
||||||
|
-- Hyprland (fwbook)
|
||||||
|
-- =========================
|
||||||
|
|
||||||
|
require("conf/env")
|
||||||
|
require("conf/general")
|
||||||
|
require("conf/animations")
|
||||||
|
require("conf/monitors")
|
||||||
|
require("conf/inputs")
|
||||||
|
require("conf/window-rules")
|
||||||
|
require("conf/keybindings")
|
||||||
|
require("conf/autostart")
|
||||||
|
require("conf.omarchy.index")
|
||||||
|
-- require("conf.noctalia.index")
|
||||||
Executable
+32
@@ -0,0 +1,32 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
set -e
|
||||||
|
|
||||||
|
_SCREEN_RECORD_DIR="$HOME/Videos/ScreenRecordings"
|
||||||
|
mkdir -p "$_SCREEN_RECORD_DIR"
|
||||||
|
|
||||||
|
|
||||||
|
if pgrep -x "wf-recorder" > /dev/null; then
|
||||||
|
last_cmd=$(pgrep -x "wf-recorder" -a)
|
||||||
|
filepath="${last_cmd##* -f }"
|
||||||
|
filepath="${filepath%% *}"
|
||||||
|
pgrep -x "wf-recorder" && pkill -INT -x wf-recorder
|
||||||
|
notify-send -h string:wf-recorder:record -t 5000 "Finished Recording. Saved at $filepath."
|
||||||
|
echo $filepath | xclip -selection clipboard
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
dims=$(slurp)
|
||||||
|
notify-send -h string:wf-recorder:record -t 1000 "Recording in:" "<span color='#90a4f4' font='26px'><i><b>3</b></i></span>"
|
||||||
|
|
||||||
|
sleep 1
|
||||||
|
|
||||||
|
notify-send -h string:wf-recorder:record -t 1000 "Recording in:" "<span color='#90a4f4' font='26px'><i><b>2</b></i></span>"
|
||||||
|
|
||||||
|
sleep 1
|
||||||
|
|
||||||
|
notify-send -h string:wf-recorder:record -t 950 "Recording in:" "<span color='#90a4f4' font='26px'><i><b>1</b></i></span>"
|
||||||
|
|
||||||
|
sleep 1
|
||||||
|
|
||||||
|
dateTime=$(date +%Y-%m-%d-%H_%M_%S)
|
||||||
|
wf-recorder --bframes max_b_frames -g "${dims}" -f $_SCREEN_RECORD_DIR/$dateTime.mp4
|
||||||
Executable
+141
@@ -0,0 +1,141 @@
|
|||||||
|
#!/usr/bin/env nu
|
||||||
|
|
||||||
|
let piperFolder = $env.HOME | path join ".local/share/piper"
|
||||||
|
let piperSoundCacheFolder = $env.HOME | path join ".local/share/piper-cache"
|
||||||
|
let modelName = "en_US-hfc_female-medium"
|
||||||
|
|
||||||
|
def pidfile [] {
|
||||||
|
$"($env.XDG_RUNTIME_DIR? | default "/tmp")/hypr-speak.pid"
|
||||||
|
}
|
||||||
|
|
||||||
|
def pid-alive [pid: int] {
|
||||||
|
(^kill -0 $pid | complete).exit_code == 0
|
||||||
|
}
|
||||||
|
|
||||||
|
def kill-tree [pid: int] {
|
||||||
|
let kids = (^pgrep -P $pid | complete)
|
||||||
|
if $kids.exit_code == 0 {
|
||||||
|
for kid in ($kids.stdout | lines) {
|
||||||
|
let kid = $kid | str trim
|
||||||
|
if not ($kid | is-empty) {
|
||||||
|
kill-tree ($kid | into int)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let _ = (^kill -KILL $pid | complete)
|
||||||
|
}
|
||||||
|
|
||||||
|
def terminate-last [file: string] {
|
||||||
|
if ($file | path exists) {
|
||||||
|
let old = (
|
||||||
|
try {
|
||||||
|
open --raw $file | str trim | into int
|
||||||
|
} catch { null }
|
||||||
|
)
|
||||||
|
rm --force $file
|
||||||
|
if $old != null and (pid-alive $old) {
|
||||||
|
kill-tree $old
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
# Show a failure notification. Works with `complete` results
|
||||||
|
# ({exit_code, stderr, ...}) and `catch` error records.
|
||||||
|
def notify-error [context: string, err: record] {
|
||||||
|
let exit = $err | get -o exit_code
|
||||||
|
let detail = if $exit != null {
|
||||||
|
let stderr = $err | get -o stderr | default ""
|
||||||
|
if ($stderr | is-empty) { $"exit ($exit)" } else { $"exit ($exit): ($stderr | str trim | lines | last)" }
|
||||||
|
} else {
|
||||||
|
$err.msg
|
||||||
|
}
|
||||||
|
let reply = notify-send -i dialog-error -A Yes="Copy to Clipboard" $"piper failed ($context)" $detail
|
||||||
|
if $reply == "Yes" {
|
||||||
|
($err | get -o stderr | default "") | ^xclip
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
def get-text [] {
|
||||||
|
let paste = (^wl-paste --primary | complete)
|
||||||
|
if $paste.exit_code != 0 {
|
||||||
|
notify-send -i dialog-warning "Piper" "No text, make sure to copy something to clipboard"
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
return ($paste.stdout
|
||||||
|
| str replace --all --regex '[\n\t]' ' '
|
||||||
|
| str replace --all --regex "[^0-9A-Za-z .,!?'-]" ''
|
||||||
|
| str replace --all --regex ' +' ' '
|
||||||
|
| str trim)
|
||||||
|
}
|
||||||
|
|
||||||
|
# returns true if failed
|
||||||
|
def run-tts [text: string, cache_file: string] {
|
||||||
|
^mkdir -p $piperSoundCacheFolder
|
||||||
|
let res = (
|
||||||
|
$text
|
||||||
|
| ^piper -m $modelName --data-dir $piperFolder --output-file $cache_file
|
||||||
|
| complete
|
||||||
|
)
|
||||||
|
if $res.exit_code != 0 {
|
||||||
|
notify-error "piper" $res
|
||||||
|
rm --force $cache_file
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
def run-tts-pipeline [use_cache: bool, cache_file: string, text: string] {
|
||||||
|
try {
|
||||||
|
notify-send -i dialog-information $"Piper `($modelName)`" $"Text: ($text)"
|
||||||
|
|
||||||
|
# skip piper when the audio is already cached
|
||||||
|
if not ($use_cache and ($cache_file | path exists)) {
|
||||||
|
if (run-tts $text $cache_file) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (play-file $cache_file) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
} catch {|err| notify-error "unexpected" $err }
|
||||||
|
|
||||||
|
# no caching → don't leave the audio file behind
|
||||||
|
if not $use_cache {
|
||||||
|
rm --force $cache_file
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
# returns true if failed
|
||||||
|
def play-file [cache_file: string] {
|
||||||
|
let res = (^ffplay -nodisp -autoexit $cache_file | complete)
|
||||||
|
if $res.exit_code != 0 {
|
||||||
|
notify-error "ffplay" $res
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
def main [--cache] {
|
||||||
|
let file = (pidfile)
|
||||||
|
if (terminate-last $file) {
|
||||||
|
notify-send -i dialog-information "Piper" "Stopped"
|
||||||
|
return
|
||||||
|
}
|
||||||
|
let text = get-text
|
||||||
|
|
||||||
|
if ($text | is-empty) {
|
||||||
|
notify-send -i dialog-warning "Piper" "No text, make sure to copy something to clipboard"
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
# cache key includes the model so different voices don't collide
|
||||||
|
let text_sha = $"($modelName)|($text)" | hash sha256
|
||||||
|
let cache_file = $piperSoundCacheFolder | path join $"($text_sha).wav"
|
||||||
|
|
||||||
|
$"($nu.pid)" | save --force $file
|
||||||
|
run-tts-pipeline $cache $cache_file $text
|
||||||
|
rm --force $file
|
||||||
|
}
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
# =========================
|
||||||
|
# xdg-desktop-portal-hyprland (fwbook)
|
||||||
|
# =========================
|
||||||
|
# Read by xdph itself from ~/.config/hypr/xdph.conf (hyprlang format, not Lua),
|
||||||
|
# so it is not require()'d from hyprland.lua. This directory is symlinked to
|
||||||
|
# ~/.config/hypr by the skyg hyprland module.
|
||||||
|
#
|
||||||
|
# force_shm: skip DMA-BUF buffer negotiation for screencast. xdph fails modifier
|
||||||
|
# fixation on this machine ("DMA-BUF fixation failed after 2 attempts") and tears
|
||||||
|
# the stream down; Chromium then reopens a ScreenCast session, which re-shows the
|
||||||
|
# output picker. Capture already ended up on SHM via the fallback path anyway, so
|
||||||
|
# image quality is unchanged -- this just avoids the failing negotiation and the
|
||||||
|
# teardown it causes.
|
||||||
|
#
|
||||||
|
# Deliberately NOT setting screencopy:allow_token_by_default -- it would auto-grant
|
||||||
|
# restore tokens to any app that asks, letting it silently re-capture later. Tick
|
||||||
|
# "allow restore token" in the picker instead.
|
||||||
|
|
||||||
|
screencopy {
|
||||||
|
force_shm = true
|
||||||
|
}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
*backup*
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
// =========================
|
||||||
|
// Niri Configuration
|
||||||
|
// =========================
|
||||||
|
// Shared configuration for multiple shell environments
|
||||||
|
|
||||||
|
// =========================
|
||||||
|
// Shared Configuration
|
||||||
|
// =========================
|
||||||
|
// General purpose configuration shared across all setups
|
||||||
|
include "shared/index.kdl"
|
||||||
|
|
||||||
|
// =========================
|
||||||
|
// Desktop Environment Selection
|
||||||
|
// =========================
|
||||||
|
// Uncomment ONE of the following to use that environment:
|
||||||
|
|
||||||
|
// For DankMaterialShell (DMS)
|
||||||
|
// include "dms/index.kdl"
|
||||||
|
|
||||||
|
include "noctalia/index.kdl"
|
||||||
|
|
||||||
|
|
||||||
|
//include "dms/binds.kdl"
|
||||||
|
include "dms/outputs.kdl"
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
// ! DO NOT EDIT !
|
||||||
|
// ! AUTO-GENERATED BY DMS !
|
||||||
|
// ! CHANGES WILL BE OVERWRITTEN !
|
||||||
|
// ! PLACE YOUR CUSTOM CONFIGURATION ELSEWHERE !
|
||||||
|
|
||||||
|
recent-windows {
|
||||||
|
highlight {
|
||||||
|
corner-radius 12
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
// =========================
|
||||||
|
// DMS-Specific Keybindings
|
||||||
|
// =========================
|
||||||
|
// Configuration and integrations specific to DankMaterialShell
|
||||||
|
|
||||||
|
binds {
|
||||||
|
// =========================
|
||||||
|
// DMS Launcher & Spotlight
|
||||||
|
// =========================
|
||||||
|
Mod+Space { spawn "dms" "ipc" "spotlight" "toggle"; }
|
||||||
|
|
||||||
|
// =========================
|
||||||
|
// DMS Integration
|
||||||
|
// =========================
|
||||||
|
Print { spawn "sh" "-c" "dms screenshot --stdout | satty -f -"; }
|
||||||
|
Mod+P { spawn "sh" "-c" "dms screenshot --stdout | satty -f -"; }
|
||||||
|
Alt+Ctrl+Delete hotkey-overlay-title="Task Manager: Toggle" { spawn "dms" "ipc" "call" "processlist" "toggle"; }
|
||||||
|
Mod+Alt+L hotkey-overlay-title="Notifications: Clear" { spawn "dms" "ipc" "notifications" "dismissAllPopups"; }
|
||||||
|
Mod+Alt+K hotkey-overlay-title="Notifications: Toggle" { spawn "dms" "ipc" "call" "notifications" "toggle"; }
|
||||||
|
// Mod+Alt+N hotkey-overlay-title="Workspace: Rename" { spawn "dms" "ipc" "workspace-rename" "toggle"; }
|
||||||
|
Mod+Alt+P hotkey-overlay-title="Clipboard: Toggle" { spawn "dms" "ipc" "call" "clipboard" "toggle"; }
|
||||||
|
Mod+Shift+Space hotkey-overlay-title="PlayerCtrl: Toggle" { spawn "playerctl" "play-pause"; }
|
||||||
|
|
||||||
|
// =========================
|
||||||
|
// DMS Media & Brightness
|
||||||
|
// =========================
|
||||||
|
Mod+Shift+Up hotkey-overlay-title="PlayerCtrl: Volume Up" { spawn "dms" "ipc" "audio" "increment" "1"; }
|
||||||
|
Mod+Shift+Down hotkey-overlay-title="PlayerCtrl: Volume Down" { spawn "dms" "ipc" "audio" "decrement" "1"; }
|
||||||
|
XF86AudioRaiseVolume allow-when-locked=true { spawn "dms" "ipc" "audio" "increment" "1"; }
|
||||||
|
XF86AudioLowerVolume allow-when-locked=true { spawn "dms" "ipc" "audio" "decrement" "1"; }
|
||||||
|
XF86AudioMute allow-when-locked=true { spawn "dms" "ipc" "call" "audio" "mute"; }
|
||||||
|
XF86AudioMicMute allow-when-locked=true { spawn "dms" "ipc" "call" "audio" "micmute"; }
|
||||||
|
XF86MonBrightnessUp allow-when-locked=true { spawn "dms" "ipc" "call" "brightness" "increment" "10" ""; }
|
||||||
|
XF86MonBrightnessDown allow-when-locked=true { spawn "dms" "ipc" "call" "brightness" "decrement" "10" ""; }
|
||||||
|
}
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
// ! Auto-generated file. Do not edit directly.
|
||||||
|
// Remove `include "dms/colors.kdl"` from your config to override.
|
||||||
|
|
||||||
|
layout {
|
||||||
|
background-color "transparent"
|
||||||
|
|
||||||
|
focus-ring {
|
||||||
|
active-color "#ff6d00"
|
||||||
|
inactive-color "#a08d85"
|
||||||
|
urgent-color "#f2b8b5"
|
||||||
|
}
|
||||||
|
|
||||||
|
border {
|
||||||
|
active-color "#ff6d00"
|
||||||
|
inactive-color "#a08d85"
|
||||||
|
urgent-color "#f2b8b5"
|
||||||
|
}
|
||||||
|
|
||||||
|
shadow {
|
||||||
|
color "#00000070"
|
||||||
|
}
|
||||||
|
|
||||||
|
tab-indicator {
|
||||||
|
active-color "#ff6d00"
|
||||||
|
inactive-color "#a08d85"
|
||||||
|
urgent-color "#f2b8b5"
|
||||||
|
}
|
||||||
|
|
||||||
|
insert-hint {
|
||||||
|
color "#ff6d0080"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
recent-windows {
|
||||||
|
highlight {
|
||||||
|
active-color "#3e2723"
|
||||||
|
urgent-color "#f2b8b5"
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
// ! DO NOT EDIT !
|
||||||
|
// ! AUTO-GENERATED BY DMS !
|
||||||
|
// ! CHANGES WILL BE OVERWRITTEN !
|
||||||
|
// ! PLACE YOUR CUSTOM CONFIGURATION ELSEWHERE !
|
||||||
|
|
||||||
|
cursor {
|
||||||
|
xcursor-theme "Adwaita"
|
||||||
|
xcursor-size 24
|
||||||
|
hide-when-typing
|
||||||
|
}
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
// =========================
|
||||||
|
// DMS Configuration Index
|
||||||
|
// =========================
|
||||||
|
// Configuration specific to DankMaterialShell (DMS)
|
||||||
|
|
||||||
|
include "./binds.kdl"
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
// ! DO NOT EDIT !
|
||||||
|
// ! AUTO-GENERATED BY DMS !
|
||||||
|
// ! CHANGES WILL BE OVERWRITTEN !
|
||||||
|
// ! PLACE YOUR CUSTOM CONFIGURATION ELSEWHERE !
|
||||||
|
|
||||||
|
layout {
|
||||||
|
gaps 4
|
||||||
|
|
||||||
|
border {
|
||||||
|
width 2
|
||||||
|
}
|
||||||
|
|
||||||
|
focus-ring {
|
||||||
|
width 2
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
window-rule {
|
||||||
|
geometry-corner-radius 12
|
||||||
|
clip-to-geometry true
|
||||||
|
tiled-state true
|
||||||
|
draw-border-with-background false
|
||||||
|
}
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
// Auto-generated by DMS - do not edit manually
|
||||||
|
|
||||||
|
output "DP-9" {
|
||||||
|
mode "1920x1080@74.973"
|
||||||
|
scale 1
|
||||||
|
position x=0 y=0
|
||||||
|
}
|
||||||
|
|
||||||
|
output "eDP-1" {
|
||||||
|
mode "2880x1920@120.000"
|
||||||
|
scale 2
|
||||||
|
position x=1253 y=1080
|
||||||
|
focus-at-startup
|
||||||
|
layout {
|
||||||
|
always-center-single-column
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
output "DP-10" {
|
||||||
|
mode "1920x1080@74.973"
|
||||||
|
scale 1
|
||||||
|
position x=1920 y=0
|
||||||
|
}
|
||||||
|
|
||||||
@@ -0,0 +1,55 @@
|
|||||||
|
// Auto-generated by DMS - do not edit manually
|
||||||
|
|
||||||
|
output "DP-9" {
|
||||||
|
mode "1920x1080@74.973"
|
||||||
|
scale 1
|
||||||
|
position x=0 y=0
|
||||||
|
}
|
||||||
|
|
||||||
|
output "Samsung Electric Company S22R35x H4TR604392" {
|
||||||
|
mode "1920x1080@60.000"
|
||||||
|
scale 1
|
||||||
|
position x=106 y=0
|
||||||
|
}
|
||||||
|
|
||||||
|
output "eDP-1" {
|
||||||
|
mode "2256x1504@59.999"
|
||||||
|
scale 1
|
||||||
|
position x=859 y=1080
|
||||||
|
}
|
||||||
|
|
||||||
|
output "DP-10" {
|
||||||
|
mode "1920x1080@74.973"
|
||||||
|
scale 1
|
||||||
|
position x=1920 y=0
|
||||||
|
}
|
||||||
|
|
||||||
|
output "Samsung Electric Company S22R35x H4TR503886" {
|
||||||
|
mode "1920x1080@60.000"
|
||||||
|
scale 1
|
||||||
|
position x=2026 y=0
|
||||||
|
}
|
||||||
|
|
||||||
|
output "PNP(GWD) ARZOPA \\x15\\xd9F\\x1675US0000" {
|
||||||
|
mode "1920x1080@60.000"
|
||||||
|
scale 1
|
||||||
|
transform "normal"
|
||||||
|
position x=2860 y=1080
|
||||||
|
}
|
||||||
|
|
||||||
|
output "DP-2" {
|
||||||
|
mode "1920x1080@60.000"
|
||||||
|
scale 1
|
||||||
|
position x=3115 y=1504
|
||||||
|
}
|
||||||
|
|
||||||
|
output "Dell Inc. DELL SE3223Q 1WDWKK3" {
|
||||||
|
scale 2
|
||||||
|
position x=4780 y=0
|
||||||
|
}
|
||||||
|
|
||||||
|
output "Dell Inc. DELL SE3223Q 1TRXKK3" {
|
||||||
|
scale 2
|
||||||
|
position x=6700 y=0
|
||||||
|
}
|
||||||
|
|
||||||
@@ -0,0 +1,55 @@
|
|||||||
|
// Auto-generated by DMS - do not edit manually
|
||||||
|
|
||||||
|
output "DP-9" {
|
||||||
|
mode "1920x1080@74.973"
|
||||||
|
scale 1
|
||||||
|
position x=0 y=0
|
||||||
|
}
|
||||||
|
|
||||||
|
output "Samsung Electric Company S22R35x H4TR604392" {
|
||||||
|
mode "1920x1080@60.000"
|
||||||
|
scale 1
|
||||||
|
position x=106 y=0
|
||||||
|
}
|
||||||
|
|
||||||
|
output "eDP-1" {
|
||||||
|
mode "2256x1504@59.999"
|
||||||
|
scale 1
|
||||||
|
position x=859 y=1080
|
||||||
|
}
|
||||||
|
|
||||||
|
output "DP-10" {
|
||||||
|
mode "1920x1080@74.973"
|
||||||
|
scale 1
|
||||||
|
position x=1920 y=0
|
||||||
|
}
|
||||||
|
|
||||||
|
output "Samsung Electric Company S22R35x H4TR503886" {
|
||||||
|
mode "1920x1080@60.000"
|
||||||
|
scale 1
|
||||||
|
position x=2026 y=0
|
||||||
|
}
|
||||||
|
|
||||||
|
output "PNP(GWD) ARZOPA \\x15\\xd9F\\x1675US0000" {
|
||||||
|
mode "1920x1080@60.000"
|
||||||
|
scale 1
|
||||||
|
transform "normal"
|
||||||
|
position x=2860 y=1080
|
||||||
|
}
|
||||||
|
|
||||||
|
output "DP-2" {
|
||||||
|
mode "1920x1080@60.000"
|
||||||
|
scale 1
|
||||||
|
position x=3115 y=1504
|
||||||
|
}
|
||||||
|
|
||||||
|
output "Dell Inc. DELL SE3223Q 1WDWKK3" {
|
||||||
|
scale 2
|
||||||
|
position x=4780 y=0
|
||||||
|
}
|
||||||
|
|
||||||
|
output "Dell Inc. DELL SE3223Q 1TRXKK3" {
|
||||||
|
scale 2
|
||||||
|
position x=6700 y=0
|
||||||
|
}
|
||||||
|
|
||||||
Whitespace-only changes.
@@ -0,0 +1,9 @@
|
|||||||
|
// ! DO NOT EDIT !
|
||||||
|
// ! AUTO-GENERATED BY DMS !
|
||||||
|
// ! CHANGES WILL BE OVERWRITTEN !
|
||||||
|
// ! PLACE YOUR CUSTOM CONFIGURATION ELSEWHERE !
|
||||||
|
|
||||||
|
layer-rule {
|
||||||
|
match namespace="dms:blurwallpaper"
|
||||||
|
place-within-backdrop true
|
||||||
|
}
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
binds {
|
||||||
|
|
||||||
|
ALT+Tab { spawn "noctalia" "msg" "window-switcher" "toggle"; }
|
||||||
|
Mod+Space { spawn "noctalia" "msg" "panel-toggle" "launcher"; }
|
||||||
|
Mod+S { spawn "noctalia" "msg" "panel-toggle" "control-center"; }
|
||||||
|
Mod+comma { spawn "noctalia" "msg" "settings-toggle"; }
|
||||||
|
Mod+Alt+L hotkey-overlay-title="Notifications: Clear" { spawn "noctalia" "msg" "notification-clear-active"; }
|
||||||
|
|
||||||
|
Mod+P { spawn "sh" "-c" "grim -g \"$(slurp)\" - | satty -f -"; }
|
||||||
|
}
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
include "./binds.kdl"
|
||||||
|
include "./startup.kdl"
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
spawn-at-startup "noctalia"
|
||||||
Executable
+32
@@ -0,0 +1,32 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
set -e
|
||||||
|
|
||||||
|
_SCREEN_RECORD_DIR="$HOME/Videos/ScreenRecordings"
|
||||||
|
mkdir -p "$_SCREEN_RECORD_DIR"
|
||||||
|
|
||||||
|
|
||||||
|
if pgrep -x "wf-recorder" > /dev/null; then
|
||||||
|
last_cmd=$(pgrep -x "wf-recorder" -a)
|
||||||
|
filepath="${last_cmd##* -f }"
|
||||||
|
filepath="${filepath%% *}"
|
||||||
|
pgrep -x "wf-recorder" && pkill -INT -x wf-recorder
|
||||||
|
notify-send -h string:wf-recorder:record -t 5000 "Finished Recording. Saved at $filepath."
|
||||||
|
echo $filepath | xclip -selection clipboard
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
dims=$(slurp)
|
||||||
|
notify-send -h string:wf-recorder:record -t 1000 "Recording in:" "<span color='#90a4f4' font='26px'><i><b>3</b></i></span>"
|
||||||
|
|
||||||
|
sleep 1
|
||||||
|
|
||||||
|
notify-send -h string:wf-recorder:record -t 1000 "Recording in:" "<span color='#90a4f4' font='26px'><i><b>2</b></i></span>"
|
||||||
|
|
||||||
|
sleep 1
|
||||||
|
|
||||||
|
notify-send -h string:wf-recorder:record -t 950 "Recording in:" "<span color='#90a4f4' font='26px'><i><b>1</b></i></span>"
|
||||||
|
|
||||||
|
sleep 1
|
||||||
|
|
||||||
|
dateTime=$(date +%Y-%m-%d-%H_%M_%S)
|
||||||
|
wf-recorder --bframes max_b_frames -g "${dims}" -f $_SCREEN_RECORD_DIR/$dateTime.mp4
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
// ! DO NOT EDIT !
|
||||||
|
// ! AUTO-GENERATED BY DMS !
|
||||||
|
// ! CHANGES WILL BE OVERWRITTEN !
|
||||||
|
// ! PLACE YOUR CUSTOM CONFIGURATION ELSEWHERE !
|
||||||
|
|
||||||
|
recent-windows {
|
||||||
|
highlight {
|
||||||
|
corner-radius 12
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,94 @@
|
|||||||
|
// =========================
|
||||||
|
// Shared Keybindings
|
||||||
|
// =========================
|
||||||
|
// Common keybindings across all desktop environments
|
||||||
|
|
||||||
|
binds {
|
||||||
|
// =========================
|
||||||
|
// General
|
||||||
|
// =========================
|
||||||
|
Mod+Shift+H { show-hotkey-overlay; }
|
||||||
|
Mod+T { spawn "ghostty"; }
|
||||||
|
Mod+A { spawn "ghostty" "-e" "pi"; }
|
||||||
|
Mod+Z { spawn "flatpak" "run" "app.zen_browser.zen"; }
|
||||||
|
Mod+B { spawn "chromium"; }
|
||||||
|
Mod+E { spawn "wofi-emoji"; }
|
||||||
|
Mod+Alt+E { spawn-sh "zeditor ~/.config/niri/shared/binds.kdl"; }
|
||||||
|
Mod+Q { close-window; }
|
||||||
|
Mod+Alt+N hotkey-overlay-title="Workspace: Rename" { spawn "skygqts" "workspace-manager" "rename"; }
|
||||||
|
|
||||||
|
|
||||||
|
// =========================
|
||||||
|
// Navigation
|
||||||
|
// =========================
|
||||||
|
Mod+Left { focus-column-left; }
|
||||||
|
Mod+Down { focus-workspace-down; }
|
||||||
|
Mod+Up { focus-workspace-up; }
|
||||||
|
Mod+Right { focus-column-right; }
|
||||||
|
|
||||||
|
Mod+Tab hotkey-overlay-title="Workspace: Rename" { spawn "skygqts" "workspace-manager" "windows"; }
|
||||||
|
Mod+Shift+Tab { focus-monitor-next; }
|
||||||
|
|
||||||
|
// =========================
|
||||||
|
// Window Management
|
||||||
|
// =========================
|
||||||
|
Mod+Ctrl+Right { swap-window-right; }
|
||||||
|
Mod+Ctrl+Left { swap-window-left; }
|
||||||
|
Mod+Ctrl+Up { move-window-to-workspace-up; }
|
||||||
|
Mod+Ctrl+Down { move-window-to-workspace-down; }
|
||||||
|
|
||||||
|
Mod+F { maximize-column; }
|
||||||
|
Mod+Shift+F { fullscreen-window; }
|
||||||
|
Mod+Ctrl+F { reset-window-height; }
|
||||||
|
Mod+V { toggle-window-floating; }
|
||||||
|
Mod+C { center-column; }
|
||||||
|
|
||||||
|
// =========================
|
||||||
|
// Basic Sound Control
|
||||||
|
// =========================
|
||||||
|
Mod+Shift+Right hotkey-overlay-title="PlayerCtrl: Next" { spawn "playerctl" "next"; }
|
||||||
|
Mod+Shift+Left hotkey-overlay-title="PlayerCtrl: Previous" { spawn "playerctl" "previous"; }
|
||||||
|
Mod+Shift+Up allow-when-locked=true { spawn "playerctl" "volume" "0.1+"; }
|
||||||
|
Mod+Shift+Down allow-when-locked=true { spawn "playerctl" "volume" "0.1-"; }
|
||||||
|
Mod+Shift+Space allow-when-locked=true { spawn "playerctl" "play-pause"; }
|
||||||
|
Mod+Shift+M allow-when-locked=true { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SINK@" "toggle"; }
|
||||||
|
Mod+Shift+S allow-when-locked=true { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SOURCE@" "toggle"; }
|
||||||
|
XF86AudioRaiseVolume allow-when-locked=true { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "5%+"; }
|
||||||
|
XF86AudioLowerVolume allow-when-locked=true { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "5%-"; }
|
||||||
|
XF86AudioMute allow-when-locked=true { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SINK@" "toggle"; }
|
||||||
|
XF86AudioMicMute allow-when-locked=true { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SOURCE@" "toggle"; }
|
||||||
|
XF86MonBrightnessUp allow-when-locked=true { spawn "brightnessctl" "set" "5%+"; }
|
||||||
|
XF86MonBrightnessDown allow-when-locked=true { spawn "brightnessctl" "set" "5%-"; }
|
||||||
|
|
||||||
|
// =========================
|
||||||
|
// Resizing
|
||||||
|
// =========================
|
||||||
|
Mod+Minus { set-column-width "-10%"; }
|
||||||
|
Mod+Equal { set-column-width "+10%"; }
|
||||||
|
Mod+Shift+Minus { set-window-height "-10%"; }
|
||||||
|
Mod+Shift+Equal { set-window-height "+10%"; }
|
||||||
|
|
||||||
|
// =========================
|
||||||
|
// Screenshots & Recording
|
||||||
|
// =========================
|
||||||
|
Mod+R { spawn "/home/ari/.config/niri/screen-record.sh"; }
|
||||||
|
Mod+M { spawn "nu" "/home/ari/.config/hypr/speak-selection.nu"; }
|
||||||
|
|
||||||
|
// =========================
|
||||||
|
// Misc
|
||||||
|
// =========================
|
||||||
|
Mod+Escape allow-inhibiting=false { toggle-keyboard-shortcuts-inhibit; }
|
||||||
|
|
||||||
|
// =========================
|
||||||
|
// Monitor Movement
|
||||||
|
// =========================
|
||||||
|
Mod+Alt+Down hotkey-overlay-title="Move to Monitor Down" { move-column-to-monitor-down; }
|
||||||
|
Mod+Alt+Left hotkey-overlay-title="Move to Monitor Left" { move-column-to-monitor-left; }
|
||||||
|
Mod+Alt+Right hotkey-overlay-title="Move to Monitor Right" { move-column-to-monitor-right; }
|
||||||
|
Mod+Alt+Up hotkey-overlay-title="Move to Monitor Up" { move-column-to-monitor-up; }
|
||||||
|
|
||||||
|
Mod+TouchpadScrollUp hotkey-overlay-title="Move Workspace to Monitor Down" { move-workspace-to-monitor-down; }
|
||||||
|
Mod+TouchpadScrollRight hotkey-overlay-title="Move Workspace to Monitor Left" { move-workspace-to-monitor-left; }
|
||||||
|
Mod+TouchpadScrollLeft hotkey-overlay-title="Move Workspace to Monitor Right" { move-workspace-to-monitor-right; }
|
||||||
|
Mod+TouchpadScrollDown hotkey-overlay-title="Move Workspace to Monitor Up" { move-workspace-to-monitor-up; }
|
||||||
|
}
|
||||||
@@ -0,0 +1,40 @@
|
|||||||
|
// Liquid Glass color scheme — vibrant cyan/teal, purple, and pink accents
|
||||||
|
// with a frosted-glass feel. The transparent background lets the wallpaper
|
||||||
|
// show through for the full glass effect.
|
||||||
|
|
||||||
|
layout {
|
||||||
|
background-color "transparent"
|
||||||
|
|
||||||
|
focus-ring {
|
||||||
|
active-color "#00e5ff" // glowing cyan
|
||||||
|
inactive-color "#6a5acd" // muted slate purple
|
||||||
|
urgent-color "#ff69b4" // hot pink
|
||||||
|
}
|
||||||
|
|
||||||
|
border {
|
||||||
|
active-color "#00e5ffcc" // cyan with ~80% opacity for glassy glow
|
||||||
|
inactive-color "#6a5acd88" // slate purple, more transparent
|
||||||
|
urgent-color "#ff69b4cc" // hot pink with glow
|
||||||
|
}
|
||||||
|
|
||||||
|
shadow {
|
||||||
|
color "#000000b0" // deeper shadow for depth
|
||||||
|
}
|
||||||
|
|
||||||
|
tab-indicator {
|
||||||
|
active-color "#00e5ff"
|
||||||
|
inactive-color "#6a5acd"
|
||||||
|
urgent-color "#ff69b4"
|
||||||
|
}
|
||||||
|
|
||||||
|
insert-hint {
|
||||||
|
color "#00e5ff80" // cyan insert hint
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
recent-windows {
|
||||||
|
highlight {
|
||||||
|
active-color "#1a1a2e" // deep navy
|
||||||
|
urgent-color "#ff69b4"
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
// ! DO NOT EDIT !
|
||||||
|
// ! AUTO-GENERATED BY DMS !
|
||||||
|
// ! CHANGES WILL BE OVERWRITTEN !
|
||||||
|
// ! PLACE YOUR CUSTOM CONFIGURATION ELSEWHERE !
|
||||||
|
|
||||||
|
cursor {
|
||||||
|
xcursor-theme "Adwaita"
|
||||||
|
xcursor-size 24
|
||||||
|
hide-when-typing
|
||||||
|
}
|
||||||
@@ -0,0 +1,68 @@
|
|||||||
|
// =========================
|
||||||
|
// DMS General Configuration
|
||||||
|
// =========================
|
||||||
|
|
||||||
|
// https://github.com/YaLTeR/niri/wiki/Configuration:-Input
|
||||||
|
input {
|
||||||
|
touchpad {
|
||||||
|
tap
|
||||||
|
natural-scroll
|
||||||
|
}
|
||||||
|
|
||||||
|
// Absolute map for the built-in panel (scale 1.5). Without this, touch
|
||||||
|
// can miss windows when logical/physical sizes diverge.
|
||||||
|
touch {
|
||||||
|
map-to-output "eDP-1"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
overview {
|
||||||
|
backdrop-color "#1a1a2e" // deep navy to complement the glass palette
|
||||||
|
}
|
||||||
|
|
||||||
|
environment {
|
||||||
|
QT_QPA_PLATFORM "wayland"
|
||||||
|
QT_WAYLAND_DISABLE_WINDOWDECORATION "1"
|
||||||
|
NIXOS_OZONE_WL "1"
|
||||||
|
DISPLAY ":0"
|
||||||
|
ELECTRON_OZONE_PLATFORM_HINT "auto"
|
||||||
|
}
|
||||||
|
|
||||||
|
// =========================
|
||||||
|
// Screenshots
|
||||||
|
// =========================
|
||||||
|
screenshot-path "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png"
|
||||||
|
|
||||||
|
// =========================
|
||||||
|
// System Events
|
||||||
|
// =========================
|
||||||
|
switch-events {
|
||||||
|
lid-close { spawn "notify-send" "The laptop lid is closed!"; }
|
||||||
|
lid-open { spawn "notify-send" "The laptop lid is open!"; }
|
||||||
|
}
|
||||||
|
|
||||||
|
hotkey-overlay {
|
||||||
|
skip-at-startup
|
||||||
|
}
|
||||||
|
|
||||||
|
gestures {
|
||||||
|
dnd-edge-view-scroll {
|
||||||
|
trigger-width 30
|
||||||
|
delay-ms 100
|
||||||
|
max-speed 1500
|
||||||
|
}
|
||||||
|
|
||||||
|
dnd-edge-workspace-switch {
|
||||||
|
trigger-height 50
|
||||||
|
delay-ms 100
|
||||||
|
max-speed 1500
|
||||||
|
}
|
||||||
|
|
||||||
|
hot-corners {
|
||||||
|
off
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
debug {
|
||||||
|
honor-xdg-activation-with-invalid-serial
|
||||||
|
}
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
// =========================
|
||||||
|
// Shared Configuration Index
|
||||||
|
// =========================
|
||||||
|
// General purpose configuration shared across all DM setups
|
||||||
|
|
||||||
|
include "./general.kdl"
|
||||||
|
include "./outputs.kdl"
|
||||||
|
include "./cursor.kdl"
|
||||||
|
include "./colors.kdl"
|
||||||
|
include "./layout.kdl"
|
||||||
|
include "./alttab.kdl"
|
||||||
|
include "./wpblur.kdl"
|
||||||
|
include "./windowrules.kdl"
|
||||||
|
include "./binds.kdl"
|
||||||
|
include "./startup.kdl"
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
layout {
|
||||||
|
gaps 1
|
||||||
|
|
||||||
|
border {
|
||||||
|
width 2
|
||||||
|
}
|
||||||
|
|
||||||
|
focus-ring {
|
||||||
|
width 4
|
||||||
|
}
|
||||||
|
}
|
||||||
|
window-rule {
|
||||||
|
geometry-corner-radius 4
|
||||||
|
clip-to-geometry true
|
||||||
|
tiled-state true
|
||||||
|
draw-border-with-background false
|
||||||
|
}
|
||||||
@@ -0,0 +1,61 @@
|
|||||||
|
// Laptop Monitor
|
||||||
|
output "eDP-1" {
|
||||||
|
mode "2256x1504@59.999"
|
||||||
|
scale 1.5
|
||||||
|
position x=859 y=1080
|
||||||
|
}
|
||||||
|
|
||||||
|
// Work Monitor
|
||||||
|
output "Ancor Communications Inc ASUS VE278 E5LMTF016849" {
|
||||||
|
mode "1920x1080@60.000"
|
||||||
|
scale 1
|
||||||
|
position x=1027 y=0
|
||||||
|
}
|
||||||
|
|
||||||
|
output "DP-9" {
|
||||||
|
mode "1920x1080@74.973"
|
||||||
|
scale 1
|
||||||
|
position x=0 y=0
|
||||||
|
}
|
||||||
|
|
||||||
|
output "Samsung Electric Company S22R35x H4TR604392" {
|
||||||
|
mode "1920x1080@60.000"
|
||||||
|
scale 1
|
||||||
|
position x=106 y=0
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
output "DP-10" {
|
||||||
|
mode "1920x1080@74.973"
|
||||||
|
scale 1
|
||||||
|
position x=1920 y=0
|
||||||
|
}
|
||||||
|
|
||||||
|
output "Samsung Electric Company S22R35x H4TR503886" {
|
||||||
|
mode "1920x1080@60.000"
|
||||||
|
scale 1
|
||||||
|
position x=2026 y=0
|
||||||
|
}
|
||||||
|
|
||||||
|
output "PNP(GWD) ARZOPA \\x15\\xd9F\\x1675US0000" {
|
||||||
|
mode "1920x1080@60.000"
|
||||||
|
scale 1
|
||||||
|
transform "normal"
|
||||||
|
position x=2860 y=1080
|
||||||
|
}
|
||||||
|
|
||||||
|
output "DP-2" {
|
||||||
|
mode "1920x1080@60.000"
|
||||||
|
scale 1
|
||||||
|
position x=3115 y=1504
|
||||||
|
}
|
||||||
|
|
||||||
|
output "Dell Inc. DELL SE3223Q 1WDWKK3" {
|
||||||
|
scale 2
|
||||||
|
position x=4780 y=0
|
||||||
|
}
|
||||||
|
|
||||||
|
output "Dell Inc. DELL SE3223Q 1TRXKK3" {
|
||||||
|
scale 2
|
||||||
|
position x=6700 y=0
|
||||||
|
}
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
spawn-at-startup "/home/ari/.config/niri/startup.sh"
|
||||||
|
|
||||||
|
binds {
|
||||||
|
Mod+Shift+A { spawn "/home/ari/.config/niri/startup.sh"; }
|
||||||
|
}
|
||||||
@@ -0,0 +1,94 @@
|
|||||||
|
// DMS Window Rules - Managed by DankMaterialShell
|
||||||
|
// Do not edit manually - changes may be overwritten
|
||||||
|
|
||||||
|
// @id=dms_rule_0 @name=
|
||||||
|
window-rule {
|
||||||
|
match app-id="^signal$"
|
||||||
|
open-focused true
|
||||||
|
}
|
||||||
|
|
||||||
|
window-rule {
|
||||||
|
match app-id="zoom"
|
||||||
|
open-floating true
|
||||||
|
open-focused true
|
||||||
|
default-column-width { proportion 0.75; }
|
||||||
|
default-window-height { proportion 0.8; }
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// @id=dms_rule_1 @name=
|
||||||
|
window-rule {
|
||||||
|
match app-id="org.pipewire.Helvum"
|
||||||
|
open-floating true
|
||||||
|
open-focused true
|
||||||
|
default-column-width { proportion 0.75; }
|
||||||
|
default-window-height { proportion 0.8; }
|
||||||
|
}
|
||||||
|
|
||||||
|
// @id=dms_rule_2 @name=Slack Huddle Rules
|
||||||
|
window-rule {
|
||||||
|
match app-id="Slack" title="$Huddle:.*"
|
||||||
|
open-floating true
|
||||||
|
open-focused true
|
||||||
|
default-column-width { proportion 0.25; }
|
||||||
|
default-window-height { proportion 0.5; }
|
||||||
|
}
|
||||||
|
|
||||||
|
// @id=dms_rule_3 @name=
|
||||||
|
window-rule {
|
||||||
|
match app-id="remote-viewer"
|
||||||
|
open-maximized true
|
||||||
|
open-fullscreen true
|
||||||
|
open-focused true
|
||||||
|
}
|
||||||
|
|
||||||
|
// @id=dms_rule_4 @name=
|
||||||
|
window-rule {
|
||||||
|
match is-active=false
|
||||||
|
opacity 0.92 // more translucent for the glass depth effect
|
||||||
|
}
|
||||||
|
|
||||||
|
// @id=dms_rule_5 @name=
|
||||||
|
window-rule {
|
||||||
|
match is-urgent=true
|
||||||
|
open-focused true
|
||||||
|
}
|
||||||
|
|
||||||
|
// @id=dms_rule_6 @name=
|
||||||
|
window-rule {
|
||||||
|
match app-id="satty"
|
||||||
|
open-floating true
|
||||||
|
open-focused true
|
||||||
|
default-column-width { proportion 0.75; }
|
||||||
|
default-window-height { proportion 0.75; }
|
||||||
|
min-width 800
|
||||||
|
min-height 400
|
||||||
|
}
|
||||||
|
|
||||||
|
// @id=dms_rule_7 @name=
|
||||||
|
window-rule {
|
||||||
|
match app-id="org.shotcut.Shotcut"
|
||||||
|
opacity 0.95
|
||||||
|
open-maximized true
|
||||||
|
open-focused true
|
||||||
|
}
|
||||||
|
|
||||||
|
// @id=dms_rule_8 @name=
|
||||||
|
window-rule {
|
||||||
|
match app-id="Sparrow"
|
||||||
|
block-out-from "screen-capture"
|
||||||
|
focus-ring { active-color "#f00f"; }
|
||||||
|
}
|
||||||
|
|
||||||
|
// @id=dms_rule_9 @name=
|
||||||
|
window-rule {
|
||||||
|
match app-id="Sparrow" title="Bitwarden" is-focused=false
|
||||||
|
opacity 0.45
|
||||||
|
}
|
||||||
|
|
||||||
|
// @id=dms_rule_10 @name=
|
||||||
|
window-rule {
|
||||||
|
match app-id="^com.slack.Slack$"
|
||||||
|
clip-to-geometry true
|
||||||
|
border { active-color "#0f0f"; }
|
||||||
|
}
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
// ! DO NOT EDIT !
|
||||||
|
// ! AUTO-GENERATED BY DMS !
|
||||||
|
// ! CHANGES WILL BE OVERWRITTEN !
|
||||||
|
// ! PLACE YOUR CUSTOM CONFIGURATION ELSEWHERE !
|
||||||
|
|
||||||
|
layer-rule {
|
||||||
|
match namespace="dms:blurwallpaper"
|
||||||
|
place-within-backdrop true
|
||||||
|
}
|
||||||
Executable
+6
@@ -0,0 +1,6 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
|
||||||
|
skygqts workspace-manager &
|
||||||
|
|
||||||
|
notify-send "Autostarted ran!"
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
plugins/
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
{
|
||||||
|
"mError": "#bf616a",
|
||||||
|
"mHover": "#5e81ac",
|
||||||
|
"mOnError": "#2e3440",
|
||||||
|
"mOnHover": "#2e3440",
|
||||||
|
"mOnPrimary": "#2e3440",
|
||||||
|
"mOnSecondary": "#2e3440",
|
||||||
|
"mOnSurface": "#eceff4",
|
||||||
|
"mOnSurfaceVariant": "#d8dee9",
|
||||||
|
"mOnTertiary": "#2e3440",
|
||||||
|
"mOutline": "#505a70",
|
||||||
|
"mPrimary": "#8fbcbb",
|
||||||
|
"mSecondary": "#88c0d0",
|
||||||
|
"mShadow": "#2e3440",
|
||||||
|
"mSurface": "#2e3440",
|
||||||
|
"mSurfaceVariant": "#3b4252",
|
||||||
|
"mTertiary": "#5e81ac"
|
||||||
|
}
|
||||||
@@ -0,0 +1,56 @@
|
|||||||
|
{
|
||||||
|
"sources": [
|
||||||
|
{
|
||||||
|
"enabled": true,
|
||||||
|
"name": "Noctalia Plugins",
|
||||||
|
"url": "https://github.com/noctalia-dev/noctalia-plugins"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"states": {
|
||||||
|
"ip-monitor": {
|
||||||
|
"enabled": true,
|
||||||
|
"sourceUrl": "https://github.com/noctalia-dev/noctalia-plugins"
|
||||||
|
},
|
||||||
|
"kde-connect": {
|
||||||
|
"enabled": true,
|
||||||
|
"sourceUrl": "https://github.com/noctalia-dev/noctalia-plugins"
|
||||||
|
},
|
||||||
|
"kubectl-ctx": {
|
||||||
|
"enabled": true,
|
||||||
|
"sourceUrl": "https://github.com/noctalia-dev/noctalia-plugins"
|
||||||
|
},
|
||||||
|
"monitor-layout": {
|
||||||
|
"enabled": true,
|
||||||
|
"sourceUrl": "https://github.com/noctalia-dev/noctalia-plugins"
|
||||||
|
},
|
||||||
|
"niri-animation-picker": {
|
||||||
|
"enabled": true,
|
||||||
|
"sourceUrl": "https://github.com/noctalia-dev/noctalia-plugins"
|
||||||
|
},
|
||||||
|
"niri-workspaces": {
|
||||||
|
"enabled": true,
|
||||||
|
"sourceUrl": "https://github.com/noctalia-dev/noctalia-plugins"
|
||||||
|
},
|
||||||
|
"privacy-indicator": {
|
||||||
|
"enabled": true,
|
||||||
|
"sourceUrl": "https://github.com/noctalia-dev/noctalia-plugins"
|
||||||
|
},
|
||||||
|
"screen-recorder": {
|
||||||
|
"enabled": true,
|
||||||
|
"sourceUrl": "https://github.com/noctalia-dev/noctalia-plugins"
|
||||||
|
},
|
||||||
|
"screen-toolkit": {
|
||||||
|
"enabled": true,
|
||||||
|
"sourceUrl": "https://github.com/noctalia-dev/noctalia-plugins"
|
||||||
|
},
|
||||||
|
"vscode-provider": {
|
||||||
|
"enabled": true,
|
||||||
|
"sourceUrl": "https://github.com/noctalia-dev/noctalia-plugins"
|
||||||
|
},
|
||||||
|
"zed-provider": {
|
||||||
|
"enabled": true,
|
||||||
|
"sourceUrl": "https://github.com/noctalia-dev/noctalia-plugins"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"version": 2
|
||||||
|
}
|
||||||
@@ -0,0 +1,881 @@
|
|||||||
|
{
|
||||||
|
"appLauncher": {
|
||||||
|
"autoPasteClipboard": false,
|
||||||
|
"clipboardWatchImageCommand": "wl-paste --type image --watch cliphist store",
|
||||||
|
"clipboardWatchTextCommand": "wl-paste --type text --watch cliphist store",
|
||||||
|
"clipboardWrapText": true,
|
||||||
|
"customLaunchPrefix": "",
|
||||||
|
"customLaunchPrefixEnabled": false,
|
||||||
|
"density": "default",
|
||||||
|
"enableClipPreview": true,
|
||||||
|
"enableClipboardChips": true,
|
||||||
|
"enableClipboardHistory": false,
|
||||||
|
"enableClipboardSmartIcons": true,
|
||||||
|
"enableSessionSearch": true,
|
||||||
|
"enableSettingsSearch": true,
|
||||||
|
"enableWindowsSearch": true,
|
||||||
|
"iconMode": "tabler",
|
||||||
|
"ignoreMouseInput": false,
|
||||||
|
"overviewLayer": false,
|
||||||
|
"pinnedApps": [],
|
||||||
|
"position": "center",
|
||||||
|
"screenshotAnnotationTool": "",
|
||||||
|
"showCategories": true,
|
||||||
|
"showIconBackground": false,
|
||||||
|
"sortByMostUsed": true,
|
||||||
|
"terminalCommand": "alacritty -e",
|
||||||
|
"viewMode": "grid"
|
||||||
|
},
|
||||||
|
"audio": {
|
||||||
|
"mprisBlacklist": [],
|
||||||
|
"preferredPlayer": "",
|
||||||
|
"spectrumFrameRate": 30,
|
||||||
|
"spectrumMirrored": true,
|
||||||
|
"visualizerType": "linear",
|
||||||
|
"volumeFeedback": false,
|
||||||
|
"volumeFeedbackSoundFile": "",
|
||||||
|
"volumeOverdrive": false,
|
||||||
|
"volumeStep": 5
|
||||||
|
},
|
||||||
|
"bar": {
|
||||||
|
"autoHideDelay": 500,
|
||||||
|
"autoShowDelay": 150,
|
||||||
|
"backgroundOpacity": 0.93,
|
||||||
|
"barType": "simple",
|
||||||
|
"capsuleColorKey": "none",
|
||||||
|
"capsuleOpacity": 1,
|
||||||
|
"contentPadding": 2,
|
||||||
|
"density": "default",
|
||||||
|
"displayMode": "always_visible",
|
||||||
|
"enableExclusionZoneInset": true,
|
||||||
|
"fontScale": 1,
|
||||||
|
"frameRadius": 12,
|
||||||
|
"frameThickness": 8,
|
||||||
|
"hideOnOverview": false,
|
||||||
|
"marginHorizontal": 4,
|
||||||
|
"marginVertical": 4,
|
||||||
|
"middleClickAction": "none",
|
||||||
|
"middleClickCommand": "",
|
||||||
|
"middleClickFollowMouse": false,
|
||||||
|
"monitors": [],
|
||||||
|
"mouseWheelAction": "none",
|
||||||
|
"mouseWheelWrap": true,
|
||||||
|
"outerCorners": true,
|
||||||
|
"position": "top",
|
||||||
|
"reverseScroll": false,
|
||||||
|
"rightClickAction": "controlCenter",
|
||||||
|
"rightClickCommand": "",
|
||||||
|
"rightClickFollowMouse": true,
|
||||||
|
"screenOverrides": [],
|
||||||
|
"showCapsule": true,
|
||||||
|
"showOnWorkspaceSwitch": true,
|
||||||
|
"showOutline": false,
|
||||||
|
"useSeparateOpacity": false,
|
||||||
|
"widgetSpacing": 6,
|
||||||
|
"widgets": {
|
||||||
|
"center": [
|
||||||
|
{
|
||||||
|
"characterCount": 10,
|
||||||
|
"colorizeIcons": true,
|
||||||
|
"emptyColor": "error",
|
||||||
|
"enableScrollWheel": true,
|
||||||
|
"focusedColor": "primary",
|
||||||
|
"followFocusedScreen": true,
|
||||||
|
"fontWeight": "bold",
|
||||||
|
"groupedBorderOpacity": 1,
|
||||||
|
"hideUnoccupied": true,
|
||||||
|
"iconScale": 0.8,
|
||||||
|
"id": "Workspace",
|
||||||
|
"labelMode": "name",
|
||||||
|
"occupiedColor": "secondary",
|
||||||
|
"pillSize": 0.6,
|
||||||
|
"showApplications": true,
|
||||||
|
"showApplicationsHover": true,
|
||||||
|
"showBadge": true,
|
||||||
|
"showLabelsOnlyWhenOccupied": true,
|
||||||
|
"unfocusedIconsOpacity": 1
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"left": [
|
||||||
|
{
|
||||||
|
"colorizeSystemIcon": "none",
|
||||||
|
"colorizeSystemText": "none",
|
||||||
|
"customIconPath": "",
|
||||||
|
"enableColorization": false,
|
||||||
|
"icon": "rocket",
|
||||||
|
"iconColor": "none",
|
||||||
|
"id": "Launcher",
|
||||||
|
"useDistroLogo": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"clockColor": "none",
|
||||||
|
"customFont": "",
|
||||||
|
"formatHorizontal": "HH:mm ddd, MMM dd",
|
||||||
|
"formatVertical": "HH mm - dd MM",
|
||||||
|
"id": "Clock",
|
||||||
|
"tooltipFormat": "HH:mm ddd, MMM dd",
|
||||||
|
"useCustomFont": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"compactMode": true,
|
||||||
|
"diskPath": "/",
|
||||||
|
"iconColor": "none",
|
||||||
|
"id": "SystemMonitor",
|
||||||
|
"showCpuCores": false,
|
||||||
|
"showCpuFreq": false,
|
||||||
|
"showCpuTemp": true,
|
||||||
|
"showCpuUsage": true,
|
||||||
|
"showDiskAvailable": false,
|
||||||
|
"showDiskUsage": false,
|
||||||
|
"showDiskUsageAsPercent": false,
|
||||||
|
"showGpuTemp": false,
|
||||||
|
"showLoadAverage": false,
|
||||||
|
"showMemoryAsPercent": false,
|
||||||
|
"showMemoryUsage": true,
|
||||||
|
"showNetworkStats": false,
|
||||||
|
"showSwapUsage": false,
|
||||||
|
"textColor": "none",
|
||||||
|
"useMonospaceFont": true,
|
||||||
|
"usePadding": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"colorizeIcons": false,
|
||||||
|
"hideMode": "hidden",
|
||||||
|
"id": "ActiveWindow",
|
||||||
|
"maxWidth": 145,
|
||||||
|
"scrollingMode": "hover",
|
||||||
|
"showIcon": true,
|
||||||
|
"showText": true,
|
||||||
|
"textColor": "none",
|
||||||
|
"useFixedWidth": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"compactMode": false,
|
||||||
|
"hideMode": "hidden",
|
||||||
|
"hideWhenIdle": false,
|
||||||
|
"id": "MediaMini",
|
||||||
|
"maxWidth": 145,
|
||||||
|
"panelShowAlbumArt": true,
|
||||||
|
"scrollingMode": "hover",
|
||||||
|
"showAlbumArt": true,
|
||||||
|
"showArtistFirst": true,
|
||||||
|
"showProgressRing": true,
|
||||||
|
"showVisualizer": false,
|
||||||
|
"textColor": "none",
|
||||||
|
"useFixedWidth": false,
|
||||||
|
"visualizerType": "linear"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"right": [
|
||||||
|
{
|
||||||
|
"blacklist": [],
|
||||||
|
"chevronColor": "none",
|
||||||
|
"colorizeIcons": false,
|
||||||
|
"drawerEnabled": true,
|
||||||
|
"hidePassive": false,
|
||||||
|
"id": "Tray",
|
||||||
|
"pinned": [
|
||||||
|
"systray_3155",
|
||||||
|
"You have 21 notifications",
|
||||||
|
"Bluetooth Enabled",
|
||||||
|
"systray_2900",
|
||||||
|
"Bluetooth Active"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"hideWhenZero": false,
|
||||||
|
"hideWhenZeroUnread": false,
|
||||||
|
"iconColor": "none",
|
||||||
|
"id": "NotificationHistory",
|
||||||
|
"showUnreadBadge": true,
|
||||||
|
"unreadBadgeColor": "primary"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"deviceNativePath": "__default__",
|
||||||
|
"displayMode": "graphic-clean",
|
||||||
|
"hideIfIdle": false,
|
||||||
|
"hideIfNotDetected": true,
|
||||||
|
"id": "Battery",
|
||||||
|
"showNoctaliaPerformance": false,
|
||||||
|
"showPowerProfiles": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"displayMode": "onhover",
|
||||||
|
"iconColor": "none",
|
||||||
|
"id": "Volume",
|
||||||
|
"middleClickCommand": "pwvucontrol || pavucontrol",
|
||||||
|
"textColor": "none"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"applyToAllMonitors": false,
|
||||||
|
"displayMode": "onhover",
|
||||||
|
"iconColor": "none",
|
||||||
|
"id": "Brightness",
|
||||||
|
"textColor": "none"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"colorizeDistroLogo": false,
|
||||||
|
"colorizeSystemIcon": "none",
|
||||||
|
"colorizeSystemText": "none",
|
||||||
|
"customIconPath": "",
|
||||||
|
"enableColorization": false,
|
||||||
|
"icon": "noctalia",
|
||||||
|
"id": "ControlCenter",
|
||||||
|
"useDistroLogo": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"defaultSettings": {
|
||||||
|
"animationsFolder": "~/.config/niri/animations",
|
||||||
|
"iconColor": "none",
|
||||||
|
"targetFile": "~/.config/niri/config.kdl"
|
||||||
|
},
|
||||||
|
"id": "plugin:niri-animation-picker"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"defaultSettings": {
|
||||||
|
"iconColor": "none",
|
||||||
|
"kubeconfigPath": "",
|
||||||
|
"panelHeight": 680,
|
||||||
|
"panelWidth": 620,
|
||||||
|
"pollInterval": 60,
|
||||||
|
"showErrorBadge": true,
|
||||||
|
"terminal": ""
|
||||||
|
},
|
||||||
|
"id": "plugin:kubectl-ctx"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"defaultSettings": {
|
||||||
|
"errorIcon": "alert-circle",
|
||||||
|
"iconColor": "primary",
|
||||||
|
"loadingIcon": "loader",
|
||||||
|
"refreshInterval": 300,
|
||||||
|
"successIcon": "network"
|
||||||
|
},
|
||||||
|
"id": "plugin:ip-monitor"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"defaultSettings": {
|
||||||
|
"audioCodec": "opus",
|
||||||
|
"audioSource": "default_output",
|
||||||
|
"colorRange": "limited",
|
||||||
|
"copyToClipboard": false,
|
||||||
|
"customReplayDuration": "30",
|
||||||
|
"directory": "",
|
||||||
|
"filenamePattern": "recording_yyyyMMdd_HHmmss",
|
||||||
|
"frameRate": "60",
|
||||||
|
"hideInactive": false,
|
||||||
|
"iconColor": "none",
|
||||||
|
"quality": "very_high",
|
||||||
|
"replayDuration": "30",
|
||||||
|
"replayEnabled": false,
|
||||||
|
"replayStorage": "ram",
|
||||||
|
"resolution": "original",
|
||||||
|
"restorePortalSession": false,
|
||||||
|
"showCursor": true,
|
||||||
|
"videoCodec": "h264",
|
||||||
|
"videoSource": "portal"
|
||||||
|
},
|
||||||
|
"id": "plugin:screen-recorder"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"defaultSettings": {
|
||||||
|
"colorHistory": [],
|
||||||
|
"detectedCompositor": "",
|
||||||
|
"detectedRecorder": "",
|
||||||
|
"filenameFormat": "",
|
||||||
|
"installedLangs": ["eng"],
|
||||||
|
"paletteColors": [],
|
||||||
|
"screenshotPath": "",
|
||||||
|
"selectedOcrLang": "eng",
|
||||||
|
"transAvailable": false,
|
||||||
|
"videoPath": ""
|
||||||
|
},
|
||||||
|
"id": "plugin:screen-toolkit"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"defaultSettings": {
|
||||||
|
"activeColor": "primary",
|
||||||
|
"camFilterRegex": "",
|
||||||
|
"enableToast": true,
|
||||||
|
"hideInactive": false,
|
||||||
|
"iconSpacing": 4,
|
||||||
|
"inactiveColor": "none",
|
||||||
|
"micFilterRegex": "",
|
||||||
|
"removeMargins": false
|
||||||
|
},
|
||||||
|
"id": "plugin:privacy-indicator"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"defaultSettings": {},
|
||||||
|
"id": "plugin:kde-connect"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"defaultSettings": {
|
||||||
|
"backend": "auto",
|
||||||
|
"gridSize": 40,
|
||||||
|
"hyprctlCommand": "hyprctl",
|
||||||
|
"iconColor": "primary",
|
||||||
|
"snapToGrid": true,
|
||||||
|
"swayCommand": "swaymsg"
|
||||||
|
},
|
||||||
|
"id": "plugin:monitor-layout"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"brightness": {
|
||||||
|
"backlightDeviceMappings": [],
|
||||||
|
"brightnessStep": 5,
|
||||||
|
"enableDdcSupport": false,
|
||||||
|
"enforceMinimum": true
|
||||||
|
},
|
||||||
|
"calendar": {
|
||||||
|
"cards": [
|
||||||
|
{
|
||||||
|
"enabled": true,
|
||||||
|
"id": "calendar-header-card"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"enabled": true,
|
||||||
|
"id": "calendar-month-card"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"enabled": true,
|
||||||
|
"id": "weather-card"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"colorSchemes": {
|
||||||
|
"darkMode": true,
|
||||||
|
"generationMethod": "tonal-spot",
|
||||||
|
"manualSunrise": "06:30",
|
||||||
|
"manualSunset": "18:30",
|
||||||
|
"monitorForColors": "",
|
||||||
|
"predefinedScheme": "Nord",
|
||||||
|
"schedulingMode": "off",
|
||||||
|
"syncGsettings": true,
|
||||||
|
"useWallpaperColors": false
|
||||||
|
},
|
||||||
|
"controlCenter": {
|
||||||
|
"cards": [
|
||||||
|
{
|
||||||
|
"enabled": true,
|
||||||
|
"id": "profile-card"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"enabled": true,
|
||||||
|
"id": "shortcuts-card"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"enabled": true,
|
||||||
|
"id": "audio-card"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"enabled": false,
|
||||||
|
"id": "brightness-card"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"enabled": true,
|
||||||
|
"id": "weather-card"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"enabled": true,
|
||||||
|
"id": "media-sysmon-card"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"diskPath": "/",
|
||||||
|
"position": "close_to_bar_button",
|
||||||
|
"shortcuts": {
|
||||||
|
"left": [
|
||||||
|
{
|
||||||
|
"id": "Network"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "Bluetooth"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "WallpaperSelector"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "NoctaliaPerformance"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"right": [
|
||||||
|
{
|
||||||
|
"id": "Notifications"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "PowerProfile"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "KeepAwake"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "NightLight"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"desktopWidgets": {
|
||||||
|
"enabled": true,
|
||||||
|
"gridSnap": true,
|
||||||
|
"gridSnapScale": false,
|
||||||
|
"monitorWidgets": [
|
||||||
|
{
|
||||||
|
"name": "DP-12",
|
||||||
|
"widgets": []
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "eDP-1",
|
||||||
|
"widgets": [
|
||||||
|
{
|
||||||
|
"clockColor": "none",
|
||||||
|
"clockStyle": "digital",
|
||||||
|
"customFont": "",
|
||||||
|
"format": "HH:mm\\nd MMMM yyyy",
|
||||||
|
"id": "Clock",
|
||||||
|
"roundedCorners": true,
|
||||||
|
"scale": 2.8436704465093623,
|
||||||
|
"showBackground": true,
|
||||||
|
"useCustomFont": false,
|
||||||
|
"x": 900,
|
||||||
|
"y": 600
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "Weather",
|
||||||
|
"roundedCorners": true,
|
||||||
|
"scale": 1.7840230578796779,
|
||||||
|
"showBackground": true,
|
||||||
|
"x": 250,
|
||||||
|
"y": 50
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"diskPath": "/",
|
||||||
|
"id": "SystemStat",
|
||||||
|
"layout": "bottom",
|
||||||
|
"roundedCorners": true,
|
||||||
|
"scale": 1.2637287322956703,
|
||||||
|
"showBackground": true,
|
||||||
|
"statType": "CPU",
|
||||||
|
"x": 975,
|
||||||
|
"y": 400
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"colorName": "primary",
|
||||||
|
"height": 72,
|
||||||
|
"hideWhenIdle": false,
|
||||||
|
"id": "AudioVisualizer",
|
||||||
|
"roundedCorners": true,
|
||||||
|
"scale": 2.0591870326523494,
|
||||||
|
"showBackground": true,
|
||||||
|
"visualizerType": "linear",
|
||||||
|
"width": 320,
|
||||||
|
"x": 1075,
|
||||||
|
"y": 50
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"diskPath": "/",
|
||||||
|
"id": "SystemStat",
|
||||||
|
"layout": "bottom",
|
||||||
|
"roundedCorners": true,
|
||||||
|
"scale": 1.2577993473075955,
|
||||||
|
"showBackground": true,
|
||||||
|
"statType": "Memory",
|
||||||
|
"x": 1125,
|
||||||
|
"y": 1050
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"diskPath": "/",
|
||||||
|
"id": "SystemStat",
|
||||||
|
"layout": "bottom",
|
||||||
|
"roundedCorners": true,
|
||||||
|
"scale": 1.2633420332747087,
|
||||||
|
"showBackground": true,
|
||||||
|
"statType": "Network",
|
||||||
|
"x": 725,
|
||||||
|
"y": 50
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"diskPath": "/",
|
||||||
|
"id": "SystemStat",
|
||||||
|
"layout": "bottom",
|
||||||
|
"roundedCorners": true,
|
||||||
|
"scale": 1.29053986441566,
|
||||||
|
"showBackground": true,
|
||||||
|
"statType": "GPU",
|
||||||
|
"x": 700,
|
||||||
|
"y": 1050
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"diskPath": "/mnt/Data",
|
||||||
|
"id": "SystemStat",
|
||||||
|
"layout": "side",
|
||||||
|
"roundedCorners": true,
|
||||||
|
"scale": 1.0167569575749935,
|
||||||
|
"showBackground": true,
|
||||||
|
"statType": "Disk",
|
||||||
|
"x": 1725,
|
||||||
|
"y": 750
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"diskPath": "/home",
|
||||||
|
"id": "SystemStat",
|
||||||
|
"layout": "side",
|
||||||
|
"roundedCorners": true,
|
||||||
|
"scale": 1,
|
||||||
|
"showBackground": true,
|
||||||
|
"statType": "Disk",
|
||||||
|
"x": 1725,
|
||||||
|
"y": 600
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"overviewEnabled": true
|
||||||
|
},
|
||||||
|
"dock": {
|
||||||
|
"animationSpeed": 1,
|
||||||
|
"backgroundOpacity": 1,
|
||||||
|
"colorizeIcons": false,
|
||||||
|
"deadOpacity": 0.6,
|
||||||
|
"displayMode": "auto_hide",
|
||||||
|
"dockType": "floating",
|
||||||
|
"enabled": true,
|
||||||
|
"floatingRatio": 1,
|
||||||
|
"groupApps": true,
|
||||||
|
"groupClickAction": "cycle",
|
||||||
|
"groupContextMenuMode": "extended",
|
||||||
|
"groupIndicatorStyle": "dots",
|
||||||
|
"inactiveIndicators": true,
|
||||||
|
"indicatorColor": "primary",
|
||||||
|
"indicatorOpacity": 0.6,
|
||||||
|
"indicatorThickness": 6,
|
||||||
|
"launcherIcon": "",
|
||||||
|
"launcherIconColor": "none",
|
||||||
|
"launcherPosition": "end",
|
||||||
|
"launcherUseDistroLogo": false,
|
||||||
|
"monitors": [],
|
||||||
|
"onlySameOutput": true,
|
||||||
|
"pinnedApps": [],
|
||||||
|
"pinnedStatic": true,
|
||||||
|
"position": "bottom",
|
||||||
|
"showDockIndicator": true,
|
||||||
|
"showLauncherIcon": false,
|
||||||
|
"sitOnFrame": false,
|
||||||
|
"size": 1.53
|
||||||
|
},
|
||||||
|
"general": {
|
||||||
|
"allowPanelsOnScreenWithoutBar": true,
|
||||||
|
"allowPasswordWithFprintd": false,
|
||||||
|
"animationDisabled": false,
|
||||||
|
"animationSpeed": 1,
|
||||||
|
"autoStartAuth": false,
|
||||||
|
"avatarImage": "/home/ari/.face",
|
||||||
|
"boxRadiusRatio": 1,
|
||||||
|
"clockFormat": "hh\\nmm",
|
||||||
|
"clockStyle": "custom",
|
||||||
|
"compactLockScreen": false,
|
||||||
|
"dimmerOpacity": 0.2,
|
||||||
|
"enableBlurBehind": true,
|
||||||
|
"enableLockScreenCountdown": true,
|
||||||
|
"enableLockScreenMediaControls": false,
|
||||||
|
"enableShadows": true,
|
||||||
|
"forceBlackScreenCorners": false,
|
||||||
|
"iRadiusRatio": 1,
|
||||||
|
"keybinds": {
|
||||||
|
"keyDown": ["Down"],
|
||||||
|
"keyEnter": ["Return", "Enter"],
|
||||||
|
"keyEscape": ["Esc"],
|
||||||
|
"keyLeft": ["Left"],
|
||||||
|
"keyRemove": ["Del"],
|
||||||
|
"keyRight": ["Right"],
|
||||||
|
"keyUp": ["Up"]
|
||||||
|
},
|
||||||
|
"language": "",
|
||||||
|
"lockOnSuspend": true,
|
||||||
|
"lockScreenAnimations": false,
|
||||||
|
"lockScreenBlur": 0,
|
||||||
|
"lockScreenCountdownDuration": 10000,
|
||||||
|
"lockScreenMonitors": [],
|
||||||
|
"lockScreenTint": 0,
|
||||||
|
"passwordChars": false,
|
||||||
|
"radiusRatio": 1,
|
||||||
|
"reverseScroll": false,
|
||||||
|
"scaleRatio": 1,
|
||||||
|
"screenRadiusRatio": 1,
|
||||||
|
"shadowDirection": "bottom_right",
|
||||||
|
"shadowOffsetX": 2,
|
||||||
|
"shadowOffsetY": 3,
|
||||||
|
"showChangelogOnStartup": true,
|
||||||
|
"showHibernateOnLockScreen": false,
|
||||||
|
"showScreenCorners": false,
|
||||||
|
"showSessionButtonsOnLockScreen": true,
|
||||||
|
"smoothScrollEnabled": true,
|
||||||
|
"telemetryEnabled": true
|
||||||
|
},
|
||||||
|
"hooks": {
|
||||||
|
"colorGeneration": "",
|
||||||
|
"darkModeChange": "",
|
||||||
|
"enabled": true,
|
||||||
|
"performanceModeDisabled": "",
|
||||||
|
"performanceModeEnabled": "",
|
||||||
|
"screenLock": "",
|
||||||
|
"screenUnlock": "",
|
||||||
|
"session": "",
|
||||||
|
"startup": "",
|
||||||
|
"wallpaperChange": ""
|
||||||
|
},
|
||||||
|
"idle": {
|
||||||
|
"customCommands": "[]",
|
||||||
|
"enabled": true,
|
||||||
|
"fadeDuration": 5,
|
||||||
|
"lockCommand": "",
|
||||||
|
"lockTimeout": 660,
|
||||||
|
"resumeLockCommand": "",
|
||||||
|
"resumeScreenOffCommand": "",
|
||||||
|
"resumeSuspendCommand": "",
|
||||||
|
"screenOffCommand": "",
|
||||||
|
"screenOffTimeout": 600,
|
||||||
|
"suspendCommand": "",
|
||||||
|
"suspendTimeout": 1800
|
||||||
|
},
|
||||||
|
"location": {
|
||||||
|
"analogClockInCalendar": false,
|
||||||
|
"autoLocate": true,
|
||||||
|
"firstDayOfWeek": -1,
|
||||||
|
"hideWeatherCityName": false,
|
||||||
|
"hideWeatherTimezone": false,
|
||||||
|
"name": "Markham",
|
||||||
|
"showCalendarEvents": true,
|
||||||
|
"showCalendarWeather": true,
|
||||||
|
"showWeekNumberInCalendar": false,
|
||||||
|
"use12hourFormat": false,
|
||||||
|
"useFahrenheit": false,
|
||||||
|
"weatherEnabled": true,
|
||||||
|
"weatherShowEffects": true,
|
||||||
|
"weatherTaliaMascotAlways": true
|
||||||
|
},
|
||||||
|
"network": {
|
||||||
|
"bluetoothAutoConnect": true,
|
||||||
|
"bluetoothDetailsViewMode": "grid",
|
||||||
|
"bluetoothHideUnnamedDevices": false,
|
||||||
|
"bluetoothRssiPollIntervalMs": 60000,
|
||||||
|
"bluetoothRssiPollingEnabled": false,
|
||||||
|
"disableDiscoverability": false,
|
||||||
|
"networkPanelView": "wifi",
|
||||||
|
"wifiDetailsViewMode": "grid"
|
||||||
|
},
|
||||||
|
"nightLight": {
|
||||||
|
"autoSchedule": true,
|
||||||
|
"dayTemp": "6500",
|
||||||
|
"enabled": false,
|
||||||
|
"forced": false,
|
||||||
|
"manualSunrise": "06:30",
|
||||||
|
"manualSunset": "18:30",
|
||||||
|
"nightTemp": "4000"
|
||||||
|
},
|
||||||
|
"noctaliaPerformance": {
|
||||||
|
"disableDesktopWidgets": true,
|
||||||
|
"disableWallpaper": true
|
||||||
|
},
|
||||||
|
"notifications": {
|
||||||
|
"backgroundOpacity": 1,
|
||||||
|
"clearDismissed": true,
|
||||||
|
"criticalUrgencyDuration": 15,
|
||||||
|
"density": "compact",
|
||||||
|
"enableBatteryToast": true,
|
||||||
|
"enableKeyboardLayoutToast": true,
|
||||||
|
"enableMarkdown": true,
|
||||||
|
"enableMediaToast": true,
|
||||||
|
"enabled": true,
|
||||||
|
"location": "top_right",
|
||||||
|
"lowUrgencyDuration": 3,
|
||||||
|
"monitors": [],
|
||||||
|
"normalUrgencyDuration": 8,
|
||||||
|
"overlayLayer": true,
|
||||||
|
"respectExpireTimeout": true,
|
||||||
|
"saveToHistory": {
|
||||||
|
"critical": true,
|
||||||
|
"low": true,
|
||||||
|
"normal": true
|
||||||
|
},
|
||||||
|
"sounds": {
|
||||||
|
"criticalSoundFile": "",
|
||||||
|
"enabled": true,
|
||||||
|
"excludedApps": "discord,firefox,chrome,chromium,edge",
|
||||||
|
"lowSoundFile": "",
|
||||||
|
"normalSoundFile": "",
|
||||||
|
"separateSounds": true,
|
||||||
|
"volume": 0.27
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"osd": {
|
||||||
|
"autoHideMs": 2000,
|
||||||
|
"backgroundOpacity": 1,
|
||||||
|
"enabled": true,
|
||||||
|
"enabledTypes": [0, 1, 2],
|
||||||
|
"location": "top_right",
|
||||||
|
"monitors": [],
|
||||||
|
"overlayLayer": true
|
||||||
|
},
|
||||||
|
"plugins": {
|
||||||
|
"autoUpdate": false,
|
||||||
|
"notifyUpdates": true
|
||||||
|
},
|
||||||
|
"sessionMenu": {
|
||||||
|
"countdownDuration": 10000,
|
||||||
|
"enableCountdown": true,
|
||||||
|
"largeButtonsLayout": "single-row",
|
||||||
|
"largeButtonsStyle": true,
|
||||||
|
"position": "center",
|
||||||
|
"powerOptions": [
|
||||||
|
{
|
||||||
|
"action": "lock",
|
||||||
|
"command": "",
|
||||||
|
"countdownEnabled": true,
|
||||||
|
"enabled": true,
|
||||||
|
"keybind": "1"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"action": "suspend",
|
||||||
|
"command": "",
|
||||||
|
"countdownEnabled": true,
|
||||||
|
"enabled": true,
|
||||||
|
"keybind": "2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"action": "hibernate",
|
||||||
|
"command": "",
|
||||||
|
"countdownEnabled": true,
|
||||||
|
"enabled": true,
|
||||||
|
"keybind": "3"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"action": "reboot",
|
||||||
|
"command": "",
|
||||||
|
"countdownEnabled": true,
|
||||||
|
"enabled": true,
|
||||||
|
"keybind": "4"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"action": "logout",
|
||||||
|
"command": "",
|
||||||
|
"countdownEnabled": true,
|
||||||
|
"enabled": true,
|
||||||
|
"keybind": "5"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"action": "shutdown",
|
||||||
|
"command": "",
|
||||||
|
"countdownEnabled": true,
|
||||||
|
"enabled": true,
|
||||||
|
"keybind": "6"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"action": "rebootToUefi",
|
||||||
|
"command": "",
|
||||||
|
"countdownEnabled": true,
|
||||||
|
"enabled": true,
|
||||||
|
"keybind": "7"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"action": "userspaceReboot",
|
||||||
|
"command": "",
|
||||||
|
"countdownEnabled": true,
|
||||||
|
"enabled": false,
|
||||||
|
"keybind": ""
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"showHeader": true,
|
||||||
|
"showKeybinds": true
|
||||||
|
},
|
||||||
|
"settingsVersion": 59,
|
||||||
|
"systemMonitor": {
|
||||||
|
"batteryCriticalThreshold": 5,
|
||||||
|
"batteryWarningThreshold": 20,
|
||||||
|
"cpuCriticalThreshold": 90,
|
||||||
|
"cpuWarningThreshold": 80,
|
||||||
|
"criticalColor": "",
|
||||||
|
"diskAvailCriticalThreshold": 10,
|
||||||
|
"diskAvailWarningThreshold": 20,
|
||||||
|
"diskCriticalThreshold": 90,
|
||||||
|
"diskWarningThreshold": 80,
|
||||||
|
"enableDgpuMonitoring": true,
|
||||||
|
"externalMonitor": "resources || missioncenter || jdsystemmonitor || corestats || system-monitoring-center || gnome-system-monitor || plasma-systemmonitor || mate-system-monitor || ukui-system-monitor || deepin-system-monitor || pantheon-system-monitor",
|
||||||
|
"gpuCriticalThreshold": 90,
|
||||||
|
"gpuWarningThreshold": 80,
|
||||||
|
"memCriticalThreshold": 90,
|
||||||
|
"memWarningThreshold": 80,
|
||||||
|
"swapCriticalThreshold": 90,
|
||||||
|
"swapWarningThreshold": 80,
|
||||||
|
"tempCriticalThreshold": 90,
|
||||||
|
"tempWarningThreshold": 80,
|
||||||
|
"useCustomColors": false,
|
||||||
|
"warningColor": ""
|
||||||
|
},
|
||||||
|
"templates": {
|
||||||
|
"activeTemplates": [],
|
||||||
|
"enableUserTheming": false
|
||||||
|
},
|
||||||
|
"ui": {
|
||||||
|
"boxBorderEnabled": false,
|
||||||
|
"fontDefault": "DejaVu Sans",
|
||||||
|
"fontDefaultScale": 1,
|
||||||
|
"fontFixed": "monospace",
|
||||||
|
"fontFixedScale": 1,
|
||||||
|
"panelBackgroundOpacity": 0.93,
|
||||||
|
"panelsAttachedToBar": true,
|
||||||
|
"scrollbarAlwaysVisible": true,
|
||||||
|
"settingsPanelMode": "attached",
|
||||||
|
"settingsPanelSideBarCardStyle": false,
|
||||||
|
"tooltipsEnabled": true,
|
||||||
|
"translucentWidgets": false
|
||||||
|
},
|
||||||
|
"wallpaper": {
|
||||||
|
"automationEnabled": false,
|
||||||
|
"directory": "/home/ari/Pictures/Wallpapers",
|
||||||
|
"enableMultiMonitorDirectories": false,
|
||||||
|
"enabled": true,
|
||||||
|
"favorites": [],
|
||||||
|
"fillColor": "#000000",
|
||||||
|
"fillMode": "crop",
|
||||||
|
"hideWallpaperFilenames": false,
|
||||||
|
"linkLightAndDarkWallpapers": true,
|
||||||
|
"monitorDirectories": [],
|
||||||
|
"overviewBlur": 0.4,
|
||||||
|
"overviewEnabled": true,
|
||||||
|
"overviewTint": 0.6,
|
||||||
|
"panelPosition": "center",
|
||||||
|
"randomIntervalSec": 300,
|
||||||
|
"setWallpaperOnAllMonitors": true,
|
||||||
|
"showHiddenFiles": false,
|
||||||
|
"skipStartupTransition": true,
|
||||||
|
"solidColor": "#1a1a2e",
|
||||||
|
"sortOrder": "name",
|
||||||
|
"transitionDuration": 0,
|
||||||
|
"transitionEdgeSmoothness": 0.05,
|
||||||
|
"transitionType": [
|
||||||
|
"fade",
|
||||||
|
"disc",
|
||||||
|
"stripes",
|
||||||
|
"wipe",
|
||||||
|
"pixelate",
|
||||||
|
"honeycomb"
|
||||||
|
],
|
||||||
|
"useOriginalImages": true,
|
||||||
|
"useSolidColor": false,
|
||||||
|
"useWallhaven": false,
|
||||||
|
"viewMode": "single",
|
||||||
|
"wallhavenApiKey": "",
|
||||||
|
"wallhavenCategories": "111",
|
||||||
|
"wallhavenOrder": "desc",
|
||||||
|
"wallhavenPurity": "100",
|
||||||
|
"wallhavenQuery": "",
|
||||||
|
"wallhavenRatios": "",
|
||||||
|
"wallhavenResolutionHeight": "",
|
||||||
|
"wallhavenResolutionMode": "atleast",
|
||||||
|
"wallhavenResolutionWidth": "",
|
||||||
|
"wallhavenSorting": "relevance",
|
||||||
|
"wallpaperChangeMode": "random"
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
# Third-party plugin checkouts stay local (own .git, omarchy-plugin-update).
|
||||||
|
# shell.json still lists enabled plugin ids; install/clone into plugins/ yourself.
|
||||||
|
plugins/
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
# configs/fwbook/omarchy/
|
||||||
|
|
||||||
|
Host-specific Omarchy (nixarchy) shell config for `fwbook`.
|
||||||
|
Symlinked to `~/.config/omarchy` by `hosts/fwbook/packages.nix`
|
||||||
|
(`system.userActivationScripts.omarchyConfig`), same pattern as hypr/noctalia.
|
||||||
|
|
||||||
|
## Layout
|
||||||
|
|
||||||
|
| Path | Notes |
|
||||||
|
| --- | --- |
|
||||||
|
| `shell.json` | Bar layout, idle timings, enabled plugins. No `omarchy.system-update` widget (its 6h poll is a no-op on NixOS). |
|
||||||
|
| `shell.toml` | Font base size for the shell. |
|
||||||
|
| `defaults/` | Defaults the shell writes (e.g. `agent`). |
|
||||||
|
| `backgrounds/` | User wallpapers / live-wallpaper sources. |
|
||||||
|
| `plugins/` | **Not tracked** (gitignored). Third-party checkouts with their own `.git` so `omarchy-plugin-update` still works. `shell.json` lists enabled ids; clone/install into this dir on each machine. |
|
||||||
|
|
||||||
|
Runtime state stays under `~/.local/state/omarchy/` (clipboard, toggles, etc.) — not here.
|
||||||
|
|
||||||
|
## Plugins currently in use (local only)
|
||||||
|
|
||||||
|
| id | source |
|
||||||
|
| --- | --- |
|
||||||
|
| `tenzin.live-wallpaper` | https://github.com/yesheytenzin/live-wallpaper |
|
||||||
|
| `io.github.ehlxr.advanced-workspaces` | https://github.com/ehlxr/advanced-workspaces |
|
||||||
|
|
||||||
|
## Package wiring
|
||||||
|
|
||||||
|
Shell binary + `OMARCHY_PATH` live in `hosts/fwbook/packages.nix`.
|
||||||
|
Launch is `omarchy-launch-shell` from `configs/fwbook/hypr/conf/autostart.lua`.
|
||||||
|
No nixarchy NixOS/HM modules.
|
||||||
Whitespace-only changes.
Binary file not shown.
|
After Width: | Height: | Size: 659 KiB |
Binary file not shown.
@@ -0,0 +1 @@
|
|||||||
|
nord
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
pi
|
||||||
@@ -0,0 +1,70 @@
|
|||||||
|
{
|
||||||
|
"bar": {
|
||||||
|
"centerAnchor": "omarchy.clock",
|
||||||
|
"layout": {
|
||||||
|
"center": [
|
||||||
|
{
|
||||||
|
"id": "omarchy.indicators"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"format": "dddd HH:mm",
|
||||||
|
"formatAlt": "d MMMM 'W'ww yyyy",
|
||||||
|
"id": "omarchy.clock",
|
||||||
|
"verticalFormat": "HH\n—\nmm"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "omarchy.keyboard-layout"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "omarchy.weather"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"left": [
|
||||||
|
{
|
||||||
|
"id": "omarchy.menu"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "omarchy.workspaces"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "io.github.ehlxr.advanced-workspaces"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"right": [
|
||||||
|
{
|
||||||
|
"id": "omarchy.tray"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "omarchy.agents"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "omarchy.bluetooth"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "omarchy.network"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "omarchy.audio"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "omarchy.monitor"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "omarchy.power"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"position": "top",
|
||||||
|
"transparent": false
|
||||||
|
},
|
||||||
|
"idle": {
|
||||||
|
"lock": 300,
|
||||||
|
"screensaver": 150
|
||||||
|
},
|
||||||
|
"plugins": [
|
||||||
|
{
|
||||||
|
"id": "tenzin.live-wallpaper"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"version": 1
|
||||||
|
}
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
[font]
|
||||||
|
base-size = 16
|
||||||
@@ -0,0 +1,97 @@
|
|||||||
|
# configs/fwbook/quickshell/
|
||||||
|
|
||||||
|
Host-specific Quickshell configs for `fwbook`. Symlinked to `~/.config/quickshell`
|
||||||
|
by the `skyg.nixos.desktop.tiler.quickshell` module, which defaults its
|
||||||
|
`configName` to the machine hostName (`configs/${hostName}/quickshell`).
|
||||||
|
|
||||||
|
Quickshell resolves each subdirectory as an independently named config, run
|
||||||
|
via `qs -c <name>` (or `qs -p <path>` for direct path testing without the
|
||||||
|
symlink). This is deliberately not part of noctalia/DMS — each `qs -c <name>`
|
||||||
|
here is its own standalone process/shell.
|
||||||
|
|
||||||
|
## overview/
|
||||||
|
|
||||||
|
A niri-like scrolling overview for Hyprland, standing in for a native overview
|
||||||
|
plugin (Hyprland has none maintained against tagged releases — see
|
||||||
|
`modules/nixos/desktop/tiler/ABOUTME.md`).
|
||||||
|
|
||||||
|
- **Model:** the browsed monitor's workspaces are vertical rows, each row a
|
||||||
|
horizontal strip of that workspace's windows (columns), sorted by x-position
|
||||||
|
to match the Hyprland `scrolling` layout's tape order.
|
||||||
|
- **Controls:** Arrow keys move the selection (Left/Right = window in the row,
|
||||||
|
Up/Down = workspace row), a two-finger trackpad swipe does the same
|
||||||
|
(vertical = workspace row, horizontal = window in the row), Enter focuses
|
||||||
|
the selection and closes, Esc
|
||||||
|
cancels, `M` cycles to the next monitor's overview, number keys 1-9 jump
|
||||||
|
straight to the Nth monitor (sorted by Hyprland's monitor id) — also
|
||||||
|
clickable via the monitor bar at the top of the screen. Hovering a window
|
||||||
|
card also recenters the carousel on it (selection-only, doesn't
|
||||||
|
focus/close). No drag/resize.
|
||||||
|
- **Monitor browsing vs. real focus:** a single overlay window, anchored once
|
||||||
|
(per open) to whichever monitor was actually focused when the overview
|
||||||
|
opened, and never moved after that. Switching monitors while browsing (M /
|
||||||
|
number keys / the monitor bar) only updates local UI state
|
||||||
|
(`shell.browsedMonitor` in `shell.qml`) that changes which monitor's
|
||||||
|
workspace data this one fixed window displays — it never touches Hyprland's
|
||||||
|
real focused monitor. This isn't just a style choice: a `PanelWindow`'s
|
||||||
|
`HyprlandFocusGrab` requires Hyprland's real seat focus to follow the
|
||||||
|
window that holds it, so a one-overlay-per-screen design (switching which
|
||||||
|
screen's overlay is visible) would force a real focus/cursor jump to
|
||||||
|
whichever monitor you browsed to, every time. Only activating a window or
|
||||||
|
workspace (Enter/click) dispatches a real Hyprland focus change.
|
||||||
|
- **Previews:** live via `Quickshell.Wayland.ScreencopyView`, capturing each
|
||||||
|
window's `HyprlandToplevel.wayland` handle. Capture only runs while the
|
||||||
|
overview is visible (`live` is bound to the window's visibility).
|
||||||
|
- **Focus dispatch:** this Hyprland build's `hyprctl dispatch <name> <args>`
|
||||||
|
no longer accepts classic freeform dispatch text at all — every request is
|
||||||
|
evaluated as Lua (`hl.dispatch(<text>)`), so the text must already be a
|
||||||
|
valid `hl.dsp.*` call. Verified forms: `hl.dsp.focus({workspace = N})`,
|
||||||
|
`hl.dsp.focus({window = "address:0x..."})`, `hl.dsp.focus({monitor = "name"})`
|
||||||
|
— sent via `Quickshell.execDetached(["hyprctl", "dispatch", ...])` since
|
||||||
|
`Hyprland.dispatch()` hits the exact same broken classic-syntax path.
|
||||||
|
|
||||||
|
### Files
|
||||||
|
|
||||||
|
```
|
||||||
|
overview/
|
||||||
|
├── shell.qml # ShellRoot: IpcHandler (target "overview": toggle/open/close),
|
||||||
|
│ # sets browsedMonitor + anchorScreen on open, owns the single
|
||||||
|
│ # OverviewWindow instance
|
||||||
|
├── OverviewWindow.qml # the one PanelWindow (layer-shell overlay), anchored to
|
||||||
|
│ # anchorScreen for the whole open session; builds the browsed
|
||||||
|
│ # monitor's workspace/window model from Quickshell.Hyprland,
|
||||||
|
│ # owns selection state, key handling, and HyprlandFocusGrab
|
||||||
|
├── MonitorBar.qml # mini-map of clickable per-monitor pills, positioned AND sized
|
||||||
|
│ # proportionally to each monitor's real x/y/resolution (like a
|
||||||
|
│ # display-arrangement UI); highlights browsedMonitor; each pill
|
||||||
|
│ # shows that monitor's "workspaces/windows" count
|
||||||
|
├── WorkspaceRow.qml # one workspace = carousel Row of WindowCards + label
|
||||||
|
├── WindowCard.qml # live ScreencopyView preview + icon/title footer + selection ring
|
||||||
|
└── Theme.qml # plain QtObject with colors/sizes/carousel tuning, instantiated
|
||||||
|
# once per OverviewWindow and prop-drilled down (no singleton/qmldir)
|
||||||
|
```
|
||||||
|
|
||||||
|
`Theme.qml` and the other sibling `.qml` files are used without explicit
|
||||||
|
imports — Quickshell (like plain QML) makes same-directory files visible as
|
||||||
|
types automatically, no `qmldir` needed for single-directory configs like this
|
||||||
|
one.
|
||||||
|
|
||||||
|
### Wiring (Hyprland side, `configs/fwbook/hypr/`)
|
||||||
|
|
||||||
|
- `conf/keybindings.lua` — `Mod+Tab` runs `qs -c overview ipc call overview toggle`
|
||||||
|
- `conf/inputs.lua` — 4-finger swipe up/down open/close it (discrete gesture,
|
||||||
|
no swipe-progress animation)
|
||||||
|
- `conf/autostart.lua` — the daemon is started via
|
||||||
|
`setpriv --ambient-caps -all -- qs -c overview` (D-Bus calls in
|
||||||
|
quickshell-based apps fail silently without this wrapper under this
|
||||||
|
Hyprland/UWSM setup)
|
||||||
|
|
||||||
|
### Testing without a rebuild
|
||||||
|
|
||||||
|
Since `~/.config/quickshell` is a symlink into this repo, edits are live.
|
||||||
|
Test directly by path before relying on the installed symlink:
|
||||||
|
|
||||||
|
```
|
||||||
|
qs -p ~/nixos-setup/configs/fwbook/quickshell/overview
|
||||||
|
qs -p ~/nixos-setup/configs/fwbook/quickshell/overview ipc call overview toggle
|
||||||
|
```
|
||||||
@@ -0,0 +1,87 @@
|
|||||||
|
import QtQuick
|
||||||
|
|
||||||
|
// Mini-map of the real monitor layout: each pill is positioned and sized
|
||||||
|
// proportionally to its monitor's actual x/y/resolution in Hyprland's
|
||||||
|
// compositor space (see conf/monitors.lua), like a display-arrangement UI.
|
||||||
|
Item {
|
||||||
|
id: root
|
||||||
|
|
||||||
|
required property var theme
|
||||||
|
required property var monitors
|
||||||
|
required property var monitorStats
|
||||||
|
required property string focusedMonitorName
|
||||||
|
|
||||||
|
signal monitorClicked(int index)
|
||||||
|
|
||||||
|
readonly property real mapWidth: 240
|
||||||
|
readonly property real minPillWidth: 34
|
||||||
|
readonly property real minPillHeight: 26
|
||||||
|
|
||||||
|
// Hyprland reports width/height as raw output resolution but x/y in
|
||||||
|
// scaled/logical space, so divide by scale to put everything in the
|
||||||
|
// same coordinate system before computing positions/sizes.
|
||||||
|
function logicalRect(m) {
|
||||||
|
return { x: m.x, y: m.y, w: m.width / m.scale, h: m.height / m.scale };
|
||||||
|
}
|
||||||
|
|
||||||
|
readonly property var rects: root.monitors.map(root.logicalRect)
|
||||||
|
readonly property var bounds: {
|
||||||
|
if (root.rects.length === 0) return { minX: 0, minY: 0, maxX: 1, maxY: 1 };
|
||||||
|
return {
|
||||||
|
minX: Math.min(...root.rects.map(r => r.x)),
|
||||||
|
minY: Math.min(...root.rects.map(r => r.y)),
|
||||||
|
maxX: Math.max(...root.rects.map(r => r.x + r.w)),
|
||||||
|
maxY: Math.max(...root.rects.map(r => r.y + r.h)),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
readonly property real totalWidth: Math.max(1, root.bounds.maxX - root.bounds.minX)
|
||||||
|
readonly property real totalHeight: Math.max(1, root.bounds.maxY - root.bounds.minY)
|
||||||
|
readonly property real scaleFactor: root.mapWidth / root.totalWidth
|
||||||
|
|
||||||
|
visible: monitors.length > 1
|
||||||
|
width: root.totalWidth * root.scaleFactor
|
||||||
|
height: root.totalHeight * root.scaleFactor
|
||||||
|
|
||||||
|
Repeater {
|
||||||
|
model: root.monitors
|
||||||
|
|
||||||
|
Rectangle {
|
||||||
|
id: pill
|
||||||
|
required property var modelData
|
||||||
|
required property int index
|
||||||
|
|
||||||
|
readonly property bool active: modelData.name === root.focusedMonitorName
|
||||||
|
readonly property var rect: root.logicalRect(modelData)
|
||||||
|
|
||||||
|
x: (rect.x - root.bounds.minX) * root.scaleFactor
|
||||||
|
y: (rect.y - root.bounds.minY) * root.scaleFactor
|
||||||
|
width: Math.max(rect.w * root.scaleFactor, root.minPillWidth)
|
||||||
|
height: Math.max(rect.h * root.scaleFactor, root.minPillHeight)
|
||||||
|
radius: 6
|
||||||
|
color: pill.active ? root.theme.selectedBorder : root.theme.cardBg
|
||||||
|
border.width: 1
|
||||||
|
border.color: root.theme.cardBorder
|
||||||
|
clip: true
|
||||||
|
|
||||||
|
Text {
|
||||||
|
anchors.centerIn: parent
|
||||||
|
width: parent.width - 4
|
||||||
|
horizontalAlignment: Text.AlignHCenter
|
||||||
|
elide: Text.ElideRight
|
||||||
|
text: {
|
||||||
|
const s = root.monitorStats[pill.index];
|
||||||
|
return (pill.index + 1) + ": " + pill.modelData.name
|
||||||
|
+ (s ? " " + s.workspaces + "/" + s.windows : "");
|
||||||
|
}
|
||||||
|
color: root.theme.textColor
|
||||||
|
font.pixelSize: Math.max(9, Math.min(11, pill.height * 0.3))
|
||||||
|
font.bold: pill.active
|
||||||
|
}
|
||||||
|
|
||||||
|
MouseArea {
|
||||||
|
anchors.fill: parent
|
||||||
|
onClicked: root.monitorClicked(pill.index)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,334 @@
|
|||||||
|
import QtQuick
|
||||||
|
import Quickshell
|
||||||
|
import Quickshell.Wayland
|
||||||
|
import Quickshell.Hyprland
|
||||||
|
|
||||||
|
PanelWindow {
|
||||||
|
id: root
|
||||||
|
|
||||||
|
required property bool shellOpen
|
||||||
|
required property string browsedMonitor
|
||||||
|
signal requestClose()
|
||||||
|
signal requestBrowseMonitor(string name)
|
||||||
|
|
||||||
|
visible: root.shellOpen
|
||||||
|
|
||||||
|
color: "transparent"
|
||||||
|
|
||||||
|
WlrLayershell.namespace: "quickshell:overview"
|
||||||
|
WlrLayershell.layer: WlrLayer.Overlay
|
||||||
|
WlrLayershell.exclusiveZone: -1
|
||||||
|
WlrLayershell.keyboardFocus: root.visible ? WlrKeyboardFocus.OnDemand : WlrKeyboardFocus.None
|
||||||
|
|
||||||
|
anchors {
|
||||||
|
top: true
|
||||||
|
left: true
|
||||||
|
right: true
|
||||||
|
bottom: true
|
||||||
|
}
|
||||||
|
|
||||||
|
property Theme theme: Theme {}
|
||||||
|
|
||||||
|
// Sorts a workspace's toplevels by x-position so card order matches the
|
||||||
|
// scrolling layout's column order.
|
||||||
|
function sortedToplevels(ws) {
|
||||||
|
const list = (ws && ws.toplevels) ? ws.toplevels.values.slice() : [];
|
||||||
|
return list.sort((a, b) => {
|
||||||
|
const ax = a?.lastIpcObject?.at?.[0] ?? 0;
|
||||||
|
const bx = b?.lastIpcObject?.at?.[0] ?? 0;
|
||||||
|
return ax - bx;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// Workspace rows for the browsed monitor, top-to-bottom by workspace id.
|
||||||
|
// Special (scratchpad) workspaces have negative ids and are excluded.
|
||||||
|
readonly property var rows: {
|
||||||
|
if (!root.browsedMonitor || !Hyprland.workspaces) return [];
|
||||||
|
const workspaces = Hyprland.workspaces.values
|
||||||
|
.filter(ws => ws && ws.id > 0 && ws.monitor && ws.monitor.name === root.browsedMonitor)
|
||||||
|
.sort((a, b) => a.id - b.id);
|
||||||
|
return workspaces.map(ws => ({ workspace: ws, toplevels: root.sortedToplevels(ws) }));
|
||||||
|
}
|
||||||
|
|
||||||
|
property int selectedRow: 0
|
||||||
|
property int selectedCol: 0
|
||||||
|
|
||||||
|
function clampSelection() {
|
||||||
|
if (root.rows.length === 0) {
|
||||||
|
root.selectedRow = 0;
|
||||||
|
root.selectedCol = 0;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (root.selectedRow >= root.rows.length) root.selectedRow = root.rows.length - 1;
|
||||||
|
if (root.selectedRow < 0) root.selectedRow = 0;
|
||||||
|
const count = root.rows[root.selectedRow].toplevels.length;
|
||||||
|
if (root.selectedCol >= count) root.selectedCol = Math.max(0, count - 1);
|
||||||
|
if (root.selectedCol < 0) root.selectedCol = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Reset the selection to the active workspace/window whenever the
|
||||||
|
// overview opens.
|
||||||
|
function resetSelection() {
|
||||||
|
const activeRowIndex = root.rows.findIndex(r => r.workspace.active);
|
||||||
|
root.selectedRow = activeRowIndex >= 0 ? activeRowIndex : 0;
|
||||||
|
const row = root.rows[root.selectedRow];
|
||||||
|
const activeColIndex = row ? row.toplevels.findIndex(tl => tl.activated) : -1;
|
||||||
|
root.selectedCol = activeColIndex >= 0 ? activeColIndex : 0;
|
||||||
|
root.clampSelection();
|
||||||
|
}
|
||||||
|
|
||||||
|
function moveSelection(dRow, dCol) {
|
||||||
|
if (root.rows.length === 0) return;
|
||||||
|
if (dRow !== 0) {
|
||||||
|
root.selectedRow = (root.selectedRow + dRow + root.rows.length) % root.rows.length;
|
||||||
|
root.clampSelection();
|
||||||
|
}
|
||||||
|
if (dCol !== 0) {
|
||||||
|
const count = root.rows[root.selectedRow].toplevels.length;
|
||||||
|
if (count > 0) root.selectedCol = (root.selectedCol + dCol + count) % count;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function activateSelection() {
|
||||||
|
const row = root.rows[root.selectedRow];
|
||||||
|
if (!row) { root.requestClose(); return; }
|
||||||
|
if (!row.workspace.active) {
|
||||||
|
Quickshell.execDetached(["hyprctl", "dispatch", `hl.dsp.focus({workspace = ${row.workspace.id}})`]);
|
||||||
|
}
|
||||||
|
const tl = row.toplevels[root.selectedCol];
|
||||||
|
if (tl) {
|
||||||
|
const addr = tl.address.startsWith("0x") ? tl.address : "0x" + tl.address;
|
||||||
|
Quickshell.execDetached(["hyprctl", "dispatch", `hl.dsp.focus({window = "address:${addr}"})`]);
|
||||||
|
}
|
||||||
|
root.requestClose();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Advances which monitor's overview is being browsed (see shell.qml) —
|
||||||
|
// purely local UI state, doesn't touch Hyprland's real focused monitor.
|
||||||
|
function cycleMonitor() {
|
||||||
|
const mons = root.sortedMonitors;
|
||||||
|
if (mons.length === 0) return;
|
||||||
|
const curIdx = Math.max(0, mons.findIndex(m => m.name === root.browsedMonitor));
|
||||||
|
const mon = mons[(curIdx + 1) % mons.length];
|
||||||
|
root.requestBrowseMonitor(mon.name);
|
||||||
|
}
|
||||||
|
|
||||||
|
readonly property var sortedMonitors: Hyprland.monitors ? Hyprland.monitors.values.slice().sort((a, b) => a.id - b.id) : []
|
||||||
|
|
||||||
|
// Per-monitor {workspaces, windows} totals for the monitor bar pills.
|
||||||
|
readonly property var monitorStats: root.sortedMonitors.map(mon => {
|
||||||
|
const workspaces = Hyprland.workspaces ? Hyprland.workspaces.values
|
||||||
|
.filter(ws => ws && ws.id > 0 && ws.monitor && ws.monitor.name === mon.name) : [];
|
||||||
|
const windows = workspaces.reduce((n, ws) => n + (ws.toplevels ? ws.toplevels.values.length : 0), 0);
|
||||||
|
return { workspaces: workspaces.length, windows: windows };
|
||||||
|
})
|
||||||
|
|
||||||
|
// Jump straight to the Nth monitor's overview (0-based), bound to number
|
||||||
|
// keys 1-9 and the monitor bar.
|
||||||
|
function focusMonitorByIndex(i) {
|
||||||
|
const mon = root.sortedMonitors[i];
|
||||||
|
if (!mon) return;
|
||||||
|
root.requestBrowseMonitor(mon.name);
|
||||||
|
}
|
||||||
|
|
||||||
|
onVisibleChanged: {
|
||||||
|
if (root.visible) {
|
||||||
|
Hyprland.refreshMonitors();
|
||||||
|
Hyprland.refreshWorkspaces();
|
||||||
|
Hyprland.refreshToplevels();
|
||||||
|
root.resetSelection();
|
||||||
|
Qt.callLater(() => focusScope.forceActiveFocus());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
HyprlandFocusGrab {
|
||||||
|
windows: [root]
|
||||||
|
active: root.visible
|
||||||
|
onCleared: {
|
||||||
|
if (root.visible) root.requestClose();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Rectangle {
|
||||||
|
anchors.fill: parent
|
||||||
|
color: root.theme.backdrop
|
||||||
|
|
||||||
|
MouseArea {
|
||||||
|
anchors.fill: parent
|
||||||
|
onClicked: root.requestClose()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
FocusScope {
|
||||||
|
id: focusScope
|
||||||
|
anchors.fill: parent
|
||||||
|
focus: root.visible
|
||||||
|
|
||||||
|
// Hovering a card recenters the carousel, which can slide a
|
||||||
|
// different card under an otherwise-stationary cursor and retrigger
|
||||||
|
// hover on it ("combo hover"). A pure movement-distance check isn't
|
||||||
|
// enough — ordinary mouse/trackpad jitter (a few px) clears a small
|
||||||
|
// threshold on its own. So: hard-lock all hover triggers for the
|
||||||
|
// duration of the recentering animation (nothing can retrigger while
|
||||||
|
// cards are still sliding), and additionally require the cursor to
|
||||||
|
// have moved well past jitter range since the last accepted trigger.
|
||||||
|
HoverHandler {
|
||||||
|
id: mouseTracker
|
||||||
|
}
|
||||||
|
property point lastHoverAcceptPos: Qt.point(-1, -1)
|
||||||
|
property bool hoverLocked: false
|
||||||
|
Timer {
|
||||||
|
id: hoverLockTimer
|
||||||
|
interval: root.theme.carouselDuration
|
||||||
|
onTriggered: focusScope.hoverLocked = false
|
||||||
|
}
|
||||||
|
function shouldAcceptHover() {
|
||||||
|
if (focusScope.hoverLocked) return false;
|
||||||
|
const cur = mouseTracker.point.position;
|
||||||
|
const dx = cur.x - focusScope.lastHoverAcceptPos.x;
|
||||||
|
const dy = cur.y - focusScope.lastHoverAcceptPos.y;
|
||||||
|
if ((dx * dx + dy * dy) <= 1600) return false; // 40px
|
||||||
|
focusScope.lastHoverAcceptPos = cur;
|
||||||
|
focusScope.hoverLocked = true;
|
||||||
|
hoverLockTimer.restart();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
Keys.onPressed: event => {
|
||||||
|
switch (event.key) {
|
||||||
|
case Qt.Key_Left:
|
||||||
|
root.moveSelection(0, -1);
|
||||||
|
break;
|
||||||
|
case Qt.Key_Right:
|
||||||
|
root.moveSelection(0, 1);
|
||||||
|
break;
|
||||||
|
case Qt.Key_Up:
|
||||||
|
root.moveSelection(-1, 0);
|
||||||
|
break;
|
||||||
|
case Qt.Key_Down:
|
||||||
|
root.moveSelection(1, 0);
|
||||||
|
break;
|
||||||
|
case Qt.Key_Return:
|
||||||
|
case Qt.Key_Enter:
|
||||||
|
root.activateSelection();
|
||||||
|
break;
|
||||||
|
case Qt.Key_Escape:
|
||||||
|
root.requestClose();
|
||||||
|
break;
|
||||||
|
case Qt.Key_M:
|
||||||
|
root.cycleMonitor();
|
||||||
|
break;
|
||||||
|
case Qt.Key_1:
|
||||||
|
case Qt.Key_2:
|
||||||
|
case Qt.Key_3:
|
||||||
|
case Qt.Key_4:
|
||||||
|
case Qt.Key_5:
|
||||||
|
case Qt.Key_6:
|
||||||
|
case Qt.Key_7:
|
||||||
|
case Qt.Key_8:
|
||||||
|
case Qt.Key_9:
|
||||||
|
root.focusMonitorByIndex(event.key - Qt.Key_1);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
event.accepted = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Two-finger trackpad swipe moves the selection like the arrow keys:
|
||||||
|
// vertical swipe = workspace rows, horizontal swipe = windows in a
|
||||||
|
// row. High-res trackpads report swipes as pixel deltas (angleDelta is
|
||||||
|
// tiny/zero), so prefer pixelDelta and fall back to angleDelta (for
|
||||||
|
// notch-style mice). Deltas accumulate on the dominant axis and a
|
||||||
|
// single step is taken once the swipe crosses the threshold.
|
||||||
|
WheelHandler {
|
||||||
|
id: swipeHandler
|
||||||
|
target: focusScope
|
||||||
|
property real accY: 0
|
||||||
|
property real accX: 0
|
||||||
|
|
||||||
|
function step(dRow, dCol) {
|
||||||
|
root.moveSelection(dRow, dCol);
|
||||||
|
swipeHandler.accY = 0;
|
||||||
|
swipeHandler.accX = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
onWheel: event => {
|
||||||
|
console.log("WHEEL px=" + event.pixelDelta.x + "," + event.pixelDelta.y
|
||||||
|
+ " ang=" + event.angleDelta.x + "," + event.angleDelta.y);
|
||||||
|
const px = event.pixelDelta;
|
||||||
|
const ang = event.angleDelta;
|
||||||
|
const dx = px.x !== 0 ? px.x : ang.x;
|
||||||
|
const dy = px.y !== 0 ? px.y : ang.y;
|
||||||
|
swipeHandler.accX += dx;
|
||||||
|
swipeHandler.accY += dy;
|
||||||
|
|
||||||
|
if (Math.abs(swipeHandler.accY) >= Math.abs(swipeHandler.accX)) {
|
||||||
|
if (swipeHandler.accY <= -root.theme.swipeThreshold) swipeHandler.step(-1, 0);
|
||||||
|
else if (swipeHandler.accY >= root.theme.swipeThreshold) swipeHandler.step(1, 0);
|
||||||
|
} else {
|
||||||
|
if (swipeHandler.accX <= -root.theme.swipeThreshold) swipeHandler.step(0, 1);
|
||||||
|
else if (swipeHandler.accX >= root.theme.swipeThreshold) swipeHandler.step(0, -1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
MonitorBar {
|
||||||
|
anchors.top: parent.top
|
||||||
|
anchors.topMargin: 24
|
||||||
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
|
theme: root.theme
|
||||||
|
monitors: root.sortedMonitors
|
||||||
|
monitorStats: root.monitorStats
|
||||||
|
focusedMonitorName: root.browsedMonitor
|
||||||
|
onMonitorClicked: index => root.focusMonitorByIndex(index)
|
||||||
|
}
|
||||||
|
|
||||||
|
Item {
|
||||||
|
anchors.fill: parent
|
||||||
|
|
||||||
|
Repeater {
|
||||||
|
model: root.rows
|
||||||
|
|
||||||
|
WorkspaceRow {
|
||||||
|
required property var modelData
|
||||||
|
required property int index
|
||||||
|
|
||||||
|
theme: root.theme
|
||||||
|
workspace: modelData.workspace
|
||||||
|
toplevels: modelData.toplevels
|
||||||
|
selectedIndex: index === root.selectedRow ? root.selectedCol : -1
|
||||||
|
live: root.visible
|
||||||
|
|
||||||
|
anchors.left: parent.left
|
||||||
|
anchors.right: parent.right
|
||||||
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
|
anchors.verticalCenterOffset: (index - root.selectedRow) * root.theme.carouselStepY
|
||||||
|
opacity: 1 - Math.min(Math.abs(index - root.selectedRow) * root.theme.carouselFadeStep, root.theme.carouselMaxFade)
|
||||||
|
scale: 1 - Math.min(Math.abs(index - root.selectedRow) * root.theme.carouselScaleStep, root.theme.carouselMaxScaleReduction)
|
||||||
|
|
||||||
|
Behavior on anchors.verticalCenterOffset {
|
||||||
|
NumberAnimation { duration: root.theme.carouselDuration; easing.type: Easing.OutCubic }
|
||||||
|
}
|
||||||
|
Behavior on opacity {
|
||||||
|
NumberAnimation { duration: root.theme.carouselDuration }
|
||||||
|
}
|
||||||
|
Behavior on scale {
|
||||||
|
NumberAnimation { duration: root.theme.carouselDuration }
|
||||||
|
}
|
||||||
|
|
||||||
|
onCardClicked: colIndex => {
|
||||||
|
root.selectedRow = index;
|
||||||
|
root.selectedCol = colIndex;
|
||||||
|
root.activateSelection();
|
||||||
|
}
|
||||||
|
onCardHovered: colIndex => {
|
||||||
|
if (!focusScope.shouldAcceptHover()) return;
|
||||||
|
root.selectedRow = index;
|
||||||
|
root.selectedCol = colIndex;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
import QtQuick
|
||||||
|
|
||||||
|
QtObject {
|
||||||
|
readonly property color backdrop: "#cc0b0e14"
|
||||||
|
readonly property color cardBg: "#332a2e3a"
|
||||||
|
readonly property color cardBorder: "#40ffffff"
|
||||||
|
readonly property color selectedBorder: "#7aa2f7"
|
||||||
|
readonly property color textColor: "#ffffff"
|
||||||
|
readonly property color emptyTextColor: "#80ffffff"
|
||||||
|
readonly property real cornerRadius: 10
|
||||||
|
readonly property real cardHeight: 180
|
||||||
|
readonly property real cardSpacing: 20
|
||||||
|
|
||||||
|
// Carousel layout: fixed step distances between slots on each axis, and
|
||||||
|
// per-step falloff for opacity/scale as items recede from the centered
|
||||||
|
// (selected) slot.
|
||||||
|
readonly property real carouselStepX: cardHeight * 2.6 + cardSpacing
|
||||||
|
readonly property real carouselStepY: cardHeight + 70
|
||||||
|
readonly property real carouselFadeStep: 0.35
|
||||||
|
readonly property real carouselMaxFade: 0.85
|
||||||
|
readonly property real carouselScaleStep: 0.08
|
||||||
|
readonly property real carouselMaxScaleReduction: 0.3
|
||||||
|
readonly property int carouselDuration: 220
|
||||||
|
|
||||||
|
// A two-finger swipe must cross this many pixels (or angleDelta units)
|
||||||
|
// before the selection steps once.
|
||||||
|
readonly property int swipeThreshold: 120
|
||||||
|
}
|
||||||
Loaded 100 of 507 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user