Merge remote-tracking branch 'origin/main'

2024-01-28 12:13:58 +01:00 · 2024-01-28 12:13:58 +01:00 · 16f5a0a9a5
commit 16f5a0a9a5
parent f30abd991c c936d859c7
30 changed files with 626 additions and 349 deletions
--- a/os/default.nix
+++ b/os/default.nix
@ -2,6 +2,7 @@
 {
  imports = [
    ../options.nix
+    ../common/frogarized
    ./battery.nix
    ./ccc
    ./common.nix
@ -9,6 +10,7 @@
    ./gaming
    ./geoffrey.nix
    ./printing
+    ./style
    ./wireless.nix
  ];
 }