Compare commits

...

294 Commits

Author SHA1 Message Date
ce239b5530 scad 2025-07-08 23:08:11 +02:00
3760180d73 Update DeterminateSystems/update-flake-lock action to v26 2025-07-06 02:02:48 +00:00
1968a1d4f6 Update DeterminateSystems/magic-nix-cache-action action to v12 2025-07-06 02:02:41 +00:00
d98f06b0b0 Update DeterminateSystems/nix-installer-action action to v18 2025-07-05 02:10:18 +00:00
6639999e9a Update DeterminateSystems/flake-checker-action action to v11 2025-07-04 02:09:28 +00:00
aa34956969 cgal 2025-06-29 23:41:04 +02:00
6a7af294dd Lock file maintenance 2025-06-29 02:10:31 +00:00
46a6bf1fe1 Lock file maintenance 2025-06-28 02:04:20 +00:00
c62d093b19 Lock file maintenance 2025-06-22 02:03:52 +00:00
4f9b1630cd Lock file maintenance 2025-06-21 02:04:46 +00:00
dc350cd669 Update DeterminateSystems/magic-nix-cache-action action to v11 2025-06-17 02:01:37 +00:00
07df68fc19 Lock file maintenance 2025-06-15 02:04:15 +00:00
1cd9d6ccbf Lock file maintenance 2025-06-14 02:03:38 +00:00
56ed6f2fa8 Update DeterminateSystems/magic-nix-cache-action action to v10 2025-06-11 02:03:40 +00:00
4c1ef61375 added mimes 2025-06-09 08:43:28 +02:00
139d33ae2d pastelle default 2025-06-09 08:30:31 +02:00
71443cfbc1 updated colors 2025-06-08 20:10:56 +02:00
db69b419b6 Upgrade to 25.05 2025-06-08 16:01:29 +02:00
4346ec7232 new colors ? 2025-06-08 15:34:49 +02:00
49469b4962 New power & no bamboo & sh3d 2025-06-08 15:34:49 +02:00
a2ef475040 Lock file maintenance 2025-06-08 02:04:44 +00:00
42952cc19b Lock file maintenance 2025-06-07 02:04:51 +00:00
110ff51e9e Lock file maintenance 2025-06-01 02:03:48 +00:00
712f263c6c Lock file maintenance 2025-05-31 02:04:59 +00:00
cc3cd50852 Update DeterminateSystems/flake-checker-action action to v10 2025-05-31 02:03:42 +00:00
56533cfeb1 Lock file maintenance 2025-05-25 02:03:18 +00:00
272587d9ab Lock file maintenance 2025-05-24 02:04:20 +00:00
2629e7c873 Lock file maintenance 2025-05-18 02:03:47 +00:00
71d1f30920 Lock file maintenance 2025-05-17 02:10:23 +00:00
29027c39d6 Update DeterminateSystems/update-flake-lock action to v25 2025-05-17 02:08:56 +00:00
fde8c67d5b Lock file maintenance 2025-05-11 02:06:53 +00:00
209bc82941 Lock file maintenance 2025-05-10 02:08:25 +00:00
06d3c576ff Lock file maintenance 2025-05-04 02:04:08 +00:00
d29d622b54 Lock file maintenance 2025-05-03 02:04:42 +00:00
b05c1c9261 Lock file maintenance 2025-04-27 02:05:07 +00:00
6227d69f5c Lock file maintenance 2025-04-26 02:05:13 +00:00
e99f5df33a Update DeterminateSystems/nix-installer-action action to v17 2025-04-25 02:01:53 +00:00
7fa3301ad7 Lock file maintenance 2025-04-20 02:04:09 +00:00
e31da30d09 Lock file maintenance 2025-04-19 02:04:35 +00:00
833b7b35b1 Lock file maintenance
Some checks failed
Nix Build / build-nixos (pull_request) Waiting to run
Nix Build / build-nixos (push) Failing after 5m31s
2025-04-13 02:04:40 +00:00
b94ce739b7 Lock file maintenance
Some checks failed
Nix Build / build-nixos (push) Has started running
Nix Build / build-nixos (pull_request) Failing after 4h46m56s
2025-04-12 02:04:11 +00:00
114831b04c Lock file maintenance
Some checks failed
Nix Build / build-nixos (pull_request) Failing after 1h11m39s
Nix Build / build-nixos (push) Has been cancelled
2025-04-11 02:03:58 +00:00
e94516a8bc bambulab fix
Some checks failed
Nix Build / build-nixos (push) Failing after 1h10m40s
2025-04-10 19:37:04 +02:00
407f3833ab Lock file maintenance
All checks were successful
Nix Build / build-nixos (pull_request) Successful in 22m33s
Nix Build / build-nixos (push) Successful in 7m26s
2025-04-05 02:05:09 +00:00
881d6ceacc Lock file maintenance
Some checks are pending
Nix Build / build-nixos (pull_request) Successful in 6m48s
Nix Build / build-nixos (push) Waiting to run
2025-03-30 02:04:56 +00:00
ee4ce37d3f Fix Hypr & add 25.05 comments
All checks were successful
Nix Build / build-nixos (push) Successful in 10m2s
2025-03-29 21:50:36 +01:00
4a1bb88e6e Lock file maintenance
All checks were successful
Nix Build / build-nixos (pull_request) Successful in 6m45s
Nix Build / build-nixos (push) Successful in 7m29s
2025-03-25 02:04:17 +00:00
07637d826d Update shells/devsh/default.nix
All checks were successful
Nix Build / build-nixos (push) Successful in 6m33s
2025-03-24 18:58:04 +01:00
6a69546fad Lock file maintenance
All checks were successful
Nix Build / build-nixos (pull_request) Successful in 9m53s
Nix Build / build-nixos (push) Successful in 7m16s
2025-03-22 02:09:10 +00:00
ffb710a68f Lock file maintenance
Some checks failed
Nix Build / build-nixos (pull_request) Waiting to run
Nix Build / build-nixos (push) Failing after 37m21s
2025-03-16 02:03:44 +00:00
770b3acddf Update cachix/install-nix-action action to v31
All checks were successful
Nix Build / build-nixos (push) Successful in 8m51s
2025-03-15 02:03:22 +00:00
6ee70b0d1f Update cachix/cachix-action action to v16
Some checks are pending
Nix Build / build-nixos (pull_request) Successful in 8m22s
Nix Build / build-nixos (push) Waiting to run
2025-03-11 02:01:17 +00:00
51e08f1cc7 Lock file maintenance
All checks were successful
Nix Build / build-nixos (pull_request) Successful in 8m41s
Nix Build / build-nixos (push) Successful in 8m18s
2025-03-08 02:05:05 +00:00
339404a312 Lock file maintenance
Some checks failed
Nix Build / build-nixos (pull_request) Successful in 8m54s
Nix Build / build-nixos (push) Failing after 2h6m16s
2025-03-02 02:05:39 +00:00
1c68ef2023 Lock file maintenance
Some checks are pending
Nix Build / build-nixos (pull_request) Successful in 8m24s
Nix Build / build-nixos (push) Waiting to run
2025-03-01 02:04:48 +00:00
fd0bfcf00d Lock file maintenance
All checks were successful
Nix Build / build-nixos (pull_request) Successful in 8m58s
Nix Build / build-nixos (push) Successful in 7m49s
2025-02-23 02:03:53 +00:00
fdcb0ede25 Lock file maintenance
Some checks are pending
Nix Build / build-nixos (pull_request) Successful in 7m35s
Nix Build / build-nixos (push) Waiting to run
2025-02-22 02:04:23 +00:00
74182b2a3e fix umu
All checks were successful
Nix Build / build-nixos (push) Successful in 24m26s
2025-02-21 23:53:13 +01:00
12646765c2 Disabled user sops for now
Some checks failed
Nix Build / build-nixos (push) Failing after 2m9s
2025-02-21 21:48:43 +01:00
495862c294 Removed umu input 2025-02-21 21:47:39 +01:00
c54376b937 Lock file maintenance
Some checks failed
Nix Build / build-nixos (pull_request) Failing after 2m35s
Nix Build / build-nixos (push) Failing after 2m31s
2025-02-15 02:08:21 +00:00
11a902d741 Lock file maintenance
Some checks failed
Nix Build / build-nixos (pull_request) Failing after 2m30s
Nix Build / build-nixos (push) Failing after 2m37s
2025-02-09 02:07:14 +00:00
7dbc9824ef Lock file maintenance
Some checks failed
Nix Build / build-nixos (pull_request) Failing after 2m28s
Nix Build / build-nixos (push) Failing after 2m31s
2025-02-08 02:07:36 +00:00
06ece39078 Lock file maintenance
Some checks failed
Nix Build / build-nixos (pull_request) Failing after 1m43s
Nix Build / build-nixos (push) Failing after 1m45s
2025-02-02 02:04:48 +00:00
8cc274d4ab Lock file maintenance
Some checks failed
Nix Build / build-nixos (pull_request) Failing after 1m40s
Nix Build / build-nixos (push) Waiting to run
2025-02-01 02:08:05 +00:00
5538d67bc9 Lock file maintenance
Some checks failed
Nix Build / build-nixos (pull_request) Failing after 1m44s
Nix Build / build-nixos (push) Failing after 1m46s
2025-01-26 02:05:12 +00:00
fd9e41cec3 Lock file maintenance
Some checks failed
Nix Build / build-nixos (pull_request) Failing after 1m40s
Nix Build / build-nixos (push) Waiting to run
2025-01-25 02:06:21 +00:00
2ea10a944a Update DeterminateSystems/magic-nix-cache-action action to v9
Some checks failed
Nix Build / build-nixos (pull_request) Failing after 1m38s
Nix Build / build-nixos (push) Failing after 1m50s
2025-01-22 02:01:50 +00:00
b42ccab3d3 Lock file maintenance
Some checks failed
Nix Build / build-nixos (pull_request) Failing after 1m2s
Nix Build / build-nixos (push) Failing after 57s
2025-01-19 01:03:55 +00:00
42ace39326 Lock file maintenance
Some checks failed
Nix Build / build-nixos (pull_request) Failing after 58s
Nix Build / build-nixos (push) Waiting to run
2025-01-18 01:05:14 +00:00
6433fe8a3a Lock file maintenance
Some checks failed
Nix Build / build-nixos (pull_request) Failing after 49s
Nix Build / build-nixos (push) Failing after 57s
2025-01-12 01:03:56 +00:00
2affae6854 Lock file maintenance
Some checks failed
Nix Build / build-nixos (pull_request) Failing after 56s
Nix Build / build-nixos (push) Failing after 49s
2025-01-11 01:04:08 +00:00
95293dc629 Lock file maintenance
Some checks failed
Nix Build / build-nixos (pull_request) Failing after 49s
Nix Build / build-nixos (push) Failing after 49s
2025-01-05 01:04:04 +00:00
f291f13f33 Lock file maintenance
Some checks failed
Nix Build / build-nixos (pull_request) Failing after 49s
Nix Build / build-nixos (push) Failing after 49s
2025-01-04 01:03:56 +00:00
1b1caad2d1 Lock file maintenance
Some checks failed
Nix Build / build-nixos (pull_request) Failing after 49s
Nix Build / build-nixos (push) Waiting to run
2024-12-29 01:03:40 +00:00
9318aa095e Lock file maintenance
Some checks failed
Nix Build / build-nixos (pull_request) Failing after 48s
Nix Build / build-nixos (push) Failing after 50s
2024-12-28 01:04:11 +00:00
fd6a3151ce fix lock
Some checks failed
Nix Build / build-nixos (push) Failing after 53s
2024-12-24 16:21:39 +01:00
40b827d4ca wow cfg 2024-12-23 20:26:31 +01:00
1410c0c39f Merge pull request 'Lock file maintenance' (#120) from renovate/lock-file-maintenance into main
All checks were successful
Nix Build / build-nixos (push) Successful in 5m43s
Reviewed-on: #120
2024-12-22 15:30:10 +01:00
8d68938abd Lock file maintenance
All checks were successful
Nix Build / build-nixos (push) Successful in 6m50s
Nix Build / build-nixos (pull_request) Successful in 6m44s
2024-12-22 01:04:08 +00:00
3d7d29934c Lock file maintenance
All checks were successful
Nix Build / build-nixos (pull_request) Successful in 6m42s
Nix Build / build-nixos (push) Successful in 6m40s
2024-12-21 01:05:08 +00:00
877f516788 Lock file maintenance
Some checks are pending
Nix Build / build-nixos (pull_request) Successful in 6m22s
Nix Build / build-nixos (push) Waiting to run
2024-12-15 01:04:00 +00:00
2ebd8c4fea Lock file maintenance
All checks were successful
Nix Build / build-nixos (pull_request) Successful in 8m16s
Nix Build / build-nixos (push) Successful in 6m26s
2024-12-14 07:48:40 +00:00
bb0f40a755 Lock file maintenance
Some checks are pending
Nix Build / build-nixos (pull_request) Successful in 8m32s
Nix Build / build-nixos (push) Waiting to run
2024-12-08 01:05:33 +00:00
e7e632fab4 Lock file maintenance
All checks were successful
Nix Build / build-nixos (pull_request) Successful in 6m48s
Nix Build / build-nixos (push) Successful in 9m16s
2024-12-07 01:03:35 +00:00
c928fbd14b New flake.log
All checks were successful
Nix Build / build-nixos (push) Successful in 6m57s
2024-12-06 02:22:36 +01:00
0d17b0650a Lock file maintenace
All checks were successful
Nix Build / build-nixos (push) Successful in 28m6s
2024-12-03 19:03:58 +01:00
dbc2aee14b removed old hyprland config 2024-12-03 19:02:52 +01:00
95cbbf591f Lock file maintenance
Some checks failed
Nix Build / build-nixos (pull_request) Failing after 5m51s
Nix Build / build-nixos (push) Failing after 6m22s
2024-12-01 01:03:52 +00:00
58cfdb4fd2 Lock file maintenance
Some checks failed
Nix Build / build-nixos (pull_request) Failing after 6m39s
Nix Build / build-nixos (push) Waiting to run
2024-11-30 01:03:30 +00:00
b77863f8f9 Lock file maintenance
All checks were successful
Nix Build / build-nixos (pull_request) Successful in 14m15s
Nix Build / build-nixos (push) Successful in 8m56s
2024-11-24 01:05:22 +00:00
ee3380b501 Lock file maintenance
All checks were successful
Nix Build / build-nixos (pull_request) Successful in 9m9s
Nix Build / build-nixos (push) Successful in 8m38s
2024-11-23 01:03:12 +00:00
5d68b291ba Fix & Update versions
All checks were successful
Nix Build / build-nixos (push) Successful in 26m31s
2024-11-21 01:21:48 +01:00
1e89d5880b Lock file maintenance
Some checks failed
Nix Build / build-nixos (pull_request) Failing after 7m41s
Nix Build / build-nixos (push) Failing after 8m0s
2024-11-17 01:03:06 +00:00
f733d9dbc4 Lock file maintenance
Some checks are pending
Nix Build / build-nixos (pull_request) Successful in 9m53s
Nix Build / build-nixos (push) Waiting to run
2024-11-16 01:03:28 +00:00
f8816df0d2 Update DeterminateSystems/nix-installer-action action to v16
Some checks failed
Nix Build / build-nixos (pull_request) Failing after 16m44s
Nix Build / build-nixos (push) Failing after 17m24s
2024-11-15 01:00:31 +00:00
4c09698f8d Lock file maintenance
Some checks failed
Nix Build / build-nixos (pull_request) Failing after 13m44s
Nix Build / build-nixos (push) Failing after 12m44s
2024-11-10 01:03:19 +00:00
724ebb4d27 Lock file maintenance
Some checks failed
Nix Build / build-nixos (pull_request) Failing after 14m29s
Nix Build / build-nixos (push) Failing after 14m41s
2024-11-09 05:25:38 +00:00
cbe331644c Update DeterminateSystems/nix-installer-action action to v15
All checks were successful
Nix Build / build-nixos (pull_request) Successful in 9m38s
Nix Build / build-nixos (push) Successful in 9m13s
2024-11-05 01:00:33 +00:00
121ea423b3 Lock file maintenance
All checks were successful
Nix Build / build-nixos (pull_request) Successful in 10m15s
Nix Build / build-nixos (push) Successful in 10m0s
2024-11-03 01:04:08 +00:00
47d87a9bec Lock file maintenance
Some checks are pending
Nix Build / build-nixos (pull_request) Successful in 9m14s
Nix Build / build-nixos (push) Waiting to run
2024-11-02 01:04:02 +00:00
f84d4e696a Flakes stable
All checks were successful
Nix Build / build-nixos (push) Successful in 14m49s
2024-10-28 20:13:25 +01:00
87f12a228a 24.11
Some checks failed
Nix Build / build-nixos (push) Failing after 56s
2024-10-28 19:56:06 +01:00
19c3f68543 Update modules/home/wayland/hyprland/config.nix
Some checks failed
Nix Build / build-nixos (push) Failing after 55s
2024-10-28 19:52:10 +01:00
36a44b9355 Lock file maintenance
Some checks failed
Nix Build / build-nixos (pull_request) Failing after 52s
Nix Build / build-nixos (push) Failing after 53s
2024-10-27 01:03:24 +00:00
adbabf4eea Lock file maintenance
Some checks failed
Nix Build / build-nixos (pull_request) Failing after 53s
Nix Build / build-nixos (push) Waiting to run
2024-10-27 00:03:57 +00:00
ea9b423c9d Lock file maintenance
Some checks failed
Nix Build / build-nixos (pull_request) Failing after 54s
Nix Build / build-nixos (push) Failing after 55s
2024-10-26 00:03:43 +00:00
551902a03e Merge pull request 'Lock file maintenance' (#99) from renovate/lock-file-maintenance into main
All checks were successful
Nix Build / build-nixos (push) Successful in 6m31s
Reviewed-on: #99
2024-10-20 13:38:54 +02:00
47880e6ab5 Lock file maintenance
All checks were successful
Nix Build / build-nixos (push) Successful in 8m58s
Nix Build / build-nixos (pull_request) Successful in 8m10s
2024-10-20 00:02:51 +00:00
5d929a23df Lock file maintenance
All checks were successful
Nix Build / build-nixos (pull_request) Successful in 7m23s
Nix Build / build-nixos (push) Successful in 7m53s
2024-10-19 00:03:09 +00:00
4f91f0276a Lock file maintenance
Some checks failed
Nix Build / build-nixos (pull_request) Failing after 1h13m35s
Nix Build / build-nixos (push) Failing after 1h11m56s
2024-10-13 00:03:16 +00:00
3612103e2f Lock file maintenance
Some checks failed
Nix Build / build-nixos (pull_request) Failing after 1h12m6s
Nix Build / build-nixos (push) Failing after 1h11m18s
2024-10-12 00:03:20 +00:00
7d10222740 Lock file maintenance
Some checks failed
Nix Build / build-nixos (pull_request) Failing after 20h35m44s
Nix Build / build-nixos (push) Failing after 12m12s
2024-10-06 00:03:51 +00:00
a1c7dc96da Lock file maintenance
All checks were successful
Nix Build / build-nixos (pull_request) Successful in 7m33s
Nix Build / build-nixos (push) Successful in 7m55s
2024-10-05 00:04:06 +00:00
0eec6b6eef Update cachix/install-nix-action action to v30
Some checks are pending
Nix Build / build-nixos (pull_request) Successful in 7m15s
Nix Build / build-nixos (push) Waiting to run
2024-10-04 00:01:18 +00:00
83ea710f1c Lock file maintenance
All checks were successful
Nix Build / build-nixos (pull_request) Successful in 6m56s
Nix Build / build-nixos (push) Successful in 7m18s
2024-09-29 00:03:35 +00:00
9cb14a2882 Lock file maintenance
All checks were successful
Nix Build / build-nixos (push) Successful in 7m2s
2024-09-28 00:03:37 +00:00
ab9074c324 Update cachix/install-nix-action action to v29
All checks were successful
Nix Build / build-nixos (pull_request) Successful in 6m38s
Nix Build / build-nixos (push) Successful in 6m47s
2024-09-27 00:01:19 +00:00
f682198e22 Discord & Wine
Some checks failed
Nix Build / build-nixos (push) Failing after 1h10m34s
2024-09-23 20:01:52 +02:00
cb0859f228 added lutris 2024-09-23 18:52:39 +02:00
e4ee6c5d2e Lock file maintenance
Some checks failed
Nix Build / build-nixos (pull_request) Failing after 5m43s
Nix Build / build-nixos (push) Failing after 5m7s
2024-09-21 00:03:50 +00:00
221250699c Update & Umu & Wine
Some checks failed
Nix Build / build-nixos (push) Failing after 5m54s
2024-09-17 10:33:57 +02:00
b00983cd21 Merge pull request 'Lock file maintenance' (#88) from renovate/lock-file-maintenance into main
All checks were successful
Nix Build / build-nixos (push) Successful in 6m4s
Reviewed-on: #88
2024-09-15 22:36:43 +02:00
9232d9a0fb Lock file maintenance
All checks were successful
Nix Build / build-nixos (push) Successful in 5m44s
Nix Build / build-nixos (pull_request) Successful in 6m5s
2024-09-15 00:03:00 +00:00
08a6485a1c Lock file maintenance
All checks were successful
Nix Build / build-nixos (push) Successful in 7m16s
2024-09-14 00:03:09 +00:00
8b3efcfc59 Update DeterminateSystems/magic-nix-cache-action action to v8
Some checks are pending
Nix Build / build-nixos (pull_request) Successful in 5m55s
Nix Build / build-nixos (push) Waiting to run
2024-09-12 00:02:00 +00:00
bdcf625ebc Update DeterminateSystems/update-flake-lock action to v24
All checks were successful
Nix Build / build-nixos (push) Successful in 6m28s
2024-09-11 02:36:52 +02:00
0d4a2a774e Update DeterminateSystems/nix-installer-action action to v14
Some checks are pending
Nix Build / build-nixos (push) Waiting to run
Nix Build / build-nixos (pull_request) Successful in 6m25s
2024-09-11 00:01:32 +00:00
87f2dd4fd4 Update DeterminateSystems/flake-checker-action action to v9
All checks were successful
Nix Build / build-nixos (pull_request) Successful in 6m48s
Nix Build / build-nixos (push) Successful in 7m16s
2024-09-10 00:02:04 +00:00
90d5038a3f Update flake.nix
All checks were successful
Nix Build / build-nixos (push) Successful in 5m35s
2024-09-08 13:51:06 +02:00
bc3ce8d5b4 Update flake.nix
All checks were successful
Nix Build / build-nixos (push) Successful in 5m53s
2024-09-08 13:35:56 +02:00
e732429365 update
All checks were successful
Nix Build / build-nixos (push) Successful in 16m34s
2024-09-08 11:41:40 +02:00
deabe42bb6 version bump
Some checks failed
Nix Build / build-nixos (push) Failing after 8m57s
2024-09-04 06:24:23 +02:00
a62b2faa2a eww version 2024-09-04 06:20:55 +02:00
9fd47e218d Dialout group 2024-09-03 23:24:43 +02:00
75480a3373 update
Some checks failed
Nix Build / build-nixos (push) Failing after 19m27s
2024-08-29 07:36:01 +02:00
e4dfead658 Update overlays/yarn-berry/default.nix
All checks were successful
Nix Build / build-nixos (push) Successful in 6m10s
2024-08-19 23:10:55 +02:00
692b613613 Updates
All checks were successful
Nix Build / build-nixos (push) Successful in 5m59s
2024-08-18 10:36:21 +02:00
38fd971314 telegraf+influx monitoring 2024-08-11 11:39:35 +02:00
0b25204147 Added pavu & alsa tools 2024-08-11 11:39:35 +02:00
c8fe860b6e Removed deprecated sound 2024-08-11 11:39:34 +02:00
c88ba54f77 Lock file maintenance
Some checks failed
Nix Build / build-nixos (pull_request) Failing after 53s
Nix Build / build-nixos (push) Failing after 54s
2024-07-28 00:03:06 +00:00
3216ca2a1b Lock file maintenance
Some checks failed
Nix Build / build-nixos (pull_request) Failing after 53s
Nix Build / build-nixos (push) Failing after 52s
2024-07-27 00:12:30 +00:00
019d38c4ba Lock file maintenance
Some checks failed
Nix Build / build-nixos (pull_request) Failing after 57s
Nix Build / build-nixos (push) Failing after 52s
2024-07-27 00:02:20 +00:00
94bb01c319 Update DeterminateSystems/nix-installer-action action to v13
Some checks failed
Nix Build / build-nixos (pull_request) Failing after 52s
Nix Build / build-nixos (push) Waiting to run
2024-07-23 00:01:08 +00:00
7f5f35b7ca Lock file maintenance
Some checks failed
Nix Build / build-nixos (pull_request) Failing after 56s
Nix Build / build-nixos (push) Failing after 55s
2024-07-21 00:03:03 +00:00
68a75ad255 Lock file maintenance
Some checks failed
Nix Build / build-nixos (pull_request) Failing after 54s
Nix Build / build-nixos (push) Waiting to run
2024-07-20 00:03:20 +00:00
d19f8ea9e1 Lock file maintenance
All checks were successful
Nix Build / build-nixos (pull_request) Successful in 8m41s
Nix Build / build-nixos (push) Successful in 6m3s
2024-07-14 00:03:40 +00:00
df5fd60d6b Lock file maintenance
Some checks failed
Nix Build / build-nixos (pull_request) Failing after 3m54s
Nix Build / build-nixos (push) Waiting to run
2024-07-13 00:03:32 +00:00
803339c49e Fix Hyprland config & new wifi
All checks were successful
Nix Build / build-nixos (push) Successful in 5m43s
2024-07-10 23:12:59 +02:00
8f9b785468 Lock file maintenance
All checks were successful
Nix Build / build-nixos (pull_request) Successful in 8m8s
Nix Build / build-nixos (push) Successful in 5m42s
2024-07-07 00:03:41 +00:00
4d3b504446 Lock file maintenance
Some checks are pending
Nix Build / build-nixos (pull_request) Successful in 6m29s
Nix Build / build-nixos (push) Waiting to run
2024-07-06 00:03:43 +00:00
9356deca2c Graphics
All checks were successful
Nix Build / build-nixos (push) Successful in 16m11s
2024-07-03 22:10:11 +02:00
92d0dad938 Lock file maintenance
Some checks failed
Nix Build / build-nixos (pull_request) Failing after 55s
Nix Build / build-nixos (push) Failing after 54s
2024-06-30 00:03:28 +00:00
fe61140415 Lock file maintenance
Some checks failed
Nix Build / build-nixos (pull_request) Failing after 55s
Nix Build / build-nixos (push) Waiting to run
2024-06-29 00:03:47 +00:00
d39d4ac640 Update DeterminateSystems/update-flake-lock action to v23
All checks were successful
Nix Build / build-nixos (pull_request) Successful in 5m57s
Nix Build / build-nixos (push) Successful in 6m7s
2024-06-29 00:02:09 +00:00
36d51f01a3 Lock file maintenance
All checks were successful
Nix Build / build-nixos (push) Successful in 6m36s
Nix Build / build-nixos (pull_request) Successful in 5m50s
2024-06-15 00:03:04 +00:00
858b38200c Lock file maintenance
All checks were successful
Nix Build / build-nixos (pull_request) Successful in 7m27s
Nix Build / build-nixos (push) Successful in 6m58s
2024-06-09 07:14:53 +00:00
81a600de00 Lock file maintenance
All checks were successful
Nix Build / build-nixos (pull_request) Successful in 6m52s
Nix Build / build-nixos (push) Successful in 6m50s
2024-06-08 00:02:07 +00:00
8712d7a8d1 Update DeterminateSystems/update-flake-lock action to v22
Some checks are pending
Nix Build / build-nixos (pull_request) Successful in 5m39s
Nix Build / build-nixos (push) Waiting to run
2024-06-06 00:00:47 +00:00
367cd0b827 Update DeterminateSystems/nix-installer-action action to v12
All checks were successful
Nix Build / build-nixos (push) Successful in 8m10s
2024-06-05 02:23:52 +02:00
611d898b99 Update DeterminateSystems/magic-nix-cache-action action to v7
Some checks are pending
Nix Build / build-nixos (push) Waiting to run
Nix Build / build-nixos (pull_request) Successful in 6m29s
2024-06-05 00:01:22 +00:00
7efc00e324 Update DeterminateSystems/flake-checker-action action to v8
All checks were successful
Nix Build / build-nixos (pull_request) Successful in 6m26s
Nix Build / build-nixos (push) Successful in 6m39s
2024-06-04 00:01:18 +00:00
6f079fb49e Lock file maintenance
All checks were successful
Nix Build / build-nixos (pull_request) Successful in 6m45s
Nix Build / build-nixos (push) Successful in 6m52s
2024-06-02 00:02:29 +00:00
d378316e60 Fix wifi
All checks were successful
Nix Build / build-nixos (push) Successful in 5m45s
2024-06-01 12:55:10 +02:00
5b43e414b7 Fix Xwayland, new wifi,...
All checks were successful
Nix Build / build-nixos (push) Successful in 6m50s
2024-06-01 12:29:57 +02:00
a4435844a9 Lock file maintenance
All checks were successful
Nix Build / build-nixos (push) Successful in 5m54s
Nix Build / build-nixos (pull_request) Successful in 5m56s
2024-06-01 10:08:43 +00:00
07bc11e7e8 Lock file maintenance
All checks were successful
Nix Build / build-nixos (pull_request) Successful in 6m11s
Nix Build / build-nixos (push) Successful in 5m57s
2024-06-01 00:03:36 +00:00
a14c2f888e Lock file maintenance
All checks were successful
Nix Build / build-nixos (pull_request) Successful in 7m5s
Nix Build / build-nixos (push) Successful in 7m19s
2024-05-26 00:03:14 +00:00
2e38384459 Lock file maintenance
Some checks are pending
Nix Build / build-nixos (pull_request) Successful in 6m45s
Nix Build / build-nixos (push) Waiting to run
2024-05-25 13:45:23 +00:00
bot
00811913b5 Lock file maintenance (#57)
All checks were successful
Nix Build / build-nixos (push) Successful in 6m11s
This PR contains the following updates:

| Update | Change |
|---|---|
| lockFileMaintenance | All locks refreshed |

🔧 This Pull Request updates lock files to use the latest dependency versions.

---

### Configuration

📅 **Schedule**: Branch creation - "every weekend" (UTC), Automerge - "every weekend" (UTC).

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://github.com/renovatebot/renovate/discussions) if that's undesired.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy41OS44IiwidXBkYXRlZEluVmVyIjoiMzcuNTkuOCIsInRhcmdldEJyYW5jaCI6Im1haW4ifQ==-->

Co-authored-by: Renovate Bot <renovate-bot@gitea.com>
Reviewed-on: #57
Co-authored-by: bot <bot@helcel.net>
Co-committed-by: bot <bot@helcel.net>
2024-05-25 15:12:40 +02:00
a17bf69d26 Update cachix/cachix-action action to v15
All checks were successful
Nix Build / build-nixos (pull_request) Successful in 6m6s
Nix Build / build-nixos (push) Successful in 6m49s
2024-05-21 00:01:32 +00:00
6978c3c1e4 idle fix
All checks were successful
Nix Build / build-nixos (push) Successful in 6m26s
2024-05-20 13:48:10 +02:00
11b7660d26 IdleInhibit Fullscreen
All checks were successful
Nix Build / build-nixos (push) Successful in 5m49s
2024-05-19 11:21:57 +02:00
dcd593cabc Lock file maintenance
All checks were successful
Nix Build / build-nixos (pull_request) Successful in 7m56s
Nix Build / build-nixos (push) Successful in 6m23s
2024-05-19 00:03:29 +00:00
8ed8e2b2e2 Fix Eww hover
All checks were successful
Nix Build / build-nixos (push) Successful in 6m40s
2024-05-18 16:52:08 +02:00
de33b74926 Qt theme
All checks were successful
Nix Build / build-nixos (push) Successful in 6m41s
2024-05-18 08:51:31 +02:00
4f2cf2d356 Fix eww hover
All checks were successful
Nix Build / build-nixos (push) Successful in 17m33s
2024-05-18 08:15:10 +02:00
addf6baa5f Update .gitea/workflows/build.yml
Some checks failed
Nix Build / build-nixos (push) Has been cancelled
2024-05-18 08:11:44 +02:00
fe1f1ee3c1 Merge pull request 'Update DeterminateSystems/magic-nix-cache-action action to v6' (#53) from renovate/determinatesystems-magic-nix-cache-action-6.x into main
Some checks failed
Nix Build / build-nixos (push) Failing after 12s
Reviewed-on: #53
2024-05-18 08:10:22 +02:00
4ea8a40dbd Updates and fixes
Some checks failed
Nix Build / build-nixos (push) Failing after 13s
2024-05-18 07:55:19 +02:00
bf0aa63936 Update cachix/install-nix-action action to v27
Some checks failed
Nix Build / build-nixos (pull_request) Failing after 11s
Nix Build / build-nixos (push) Failing after 11s
2024-05-18 00:02:29 +00:00
160fceb1d7 Update DeterminateSystems/magic-nix-cache-action action to v6
Some checks failed
Nix Build / build-nixos (push) Failing after 13s
Nix Build / build-nixos (pull_request) Failing after 11s
2024-05-18 00:02:26 +00:00
f9b2912764 Update DeterminateSystems/flake-checker-action action to v7
Some checks failed
Nix Build / build-nixos (pull_request) Failing after 11s
Nix Build / build-nixos (push) Waiting to run
2024-05-16 00:01:34 +00:00
c636f15689 sops&server
Some checks failed
Nix Build / build-nixos (push) Failing after 20s
2024-05-16 00:13:16 +02:00
16540a9327 theme&zsh 2024-05-16 00:13:13 +02:00
5a50140975 Lock file maintenance
All checks were successful
Nix Build / build-nixos (pull_request) Successful in 6m27s
Nix Build / build-nixos (push) Successful in 8m48s
2024-05-12 00:03:21 +00:00
da870ad90b Lock file maintenance
All checks were successful
Nix Build / build-nixos (pull_request) Successful in 10m27s
Nix Build / build-nixos (push) Successful in 6m21s
2024-05-11 00:03:13 +00:00
fc90173651 Update DeterminateSystems/nix-installer-action action to v11
All checks were successful
Nix Build / build-nixos (pull_request) Successful in 5m55s
Nix Build / build-nixos (push) Successful in 8m13s
2024-05-10 00:01:26 +00:00
10926b3622 Lock file maintenance
All checks were successful
Nix Build / build-nixos (pull_request) Successful in 5m53s
Nix Build / build-nixos (push) Successful in 6m24s
2024-05-05 00:03:49 +00:00
df90098d44 Lock file maintenance
Some checks are pending
Nix Build / build-nixos (pull_request) Successful in 6m12s
Nix Build / build-nixos (push) Waiting to run
2024-05-04 00:03:23 +00:00
25429b40bc Lock file maintenance
All checks were successful
Nix Build / build-nixos (pull_request) Successful in 6m52s
Nix Build / build-nixos (push) Successful in 6m30s
2024-04-28 00:03:16 +00:00
f1bdc6f8d4 Lock file maintenance
All checks were successful
Nix Build / build-nixos (pull_request) Successful in 5m52s
Nix Build / build-nixos (push) Successful in 6m59s
2024-04-27 00:03:03 +00:00
a8c74cba69 Fixing networks arion
All checks were successful
Nix Build / build-nixos (push) Successful in 6m8s
2024-04-21 13:27:56 +02:00
0f4154bcb5 Fix project names
All checks were successful
Nix Build / build-nixos (push) Successful in 6m12s
2024-04-21 10:35:47 +02:00
3aedb499fb cache&arion
Some checks failed
Nix Build / build-nixos (push) Has been cancelled
2024-04-21 10:30:42 +02:00
29eeb04fac dockercompat&sops
All checks were successful
Nix Build / build-nixos (push) Successful in 5m57s
2024-04-21 10:24:22 +02:00
8a09c870d7 mockkey path
All checks were successful
Nix Build / build-nixos (push) Successful in 14m29s
2024-04-21 02:32:38 +02:00
d0732d6f11 Lock file maintenance
Some checks failed
Nix Build / build-nixos (pull_request) Failing after 31s
Nix Build / build-nixos (push) Failing after 30s
2024-04-21 00:03:15 +00:00
832471f37d Wip Server
Some checks failed
Nix Build / build-nixos (push) Failing after 33s
2024-04-20 12:58:45 +02:00
93dd93561f Lock file maintenance
Some checks failed
Nix Build / build-nixos (pull_request) Failing after 31s
Nix Build / build-nixos (push) Failing after 28s
2024-04-20 00:03:08 +00:00
b1f2a66d72 Merge pull request 'Update actions/checkout action to v4' (#42) from renovate/actions-checkout-4.x into main
All checks were successful
Nix Build / build-nixos (push) Successful in 5m34s
Reviewed-on: #42
2024-04-19 07:58:30 +02:00
486db33120 Update actions/checkout action to v4
All checks were successful
Nix Build / build-nixos (push) Successful in 4m35s
Nix Build / build-nixos (pull_request) Successful in 4m29s
2024-04-19 00:01:49 +00:00
150d2f2e07 Cfg updated
All checks were successful
Nix Build / build-nixos (push) Successful in 4m51s
2024-04-17 08:26:08 +02:00
b644c87517 Autosys 2024-04-17 00:25:54 +02:00
6441652b8c Remerged xdg
All checks were successful
Nix Build / build-nixos (push) Successful in 4m54s
2024-04-16 19:03:22 +02:00
4c2c9c2773 Split xdg
All checks were successful
Nix Build / build-nixos (push) Successful in 4m34s
2024-04-16 01:35:30 +02:00
f966c944f9 Fix BLE
All checks were successful
Nix Build / build-nixos (push) Successful in 4m35s
2024-04-16 01:30:23 +02:00
a1c6b056e0 More opt
Some checks failed
Nix Build / build-nixos (push) Failing after 21s
2024-04-16 01:28:24 +02:00
e0b1be56a2 Deprecated option
All checks were successful
Nix Build / build-nixos (push) Successful in 4m41s
2024-04-15 18:37:16 +02:00
448fe0c18b Server & Podman
Some checks failed
Nix Build / build-nixos (push) Failing after 32s
2024-04-15 18:34:14 +02:00
6ba720623b Boot for CI fix
All checks were successful
Nix Build / build-nixos (push) Successful in 5m19s
2024-04-14 23:11:57 +02:00
6549d9135f ssh
Some checks failed
Nix Build / build-nixos (push) Failing after 30s
2024-04-14 23:07:30 +02:00
df40f31406 Fixed typo in sops
Some checks failed
Nix Build / build-nixos (push) Failing after 31s
2024-04-14 23:04:08 +02:00
0920a1381d More opt
Some checks failed
Nix Build / build-nixos (push) Failing after 29s
2024-04-14 22:45:21 +02:00
ad1c8a0026 CI
Some checks failed
Nix Build / build-nixos (push) Failing after 5m19s
2024-04-14 22:36:11 +02:00
f65ccf0e5e Revert error
Some checks failed
Nix Build / build-nixos (push) Has been cancelled
2024-04-14 22:34:14 +02:00
52423ffdad more WM
Some checks failed
Nix Build / build-nixos (push) Failing after 22s
2024-04-14 22:24:23 +02:00
e325d82f34 Fix WM
All checks were successful
Nix Build / build-nixos (push) Successful in 6m1s
2024-04-14 21:42:01 +02:00
dfb4761621 fix wm
Some checks failed
Nix Build / build-nixos (push) Has been cancelled
2024-04-14 21:41:11 +02:00
e0b96bf7c5 NoWM
Some checks failed
Nix Build / build-nixos (push) Failing after 27s
2024-04-14 21:40:12 +02:00
05bf386e51 Fix
All checks were successful
Nix Build / build-nixos (push) Successful in 5m30s
2024-04-14 21:25:20 +02:00
6cb2c2bd00 Sandbox
Some checks failed
Nix Build / build-nixos (push) Has been cancelled
2024-04-14 21:22:22 +02:00
972cb47e3f Merged Host/Home Opt into SysOpt
All checks were successful
Nix Build / build-nixos (push) Successful in 5m27s
2024-04-14 12:09:03 +02:00
0a02d67b7e Update DeterminateSystems/update-flake-lock action to v21
All checks were successful
Nix Build / build-nixos (pull_request) Successful in 5m11s
Nix Build / build-nixos (push) Successful in 5m45s
2024-04-14 00:01:30 +00:00
29b836fffe Update DeterminateSystems/nix-installer-action action to v10
All checks were successful
Nix Build / build-nixos (push) Successful in 4m41s
Nix Build / build-nixos (pull_request) Successful in 4m38s
2024-04-14 00:01:22 +00:00
9a578de3ad Jaq
All checks were successful
Nix Build / build-nixos (push) Successful in 4m41s
2024-04-13 19:35:05 +02:00
c5d1e36160 jq
Some checks failed
Nix Build / build-nixos (push) Has been cancelled
2024-04-13 19:30:34 +02:00
41efe10dd4 systray css
All checks were successful
Nix Build / build-nixos (push) Successful in 9m23s
2024-04-13 12:19:52 +02:00
918a2460f2 Add .gitea/workflows/update.yml
Some checks failed
Nix Build / build-nixos (push) Has been cancelled
2024-04-13 11:58:56 +02:00
35626de702 Add .gitea/workflows/update.yml
All checks were successful
Nix Build / build-nixos (push) Successful in 26m11s
2024-04-13 10:52:49 +02:00
177c26e41d Eww Overlay
Some checks failed
Nix Build / build-nixos (push) Has been cancelled
2024-04-13 10:50:02 +02:00
e4b93499b9 theme 2024-04-13 09:17:37 +02:00
80965eb915 Lock file maintenance 2024-04-13 00:02:17 +00:00
1200a5bb4c Merge pull request 'Lock file maintenance' (#38) from renovate/lock-file-maintenance into main
Reviewed-on: #38
2024-04-13 01:22:09 +02:00
90364e9909 Lock file maintenance 2024-04-12 23:11:59 +00:00
4c8b53237f Lock file maintenance 2024-04-06 00:02:38 +00:00
f1ac3b5ac3 Lock file maintenance 2024-03-31 17:22:17 +00:00
4ca7b1caa5 Lock file maintenance 2024-03-30 01:02:52 +00:00
0c40e45266 Update modules/nixos/system/hw/base/default.nix 2024-03-25 07:06:40 +01:00
de4b1c4f1f Lock file maintenance 2024-03-24 01:02:58 +00:00
b1a06cafbb Lock file maintenance 2024-03-23 01:03:10 +00:00
3b7f9efb4a Lock file maintenance 2024-03-17 14:09:35 +00:00
85d9d4bf72 Lock file maintenance 2024-03-17 01:03:05 +00:00
663260bee0 Lock file maintenance 2024-03-16 01:03:06 +00:00
f743fa5ce2 Lock file maintenance 2024-03-10 01:02:35 +00:00
67a982055e Update modules/nixos/tools/develop/default.nix 2024-03-09 18:20:45 +01:00
7255caad6e Lock file maintenance 2024-03-09 01:02:37 +00:00
f6e2f16191 Update modules/home/wayland/apps/eww/default.nix 2024-03-05 20:38:18 +01:00
e67052bd90 Lock file maintenance 2024-03-03 01:01:39 +00:00
a0d6a1696a Lock file maintenance 2024-03-02 01:02:19 +00:00
9954788c83 Lock file maintenance 2024-02-25 01:02:09 +00:00
80c3444462 Lock file maintenance 2024-02-24 01:02:17 +00:00
008373bdc0 Lock file maintenance 2024-02-22 01:01:19 +00:00
6386870219 [m] Fix dunst pos 2024-02-22 00:04:21 +01:00
a8b9dd2475 [m] Fixing Eww Scripts 2024-02-18 10:19:51 +01:00
f6a80afbd8 [m] Fixing Eww Scripts 2024-02-18 10:13:33 +01:00
98da2a2673 Flake update 2024-02-18 08:44:11 +01:00
1310943f70 [m] Fix eww 2024-02-18 08:42:26 +01:00
03f7ec5402 [m] Wifi & Fixes 2024-02-18 08:36:16 +01:00
22cd4b8d29 [m] Added wifi 2024-02-08 20:51:15 +01:00
4f7a2fca23 [m] Migrated deprecated options & lock update 2024-02-06 09:33:16 +01:00
7434010069 Merge pull request 'Lock file maintenance' (#22) from renovate/lock-file-maintenance into main
Reviewed-on: #22
2024-02-05 18:32:49 +01:00
8dda74e818 Lock file maintenance 2024-02-05 17:23:37 +00:00
3c8921fd44 Lock file maintenance 2024-01-19 14:41:13 +00:00
beea1313e5 [m] Removed deprecated line 2024-01-19 12:22:21 +01:00
1b4f5090cf [m] Migrated android to host 2024-01-19 12:20:21 +01:00
81be322a80 [m] Android dev, cleanup, qemu,... 2024-01-19 11:58:52 +01:00
0486df012d Update modules/home/gui/apps/develop/default.nix 2024-01-18 11:39:18 +01:00
9593752e0c Update modules/home/wayland/hyprland/config.nix 2024-01-18 11:12:03 +01:00
028c7273ed Lock file maintenance 2024-01-08 01:02:27 +00:00
d67ef5edae Update modules/home/wayland/apps/eww/bar/scripts/radio 2024-01-07 10:43:51 +01:00
dce503e035 Update modules/home/wayland/base/default.nix 2024-01-06 15:53:05 +01:00
c72232c4a0 Update modules/home/wayland/hyprland/config.nix 2024-01-06 15:52:33 +01:00
93a31f33e2 Merge pull request 'Lock file maintenance' (#19) from renovate/lock-file-maintenance into main
Reviewed-on: #19
2024-01-04 11:14:17 +01:00
329f94d9e0 Lock file maintenance 2024-01-03 01:02:09 +00:00
83bab9b2b7 [m] Minor css fix 2023-12-27 10:09:52 +01:00
22c036b26e Lock file maintenance 2023-12-18 01:01:03 +00:00
7fd3cf04b7 [m] Develop modules 2023-12-16 15:18:35 +01:00
da69a21100 Fix overlays 2023-12-16 13:55:04 +01:00
a2ad5dd5a7 Lock file maintenance 2023-12-12 01:01:07 +00:00
8fafe65aec Update modules/nixos/system/network/wireguard/default.nix
Corrected MTU
2023-12-11 17:56:03 +01:00
a0e210880c Lock file maintenance 2023-12-07 01:01:52 +00:00
700476d9a0 [m] Added more docker services 2023-12-07 01:07:42 +01:00
c3ceacc725 Lock file maintenance 2023-12-02 01:01:54 +00:00
09e3a2af95 Update modules/home/wayland/apps/eww/bar/scripts/radio 2023-12-01 15:50:07 +01:00
7a3a2a9f69 [m] Server: adding docker 2023-12-01 12:54:30 +01:00
c0d7023d90 [m] Dunst: minor style change 2023-11-29 23:50:40 +01:00
675d79ad1a [m] Various fixes and reverts 2023-11-29 23:12:08 +01:00
efa2a5c0be [m] Cleanup nixos config 2023-11-28 03:39:49 +01:00
5d730f8071 [m]Flake: Updated XDG portal config for 24.05 2023-11-26 01:33:20 +01:00
f693a59f6c [m]Pkgs: Fix Vosk 2023-11-26 00:39:26 +01:00
4c2b988996 [m]Devshell envar name change 2023-11-25 14:40:38 +01:00
84d57009a1 [m] Shell palette fix 2023-11-25 14:30:11 +01:00
145 changed files with 4179 additions and 2257 deletions

View File

@ -0,0 +1,38 @@
name: Nix Build
on:
pull_request:
push:
workflow_run:
workflows: []
types: [completed]
workflow_dispatch:
jobs:
build-nixos:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: "Install Nix ❄️"
uses: cachix/install-nix-action@v31
# - uses: DeterminateSystems/nix-installer-action@v4
- uses: DeterminateSystems/magic-nix-cache-action@v12
- uses: DeterminateSystems/flake-checker-action@v11
- name: "Install Cachix ❄️"
uses: cachix/cachix-action@v16
with:
name: helcel
authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
- name: "Build NixOS CI config ❄️"
run: |
nix build .#nixosConfigurations.ci.config.system.build.toplevel
- name: "Build NixOS Sandbox config ❄️"
run: |
nix build .#nixosConfigurations.sandbox.config.system.build.toplevel

View File

@ -0,0 +1,30 @@
name: update-flake-lock
on:
workflow_dispatch:
schedule:
- cron: '0 2 * * 6,7'
env:
USER: "runner"
jobs:
lockfile:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: Install nix
uses: DeterminateSystems/nix-installer-action@v18
with:
github-token: ${{ secrets.GH_TOKEN_FOR_UPDATES }}
extra_nix_config: |
experimental-features = nix-command flakes
- name: Update flake.lock
uses: DeterminateSystems/update-flake-lock@v26
with:
token: ${{ secrets.GT_TOKEN_FOR_UPDATES }}
pr-title: "[chore] Update flake.lock"
pr-labels: |
dependencies
automated

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
result
age-key.txt
.decrypted~common.yaml
.decrypted*

View File

@ -4,38 +4,55 @@ keys:
- &sora 4E241635F8EDD2919D2FB44CA362EA0491E2EEA0
# Hosts
- &hosts:
- &ci age13qv9dn9806paqgpjwmmkwtdzvv4qpv0ulksq0epnn8ufaxeug5zskyas3z
- &iriy age1ms8f0ysv6vakxepvt69fejczs6tddexepesdv4rkgtheehj3nu4sc6290s
- &avalon age1sxzuhh2fcd4pmaz4mdqq95t683d32ft22w9t2r7pk258u0s8wymsqdj7lg
- &valinor age1sxzuhh2fcd4pmaz4mdqq95t683d32ft22w9t2r7pk258u0s8wymsqdj7lg
- &asgard age1sxzuhh2fcd4pmaz4mdqq95t683d32ft22w9t2r7pk258u0s8wymsqdj7lg
creation_rules:
- path_regex: modules/nixos/system/security/sops/iriy.ya?ml$
- path_regex: modules/shared/sops/private/iriy.[a-z]+
key_groups:
- age:
- *iriy
pgp:
- *sora
- path_regex: modules/nixos/system/security/sops/avalon.ya?ml$
- path_regex: modules/shared/sops/private/avalon.[a-z]+
key_groups:
- age:
- *avalon
pgp:
- *sora
- path_regex: modules/nixos/system/security/sops/valinor.ya?ml$
- path_regex: modules/shared/sops/private/valinor.[a-z]+
key_groups:
- age:
- *valinor
pgp:
- *sora
- path_regex: modules/nixos/system/security/sops/asgard.ya?ml$
- path_regex: modules/shared/sops/private/asgard.[a-z]+
key_groups:
- age:
- *asgard
pgp:
- *sora
- path_regex: modules/nixos/system/security/sops/common.yaml$
- path_regex: modules/shared/sops/common.[a-z]+
key_groups:
- age:
- *valinor
- *iriy
- *avalon
- *asgard
pgp:
- *sora
- path_regex: modules/shared/sops/mock.[a-z]+
key_groups:
- age:
- *ci
- path_regex: modules/server/sops/server.[a-z]+
key_groups:
- age:
- *valinor

313
flake.lock generated
View File

@ -1,13 +1,35 @@
{
"nodes": {
"arion": {
"inputs": {
"flake-parts": "flake-parts",
"haskell-flake": "haskell-flake",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1745165725,
"narHash": "sha256-OnHV8Us04vRsWM0uL1cQez8DumhRi6yE+4K4VLtH6Ws=",
"owner": "hercules-ci",
"repo": "arion",
"rev": "4f59059633b14364b994503b179a701f5e6cfb90",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "arion",
"type": "github"
}
},
"base16-schemes": {
"flake": false,
"locked": {
"lastModified": 1689473676,
"narHash": "sha256-L0RhUr9+W5EPWBpLcmkKpUeCEWRs/kLzVMF3Vao2ZU0=",
"lastModified": 1696158499,
"narHash": "sha256-5yIHgDTPjoX/3oDEfLSQ0eJZdFL1SaCfb9d6M0RmOTM=",
"owner": "tinted-theming",
"repo": "base16-schemes",
"rev": "d95123ca6377cd849cfdce92c0a24406b0c6a789",
"rev": "a9112eaae86d9dd8ee6bb9445b664fba2f94037a",
"type": "github"
},
"original": {
@ -23,11 +45,11 @@
]
},
"locked": {
"lastModified": 1700795494,
"narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=",
"lastModified": 1750618568,
"narHash": "sha256-w9EG5FOXrjXGfbqCcQg9x1lMnTwzNDW5BMXp8ddy15E=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d",
"rev": "1dd19f19e4b53a1fd2e8e738a08dd5fe635ec7e5",
"type": "github"
},
"original": {
@ -37,13 +59,55 @@
"type": "github"
}
},
"flake-parts": {
"inputs": {
"nixpkgs-lib": [
"arion",
"nixpkgs"
]
},
"locked": {
"lastModified": 1733312601,
"narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_2": {
"inputs": {
"nixpkgs-lib": [
"nur",
"nixpkgs"
]
},
"locked": {
"lastModified": 1733312601,
"narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"hardware": {
"locked": {
"lastModified": 1700559156,
"narHash": "sha256-gL4epO/qf+wo30JjC3g+b5Bs8UrpxzkhNBBsUYxpw2g=",
"lastModified": 1750837715,
"narHash": "sha256-2m1ceZjbmgrJCZ2PuQZaK4in3gcg3o6rZ7WK6dr5vAA=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "c3abafb01cd7045dba522af29b625bd1e170c2fb",
"rev": "98236410ea0fe204d0447149537a924fb71a6d4f",
"type": "github"
},
"original": {
@ -52,6 +116,22 @@
"type": "github"
}
},
"haskell-flake": {
"locked": {
"lastModified": 1675296942,
"narHash": "sha256-u1X1sblozi5qYEcLp1hxcyo8FfDHnRUVX3dJ/tW19jY=",
"owner": "srid",
"repo": "haskell-flake",
"rev": "c2cafce9d57bfca41794dc3b99c593155006c71e",
"type": "github"
},
"original": {
"owner": "srid",
"ref": "0.1.0",
"repo": "haskell-flake",
"type": "github"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
@ -59,79 +139,31 @@
]
},
"locked": {
"lastModified": 1700847865,
"narHash": "sha256-uWaOIemGl9LF813MW0AEgCBpKwFo2t1Wv3BZc6e5Frw=",
"lastModified": 1750792728,
"narHash": "sha256-Lh3dopA8DdY+ZoaAJPrtkZOZaFEJGSYjOdAYYgOPgE4=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "8cedd63eede4c22deb192f1721dd67e7460e1ebe",
"rev": "366f00797b1efb70f2882d3da485e3c10fd3d557",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-25.05",
"repo": "home-manager",
"type": "github"
}
},
"hyprland": {
"inputs": {
"hyprland-protocols": "hyprland-protocols",
"nixpkgs": [
"nixpkgs"
],
"systems": "systems",
"wlroots": "wlroots",
"xdph": "xdph"
},
"locked": {
"lastModified": 1700873282,
"narHash": "sha256-xZngvZYUQxivI9Z/90i8mDpJBC61lE+kQ0Pq3EqOPx8=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "a6eba919356b08a2a403a52c1e5e020734411668",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "Hyprland",
"type": "github"
}
},
"hyprland-protocols": {
"inputs": {
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1691753796,
"narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=",
"owner": "hyprwm",
"repo": "hyprland-protocols",
"rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprland-protocols",
"type": "github"
}
},
"nix-colors": {
"inputs": {
"base16-schemes": "base16-schemes",
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1695388192,
"narHash": "sha256-2jelpE7xK+4M7jZNyWL7QYOYegQLYBDQS5bvdo8XRUQ=",
"lastModified": 1707825078,
"narHash": "sha256-hTfge2J2W+42SZ7VHXkf4kjU+qzFqPeC9k66jAUBMHk=",
"owner": "misterio77",
"repo": "nix-colors",
"rev": "37227f274b34a3b51649166deb94ce7fec2c6a4c",
"rev": "b01f024090d2c4fc3152cd0cf12027a7b8453ba1",
"type": "github"
},
"original": {
@ -140,13 +172,60 @@
"type": "github"
}
},
"nixpkgs": {
"nixUnstable": {
"locked": {
"lastModified": 1700612854,
"narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=",
"lastModified": 1750994206,
"narHash": "sha256-3u6rEbIX9CN/5A5/mc3u0wIO1geZ0EhjvPBXmRDHqWM=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614",
"rev": "80d50fc87924c2a0d346372d242c27973cf8cdbf",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1750969886,
"narHash": "sha256-zW/OFnotiz/ndPFdebpo3X0CrbVNf22n4DjN2vxlb58=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "a676066377a2fe7457369dd37c31fd2263b662f4",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-25.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-lib": {
"locked": {
"lastModified": 1697935651,
"narHash": "sha256-qOfWjQ2JQSQL15KLh6D7xQhx0qgZlYZTYlcEiRuAMMw=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "e1e11fdbb01113d85c7f41cada9d2847660e3902",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixpkgs.lib",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1751011381,
"narHash": "sha256-krGXKxvkBhnrSC/kGBmg5MyupUUT5R6IBCLEzx9jhMM=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "30e2e2857ba47844aa71991daa6ed1fc678bcbb7",
"type": "github"
},
"original": {
@ -156,28 +235,18 @@
"type": "github"
}
},
"nixpkgs-lib": {
"locked": {
"lastModified": 1694911725,
"narHash": "sha256-8YqI+YU1DGclEjHsnrrGfqsQg3Wyga1DfTbJrN3Ud0c=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "819180647f428a3826bfc917a54449da1e532ce0",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixpkgs.lib",
"type": "github"
}
},
"nur": {
"inputs": {
"flake-parts": "flake-parts_2",
"nixpkgs": "nixpkgs_2",
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1700865924,
"narHash": "sha256-3OvmS6b3bD1a3bCH3roDO7uBJrYVPhMLd+eUbmzahxk=",
"lastModified": 1751150016,
"narHash": "sha256-aaNJgaEXYMsdmLG38YyCO0eZdTf49Cj0TZsW4gpn9jg=",
"owner": "nix-community",
"repo": "nur",
"rev": "7ddd84acfc35469739ebddbaa2f58f9eebd60869",
"rev": "c3c9ee3b26349abe162df39499ec587f453ce089",
"type": "github"
},
"original": {
@ -188,11 +257,12 @@
},
"root": {
"inputs": {
"arion": "arion",
"darwin": "darwin",
"hardware": "hardware",
"home-manager": "home-manager",
"hyprland": "hyprland",
"nix-colors": "nix-colors",
"nixUnstable": "nixUnstable",
"nixpkgs": "nixpkgs",
"nur": "nur",
"sops-nix": "sops-nix"
@ -202,17 +272,14 @@
"inputs": {
"nixpkgs": [
"nixpkgs"
],
"nixpkgs-stable": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1700362823,
"narHash": "sha256-/H7XgvrYM0IbkpWkcdfkOH0XyBM5ewSWT1UtaLvOgKY=",
"lastModified": 1750119275,
"narHash": "sha256-Rr7Pooz9zQbhdVxux16h7URa6mA80Pb/G07T4lHvh0M=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "49a87c6c827ccd21c225531e30745a9a6464775c",
"rev": "77c423a03b9b2b79709ea2cb63336312e78b72e2",
"type": "github"
},
"original": {
@ -221,66 +288,24 @@
"type": "github"
}
},
"systems": {
"locked": {
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
"owner": "nix-systems",
"repo": "default-linux",
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default-linux",
"type": "github"
}
},
"wlroots": {
"flake": false,
"locked": {
"host": "gitlab.freedesktop.org",
"lastModified": 1700736101,
"narHash": "sha256-1Fh1xf/JX5zFbGIF9LDaffaleG6JDwwwnKby0LyiXEA=",
"owner": "wlroots",
"repo": "wlroots",
"rev": "f1762f428b0ef2989c81f57ea9e810403d34d946",
"type": "gitlab"
},
"original": {
"host": "gitlab.freedesktop.org",
"owner": "wlroots",
"repo": "wlroots",
"rev": "f1762f428b0ef2989c81f57ea9e810403d34d946",
"type": "gitlab"
}
},
"xdph": {
"treefmt-nix": {
"inputs": {
"hyprland-protocols": [
"hyprland",
"hyprland-protocols"
],
"nixpkgs": [
"hyprland",
"nur",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1700508250,
"narHash": "sha256-X4o/mifI7Nhu0UKYlxx53wIC+gYDo3pVM9L2u3PE2bE=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "eb120ff25265ecacd0fc13d7dab12131b60d0f47",
"lastModified": 1733222881,
"narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "49717b5af6f80172275d47a418c9719a31a78b53",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
}

View File

@ -1,13 +1,14 @@
{
description = "SoraFlake";
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
# Trick renovate into working: "github:NixOS/nixpkgs/nixpkgs-unstable"
nixUnstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
hardware.url = "github:nixos/nixos-hardware";
nur.url = "github:nix-community/nur";
home-manager = {
url = "github:nix-community/home-manager";
url = "github:nix-community/home-manager/release-25.05";
inputs.nixpkgs.follows = "nixpkgs";
};
@ -16,66 +17,38 @@
inputs.nixpkgs.follows = "nixpkgs";
};
hyprland = {
url = "github:hyprwm/Hyprland";
inputs.nixpkgs.follows = "nixpkgs";
};
# hyprland = {
# url = "github:hyprwm/Hyprland";
# inputs.nixpkgs.follows = "nixpkgs";
# };
sops-nix = {
url = "github:Mic92/sops-nix";
inputs.nixpkgs.follows = "nixpkgs";
inputs.nixpkgs-stable.follows = "nixpkgs";
};
nix-colors.url = "github:misterio77/nix-colors";
arion.url = "github:hercules-ci/arion";
arion.inputs.nixpkgs.follows = "nixpkgs";
};
outputs = inputs:
let gen = import ./generator.nix { inherit inputs; };
in {
devShells = import ./shells { inherit inputs; };
nixosConfigurations = {
valinor = gen.generate {
type = "nixos";
system = "x86_64-linux";
host = "valinor";
};
iriy = gen.generate {
type = "nixos";
system = "x86_64-linux";
host = "iriy";
};
efir = gen.generate {
type = "nixos";
system = "x86_64-linux";
host = "efir";
};
avalon = gen.generate {
type = "nixos";
system = "x86_64-linux";
host = "avalon";
};
};
darwinConfigurations = {
asgard = gen.generate {
type = "macos";
system = "x86_64-darwin";
host = "asgard";
};
valinor = gen.generate { host = "valinor"; };
iriy = gen.generate { host = "iriy"; };
efir = gen.generate { host = "efir"; };
avalon = gen.generate { host = "avalon"; };
ci = gen.generate { host = "ci"; };
sandbox = gen.generate { host = "sandbox"; };
};
darwinConfigurations = { asgard = gen.generate { host = "asgard"; }; };
homeConfigurations = {
yomi = gen.generate {
type = "home";
system = "arm-64";
host = "example";
};
example = gen.generate {
type = "home";
system = "-"; # supports any
host = "example";
};
yomi = gen.generate { host = "example"; };
example = gen.generate { host = "example"; };
};
};

View File

@ -1,51 +1,68 @@
{ inputs, ... }: {
generate = { type, system, host }:
({
generate = { host }:
let
syscfg = import ./systems/${host}/cfg.nix;
nameValuePair = name: value: { inherit name value; };
in ({
"nixos" = inputs.nixpkgs.lib.nixosSystem {
system = system;
system = syscfg.syscfg.system;
specialArgs = { inherit inputs; };
modules = [
inputs.sops-nix.nixosModules.sops
./modules/shared/syscfg
./modules/shared/sops
./modules/nixos
syscfg
./systems/${host}
inputs.arion.nixosModules.arion
inputs.sops-nix.nixosModules.sops
inputs.home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = { inherit inputs; };
home-manager.users.sora = {
imports = [
./modules/home
inputs.nix-colors.homeManagerModule
inputs.hyprland.homeManagerModules.default
./systems/${host}/home.nix
];
};
home-manager.users = builtins.listToAttrs (map (userConfig:
nameValuePair userConfig.username {
imports = [
./modules/shared/syscfg
./modules/shared/colors
./modules/home
syscfg
{ usercfg = userConfig; }
inputs.nix-colors.homeManagerModule
# inputs.hyprland.homeManagerModules.default
inputs.sops-nix.homeManagerModules.sops
];
}) syscfg.syscfg.users);
}
];
};
"macos" = inputs.darwin.lib.darwinSystem {
system = system;
system = syscfg.system;
modules = [
inputs.sops-nix.nixosModules.sops
./modules/shared/syscfg
./modules/shared/sops
syscfg
./systems/${host}
inputs.sops-nix.nixosModules.sops
inputs.home-manager.darwinModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = { inherit inputs; };
home-manager.users.sora = {
imports = [
inputs.nix-colors.homeManagerModule
inputs.hyprland.homeManagerModules.default
./systems/${host}/home.nix
];
};
home-manager.users = builtins.listToAttrs (map (userConfig:
nameValuePair userConfig.username {
imports = [
inputs.nix-colors.homeManagerModule
inputs.sops-nix.homeManagerModules.sops
];
}) syscfg.syscfg.users);
}
];
};
"home" = inputs.home-manager.lib.homeManagerConfiguration {
modules = [ ./modules/home ./systems/${host}/home.nix ];
modules = [ ./modules/home ];
};
_ = throw "Unsupported system";
}.${type});
}.${syscfg.syscfg.type});
}

View File

@ -1,12 +1,21 @@
{ lib, config, ... }: {
#environment.sessionVariables.SOPS_AGE_KEY_FILE = keyFilePath;
systemd.user.startServices = "sd-switch";
programs.home-manager.enable = true;
home = {
username = "${config.homecfg.username}";
homeDirectory = "/home/${config.homecfg.username}";
username = "${config.usercfg.username}";
homeDirectory = "/home/${config.usercfg.username}";
stateVersion = "23.11";
stateVersion = "24.11";
};
#SOPS
# sops.defaultSopsFile = ./sops/${config.usercfg.username}.yaml;
# sops.age.keyFile = "/var/lib/sops-nix/age-key.txt";
# sops.age.generateKey = true;
# sops.secrets."github_user_key" = { };
# sops.secrets."curse_forge_key" = { };
}

View File

@ -0,0 +1,69 @@
curse_forge_key: ENC[AES256_GCM,data:PhhwPhUys/WDzXb40iFlrUcwFEJVzi49vDlm5Hpc7IUwbBiQI1Zvi6115THMvarnGESDyouPfoZP0wha,iv:x//EzR4QwdD0UxqV97yUepc39DopoqiDT21unpF9R2E=,tag:5jM1EibWo0wI+PS70+kb/Q==,type:str]
github_user_key: ENC[AES256_GCM,data:RvBsQjWGd2qRCvBzcpMv8FIXGY/GiPd9o0x2Oq+NlbXxR2NMqNBNLw==,iv:99AcmOWFft7XQAn7YrGjZuCvz0M5wUkYeInsWwyeUFM=,tag:wkw2YQGi9j/8XtOFd8KhdQ==,type:str]
sops:
kms: []
gcp_kms: []
azure_kv: []
hc_vault: []
age:
- recipient: age1sxzuhh2fcd4pmaz4mdqq95t683d32ft22w9t2r7pk258u0s8wymsqdj7lg
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBraWFDRFUxQ2l5OWV1OXNK
UExEbWZkM0kzVk1rZG4yY3pBLzdMVWVJS0UwCnhlWFJ5T2lZUXJyNkg1ejQxaU1t
L3F2RUhldTY3N2xXL0hwczNKRzNjcncKLS0tIEkycHoxcDBGNyt2V3RDY29wNGVp
TGg5Rk05VkRsaXM1Q0NxMmtMajRORDAKqjFldiAYJKjmnkeDkwanjYvhL6645DZ5
dVXExjqO/DG733ge8HFyKzpfpkzRymV1giUwxBdII1dd0mJ2ncINeA==
-----END AGE ENCRYPTED FILE-----
- recipient: age1ms8f0ysv6vakxepvt69fejczs6tddexepesdv4rkgtheehj3nu4sc6290s
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB3UkRjblIvYStZUzQyRHA1
ZGVXeHhrN0kyVkxZdms5U3gwVFlPMW12MVJjCjRkVURpZXBzb0tYenB4dGxKamh6
VXVBMmo1Ujkvd2VTRExyWE5MbVJaclUKLS0tIDVhRkYzZmEzUG00Q2IwOWZUMVVt
ODVIbytpcjN1cVMyaG1qVVdkRmtaMzQKNsvD9DpK/raDBob+IcuNk72tQDts36kJ
QhtoLy8MvUymi49PdEWrgyf68w5XwRO/U4iINhR0qzm0glg/XcyHjA==
-----END AGE ENCRYPTED FILE-----
- recipient: age1sxzuhh2fcd4pmaz4mdqq95t683d32ft22w9t2r7pk258u0s8wymsqdj7lg
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJc3hKWkk3ckNOY2UyTVhG
MmtLaEd0K04yaGxiOUoxMXkzOEFnYis4VkhnCktDRFM2bS8vb05OWDdwa0RwRlNO
cmlZemtxVGZ6S0tNTDV1cmE1N0pVWnMKLS0tIE9EZllycHJpcEY2R1pwOFhOZEU3
L01IcytDd3BPb0VOTW9DQ2lUdUVJS0kKiD+C+3mK1b/eIwCEFanFgYGLNk3JNPQ7
i1UqzbHVxSd0q/YVwdKAcj0jA6EezGm275tgq7IVsy2sHkvRMaEDtQ==
-----END AGE ENCRYPTED FILE-----
- recipient: age1sxzuhh2fcd4pmaz4mdqq95t683d32ft22w9t2r7pk258u0s8wymsqdj7lg
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAweVU3TkxFZzRnd2I2clN2
ZTlTWmhwQkhVc1hnOXFvZVVDSWpHMVh1TGtrCkc3M1pUTnZCMHpvYXB5ZVhreGxa
ZVY2cG5Ja2ltL3k2Q1VEalc5TTNFMXcKLS0tIGd5UWl0RGVXT211Zm51dlB6WFZ1
STRtTVpVTCtVZ1FUNENqWFFVNTNuaVUKN6HRiZjTdENeif8dJ29urBxPXDaosjjY
InN4Ko6YUaGfvB1DTrKIzrxOpsHS+XjisoGfT71tJwwEOoREklEO/A==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2024-12-23T18:05:22Z"
mac: ENC[AES256_GCM,data:YSi2xIwz50VxUDL3QzGVUwRWUgZhvudSLCKgwIbWm8gkuAJ/V2sVRhJNVQJ1YvLO44ob5hmrgR4wSnOdAbS7FrpbLcJuoYBjVUTDjy+j6otnIDxEcYeciHhZ1pV/OiydBmJC+lZ4+SRdWdokL2HaXRKgc9QT9e/MdAbFIzI1x90=,iv:8rj8yEqHTMgoGu31RVskYizmROB/5I0ajZJ/EcmlVfE=,tag:PILFCyXY8sXYGxCEHS7qCg==,type:str]
pgp:
- created_at: "2023-04-20T10:20:17Z"
enc: |-
-----BEGIN PGP MESSAGE-----
wcFMA6R3Y9nD7qMBAQ/8CVWQaYKfOzvPIllZyyWpUjHRLLXaR8MNJ8U5WI/tdwdN
9UScDYJFuYRW7Q9s4Mt961kBGpaHqe9MUZBxUDlYX59+EN3FbO/eMQ5OqI05ESmL
TvZB4+S9C5o73nuypSDNvYz+Lgq6DO25ZPhXdtPhx2DE4G31/wft/LpxhjalIjI8
MU0Dv22R4qC+glJbe4GIF2IJ8XoxnnzjiGeSqiyv0QIBM0SzOtA5sKwNohWBnW7g
7vxOTm5+kyzG0dDjt3tFApgPDaA1wjofzhRuuveF52VBsuIA2opFdpqkyICvK6rn
NB5kUaPlY6A0m+n0oHSfY5wm/AnHNE4Oob/ifumAaB0EAJVUTRauI5M8SeJF0ya1
U0IQ9N2lb7Y6q4pqHywIa6fnylsqCfxInAYKMuslRq8f9t/qakb4/MYcnPrwpzjw
73/naiNoJmG6NVTkM52qTtOqZAmsaQd5cigTuPW2Z2CJq1yLZEVGSSd1DUGUjBDK
nQGucpVVVpD+ifrIPz+Iqwy+5NoZZm/Oa9pKJGFzqXinnDNZaqtgpmTw9QxcSeaP
VvGZG9CDd89MtAm1VQyuqi1bQ2faq3G0xNrLl7xUsfmjx4ofW+JXR87OzvGfLPhu
Sjl3kS9j5/MEBRBg3n9gNkgSu5Sy3ilhckY3yjTgAT9Gw2giDhCiUXi1/7KrGprS
UQHPCSsjyWsyuYVa3lAP/WPdVclc4WOdfYcetUCXBVP7LQr0bq+IG+2J0nnY3mDt
Va5k4sP1qu6Ecrs2JioQ1V2H+VmcrRykBWnMXl1tDSWKMA==
=pS8X
-----END PGP MESSAGE-----
fp: 4E241635F8EDD2919D2FB44CA362EA0491E2EEA0
unencrypted_suffix: _unencrypted
version: 3.9.2

View File

@ -6,86 +6,86 @@
# Theme generated from: ${config.colorScheme.slug}
# Main background, empty for terminal default, need to be empty if you want transparent background
theme[main_bg]="#${config.colorScheme.colors.base00}"
theme[main_bg]="#${config.colorScheme.palette.base00}"
# Main text color
theme[main_fg]="#${config.colorScheme.colors.base07}"
theme[main_fg]="#${config.colorScheme.palette.base07}"
# Title color for boxes
theme[title]="#${config.colorScheme.colors.base07}"
theme[title]="#${config.colorScheme.palette.base07}"
# Higlight color for keyboard shortcuts
theme[hi_fg]="#${config.colorScheme.colors.base0E}"
theme[hi_fg]="#${config.colorScheme.palette.base0E}"
# Background color of selected item in processes box
theme[selected_bg]="#${config.colorScheme.colors.base0C}"
theme[selected_bg]="#${config.colorScheme.palette.base0C}"
# Foreground color of selected item in processes box
theme[selected_fg]="#${config.colorScheme.colors.base00}"
theme[selected_fg]="#${config.colorScheme.palette.base00}"
# Color of inactive/disabled text
theme[inactive_fg]="#${config.colorScheme.colors.base02}"
theme[inactive_fg]="#${config.colorScheme.palette.base02}"
# Color of text appearing on top of graphs, i.e uptime and current network graph scaling
theme[graph_text]="#${config.colorScheme.colors.base05}"
theme[graph_text]="#${config.colorScheme.palette.base05}"
# Misc colors for processes box including mini cpu graphs, details memory graph and details status text
theme[proc_misc]="#${config.colorScheme.colors.base0C}"
theme[proc_misc]="#${config.colorScheme.palette.base0C}"
# Cpu box outline color
theme[cpu_box]="#${config.colorScheme.colors.base02}"
theme[cpu_box]="#${config.colorScheme.palette.base02}"
# Memory/disks box outline color
theme[mem_box]="#${config.colorScheme.colors.base02}"
theme[mem_box]="#${config.colorScheme.palette.base02}"
# Net up/down box outline color
theme[net_box]="#${config.colorScheme.colors.base02}"
theme[net_box]="#${config.colorScheme.palette.base02}"
# Processes box outline color
theme[proc_box]="#${config.colorScheme.colors.base02}"
theme[proc_box]="#${config.colorScheme.palette.base02}"
# Box divider line and small boxes line color
theme[div_line]="#${config.colorScheme.colors.base02}"
theme[div_line]="#${config.colorScheme.palette.base02}"
# Temperature graph colors
theme[temp_start]="#${config.colorScheme.colors.base0D}"
theme[temp_start]="#${config.colorScheme.palette.base0D}"
theme[temp_mid]=""
theme[temp_end]="#${config.colorScheme.colors.base0F}"
theme[temp_end]="#${config.colorScheme.palette.base0F}"
# CPU graph colors
theme[cpu_start]="#${config.colorScheme.colors.base0C}"
theme[cpu_start]="#${config.colorScheme.palette.base0C}"
theme[cpu_mid]=""
theme[cpu_end]="#${config.colorScheme.colors.base0C}"
theme[cpu_end]="#${config.colorScheme.palette.base0C}"
# Mem/Disk free meter
theme[free_start]="#${config.colorScheme.colors.base0A}"
theme[free_start]="#${config.colorScheme.palette.base0A}"
theme[free_mid]=""
theme[free_end]="#${config.colorScheme.colors.base0A}"
theme[free_end]="#${config.colorScheme.palette.base0A}"
# Mem/Disk cached meter
theme[cached_start]="#${config.colorScheme.colors.base09}"
theme[cached_start]="#${config.colorScheme.palette.base09}"
theme[cached_mid]=""
theme[cached_end]="#${config.colorScheme.colors.base09}"
theme[cached_end]="#${config.colorScheme.palette.base09}"
# Mem/Disk available meter
theme[available_start]="#${config.colorScheme.colors.base0B}"
theme[available_start]="#${config.colorScheme.palette.base0B}"
theme[available_mid]=""
theme[available_end]="#${config.colorScheme.colors.base0B}"
theme[available_end]="#${config.colorScheme.palette.base0B}"
# Mem/Disk used meter
theme[used_start]="#${config.colorScheme.colors.base08}"
theme[used_start]="#${config.colorScheme.palette.base08}"
theme[used_mid]=""
theme[used_end]="#${config.colorScheme.colors.base08}"
theme[used_end]="#${config.colorScheme.palette.base08}"
# Download graph colors
theme[download_start]="#${config.colorScheme.colors.base02}"
theme[download_start]="#${config.colorScheme.palette.base02}"
theme[download_mid]=""
theme[download_end]="#${config.colorScheme.colors.base0D}"
theme[download_end]="#${config.colorScheme.palette.base0D}"
# Upload graph colors
theme[upload_start]="#${config.colorScheme.colors.base02}"
theme[upload_start]="#${config.colorScheme.palette.base02}"
theme[upload_mid]=""
theme[upload_end]="#${config.colorScheme.colors.base0E}"
theme[upload_end]="#${config.colorScheme.palette.base0E}"
'';
}

View File

@ -2,10 +2,10 @@
programs.git = {
enable = true;
userEmail = "${config.homecfg.git.email}";
userName = "${config.homecfg.git.username}";
userEmail = "${config.usercfg.git.email}";
userName = "${config.usercfg.git.username}";
signing = {
key = "${config.homecfg.git.key}";
key = "${config.usercfg.git.key}";
signByDefault = true;
};
ignores = [ "*result*" ".direnv" "node_modules" ];

View File

@ -2,53 +2,53 @@
programs.kitty = {
enable = true;
settings = {
foreground = "#${config.colorScheme.colors.base07}";
background = "#${config.colorScheme.colors.base00}";
selection_foreground = "#${config.colorScheme.colors.base07}";
selection_background = "#${config.colorScheme.colors.base03}";
foreground = "#${config.colorScheme.palette.base07}";
background = "#${config.colorScheme.palette.base00}";
selection_foreground = "#${config.colorScheme.palette.base07}";
selection_background = "#${config.colorScheme.palette.base03}";
background_opacity = "0.9";
cursor = "#${config.colorScheme.colors.base05}";
cursor_text_color = "#${config.colorScheme.colors.base01}";
cursor = "#${config.colorScheme.palette.base05}";
cursor_text_color = "#${config.colorScheme.palette.base01}";
url_color = "#${config.colorScheme.colors.base05}";
url_color = "#${config.colorScheme.palette.base05}";
active_border_color = "#${config.colorScheme.colors.base05}";
inactive_border_color = "#${config.colorScheme.colors.base03}";
bell_border_color = "#${config.colorScheme.colors.base09}";
active_border_color = "#${config.colorScheme.palette.base05}";
inactive_border_color = "#${config.colorScheme.palette.base03}";
bell_border_color = "#${config.colorScheme.palette.base09}";
wayland_titlebar_color = "system";
macos_titlebar_color = "system";
active_tab_foreground = "#${config.colorScheme.colors.base0C}";
active_tab_background = "#${config.colorScheme.colors.base01}";
inactive_tab_foreground = "#${config.colorScheme.colors.base06}";
inactive_tab_background = "#${config.colorScheme.colors.base00}";
tab_bar_background = "#${config.colorScheme.colors.base02}";
active_tab_foreground = "#${config.colorScheme.palette.base0C}";
active_tab_background = "#${config.colorScheme.palette.base01}";
inactive_tab_foreground = "#${config.colorScheme.palette.base06}";
inactive_tab_background = "#${config.colorScheme.palette.base00}";
tab_bar_background = "#${config.colorScheme.palette.base02}";
mark1_foreground = "#${config.colorScheme.colors.base00}";
mark1_background = "#${config.colorScheme.colors.base0C}";
mark2_foreground = "#${config.colorScheme.colors.base00}";
mark2_background = "#${config.colorScheme.colors.base0E}";
mark3_foreground = "#${config.colorScheme.colors.base00}";
mark3_background = "#${config.colorScheme.colors.base0A}";
mark1_foreground = "#${config.colorScheme.palette.base00}";
mark1_background = "#${config.colorScheme.palette.base0C}";
mark2_foreground = "#${config.colorScheme.palette.base00}";
mark2_background = "#${config.colorScheme.palette.base0E}";
mark3_foreground = "#${config.colorScheme.palette.base00}";
mark3_background = "#${config.colorScheme.palette.base0A}";
color0 = "#${config.colorScheme.colors.base00}";
color1 = "#${config.colorScheme.colors.base01}";
color2 = "#${config.colorScheme.colors.base02}";
color3 = "#${config.colorScheme.colors.base03}";
color4 = "#${config.colorScheme.colors.base04}";
color5 = "#${config.colorScheme.colors.base05}";
color6 = "#${config.colorScheme.colors.base06}";
color7 = "#${config.colorScheme.colors.base07}";
color8 = "#${config.colorScheme.colors.base08}";
color9 = "#${config.colorScheme.colors.base09}";
color10 = "#${config.colorScheme.colors.base0A}";
color11 = "#${config.colorScheme.colors.base0B}";
color12 = "#${config.colorScheme.colors.base0C}";
color13 = "#${config.colorScheme.colors.base0D}";
color14 = "#${config.colorScheme.colors.base0E}";
color15 = "#${config.colorScheme.colors.base0F}";
color0 = "#${config.colorScheme.palette.base01}";
color1 = "#${config.colorScheme.palette.base0F}";
color2 = "#${config.colorScheme.palette.base0A}";
color3 = "#${config.colorScheme.palette.base09}";
color4 = "#${config.colorScheme.palette.base0C}";
color5 = "#${config.colorScheme.palette.base0D}";
color6 = "#${config.colorScheme.palette.base0B}";
color7 = "#${config.colorScheme.palette.base07}";
color8 = "#${config.colorScheme.palette.base01}";
color9 = "#${config.colorScheme.palette.base0F}";
color10 = "#${config.colorScheme.palette.base0A}";
color11 = "#${config.colorScheme.palette.base09}";
color12 = "#${config.colorScheme.palette.base0C}";
color13 = "#${config.colorScheme.palette.base0D}";
color14 = "#${config.colorScheme.palette.base0B}";
color15 = "#${config.colorScheme.palette.base07}";
font_size = 12;
window-padding-width = 15;

View File

@ -1,13 +1,13 @@
print_info() {
info ""
info "${c5} ├─ 󰜗 Distro " distro
info "${c5} ├─ 󰌽 Kernel " kernel
info "${c5} ├─ 󰏗 Pkgs " packages
info "${c5} ├─ 󰍹 Compositor " de
info "${c5} ├─ 󱛠 CPU " cpu
info "${c5} ├─ 󰢮 GPU " gpu
info "${c5} ├─ 󰞷 Term " term
info "├─ 󰜗 Distro " distro
info "├─ 󰌽 Kernel " kernel
info "├─ 󰏗 Pkgs " packages
info "├─ 󰍹 Compositor " de
info "├─ 󱛠 CPU " cpu
info "├─ 󰢮 GPU " gpu
info "├─ 󰞷 Term " term
prin "$(color 0)󰝥 $(color 1)󰝥 $(color 2)󰝥 $(color 3)󰝥 $(color 4)󰝥 $(color 5)󰝥 $(color 6)󰝥 $(color 7)󰝥"
prin "$(color 8)󰝥 $(color 9)󰝥 $(color 10)󰝥 $(color 11)󰝥 $(color 12)󰝥 $(color 13)󰝥 $(color 14)󰝥 $(color 15)󰝥"
@ -76,7 +76,7 @@ song_shorthand="off"
mpc_args=()
##--------- Text Colors
colors=(0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15)
colors=(0 0 0 4 7 7)
##--------- Text Options
bold="on"

View File

@ -12,6 +12,7 @@
cbonsai
pipes-rs
cmatrix
cava
#cava
sl
];
}

View File

@ -10,51 +10,51 @@
enableZshIntegration = true;
settings = {
format = lib.concatStrings [
"[](#${config.colorScheme.colors.base06})"
"[](#${config.colorScheme.palette.base06})"
"$username"
"$hostname"
"[](bg:#${config.colorScheme.colors.base05} fg:#${config.colorScheme.colors.base06})"
"[](bg:#${config.colorScheme.palette.base05} fg:#${config.colorScheme.palette.base06})"
"$directory"
"[](bg:#${config.colorScheme.colors.base04} fg:#${config.colorScheme.colors.base05})"
"[ ](bg:#${config.colorScheme.colors.base04})"
"[](bg:#${config.colorScheme.palette.base04} fg:#${config.colorScheme.palette.base05})"
"[ ](bg:#${config.colorScheme.palette.base04})"
"$env_var"
"[](bg:#${config.colorScheme.colors.base00} fg:#${config.colorScheme.colors.base04})"
"[](bg:#${config.colorScheme.palette.base00} fg:#${config.colorScheme.palette.base04})"
" "
];
username = {
show_always = true;
style_user =
"bg:#${config.colorScheme.colors.base06} fg:#${config.colorScheme.colors.base00}";
"bg:#${config.colorScheme.palette.base06} fg:#${config.colorScheme.palette.base00}";
style_root =
"bg:#${config.colorScheme.colors.base06} fg:#${config.colorScheme.colors.base00}";
"bg:#${config.colorScheme.palette.base06} fg:#${config.colorScheme.palette.base00}";
format = "[ $user]($style)";
};
hostname = {
ssh_symbol = "";
style =
"bg:#${config.colorScheme.colors.base06} fg:#${config.colorScheme.colors.base00}";
"bg:#${config.colorScheme.palette.base06} fg:#${config.colorScheme.palette.base00}";
format = "[@$hostname]($style)";
ssh_only = false;
disabled = false;
};
directory = {
style =
"bg:#${config.colorScheme.colors.base05} fg:#${config.colorScheme.colors.base00}";
"bg:#${config.colorScheme.palette.base05} fg:#${config.colorScheme.palette.base00}";
format = "[ $path ]($style)";
truncation_length = 3;
truncation_symbol = "/";
};
directory.substitutions = {
"documents" = " ";
"downloads" = " ";
"music" = " ";
"pictures" = " ";
"documents" = "󰮜 ";
"downloads" = "󱃩 ";
"files" = "󱧷 ";
"media" = "󱍚 ";
};
env_var = {
variable = "DEVSH";
variable = "SHELLENVTYPE";
default = "";
style =
"bg:#${config.colorScheme.colors.base04} fg:#${config.colorScheme.colors.base00}";
"bg:#${config.colorScheme.palette.base04} fg:#${config.colorScheme.palette.base00}";
format = "[$env_value]($style)";
};
};

View File

@ -14,5 +14,9 @@ in {
"ssh" = "TERM=xterm-256color ${pkgs.openssh}/bin/ssh";
"top" = "btop";
};
initContent = ''
sopsu() {nix-shell -p sops --run "sops updatekeys $1";}
sopsn() {nix-shell -p sops --run "sops $1";}
'';
};
}

View File

@ -1 +1 @@
{ ... }: { imports = [ ./base ./cli ./gui ./homecfg ./wayland ./xdg ./xorg ]; }
{ ... }: { imports = [ ./base ./cli ./gui ./wayland ./xdg ./xorg ]; }

View File

@ -1,3 +1,3 @@
{ ... }: {
imports = [ ./firefox ./images ./mpv ./pipewire ./vosk ./vscodium ./zathura ];
imports = [ ./develop ./firefox ./images ./mpv ./pipewire ./zathura ];
}

View File

@ -0,0 +1,7 @@
{ lib, config, pkgs, ... }: {
imports = [ ./vscodium ];
config = lib.mkIf (config.syscfg.make.develop) {
home.packages = with pkgs; [ blender godot_4 openscad-unstable bambu-studio ];
};
}

View File

@ -0,0 +1,19 @@
{ lib, config, pkgs, ... }: {
config = lib.mkIf (config.syscfg.make.develop) {
programs.vscode = {
enable = true;
package = pkgs.vscodium;
#profiles.default = {
profiles.default.extensions = with pkgs.vscode-extensions; [
bbenoist.nix
esbenp.prettier-vscode
golang.go
ms-python.vscode-pylance
ms-vscode.cpptools
dbaeumer.vscode-eslint
];
#};
};
};
}

View File

@ -1,5 +1,5 @@
{ lib, config, ... }: {
config = lib.mkIf (config.homecfg.make.gui) {
config = lib.mkIf (config.syscfg.make.gui) {
programs.firefox = {
enable = true;
profiles = {

View File

@ -1,6 +1,6 @@
{ lib, config, pkgs, ... }: {
config = lib.mkIf (config.homecfg.make.gui) {
config = lib.mkIf (config.syscfg.make.gui) {
programs.imv.enable = true;
programs.obs-studio.enable = true;

View File

@ -1,6 +1,6 @@
{ lib, config, pkgs, ... }: {
config = lib.mkIf (config.homecfg.make.gui) {
config = lib.mkIf (config.syscfg.make.gui) {
programs.mpv = {
enable = true;
scripts = with pkgs; [ mpvScripts.mpris ];

View File

@ -1,6 +1,6 @@
{ lib, config, ... }: {
config = lib.mkIf (config.homecfg.make.gui) {
config = lib.mkIf (config.syscfg.make.gui) {
xdg.configFile."pipewire/pipewire-pulse.conf.d/desktop.conf".text = ''
context.modules = [
{ name = libpipewire-module-loopback

View File

@ -1,65 +1,60 @@
{ lib, config, pkgs, ... }: {
config = lib.mkIf (config.homecfg.make.gui) {
# home.packages = with pkgs; [
# custom.vosk
# custom.vosk.cli
# custom.vosk.lang.en
# custom.vosk.lang.ja
# custom.vosk.lang.de
# custom.vosk.lang.ru
# jq
# (python3.withPackages (ps: with ps; [ translatepy ]))
# ];
config = lib.mkIf (config.syscfg.make.gui) {
home.packages = with pkgs; [
custom.vosk.base
jq
(python3.withPackages (ps: with ps; [ translatepy ]))
];
# xdg.configFile."script/transcript-translate.py".text = ''
# #!/bin/python
xdg.configFile."script/transcript-translate.py".text = ''
#!/bin/python
# import sys;
# from translatepy.translators.google import GoogleTranslate;
import sys;
from translatepy.translators.google import GoogleTranslate;
# if len(sys.argv) != 2:
# print("No language provided.")
# exit
# translator = GoogleTranslate()
# while True:
# for line in sys.stdin:
# sys.stdout.write(translator.translate(line,sys.argv[1]).result+"\n")
# '';
if len(sys.argv) != 2:
print("No language provided.")
exit
translator = GoogleTranslate()
while True:
for line in sys.stdin:
sys.stdout.write(translator.translate(line,sys.argv[1]).result+"\n")
'';
# xdg.configFile."script/transcript.sh".text = ''
# #!/bin/sh
xdg.configFile."script/transcript.sh".text = ''
#!/bin/sh
# MODELS=(
# "English:${pkgs.custom.vosklang.en-us}/usr/share/vosk-models/en-us"
# "German:${pkgs.custom.vosklang.de}/usr/share/vosk-models/de"
# "Russian:${pkgs.custom.vosklang.ru}/usr/share/vosk-models/ru"
# "Japanese:${pkgs.custom.vosklang.ja}/usr/share/vosk-models/ja"
# )
MODELS=(
"English:${pkgs.custom.vosk.lang.en-us}/usr/share/vosk-models/en-us"
"German:${pkgs.custom.vosk.lang.de}/usr/share/vosk-models/de"
"Russian:${pkgs.custom.vosk.lang.ru}/usr/share/vosk-models/ru"
"Japanese:${pkgs.custom.vosk.lang.ja}/usr/share/vosk-models/ja"
)
# MODEL_OPTS=""
# for pair in "''${MODELS[@]}"; do
# MODEL_OPTS+="$pair\n"
# done
MODEL_OPTS=""
for pair in "''${MODELS[@]}"; do
MODEL_OPTS+="$pair\n"
done
# MODEL_OPT=$(echo -e "$MODEL_OPTS" | wofi --dmenu -p "Choose model:")
# MODEL=$(echo "$MODEL_OPT" | awk -F ':' '{print $2}')
MODEL_OPT=$(echo -e "$MODEL_OPTS" | wofi --dmenu -p "Choose model:")
MODEL=$(echo "$MODEL_OPT" | awk -F ':' '{print $2}')
# TRANSS="None\nNone-prog\nEnglish\nGerman\nRussian\nJapanese"
# TRANS=$(echo -e "$TRANSS" | wofi --dmenu -p "Choose translation:")
TRANSS="None\nNone-prog\nEnglish\nGerman\nRussian\nJapanese"
TRANS=$(echo -e "$TRANSS" | wofi --dmenu -p "Choose translation:")
# export VOSK_MODEL=$MODEL
# case $TRANS in
# "None")
# voskcli 2>/dev/null | jq --unbuffered -r '.alternatives[0].text // empty | select(length > 0)' 2>/dev/null
# ;;
# "None-prog")
# voskcli 2>/dev/null | jq --unbuffered -r '.alternatives[0].text // empty, .partial // empty | select(length > 0)' 2>/dev/null
# ;;
# *)
# voskcli 2>/dev/null | jq --unbuffered -r '.alternatives[0].text // empty | select(length > 0)' | python ~/.config/script/transcript-translate.py $TRANS
# ;;
# esac
# '';
export VOSK_MODEL=$MODEL
case $TRANS in
"None")
${pkgs.custom.vosk.cli}/bin/voskcli 2>/dev/null | jq --unbuffered -r '.alternatives[0].text // empty | select(length > 0)' 2>/dev/null
;;
"None-prog")
${pkgs.custom.vosk.cli}/bin/voskcli 2>/dev/null | jq --unbuffered -r '.alternatives[0].text // empty, .partial // empty | select(length > 0)' 2>/dev/null
;;
*)
${pkgs.custom.vosk.cli}/bin/voskcli 2>/dev/null | jq --unbuffered -r '.alternatives[0].text // empty | select(length > 0)' | python ~/.config/script/transcript-translate.py $TRANS
;;
esac
'';
};
}

View File

@ -1,17 +0,0 @@
{ lib, config, pkgs, ... }: {
config = lib.mkIf (config.homecfg.make.gui) {
programs.vscode = {
enable = true;
package = pkgs.vscodium;
extensions = with pkgs.vscode-extensions; [
bbenoist.nix
esbenp.prettier-vscode
golang.go
ms-python.vscode-pylance
ms-vscode.cpptools
dbaeumer.vscode-eslint
];
};
};
}

View File

@ -1,46 +1,46 @@
{ lib, config, ... }: {
config = lib.mkIf (config.homecfg.make.gui) {
config = lib.mkIf (config.syscfg.make.gui) {
programs.zathura = {
enable = true;
extraConfig = ''
set default-fg "#${config.colorScheme.colors.base06}"
set default-bg "#${config.colorScheme.colors.base00}"
set default-fg "#${config.colorScheme.palette.base06}"
set default-bg "#${config.colorScheme.palette.base00}"
set completion-bg "#${config.colorScheme.colors.base02}"
set completion-fg "#${config.colorScheme.colors.base06}"
set completion-highlight-bg "#${config.colorScheme.colors.base03}"
set completion-highlight-fg "#${config.colorScheme.colors.base06}"
set completion-group-bg "#${config.colorScheme.colors.base01}"
set completion-group-fg "#${config.colorScheme.colors.base0C}"
set completion-bg "#${config.colorScheme.palette.base02}"
set completion-fg "#${config.colorScheme.palette.base06}"
set completion-highlight-bg "#${config.colorScheme.palette.base03}"
set completion-highlight-fg "#${config.colorScheme.palette.base06}"
set completion-group-bg "#${config.colorScheme.palette.base01}"
set completion-group-fg "#${config.colorScheme.palette.base0C}"
set statusbar-fg "#${config.colorScheme.colors.base06}"
set statusbar-bg "#${config.colorScheme.colors.base01}"
set statusbar-fg "#${config.colorScheme.palette.base06}"
set statusbar-bg "#${config.colorScheme.palette.base01}"
set notification-bg "#${config.colorScheme.colors.base01}"
set notification-fg "#${config.colorScheme.colors.base06}"
set notification-error-bg "#${config.colorScheme.colors.base01}"
set notification-error-fg "#${config.colorScheme.colors.base0F}"
set notification-warning-bg "#${config.colorScheme.colors.base01}"
set notification-warning-fg "#${config.colorScheme.colors.base09}"
set notification-bg "#${config.colorScheme.palette.base01}"
set notification-fg "#${config.colorScheme.palette.base06}"
set notification-error-bg "#${config.colorScheme.palette.base01}"
set notification-error-fg "#${config.colorScheme.palette.base0F}"
set notification-warning-bg "#${config.colorScheme.palette.base01}"
set notification-warning-fg "#${config.colorScheme.palette.base09}"
set inputbar-fg "#${config.colorScheme.colors.base06}"
set inputbar-bg "#${config.colorScheme.colors.base01}"
set inputbar-fg "#${config.colorScheme.palette.base06}"
set inputbar-bg "#${config.colorScheme.palette.base01}"
set recolor-lightcolor "#${config.colorScheme.colors.base00}"
set recolor-darkcolor "#${config.colorScheme.colors.base06}"
set recolor-lightcolor "#${config.colorScheme.palette.base00}"
set recolor-darkcolor "#${config.colorScheme.palette.base06}"
set index-fg "#${config.colorScheme.colors.base06}"
set index-bg "#${config.colorScheme.colors.base00}"
set index-active-fg "#${config.colorScheme.colors.base06}"
set index-active-bg "#${config.colorScheme.colors.base01}"
set index-fg "#${config.colorScheme.palette.base06}"
set index-bg "#${config.colorScheme.palette.base00}"
set index-active-fg "#${config.colorScheme.palette.base06}"
set index-active-bg "#${config.colorScheme.palette.base01}"
set render-loading-bg "#${config.colorScheme.colors.base00}"
set render-loading-fg "#${config.colorScheme.colors.base06}"
set render-loading-bg "#${config.colorScheme.palette.base00}"
set render-loading-fg "#${config.colorScheme.palette.base06}"
set highlight-color "#${config.colorScheme.colors.base04}"
set highlight-fg "#${config.colorScheme.colors.base0E}"
set highlight-active-color "#${config.colorScheme.colors.base0E}"
set highlight-color "#${config.colorScheme.palette.base04}"
set highlight-fg "#${config.colorScheme.palette.base0E}"
set highlight-active-color "#${config.colorScheme.palette.base0E}"
'';
};

View File

@ -1,6 +1,6 @@
{ lib, config, pkgs, ... }: {
config = lib.mkIf (config.homecfg.make.gui) {
config = lib.mkIf (config.syscfg.make.gui) {
services.nextcloud-client.enable = true;
home.packages = with pkgs; [
@ -10,9 +10,13 @@
xfce.tumbler
telegram-desktop
discord-canary
pavucontrol
keepassxc
nextcloud-client
gramps
sweethome3d.application
];
};
}

View File

@ -1,11 +1,10 @@
{ lib, config, pkgs, ... }: {
{ inputs, lib, config, pkgs, ... }: {
imports = [ ./openttd.nix ];
imports = [ ./openttd.nix ./wow.nix ];
config = lib.mkIf (config.homecfg.make.game) {
config = lib.mkIf (config.syscfg.make.game) {
home.packages = with pkgs; [
# custom.simc
#games
steam
@ -15,6 +14,9 @@
prismlauncher
openttd-jgrpp
bottles
lutris
unstable.umu-launcher
wine
];
};

View File

@ -1,6 +1,6 @@
{ lib, config, ... }: {
config = lib.mkIf (config.homecfg.make.game) {
config = lib.mkIf (config.syscfg.make.game) {
xdg.configFile."openttd/openttd.cfg".text = ''
[misc]
display_opt = SHOW_TOWN_NAMES|SHOW_STATION_NAMES|SHOW_SIGNS|FULL_ANIMATION|FULL_DETAIL|WAYPOINTS|SHOW_COMPETITOR_SIGNS

View File

@ -0,0 +1,81 @@
{ pkgs, lib, config, sops, ... }: {
config = lib.mkIf (config.syscfg.make.game) {
home.packages = with pkgs;
[
# custom.simc
];
# templates buggy currently
#xdg.configFile."instawow/config.json" = ''${config.sops.templates."instawow_config.json".path}'';
sops.templates."instawow_config.json".content = ''
{
"auto_update_check": true,
"access_tokens": {
"cfcore": "${config.sops.placeholder.curse_forge_key}",
"github": "${config.sops.placeholder.github_user_key}",
"wago_addons": null
}
}'';
# curse:master-plan
# curse:raretrackercore-rt
# curse:raretrackerdragonflight-rtd
# curse:raretrackermaw-rtmw
# curse:raretrackermechagon-rtm
# curse:raretrackerthewarwithin-rtww
# curse:raretrackertimelessisle-rtti
# curse:raretrackeruldum-rtu
# curse:raretrackervale-rtv
# curse:raretrackerworldbosses-rtwb
# curse:raretrackerzerethmortis-rtz
# curse:venture-plan
# curse:war-plan
# github:nevcairiel/bartender4
# github:cidan/betterbags
# github:bigwigsmods/bigwigs
# github:bigwigsmods/bigwigs_battleforazeroth
# github:bigwigsmods/bigwigs_burningcrusade
# github:bigwigsmods/bigwigs_cataclysm
# github:bigwigsmods/bigwigs_classic
# github:bigwigsmods/bigwigs_dragonflight
# github:bigwigsmods/bigwigs_legion
# github:bigwigsmods/bigwigs_mistsofpandaria
# github:bigwigsmods/bigwigs_shadowlands
# github:bigwigsmods/bigwigs_warlordsofdraenor
# github:bigwigsmods/bigwigs_wrathofthelichking
# github:nezroy/demodal
# github:curseforge-mirror/details
# github:edusperoni/details_elitism
# github:curseforge-mirror/elitismhelper
# github:michaelnpsp/grid2
# github:jods-gh/groupfinderrio
# github:nevcairiel/handynotes
# github:hekili/hekili
# github:thekrowi/krowi_achievementfilter
# github:bigwigsmods/littlewigs
# github:nnoggie/mythicdungeontools
# github:tullamods/omnicc
# github:tercioo/plater-nameplates
# github:curseforge-mirror/quest_completist
# github:raiderio/raiderio-addon
# github:wowrarity/rarity
# github:nevcairiel/shadowedunitframes
# github:simulationcraft/simc-addon
# github:curseforge-mirror/tomcats
# github:weakauras/weakauras2
# github:kemayo/wow-handynotes-battleforazerothtreasures
# github:kemayo/wow-handynotes-dragonflight
# github:kemayo/wow-handynotes-legiontreasures
# github:kemayo/wow-handynotes-longforgottenhippogryph
# github:kemayo/wow-handynotes-lostandfound
# github:kemayo/wow-handynotes-secretfish
# github:kemayo/wow-handynotes-shadowlandstreasures
# github:kemayo/wow-handynotes-stygia
# github:kemayo/wow-handynotes-treasurehunter
# github:kemayo/wow-handynotes-warwithin
# wowi:7032-tomtom
};
}

View File

@ -5,7 +5,7 @@ let
wallpaperGen = import ./wallpaper-gen.nix { inherit pkgs config; };
in {
config = lib.mkIf (config.homecfg.make.gui) {
config = lib.mkIf (config.syscfg.make.gui) {
home.pointerCursor = {
package = pkgs.bibata-cursors;
name = "Bibata-Modern-Classic";
@ -17,7 +17,7 @@ in {
gtk = {
enable = true;
theme = {
name = "${config.colorscheme.slug}";
name = "${config.colorscheme.slug}-Dark";
package = gtkThemeFromScheme;
};
iconTheme = {
@ -28,7 +28,7 @@ in {
qt = {
enable = true;
platformTheme = "gtk";
platformTheme.name = "gtk";
};
home.packages = [ wallpaperGen pkgs.swww ];

View File

@ -9,60 +9,89 @@ let
in pkgs.stdenv.mkDerivation rec {
name = "generated-gtk-theme-${scheme.slug}";
src = pkgs.fetchFromGitHub {
owner = "nana-4";
repo = "materia-theme";
rev = "6e5850388a25f424b8193fe4523504d1dc364175";
sha256 = "sha256-I6hpH0VTmftU4+/pRbztuTQcBKcOFBFbNZXJL/2bcgU=";
owner = "vinceliuice";
repo = "Orchis-theme";
rev = "5b73376721cf307101e22d7031c1f4b1344d1f63";
sha256 = "sha256-+2/CsgJ+rdDpCp+r5B/zys3PtFgtnu+ohTEUOtJNd1Y=";
};
buildInputs = with pkgs; [
sassc
bc
which
rendersvg
meson
ninja
nodePackages.sass
gtk4.dev
optipng
];
phases = [ "unpackPhase" "installPhase" ];
installPhase = ''
HOME=/build
chmod 777 -R .
patchShebangs .
mkdir -p $out/share/themes
mkdir bin
sed -e 's/handle-horz-.*//' -e 's/handle-vert-.*//' -i ./src/gtk-2.0/assets.txt
cat > /build/gtk-colors << EOF
BG=${scheme.colors.base00}
FG=${scheme.colors.base07}
HDR_BG=${scheme.colors.base00}
HDR_FG=${scheme.colors.base07}
SEL_BG=${scheme.colors.base03}
SEL_FG=${scheme.colors.base07}
TXT_BG=${scheme.colors.base01}
TXT_FG=${scheme.colors.base07}
BTN_BG=${scheme.colors.base01}
BTN_FG=${scheme.colors.base07}
HDR_BTN_BG=${scheme.colors.base01}
HDR_BTN_FG=${scheme.colors.base07}
MENU_BG=${scheme.colors.base00}
MENU_FG=${scheme.colors.base07}
ACCENT_BG=${scheme.colors.base0C}
ACCENT_FG=${scheme.colors.base00}
MATERIA_SURFACE=${scheme.colors.base01}
MATERIA_VIEW=${scheme.colors.base00}
WM_BORDER_FOCUS=${scheme.colors.base02}
WM_BORDER_UNFOCUS=${scheme.colors.base02}
UNITY_DEFAULT_LAUNCHER_STYLE=False
ROUNDNESS=7
NAME=${scheme.slug}
MATERIA_STYLE_COMPACT=True
nativeBuildInputs = with pkgs; [ gtk3 sassc ];
buildInputs = with pkgs; [ gnome-themes-extra ];
propagatedUserEnvPkgs = with pkgs; [ gtk-engine-murrine ];
preInstall = ''
mkdir -p $out/share/themes
cat > src/_sass/_color-palette-${scheme.slug}.scss << 'EOF'
$red-light: #${scheme.palette.low0F};
$red-dark: #${scheme.palette.high0F};
$pink-light: #${scheme.palette.low0E};
$pink-dark: #${scheme.palette.high0E};
$purple-light: #${scheme.palette.low0D};
$purple-dark: #${scheme.palette.high0D};
$blue-light: #${scheme.palette.low0C};
$blue-dark: #${scheme.palette.high0C};
$teal-light: #${scheme.palette.low0B};
$teal-dark: #${scheme.palette.high0B};
$green-light: #${scheme.palette.low0A};
$green-dark: #${scheme.palette.high0A};
$sea-light: #${scheme.palette.alt_low0B};
$sea-dark: #${scheme.palette.alt_high0B};
$yellow-light: #${scheme.palette.low09};
$yellow-dark: #${scheme.palette.low09};
$orange-light: #${scheme.palette.low08};
$orange-dark: #${scheme.palette.high08};
$grey-050: #${scheme.palette.base07};
$grey-100: #${scheme.palette.base07};
$grey-150: #${scheme.palette.base06};
$grey-200: #${scheme.palette.base06};
$grey-250: #${scheme.palette.base05};
$grey-300: #${scheme.palette.base05};
$grey-350: #${scheme.palette.base04};
$grey-400: #${scheme.palette.base04};
$grey-450: #${scheme.palette.base03};
$grey-500: #${scheme.palette.base03};
$grey-550: #${scheme.palette.base02};
$grey-600: #${scheme.palette.base02};
$grey-650: #${scheme.palette.base02};
$grey-700: #${scheme.palette.base01};
$grey-750: #${scheme.palette.base01};
$grey-800: #${scheme.palette.base01};
$grey-850: #${scheme.palette.base00};
$grey-900: #${scheme.palette.base00};
$grey-950: #${scheme.palette.base00};
$white: #${scheme.palette.base07};
$black: #${scheme.palette.base00};
$button-close: #${scheme.palette.base0F};
$button-max: #${scheme.palette.base0A};
$button-min: #${scheme.palette.base08};
EOF
echo "Changing colours:"
./change_color.sh -o ${scheme.slug} /build/gtk-colors -i False -t "$out/share/themes"
chmod 555 -R .
sed -i "/\@import/s/color-palette-default/color-palette-${scheme.slug}/" src/_sass/_tweaks.scss
sed -i "/\$colorscheme:/s/default/${scheme.slug}/" src/_sass/_tweaks.scss
'';
installPhase = ''
runHook preInstall
bash install.sh -d $out/share/themes \
-t default \
-n ${scheme.slug} \
-c ${scheme.variant} \
-s standard \
--tweaks primary \
--round ${scheme.palette.border-radius}px
runHook postInstall
'';
}

View File

@ -2,7 +2,7 @@
let
scheme = config.colorScheme;
colors = scheme.colors;
colors = scheme.palette;
dither =
"atkinson"; # none | floyd-steinberg | atkinson | jjn | burkes | sierra | sierra-lite
in pkgs.stdenv.mkDerivation rec {

View File

@ -1,39 +0,0 @@
{ inputs, lib, config, ... }:
with lib; {
options.homecfg = {
username = mkOption { type = types.str; };
wm = mkOption {
type = types.enum [ "Wayland" "X11" ];
default = "Wayland";
};
make = {
cli = mkOption {
type = types.bool;
default = true;
};
gui = mkOption {
type = types.bool;
default = false;
};
game = mkOption {
type = types.bool;
default = false;
};
power = mkOption {
type = types.bool;
default = false;
};
};
git = {
username = mkOption { type = types.str; };
email = mkOption { type = types.str; };
key = mkOption { type = types.str; };
};
};
imports = with inputs; [
nix-colors.homeManagerModules.default
../../shared/colors
];
}

View File

@ -1 +1 @@
{ ... }: { imports = [ ./dunst ./eww ./kanshi ./waybar ./waylock ./wofi ]; }
{ ... }: { imports = [ ./dunst ./eww ./kanshi ./waylock ./wofi ]; }

View File

@ -1,6 +1,6 @@
{ lib, config, pkgs, ... }: {
config = lib.mkIf (config.homecfg.wm == "Wayland") {
config = lib.mkIf (config.usercfg.wm == "Wayland") {
home.packages = with pkgs; [ libnotify ];
services.dunst = {
enable = true;
@ -9,25 +9,27 @@
global = {
follow = "mouse";
height = "200";
width = "400";
width = "350";
scale = "0";
origin = "top-right";
offset =
"${config.colorScheme.colors.gaps-bar}x${config.colorScheme.colors.gaps-screen}";
offset = "${
toString ((lib.strings.toInt config.colorScheme.palette.gaps-bar)
+ (lib.strings.toInt config.colorScheme.palette.gaps-screen))
}x${config.colorScheme.palette.gaps-screen}";
notification_limit = "0";
progress_bar = "true";
progress_bar_height = "10";
progress_bar_frame_width = "0";
progress_bar_min_width = "350";
progress_bar_max_width = "400";
progress_bar_frame_width = "1";
progress_bar_min_width = "150";
progress_bar_max_width = "350";
indicate_hidden = "yes";
transparency = "0";
separator_height = "2";
padding = "12";
horizontal_padding = "15";
text_icon_padding = "0";
frame_width = "2";
frame_color = "#${config.colorScheme.colors.base03}";
frame_width = "${config.colorScheme.palette.border-width}";
frame_color = "#${config.colorScheme.palette.base04}";
separator_color = "auto";
sort = "yes";
font = "IBM Plex Mono 14";
@ -57,7 +59,7 @@
always_run_script = "true";
title = "Dunst";
class = "Dunst";
corner_radius = "${config.colorScheme.colors.border-radius}";
corner_radius = "${config.colorScheme.palette.border-radius}";
ignore_dbusclose = "false";
layer = "top";
force_xwayland = "true";
@ -69,25 +71,25 @@
};
urgency_low = {
background = "#${config.colorScheme.colors.base00}";
foreground = "#${config.colorScheme.colors.base07}";
frame_color = "#${config.colorScheme.colors.base03}";
background = "#${config.colorScheme.palette.base01}";
foreground = "#${config.colorScheme.palette.base07}";
frame_color = "#${config.colorScheme.palette.base03}";
timeout = "3";
highlight = "#${config.colorScheme.colors.base0B}";
highlight = "#${config.colorScheme.palette.base0B}";
};
urgency_normal = {
background = "#${config.colorScheme.colors.base00}";
foreground = "#${config.colorScheme.colors.base07}";
frame_color = "#${config.colorScheme.colors.base03}";
background = "#${config.colorScheme.palette.base01}";
foreground = "#${config.colorScheme.palette.base07}";
frame_color = "#${config.colorScheme.palette.base04}";
timeout = "5";
highlight = "#${config.colorScheme.colors.base0C}";
highlight = "#${config.colorScheme.palette.base0C}";
};
urgency_critical = {
background = "#${config.colorScheme.colors.base00}";
foreground = "#${config.colorScheme.colors.base0F}";
frame_color = "#${config.colorScheme.colors.base03}";
background = "#${config.colorScheme.palette.base01}";
foreground = "#${config.colorScheme.palette.base0F}";
frame_color = "#${config.colorScheme.palette.base0F}";
timeout = "10";
highlight = "#${config.colorScheme.colors.base0E}";
highlight = "#${config.colorScheme.palette.base0E}";
};
};
};

View File

@ -17,7 +17,8 @@ calendar {
font-weight: bold;
}
.button {
label {
font-size: 20pt;
color: $base0C;
}
@ -35,9 +36,6 @@ calendar {
margin-top: -4pt;
}
.minute, .hour, .day, .month {
font-size: 20pt;
}
.date {
color: $base0C;
@ -47,5 +45,4 @@ calendar {
.datetime {
padding: $gaps-window;
}

View File

@ -23,15 +23,6 @@ color: $base0B;
margin: $gaps-window 0;
}
.icon-text {
padding: 5pt;
font-size: 5pt;
font-weight: 900;
}
.cpu-core-usage, .gpu-core-usage, .memory-usage {
background-color: $bg0;
border-radius: $border-radius;
@ -68,11 +59,11 @@ color: $base0B;
// @include window;
// background-color: $bg1;
// color: $fg;
// margin: $gaps-screen;
// padding: .5em;
}
// margin: $gaps-win;
padding: 5pt;
}
.sys-label {
.sys-label {
font-weight: bolder;
color: $base04;
}
}

View File

@ -0,0 +1,35 @@
.tray * {
padding: $border-width 0px;
}
.tray menu {
background-color: $base01;
color: $base07;
@include border-radius;
@include border-active;
padding: 10px 0px;
>menuitem {
margin: 2px $border-width;
padding: 0px 10px;
&:disabled label {
color: $base04;
}
&:hover {
background-color: $base0C;
}
}
separator {
background-color: $base03;
padding-top: 1px;
margin:10px 0px;
&:last-child {
padding: unset;
}
}
}

View File

@ -13,6 +13,8 @@
}
@mixin border-active {
border-width: $border-width;
border-style: solid;
border-color: $base04;
}
@ -41,24 +43,30 @@ tooltip {
.icon,
.icon label { font-family: Material Design Icons; }
.icon-text {
padding: 4pt;
font-size: 6pt;
font-weight: 900;
}
.grey {
background-color: $base02;
color: $base02;
}
.red {
background-color: $base0F;
color: $base0F;
}
.orange {
background-color: $base08;
color: $base08;
}
.green {
background-color: $base0B;
color: $base0B;
}
.blue {
background-color: $base0C;
color: $base0C;
}
/* WINDOW WRAPPER CSS */
@ -93,6 +101,9 @@ tooltip {
}
.modevent:hover {
@include border-active;
border-right-style: none;
border-bottom-right-radius: 0;
border-top-right-radius: 0;
}
.modinner {
@ -109,6 +120,7 @@ tooltip {
@import 'css/clock';
@import 'css/radio';
@import 'css/powermenu';
@import 'css/systray';
/* BAR */
@ -116,17 +128,3 @@ tooltip {
.bar label {
font-size: 1.2rem;
}
/* WORKSPACE */
.ws {
border-radius: $border-radius;
margin: $gaps-window;
}
.focused {
background-color: $bg1;
border-radius: 1rem;
margin: .3rem;
padding: .25rem;
}

View File

@ -2,6 +2,7 @@
(include "modules/sys.yuck")
(include "modules/net.yuck")
(include "modules/systray.yuck")
(include "modules/clock.yuck")
(include "windows/calendar.yuck")
@ -26,6 +27,7 @@
:valign "end"
(sys-mod)
(net-mod)
(systray-mod)
(clock-mod)))
(defwidget center []

View File

@ -5,28 +5,30 @@
(eventbox
:onhover "${EWW_CMD} update date_rev=true"
:onhoverlost "${EWW_CMD} update date_rev=false"
:onclick "(sleep 0.1 && ${EWW_CMD} open --toggle calendar)"
:onrightclick "(sleep 0.1 && ${EWW_CMD} open --toggle powermenu)"
(box
:class "datetime"
(overlay
(box
:orientation "v"
(button
:class "hour" hour)
(button
:class "minute" minute))
(label :show-truncated false
:class "hour"
:text {hour})
(label :show-truncated false
:class "minute"
:text {minute}))
(revealer
:reveal date_rev
(box
:class "date"
:orientation "v"
(button
:onclick "${EWW_CMD} open --toggle calendar"
:onrightclick "${EWW_CMD} open --toggle powermenu"
:class "day" day)
(button
:onclick "${EWW_CMD} open --toggle calendar"
:onrightclick "${EWW_CMD} open --toggle powermenu"
:class "month" month))
(label :show-truncated "false"
:class "day"
:text {day})
(label :show-truncated "false"
:class "month"
:text {month}))
)
)
)

View File

@ -6,23 +6,21 @@
(defwidget sys-mod []
(module
(button
:class "module"
:onclick "${EWW_CMD} open --toggle sys"
(eventbox
:onclick "(sleep 0.1 && ${EWW_CMD} open --toggle sys)"
(box
:orientation "v"
(circular-progress
:value {EWW_CPU.avg}
:class "cpubar"
:thickness 6
(label :class "icon-text" :text "C"))
(circular-progress
:value {gpu.devices[0].GRBM2?.CommandProcessor-Graphics?.value?:0}
:class "gpubar"
:thickness 6
(label :class "icon-text" :text "G"))
:orientation "v"
(circular-progress
:value {EWW_CPU.avg}
:class "cpubar"
:thickness 6
(label :class "icon-text" :text "C"))
(circular-progress
:value {gpu.devices[0].GRBM2?.CommandProcessor-Graphics?.value?:0}
:class "gpubar"
:thickness 6
(label :class "icon-text" :text "G"))
(circular-progress
:value {100*memory.used/memory.total}
:class "membar"
@ -36,6 +34,7 @@
:visible {battery.visible}
:style "color: ${battery.color};"
:thickness 6
:tooltip "${battery.status} @ ${battery.wattage}"
(label :class "icon-text" :text "B"))
)
)

View File

@ -0,0 +1,15 @@
(defwidget systray-mod []
(module
(box
:orientation "v"
(systray
:class "tray"
:space-evenly "true"
:orientation "v"
:icon-size 20
:prepend-new "false"
)
)
)
)

View File

@ -1,17 +1,23 @@
(deflisten workspace :initial '[]' "scripts/workspaces")
(defwidget workspace-mod []
(module
(eventbox
(module
(eventbox
:onscroll "echo {} | sed -e \"s/up/-1/g\" -e \"s/down/+1/g\" | xargs hyprctl dispatch workspace"
(box
:class "module workspaces"
:orientation "v"
(for ws in workspace
(button
:onclick "hyprctl dispatch workspace ${ws.number}"
:class "ws icon ${ws.color}"
; :tooltip {ws.tooltip}
(box
:class `${ws.focused ? "focused" : ""}`
:height 3)))))))
(box
:class "module workspaces"
:orientation "v"
(for ws in workspace
(button
:onclick "hyprctl dispatch workspace ${ws.number}"
(label
:show-truncated false
:class "icon-text ${ws.color}"
:text `${ws.focused ? "󰜗" : "󰝥"}`
)
)
)
)
)
)
)

View File

@ -1,4 +1,4 @@
#!/usr/bin/env bash
#!/usr/bin/env zsh
function get_time_ms {
date -u +%s%3N
@ -26,7 +26,8 @@ function gen_wifi() {
icon=${icons[$level]}
ip="-"
class="net-connected"
name=$(wpa_cli status | grep \^ssid= | sed 's/ssid=//g')
name_raw=$(wpa_cli status | grep \^ssid= | sed 's/ssid=//g')
name=$(printf "%s" $name_raw)
}
function gen_ethernet() {

View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash
function get_time_ms {
get_time_ms() {
date -u +%s%3N
}
@ -15,7 +15,7 @@ PID=$( [ -e "$MPV_PID_FILE" ] && cat "$MPV_PID_FILE" || echo 0 )
RADIO_ID=$( [ -e "$RADIO_ID_FILE" ] && cat "$RADIO_ID_FILE" || echo 0 )
RADIO_URL=""
INFO='{"id":null,"artist":null,"song":null,"image600":null}'
PAUSED=$(( $PID == 0 && $RADIO_ID > 0 ? 1 : 0 ))
PAUSED=$(( $PID == 0 || $RADIO_ID == 0 ? 1 : 0 ))
STATUS="{}"
get_radio() {

View File

@ -1,4 +1,4 @@
#!/usr/bin/env bash
#!/usr/bin/env zsh
icons=("󰂎" "󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹")
num_icons=$(awk -v n="${#icons[@]}" 'BEGIN{print 100 / n}')
@ -11,7 +11,7 @@ geticon() {
status() {
if [ "$STATE" = "Charging" ]; then
echo -n "charging"
echo -n "Charging"
if [ "$RATE" -gt 0 ]; then
echo ", $(gettime) left"
@ -21,7 +21,7 @@ status() {
elif [ "$STATE" = "Discharging" ]; then
echo "$(gettime)h left"
else
echo "fully charged"
echo "Fully Charged"
fi
}
@ -39,9 +39,9 @@ gettime() {
if [ "$RATE" -gt 0 ]; then
if [ "$STATE" = "Discharging" ]; then
EX="$NOW / $RATE"
EX=$(( ($NOW*1.0) / $RATE))
else
EX="($FULL - $NOW) / $RATE"
EX=$(( (($FULL - $NOW)*1.0) / $RATE))
fi
date -u -d@"$(awk -v ex="$EX" 'BEGIN{print ex * 3600}')" +%H:%M
fi

View File

@ -1 +1 @@
#!/usr/bin/env bash
#!/usr/bin/env zsh

View File

@ -1,3 +1,3 @@
#!/usr/bin/env bash
#!/usr/bin/env zsh
amdgpu_top -J -s 5000 | sed 's/ //g'

View File

@ -1,4 +1,4 @@
#!/usr/bin/env bash
#!/usr/bin/env zsh
total="$(free --si | rg Mem | awk '{print $2}')"

View File

@ -64,7 +64,7 @@ done
generate
# main loop
socat -u UNIX-CONNECT:/tmp/hypr/"$HYPRLAND_INSTANCE_SIGNATURE"/.socket2.sock - | rg --line-buffered "workspace|mon(itor)?" | while read -r line; do
socat -u UNIX-CONNECT:$XDG_RUNTIME_DIR/hypr/"$HYPRLAND_INSTANCE_SIGNATURE"/.socket2.sock - | rg --line-buffered "workspace|mon(itor)?" | while read -r line; do
case ${line%>>*} in
"workspace")
focusedws=${line#*>>}

View File

@ -100,8 +100,11 @@
(box
:orientation "v"
(button
:onclick "${EWW_CMD} open --toggle --no-daemonize radio"
(label :class "icon-text" :text "󰝚")
:onclick "(sleep 0.1 && ${EWW_CMD} open --toggle --no-daemonize radio)"
(label
:show-truncated false
:class "icon-text"
:text "󰝚")
)
)
)

View File

@ -101,14 +101,30 @@
(box
:class "sys-win"
:space-evenly false
:orientation "v"
(cpu-sys-win)
(box :class "spacer")
(box :class "spacer")
(gpu-sys-win)
(box :class "spacer")
(box :class "spacer")
(ram-sys-win)
:orientation "h"
(box
:space-evenly false
:orientation "v"
(cpu-sys-win)
(box :class "spacer")
(box :class "spacer")
(gpu-sys-win)
(box :class "spacer")
(box :class "spacer")
(ram-sys-win)
)
(box
:visible {battery.visible}
:height 200
(graph
:height 200
:value {battery.percentage}
:time-range "30min"
:min "0.0"
:max "100.0"
:dynamic true
)
)
)
)

View File

@ -1,7 +1,7 @@
{ lib, config, pkgs, ... }: {
config = lib.mkIf (config.homecfg.wm == "Wayland") {
home.packages = with pkgs; [ eww-wayland jaq ];
config = lib.mkIf (config.usercfg.wm == "Wayland") {
home.packages = with pkgs; [ eww jq jaq custom.amdgpu_top ];
xdg.configFile."eww" = {
source = lib.cleanSourceWith {
@ -16,22 +16,22 @@
# colors file
xdg.configFile."eww/css/_colors.scss".text = ''
$base00: #${config.colorScheme.colors.base00};
$base01: #${config.colorScheme.colors.base01};
$base02: #${config.colorScheme.colors.base02};
$base03: #${config.colorScheme.colors.base03};
$base04: #${config.colorScheme.colors.base04};
$base05: #${config.colorScheme.colors.base05};
$base06: #${config.colorScheme.colors.base06};
$base07: #${config.colorScheme.colors.base07};
$base08: #${config.colorScheme.colors.base08};
$base09: #${config.colorScheme.colors.base09};
$base0A: #${config.colorScheme.colors.base0A};
$base0B: #${config.colorScheme.colors.base0B};
$base0C: #${config.colorScheme.colors.base0C};
$base0D: #${config.colorScheme.colors.base0D};
$base0E: #${config.colorScheme.colors.base0E};
$base0F: #${config.colorScheme.colors.base0F};
$base00: #${config.colorScheme.palette.base00};
$base01: #${config.colorScheme.palette.base01};
$base02: #${config.colorScheme.palette.base02};
$base03: #${config.colorScheme.palette.base03};
$base04: #${config.colorScheme.palette.base04};
$base05: #${config.colorScheme.palette.base05};
$base06: #${config.colorScheme.palette.base06};
$base07: #${config.colorScheme.palette.base07};
$base08: #${config.colorScheme.palette.base08};
$base09: #${config.colorScheme.palette.base09};
$base0A: #${config.colorScheme.palette.base0A};
$base0B: #${config.colorScheme.palette.base0B};
$base0C: #${config.colorScheme.palette.base0C};
$base0D: #${config.colorScheme.palette.base0D};
$base0E: #${config.colorScheme.palette.base0E};
$base0F: #${config.colorScheme.palette.base0F};
$fg: $base07;
@ -40,11 +40,11 @@
$border-color: $base03;
$border-color-focus: $base04;
$border-radius: ${config.colorScheme.colors.border-radius}px;
$border-width: ${config.colorScheme.colors.border-width}px;
$border-radius: ${config.colorScheme.palette.border-radius}px;
$border-width: ${config.colorScheme.palette.border-width}px;
$gaps-screen: ${config.colorScheme.colors.gaps-screen}px;
$gaps-window: ${config.colorScheme.colors.gaps-window}px;
$gaps-screen: ${config.colorScheme.palette.gaps-screen}px;
$gaps-window: ${config.colorScheme.palette.gaps-window}px;
'';
};
}

View File

@ -1,93 +1,101 @@
{ ... }: {
{ config, lib, ... }: {
services.kanshi = {
enable = true;
systemdTarget = "graphical-session.target";
profiles = {
tower_0 = {
outputs = [{
criteria = "CEX CX133 0x00000001";
mode = "1920x1200@59.972";
position = "0,0";
scale = 1.0;
status = "enable";
}];
};
tower_1 = {
outputs = [{
criteria = "AOC 16G3 1DDP7HA000348";
mode = "1920x1080@144.000";
position = "0,0";
status = "enable";
scale = 1.0;
adaptiveSync = true;
}];
};
tower_2 = {
outputs = [
{
criteria = "AOC 16G3 1DDP7HA000348";
mode = "1920x1080@144.000";
position = "0,0";
status = "enable";
scale = 1.0;
adaptiveSync = true;
}
{
config = lib.mkIf (config.usercfg.wm == "Wayland") {
services.kanshi = {
enable = true;
systemdTarget = "graphical-session.target";
settings = [
{
profile.name = "tower_0";
profile.outputs = [{
criteria = "CEX CX133 0x00000001";
mode = "1920x1200@59.972";
position = "0,1080";
scale = 1.0;
status = "enable";
}
];
};
laptop_0 = {
outputs = [{
criteria = "LG Display 0x060A Unknown";
mode = "1920x1080@60.020";
position = "0,0";
scale = 1.0;
status = "enable";
}];
};
laptop_1 = {
outputs = [
{
criteria = "CEX CX133 0x00000001";
mode = "2560x1600@59.972";
position = "0,0";
scale = 1.0;
status = "enable";
}
{
criteria = "LG Display 0x060A Unknown";
mode = "1920x1080@60.020";
position = "2560,0";
scale = 1.0;
status = "enable";
}
];
};
laptop_2 = {
outputs = [
{
}];
}
{
profile.name = "tower_1";
profile.outputs = [{
criteria = "AOC 16G3 1DDP7HA000348";
mode = "1920x1080@144.000";
position = "0,0";
status = "enable";
scale = 1.0;
adaptiveSync = true;
}
{
}];
}
{
profile.name = "tower_2";
profile.outputs = [
{
criteria = "AOC 16G3 1DDP7HA000348";
mode = "1920x1080@144.000";
position = "0,0";
status = "enable";
scale = 1.0;
adaptiveSync = true;
}
{
criteria = "CEX CX133 0x00000001";
mode = "1920x1200@59.972";
position = "0,1080";
scale = 1.0;
status = "enable";
}
];
}
{
profile.name = "laptop_0";
profile.outputs = [{
criteria = "LG Display 0x060A Unknown";
mode = "1920x1080@60.020";
position = "1920,0";
position = "0,0";
scale = 1.0;
status = "enable";
}
];
};
}];
}
{
profile.name = "laptop_1";
profile.outputs = [
{
criteria = "CEX CX133 0x00000001";
mode = "2560x1600@59.972";
position = "0,0";
scale = 1.0;
status = "enable";
}
{
criteria = "LG Display 0x060A Unknown";
mode = "1920x1080@60.020";
position = "2560,0";
scale = 1.0;
status = "enable";
}
];
}
{
profile.name = "laptop_2";
profile.outputs = [
{
criteria = "AOC 16G3 1DDP7HA000348";
mode = "1920x1080@144.000";
position = "0,0";
status = "enable";
scale = 1.0;
adaptiveSync = true;
}
{
criteria = "LG Display 0x060A Unknown";
mode = "1920x1080@60.020";
position = "1920,0";
scale = 1.0;
status = "enable";
}
];
}
];
};
};
}

View File

@ -17,7 +17,7 @@ let
''
}/bin/waybar-${name}";
in {
config = lib.mkIf (config.homecfg.wm == "Wayland") {
config = lib.mkIf (config.usercfg.wm == "Wayland") {
home.packages = [ pkgs.custom.amdgpu_top pkgs.jq ];
@ -28,23 +28,23 @@ in {
style = ''
* {
border: none;
border-radius: ${config.colorScheme.colors.border-radius}pt;
border-radius: ${config.colorScheme.palette.border-radius}pt;
font-family:'Monospace','Material Design Icons','Openmoji';
font-size: 13pt;
color: #${config.colorScheme.colors.base07};
color: #${config.colorScheme.palette.base07};
}
window#waybar {
background: transparent;
padding-top: ${config.colorScheme.colors.gaps-screen}pt;
padding-bottom: ${config.colorScheme.colors.gaps-screen}pt;
padding-top: ${config.colorScheme.palette.gaps-screen}pt;
padding-bottom: ${config.colorScheme.palette.gaps-screen}pt;
}
tooltip {
background: #${config.colorScheme.colors.base01};
border-radius: ${config.colorScheme.colors.border-radius}pt;
border-color: #${config.colorScheme.colors.base03};
border-width: ${config.colorScheme.colors.border-width}pt;
background: #${config.colorScheme.palette.base01};
border-radius: ${config.colorScheme.palette.border-radius}pt;
border-color: #${config.colorScheme.palette.base03};
border-width: ${config.colorScheme.palette.border-width}pt;
border-style: solid;
font-size: 13pt;
}
@ -64,19 +64,19 @@ in {
}
#workspaces button.focused {
color: #${config.colorScheme.colors.base0C};
color: #${config.colorScheme.palette.base0C};
}
#workspaces button.active {
color: #${config.colorScheme.colors.base0C};
color: #${config.colorScheme.palette.base0C};
}
#workspaces button.urgent {
color: #${config.colorScheme.colors.base08};
color: #${config.colorScheme.palette.base08};
}
#workspaces button:hover icon {
color: #${config.colorScheme.colors.base04};
color: #${config.colorScheme.palette.base04};
}
#workspaces,
@ -88,16 +88,16 @@ in {
#custom-powermenu,
#clock, #clock.date, #clock.time
{
background: #${config.colorScheme.colors.base01};
margin-bottom: ${config.colorScheme.colors.gaps-window}pt;
background: #${config.colorScheme.palette.base01};
margin-bottom: ${config.colorScheme.palette.gaps-window}pt;
padding-top: 2px;
padding-left: 2px;
padding-bottom: 2px;
border-top-right-radius: 0px;
border-bottom-right-radius: 0px;
border-top: ${config.colorScheme.colors.border-width}px solid #${config.colorScheme.colors.base03};
border-left: ${config.colorScheme.colors.border-width}px solid #${config.colorScheme.colors.base03};
border-bottom: ${config.colorScheme.colors.border-width}px solid #${config.colorScheme.colors.base03};
border-top: ${config.colorScheme.palette.border-width}px solid #${config.colorScheme.palette.base03};
border-left: ${config.colorScheme.palette.border-width}px solid #${config.colorScheme.palette.base03};
border-bottom: ${config.colorScheme.palette.border-width}px solid #${config.colorScheme.palette.base03};
}
#custom-powermenu {

View File

@ -1,10 +1,12 @@
{ lib, pkgs, config, ... }: {
config = lib.mkIf (config.homecfg.wm == "Wayland") {
config = lib.mkIf (config.usercfg.wm == "Wayland") {
home.packages = with pkgs; [ swayidle swaylock-effects ];
xdg.configFile."swaylock/config".text = ''
screenshots
grace-no-mouse
grace-no-touch
grace=5
effect-pixelate=5
fade-in=0.2
@ -12,97 +14,43 @@
ignore-empty-password
font=IBM Plex Mono
color=${config.colorscheme.colors.base00}00
color=${config.colorScheme.palette.base00}00
indicator-radius=100
indicator-thickness=30
separator-color=${config.colorscheme.colors.base00}00
separator-color=${config.colorScheme.palette.base00}00
inside-color=${config.colorscheme.colors.base0C}00
inside-clear-color=${config.colorscheme.colors.base08}FF
inside-caps-lock-color=${config.colorscheme.colors.base09}00
inside-ver-color=${config.colorscheme.colors.base0C}FF
inside-wrong-color=${config.colorscheme.colors.base0F}FF
inside-color=${config.colorScheme.palette.base0C}00
inside-clear-color=${config.colorScheme.palette.base08}FF
inside-caps-lock-color=${config.colorScheme.palette.base09}00
inside-ver-color=${config.colorScheme.palette.base0C}FF
inside-wrong-color=${config.colorScheme.palette.base0F}FF
ring-color=${config.colorscheme.colors.base00}00
ring-clear-color=${config.colorscheme.colors.base00}00
ring-caps-lock-color=${config.colorscheme.colors.base00}00
ring-ver-color=${config.colorscheme.colors.base00}00
ring-wrong-color=${config.colorscheme.colors.base00}00
ring-color=${config.colorScheme.palette.base00}00
ring-clear-color=${config.colorScheme.palette.base00}00
ring-caps-lock-color=${config.colorScheme.palette.base00}00
ring-ver-color=${config.colorScheme.palette.base00}00
ring-wrong-color=${config.colorScheme.palette.base00}00
line-color=${config.colorscheme.colors.base00}00
line-clear-color=${config.colorscheme.colors.base00}00
line-caps-lock-color=${config.colorscheme.colors.base00}00
line-ver-color=${config.colorscheme.colors.base00}00
line-wrong-color=${config.colorscheme.colors.base00}00
line-color=${config.colorScheme.palette.base00}00
line-clear-color=${config.colorScheme.palette.base00}00
line-caps-lock-color=${config.colorScheme.palette.base00}00
line-ver-color=${config.colorScheme.palette.base00}00
line-wrong-color=${config.colorScheme.palette.base00}00
text-color=${config.colorscheme.colors.base00}00
text-clear-color=${config.colorscheme.colors.base00}00
text-caps-lock-color=${config.colorscheme.colors.base00}00
text-ver-color=${config.colorscheme.colors.base00}00
text-wrong-color=${config.colorscheme.colors.base00}00
text-color=${config.colorScheme.palette.base00}00
text-clear-color=${config.colorScheme.palette.base00}00
text-caps-lock-color=${config.colorScheme.palette.base00}00
text-ver-color=${config.colorScheme.palette.base00}00
text-wrong-color=${config.colorScheme.palette.base00}00
key-hl-color=${config.colorscheme.colors.base0C}FF
bs-hl-color=${config.colorscheme.colors.base08}FF
caps-lock-key-hl-color=${config.colorscheme.colors.base09}FF
caps-lock-bs-hl-color=${config.colorscheme.colors.base09}FF
'';
xdg.configFile."wlogout/style.css".text = ''
window {
font-family: Material Design Icons;
font-size: 64pt;
color: #${config.colorscheme.colors.base07};
background-color: alpha(#${config.colorscheme.colors.base00},0.6);
}
button {
border-radius:${config.colorscheme.colors.border-radius}px;
border-width: ${config.colorscheme.colors.border-width}px;
border-style: solid;
border-color: #${config.colorscheme.colors.base04};
color: #${config.colorscheme.colors.base07};
padding: 20px;
background-color: alpha(#${config.colorscheme.colors.base00},0.8);
transition: box-shadow 0.2s ease-in-out, background-color 0.2s ease-in-out;
}
button:hover {
background-color: alpha(#${config.colorscheme.colors.base02},0.8);
}
button:focus {
background-color: alpha(#${config.colorscheme.colors.base02},1.0);
border-radius:${config.colorscheme.colors.border-radius}px;
border-width: ${config.colorscheme.colors.border-width}px;
border-color: #${config.colorscheme.colors.base04};
border-style: solid;
}
'';
xdg.configFile."wlogout/layout".text = ''
{
"label" : "lock",
"action" : "swaylock",
"text" : "󰌾",
"keybind" : "l"
}
{
"label" : "reboot",
"action" : "systemctl reboot",
"text" : "󰜉",
"keybind" : "r"
}
{
"label" : "shutdown",
"action" : "systemctl poweroff",
"text" : "󰐥",
"keybind" : "s"
}
key-hl-color=${config.colorScheme.palette.base0C}FF
bs-hl-color=${config.colorScheme.palette.base08}FF
caps-lock-key-hl-color=${config.colorScheme.palette.base09}FF
caps-lock-bs-hl-color=${config.colorScheme.palette.base09}FF
'';
};
}

View File

@ -1,6 +1,6 @@
{ lib, config, pkgs, ... }: {
config = lib.mkIf (config.homecfg.wm == "Wayland") {
config = lib.mkIf (config.usercfg.wm == "Wayland") {
home.packages = with pkgs; [ wofi ];
xdg.configFile."wofi/config".text = ''
width=280
@ -23,8 +23,8 @@
xdg.configFile."wofi/style.css".text = ''
window {
margin: 0px;
border-radius: ${config.colorscheme.colors.border-radius}px;
background-color: #${config.colorscheme.colors.base00};
border-radius: ${config.colorScheme.palette.border-radius}px;
background-color: #${config.colorScheme.palette.base00};
}
#input {
@ -33,14 +33,14 @@
padding: 4px 10px;
margin: 4px;
border: none;
color: #${config.colorscheme.colors.base07};
color: #${config.colorScheme.palette.base07};
font-weight: bold;
background-color: #${config.colorscheme.colors.base01};
outline: #${config.colorscheme.colors.base04};
background-color: #${config.colorScheme.palette.base01};
outline: #${config.colorScheme.palette.base04};
}
#input:selected {
color: #${config.colorscheme.colors.base0C};
color: #${config.colorScheme.palette.base0C};
}
#inner-box {
@ -51,19 +51,19 @@
#outer-box {
margin: 0px;
padding: 3px;
border-radius: ${config.colorscheme.colors.border-radius}px;
border-width: ${config.colorscheme.colors.border-width}px;
border-color: #${config.colorscheme.colors.base04};
border-radius: ${config.colorScheme.palette.border-radius}px;
border-width: ${config.colorScheme.palette.border-width}px;
border-color: #${config.colorScheme.palette.base04};
border-style: solid;
}
#text:selected {
color: #${config.colorscheme.colors.base00};
color: #${config.colorScheme.palette.base00};
background-color: transparent;
}
#entry:selected {
background-color: #${config.colorscheme.colors.base07};
background-color: #${config.colorScheme.palette.base07};
}
'';
};

View File

@ -11,7 +11,7 @@ let
'';
};
in {
config = lib.mkIf (config.homecfg.wm == "Wayland") {
config = lib.mkIf (config.usercfg.wm == "Wayland") {
home.packages = with pkgs; [
dbus-hyprland-environment
@ -29,7 +29,7 @@ in {
glib
brillo
brightnessctl
swww
];
@ -42,6 +42,8 @@ in {
[ "discord-402572971681644545.desktop" ];
"x-scheme-handler/discord-696343075731144724" =
[ "discord-696343075731144724.desktop" ];
"x-scheme-handler/tg" = [ "org.telegram.desktop.desktop" ];
"x-scheme-handler/tonsite" = [ "org.telegram.desktop.desktop" ];
"x-scheme-handler/http" = [ "firefox.desktop" ];
"x-scheme-handler/https" = [ "firefox.desktop" ];
"x-scheme-handler/chrome" = [ "firefox.desktop" ];

View File

@ -1,11 +1,12 @@
{ lib, config, pkgs, ... }: {
config = lib.mkIf (config.homecfg.wm == "Wayland") {
config = lib.mkIf (config.usercfg.wm == "Wayland") {
wayland.windowManager.hyprland = {
enable = true;
xwayland.enable = true;
extraConfig = ''
monitor=,preferred,auto,auto
env=bitdepth,10
input {
kb_layout = us, ru
kb_variant = intl, phonetic
@ -13,7 +14,7 @@
follow_mouse = 1
sensitivity = 0 # -0.5 # -1.0 - 1.0, 0 means no modification.
sensitivity = 0
touchpad {
natural_scroll=no
@ -33,18 +34,18 @@
}
general {
gaps_in = ${config.colorScheme.colors.gaps-window}
gaps_out = ${config.colorScheme.colors.gaps-screen}
border_size = ${config.colorScheme.colors.border-width}
gaps_in = ${config.colorScheme.palette.gaps-window}
gaps_out = ${config.colorScheme.palette.gaps-screen}
border_size = ${config.colorScheme.palette.border-width}
col.active_border = rgb(${config.colorScheme.colors.base04})
col.inactive_border = rgb(${config.colorScheme.colors.base03})
col.active_border = rgb(${config.colorScheme.palette.base04})
col.inactive_border = rgb(${config.colorScheme.palette.base03})
layout = dwindle
}
decoration {
rounding = ${config.colorScheme.colors.border-radius}
rounding = ${config.colorScheme.palette.border-radius}
blur {
enabled = true
@ -60,10 +61,10 @@
fullscreen_opacity = 1.0
# shadow
drop_shadow = no
shadow_range = 60
shadow_offset = 0 5
shadow_render_power = 4
# drop_shadow = no
# shadow_range = 60
# shadow_offset = 0 5
# shadow_render_power = 4
#col.shadow = rgba(00000099)
}
@ -85,7 +86,7 @@
}
master {
new_is_master = true
new_status = master
}
gestures {
@ -117,8 +118,6 @@
windowrule = float, title:^(Volume Control)$
windowrule = float, title:^(Picture-in-Picture)$
windowrule = float, title:^(Steam)$
windowrule = fullscreen, title:^(wlogout)$
windowrule = float, title:^(wlogout)$
windowrulev2 = workspace 2 silent, class:^(org.telegram.desktop)$
windowrulev2 = workspace 2 silent, class:^(discord)$
@ -139,14 +138,19 @@
windowrulev2 = float,title:^(File Operation Progress)$
windowrulev2 = float,class:^(firefox)$,title:^(Picture-in-Picture)$
windowrulev2 = pin,class:^(firefox)$,title:^(Picture-in-Picture)$
windowrulev2 = nofullscreenrequest,class:^(firefox)$,title:^(Picture-in-Picture)$
windowrulev2 = suppressevent fullscreen,class:^(firefox)$,title:^(Picture-in-Picture)$
windowrulev2 = float,class:^(firefox)$,title:^(Firefox Sharing Indicator)$
windowrulev2 = nofullscreenrequest,class:^(firefox)$,title:^(Firefox Sharing Indicator)$
windowrulev2 = suppressevent fullscreen,class:^(firefox)$,title:^(Firefox Sharing Indicator)$
windowrulev2 = float,class:^(firefox)$,title:^(Extension:.* Mozilla Firefox)$
windowrulev2 = nofullscreenrequest,class:^(firefox)$,title:^(Extension:.* Mozilla Firefox)$
windowrulev2 = suppressevent fullscreen,class:^(firefox)$,title:^(Extension:.* Mozilla Firefox)$
windowrulev2 = float,class:^(org.telegram.desktop)$,title:^(Media viewer)$
windowrulev2 = center,class:^(org.telegram.desktop)$,title:^(Media viewer)$
#SPECIAL NO SLEEP
windowrulev2 = idleinhibit fullscreen, class:^(.*)
windowrulev2 = idleinhibit focus, class:^(steam_app_.*)$
windowrulev2 = idleinhibit focus, class:^(mpv)$
layerrule = blur,^(eww-blur)
#binds
@ -204,8 +208,8 @@
bind = , XF86AudioRaiseVolume, exec, amixer -q sset 'Master' 5%+
bind = , XF86AudioLowerVolume, exec, amixer -q sset 'Master' 5%-
bind = , XF86AudioMute, exec, amixer -q sset 'Master' toggle
bind = , XF86MonBrightnessUp, exec, brillo -A 5
bind = , XF86MonBrightnessDown, exec, brillo -U 5
bind = , XF86MonBrightnessUp, exec, brightnessctl s 5%+
bind = , XF86MonBrightnessDown, exec, brightnessctl s 5%-
exec-once = [workspace special silent] kitty --title flying_kitty
exec-once = sh ~/.config/startup.sh

View File

@ -1,6 +1,6 @@
{ lib, config, pkgs, ... }: {
imports = [ ./config.nix ];
config = lib.mkIf (config.homecfg.wm == "Wayland") {
config = lib.mkIf (config.usercfg.wm == "Wayland") {
wayland.windowManager.hyprland = { enable = true; };
};
}

View File

@ -1,5 +1,5 @@
{ lib, config, ... }: {
config = lib.mkIf (config.homecfg.wm == "X11") {
config = lib.mkIf (config.usercfg.wm == "X11") {
xsession.windowManager.bspwm.extraConfig = ''
#! /bin/bash

View File

@ -2,7 +2,7 @@
imports = [ ./config.nix ./script.nix ./xressources.nix ];
config = lib.mkIf (config.homecfg.wm == "X11") {
config = lib.mkIf (config.usercfg.wm == "X11") {
xsession.windowManager.bspwm = { enable = true; };
services.sxhkd = { enable = true; };
home.packages = with pkgs; [ xrandr arandr flameshot xtrlock i3lock ];

View File

@ -1,5 +1,5 @@
{ lib, config, ... }: {
config = lib.mkIf (config.homecfg.wm == "X11") {
config = lib.mkIf (config.usercfg.wm == "X11") {
xdg.configFile."script/lock.sh".text = ''
#!/bin/bash
TMPBG=/tmp/screen.png

View File

@ -1,29 +1,29 @@
{ lib, config, ... }: {
config = lib.mkIf (config.homecfg.wm == "X11") {
config = lib.mkIf (config.usercfg.wm == "X11") {
xresources.extraConfig = ''
#define white #ffffff
#define black #000000
#define cFG #${config.colorScheme.colors.base07}
#define cBG #${config.colorScheme.colors.base00}
#define cP #${config.colorScheme.colors.base07}
#define cH #${config.colorScheme.colors.base0C}
#define c0 #${config.colorScheme.colors.base00}
#define c1 #${config.colorScheme.colors.base01}
#define c2 #${config.colorScheme.colors.base02}
#define c3 #${config.colorScheme.colors.base03}
#define c4 #${config.colorScheme.colors.base04}
#define c5 #${config.colorScheme.colors.base05}
#define c6 #${config.colorScheme.colors.base06}
#define c7 #${config.colorScheme.colors.base07}
#define c8 #${config.colorScheme.colors.base08}
#define c9 #${config.colorScheme.colors.base09}
#define cA #${config.colorScheme.colors.base0A}
#define cB #${config.colorScheme.colors.base0B}
#define cC #${config.colorScheme.colors.base0C}
#define cD #${config.colorScheme.colors.base0D}
#define cE #${config.colorScheme.colors.base0E}
#define cF #${config.colorScheme.colors.base0F}
#define cFG #${config.colorScheme.palette.base07}
#define cBG #${config.colorScheme.palette.base00}
#define cP #${config.colorScheme.palette.base07}
#define cH #${config.colorScheme.palette.base0C}
#define c0 #${config.colorScheme.palette.base00}
#define c1 #${config.colorScheme.palette.base01}
#define c2 #${config.colorScheme.palette.base02}
#define c3 #${config.colorScheme.palette.base03}
#define c4 #${config.colorScheme.palette.base04}
#define c5 #${config.colorScheme.palette.base05}
#define c6 #${config.colorScheme.palette.base06}
#define c7 #${config.colorScheme.palette.base07}
#define c8 #${config.colorScheme.palette.base08}
#define c9 #${config.colorScheme.palette.base09}
#define cA #${config.colorScheme.palette.base0A}
#define cB #${config.colorScheme.palette.base0B}
#define cC #${config.colorScheme.palette.base0C}
#define cD #${config.colorScheme.palette.base0D}
#define cE #${config.colorScheme.palette.base0E}
#define cF #${config.colorScheme.palette.base0F}
Xft.dpi: 96

View File

@ -1 +1 @@
{ ... }: { imports = [ ./cli ./gui ./hostcfg ./system ./tools ./users ]; }
{ ... }: { imports = [ ./cli ./gui ./system ./tools ./users ]; }

View File

@ -1,18 +1,18 @@
{ lib, config, pkgs, ... }:
let cfg = config.hostcfg.make.gui;
let cfg = config.syscfg.make.gui;
in {
config = lib.mkIf cfg {
sound.enable = true;
hardware.pulseaudio.enable = false;
# sound.enable = true;
security.rtkit.enable = true;
services.pulseaudio.enable = false; #25.05 change to services
services.pipewire = {
enable = true;
alsa.enable = true;
alsa.support32Bit = true;
pulse.enable = true;
wireplumber.enable = true;
# wireplumber.enable = true;
};
environment.systemPackages = with pkgs; [ easyeffects ];
environment.systemPackages = with pkgs; [ easyeffects alsa-utils ];
};
}

View File

@ -1,5 +1,5 @@
{ lib, config, pkgs, ... }:
let cfg = config.hostcfg.make.game;
let cfg = config.syscfg.make.game;
in {
config = lib.mkIf cfg {
programs.steam = {

View File

@ -1,14 +1,12 @@
{ lib, config, pkgs, ... }:
let cfg = config.hostcfg.make.gui;
in {
config = lib.mkIf cfg {
{ lib, config, pkgs, ... }: {
config = lib.mkIf (config.syscfg.make.gui) {
services.greetd = {
enable = true;
settings = rec {
initial_session = {
command = "zsh";
user = "${config.hostcfg.username}";
user = "${config.syscfg.defaultUser}";
};
default_session = initial_session;
};

View File

@ -1,12 +1,13 @@
{ lib, config, pkgs, ... }:
let cfg = config.hostcfg.make.gui;
in {
config = lib.mkIf cfg {
{ lib, config, pkgs, ... }: {
config = lib.mkIf (config.syscfg.make.gui) {
programs.xwayland.enable = true;
services.xserver = {
enable = true;
videoDrivers = [ "amd" ];
layout = "us";
xkbVariant = "intl";
xkb = {
layout = "us";
variant = "intl";
};
excludePackages = [ pkgs.xterm ];
exportConfiguration = true;
# libinput.touchpad.tapping = false;

View File

@ -1,44 +0,0 @@
{ lib, config, ... }:
with lib; {
options.hostcfg = {
hostname = mkOption { type = types.str; };
username = mkOption { type = types.str; };
make = {
cli = mkOption {
type = types.bool;
default = true;
};
gui = mkOption {
type = types.bool;
default = false;
};
virt = mkOption {
type = types.bool;
default = true;
};
power = mkOption {
type = types.bool;
default = false;
};
game = mkOption {
type = types.bool;
default = false;
};
};
net = {
wlp = {
enable = mkOption { type = types.bool; };
nif = mkOption { type = types.str; };
};
wg = {
enable = mkOption {
type = types.bool;
default = true;
};
ip4 = mkOption { type = types.str; };
ip6 = mkOption { type = types.str; };
pk = mkOption { type = types.str; };
};
};
};
}

View File

@ -3,7 +3,7 @@
fonts = {
enableDefaultPackages = false;
fontDir.enable = true;
#fonts = with pkgs; [
packages = with pkgs; [
ibm-plex
lmmath
@ -25,7 +25,6 @@
};
hinting.style = "medium";
# hinting.style = "hintfull";
};
};
}

View File

@ -1,12 +1,16 @@
{ ... }: {
boot.loader = {
systemd-boot = {
enable = true;
configurationLimit = 8;
};
efi = {
canTouchEfiVariables = true;
efiSysMountPoint = "/boot/efi";
{ lib, config, ... }:
let isSANDBOX = builtins.elem config.syscfg.hostname [ "sandbox" ];
in {
config = lib.mkIf (!isSANDBOX) {
boot.loader = {
systemd-boot = {
enable = true;
configurationLimit = 8;
};
efi = {
canTouchEfiVariables = true;
efiSysMountPoint = "/boot/efi";
};
};
};
}

View File

@ -1 +1 @@
{ ... }: { imports = [ ./base ./boot ./fs ./opengl ./power ./udev ./virt ]; }
{ ... }: { imports = [ ./base ./boot ./fs ./graphics ./power ./udev ./virt ]; }

View File

@ -1,6 +1,6 @@
{ pkgs, ... }: {
services.fstrim.enable = true;
services.gvfs.enable = true;
services.fstrim.enable = true; # Improves SSD life
services.gvfs.enable = true; # User Mounted FS
environment.systemPackages = with pkgs; [ gvfs nfs-utils ];
environment.systemPackages = with pkgs; [ nfs-utils ];
}

View File

@ -0,0 +1,4 @@
{ ... }: {
hardware.graphics.enable = true;
hardware.graphics.enable32Bit = true;
}

View File

@ -1,5 +0,0 @@
{ ... }: {
hardware.opengl.enable = true;
hardware.opengl.driSupport = true;
hardware.opengl.driSupport32Bit = true;
}

View File

@ -1,7 +1,5 @@
{ lib, config, pkgs, ... }:
let cfg = config.hostcfg.make.power;
in {
config = lib.mkIf cfg {
{ lib, config, pkgs, ... }: {
config = lib.mkIf (config.syscfg.make.power) {
services.tlp = {
enable = true;
settings = {
@ -9,8 +7,24 @@ in {
STOP_CHARGE_THRESH_BAT0 = 90;
CPU_SCALING_GOVERNOR_ON_AC = "performance";
CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
MEM_SLEEP_ON_BAT = "deep";
};
};
powerManagement.enable = true;
# suspend to RAM (deep) rather than `s2idle`
boot.kernelParams = [ "mem_sleep_default=deep" ];
# suspend-then-hibernate
systemd.sleep.extraConfig = ''
HibernateDelaySec=30m
SuspendState=mem
'';
services.logind.lidSwitch = "suspend-then-hibernate";
# Hibernate on power button pressed
services.logind.powerKey = "hibernate";
services.logind.powerKeyLongPress = "poweroff";
systemd.user.services.battery_monitor = {
wants = [ "display-manager.service" ];

View File

@ -1,13 +1,16 @@
{ ... }: {
systemd.services.systemd-udevd.restartIfChanged = false;
services.udev.extraRules = ''
SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="0127", GROUP="plugdev", TAG+="uaccess"
SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="0118", GROUP="plugdev", TAG+="uaccess"
SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="0106", GROUP="plugdev", TAG+="uaccess"
SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="0128", GROUP="plugdev", TAG+="uaccess"
SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="010a", GROUP="plugdev", TAG+="uaccess"
SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="0102", GROUP="plugdev", TAG+="uaccess"
SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="0313", GROUP="plugdev", TAG+="uaccess"
'';
services.udev = {
packages = [ ];
extraRules = ''
SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="0127", GROUP="plugdev", TAG+="uaccess"
SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="0118", GROUP="plugdev", TAG+="uaccess"
SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="0106", GROUP="plugdev", TAG+="uaccess"
SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="0128", GROUP="plugdev", TAG+="uaccess"
SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="010a", GROUP="plugdev", TAG+="uaccess"
SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="0102", GROUP="plugdev", TAG+="uaccess"
SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="0313", GROUP="plugdev", TAG+="uaccess"
'';
};
}

View File

@ -1,16 +1,19 @@
{ lib, config, ... }:
let cfg = config.hostcfg.make.virt;
in {
config = lib.mkIf cfg {
{ lib, config, pkgs, ... }: {
config = lib.mkIf (config.syscfg.make.virt) {
#environment.systemPackages = [ pkgs.qemu ];
virtualisation = {
# libvirtd.enable = true;
#libvirtd.enable = true;
# waydroid.enable = true;
# lxd.enable = true;
docker = {
docker.enable = false;
podman = {
enable = true;
rootless = {
enable = true;
setSocketVariable = true;
dockerSocket.enable = true;
dockerCompat = true;
defaultNetwork.settings = {
dnsname.enable = true;
internal = true;
name = "internal";
};
};
};

View File

@ -1,6 +1,6 @@
{ config, ... }: {
networking = {
hostName = config.hostcfg.hostname;
hostName = config.syscfg.hostname;
useDHCP = true;
nameservers = [ "1.1.1.1" "9.9.9.9" ];

View File

@ -1,7 +1,7 @@
{ pkgs, ... }: {
hardware.bluetooth.enable = true;
hardware.brillo.enable = true;
services.blueman.enable = true;
environment.systemPackages = with pkgs; [ bluez bluez-tools ];
{ config, lib, pkgs, ... }: {
config = lib.mkIf (config.syscfg.net.ble.enable) {
hardware.bluetooth.enable = true;
services.blueman.enable = true;
environment.systemPackages = with pkgs; [ bluez bluez-tools ];
};
}

View File

@ -1,9 +1,7 @@
{ lib, config, ... }:
let cfg = config.hostcfg.net.wlp;
in {
config = lib.mkIf cfg.enable {
{ lib, config, ... }: {
config = lib.mkIf (config.syscfg.net.wlp.enable) {
networking.supplicant = {
"${cfg.nif}" = {
"${config.syscfg.net.wlp.nif}" = {
configFile.path = config.sops.secrets.wifi.path;
extraConf = ''
network={

View File

@ -1,17 +1,21 @@
{ config, ... }: {
networking.wireguard = {
enable = true;
interfaces = {
wg0 = {
ips = [ config.hostcfg.net.wg.ip4 config.hostcfg.net.wg.ip6 ];
privateKeyFile = config.hostcfg.net.wg.pk;
listenPort = 1515;
peers = [{
allowedIPs = [ "10.10.1.0/24" "fd10:10:10::0/64" ];
endpoint = "vpn.helcel.net:1515";
publicKey = "NFBJvYXZC+bd62jhrKnM7/pugidWhgR6+C5qIiUiq3Q=";
persistentKeepalive = 30;
}];
{ config, lib, ... }: {
config = lib.mkIf (config.syscfg.net.wg.enable) {
networking.wireguard = {
enable = true;
interfaces = {
wg0 = {
ips = [ config.syscfg.net.wg.ip4 config.syscfg.net.wg.ip6 ];
privateKeyFile =
config.sops.secrets."${config.syscfg.hostname}_wg_priv".path;
listenPort = 1515;
mtu = 1340;
peers = [{
allowedIPs = [ "10.10.1.0/24" "fd10:10:10::0/64" ];
endpoint = "vpn.helcel.net:1515";
publicKey = "NFBJvYXZC+bd62jhrKnM7/pugidWhgR6+C5qIiUiq3Q=";
persistentKeepalive = 30;
}];
};
};
};
};

View File

@ -1,15 +1,16 @@
{ pkgs, ... }: {
{ inputs, pkgs, ... }: {
nixpkgs.config = {
permittedInsecurePackages = [ ];
allowUnfree = true;
android_sdk.accept_license = true;
packageOverrides = pkgs: rec {
custom = import ../../../../packages { inherit pkgs; };
};
};
nixpkgs.overlays = import ../../../../overlays { inherit pkgs; };
nixpkgs.overlays = import ../../../../overlays { inherit inputs pkgs; };
nix = {
package = pkgs.nixFlakes;
package = pkgs.nixVersions.stable;
extraOptions = ''
experimental-features = nix-command flakes
warn-dirty = false
@ -24,13 +25,17 @@
settings = {
auto-optimise-store = true;
builders-use-substitutes = true;
substituters =
[ "https://hyprland.cachix.org" "https://cache.nixos.org" ];
substituters = [
"https://hyprland.cachix.org"
"https://cache.nixos.org"
"https://helcel.cachix.org"
];
trusted-public-keys = [
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
"helcel.cachix.org-1:95s8D+N2xIHwzmkuu7jMUp9t3rtN4EimafR73jO7GLg="
];
};
};
system.stateVersion = "23.11";
system.stateVersion = "24.11";
}

View File

@ -1 +1 @@
{ ... }: { imports = [ ./gpg ./polkit ./sops ./ssh ]; }
{ ... }: { imports = [ ./gpg ./polkit ./ssh ]; }

View File

@ -1,93 +0,0 @@
valinor_ssh_priv: ENC[AES256_GCM,data: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,iv:pTQbb6nLHJ8BXTIYdiSe4vc5+1hpNuHhQhDkIAsZ9HI=,tag:jyO99VXSsCQlQD+Hh+gtvg==,type:str]
valinor_ssh_pub: ENC[AES256_GCM,data:c9s+tEjn+aZAjsxU7+dWmKLVc3dFdtna3ilDJrEb4k9TToyYY5VYEW6exxpbBl6MMAe98/KXgLPI5kTmq3gCqQe2dBnOB3C4f212DOmVyoYGj4AiqzU+Oo0pfg6DRw5BCjYGY7B+zJopqQgDvlIRTdJzAhQe3ZRuJFXKupVpJ+pEx56bo/memAf+BBZgIXChFrYadqze90rMmlw0D5V3L3lmTnqjoniXTXj5QoHh2f873qFAQ72+fSNlJCkasNavSiXKWVPcS3xMmgfiaffkqdO6pte1m/IgevKkKfciIOBbKskgsTZdy9iPGdELLH1wMzO45+vX3h2ATy/v5Hqq/yWlrDbvFFUKoaCb6n7/5O3MhaLwa78Uk09Dvbno2Wb8C5BBZlXBZ/BSooosDFUG/2IG8nKM+FrHJvtwgugCGa3ZQYKQr6iJ9g6tN83YRTEgKTCsZPnSNg+vXSBAib5ABHl8z7oHVB2hJFBnEn7Im99b/GRsCRD+/y9Y+4wF8nzznJgSrqInM59//EJHmwOWrHzSIpyV+cY67cCUXlkYB/ufx510XtEjijr2SOJXKmdAmme0EICkP/LY80Yrsoz2ee/A6w6ZP3HDHuxUVNeGNJvdoFhIyt9pEiRBwl7K2XKYCh/lRiE6E19EM6SmwplEM0+uAWTY+NUKZba2JSqFZLMlBFfWSLHgOHFLPatkZRUTkoNa4BOhtUlAYfuN/uHHimnL7H4O814OnjU5exqHca63VkDDhA==,iv:YT0ZN/Rt6CbMSFU1wZDbrenlwXCh7e4C06YbVL5J/VU=,tag:BqVtzOC1ViEkHHTXbgDJHw==,type:str]
valinor_wg_priv: ENC[AES256_GCM,data:1izZF+6G2Uc2MRBH56A07lexZEkyOiiFI4zltyoZco0+Y9EPhH1nJ4sWzs0=,iv:OIBIQvMsrq93/o0r8V6eSzfU63xtCzgQFf8NKXsjRk0=,tag:wdcQOfdaoxe7Vw0QWmngwA==,type:str]
valinor_wg_pub: ENC[AES256_GCM,data:noAhVF91HUwpU3lHl4knlmGkV0Zjbuc4TQhFhF7HjCbv1hdSycO17TDfgcw=,iv:82v169pOoCOwnOaqPTOMvtvOUJJEcXjPI9BzogC+UaI=,tag:NHIcOYD5mSnZ6kwZBAnXGg==,type:str]
iriy_ssh_priv: ENC[AES256_GCM,data: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,iv:cM6fDDPdHQ0Xamv41gKvCQ3Oh70hCRaijXLA8n2rEEA=,tag:7CsbqkiNGv7W5lCrPK3CmQ==,type:str]
iriy_ssh_pub: ENC[AES256_GCM,data:zjET00BIFhSI3/3bHO9d99VZLNqpGwWYuqhFvZAk6hYejOFRReCn3WKxXwEJh/IS8PYw1ARnj8DOpfYoRwhdofg+ap2/XMLE858B2cmgGQE5XZNftUryjmBV/WpWVECmAa/Dd6w71MACqZ9TDnt8Kkg5c0jtiGT7zg62/gMcjm/k531y1NDi4e8Jf7MFN9A/5nMpVDCpspZe42N2Lv+w0M2lhDrP4bjYTE9p7Klo27C7lt3vGahlNAjQBvx3o+309+4bSnE2hwTUkgwjN8YPx9qpV8v5XAfPEA3Syz4Qmhi6YpDnEsNPIVrmuGdNhrnprDQHJ8G04bHv51DXURf7Wtf8HSQUNVWXJoGb1jw5xzyiYEBB1Cu6VrRRHytQGtMMbQsIldoW7ISSo1jzRIPWJRMCYrY/4fneoALAXPN6u6VsYM+wtO6/1+A02KIz4uhHvt9c+iv2BNiJrwgHSdH2aY3JaOLEAI+wVQaf47WBfPIjfTzYsDx+kDNiflmBhENNWSqRnrXXLiAG0oVbbz0iuzA+C6w/gNc/t4L4foiMbeF3m9jVfFm3LrCmR1FJrGeA7ZSUAEQ6v55an+IbDMv7P9lUxgd7rsCj2M0elG2iDizV9vziFPOSJkplqzygxXZdo+In0pmRHUfWj06epacZjNdDxJHrakfhmWpGBvrwYRRp4/5p7/k2CToqj6UqedYen0S8M09JseHjNndr9/Oe2yJZYlzRhfq0ZDB1pzdVIiePcQ==,iv:nWWm3vecA7c5pv8bYrjjZk3VLHjKJI7c7ZPkK+pUqU4=,tag:Gfa5Izk6I3s/spA3GkXufQ==,type:str]
iriy_wg_priv: ENC[AES256_GCM,data:inng2niJrTXF3ld2T5Xs9t/64oDC8haJhpK1Iajpc60hMHWbenpqGRis7NM=,iv:E/cW6iwjbC3iKulvgBD5vXsjxh9A6nGO7Acr2DXAQps=,tag:CfHqE8u87xGDkzArZg3BnA==,type:str]
iriy_wg_pub: ENC[AES256_GCM,data:/4yPr9+NKyU/84L1heVhVa5Mzu6/9bTRciL4V8v31J99Fh5ratZDufNt8AY=,iv:1PzTUsgt1YQPQAywSQqBUVm08++EA9rTdQF/puRJMs8=,tag:ew+bmkZmlj74/mzdBPiSDA==,type:str]
avalon_ssh_priv: ENC[AES256_GCM,data:wTAQKXU=,iv:7x+5AnmbNde6lsr+y5MlkR7KoaOUSCGTCVwLECYxPHI=,tag:DkrosVUFtURFBuqQI0LxaQ==,type:bool]
avalon_ssh_pub: ENC[AES256_GCM,data:22S09ak=,iv:Q5SU6BQw9j4HMyohQorIeNwGL0xLx8erm10gvPpHmCc=,tag:o02ZcLBSz35sqY9INyOMRw==,type:bool]
avalon_wg_priv: ENC[AES256_GCM,data:Urf0hCzMoyo3IiV+0zhiHGhh3vfinrMAFbX9JwFgkXiW+3+AXN2b1b785JE=,iv:TV0zwPssXOEVSxiVo0jZwFCmZJiTSXXXctFXFX0H97s=,tag:YDNaw6dRBcbyMSjXTRIJmw==,type:str]
avalon_wg_pub: ENC[AES256_GCM,data:Lc8LIn3UX6mpN8WWum18OVI5LWjBLoW2Qles4Bv/cKP6yOfKTLXPkAYzmFU=,iv:P3UJr5aHkW07HVH0oy500HdsumZpcwwuRdRKx/Efgjo=,tag:U9G9Ja+7mS1x6no+MVptiQ==,type:str]
asgard_ssh_priv: ENC[AES256_GCM,data:PflBgd0=,iv:OvKG6iGAtvcx7Nw/CT3mJos69ECG0k5CasZMzg/xWo8=,tag:X9iQY/nDBb5Dz9a+rnN9Rg==,type:bool]
asgard_ssh_pub: ENC[AES256_GCM,data:+M50sSY=,iv:fWVBRPlz/ACENHhOJ5zabu0eqOAAH/AH9+HBqUZZQU8=,tag:UPdE0aLWnhj/zlXpKbdoGw==,type:bool]
asgard_wg_priv: ENC[AES256_GCM,data:YxlKrwQ=,iv:1xnNKjzkJ0KPglLQy35i3FZ6kaJIgf7u0vT4aciDQI8=,tag:Jg5a/215Ifxj/XXMkSHwMg==,type:bool]
asgard_wg_pub: ENC[AES256_GCM,data:7ojknU8=,iv:Rk2otESlMbnVItBS0Xo2JeoSjOiDusUnsMVMw9/4oU4=,tag:FD0S6AfDfvVgvgy0coF/Uw==,type:bool]
efir_ssh_priv: ENC[AES256_GCM,data:lfC0LrU=,iv:QCNZWYj1bokbZwVbPanuWzljwTv8k1yRvJJYzXiffRw=,tag:1r0myqf+wk0paT3ODStB6A==,type:bool]
efir_ssh_pub: ENC[AES256_GCM,data:s2CtFco=,iv:5ckMLWh/OrANzuN7dChi87jJqp8ulbTuhefteVijVeU=,tag:0Ojvf/u6Vs0tKiPzLnaHuQ==,type:bool]
efir_wg_priv: ENC[AES256_GCM,data:jxmtVME=,iv:4SJC/lexF/oxgZp4QDAA+MhLU50K6G7g4IgQmbXl81s=,tag:wC7h+uCgBfGFynIZlyaOng==,type:bool]
efir_wg_pub: ENC[AES256_GCM,data:lYCUem4=,iv:FmIo/U0Zo9O2pbiehLLbTe9bWKzRRjEJHP53zXPvhAU=,tag:nQKx887kvTKaoKIXTR+/EA==,type:bool]
vpn_ssh_priv: ENC[AES256_GCM,data:RQhNAZg=,iv:PHdobW9HIEITGaIq86YbOFhyf7OTeTzhgjWVKo0YgNs=,tag:EhSAJz8N2OAuHC7sbvBj+w==,type:bool]
vpn_ssh_pub: ENC[AES256_GCM,data:K7+ZMxQ=,iv:xp1ghLqP5sk91feAIxC1JpHOkCzBfYBO9rHW9ghfqAM=,tag:eX8s7hGITevnerFo1VpfRg==,type:bool]
vpn_wg_priv: ENC[AES256_GCM,data:YS2NMqSZdH6gTQq89sWNLna6sLFIzR+uDFurFP1s+3Pe1+QP/SAiX81PZfc=,iv:Ovm3ir8ia5793yYPsKrscpqc4A6B6r270hpx9pWmR1o=,tag:asWYQrENr5ip8kHdb2mkYw==,type:str]
vpn_wg_pub: ENC[AES256_GCM,data:orLTPlTD5Y6bimDcc+BFJytQFER2POfgcOFEk6zcKkvuq/GyU8bKgKLxuyM=,iv:TVHw+yVhlDJFz/8HYqI3qT85hGzgx+3Bj7mT0mr3dFE=,tag:EKDs8gE8RJMGQVfcYLj9Jw==,type:str]
pgp_key: ENC[AES256_GCM,data:nEMur/Uq,iv:2KXW/AAAWDX09Ich2S6LQ7618ZBAY61KZcGkIabqCLs=,tag:Q7o8fz3dFFuqeMpzu9U/Fg==,type:str]
wifi: ENC[AES256_GCM,data:LBDjdh4/Kny4cz7WZ5EGeFH7k0PGdERBq0/2wAWHdZtAhC2avlVNRfV8n/DsRodaUVm/6/tCXmXGOfqkzRgC9drQmDxeJWe5IhjJpOOOAXvLA/BCgzwu/Poi4b2KiXdZ1BgznMBV9+EBNFR55+KAb+GjjEIR96G15wGTfk3D0hPs9sE238OcfKFLv5L7ptUN7qnmAH6M4AIEKk0gv+J9dyu3UAw7qfdr6uiuPsYOoQ95A2q1OpERh7VnfsI6zjJ8vKSKbG/yb0VOhcCOlM1oijqSw+fUIMBlOQ9wWyWN2brqkhACqqIiBWxrqfPHQT2mobMTgE4vw1BruzTnhBrqtCeGG8yHEZnL/8NU4z3NQDG3FfYScVNDAvMrW+06HHKRi43vJ1Zz7HMb6ik8ZOKFI4CvsYingNSD1cAXt3FMet5PvVFfWErsrpO3dST7A0ZSb56N+fXrfBcB8jdxsOZBopfksFpx81J/VLLdAoO0aXtYhZlMM11nuCjkgTFPvwkxy2e/+gZVqPbWEaDeJ5j2bEB7lJ1DpMX88FN9g0zhA6cufVbSanaLCvCDCdxTslZVauO0mlmOBh0GMPD7Oi/l8hdCX74PqjSx0kmH4RWRL6Jei2PPnAEW4scWrhUOKxMaagFsLFyKvy3HYAnTqevlEi8FXmS2hglQzsN3H7343kaV+OSTy50uOG9wr7T3rbztcKDOf9dp1CM4JVk933wOmMdg7nXBrU16ELVYlWuBHgswHiBtZQXVvQBPhxp7giFjduhXlg92wvmV2ZEcVOSiDJp4nJsiIaGmwbq6PsO/1Xy5sIJ0/jh1aJwAnp507xEXl0tvcBXSdaXpHdUnKnBPw9q8Gt9Td+UoLgEb13Dy1op9Fs9iA9LMX1EMQe6d,iv:rxAs2PD9EWNONqU0Hh9DJfECJ93nnRMrbUCwormAwxw=,tag:+n0iICniidi4H0Zv9pCDfA==,type:str]
sops:
kms: []
gcp_kms: []
azure_kv: []
hc_vault: []
age:
- recipient: age1sxzuhh2fcd4pmaz4mdqq95t683d32ft22w9t2r7pk258u0s8wymsqdj7lg
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBraWFDRFUxQ2l5OWV1OXNK
UExEbWZkM0kzVk1rZG4yY3pBLzdMVWVJS0UwCnhlWFJ5T2lZUXJyNkg1ejQxaU1t
L3F2RUhldTY3N2xXL0hwczNKRzNjcncKLS0tIEkycHoxcDBGNyt2V3RDY29wNGVp
TGg5Rk05VkRsaXM1Q0NxMmtMajRORDAKqjFldiAYJKjmnkeDkwanjYvhL6645DZ5
dVXExjqO/DG733ge8HFyKzpfpkzRymV1giUwxBdII1dd0mJ2ncINeA==
-----END AGE ENCRYPTED FILE-----
- recipient: age1ms8f0ysv6vakxepvt69fejczs6tddexepesdv4rkgtheehj3nu4sc6290s
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB3UkRjblIvYStZUzQyRHA1
ZGVXeHhrN0kyVkxZdms5U3gwVFlPMW12MVJjCjRkVURpZXBzb0tYenB4dGxKamh6
VXVBMmo1Ujkvd2VTRExyWE5MbVJaclUKLS0tIDVhRkYzZmEzUG00Q2IwOWZUMVVt
ODVIbytpcjN1cVMyaG1qVVdkRmtaMzQKNsvD9DpK/raDBob+IcuNk72tQDts36kJ
QhtoLy8MvUymi49PdEWrgyf68w5XwRO/U4iINhR0qzm0glg/XcyHjA==
-----END AGE ENCRYPTED FILE-----
- recipient: age1sxzuhh2fcd4pmaz4mdqq95t683d32ft22w9t2r7pk258u0s8wymsqdj7lg
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJc3hKWkk3ckNOY2UyTVhG
MmtLaEd0K04yaGxiOUoxMXkzOEFnYis4VkhnCktDRFM2bS8vb05OWDdwa0RwRlNO
cmlZemtxVGZ6S0tNTDV1cmE1N0pVWnMKLS0tIE9EZllycHJpcEY2R1pwOFhOZEU3
L01IcytDd3BPb0VOTW9DQ2lUdUVJS0kKiD+C+3mK1b/eIwCEFanFgYGLNk3JNPQ7
i1UqzbHVxSd0q/YVwdKAcj0jA6EezGm275tgq7IVsy2sHkvRMaEDtQ==
-----END AGE ENCRYPTED FILE-----
- recipient: age1sxzuhh2fcd4pmaz4mdqq95t683d32ft22w9t2r7pk258u0s8wymsqdj7lg
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAweVU3TkxFZzRnd2I2clN2
ZTlTWmhwQkhVc1hnOXFvZVVDSWpHMVh1TGtrCkc3M1pUTnZCMHpvYXB5ZVhreGxa
ZVY2cG5Ja2ltL3k2Q1VEalc5TTNFMXcKLS0tIGd5UWl0RGVXT211Zm51dlB6WFZ1
STRtTVpVTCtVZ1FUNENqWFFVNTNuaVUKN6HRiZjTdENeif8dJ29urBxPXDaosjjY
InN4Ko6YUaGfvB1DTrKIzrxOpsHS+XjisoGfT71tJwwEOoREklEO/A==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2023-08-05T09:52:06Z"
mac: ENC[AES256_GCM,data:lIY0q/K772KOiRZ24QgPtWqN67FqOdKScfJ/G8tY/VOe+KquGSIIIIyXZoIjvjEnVZpKleQfqGpcbssZR491r09xDazhadCOtEfY3YGtNUYSDcWfgHjYOYm22Pa/8YK90aAwc/2BAY6X0mXR/zPPTpdALvzIGYaS5EYVLdcdcxI=,iv:kMAgc7e8ATA2ZGRXKt1XdVWlc17OIccnCndBzKVw4T4=,tag:pR+xVV5bnE2nP/7fGWSm3Q==,type:str]
pgp:
- created_at: "2023-04-20T10:20:17Z"
enc: |-
-----BEGIN PGP MESSAGE-----
wcFMA6R3Y9nD7qMBAQ/8CVWQaYKfOzvPIllZyyWpUjHRLLXaR8MNJ8U5WI/tdwdN
9UScDYJFuYRW7Q9s4Mt961kBGpaHqe9MUZBxUDlYX59+EN3FbO/eMQ5OqI05ESmL
TvZB4+S9C5o73nuypSDNvYz+Lgq6DO25ZPhXdtPhx2DE4G31/wft/LpxhjalIjI8
MU0Dv22R4qC+glJbe4GIF2IJ8XoxnnzjiGeSqiyv0QIBM0SzOtA5sKwNohWBnW7g
7vxOTm5+kyzG0dDjt3tFApgPDaA1wjofzhRuuveF52VBsuIA2opFdpqkyICvK6rn
NB5kUaPlY6A0m+n0oHSfY5wm/AnHNE4Oob/ifumAaB0EAJVUTRauI5M8SeJF0ya1
U0IQ9N2lb7Y6q4pqHywIa6fnylsqCfxInAYKMuslRq8f9t/qakb4/MYcnPrwpzjw
73/naiNoJmG6NVTkM52qTtOqZAmsaQd5cigTuPW2Z2CJq1yLZEVGSSd1DUGUjBDK
nQGucpVVVpD+ifrIPz+Iqwy+5NoZZm/Oa9pKJGFzqXinnDNZaqtgpmTw9QxcSeaP
VvGZG9CDd89MtAm1VQyuqi1bQ2faq3G0xNrLl7xUsfmjx4ofW+JXR87OzvGfLPhu
Sjl3kS9j5/MEBRBg3n9gNkgSu5Sy3ilhckY3yjTgAT9Gw2giDhCiUXi1/7KrGprS
UQHPCSsjyWsyuYVa3lAP/WPdVclc4WOdfYcetUCXBVP7LQr0bq+IG+2J0nnY3mDt
Va5k4sP1qu6Ecrs2JioQ1V2H+VmcrRykBWnMXl1tDSWKMA==
=pS8X
-----END PGP MESSAGE-----
fp: 4E241635F8EDD2919D2FB44CA362EA0491E2EEA0
unencrypted_suffix: _unencrypted
version: 3.7.3

View File

@ -1,26 +0,0 @@
{ config, pkgs, ... }:
let keyFilePath = "/var/lib/sops-nix/age-key.txt";
in {
sops.defaultSopsFile = ./common.yaml;
sops.age.keyFile = keyFilePath;
sops.age.generateKey = true;
sops.secrets.wifi = { };
sops.secrets."${config.hostcfg.hostname}_ssh_priv" = {
mode = "0400";
owner = config.users.users.sora.name;
group = config.users.users.sora.group;
};
sops.secrets."${config.hostcfg.hostname}_ssh_pub" = {
mode = "0400";
owner = config.users.users.sora.name;
group = config.users.users.sora.group;
};
sops.secrets."${config.hostcfg.hostname}_wg_priv" = { };
sops.secrets."${config.hostcfg.hostname}_wg_pub" = { };
environment.systemPackages = with pkgs; [ sops ];
environment.sessionVariables.OPS_AGE_KEY_FILE = keyFilePath;
}

View File

@ -2,7 +2,7 @@
programs.ssh = {
extraConfig = ''
IdentityFile ${
config.sops.secrets."${config.hostcfg.hostname}_ssh_priv".path
config.sops.secrets."${config.syscfg.hostname}_ssh_priv".path
}
'';
};

View File

@ -1,60 +1,68 @@
{ pkgs, ... }: {
{ config, lib, pkgs, ... }: {
config = lib.mkMerge [
(lib.mkIf (config.syscfg.make.gui) {
xdg.portal = {
enable = true;
# wlr.enable = true;
extraPortals = with pkgs; [
xdg-desktop-portal-hyprland
xdg-desktop-portal-gtk
];
config.common.default = [ "hyprland" "gtk" ];
};
xdg.portal = {
enable = true;
# wlr.enable = true;
extraPortals = with pkgs;
[
xdg-desktop-portal-hyprland
# xdg-desktop-portal-gtk
];
};
environment.sessionVariables = rec {
GBM_BACKEND = "amd-drm";
__GL_GSYNC_ALLOWED = "0";
__GL_VRR_ALLOWED = "1";
__GLX_VENDOR_LIBRARY_NAME = "amd";
WLR_DRM_NO_ATOMIC = "1";
_JAVA_AWT_WM_NONREPARENTING = "1";
QT_QPA_PLATFORM = "wayland";
QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
# GDK_BACKEND = "wayland";
WLR_NO_HARDWARE_CURSORS = "1";
MOZ_ENABLE_WAYLAND = "1";
# WLR_BACKEND = "vulkan";
# WLR_RENDERER = "vulkan";
XCURSOR_SIZE = "24";
NIXOS_OZONE_WL = "1";
};
})
({
environment.sessionVariables = rec {
GBM_BACKEND = "amd-drm";
__GL_GSYNC_ALLOWED = "0";
__GL_VRR_ALLOWED = "1";
WLR_DRM_NO_ATOMIC = "1";
__GLX_VENDOR_LIBRARY_NAME = "amd";
_JAVA_AWT_WM_NONREPARENTING = "1";
QT_QPA_PLATFORM = "wayland";
QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
GDK_BACKEND = "wayland";
WLR_NO_HARDWARE_CURSORS = "1";
MOZ_ENABLE_WAYLAND = "1";
WLR_BACKEND = "vulkan";
WLR_RENDERER = "vulkan";
XCURSOR_SIZE = "24";
NIXOS_OZONE_WL = "1";
PATH = [ "$HOME/.local/bin/:$PATH" ];
XDG_CACHE_HOME = "$HOME/.cache";
XDG_CONFIG_HOME = "$HOME/.config";
XDG_DATA_HOME = "$HOME/.local/share";
XDG_STATE_HOME = "$HOME/.local/state";
XDG_BIN_HOME = "$HOME/.local/bin";
XDG_DESKTOP_DIR = "$HOME/desktop";
XDG_DOCUMENTS_DIR = "$HOME/files";
XDG_DOWNLOAD_DIR = "$HOME/download";
XDG_MUSIC_DIR = "$HOME/media/music";
XDG_PICTURES_DIR = "$HOME/media/photo";
XDG_PUBLICSHARE_DIR = "$HOME/pub";
XDG_TEMPLATES_DIR = "$HOME/media/templates";
XDG_VIDEOS_DIR = "$HOME/media/video";
};
environment.sessionVariables = rec {
PATH = [ "$HOME/.local/bin/:$PATH" ];
XDG_CACHE_HOME = "$HOME/.cache";
XDG_CONFIG_HOME = "$HOME/.config";
XDG_DATA_HOME = "$HOME/.local/share";
XDG_STATE_HOME = "$HOME/.local/state";
XDG_BIN_HOME = "$HOME/.local/bin";
XDG_DESKTOP_DIR = "$HOME/desktop";
XDG_DOCUMENTS_DIR = "$HOME/files";
XDG_DOWNLOAD_DIR = "$HOME/download";
XDG_MUSIC_DIR = "$HOME/media/music";
XDG_PICTURES_DIR = "$HOME/media/photo";
XDG_PUBLICSHARE_DIR = "$HOME/pub";
XDG_TEMPLATES_DIR = "$HOME/media/templates";
XDG_VIDEOS_DIR = "$HOME/media/video";
};
environment.etc."xdg/user-dirs.defaults".text = ''
XDG_CACHE_HOME="$HOME/.cache"
XDG_CONFIG_HOME="$HOME/.config"
XDG_DATA_HOME="$HOME/.local/share"
XDG_STATE_HOME="$HOME/.local/state"
XDG_BIN_HOME="$HOME/.local/bin"
XDG_DESKTOP_DIR="$HOME/desktop"
XDG_DOCUMENTS_DIR="$HOME/files"
XDG_DOWNLOAD_DIR="$HOME/download"
XDG_MUSIC_DIR="$HOME/media/music"
XDG_PICTURES_DIR="$HOME/media/photo"
XDG_PUBLICSHARE_DIR="$HOME/pub"
XDG_TEMPLATES_DIR="$HOME/media/templates"
XDG_VIDEOS_DIR="$HOME/media/video"
'';
environment.etc."xdg/user-dirs.defaults".text = ''
XDG_CACHE_HOME="$HOME/.cache"
XDG_CONFIG_HOME="$HOME/.config"
XDG_DATA_HOME="$HOME/.local/share"
XDG_STATE_HOME="$HOME/.local/state"
XDG_BIN_HOME="$HOME/.local/bin"
XDG_DESKTOP_DIR="$HOME/desktop"
XDG_DOCUMENTS_DIR="$HOME/files"
XDG_DOWNLOAD_DIR="$HOME/download"
XDG_MUSIC_DIR="$HOME/media/music"
XDG_PICTURES_DIR="$HOME/media/photo"
XDG_PUBLICSHARE_DIR="$HOME/pub"
XDG_TEMPLATES_DIR="$HOME/media/templates"
XDG_VIDEOS_DIR="$HOME/media/video"
'';
})
];
}

View File

@ -1,6 +1,9 @@
{ pkgs, ... }: {
programs.adb.enable = true;
programs.wireshark.enable = true;
{ pkgs, config, lib, ... }: {
environment.systemPackages = with pkgs; [ wget dconf ];
config = lib.mkIf (config.syscfg.make.develop) {
programs.adb.enable = true;
programs.wireshark.enable = true;
environment.systemPackages = with pkgs; [ wget dconf wireshark ];
};
}

View File

@ -1 +1,64 @@
{ ... }: { imports = [ ./debug ./devel ]; }
{ pkgs, ... }: {
imports = [ ./debug ./develop ];
# services.telegraf = {
# enable = true;
# extraConfig = {
# agent = {
# interval = "10s";
# round_interval = true;
# metric_batch_size = 1000;
# metric_buffer_limit = 10000;
# collection_jitter = "0s";
# flush_interval = "10s";
# flush_jitter = "0s";
# precision = "";
# hostname = "valinor";
# omit_hostname = false;
# };
# inputs.cpu = {
# percpu = true;
# totalcpu = true;
# collect_cpu_time = false;
# report_active = false;
# };
# inputs.mem = {};
# inputs.swap = {};
# inputs.system = {};
# inputs.disk = {
# ignore_fs = ["tmpfs" "devtmpfs" "devfs"];
# };
# inputs.net = {};
# inputs.netstat = {};
# inputs.ping = {
# urls = ["8.8.8.8" "8.8.4.4"];
# count = 4;
# interval = "60s";
# binary = "${pkgs.iputils.out}/bin/ping";
# };
# inputs.internet_speed = {
# interval = "2m";
# };
# inputs.net_response = {
# protocol = "tcp";
# address = "google.com:80";
# timeout = "5s";
# read_timeout = "5s";
# interval = "30s";
# };
# outputs.influxdb_v2 = {
# urls = [""];
# token = "";
# organization = "";
# bucket = "";
# };
# };
# };
}

View File

@ -1,4 +0,0 @@
{ ... }:
{
}

View File

@ -0,0 +1,16 @@
{ lib, config, pkgs, ... }:
let
android_env = pkgs.androidenv.composeAndroidPackages {
platformVersions = [ "34" ];
abiVersions = [ "x86" "x86_64" ];
includeEmulator = false;
};
in {
config = lib.mkIf (config.syscfg.make.develop) {
environment.systemPackages = with pkgs;
[
# android-tools
# androidStudioPackages.canary
];
};
}

View File

@ -1,21 +1,28 @@
{ config, pkgs, ... }: {
{ config, pkgs, lib, ... }:
let nameValuePair = name: value: { inherit name value; };
in {
programs.zsh.enable = true;
users = {
defaultUserShell = pkgs.zsh;
users.${config.hostcfg.username} = {
isNormalUser = true;
description = "${config.hostcfg.username}";
extraGroups = [
"networkmanager"
"wheel"
"vboxsf"
"adbusers"
"lp"
"audio"
"video"
"docker"
"wireshark"
];
};
users = builtins.listToAttrs (map (userConfig:
nameValuePair userConfig.username {
isNormalUser = true;
description = "${userConfig.username}";
extraGroups = [
"networkmanager"
"wheel"
"dialout"
"vboxsf"
"adbusers"
"libvirtd"
"kvm"
"lp"
"audio"
"video"
"docker"
"podman"
"wireshark"
];
}) config.syscfg.users);
};
}

View File

@ -0,0 +1,15 @@
{ config, pkgs, lib, ... }:
let
in {
imports = [ ./sops ];
environment.systemPackages = with pkgs; [ arion ];
virtualisation.arion = {
backend = "podman-socket";
projects = {
cloud.settings = import ./docker/cloud.nix { inherit config pkgs lib; };
authentik.settings =
import ./docker/authentik.nix { inherit config pkgs lib; };
};
};
}

View File

@ -0,0 +1,104 @@
{ config, pkgs, lib, ... }:
let serverCfg = config.syscfg.server;
in {
project.name = "authentik";
networks = {
internal = {
name = lib.mkForce "internal";
internal = true;
};
external = {
name = lib.mkForce "external";
internal = false;
};
};
services = {
auth_postgresql.service = {
image = "postgres:14-alpine";
container_name = "auth_postgresql";
restart = "unless-stopped";
networks = [ "internal" ];
volumes = [ ];
environment = {
POSTGRES_PASSWORD = "/run/secrets/AUTHENTIK_POSTGRESQL__PASSWORD";
POSTGRES_USER = "authentik";
POSTGRES_DB = "authentik";
};
};
auth_redis.service = {
image = "redis:alpine";
container_name = "auth_redis";
restart = "unless-stopped";
networks = [ "internal" ];
volumes = [ ];
environment = { };
labels = { "traefik.enable" = "false"; };
};
auth_server.service = {
image = "ghcr.io/goauthentik/server:latest";
container_name = "auth_server";
restart = "unless-stopped";
networks = [ "internal" "external" ];
volumes = [
"${serverCfg.dataPath}/authentik/media:/media"
"${serverCfg.dataPath}/authentik/templates:/templates"
];
environment = {
"AUTHENTIK_REDIS__HOST" = "auth_redis";
"AUTHENTIK_POSTGRESQL__HOST" = "auth_postgresql";
"AUTHENTIK_POSTGRESQL__USER" = "authentik";
"AUTHENTIK_POSTGRESQL__NAME" = "authentik";
"AUTHENTIK_POSTGRESQL__PASSWORD" = "AUTHENTIK_DB_PASSWORD";
"AUTHENTIK_SECRET_KEY" = "AUTHENTIK_SECRET_KEY";
"AUTHENTIK_EMAIL__HOST" = "${serverCfg.mailDomain}";
"AUTHENTIK_EMAIL__PORT" = "587";
"AUTHENTIK_EMAIL__USERNAME" = "noreply@${serverCfg.hostDomain}";
"AUTHENTIK_EMAIL__PASSWORD" = "AUTHENTIK_EMAIL_PASSWORD";
"AUTHENTIK_EMAIL__USE_TLS" = "true";
"AUTHENTIK_EMAIL__USE_SSL" = "false";
"AUTHENTIK_EMAIL__TIMEOUT" = "10";
"AUTHENTIK_EMAIL__FROM" = "sso@noreply.${serverCfg.hostDomain}";
};
labels = {
"traefik.enable" = "true";
"traefik.http.routers.sso.entrypoints" = "web-secure";
"traefik.http.routers.sso.rule" = "Host(`sso.${serverCfg.hostDomain}`)";
"traefik.http.routers.sso.tls" = "true";
"traefik.http.services.sso.loadbalancer.server.port" = "9000";
"traefik.docker.network" = "external";
};
command = "server";
ports = [
"9999:9000" # host:container
];
};
auth_worker.service = {
image = "ghcr.io/goauthentik/server:latest";
container_name = "auth_worker";
restart = "unless-stopped";
networks = [ "internal" ];
volumes = [
"${serverCfg.dataPath}/authentik/media:/media"
"${serverCfg.dataPath}/authentik/templates:/templates"
"/var/run/docker.sock:/var/run/docker.sock"
];
environment = {
"AUTHENTIK_REDIS__HOST" = "auth_redis";
"AUTHENTIK_POSTGRESQL__HOST" = "auth_postgresql";
"AUTHENTIK_POSTGRESQL__USER" = "authentik";
"AUTHENTIK_POSTGRESQL__NAME" = "authentik";
"AUTHENTIK_POSTGRESQL__PASSWORD" = "AUTHENTIK_DB_PASSWORD";
"AUTHENTIK_SECRET_KEY" = "AUTHENTIK_SECRET_KEY";
};
labels = { "traefik.enable" = "false"; };
command = "worker";
user = "root";
};
};
}

View File

@ -0,0 +1,152 @@
{ config, pkgs, lib, ... }:
let serverCfg = config.syscfg.server;
in {
project.name = "cloud";
networks = {
internal = {
name = lib.mkForce "internal";
internal = true;
};
external = {
name = lib.mkForce "external";
internal = false;
};
};
services = {
cloud_nextcloud.service = {
image = "nextcloud:27";
container_name = "cloud";
restart = "unless-stopped";
networks = [ "external" ];
volumes = [
"${serverCfg.configPath}/data/nextcloud:/var/www/html"
"${serverCfg.dataPath}/data/music:/media/music"
"${serverCfg.dataPath}/data/video:/media/video"
"${serverCfg.dataPath}/data/photo:/media/photo"
];
tmpfs = [ "/tmp" ];
labels = {
"traefik.enable" = "true";
"traefik.http.routers.nextcloud.entrypoints" = "web-secure";
"traefik.http.routers.nextcloud.rule" =
"Host(`cloud.${serverCfg.hostDomain}`)";
"traefik.http.routers.nextcloud.tls" = "true";
"traefik.http.routers.nextcloud.middlewares" =
"sts_headers,nextcloud-caldav";
"traefik.http.middlewares.nextcloud-caldav.redirectregex.permanent" =
"true";
"traefik.http.middlewares.nextcloud-caldav.redirectregex.regex" =
"^https://(.*)/.well-known/(card|cal)dav";
"traefik.http.middlewares.nextcloud-caldav.redirectregex.replacement" =
"https://$\${1}/remote.php/dav/";
"traefik.http.middlewares.sts_headers.headers.stsSeconds" = "15552000";
"traefik.http.middlewares.sts_headers.headers.stsIncludeSubdomains" =
"true";
};
};
cloud_office.service = {
image = "collabora/code:latest";
container_name = "cloud_office";
restart = "unless-stopped";
networks = [ "external" ];
volumes = [ ];
environment = {
username = "COLLABORA_USER";
password = "COLLABORA_PASSWORD";
aliasgroup1 = "https://cloud.${serverCfg.hostDomain}";
server_name = "office.${serverCfg.hostDomain}";
VIRTUAL_HOST = "office.${serverCfg.hostDomain}";
VIRTUAL_PORT = "9980";
VIRTUAL_PROTO = "http";
DONT_GEN_SSL_CERT = "true";
RESOLVE_TO_PROXY_IP = "true";
NETWORK_ACCESS = "internal";
extra_params = "--o:ssl.enable=false --o:ssl.termination=true";
dictionaries = "en fr de jp";
};
labels = {
"traefik.enable" = "true";
"traefik.http.routers.collabora.entrypoints" = "web-secure";
"traefik.http.routers.collabora.rule" =
"Host(`office.${serverCfg.hostDomain}`)";
"traefik.http.routers.collabora.tls" = "true";
};
};
cloud_etherpad.service = {
image = "etherpad/etherpad:latest";
container_name = "etherpad";
restart = "unless-stopped";
networks = [ "external" ];
volumes = [
"${serverCfg.dataPath}/ether/etherpad/data:/opt/etherpad-lite/var"
"${serverCfg.dataPath}/ether/etherpad/APIKEY.txt:/opt/etherpad-lite/APIKEY.txt"
];
environment = {
NODE_ENV = "production";
TITLE = "Helcel-Pad";
DB_TYPE = "mysql";
DB_HOST = serverCfg.dbHost;
DB_PORT = serverCfg.dbPort;
DB_NAME = "etherpad";
DB_USER = "ETHERPAD_DB_USER";
DB_PASS = "ETHERPAD_DB_PASSWORD";
DB_CHARSET = "utf8mb4";
DEFAULT_PAD_TEXT = "P A D";
PAD_OPTIONS_SHOW_LINE_NUMBERS = "true";
PAD_OPTIONS_USE_MONOSPACE_FONT = "true";
ADMIN_PASSWORD = "ETHERPAD_ADMIN_PASSWORD";
SKIN_VARIANTS = "super-dark-toolbar light-editor dark-background";
};
labels = {
"traefik.enable" = "true";
"traefik.http.routers.etherpad.entrypoints" = "web-secure";
"traefik.http.routers.etherpad.rule" =
"Host(`pad.${serverCfg.hostDomain}`)";
"traefik.http.routers.etherpad.tls" = "true";
};
};
cloud_ethercalc.service = {
image = "audreyt/ethercalc:latest";
container_name = "ethercalc";
restart = "unless-stopped";
networks = [ "external" "internal" ];
volumes = [
"${serverCfg.dataPath}/ether/etherpad/data:/opt/etherpad-lite/var"
"${serverCfg.dataPath}/ether/etherpad/APIKEY.txt:/opt/etherpad-lite/APIKEY.txt"
];
environment = {
NODE_ENV = "production";
TITLE = "Helcel-Calc";
REDIS_PORT_6379_TCP_ADDR = "ethercalc-redis";
REDIS_PORT_6379_TCP_PORT = "6379";
ADMIN_PASSWORD = "ETHERPAD_ADMIN_PASSWORD";
SKIN_VARIANTS = "super-dark-toolbar light-editor dark-background";
};
labels = {
"traefik.enable" = "true";
"traefik.http.routers.ethercalc.entrypoints" = "web-secure";
"traefik.http.routers.ethercalc.rule" =
"Host(`calc.${serverCfg.hostDomain}`)";
"traefik.http.routers.ethercalc.tls" = "true";
};
};
cloud_redis.service = {
image = "redis:latest";
container_name = "ethercalc-redis";
restart = "unless-stopped";
networks = [ "internal" ];
volumes = [ "${serverCfg.dataPath}/ether/ethercalc/redis:/data" ];
environment = { };
labels = { "traefik.enable" = "false"; };
};
};
}

Some files were not shown because too many files have changed in this diff Show More