From f9161573ffa913723256ca5db648e47f94b0bc42 Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Sat, 30 Dec 2023 22:41:46 +0800 Subject: [PATCH] nixos: sorting --- nixos/hosts/Aristotle/default.nix | 24 ++++++++---------- nixos/profiles/{ => common}/core/default.nix | 0 .../{ => common}/core/hardening/default.nix | 0 .../{ => common}/core/hardening/sysctl.nix | 0 .../{ => common}/core/networking/default.nix | 0 .../{ => common}/core/nix/default.nix | 0 .../profiles/{ => common}/core/nix/flake.nix | 0 nixos/profiles/{ => common}/core/nix/gc.nix | 0 .../{ => common}/core/nix/monitor.nix | 0 nixos/profiles/{ => common}/core/nix/nix.nix | 0 .../core/packages/anti-feature.nix | 2 +- .../{ => common}/core/packages/default.nix | 0 .../core/packages/overlays/default.nix | 0 .../core/packages/overlays/nautilus.nix | 0 .../core/packages/overlays/prismlauncher.nix | 0 .../core/packages/overlays/sway.nix | 0 .../desktop => common}/graphical/default.nix | 0 .../graphical/display-server.nix | 0 .../graphical/gnome-keyring.nix | 0 .../desktop => common}/graphical/polkit.nix | 0 .../server => common/minimal}/default.nix | 4 +-- .../profiles/{ => common}/opt-in/_flatpak.nix | 0 .../{ => common}/opt-in/_legacy-boot.nix | 0 .../{ => common}/opt-in/_virtualbox.nix | 0 nixos/profiles/{ => common}/opt-in/disko.nix | 0 nixos/profiles/{ => common}/opt-in/gaming.nix | 0 .../{ => common}/opt-in/impermanence.nix | 0 .../{ => common}/opt-in/lanzaboote.nix | 0 .../{ => common}/opt-in/virt-manager.nix | 0 .../{ => common}/opt-in/zram-generator.nix | 0 .../{device-type => }/desktop/default.nix | 3 ++- .../{device-type => }/laptop/default.nix | 0 nixos/profiles/server/default.nix | 7 +++++ .../profiles/{ => common}/core/default.nix | 2 +- .../profiles/common/core/home/default.nix | 6 +++++ .../desktop => common/graphical}/default.nix | 0 .../graphical}/home/default.nix | 0 .../graphical}/home/fonts/default.nix | 0 .../fonts/fontconfig/conf.d/nixos-fonts.conf | 0 .../fontconfig/conf.d/old-chinese-fonts.conf | 0 .../fonts/fontconfig/conf.d/qt-fonts.conf | 0 .../fontconfig/conf.d/unliked-fonts.conf | 0 .../fontconfig/conf.d/windows-fonts.conf | 0 .../home/fonts/fontconfig/fonts.conf | 0 .../graphical}/home/packages.nix | 0 .../home/scripts/bin/wrapped-brightnessctl | 0 .../home/scripts/bin/wrapped-mpvpaper | 0 .../home/scripts/bin/wrapped-pamixer | 0 .../graphical}/home/scripts/bin/wrapped-swww | 0 .../graphical}/home/scripts/default.nix | 0 .../graphical}/home/theme.nix | 0 .../graphical}/home/wallpapers/default.nix | 0 .../wallpapers/Minato-Aqua-Dark.png | Bin .../wallpapers/wallpapers/Minato-Aqua.png | Bin .../home/wallpapers/wallpapers/unixcloud.jpg | Bin .../graphical}/home/xdg-mime.nix | 0 .../laptop => common/mobile}/default.nix | 6 +---- .../laptop => common/mobile}/home/default.nix | 0 .../{ => common}/opt-in/_hysteria2-server.nix | 0 .../{ => common}/opt-in/_juicity-server.nix | 0 .../opt-in/clash-meta-client/config.yaml | 2 +- .../opt-in/clash-meta-client/default.nix | 0 .../{ => common}/opt-in/gaming/default.nix | 0 .../opt-in/gaming/home/default.nix | 2 +- .../opt-in/torrenting/default.nix | 0 .../common/opt-in/torrenting/home/default.nix | 5 ++++ .../nixos/profiles/core/home/default.nix | 6 ----- .../nixos/profiles/desktop/default.nix | 6 +++++ .../nixos/profiles/laptop/default.nix | 7 +++++ .../opt-in/torrenting/home/default.nix | 5 ---- 70 files changed, 50 insertions(+), 37 deletions(-) rename nixos/profiles/{ => common}/core/default.nix (100%) rename nixos/profiles/{ => common}/core/hardening/default.nix (100%) rename nixos/profiles/{ => common}/core/hardening/sysctl.nix (100%) rename nixos/profiles/{ => common}/core/networking/default.nix (100%) rename nixos/profiles/{ => common}/core/nix/default.nix (100%) rename nixos/profiles/{ => common}/core/nix/flake.nix (100%) rename nixos/profiles/{ => common}/core/nix/gc.nix (100%) rename nixos/profiles/{ => common}/core/nix/monitor.nix (100%) rename nixos/profiles/{ => common}/core/nix/nix.nix (100%) rename nixos/profiles/{ => common}/core/packages/anti-feature.nix (96%) rename nixos/profiles/{ => common}/core/packages/default.nix (100%) rename nixos/profiles/{ => common}/core/packages/overlays/default.nix (100%) rename nixos/profiles/{ => common}/core/packages/overlays/nautilus.nix (100%) rename nixos/profiles/{ => common}/core/packages/overlays/prismlauncher.nix (100%) rename nixos/profiles/{ => common}/core/packages/overlays/sway.nix (100%) rename nixos/profiles/{device-type/desktop => common}/graphical/default.nix (100%) rename nixos/profiles/{device-type/desktop => common}/graphical/display-server.nix (100%) rename nixos/profiles/{device-type/desktop => common}/graphical/gnome-keyring.nix (100%) rename nixos/profiles/{device-type/desktop => common}/graphical/polkit.nix (100%) rename nixos/profiles/{device-type/server => common/minimal}/default.nix (53%) rename nixos/profiles/{ => common}/opt-in/_flatpak.nix (100%) rename nixos/profiles/{ => common}/opt-in/_legacy-boot.nix (100%) rename nixos/profiles/{ => common}/opt-in/_virtualbox.nix (100%) rename nixos/profiles/{ => common}/opt-in/disko.nix (100%) rename nixos/profiles/{ => common}/opt-in/gaming.nix (100%) rename nixos/profiles/{ => common}/opt-in/impermanence.nix (100%) rename nixos/profiles/{ => common}/opt-in/lanzaboote.nix (100%) rename nixos/profiles/{ => common}/opt-in/virt-manager.nix (100%) rename nixos/profiles/{ => common}/opt-in/zram-generator.nix (100%) rename nixos/profiles/{device-type => }/desktop/default.nix (88%) rename nixos/profiles/{device-type => }/laptop/default.nix (100%) create mode 100644 nixos/profiles/server/default.nix rename users/guanranwang/nixos/profiles/{ => common}/core/default.nix (95%) create mode 100644 users/guanranwang/nixos/profiles/common/core/home/default.nix rename users/guanranwang/nixos/profiles/{device-type/desktop => common/graphical}/default.nix (100%) rename users/guanranwang/nixos/profiles/{device-type/desktop => common/graphical}/home/default.nix (100%) rename users/guanranwang/nixos/profiles/{device-type/desktop => common/graphical}/home/fonts/default.nix (100%) rename users/guanranwang/nixos/profiles/{device-type/desktop => common/graphical}/home/fonts/fontconfig/conf.d/nixos-fonts.conf (100%) rename users/guanranwang/nixos/profiles/{device-type/desktop => common/graphical}/home/fonts/fontconfig/conf.d/old-chinese-fonts.conf (100%) rename users/guanranwang/nixos/profiles/{device-type/desktop => common/graphical}/home/fonts/fontconfig/conf.d/qt-fonts.conf (100%) rename users/guanranwang/nixos/profiles/{device-type/desktop => common/graphical}/home/fonts/fontconfig/conf.d/unliked-fonts.conf (100%) rename users/guanranwang/nixos/profiles/{device-type/desktop => common/graphical}/home/fonts/fontconfig/conf.d/windows-fonts.conf (100%) rename users/guanranwang/nixos/profiles/{device-type/desktop => common/graphical}/home/fonts/fontconfig/fonts.conf (100%) rename users/guanranwang/nixos/profiles/{device-type/desktop => common/graphical}/home/packages.nix (100%) rename users/guanranwang/nixos/profiles/{device-type/desktop => common/graphical}/home/scripts/bin/wrapped-brightnessctl (100%) rename users/guanranwang/nixos/profiles/{device-type/desktop => common/graphical}/home/scripts/bin/wrapped-mpvpaper (100%) rename users/guanranwang/nixos/profiles/{device-type/desktop => common/graphical}/home/scripts/bin/wrapped-pamixer (100%) rename users/guanranwang/nixos/profiles/{device-type/desktop => common/graphical}/home/scripts/bin/wrapped-swww (100%) rename users/guanranwang/nixos/profiles/{device-type/desktop => common/graphical}/home/scripts/default.nix (100%) rename users/guanranwang/nixos/profiles/{device-type/desktop => common/graphical}/home/theme.nix (100%) rename users/guanranwang/nixos/profiles/{device-type/desktop => common/graphical}/home/wallpapers/default.nix (100%) rename users/guanranwang/nixos/profiles/{device-type/desktop => common/graphical}/home/wallpapers/wallpapers/Minato-Aqua-Dark.png (100%) rename users/guanranwang/nixos/profiles/{device-type/desktop => common/graphical}/home/wallpapers/wallpapers/Minato-Aqua.png (100%) rename users/guanranwang/nixos/profiles/{device-type/desktop => common/graphical}/home/wallpapers/wallpapers/unixcloud.jpg (100%) rename users/guanranwang/nixos/profiles/{device-type/desktop => common/graphical}/home/xdg-mime.nix (100%) rename users/guanranwang/nixos/profiles/{device-type/laptop => common/mobile}/default.nix (54%) rename users/guanranwang/nixos/profiles/{device-type/laptop => common/mobile}/home/default.nix (100%) rename users/guanranwang/nixos/profiles/{ => common}/opt-in/_hysteria2-server.nix (100%) rename users/guanranwang/nixos/profiles/{ => common}/opt-in/_juicity-server.nix (100%) rename users/guanranwang/nixos/profiles/{ => common}/opt-in/clash-meta-client/config.yaml (99%) rename users/guanranwang/nixos/profiles/{ => common}/opt-in/clash-meta-client/default.nix (100%) rename users/guanranwang/nixos/profiles/{ => common}/opt-in/gaming/default.nix (100%) rename users/guanranwang/nixos/profiles/{ => common}/opt-in/gaming/home/default.nix (57%) rename users/guanranwang/nixos/profiles/{ => common}/opt-in/torrenting/default.nix (100%) create mode 100644 users/guanranwang/nixos/profiles/common/opt-in/torrenting/home/default.nix delete mode 100644 users/guanranwang/nixos/profiles/core/home/default.nix create mode 100644 users/guanranwang/nixos/profiles/desktop/default.nix create mode 100644 users/guanranwang/nixos/profiles/laptop/default.nix delete mode 100644 users/guanranwang/nixos/profiles/opt-in/torrenting/home/default.nix diff --git a/nixos/hosts/Aristotle/default.nix b/nixos/hosts/Aristotle/default.nix index 4c9a62a..fd11fed 100644 --- a/nixos/hosts/Aristotle/default.nix +++ b/nixos/hosts/Aristotle/default.nix @@ -1,24 +1,22 @@ {...}: { imports = [ # OS - ../../profiles/core - ../../profiles/device-type/laptop - ../../profiles/opt-in/zram-generator.nix - ../../profiles/opt-in/gaming.nix - ../../profiles/opt-in/virt-manager.nix + ../../profiles/laptop + ../../profiles/common/opt-in/zram-generator.nix + ../../profiles/common/opt-in/gaming.nix + ../../profiles/common/opt-in/virt-manager.nix # User - ../../../users/guanranwang/nixos/profiles/core - ../../../users/guanranwang/nixos/profiles/device-type/laptop - ../../../users/guanranwang/nixos/profiles/opt-in/clash-meta-client - ../../../users/guanranwang/nixos/profiles/opt-in/gaming - ../../../users/guanranwang/nixos/profiles/opt-in/torrenting + ../../../users/guanranwang/nixos/profiles/laptop + ../../../users/guanranwang/nixos/profiles/common/opt-in/clash-meta-client + ../../../users/guanranwang/nixos/profiles/common/opt-in/gaming + ../../../users/guanranwang/nixos/profiles/common/opt-in/torrenting # Hardware ./hardware-configuration.nix - ../../profiles/opt-in/lanzaboote.nix - ../../profiles/opt-in/impermanence.nix - ../../profiles/opt-in/disko.nix + ../../profiles/common/opt-in/lanzaboote.nix + ../../profiles/common/opt-in/impermanence.nix + ../../profiles/common/opt-in/disko.nix ]; networking.hostName = "Aristotle"; diff --git a/nixos/profiles/core/default.nix b/nixos/profiles/common/core/default.nix similarity index 100% rename from nixos/profiles/core/default.nix rename to nixos/profiles/common/core/default.nix diff --git a/nixos/profiles/core/hardening/default.nix b/nixos/profiles/common/core/hardening/default.nix similarity index 100% rename from nixos/profiles/core/hardening/default.nix rename to nixos/profiles/common/core/hardening/default.nix diff --git a/nixos/profiles/core/hardening/sysctl.nix b/nixos/profiles/common/core/hardening/sysctl.nix similarity index 100% rename from nixos/profiles/core/hardening/sysctl.nix rename to nixos/profiles/common/core/hardening/sysctl.nix diff --git a/nixos/profiles/core/networking/default.nix b/nixos/profiles/common/core/networking/default.nix similarity index 100% rename from nixos/profiles/core/networking/default.nix rename to nixos/profiles/common/core/networking/default.nix diff --git a/nixos/profiles/core/nix/default.nix b/nixos/profiles/common/core/nix/default.nix similarity index 100% rename from nixos/profiles/core/nix/default.nix rename to nixos/profiles/common/core/nix/default.nix diff --git a/nixos/profiles/core/nix/flake.nix b/nixos/profiles/common/core/nix/flake.nix similarity index 100% rename from nixos/profiles/core/nix/flake.nix rename to nixos/profiles/common/core/nix/flake.nix diff --git a/nixos/profiles/core/nix/gc.nix b/nixos/profiles/common/core/nix/gc.nix similarity index 100% rename from nixos/profiles/core/nix/gc.nix rename to nixos/profiles/common/core/nix/gc.nix diff --git a/nixos/profiles/core/nix/monitor.nix b/nixos/profiles/common/core/nix/monitor.nix similarity index 100% rename from nixos/profiles/core/nix/monitor.nix rename to nixos/profiles/common/core/nix/monitor.nix diff --git a/nixos/profiles/core/nix/nix.nix b/nixos/profiles/common/core/nix/nix.nix similarity index 100% rename from nixos/profiles/core/nix/nix.nix rename to nixos/profiles/common/core/nix/nix.nix diff --git a/nixos/profiles/core/packages/anti-feature.nix b/nixos/profiles/common/core/packages/anti-feature.nix similarity index 96% rename from nixos/profiles/core/packages/anti-feature.nix rename to nixos/profiles/common/core/packages/anti-feature.nix index 4dae65d..52e7ae1 100644 --- a/nixos/profiles/core/packages/anti-feature.nix +++ b/nixos/profiles/common/core/packages/anti-feature.nix @@ -30,7 +30,7 @@ #"nvidia-persistenced" "xow_dongle-firmware" #"facetimehd-firmware" - "osu-lazer-bin-2023.1221.0" + "osu-lazer-bin-2023.1224.0" "spotify" "steam" "steam-original" diff --git a/nixos/profiles/core/packages/default.nix b/nixos/profiles/common/core/packages/default.nix similarity index 100% rename from nixos/profiles/core/packages/default.nix rename to nixos/profiles/common/core/packages/default.nix diff --git a/nixos/profiles/core/packages/overlays/default.nix b/nixos/profiles/common/core/packages/overlays/default.nix similarity index 100% rename from nixos/profiles/core/packages/overlays/default.nix rename to nixos/profiles/common/core/packages/overlays/default.nix diff --git a/nixos/profiles/core/packages/overlays/nautilus.nix b/nixos/profiles/common/core/packages/overlays/nautilus.nix similarity index 100% rename from nixos/profiles/core/packages/overlays/nautilus.nix rename to nixos/profiles/common/core/packages/overlays/nautilus.nix diff --git a/nixos/profiles/core/packages/overlays/prismlauncher.nix b/nixos/profiles/common/core/packages/overlays/prismlauncher.nix similarity index 100% rename from nixos/profiles/core/packages/overlays/prismlauncher.nix rename to nixos/profiles/common/core/packages/overlays/prismlauncher.nix diff --git a/nixos/profiles/core/packages/overlays/sway.nix b/nixos/profiles/common/core/packages/overlays/sway.nix similarity index 100% rename from nixos/profiles/core/packages/overlays/sway.nix rename to nixos/profiles/common/core/packages/overlays/sway.nix diff --git a/nixos/profiles/device-type/desktop/graphical/default.nix b/nixos/profiles/common/graphical/default.nix similarity index 100% rename from nixos/profiles/device-type/desktop/graphical/default.nix rename to nixos/profiles/common/graphical/default.nix diff --git a/nixos/profiles/device-type/desktop/graphical/display-server.nix b/nixos/profiles/common/graphical/display-server.nix similarity index 100% rename from nixos/profiles/device-type/desktop/graphical/display-server.nix rename to nixos/profiles/common/graphical/display-server.nix diff --git a/nixos/profiles/device-type/desktop/graphical/gnome-keyring.nix b/nixos/profiles/common/graphical/gnome-keyring.nix similarity index 100% rename from nixos/profiles/device-type/desktop/graphical/gnome-keyring.nix rename to nixos/profiles/common/graphical/gnome-keyring.nix diff --git a/nixos/profiles/device-type/desktop/graphical/polkit.nix b/nixos/profiles/common/graphical/polkit.nix similarity index 100% rename from nixos/profiles/device-type/desktop/graphical/polkit.nix rename to nixos/profiles/common/graphical/polkit.nix diff --git a/nixos/profiles/device-type/server/default.nix b/nixos/profiles/common/minimal/default.nix similarity index 53% rename from nixos/profiles/device-type/server/default.nix rename to nixos/profiles/common/minimal/default.nix index 9e84d6d..af6e712 100644 --- a/nixos/profiles/device-type/server/default.nix +++ b/nixos/profiles/common/minimal/default.nix @@ -1,6 +1,4 @@ -{modulesPath, ...}: -# no i dont actually own a server -{ +{modulesPath, ...}: { imports = [ (modulesPath + "/profiles/minimal.nix") ]; diff --git a/nixos/profiles/opt-in/_flatpak.nix b/nixos/profiles/common/opt-in/_flatpak.nix similarity index 100% rename from nixos/profiles/opt-in/_flatpak.nix rename to nixos/profiles/common/opt-in/_flatpak.nix diff --git a/nixos/profiles/opt-in/_legacy-boot.nix b/nixos/profiles/common/opt-in/_legacy-boot.nix similarity index 100% rename from nixos/profiles/opt-in/_legacy-boot.nix rename to nixos/profiles/common/opt-in/_legacy-boot.nix diff --git a/nixos/profiles/opt-in/_virtualbox.nix b/nixos/profiles/common/opt-in/_virtualbox.nix similarity index 100% rename from nixos/profiles/opt-in/_virtualbox.nix rename to nixos/profiles/common/opt-in/_virtualbox.nix diff --git a/nixos/profiles/opt-in/disko.nix b/nixos/profiles/common/opt-in/disko.nix similarity index 100% rename from nixos/profiles/opt-in/disko.nix rename to nixos/profiles/common/opt-in/disko.nix diff --git a/nixos/profiles/opt-in/gaming.nix b/nixos/profiles/common/opt-in/gaming.nix similarity index 100% rename from nixos/profiles/opt-in/gaming.nix rename to nixos/profiles/common/opt-in/gaming.nix diff --git a/nixos/profiles/opt-in/impermanence.nix b/nixos/profiles/common/opt-in/impermanence.nix similarity index 100% rename from nixos/profiles/opt-in/impermanence.nix rename to nixos/profiles/common/opt-in/impermanence.nix diff --git a/nixos/profiles/opt-in/lanzaboote.nix b/nixos/profiles/common/opt-in/lanzaboote.nix similarity index 100% rename from nixos/profiles/opt-in/lanzaboote.nix rename to nixos/profiles/common/opt-in/lanzaboote.nix diff --git a/nixos/profiles/opt-in/virt-manager.nix b/nixos/profiles/common/opt-in/virt-manager.nix similarity index 100% rename from nixos/profiles/opt-in/virt-manager.nix rename to nixos/profiles/common/opt-in/virt-manager.nix diff --git a/nixos/profiles/opt-in/zram-generator.nix b/nixos/profiles/common/opt-in/zram-generator.nix similarity index 100% rename from nixos/profiles/opt-in/zram-generator.nix rename to nixos/profiles/common/opt-in/zram-generator.nix diff --git a/nixos/profiles/device-type/desktop/default.nix b/nixos/profiles/desktop/default.nix similarity index 88% rename from nixos/profiles/device-type/desktop/default.nix rename to nixos/profiles/desktop/default.nix index 97573ee..4996797 100644 --- a/nixos/profiles/device-type/desktop/default.nix +++ b/nixos/profiles/desktop/default.nix @@ -1,6 +1,7 @@ {pkgs, ...}: { imports = [ - ./graphical + ../common/core + ../common/graphical ]; boot.kernelPackages = pkgs.linuxPackages_zen; diff --git a/nixos/profiles/device-type/laptop/default.nix b/nixos/profiles/laptop/default.nix similarity index 100% rename from nixos/profiles/device-type/laptop/default.nix rename to nixos/profiles/laptop/default.nix diff --git a/nixos/profiles/server/default.nix b/nixos/profiles/server/default.nix new file mode 100644 index 0000000..aea777d --- /dev/null +++ b/nixos/profiles/server/default.nix @@ -0,0 +1,7 @@ +{...}: +# no i dont actually own a server +{ + imports = [ + ../common/minimal + ]; +} diff --git a/users/guanranwang/nixos/profiles/core/default.nix b/users/guanranwang/nixos/profiles/common/core/default.nix similarity index 95% rename from users/guanranwang/nixos/profiles/core/default.nix rename to users/guanranwang/nixos/profiles/common/core/default.nix index ba4bd28..a8b9b0f 100644 --- a/users/guanranwang/nixos/profiles/core/default.nix +++ b/users/guanranwang/nixos/profiles/common/core/default.nix @@ -25,7 +25,7 @@ ### sops-nix sops = { - defaultSopsFile = ../../../secrets.yaml; + defaultSopsFile = ../../../../secrets.yaml; age.sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"]; gnupg.sshKeyPaths = []; secrets = { diff --git a/users/guanranwang/nixos/profiles/common/core/home/default.nix b/users/guanranwang/nixos/profiles/common/core/home/default.nix new file mode 100644 index 0000000..248eceb --- /dev/null +++ b/users/guanranwang/nixos/profiles/common/core/home/default.nix @@ -0,0 +1,6 @@ +{...}: { + imports = [ + ../../../../../home-manager + ../../../../../home-manager/applications/trashy + ]; +} diff --git a/users/guanranwang/nixos/profiles/device-type/desktop/default.nix b/users/guanranwang/nixos/profiles/common/graphical/default.nix similarity index 100% rename from users/guanranwang/nixos/profiles/device-type/desktop/default.nix rename to users/guanranwang/nixos/profiles/common/graphical/default.nix diff --git a/users/guanranwang/nixos/profiles/device-type/desktop/home/default.nix b/users/guanranwang/nixos/profiles/common/graphical/home/default.nix similarity index 100% rename from users/guanranwang/nixos/profiles/device-type/desktop/home/default.nix rename to users/guanranwang/nixos/profiles/common/graphical/home/default.nix diff --git a/users/guanranwang/nixos/profiles/device-type/desktop/home/fonts/default.nix b/users/guanranwang/nixos/profiles/common/graphical/home/fonts/default.nix similarity index 100% rename from users/guanranwang/nixos/profiles/device-type/desktop/home/fonts/default.nix rename to users/guanranwang/nixos/profiles/common/graphical/home/fonts/default.nix diff --git a/users/guanranwang/nixos/profiles/device-type/desktop/home/fonts/fontconfig/conf.d/nixos-fonts.conf b/users/guanranwang/nixos/profiles/common/graphical/home/fonts/fontconfig/conf.d/nixos-fonts.conf similarity index 100% rename from users/guanranwang/nixos/profiles/device-type/desktop/home/fonts/fontconfig/conf.d/nixos-fonts.conf rename to users/guanranwang/nixos/profiles/common/graphical/home/fonts/fontconfig/conf.d/nixos-fonts.conf diff --git a/users/guanranwang/nixos/profiles/device-type/desktop/home/fonts/fontconfig/conf.d/old-chinese-fonts.conf b/users/guanranwang/nixos/profiles/common/graphical/home/fonts/fontconfig/conf.d/old-chinese-fonts.conf similarity index 100% rename from users/guanranwang/nixos/profiles/device-type/desktop/home/fonts/fontconfig/conf.d/old-chinese-fonts.conf rename to users/guanranwang/nixos/profiles/common/graphical/home/fonts/fontconfig/conf.d/old-chinese-fonts.conf diff --git a/users/guanranwang/nixos/profiles/device-type/desktop/home/fonts/fontconfig/conf.d/qt-fonts.conf b/users/guanranwang/nixos/profiles/common/graphical/home/fonts/fontconfig/conf.d/qt-fonts.conf similarity index 100% rename from users/guanranwang/nixos/profiles/device-type/desktop/home/fonts/fontconfig/conf.d/qt-fonts.conf rename to users/guanranwang/nixos/profiles/common/graphical/home/fonts/fontconfig/conf.d/qt-fonts.conf diff --git a/users/guanranwang/nixos/profiles/device-type/desktop/home/fonts/fontconfig/conf.d/unliked-fonts.conf b/users/guanranwang/nixos/profiles/common/graphical/home/fonts/fontconfig/conf.d/unliked-fonts.conf similarity index 100% rename from users/guanranwang/nixos/profiles/device-type/desktop/home/fonts/fontconfig/conf.d/unliked-fonts.conf rename to users/guanranwang/nixos/profiles/common/graphical/home/fonts/fontconfig/conf.d/unliked-fonts.conf diff --git a/users/guanranwang/nixos/profiles/device-type/desktop/home/fonts/fontconfig/conf.d/windows-fonts.conf b/users/guanranwang/nixos/profiles/common/graphical/home/fonts/fontconfig/conf.d/windows-fonts.conf similarity index 100% rename from users/guanranwang/nixos/profiles/device-type/desktop/home/fonts/fontconfig/conf.d/windows-fonts.conf rename to users/guanranwang/nixos/profiles/common/graphical/home/fonts/fontconfig/conf.d/windows-fonts.conf diff --git a/users/guanranwang/nixos/profiles/device-type/desktop/home/fonts/fontconfig/fonts.conf b/users/guanranwang/nixos/profiles/common/graphical/home/fonts/fontconfig/fonts.conf similarity index 100% rename from users/guanranwang/nixos/profiles/device-type/desktop/home/fonts/fontconfig/fonts.conf rename to users/guanranwang/nixos/profiles/common/graphical/home/fonts/fontconfig/fonts.conf diff --git a/users/guanranwang/nixos/profiles/device-type/desktop/home/packages.nix b/users/guanranwang/nixos/profiles/common/graphical/home/packages.nix similarity index 100% rename from users/guanranwang/nixos/profiles/device-type/desktop/home/packages.nix rename to users/guanranwang/nixos/profiles/common/graphical/home/packages.nix diff --git a/users/guanranwang/nixos/profiles/device-type/desktop/home/scripts/bin/wrapped-brightnessctl b/users/guanranwang/nixos/profiles/common/graphical/home/scripts/bin/wrapped-brightnessctl similarity index 100% rename from users/guanranwang/nixos/profiles/device-type/desktop/home/scripts/bin/wrapped-brightnessctl rename to users/guanranwang/nixos/profiles/common/graphical/home/scripts/bin/wrapped-brightnessctl diff --git a/users/guanranwang/nixos/profiles/device-type/desktop/home/scripts/bin/wrapped-mpvpaper b/users/guanranwang/nixos/profiles/common/graphical/home/scripts/bin/wrapped-mpvpaper similarity index 100% rename from users/guanranwang/nixos/profiles/device-type/desktop/home/scripts/bin/wrapped-mpvpaper rename to users/guanranwang/nixos/profiles/common/graphical/home/scripts/bin/wrapped-mpvpaper diff --git a/users/guanranwang/nixos/profiles/device-type/desktop/home/scripts/bin/wrapped-pamixer b/users/guanranwang/nixos/profiles/common/graphical/home/scripts/bin/wrapped-pamixer similarity index 100% rename from users/guanranwang/nixos/profiles/device-type/desktop/home/scripts/bin/wrapped-pamixer rename to users/guanranwang/nixos/profiles/common/graphical/home/scripts/bin/wrapped-pamixer diff --git a/users/guanranwang/nixos/profiles/device-type/desktop/home/scripts/bin/wrapped-swww b/users/guanranwang/nixos/profiles/common/graphical/home/scripts/bin/wrapped-swww similarity index 100% rename from users/guanranwang/nixos/profiles/device-type/desktop/home/scripts/bin/wrapped-swww rename to users/guanranwang/nixos/profiles/common/graphical/home/scripts/bin/wrapped-swww diff --git a/users/guanranwang/nixos/profiles/device-type/desktop/home/scripts/default.nix b/users/guanranwang/nixos/profiles/common/graphical/home/scripts/default.nix similarity index 100% rename from users/guanranwang/nixos/profiles/device-type/desktop/home/scripts/default.nix rename to users/guanranwang/nixos/profiles/common/graphical/home/scripts/default.nix diff --git a/users/guanranwang/nixos/profiles/device-type/desktop/home/theme.nix b/users/guanranwang/nixos/profiles/common/graphical/home/theme.nix similarity index 100% rename from users/guanranwang/nixos/profiles/device-type/desktop/home/theme.nix rename to users/guanranwang/nixos/profiles/common/graphical/home/theme.nix diff --git a/users/guanranwang/nixos/profiles/device-type/desktop/home/wallpapers/default.nix b/users/guanranwang/nixos/profiles/common/graphical/home/wallpapers/default.nix similarity index 100% rename from users/guanranwang/nixos/profiles/device-type/desktop/home/wallpapers/default.nix rename to users/guanranwang/nixos/profiles/common/graphical/home/wallpapers/default.nix diff --git a/users/guanranwang/nixos/profiles/device-type/desktop/home/wallpapers/wallpapers/Minato-Aqua-Dark.png b/users/guanranwang/nixos/profiles/common/graphical/home/wallpapers/wallpapers/Minato-Aqua-Dark.png similarity index 100% rename from users/guanranwang/nixos/profiles/device-type/desktop/home/wallpapers/wallpapers/Minato-Aqua-Dark.png rename to users/guanranwang/nixos/profiles/common/graphical/home/wallpapers/wallpapers/Minato-Aqua-Dark.png diff --git a/users/guanranwang/nixos/profiles/device-type/desktop/home/wallpapers/wallpapers/Minato-Aqua.png b/users/guanranwang/nixos/profiles/common/graphical/home/wallpapers/wallpapers/Minato-Aqua.png similarity index 100% rename from users/guanranwang/nixos/profiles/device-type/desktop/home/wallpapers/wallpapers/Minato-Aqua.png rename to users/guanranwang/nixos/profiles/common/graphical/home/wallpapers/wallpapers/Minato-Aqua.png diff --git a/users/guanranwang/nixos/profiles/device-type/desktop/home/wallpapers/wallpapers/unixcloud.jpg b/users/guanranwang/nixos/profiles/common/graphical/home/wallpapers/wallpapers/unixcloud.jpg similarity index 100% rename from users/guanranwang/nixos/profiles/device-type/desktop/home/wallpapers/wallpapers/unixcloud.jpg rename to users/guanranwang/nixos/profiles/common/graphical/home/wallpapers/wallpapers/unixcloud.jpg diff --git a/users/guanranwang/nixos/profiles/device-type/desktop/home/xdg-mime.nix b/users/guanranwang/nixos/profiles/common/graphical/home/xdg-mime.nix similarity index 100% rename from users/guanranwang/nixos/profiles/device-type/desktop/home/xdg-mime.nix rename to users/guanranwang/nixos/profiles/common/graphical/home/xdg-mime.nix diff --git a/users/guanranwang/nixos/profiles/device-type/laptop/default.nix b/users/guanranwang/nixos/profiles/common/mobile/default.nix similarity index 54% rename from users/guanranwang/nixos/profiles/device-type/laptop/default.nix rename to users/guanranwang/nixos/profiles/common/mobile/default.nix index d26ea13..3519407 100644 --- a/users/guanranwang/nixos/profiles/device-type/laptop/default.nix +++ b/users/guanranwang/nixos/profiles/common/mobile/default.nix @@ -1,7 +1,3 @@ -{...}: { - imports = [ - ../desktop - ]; - +_: { home-manager.users.guanranwang = import ./home; } diff --git a/users/guanranwang/nixos/profiles/device-type/laptop/home/default.nix b/users/guanranwang/nixos/profiles/common/mobile/home/default.nix similarity index 100% rename from users/guanranwang/nixos/profiles/device-type/laptop/home/default.nix rename to users/guanranwang/nixos/profiles/common/mobile/home/default.nix diff --git a/users/guanranwang/nixos/profiles/opt-in/_hysteria2-server.nix b/users/guanranwang/nixos/profiles/common/opt-in/_hysteria2-server.nix similarity index 100% rename from users/guanranwang/nixos/profiles/opt-in/_hysteria2-server.nix rename to users/guanranwang/nixos/profiles/common/opt-in/_hysteria2-server.nix diff --git a/users/guanranwang/nixos/profiles/opt-in/_juicity-server.nix b/users/guanranwang/nixos/profiles/common/opt-in/_juicity-server.nix similarity index 100% rename from users/guanranwang/nixos/profiles/opt-in/_juicity-server.nix rename to users/guanranwang/nixos/profiles/common/opt-in/_juicity-server.nix diff --git a/users/guanranwang/nixos/profiles/opt-in/clash-meta-client/config.yaml b/users/guanranwang/nixos/profiles/common/opt-in/clash-meta-client/config.yaml similarity index 99% rename from users/guanranwang/nixos/profiles/opt-in/clash-meta-client/config.yaml rename to users/guanranwang/nixos/profiles/common/opt-in/clash-meta-client/config.yaml index 2c0bee5..11e9184 100644 --- a/users/guanranwang/nixos/profiles/opt-in/clash-meta-client/config.yaml +++ b/users/guanranwang/nixos/profiles/common/opt-in/clash-meta-client/config.yaml @@ -119,4 +119,4 @@ rules: - GEOIP, twitter, Twitter - GEOSITE, CN, 国内 - GEOIP, CN, 国内 - - MATCH, 其他 + - MATCH, 其他 \ No newline at end of file diff --git a/users/guanranwang/nixos/profiles/opt-in/clash-meta-client/default.nix b/users/guanranwang/nixos/profiles/common/opt-in/clash-meta-client/default.nix similarity index 100% rename from users/guanranwang/nixos/profiles/opt-in/clash-meta-client/default.nix rename to users/guanranwang/nixos/profiles/common/opt-in/clash-meta-client/default.nix diff --git a/users/guanranwang/nixos/profiles/opt-in/gaming/default.nix b/users/guanranwang/nixos/profiles/common/opt-in/gaming/default.nix similarity index 100% rename from users/guanranwang/nixos/profiles/opt-in/gaming/default.nix rename to users/guanranwang/nixos/profiles/common/opt-in/gaming/default.nix diff --git a/users/guanranwang/nixos/profiles/opt-in/gaming/home/default.nix b/users/guanranwang/nixos/profiles/common/opt-in/gaming/home/default.nix similarity index 57% rename from users/guanranwang/nixos/profiles/opt-in/gaming/home/default.nix rename to users/guanranwang/nixos/profiles/common/opt-in/gaming/home/default.nix index 1445d1f..cab065b 100644 --- a/users/guanranwang/nixos/profiles/opt-in/gaming/home/default.nix +++ b/users/guanranwang/nixos/profiles/common/opt-in/gaming/home/default.nix @@ -1,5 +1,5 @@ {...}: { - imports = map (n: ../../../../../home-manager/applications/${n}) [ + imports = map (n: ../../../../../../home-manager/applications/${n}) [ "steam" "prismlauncher" "osu-lazer" diff --git a/users/guanranwang/nixos/profiles/opt-in/torrenting/default.nix b/users/guanranwang/nixos/profiles/common/opt-in/torrenting/default.nix similarity index 100% rename from users/guanranwang/nixos/profiles/opt-in/torrenting/default.nix rename to users/guanranwang/nixos/profiles/common/opt-in/torrenting/default.nix diff --git a/users/guanranwang/nixos/profiles/common/opt-in/torrenting/home/default.nix b/users/guanranwang/nixos/profiles/common/opt-in/torrenting/home/default.nix new file mode 100644 index 0000000..cb3a063 --- /dev/null +++ b/users/guanranwang/nixos/profiles/common/opt-in/torrenting/home/default.nix @@ -0,0 +1,5 @@ +{...}: { + imports = [ + ../../../../../../home-manager/applications/qbittorrent + ]; +} diff --git a/users/guanranwang/nixos/profiles/core/home/default.nix b/users/guanranwang/nixos/profiles/core/home/default.nix deleted file mode 100644 index c903002..0000000 --- a/users/guanranwang/nixos/profiles/core/home/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{...}: { - imports = [ - ../../../../home-manager - ../../../../home-manager/applications/trashy - ]; -} diff --git a/users/guanranwang/nixos/profiles/desktop/default.nix b/users/guanranwang/nixos/profiles/desktop/default.nix new file mode 100644 index 0000000..321c287 --- /dev/null +++ b/users/guanranwang/nixos/profiles/desktop/default.nix @@ -0,0 +1,6 @@ +{...}: { + imports = [ + ../common/core + ../common/graphical + ]; +} diff --git a/users/guanranwang/nixos/profiles/laptop/default.nix b/users/guanranwang/nixos/profiles/laptop/default.nix new file mode 100644 index 0000000..fbd7c26 --- /dev/null +++ b/users/guanranwang/nixos/profiles/laptop/default.nix @@ -0,0 +1,7 @@ +{...}: { + imports = [ + ../common/core + ../common/graphical + ../common/mobile + ]; +} diff --git a/users/guanranwang/nixos/profiles/opt-in/torrenting/home/default.nix b/users/guanranwang/nixos/profiles/opt-in/torrenting/home/default.nix deleted file mode 100644 index 257fdb4..0000000 --- a/users/guanranwang/nixos/profiles/opt-in/torrenting/home/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{...}: { - imports = [ - ../../../../../home-manager/applications/qbittorrent - ]; -}