From 32019b25d8c2af8c89f706bd3ee6945b61aa1c61 Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Tue, 7 Nov 2023 13:41:12 +0800 Subject: [PATCH] nixos,alidns: move to nixos/presets/core/networking --- flake.nix | 3 ++- .../dns.nix => nixos/presets/core/networking/alidns.nix | 0 users/guanranwang/nixos/networking/default.nix | 5 ----- users/guanranwang/nixos/presets/core.nix | 2 -- 4 files changed, 2 insertions(+), 8 deletions(-) rename users/guanranwang/nixos/networking/dns.nix => nixos/presets/core/networking/alidns.nix (100%) delete mode 100644 users/guanranwang/nixos/networking/default.nix diff --git a/flake.nix b/flake.nix index 4aa09a2..bfa4637 100755 --- a/flake.nix +++ b/flake.nix @@ -169,8 +169,9 @@ modules = [ # OS ./nixos/presets/desktop.nix - ./nixos/presets/core/boot/no-bootloader-menu.nix ./nixos/presets/core/zram-generator.nix + ./nixos/presets/core/boot/no-bootloader-menu.nix + ./nixos/presets/core/networking/alidns.nix ./nixos/presets/desktop/gaming.nix ./nixos/presets/desktop/virtualbox.nix ./nixos/presets/desktop/wayland.nix diff --git a/users/guanranwang/nixos/networking/dns.nix b/nixos/presets/core/networking/alidns.nix similarity index 100% rename from users/guanranwang/nixos/networking/dns.nix rename to nixos/presets/core/networking/alidns.nix diff --git a/users/guanranwang/nixos/networking/default.nix b/users/guanranwang/nixos/networking/default.nix deleted file mode 100644 index 5057fd7..0000000 --- a/users/guanranwang/nixos/networking/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{...}: { - imports = [ - ./dns.nix - ]; -} diff --git a/users/guanranwang/nixos/presets/core.nix b/users/guanranwang/nixos/presets/core.nix index fd44081..7f47c4f 100644 --- a/users/guanranwang/nixos/presets/core.nix +++ b/users/guanranwang/nixos/presets/core.nix @@ -19,8 +19,6 @@ }; imports = [ - ### Overrides (overrides global config) - ../networking ### Flakes ../../../../flakes/nixos/sops-nix.nix ../../../../flakes/nixos/hosts.nix