nyancat/flake
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

treewide: modules: simplify

Browse source
This commit is contained in:
Guanran Wang 2024-01-29 08:18:06 +08:00
parent 4a33b357d2
commit 5b87816947
Signed by: nyancat
SSH key fingerprint: SHA256:8oWGKciPALWut/6WA27oFKofX+6Wtc0gQnsefXLQx/8
13 changed files with 10 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
darwin/modules/default.nix
View file

@ -1,6 +1,6 @@
{...}: {
imports = [
./networking
./services
./networking/proxy.nix
./services/clash.nix
];
}

5
darwin/modules/networking/default.nix
View file

@ -1,5 +0,0 @@
{...}: {
imports = [
./proxy
];
}

0
darwin/modules/networking/proxy/default.nix → darwin/modules/networking/proxy.nix
View file

0
darwin/modules/services/clash/default.nix → darwin/modules/services/clash.nix
View file

5
darwin/modules/services/default.nix
View file

@ -1,5 +0,0 @@
{...}: {
imports = [
./clash
];
}

10
nixos/modules/default.nix
View file

@ -1,9 +1,15 @@
{...}: {
imports = [
# utils that is used internally
./myFlake
./myFlake/boot.nix
./myFlake/hardware/accessories/logitech-wireless.nix
./myFlake/hardware/accessories/piper.nix
./myFlake/hardware/accessories/xbox-one-controller.nix
./myFlake/hardware/components/audio.nix
./myFlake/hardware/components/bluetooth.nix
./myFlake/hardware/components/tpm.nix
# nixpkgs styled options
./services
./services/clash.nix
];
}

0
nixos/modules/myFlake/boot/boot.nix → nixos/modules/myFlake/boot.nix
View file

5
nixos/modules/myFlake/boot/default.nix
View file

@ -1,5 +0,0 @@
{...}: {
imports = [
./boot.nix
];
}

6
nixos/modules/myFlake/default.nix
View file

@ -1,6 +0,0 @@
{...}: {
imports = [
./boot
./hardware
];
}

7
nixos/modules/myFlake/hardware/accessories/default.nix
View file

@ -1,7 +0,0 @@
{...}: {
imports = [
./logitech-wireless.nix
./piper.nix
./xbox-one-controller.nix
];
}

7
nixos/modules/myFlake/hardware/components/default.nix
View file

@ -1,7 +0,0 @@
{...}: {
imports = [
./audio.nix
./bluetooth.nix
./tpm.nix
];
}

6
nixos/modules/myFlake/hardware/default.nix
View file

@ -1,6 +0,0 @@
{...}: {
imports = [
./accessories
./components
];
}

5
nixos/modules/services/default.nix
View file

@ -1,5 +0,0 @@
{...}: {
imports = [
./clash.nix
];
}