diff --git a/.gitmodules b/.gitmodules index a10035d..8c715d4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,29 +1,29 @@ -[submodule "flakes/home-manager/guanranwang/common/dotfiles/config/alacritty/catppuccin"] - path = flakes/home-manager/guanranwang/common/dotfiles/config/alacritty/catppuccin +[submodule "users/guanranwang/home-manager/common/dotfiles/config/alacritty/catppuccin"] + path = users/guanranwang/home-manager/common/dotfiles/config/alacritty/catppuccin url = https://github.com/catppuccin/catppuccin.git -[submodule "flakes/home-manager/guanranwang/common/dotfiles/config/clash/yacd"] - path = flakes/home-manager/guanranwang/common/dotfiles/config/clash/yacd +[submodule "users/guanranwang/home-manager/common/dotfiles/config/clash/yacd"] + path = users/guanranwang/home-manager/common/dotfiles/config/clash/yacd url = https://github.com/haishanh/yacd.git branch = gh-pages -[submodule "flakes/home-manager/guanranwang/common/dotfiles/config/clash/metacubexd"] - path = flakes/home-manager/guanranwang/common/dotfiles/config/clash/metacubexd +[submodule "users/guanranwang/home-manager/common/dotfiles/config/clash/metacubexd"] + path = users/guanranwang/home-manager/common/dotfiles/config/clash/metacubexd url = https://github.com/MetaCubeX/metacubexd.git branch = gh-pages -[submodule "flakes/home-manager/guanranwang/common/dotfiles/config/zsh/fast-syntax-highlighting"] - path = flakes/home-manager/guanranwang/common/dotfiles/config/zsh/fast-syntax-highlighting +[submodule "users/guanranwang/home-manager/common/dotfiles/config/zsh/fast-syntax-highlighting"] + path = users/guanranwang/home-manager/common/dotfiles/config/zsh/fast-syntax-highlighting url = https://github.com/zdharma-continuum/fast-syntax-highlighting.git -[submodule "flakes/home-manager/guanranwang/common/dotfiles/config/zsh/fzf-tab"] - path = flakes/home-manager/guanranwang/common/dotfiles/config/zsh/fzf-tab +[submodule "users/guanranwang/home-manager/common/dotfiles/config/zsh/fzf-tab"] + path = users/guanranwang/home-manager/common/dotfiles/config/zsh/fzf-tab url = https://github.com/Aloxaf/fzf-tab.git -[submodule "flakes/home-manager/guanranwang/common/dotfiles/config/zsh/powerlevel10k"] - path = flakes/home-manager/guanranwang/common/dotfiles/config/zsh/powerlevel10k +[submodule "users/guanranwang/home-manager/common/dotfiles/config/zsh/powerlevel10k"] + path = users/guanranwang/home-manager/common/dotfiles/config/zsh/powerlevel10k url = https://github.com/romkatv/powerlevel10k.git -[submodule "flakes/home-manager/guanranwang/common/dotfiles/config/zsh/zsh-autosuggestions"] - path = flakes/home-manager/guanranwang/common/dotfiles/config/zsh/zsh-autosuggestions +[submodule "users/guanranwang/home-manager/common/dotfiles/config/zsh/zsh-autosuggestions"] + path = users/guanranwang/home-manager/common/dotfiles/config/zsh/zsh-autosuggestions url = https://github.com/zsh-users/zsh-autosuggestions.git -[submodule "flakes/home-manager/guanranwang/common/dotfiles/config/zsh/zsh-history-substring-search"] - path = flakes/home-manager/guanranwang/common/dotfiles/config/zsh/zsh-history-substring-search +[submodule "users/guanranwang/home-manager/common/dotfiles/config/zsh/zsh-history-substring-search"] + path = users/guanranwang/home-manager/common/dotfiles/config/zsh/zsh-history-substring-search url = https://github.com/zsh-users/zsh-history-substring-search.git -[submodule "flakes/home-manager/guanranwang/common/dotfiles/config/zsh/zsh-syntax-highlighting"] - path = flakes/home-manager/guanranwang/common/dotfiles/config/zsh/zsh-syntax-highlighting +[submodule "users/guanranwang/home-manager/common/dotfiles/config/zsh/zsh-syntax-highlighting"] + path = users/guanranwang/home-manager/common/dotfiles/config/zsh/zsh-syntax-highlighting url = https://github.com/zsh-users/zsh-syntax-highlighting.git diff --git a/flakes/darwin/input.nix b/darwin/input.nix similarity index 100% rename from flakes/darwin/input.nix rename to darwin/input.nix diff --git a/flakes/darwin/main.nix b/darwin/main.nix similarity index 100% rename from flakes/darwin/main.nix rename to darwin/main.nix diff --git a/flakes/darwin/networking/default.nix b/darwin/networking/default.nix similarity index 100% rename from flakes/darwin/networking/default.nix rename to darwin/networking/default.nix diff --git a/flakes/darwin/networking/dns.nix b/darwin/networking/dns.nix similarity index 100% rename from flakes/darwin/networking/dns.nix rename to darwin/networking/dns.nix diff --git a/flakes/darwin/packages/default.nix b/darwin/packages/default.nix similarity index 100% rename from flakes/darwin/packages/default.nix rename to darwin/packages/default.nix diff --git a/flakes/darwin/packages/homebrew.nix b/darwin/packages/homebrew.nix similarity index 100% rename from flakes/darwin/packages/homebrew.nix rename to darwin/packages/homebrew.nix diff --git a/flakes/darwin/users/default.nix b/darwin/users/default.nix similarity index 100% rename from flakes/darwin/users/default.nix rename to darwin/users/default.nix diff --git a/flakes/darwin/users/guanranwang.nix b/darwin/users/guanranwang.nix similarity index 100% rename from flakes/darwin/users/guanranwang.nix rename to darwin/users/guanranwang.nix diff --git a/flake.nix b/flake.nix index f5b9585..22c8486 100755 --- a/flake.nix +++ b/flake.nix @@ -65,6 +65,7 @@ specialArgs = { inherit inputs; }; modules = [ ./machines/nixos/81fw-lenovo-legion-y7000.nix + ./users/guanranwang/nixos.nix # Overlays { @@ -90,7 +91,8 @@ home-manager = { useGlobalPkgs = true; useUserPackages = true; - users.guanranwang = import ./flakes/home-manager/guanranwang/nixos; + # users,user, flake, os. + users.guanranwang = import ./users/guanranwang/home-manager/nixos; extraSpecialArgs = { inherit inputs; }; # ??? isnt specialArgs imported by default ??? }; @@ -111,7 +113,7 @@ ({ config, ... }: { sops = { - defaultSopsFile = ./secrets/secrets.yaml; + defaultSopsFile = ./users/guanranwang/secrets/secrets.yaml; age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; secrets = { "clash-config" = { @@ -134,13 +136,14 @@ specialArgs = { inherit inputs; }; modules = [ ./machines/nixos/imac-2017.nix + ./users/guanranwag/nixos.nix home-manager.nixosModules.home-manager { home-manager = { useGlobalPkgs = true; useUserPackages = true; - users.guanranwang = import ./flakes/home-manager/guanranwang/nixos; + users.guanranwang = import ./users/guananwnng/home-manager/nixos; }; } diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/alacritty/catppuccin b/flakes/home-manager/guanranwang/common/dotfiles/config/alacritty/catppuccin deleted file mode 160000 index 1c5a013..0000000 --- a/flakes/home-manager/guanranwang/common/dotfiles/config/alacritty/catppuccin +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1c5a013e5ff13061126af92c667b47d5f9b5013c diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/clash/metacubexd b/flakes/home-manager/guanranwang/common/dotfiles/config/clash/metacubexd deleted file mode 160000 index d33141c..0000000 --- a/flakes/home-manager/guanranwang/common/dotfiles/config/clash/metacubexd +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d33141ce58fae07c5b040acaf745e9dc1e1c46e5 diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/clash/yacd b/flakes/home-manager/guanranwang/common/dotfiles/config/clash/yacd deleted file mode 160000 index 1cc1556..0000000 --- a/flakes/home-manager/guanranwang/common/dotfiles/config/clash/yacd +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1cc15568c4136fa1dc4452eb77d8855e20f809cf diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/zsh/fast-syntax-highlighting b/flakes/home-manager/guanranwang/common/dotfiles/config/zsh/fast-syntax-highlighting deleted file mode 160000 index cf318e0..0000000 --- a/flakes/home-manager/guanranwang/common/dotfiles/config/zsh/fast-syntax-highlighting +++ /dev/null @@ -1 +0,0 @@ -Subproject commit cf318e06a9b7c9f2219d78f41b46fa6e06011fd9 diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/zsh/fzf-tab b/flakes/home-manager/guanranwang/common/dotfiles/config/zsh/fzf-tab deleted file mode 160000 index c2b4aa5..0000000 --- a/flakes/home-manager/guanranwang/common/dotfiles/config/zsh/fzf-tab +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c2b4aa5ad2532cca91f23908ac7f00efb7ff09c9 diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/zsh/powerlevel10k b/flakes/home-manager/guanranwang/common/dotfiles/config/zsh/powerlevel10k deleted file mode 160000 index 873c4ff..0000000 --- a/flakes/home-manager/guanranwang/common/dotfiles/config/zsh/powerlevel10k +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 873c4ff09c559a507d33e528df7e27a8a48705d7 diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/zsh/zsh-autosuggestions b/flakes/home-manager/guanranwang/common/dotfiles/config/zsh/zsh-autosuggestions deleted file mode 160000 index c3d4e57..0000000 --- a/flakes/home-manager/guanranwang/common/dotfiles/config/zsh/zsh-autosuggestions +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c3d4e576c9c86eac62884bd47c01f6faed043fc5 diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/zsh/zsh-history-substring-search b/flakes/home-manager/guanranwang/common/dotfiles/config/zsh/zsh-history-substring-search deleted file mode 160000 index 400e58a..0000000 --- a/flakes/home-manager/guanranwang/common/dotfiles/config/zsh/zsh-history-substring-search +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 400e58a87f72ecec14f783fbd29bc6be4ff1641c diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/zsh/zsh-syntax-highlighting b/flakes/home-manager/guanranwang/common/dotfiles/config/zsh/zsh-syntax-highlighting deleted file mode 160000 index 143b25e..0000000 --- a/flakes/home-manager/guanranwang/common/dotfiles/config/zsh/zsh-syntax-highlighting +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 143b25eb98aa3227af63bd7f04413e1b3e7888ec diff --git a/nixos/networking/proxy.nix b/nixos/networking/proxy.nix index 2389270..ef52978 100644 --- a/nixos/networking/proxy.nix +++ b/nixos/networking/proxy.nix @@ -32,5 +32,5 @@ }; }; - environment.etc."clash-meta/metacubexd".source = ../../flakes/home-manager/guanranwang/common/dotfiles/config/clash/metacubexd; + environment.etc."clash-meta/metacubexd".source = ../../users/guanranwang/home-manager/common/dotfiles/config/clash/metacubexd; } \ No newline at end of file diff --git a/nixos/users/default.nix b/nixos/users/default.nix index da2dad8..d5afd53 100644 --- a/nixos/users/default.nix +++ b/nixos/users/default.nix @@ -4,6 +4,5 @@ imports = [ ./users.nix ./system-users.nix - ./normal-users/guanranwang.nix ]; } \ No newline at end of file diff --git a/flakes/home-manager/guanranwang/common/dotfiles/.drirc b/users/guanranwang/home-manager/common/dotfiles/.drirc similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/.drirc rename to users/guanranwang/home-manager/common/dotfiles/.drirc diff --git a/flakes/home-manager/guanranwang/common/dotfiles/.xinitrc b/users/guanranwang/home-manager/common/dotfiles/.xinitrc similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/.xinitrc rename to users/guanranwang/home-manager/common/dotfiles/.xinitrc diff --git a/flakes/home-manager/guanranwang/common/dotfiles/bin/batterynotify b/users/guanranwang/home-manager/common/dotfiles/bin/batterynotify similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/bin/batterynotify rename to users/guanranwang/home-manager/common/dotfiles/bin/batterynotify diff --git a/flakes/home-manager/guanranwang/common/dotfiles/bin/chargingnotify b/users/guanranwang/home-manager/common/dotfiles/bin/chargingnotify similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/bin/chargingnotify rename to users/guanranwang/home-manager/common/dotfiles/bin/chargingnotify diff --git a/flakes/home-manager/guanranwang/common/dotfiles/bin/font-inter b/users/guanranwang/home-manager/common/dotfiles/bin/font-inter similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/bin/font-inter rename to users/guanranwang/home-manager/common/dotfiles/bin/font-inter diff --git a/flakes/home-manager/guanranwang/common/dotfiles/bin/font-noto-sans b/users/guanranwang/home-manager/common/dotfiles/bin/font-noto-sans similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/bin/font-noto-sans rename to users/guanranwang/home-manager/common/dotfiles/bin/font-noto-sans diff --git a/flakes/home-manager/guanranwang/common/dotfiles/bin/font-torus b/users/guanranwang/home-manager/common/dotfiles/bin/font-torus similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/bin/font-torus rename to users/guanranwang/home-manager/common/dotfiles/bin/font-torus diff --git a/flakes/home-manager/guanranwang/common/dotfiles/bin/hyprland-autostart b/users/guanranwang/home-manager/common/dotfiles/bin/hyprland-autostart similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/bin/hyprland-autostart rename to users/guanranwang/home-manager/common/dotfiles/bin/hyprland-autostart diff --git a/flakes/home-manager/guanranwang/common/dotfiles/bin/hyprland-gamemode b/users/guanranwang/home-manager/common/dotfiles/bin/hyprland-gamemode similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/bin/hyprland-gamemode rename to users/guanranwang/home-manager/common/dotfiles/bin/hyprland-gamemode diff --git a/flakes/home-manager/guanranwang/common/dotfiles/bin/lofi b/users/guanranwang/home-manager/common/dotfiles/bin/lofi similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/bin/lofi rename to users/guanranwang/home-manager/common/dotfiles/bin/lofi diff --git a/flakes/home-manager/guanranwang/common/dotfiles/bin/minecraft-inputfix b/users/guanranwang/home-manager/common/dotfiles/bin/minecraft-inputfix similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/bin/minecraft-inputfix rename to users/guanranwang/home-manager/common/dotfiles/bin/minecraft-inputfix diff --git a/flakes/home-manager/guanranwang/common/dotfiles/bin/update-hosts b/users/guanranwang/home-manager/common/dotfiles/bin/update-hosts similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/bin/update-hosts rename to users/guanranwang/home-manager/common/dotfiles/bin/update-hosts diff --git a/flakes/home-manager/guanranwang/common/dotfiles/bin/wrapped-brightnessctl b/users/guanranwang/home-manager/common/dotfiles/bin/wrapped-brightnessctl similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/bin/wrapped-brightnessctl rename to users/guanranwang/home-manager/common/dotfiles/bin/wrapped-brightnessctl diff --git a/flakes/home-manager/guanranwang/common/dotfiles/bin/wrapped-mpvpaper b/users/guanranwang/home-manager/common/dotfiles/bin/wrapped-mpvpaper similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/bin/wrapped-mpvpaper rename to users/guanranwang/home-manager/common/dotfiles/bin/wrapped-mpvpaper diff --git a/flakes/home-manager/guanranwang/common/dotfiles/bin/wrapped-pamixer b/users/guanranwang/home-manager/common/dotfiles/bin/wrapped-pamixer similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/bin/wrapped-pamixer rename to users/guanranwang/home-manager/common/dotfiles/bin/wrapped-pamixer diff --git a/flakes/home-manager/guanranwang/common/dotfiles/bin/wrapped-slurp b/users/guanranwang/home-manager/common/dotfiles/bin/wrapped-slurp similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/bin/wrapped-slurp rename to users/guanranwang/home-manager/common/dotfiles/bin/wrapped-slurp diff --git a/flakes/home-manager/guanranwang/common/dotfiles/bin/wrapped-swaylock-effects b/users/guanranwang/home-manager/common/dotfiles/bin/wrapped-swaylock-effects similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/bin/wrapped-swaylock-effects rename to users/guanranwang/home-manager/common/dotfiles/bin/wrapped-swaylock-effects diff --git a/flakes/home-manager/guanranwang/common/dotfiles/bin/wrapped-swww b/users/guanranwang/home-manager/common/dotfiles/bin/wrapped-swww similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/bin/wrapped-swww rename to users/guanranwang/home-manager/common/dotfiles/bin/wrapped-swww diff --git a/flakes/home-manager/guanranwang/common/dotfiles/bin/wrapped-wayshot b/users/guanranwang/home-manager/common/dotfiles/bin/wrapped-wayshot similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/bin/wrapped-wayshot rename to users/guanranwang/home-manager/common/dotfiles/bin/wrapped-wayshot diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/alacritty/tokyonight/tokyonight_day.yml b/users/guanranwang/home-manager/common/dotfiles/config/alacritty/tokyonight/tokyonight_day.yml similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/alacritty/tokyonight/tokyonight_day.yml rename to users/guanranwang/home-manager/common/dotfiles/config/alacritty/tokyonight/tokyonight_day.yml diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/alacritty/tokyonight/tokyonight_moon.yml b/users/guanranwang/home-manager/common/dotfiles/config/alacritty/tokyonight/tokyonight_moon.yml similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/alacritty/tokyonight/tokyonight_moon.yml rename to users/guanranwang/home-manager/common/dotfiles/config/alacritty/tokyonight/tokyonight_moon.yml diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/alacritty/tokyonight/tokyonight_night.yml b/users/guanranwang/home-manager/common/dotfiles/config/alacritty/tokyonight/tokyonight_night.yml similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/alacritty/tokyonight/tokyonight_night.yml rename to users/guanranwang/home-manager/common/dotfiles/config/alacritty/tokyonight/tokyonight_night.yml diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/alacritty/tokyonight/tokyonight_storm.yml b/users/guanranwang/home-manager/common/dotfiles/config/alacritty/tokyonight/tokyonight_storm.yml similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/alacritty/tokyonight/tokyonight_storm.yml rename to users/guanranwang/home-manager/common/dotfiles/config/alacritty/tokyonight/tokyonight_storm.yml diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/alsoft.conf b/users/guanranwang/home-manager/common/dotfiles/config/alsoft.conf similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/alsoft.conf rename to users/guanranwang/home-manager/common/dotfiles/config/alsoft.conf diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/dunst/dunstrc b/users/guanranwang/home-manager/common/dotfiles/config/dunst/dunstrc similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/dunst/dunstrc rename to users/guanranwang/home-manager/common/dotfiles/config/dunst/dunstrc diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/fish/fish_plugins b/users/guanranwang/home-manager/common/dotfiles/config/fish/fish_plugins similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/fish/fish_plugins rename to users/guanranwang/home-manager/common/dotfiles/config/fish/fish_plugins diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/fish/themes/tokyonight_day.theme b/users/guanranwang/home-manager/common/dotfiles/config/fish/themes/tokyonight_day.theme similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/fish/themes/tokyonight_day.theme rename to users/guanranwang/home-manager/common/dotfiles/config/fish/themes/tokyonight_day.theme diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/fish/themes/tokyonight_moon.theme b/users/guanranwang/home-manager/common/dotfiles/config/fish/themes/tokyonight_moon.theme similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/fish/themes/tokyonight_moon.theme rename to users/guanranwang/home-manager/common/dotfiles/config/fish/themes/tokyonight_moon.theme diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/fish/themes/tokyonight_night.theme b/users/guanranwang/home-manager/common/dotfiles/config/fish/themes/tokyonight_night.theme similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/fish/themes/tokyonight_night.theme rename to users/guanranwang/home-manager/common/dotfiles/config/fish/themes/tokyonight_night.theme diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/fish/themes/tokyonight_storm.theme b/users/guanranwang/home-manager/common/dotfiles/config/fish/themes/tokyonight_storm.theme similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/fish/themes/tokyonight_storm.theme rename to users/guanranwang/home-manager/common/dotfiles/config/fish/themes/tokyonight_storm.theme diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/fish/tokyonight_day.fish b/users/guanranwang/home-manager/common/dotfiles/config/fish/tokyonight_day.fish similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/fish/tokyonight_day.fish rename to users/guanranwang/home-manager/common/dotfiles/config/fish/tokyonight_day.fish diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/fish/tokyonight_moon.fish b/users/guanranwang/home-manager/common/dotfiles/config/fish/tokyonight_moon.fish similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/fish/tokyonight_moon.fish rename to users/guanranwang/home-manager/common/dotfiles/config/fish/tokyonight_moon.fish diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/fish/tokyonight_night.fish b/users/guanranwang/home-manager/common/dotfiles/config/fish/tokyonight_night.fish similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/fish/tokyonight_night.fish rename to users/guanranwang/home-manager/common/dotfiles/config/fish/tokyonight_night.fish diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/fish/tokyonight_storm.fish b/users/guanranwang/home-manager/common/dotfiles/config/fish/tokyonight_storm.fish similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/fish/tokyonight_storm.fish rename to users/guanranwang/home-manager/common/dotfiles/config/fish/tokyonight_storm.fish diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/fontconfig/conf.d/qt-fonts.conf b/users/guanranwang/home-manager/common/dotfiles/config/fontconfig/conf.d/qt-fonts.conf similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/fontconfig/conf.d/qt-fonts.conf rename to users/guanranwang/home-manager/common/dotfiles/config/fontconfig/conf.d/qt-fonts.conf diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/fontconfig/conf.d/web-ui-fonts.conf b/users/guanranwang/home-manager/common/dotfiles/config/fontconfig/conf.d/web-ui-fonts.conf similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/fontconfig/conf.d/web-ui-fonts.conf rename to users/guanranwang/home-manager/common/dotfiles/config/fontconfig/conf.d/web-ui-fonts.conf diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/fontconfig/fonts.conf b/users/guanranwang/home-manager/common/dotfiles/config/fontconfig/fonts.conf similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/fontconfig/fonts.conf rename to users/guanranwang/home-manager/common/dotfiles/config/fontconfig/fonts.conf diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/foot/foot.ini b/users/guanranwang/home-manager/common/dotfiles/config/foot/foot.ini similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/foot/foot.ini rename to users/guanranwang/home-manager/common/dotfiles/config/foot/foot.ini diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/hyprland/autostart.conf b/users/guanranwang/home-manager/common/dotfiles/config/hyprland/autostart.conf similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/hyprland/autostart.conf rename to users/guanranwang/home-manager/common/dotfiles/config/hyprland/autostart.conf diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/hyprland/env.conf b/users/guanranwang/home-manager/common/dotfiles/config/hyprland/env.conf similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/hyprland/env.conf rename to users/guanranwang/home-manager/common/dotfiles/config/hyprland/env.conf diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/hyprland/hyprland.bak b/users/guanranwang/home-manager/common/dotfiles/config/hyprland/hyprland.bak similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/hyprland/hyprland.bak rename to users/guanranwang/home-manager/common/dotfiles/config/hyprland/hyprland.bak diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/hyprland/hyprpaper.conf b/users/guanranwang/home-manager/common/dotfiles/config/hyprland/hyprpaper.conf similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/hyprland/hyprpaper.conf rename to users/guanranwang/home-manager/common/dotfiles/config/hyprland/hyprpaper.conf diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/hyprland/keybinds.conf b/users/guanranwang/home-manager/common/dotfiles/config/hyprland/keybinds.conf similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/hyprland/keybinds.conf rename to users/guanranwang/home-manager/common/dotfiles/config/hyprland/keybinds.conf diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/hyprland/main.conf b/users/guanranwang/home-manager/common/dotfiles/config/hyprland/main.conf similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/hyprland/main.conf rename to users/guanranwang/home-manager/common/dotfiles/config/hyprland/main.conf diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/hyprland/plugins.conf b/users/guanranwang/home-manager/common/dotfiles/config/hyprland/plugins.conf similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/hyprland/plugins.conf rename to users/guanranwang/home-manager/common/dotfiles/config/hyprland/plugins.conf diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/hyprland/themes/colors.conf b/users/guanranwang/home-manager/common/dotfiles/config/hyprland/themes/colors.conf similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/hyprland/themes/colors.conf rename to users/guanranwang/home-manager/common/dotfiles/config/hyprland/themes/colors.conf diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/hyprland/themes/frappe.conf b/users/guanranwang/home-manager/common/dotfiles/config/hyprland/themes/frappe.conf similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/hyprland/themes/frappe.conf rename to users/guanranwang/home-manager/common/dotfiles/config/hyprland/themes/frappe.conf diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/hyprland/themes/latte.conf b/users/guanranwang/home-manager/common/dotfiles/config/hyprland/themes/latte.conf similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/hyprland/themes/latte.conf rename to users/guanranwang/home-manager/common/dotfiles/config/hyprland/themes/latte.conf diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/hyprland/themes/macchiato.conf b/users/guanranwang/home-manager/common/dotfiles/config/hyprland/themes/macchiato.conf similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/hyprland/themes/macchiato.conf rename to users/guanranwang/home-manager/common/dotfiles/config/hyprland/themes/macchiato.conf diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/hyprland/themes/mocha.conf b/users/guanranwang/home-manager/common/dotfiles/config/hyprland/themes/mocha.conf similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/hyprland/themes/mocha.conf rename to users/guanranwang/home-manager/common/dotfiles/config/hyprland/themes/mocha.conf diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/kitty/dracula.conf b/users/guanranwang/home-manager/common/dotfiles/config/kitty/dracula.conf similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/kitty/dracula.conf rename to users/guanranwang/home-manager/common/dotfiles/config/kitty/dracula.conf diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/kitty/frappe.conf b/users/guanranwang/home-manager/common/dotfiles/config/kitty/frappe.conf similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/kitty/frappe.conf rename to users/guanranwang/home-manager/common/dotfiles/config/kitty/frappe.conf diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/kitty/kitty.conf b/users/guanranwang/home-manager/common/dotfiles/config/kitty/kitty.conf similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/kitty/kitty.conf rename to users/guanranwang/home-manager/common/dotfiles/config/kitty/kitty.conf diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/kitty/latte.conf b/users/guanranwang/home-manager/common/dotfiles/config/kitty/latte.conf similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/kitty/latte.conf rename to users/guanranwang/home-manager/common/dotfiles/config/kitty/latte.conf diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/kitty/macchiato.conf b/users/guanranwang/home-manager/common/dotfiles/config/kitty/macchiato.conf similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/kitty/macchiato.conf rename to users/guanranwang/home-manager/common/dotfiles/config/kitty/macchiato.conf diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/kitty/mocha.conf b/users/guanranwang/home-manager/common/dotfiles/config/kitty/mocha.conf similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/kitty/mocha.conf rename to users/guanranwang/home-manager/common/dotfiles/config/kitty/mocha.conf diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/kitty/tokyonight_day.conf b/users/guanranwang/home-manager/common/dotfiles/config/kitty/tokyonight_day.conf similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/kitty/tokyonight_day.conf rename to users/guanranwang/home-manager/common/dotfiles/config/kitty/tokyonight_day.conf diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/kitty/tokyonight_moon.conf b/users/guanranwang/home-manager/common/dotfiles/config/kitty/tokyonight_moon.conf similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/kitty/tokyonight_moon.conf rename to users/guanranwang/home-manager/common/dotfiles/config/kitty/tokyonight_moon.conf diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/kitty/tokyonight_night.conf b/users/guanranwang/home-manager/common/dotfiles/config/kitty/tokyonight_night.conf similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/kitty/tokyonight_night.conf rename to users/guanranwang/home-manager/common/dotfiles/config/kitty/tokyonight_night.conf diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/kitty/tokyonight_storm.conf b/users/guanranwang/home-manager/common/dotfiles/config/kitty/tokyonight_storm.conf similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/kitty/tokyonight_storm.conf rename to users/guanranwang/home-manager/common/dotfiles/config/kitty/tokyonight_storm.conf diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/makepkgs.conf b/users/guanranwang/home-manager/common/dotfiles/config/makepkgs.conf similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/makepkgs.conf rename to users/guanranwang/home-manager/common/dotfiles/config/makepkgs.conf diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/mpv/fonts/Material-Design-Iconic-Font.ttf b/users/guanranwang/home-manager/common/dotfiles/config/mpv/fonts/Material-Design-Iconic-Font.ttf similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/mpv/fonts/Material-Design-Iconic-Font.ttf rename to users/guanranwang/home-manager/common/dotfiles/config/mpv/fonts/Material-Design-Iconic-Font.ttf diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/mpv/fonts/Netflix Sans Bold.otf b/users/guanranwang/home-manager/common/dotfiles/config/mpv/fonts/Netflix Sans Bold.otf similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/mpv/fonts/Netflix Sans Bold.otf rename to users/guanranwang/home-manager/common/dotfiles/config/mpv/fonts/Netflix Sans Bold.otf diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/mpv/fonts/Netflix Sans Light.otf b/users/guanranwang/home-manager/common/dotfiles/config/mpv/fonts/Netflix Sans Light.otf similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/mpv/fonts/Netflix Sans Light.otf rename to users/guanranwang/home-manager/common/dotfiles/config/mpv/fonts/Netflix Sans Light.otf diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/mpv/fonts/Netflix Sans Medium.otf b/users/guanranwang/home-manager/common/dotfiles/config/mpv/fonts/Netflix Sans Medium.otf similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/mpv/fonts/Netflix Sans Medium.otf rename to users/guanranwang/home-manager/common/dotfiles/config/mpv/fonts/Netflix Sans Medium.otf diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/mpv/input.conf b/users/guanranwang/home-manager/common/dotfiles/config/mpv/input.conf similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/mpv/input.conf rename to users/guanranwang/home-manager/common/dotfiles/config/mpv/input.conf diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/mpv/mpv.conf b/users/guanranwang/home-manager/common/dotfiles/config/mpv/mpv.conf similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/mpv/mpv.conf rename to users/guanranwang/home-manager/common/dotfiles/config/mpv/mpv.conf diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/mpv/script-opts/gif.conf b/users/guanranwang/home-manager/common/dotfiles/config/mpv/script-opts/gif.conf similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/mpv/script-opts/gif.conf rename to users/guanranwang/home-manager/common/dotfiles/config/mpv/script-opts/gif.conf diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/mpv/script-opts/osc.conf b/users/guanranwang/home-manager/common/dotfiles/config/mpv/script-opts/osc.conf similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/mpv/script-opts/osc.conf rename to users/guanranwang/home-manager/common/dotfiles/config/mpv/script-opts/osc.conf diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/mpv/script-opts/thumbfast.conf b/users/guanranwang/home-manager/common/dotfiles/config/mpv/script-opts/thumbfast.conf similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/mpv/script-opts/thumbfast.conf rename to users/guanranwang/home-manager/common/dotfiles/config/mpv/script-opts/thumbfast.conf diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/mpv/scripts/audio_visualizer.lua b/users/guanranwang/home-manager/common/dotfiles/config/mpv/scripts/audio_visualizer.lua similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/mpv/scripts/audio_visualizer.lua rename to users/guanranwang/home-manager/common/dotfiles/config/mpv/scripts/audio_visualizer.lua diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/mpv/scripts/autoload.lua b/users/guanranwang/home-manager/common/dotfiles/config/mpv/scripts/autoload.lua similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/mpv/scripts/autoload.lua rename to users/guanranwang/home-manager/common/dotfiles/config/mpv/scripts/autoload.lua diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/mpv/scripts/copy-time.lua b/users/guanranwang/home-manager/common/dotfiles/config/mpv/scripts/copy-time.lua similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/mpv/scripts/copy-time.lua rename to users/guanranwang/home-manager/common/dotfiles/config/mpv/scripts/copy-time.lua diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/mpv/scripts/cycle-commands.lua b/users/guanranwang/home-manager/common/dotfiles/config/mpv/scripts/cycle-commands.lua similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/mpv/scripts/cycle-commands.lua rename to users/guanranwang/home-manager/common/dotfiles/config/mpv/scripts/cycle-commands.lua diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/mpv/scripts/cycle-profile.lua b/users/guanranwang/home-manager/common/dotfiles/config/mpv/scripts/cycle-profile.lua similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/mpv/scripts/cycle-profile.lua rename to users/guanranwang/home-manager/common/dotfiles/config/mpv/scripts/cycle-profile.lua diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/mpv/scripts/modernx.lua b/users/guanranwang/home-manager/common/dotfiles/config/mpv/scripts/modernx.lua similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/mpv/scripts/modernx.lua rename to users/guanranwang/home-manager/common/dotfiles/config/mpv/scripts/modernx.lua diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/mpv/scripts/mpv-gif.lua b/users/guanranwang/home-manager/common/dotfiles/config/mpv/scripts/mpv-gif.lua similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/mpv/scripts/mpv-gif.lua rename to users/guanranwang/home-manager/common/dotfiles/config/mpv/scripts/mpv-gif.lua diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/mpv/scripts/playlistmanager.lua b/users/guanranwang/home-manager/common/dotfiles/config/mpv/scripts/playlistmanager.lua similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/mpv/scripts/playlistmanager.lua rename to users/guanranwang/home-manager/common/dotfiles/config/mpv/scripts/playlistmanager.lua diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/mpv/scripts/seek-to.lua b/users/guanranwang/home-manager/common/dotfiles/config/mpv/scripts/seek-to.lua similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/mpv/scripts/seek-to.lua rename to users/guanranwang/home-manager/common/dotfiles/config/mpv/scripts/seek-to.lua diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/mpv/scripts/sponsorblock-minimal.lua b/users/guanranwang/home-manager/common/dotfiles/config/mpv/scripts/sponsorblock-minimal.lua similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/mpv/scripts/sponsorblock-minimal.lua rename to users/guanranwang/home-manager/common/dotfiles/config/mpv/scripts/sponsorblock-minimal.lua diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/mpv/scripts/thumbfast.lua b/users/guanranwang/home-manager/common/dotfiles/config/mpv/scripts/thumbfast.lua similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/mpv/scripts/thumbfast.lua rename to users/guanranwang/home-manager/common/dotfiles/config/mpv/scripts/thumbfast.lua diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/mpv/shaders/FSRCNNX_x2_16-0-4-1.glsl b/users/guanranwang/home-manager/common/dotfiles/config/mpv/shaders/FSRCNNX_x2_16-0-4-1.glsl similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/mpv/shaders/FSRCNNX_x2_16-0-4-1.glsl rename to users/guanranwang/home-manager/common/dotfiles/config/mpv/shaders/FSRCNNX_x2_16-0-4-1.glsl diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/mpv/shaders/KrigBilateral.glsl b/users/guanranwang/home-manager/common/dotfiles/config/mpv/shaders/KrigBilateral.glsl similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/mpv/shaders/KrigBilateral.glsl rename to users/guanranwang/home-manager/common/dotfiles/config/mpv/shaders/KrigBilateral.glsl diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/mpv/shaders/SSimDownscaler.glsl b/users/guanranwang/home-manager/common/dotfiles/config/mpv/shaders/SSimDownscaler.glsl similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/mpv/shaders/SSimDownscaler.glsl rename to users/guanranwang/home-manager/common/dotfiles/config/mpv/shaders/SSimDownscaler.glsl diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/mpv/shaders/nnedi3-nns128-win8x4.hook b/users/guanranwang/home-manager/common/dotfiles/config/mpv/shaders/nnedi3-nns128-win8x4.hook similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/mpv/shaders/nnedi3-nns128-win8x4.hook rename to users/guanranwang/home-manager/common/dotfiles/config/mpv/shaders/nnedi3-nns128-win8x4.hook diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/mpv/shaders/nnedi3-nns256-win8x4.hook b/users/guanranwang/home-manager/common/dotfiles/config/mpv/shaders/nnedi3-nns256-win8x4.hook similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/mpv/shaders/nnedi3-nns256-win8x4.hook rename to users/guanranwang/home-manager/common/dotfiles/config/mpv/shaders/nnedi3-nns256-win8x4.hook diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/picom/picom.conf b/users/guanranwang/home-manager/common/dotfiles/config/picom/picom.conf similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/picom/picom.conf rename to users/guanranwang/home-manager/common/dotfiles/config/picom/picom.conf diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/polybar/config.ini b/users/guanranwang/home-manager/common/dotfiles/config/polybar/config.ini similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/polybar/config.ini rename to users/guanranwang/home-manager/common/dotfiles/config/polybar/config.ini diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/rofi/colors.rasi b/users/guanranwang/home-manager/common/dotfiles/config/rofi/colors.rasi similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/rofi/colors.rasi rename to users/guanranwang/home-manager/common/dotfiles/config/rofi/colors.rasi diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/rofi/config.rasi b/users/guanranwang/home-manager/common/dotfiles/config/rofi/config.rasi similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/rofi/config.rasi rename to users/guanranwang/home-manager/common/dotfiles/config/rofi/config.rasi diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/user-tmpfiles.d/discord-rpc.conf b/users/guanranwang/home-manager/common/dotfiles/config/user-tmpfiles.d/discord-rpc.conf similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/user-tmpfiles.d/discord-rpc.conf rename to users/guanranwang/home-manager/common/dotfiles/config/user-tmpfiles.d/discord-rpc.conf diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/waybar/config b/users/guanranwang/home-manager/common/dotfiles/config/waybar/config similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/waybar/config rename to users/guanranwang/home-manager/common/dotfiles/config/waybar/config diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/waybar/config-sway b/users/guanranwang/home-manager/common/dotfiles/config/waybar/config-sway similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/waybar/config-sway rename to users/guanranwang/home-manager/common/dotfiles/config/waybar/config-sway diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/waybar/frappe.css b/users/guanranwang/home-manager/common/dotfiles/config/waybar/frappe.css similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/waybar/frappe.css rename to users/guanranwang/home-manager/common/dotfiles/config/waybar/frappe.css diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/waybar/latte.css b/users/guanranwang/home-manager/common/dotfiles/config/waybar/latte.css similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/waybar/latte.css rename to users/guanranwang/home-manager/common/dotfiles/config/waybar/latte.css diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/waybar/macchiato.css b/users/guanranwang/home-manager/common/dotfiles/config/waybar/macchiato.css similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/waybar/macchiato.css rename to users/guanranwang/home-manager/common/dotfiles/config/waybar/macchiato.css diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/waybar/mocha.css b/users/guanranwang/home-manager/common/dotfiles/config/waybar/mocha.css similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/waybar/mocha.css rename to users/guanranwang/home-manager/common/dotfiles/config/waybar/mocha.css diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/waybar/style.css b/users/guanranwang/home-manager/common/dotfiles/config/waybar/style.css similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/waybar/style.css rename to users/guanranwang/home-manager/common/dotfiles/config/waybar/style.css diff --git a/flakes/home-manager/guanranwang/common/dotfiles/config/zsh/sudo/sudo.plugin.zsh b/users/guanranwang/home-manager/common/dotfiles/config/zsh/sudo/sudo.plugin.zsh similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/config/zsh/sudo/sudo.plugin.zsh rename to users/guanranwang/home-manager/common/dotfiles/config/zsh/sudo/sudo.plugin.zsh diff --git a/flakes/home-manager/guanranwang/common/dotfiles/data/applications/ca.desrt.dconf-editor.desktop b/users/guanranwang/home-manager/common/dotfiles/data/applications/ca.desrt.dconf-editor.desktop similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/data/applications/ca.desrt.dconf-editor.desktop rename to users/guanranwang/home-manager/common/dotfiles/data/applications/ca.desrt.dconf-editor.desktop diff --git a/flakes/home-manager/guanranwang/common/dotfiles/data/applications/com.github.wwmm.easyeffects.desktop b/users/guanranwang/home-manager/common/dotfiles/data/applications/com.github.wwmm.easyeffects.desktop similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/data/applications/com.github.wwmm.easyeffects.desktop rename to users/guanranwang/home-manager/common/dotfiles/data/applications/com.github.wwmm.easyeffects.desktop diff --git a/flakes/home-manager/guanranwang/common/dotfiles/data/applications/io.bassi.Amberol.desktop b/users/guanranwang/home-manager/common/dotfiles/data/applications/io.bassi.Amberol.desktop similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/data/applications/io.bassi.Amberol.desktop rename to users/guanranwang/home-manager/common/dotfiles/data/applications/io.bassi.Amberol.desktop diff --git a/flakes/home-manager/guanranwang/common/dotfiles/data/applications/org.gnome.Calendar.desktop b/users/guanranwang/home-manager/common/dotfiles/data/applications/org.gnome.Calendar.desktop similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/data/applications/org.gnome.Calendar.desktop rename to users/guanranwang/home-manager/common/dotfiles/data/applications/org.gnome.Calendar.desktop diff --git a/flakes/home-manager/guanranwang/common/dotfiles/data/applications/org.gnome.Characters.desktop b/users/guanranwang/home-manager/common/dotfiles/data/applications/org.gnome.Characters.desktop similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/data/applications/org.gnome.Characters.desktop rename to users/guanranwang/home-manager/common/dotfiles/data/applications/org.gnome.Characters.desktop diff --git a/flakes/home-manager/guanranwang/common/dotfiles/data/applications/org.gnome.baobab.desktop b/users/guanranwang/home-manager/common/dotfiles/data/applications/org.gnome.baobab.desktop similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/data/applications/org.gnome.baobab.desktop rename to users/guanranwang/home-manager/common/dotfiles/data/applications/org.gnome.baobab.desktop diff --git a/flakes/home-manager/guanranwang/common/dotfiles/data/applications/org.telegram.desktop.desktop b/users/guanranwang/home-manager/common/dotfiles/data/applications/org.telegram.desktop.desktop similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/data/applications/org.telegram.desktop.desktop rename to users/guanranwang/home-manager/common/dotfiles/data/applications/org.telegram.desktop.desktop diff --git a/flakes/home-manager/guanranwang/common/dotfiles/data/backgrounds/Mojave Night.jpg b/users/guanranwang/home-manager/common/dotfiles/data/backgrounds/Mojave Night.jpg similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/data/backgrounds/Mojave Night.jpg rename to users/guanranwang/home-manager/common/dotfiles/data/backgrounds/Mojave Night.jpg diff --git a/flakes/home-manager/guanranwang/common/dotfiles/data/backgrounds/wallpaper1.png b/users/guanranwang/home-manager/common/dotfiles/data/backgrounds/wallpaper1.png similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/data/backgrounds/wallpaper1.png rename to users/guanranwang/home-manager/common/dotfiles/data/backgrounds/wallpaper1.png diff --git a/flakes/home-manager/guanranwang/common/dotfiles/data/backgrounds/wallpaper2.jpg b/users/guanranwang/home-manager/common/dotfiles/data/backgrounds/wallpaper2.jpg similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/data/backgrounds/wallpaper2.jpg rename to users/guanranwang/home-manager/common/dotfiles/data/backgrounds/wallpaper2.jpg diff --git a/flakes/home-manager/guanranwang/common/dotfiles/data/backgrounds/wallpaper3.jpg b/users/guanranwang/home-manager/common/dotfiles/data/backgrounds/wallpaper3.jpg similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/data/backgrounds/wallpaper3.jpg rename to users/guanranwang/home-manager/common/dotfiles/data/backgrounds/wallpaper3.jpg diff --git a/flakes/home-manager/guanranwang/common/dotfiles/data/backgrounds/wallpaper4.png b/users/guanranwang/home-manager/common/dotfiles/data/backgrounds/wallpaper4.png similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/data/backgrounds/wallpaper4.png rename to users/guanranwang/home-manager/common/dotfiles/data/backgrounds/wallpaper4.png diff --git a/flakes/home-manager/guanranwang/common/dotfiles/data/backgrounds/wallpaper5.png b/users/guanranwang/home-manager/common/dotfiles/data/backgrounds/wallpaper5.png similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/data/backgrounds/wallpaper5.png rename to users/guanranwang/home-manager/common/dotfiles/data/backgrounds/wallpaper5.png diff --git a/flakes/home-manager/guanranwang/common/dotfiles/data/flatpak/overrides/com.github.Eloston.UngoogledChromium b/users/guanranwang/home-manager/common/dotfiles/data/flatpak/overrides/com.github.Eloston.UngoogledChromium similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/data/flatpak/overrides/com.github.Eloston.UngoogledChromium rename to users/guanranwang/home-manager/common/dotfiles/data/flatpak/overrides/com.github.Eloston.UngoogledChromium diff --git a/flakes/home-manager/guanranwang/common/dotfiles/data/flatpak/overrides/com.google.Chrome b/users/guanranwang/home-manager/common/dotfiles/data/flatpak/overrides/com.google.Chrome similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/data/flatpak/overrides/com.google.Chrome rename to users/guanranwang/home-manager/common/dotfiles/data/flatpak/overrides/com.google.Chrome diff --git a/flakes/home-manager/guanranwang/common/dotfiles/data/flatpak/overrides/com.lunarclient.LunarClient b/users/guanranwang/home-manager/common/dotfiles/data/flatpak/overrides/com.lunarclient.LunarClient similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/data/flatpak/overrides/com.lunarclient.LunarClient rename to users/guanranwang/home-manager/common/dotfiles/data/flatpak/overrides/com.lunarclient.LunarClient diff --git a/flakes/home-manager/guanranwang/common/dotfiles/data/flatpak/overrides/com.mojang.Minecraft b/users/guanranwang/home-manager/common/dotfiles/data/flatpak/overrides/com.mojang.Minecraft similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/data/flatpak/overrides/com.mojang.Minecraft rename to users/guanranwang/home-manager/common/dotfiles/data/flatpak/overrides/com.mojang.Minecraft diff --git a/flakes/home-manager/guanranwang/common/dotfiles/data/flatpak/overrides/com.valvesoftware.Steam b/users/guanranwang/home-manager/common/dotfiles/data/flatpak/overrides/com.valvesoftware.Steam similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/data/flatpak/overrides/com.valvesoftware.Steam rename to users/guanranwang/home-manager/common/dotfiles/data/flatpak/overrides/com.valvesoftware.Steam diff --git a/flakes/home-manager/guanranwang/common/dotfiles/data/flatpak/overrides/global b/users/guanranwang/home-manager/common/dotfiles/data/flatpak/overrides/global similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/data/flatpak/overrides/global rename to users/guanranwang/home-manager/common/dotfiles/data/flatpak/overrides/global diff --git a/flakes/home-manager/guanranwang/common/dotfiles/data/flatpak/overrides/im.riot.Riot b/users/guanranwang/home-manager/common/dotfiles/data/flatpak/overrides/im.riot.Riot similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/data/flatpak/overrides/im.riot.Riot rename to users/guanranwang/home-manager/common/dotfiles/data/flatpak/overrides/im.riot.Riot diff --git a/flakes/home-manager/guanranwang/common/dotfiles/data/flatpak/overrides/org.chromium.Chromium b/users/guanranwang/home-manager/common/dotfiles/data/flatpak/overrides/org.chromium.Chromium similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/data/flatpak/overrides/org.chromium.Chromium rename to users/guanranwang/home-manager/common/dotfiles/data/flatpak/overrides/org.chromium.Chromium diff --git a/flakes/home-manager/guanranwang/common/dotfiles/data/flatpak/overrides/org.mozilla.firefox b/users/guanranwang/home-manager/common/dotfiles/data/flatpak/overrides/org.mozilla.firefox similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/data/flatpak/overrides/org.mozilla.firefox rename to users/guanranwang/home-manager/common/dotfiles/data/flatpak/overrides/org.mozilla.firefox diff --git a/flakes/home-manager/guanranwang/common/dotfiles/data/flatpak/overrides/org.prismlauncher.PrismLauncher b/users/guanranwang/home-manager/common/dotfiles/data/flatpak/overrides/org.prismlauncher.PrismLauncher similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/data/flatpak/overrides/org.prismlauncher.PrismLauncher rename to users/guanranwang/home-manager/common/dotfiles/data/flatpak/overrides/org.prismlauncher.PrismLauncher diff --git a/flakes/home-manager/guanranwang/common/dotfiles/data/icons/dunst/battery-alert.png b/users/guanranwang/home-manager/common/dotfiles/data/icons/dunst/battery-alert.png similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/data/icons/dunst/battery-alert.png rename to users/guanranwang/home-manager/common/dotfiles/data/icons/dunst/battery-alert.png diff --git a/flakes/home-manager/guanranwang/common/dotfiles/data/icons/dunst/battery-charging.png b/users/guanranwang/home-manager/common/dotfiles/data/icons/dunst/battery-charging.png similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/data/icons/dunst/battery-charging.png rename to users/guanranwang/home-manager/common/dotfiles/data/icons/dunst/battery-charging.png diff --git a/flakes/home-manager/guanranwang/common/dotfiles/data/icons/dunst/battery.png b/users/guanranwang/home-manager/common/dotfiles/data/icons/dunst/battery.png similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/data/icons/dunst/battery.png rename to users/guanranwang/home-manager/common/dotfiles/data/icons/dunst/battery.png diff --git a/flakes/home-manager/guanranwang/common/dotfiles/data/icons/dunst/volume-high.png b/users/guanranwang/home-manager/common/dotfiles/data/icons/dunst/volume-high.png similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/data/icons/dunst/volume-high.png rename to users/guanranwang/home-manager/common/dotfiles/data/icons/dunst/volume-high.png diff --git a/flakes/home-manager/guanranwang/common/dotfiles/data/icons/dunst/volume-minus.png b/users/guanranwang/home-manager/common/dotfiles/data/icons/dunst/volume-minus.png similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/data/icons/dunst/volume-minus.png rename to users/guanranwang/home-manager/common/dotfiles/data/icons/dunst/volume-minus.png diff --git a/flakes/home-manager/guanranwang/common/dotfiles/data/icons/dunst/volume-mute.png b/users/guanranwang/home-manager/common/dotfiles/data/icons/dunst/volume-mute.png similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/data/icons/dunst/volume-mute.png rename to users/guanranwang/home-manager/common/dotfiles/data/icons/dunst/volume-mute.png diff --git a/flakes/home-manager/guanranwang/common/dotfiles/data/icons/dunst/volume-off.png b/users/guanranwang/home-manager/common/dotfiles/data/icons/dunst/volume-off.png similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/data/icons/dunst/volume-off.png rename to users/guanranwang/home-manager/common/dotfiles/data/icons/dunst/volume-off.png diff --git a/flakes/home-manager/guanranwang/common/dotfiles/data/icons/dunst/volume-plus.png b/users/guanranwang/home-manager/common/dotfiles/data/icons/dunst/volume-plus.png similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/data/icons/dunst/volume-plus.png rename to users/guanranwang/home-manager/common/dotfiles/data/icons/dunst/volume-plus.png diff --git a/flakes/home-manager/guanranwang/common/dotfiles/data/icons/dunst/volume-source.png b/users/guanranwang/home-manager/common/dotfiles/data/icons/dunst/volume-source.png similarity index 100% rename from flakes/home-manager/guanranwang/common/dotfiles/data/icons/dunst/volume-source.png rename to users/guanranwang/home-manager/common/dotfiles/data/icons/dunst/volume-source.png diff --git a/flakes/home-manager/guanranwang/common/home.nix b/users/guanranwang/home-manager/common/home.nix similarity index 100% rename from flakes/home-manager/guanranwang/common/home.nix rename to users/guanranwang/home-manager/common/home.nix diff --git a/flakes/home-manager/guanranwang/darwin/dotfiles.nix b/users/guanranwang/home-manager/darwin/dotfiles.nix similarity index 100% rename from flakes/home-manager/guanranwang/darwin/dotfiles.nix rename to users/guanranwang/home-manager/darwin/dotfiles.nix diff --git a/flakes/home-manager/guanranwang/darwin/home.nix b/users/guanranwang/home-manager/darwin/home.nix similarity index 100% rename from flakes/home-manager/guanranwang/darwin/home.nix rename to users/guanranwang/home-manager/darwin/home.nix diff --git a/flakes/home-manager/guanranwang/nixos/default.nix b/users/guanranwang/home-manager/nixos/default.nix similarity index 100% rename from flakes/home-manager/guanranwang/nixos/default.nix rename to users/guanranwang/home-manager/nixos/default.nix diff --git a/flakes/home-manager/guanranwang/nixos/dotfiles.nix b/users/guanranwang/home-manager/nixos/dotfiles.nix similarity index 100% rename from flakes/home-manager/guanranwang/nixos/dotfiles.nix rename to users/guanranwang/home-manager/nixos/dotfiles.nix diff --git a/flakes/home-manager/guanranwang/nixos/home.nix b/users/guanranwang/home-manager/nixos/home.nix similarity index 100% rename from flakes/home-manager/guanranwang/nixos/home.nix rename to users/guanranwang/home-manager/nixos/home.nix diff --git a/flakes/home-manager/guanranwang/nixos/i18n.nix b/users/guanranwang/home-manager/nixos/i18n.nix similarity index 100% rename from flakes/home-manager/guanranwang/nixos/i18n.nix rename to users/guanranwang/home-manager/nixos/i18n.nix diff --git a/flakes/home-manager/guanranwang/nixos/xdg/default.nix b/users/guanranwang/home-manager/nixos/xdg/default.nix similarity index 100% rename from flakes/home-manager/guanranwang/nixos/xdg/default.nix rename to users/guanranwang/home-manager/nixos/xdg/default.nix diff --git a/flakes/home-manager/guanranwang/nixos/xdg/xdg-mime.nix b/users/guanranwang/home-manager/nixos/xdg/xdg-mime.nix similarity index 100% rename from flakes/home-manager/guanranwang/nixos/xdg/xdg-mime.nix rename to users/guanranwang/home-manager/nixos/xdg/xdg-mime.nix diff --git a/flakes/home-manager/guanranwang/nixos/xdg/xdg.nix b/users/guanranwang/home-manager/nixos/xdg/xdg.nix similarity index 100% rename from flakes/home-manager/guanranwang/nixos/xdg/xdg.nix rename to users/guanranwang/home-manager/nixos/xdg/xdg.nix diff --git a/nixos/users/normal-users/guanranwang.nix b/users/guanranwang/nixos.nix similarity index 100% rename from nixos/users/normal-users/guanranwang.nix rename to users/guanranwang/nixos.nix diff --git a/secrets/secrets.yaml b/users/guanranwang/secrets/secrets.yaml similarity index 100% rename from secrets/secrets.yaml rename to users/guanranwang/secrets/secrets.yaml