migrate to new structure

This commit is contained in:
Guanran Wang 2023-09-27 12:05:53 +08:00
parent 16dd604ca9
commit fedee7be14
Signed by: nyancat
SSH key fingerprint: SHA256:8oWGKciPALWut/6WA27oFKofX+6Wtc0gQnsefXLQx/8
164 changed files with 25 additions and 32 deletions

36
.gitmodules vendored
View file

@ -1,29 +1,29 @@
[submodule "flakes/home-manager/guanranwang/common/dotfiles/config/alacritty/catppuccin"] [submodule "users/guanranwang/home-manager/common/dotfiles/config/alacritty/catppuccin"]
path = flakes/home-manager/guanranwang/common/dotfiles/config/alacritty/catppuccin path = users/guanranwang/home-manager/common/dotfiles/config/alacritty/catppuccin
url = https://github.com/catppuccin/catppuccin.git url = https://github.com/catppuccin/catppuccin.git
[submodule "flakes/home-manager/guanranwang/common/dotfiles/config/clash/yacd"] [submodule "users/guanranwang/home-manager/common/dotfiles/config/clash/yacd"]
path = flakes/home-manager/guanranwang/common/dotfiles/config/clash/yacd path = users/guanranwang/home-manager/common/dotfiles/config/clash/yacd
url = https://github.com/haishanh/yacd.git url = https://github.com/haishanh/yacd.git
branch = gh-pages branch = gh-pages
[submodule "flakes/home-manager/guanranwang/common/dotfiles/config/clash/metacubexd"] [submodule "users/guanranwang/home-manager/common/dotfiles/config/clash/metacubexd"]
path = flakes/home-manager/guanranwang/common/dotfiles/config/clash/metacubexd path = users/guanranwang/home-manager/common/dotfiles/config/clash/metacubexd
url = https://github.com/MetaCubeX/metacubexd.git url = https://github.com/MetaCubeX/metacubexd.git
branch = gh-pages branch = gh-pages
[submodule "flakes/home-manager/guanranwang/common/dotfiles/config/zsh/fast-syntax-highlighting"] [submodule "users/guanranwang/home-manager/common/dotfiles/config/zsh/fast-syntax-highlighting"]
path = flakes/home-manager/guanranwang/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 url = https://github.com/zdharma-continuum/fast-syntax-highlighting.git
[submodule "flakes/home-manager/guanranwang/common/dotfiles/config/zsh/fzf-tab"] [submodule "users/guanranwang/home-manager/common/dotfiles/config/zsh/fzf-tab"]
path = flakes/home-manager/guanranwang/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 url = https://github.com/Aloxaf/fzf-tab.git
[submodule "flakes/home-manager/guanranwang/common/dotfiles/config/zsh/powerlevel10k"] [submodule "users/guanranwang/home-manager/common/dotfiles/config/zsh/powerlevel10k"]
path = flakes/home-manager/guanranwang/common/dotfiles/config/zsh/powerlevel10k path = users/guanranwang/home-manager/common/dotfiles/config/zsh/powerlevel10k
url = https://github.com/romkatv/powerlevel10k.git url = https://github.com/romkatv/powerlevel10k.git
[submodule "flakes/home-manager/guanranwang/common/dotfiles/config/zsh/zsh-autosuggestions"] [submodule "users/guanranwang/home-manager/common/dotfiles/config/zsh/zsh-autosuggestions"]
path = flakes/home-manager/guanranwang/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 url = https://github.com/zsh-users/zsh-autosuggestions.git
[submodule "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 = flakes/home-manager/guanranwang/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 url = https://github.com/zsh-users/zsh-history-substring-search.git
[submodule "flakes/home-manager/guanranwang/common/dotfiles/config/zsh/zsh-syntax-highlighting"] [submodule "users/guanranwang/home-manager/common/dotfiles/config/zsh/zsh-syntax-highlighting"]
path = flakes/home-manager/guanranwang/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 url = https://github.com/zsh-users/zsh-syntax-highlighting.git

View file

@ -65,6 +65,7 @@
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
modules = [ modules = [
./machines/nixos/81fw-lenovo-legion-y7000.nix ./machines/nixos/81fw-lenovo-legion-y7000.nix
./users/guanranwang/nixos.nix
# Overlays # Overlays
{ {
@ -90,7 +91,8 @@
home-manager = { home-manager = {
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = 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 ??? extraSpecialArgs = { inherit inputs; }; # ??? isnt specialArgs imported by default ???
}; };
@ -111,7 +113,7 @@
({ config, ... }: ({ config, ... }:
{ {
sops = { sops = {
defaultSopsFile = ./secrets/secrets.yaml; defaultSopsFile = ./users/guanranwang/secrets/secrets.yaml;
age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
secrets = { secrets = {
"clash-config" = { "clash-config" = {
@ -134,13 +136,14 @@
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
modules = [ modules = [
./machines/nixos/imac-2017.nix ./machines/nixos/imac-2017.nix
./users/guanranwag/nixos.nix
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
{ {
home-manager = { home-manager = {
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
users.guanranwang = import ./flakes/home-manager/guanranwang/nixos; users.guanranwang = import ./users/guananwnng/home-manager/nixos;
}; };
} }

@ -1 +0,0 @@
Subproject commit 1c5a013e5ff13061126af92c667b47d5f9b5013c

@ -1 +0,0 @@
Subproject commit d33141ce58fae07c5b040acaf745e9dc1e1c46e5

@ -1 +0,0 @@
Subproject commit 1cc15568c4136fa1dc4452eb77d8855e20f809cf

@ -1 +0,0 @@
Subproject commit cf318e06a9b7c9f2219d78f41b46fa6e06011fd9

@ -1 +0,0 @@
Subproject commit c2b4aa5ad2532cca91f23908ac7f00efb7ff09c9

@ -1 +0,0 @@
Subproject commit 873c4ff09c559a507d33e528df7e27a8a48705d7

@ -1 +0,0 @@
Subproject commit c3d4e576c9c86eac62884bd47c01f6faed043fc5

@ -1 +0,0 @@
Subproject commit 400e58a87f72ecec14f783fbd29bc6be4ff1641c

@ -1 +0,0 @@
Subproject commit 143b25eb98aa3227af63bd7f04413e1b3e7888ec

View file

@ -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;
} }

View file

@ -4,6 +4,5 @@
imports = [ imports = [
./users.nix ./users.nix
./system-users.nix ./system-users.nix
./normal-users/guanranwang.nix
]; ];
} }

Some files were not shown because too many files have changed in this diff Show more