From 754befb5f53521257fed9d652c9fed1d873a501d Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Sun, 10 Dec 2023 13:55:07 +0800 Subject: [PATCH] home: merge ./profiles into ../nixos/profiles --- .../darwin/profiles/core/default.nix | 5 +- .../profiles/core/home}/default.nix | 4 +- .../profiles/device-type/desktop/default.nix | 4 +- .../device-type/desktop/home}/default.nix | 2 +- .../darwin/profiles/opt-in/gaming.nix | 5 -- .../darwin/profiles/opt-in/gaming/default.nix | 4 ++ .../profiles/opt-in/gaming/home/default.nix | 5 ++ .../applications/sxhkd/default.nix | 6 +- users/guanranwang/home-manager/default.nix | 59 ++++++++++++++++++ .../home-manager/profiles/core/default.nix | 30 --------- .../non-graphical/common/default.nix | 31 --------- .../non-graphical/nixos/default.nix | 6 -- .../profiles/opt-in/gaming/darwin/default.nix | 5 -- .../profiles/opt-in/gaming/nixos/default.nix | 9 --- .../opt-in/torrenting/nixos/default.nix | 5 -- .../nixos/profiles/core/default.nix | 16 ++--- .../nixos/profiles/core/home/default.nix | 6 ++ .../profiles/device-type/desktop/default.nix | 7 +-- .../device-type/desktop/home}/default.nix | 2 +- .../desktop/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 .../desktop/home}/fonts/fontconfig/fonts.conf | 0 .../device-type/desktop/home}/packages.nix | 0 .../home}/scripts/bin/minecraft-inputfix | 0 .../home}/scripts/bin/wrapped-brightnessctl | 0 .../home}/scripts/bin/wrapped-mpvpaper | 0 .../desktop/home}/scripts/bin/wrapped-pamixer | 0 .../desktop/home}/scripts/bin/wrapped-swww | 0 .../desktop/home}/scripts/default.nix | 0 .../device-type/desktop/home}/theme.nix | 0 .../desktop/home}/wallpapers/default.nix | 0 .../wallpapers/wallpapers/Mojave Night.jpg | Bin .../wallpapers/wallpapers/wallpaper1.png | Bin .../wallpapers/wallpapers/wallpaper2.jpg | Bin .../wallpapers/wallpapers/wallpaper3.jpg | Bin .../wallpapers/wallpapers/wallpaper4.png | Bin .../wallpapers/wallpapers/wallpaper5.png | Bin .../device-type/desktop/home}/xdg-mime.nix | 0 .../profiles/device-type/laptop/default.nix | 2 +- .../device-type/laptop/home/default.nix | 3 + .../nixos/profiles/opt-in/gaming.nix | 5 -- .../nixos/profiles/opt-in/gaming/default.nix | 4 ++ .../profiles/opt-in/gaming/home/default.nix | 9 +++ .../nixos/profiles/opt-in/torrenting.nix | 5 -- .../profiles/opt-in/torrenting/default.nix | 4 ++ .../opt-in/torrenting/home/default.nix | 5 ++ 50 files changed, 116 insertions(+), 132 deletions(-) rename users/guanranwang/{home-manager/profiles/device-type/non-graphical/darwin => darwin/profiles/core/home}/default.nix (75%) rename users/guanranwang/{home-manager/profiles/device-type/graphical/darwin => darwin/profiles/device-type/desktop/home}/default.nix (96%) delete mode 100644 users/guanranwang/darwin/profiles/opt-in/gaming.nix create mode 100644 users/guanranwang/darwin/profiles/opt-in/gaming/default.nix create mode 100644 users/guanranwang/darwin/profiles/opt-in/gaming/home/default.nix create mode 100644 users/guanranwang/home-manager/default.nix delete mode 100644 users/guanranwang/home-manager/profiles/core/default.nix delete mode 100644 users/guanranwang/home-manager/profiles/device-type/non-graphical/common/default.nix delete mode 100644 users/guanranwang/home-manager/profiles/device-type/non-graphical/nixos/default.nix delete mode 100644 users/guanranwang/home-manager/profiles/opt-in/gaming/darwin/default.nix delete mode 100644 users/guanranwang/home-manager/profiles/opt-in/gaming/nixos/default.nix delete mode 100644 users/guanranwang/home-manager/profiles/opt-in/torrenting/nixos/default.nix create mode 100644 users/guanranwang/nixos/profiles/core/home/default.nix rename users/guanranwang/{home-manager/profiles/device-type/graphical/nixos => nixos/profiles/device-type/desktop/home}/default.nix (92%) rename users/guanranwang/{home-manager/profiles/device-type/graphical/nixos => nixos/profiles/device-type/desktop/home}/fonts/default.nix (100%) rename users/guanranwang/{home-manager/profiles/device-type/graphical/nixos => nixos/profiles/device-type/desktop/home}/fonts/fontconfig/conf.d/nixos-fonts.conf (100%) rename users/guanranwang/{home-manager/profiles/device-type/graphical/nixos => nixos/profiles/device-type/desktop/home}/fonts/fontconfig/conf.d/old-chinese-fonts.conf (100%) rename users/guanranwang/{home-manager/profiles/device-type/graphical/nixos => nixos/profiles/device-type/desktop/home}/fonts/fontconfig/conf.d/qt-fonts.conf (100%) rename users/guanranwang/{home-manager/profiles/device-type/graphical/nixos => nixos/profiles/device-type/desktop/home}/fonts/fontconfig/conf.d/unliked-fonts.conf (100%) rename users/guanranwang/{home-manager/profiles/device-type/graphical/nixos => nixos/profiles/device-type/desktop/home}/fonts/fontconfig/conf.d/windows-fonts.conf (100%) rename users/guanranwang/{home-manager/profiles/device-type/graphical/nixos => nixos/profiles/device-type/desktop/home}/fonts/fontconfig/fonts.conf (100%) rename users/guanranwang/{home-manager/profiles/device-type/graphical/nixos => nixos/profiles/device-type/desktop/home}/packages.nix (100%) rename users/guanranwang/{home-manager/profiles/device-type/graphical/nixos => nixos/profiles/device-type/desktop/home}/scripts/bin/minecraft-inputfix (100%) rename users/guanranwang/{home-manager/profiles/device-type/graphical/nixos => nixos/profiles/device-type/desktop/home}/scripts/bin/wrapped-brightnessctl (100%) rename users/guanranwang/{home-manager/profiles/device-type/graphical/nixos => nixos/profiles/device-type/desktop/home}/scripts/bin/wrapped-mpvpaper (100%) rename users/guanranwang/{home-manager/profiles/device-type/graphical/nixos => nixos/profiles/device-type/desktop/home}/scripts/bin/wrapped-pamixer (100%) rename users/guanranwang/{home-manager/profiles/device-type/graphical/nixos => nixos/profiles/device-type/desktop/home}/scripts/bin/wrapped-swww (100%) rename users/guanranwang/{home-manager/profiles/device-type/graphical/nixos => nixos/profiles/device-type/desktop/home}/scripts/default.nix (100%) rename users/guanranwang/{home-manager/profiles/device-type/graphical/nixos => nixos/profiles/device-type/desktop/home}/theme.nix (100%) rename users/guanranwang/{home-manager/profiles/device-type/graphical/nixos => nixos/profiles/device-type/desktop/home}/wallpapers/default.nix (100%) rename users/guanranwang/{home-manager/profiles/device-type/graphical/nixos => nixos/profiles/device-type/desktop/home}/wallpapers/wallpapers/Mojave Night.jpg (100%) rename users/guanranwang/{home-manager/profiles/device-type/graphical/nixos => nixos/profiles/device-type/desktop/home}/wallpapers/wallpapers/wallpaper1.png (100%) rename users/guanranwang/{home-manager/profiles/device-type/graphical/nixos => nixos/profiles/device-type/desktop/home}/wallpapers/wallpapers/wallpaper2.jpg (100%) rename users/guanranwang/{home-manager/profiles/device-type/graphical/nixos => nixos/profiles/device-type/desktop/home}/wallpapers/wallpapers/wallpaper3.jpg (100%) rename users/guanranwang/{home-manager/profiles/device-type/graphical/nixos => nixos/profiles/device-type/desktop/home}/wallpapers/wallpapers/wallpaper4.png (100%) rename users/guanranwang/{home-manager/profiles/device-type/graphical/nixos => nixos/profiles/device-type/desktop/home}/wallpapers/wallpapers/wallpaper5.png (100%) rename users/guanranwang/{home-manager/profiles/device-type/graphical/nixos => nixos/profiles/device-type/desktop/home}/xdg-mime.nix (100%) create mode 100644 users/guanranwang/nixos/profiles/device-type/laptop/home/default.nix delete mode 100644 users/guanranwang/nixos/profiles/opt-in/gaming.nix create mode 100644 users/guanranwang/nixos/profiles/opt-in/gaming/default.nix create mode 100644 users/guanranwang/nixos/profiles/opt-in/gaming/home/default.nix delete mode 100644 users/guanranwang/nixos/profiles/opt-in/torrenting.nix create mode 100644 users/guanranwang/nixos/profiles/opt-in/torrenting/default.nix create mode 100644 users/guanranwang/nixos/profiles/opt-in/torrenting/home/default.nix diff --git a/users/guanranwang/darwin/profiles/core/default.nix b/users/guanranwang/darwin/profiles/core/default.nix index 18e86c3..200f2d8 100644 --- a/users/guanranwang/darwin/profiles/core/default.nix +++ b/users/guanranwang/darwin/profiles/core/default.nix @@ -23,8 +23,5 @@ ]; ### home-manager - home-manager.users.guanranwang.imports = map (n: ../../../home-manager/${n}) [ - "default.nix" - "profiles/command-line/darwin" - ]; + home-manager.users.guanranwang = import ./home; } diff --git a/users/guanranwang/home-manager/profiles/device-type/non-graphical/darwin/default.nix b/users/guanranwang/darwin/profiles/core/home/default.nix similarity index 75% rename from users/guanranwang/home-manager/profiles/device-type/non-graphical/darwin/default.nix rename to users/guanranwang/darwin/profiles/core/home/default.nix index b377276..c038cae 100644 --- a/users/guanranwang/home-manager/profiles/device-type/non-graphical/darwin/default.nix +++ b/users/guanranwang/darwin/profiles/core/home/default.nix @@ -1,5 +1,7 @@ {pkgs, ...}: { - imports = [../common]; + imports = [ + ../../../../home-manager + ]; home.packages = with pkgs; [ ### Outdated macOS components coreutils diff --git a/users/guanranwang/darwin/profiles/device-type/desktop/default.nix b/users/guanranwang/darwin/profiles/device-type/desktop/default.nix index 639be49..e5bfab2 100644 --- a/users/guanranwang/darwin/profiles/device-type/desktop/default.nix +++ b/users/guanranwang/darwin/profiles/device-type/desktop/default.nix @@ -1,6 +1,4 @@ _: { ### home-manager - home-manager.users.guanranwang.imports = map (n: ../../../../home-manager/${n}) [ - "profiles/graphical-stuff/darwin" - ]; + home-manager.users.guanranwang = import ./home; } diff --git a/users/guanranwang/home-manager/profiles/device-type/graphical/darwin/default.nix b/users/guanranwang/darwin/profiles/device-type/desktop/home/default.nix similarity index 96% rename from users/guanranwang/home-manager/profiles/device-type/graphical/darwin/default.nix rename to users/guanranwang/darwin/profiles/device-type/desktop/home/default.nix index 4282029..727c24a 100644 --- a/users/guanranwang/home-manager/profiles/device-type/graphical/darwin/default.nix +++ b/users/guanranwang/darwin/profiles/device-type/desktop/home/default.nix @@ -4,7 +4,7 @@ lib, ... }: { - imports = map (n: ../../../../applications/${n}) [ + imports = map (n: ../../../../../home-manager/applications/${n}) [ # Terminal "alacritty" diff --git a/users/guanranwang/darwin/profiles/opt-in/gaming.nix b/users/guanranwang/darwin/profiles/opt-in/gaming.nix deleted file mode 100644 index f6f3e77..0000000 --- a/users/guanranwang/darwin/profiles/opt-in/gaming.nix +++ /dev/null @@ -1,5 +0,0 @@ -_: { - home-manager.users.guanranwang.imports = [ - ../../../../../home-manager/profiles/gaming/darwin - ]; -} diff --git a/users/guanranwang/darwin/profiles/opt-in/gaming/default.nix b/users/guanranwang/darwin/profiles/opt-in/gaming/default.nix new file mode 100644 index 0000000..e5bfab2 --- /dev/null +++ b/users/guanranwang/darwin/profiles/opt-in/gaming/default.nix @@ -0,0 +1,4 @@ +_: { + ### home-manager + home-manager.users.guanranwang = import ./home; +} diff --git a/users/guanranwang/darwin/profiles/opt-in/gaming/home/default.nix b/users/guanranwang/darwin/profiles/opt-in/gaming/home/default.nix new file mode 100644 index 0000000..0ba1cbe --- /dev/null +++ b/users/guanranwang/darwin/profiles/opt-in/gaming/home/default.nix @@ -0,0 +1,5 @@ +{...}: { + imports = [ + ../../../../../home-manager/applications/prismlauncher + ]; +} diff --git a/users/guanranwang/home-manager/applications/sxhkd/default.nix b/users/guanranwang/home-manager/applications/sxhkd/default.nix index 2fa382f..cabdf38 100644 --- a/users/guanranwang/home-manager/applications/sxhkd/default.nix +++ b/users/guanranwang/home-manager/applications/sxhkd/default.nix @@ -1,8 +1,4 @@ -{...}: { - imports = [ - ./rofi - ]; - +_: { services.sxhkd = { enable = true; keybindings = { diff --git a/users/guanranwang/home-manager/default.nix b/users/guanranwang/home-manager/default.nix new file mode 100644 index 0000000..105797a --- /dev/null +++ b/users/guanranwang/home-manager/default.nix @@ -0,0 +1,59 @@ +{ + pkgs, + config, + ... +}: { + home = { + username = "guanranwang"; + homeDirectory = + if pkgs.stdenv.hostPlatform.isDarwin + then "/Users/${config.home.username}" + else "/home/${config.home.username}"; + + # This value determines the Home Manager release that your + # configuration is compatible with. This helps avoid breakage + # when a new Home Manager release introduces backwards + # incompatible changes. + # + # You can update Home Manager without changing this value. See + # the Home Manager release notes for a list of state version + # changes in each release. + stateVersion = "23.05"; + }; + + # Let Home Manager install and manage itself. + programs.home-manager.enable = true; + + # Default applications + imports = [ + ./modules + + ./applications/git + ./applications/starship + ./applications/eza + ./applications/skim + ./applications/bat + ./applications/bottom + ./applications/zoxide + ./applications/ripgrep + ./applications/wget + ./applications/fd + ./applications/hyperfine + + ./applications/ydict + ./applications/fastfetch + ./applications/android-tools + ./applications/tealdeer + ]; + + home.shellAliases = { + ".." = "cd .."; + "farsee" = "curl -F 'c=@-' 'https://fars.ee/'"; # pb + + # proxy + "setproxy" = let + proxy = "http://127.0.0.1:7890/"; + in "export http_proxy=${proxy} https_proxy=${proxy} ftp_proxy=${proxy} rsync_proxy=${proxy}"; + "unsetproxy" = "set -e http_proxy https_proxy all_proxy"; + }; +} diff --git a/users/guanranwang/home-manager/profiles/core/default.nix b/users/guanranwang/home-manager/profiles/core/default.nix deleted file mode 100644 index 820b65d..0000000 --- a/users/guanranwang/home-manager/profiles/core/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - pkgs, - config, - ... -}: { - home = { - username = "guanranwang"; - homeDirectory = - if pkgs.stdenv.hostPlatform.isDarwin - then "/Users/${config.home.username}" - else "/home/${config.home.username}"; - - # This value determines the Home Manager release that your - # configuration is compatible with. This helps avoid breakage - # when a new Home Manager release introduces backwards - # incompatible changes. - # - # You can update Home Manager without changing this value. See - # the Home Manager release notes for a list of state version - # changes in each release. - stateVersion = "23.05"; - }; - - # Let Home Manager install and manage itself. - programs.home-manager.enable = true; - - imports = [ - ../../modules - ]; -} diff --git a/users/guanranwang/home-manager/profiles/device-type/non-graphical/common/default.nix b/users/guanranwang/home-manager/profiles/device-type/non-graphical/common/default.nix deleted file mode 100644 index 8433e2a..0000000 --- a/users/guanranwang/home-manager/profiles/device-type/non-graphical/common/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{...}: { - imports = [ - ../../../../applications/git - ../../../../applications/starship - ../../../../applications/eza - ../../../../applications/skim - ../../../../applications/bat - ../../../../applications/bottom - ../../../../applications/zoxide - ../../../../applications/ripgrep - ../../../../applications/wget - ../../../../applications/fd - ../../../../applications/hyperfine - - ../../../../applications/ydict - ../../../../applications/fastfetch - ../../../../applications/android-tools - ../../../../applications/tealdeer - ]; - - home.shellAliases = { - ".." = "cd .."; - "farsee" = "curl -F 'c=@-' 'https://fars.ee/'"; # pb - - # proxy - "setproxy" = let - proxy = "http://127.0.0.1:7890/"; - in "export http_proxy=${proxy} https_proxy=${proxy} ftp_proxy=${proxy} rsync_proxy=${proxy}"; - "unsetproxy" = "set -e http_proxy https_proxy all_proxy"; - }; -} diff --git a/users/guanranwang/home-manager/profiles/device-type/non-graphical/nixos/default.nix b/users/guanranwang/home-manager/profiles/device-type/non-graphical/nixos/default.nix deleted file mode 100644 index f4f34f4..0000000 --- a/users/guanranwang/home-manager/profiles/device-type/non-graphical/nixos/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{...}: { - imports = [ - ../common - ../../../../applications/trashy - ]; -} diff --git a/users/guanranwang/home-manager/profiles/opt-in/gaming/darwin/default.nix b/users/guanranwang/home-manager/profiles/opt-in/gaming/darwin/default.nix deleted file mode 100644 index 1d428b0..0000000 --- a/users/guanranwang/home-manager/profiles/opt-in/gaming/darwin/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{...}: { - imports = [ - ../../../../applications/prismlauncher - ]; -} diff --git a/users/guanranwang/home-manager/profiles/opt-in/gaming/nixos/default.nix b/users/guanranwang/home-manager/profiles/opt-in/gaming/nixos/default.nix deleted file mode 100644 index d6bc419..0000000 --- a/users/guanranwang/home-manager/profiles/opt-in/gaming/nixos/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{...}: { - imports = [ - ../../../../applications/steam - ../../../../applications/prismlauncher - ../../../../applications/osu-lazer - ../../../../applications/mangohud - ../../../../applications/protonup-qt - ]; -} diff --git a/users/guanranwang/home-manager/profiles/opt-in/torrenting/nixos/default.nix b/users/guanranwang/home-manager/profiles/opt-in/torrenting/nixos/default.nix deleted file mode 100644 index b6aa54e..0000000 --- a/users/guanranwang/home-manager/profiles/opt-in/torrenting/nixos/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{...}: { - imports = [ - ../../../../applications/qbittorrent - ]; -} diff --git a/users/guanranwang/nixos/profiles/core/default.nix b/users/guanranwang/nixos/profiles/core/default.nix index ac2f3b6..67efe20 100644 --- a/users/guanranwang/nixos/profiles/core/default.nix +++ b/users/guanranwang/nixos/profiles/core/default.nix @@ -20,11 +20,10 @@ packages = []; }; - ### for default shell programs.fish.enable = true; - - ### Options myFlake.nixos.networking.dns.provider = lib.mkDefault "alidns"; + users.groups."nix-access-tokens" = {}; + nix.extraOptions = "!include ${config.sops.secrets.nix-access-tokens.path}"; ### Flakes imports = [ @@ -33,14 +32,14 @@ ]; ### sops-nix - nix.extraOptions = "!include ${config.sops.secrets.nix-access-tokens.path}"; - users.groups."nix-access-tokens" = {}; sops = { defaultSopsFile = ../../../secrets/secrets.yaml; age.sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"]; gnupg.sshKeyPaths = []; secrets = { - "hashed-passwd".neededForUsers = true; # Hashed user password + "hashed-passwd" = { + neededForUsers = true; + }; "nix-access-tokens" = { group = config.users.groups."nix-access-tokens".name; mode = "0440"; @@ -49,8 +48,5 @@ }; ### home-manager - home-manager.users.guanranwang.imports = map (n: ../../../home-manager/${n}) [ - "profiles/core" - "profiles/device-type/non-graphical/nixos" - ]; + home-manager.users.guanranwang = import ./home; } diff --git a/users/guanranwang/nixos/profiles/core/home/default.nix b/users/guanranwang/nixos/profiles/core/home/default.nix new file mode 100644 index 0000000..c903002 --- /dev/null +++ b/users/guanranwang/nixos/profiles/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/device-type/desktop/default.nix index 4e80f06..a17eaef 100644 --- a/users/guanranwang/nixos/profiles/device-type/desktop/default.nix +++ b/users/guanranwang/nixos/profiles/device-type/desktop/default.nix @@ -17,10 +17,7 @@ sops.secrets."wireless/home".path = "/var/lib/iwd/wangxiaobo.psk"; # Home wifi password ### home-manager - home-manager.users.guanranwang.imports = map (n: ../../../../home-manager/${n}) [ - "profiles/device-type/non-graphical/nixos" - "profiles/device-type/graphical/nixos" - ]; + home-manager.users.guanranwang = import ./home; fonts.enableDefaultPackages = false; security.pam.services.swaylock = {}; @@ -47,7 +44,7 @@ }; programs = { kdeconnect = { - #enable = true; + enable = true; #package = pkgs.gnomeExtensions.gsconnect; package = pkgs.valent; }; diff --git a/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/default.nix b/users/guanranwang/nixos/profiles/device-type/desktop/home/default.nix similarity index 92% rename from users/guanranwang/home-manager/profiles/device-type/graphical/nixos/default.nix rename to users/guanranwang/nixos/profiles/device-type/desktop/home/default.nix index 95c5216..94c6546 100644 --- a/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/default.nix +++ b/users/guanranwang/nixos/profiles/device-type/desktop/home/default.nix @@ -9,7 +9,7 @@ ./theme.nix ./xdg-mime.nix ] - ++ map (n: ../../../../applications/${n}) [ + ++ map (n: ../../../../../home-manager/applications/${n}) [ # Terminal "alacritty" diff --git a/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/fonts/default.nix b/users/guanranwang/nixos/profiles/device-type/desktop/home/fonts/default.nix similarity index 100% rename from users/guanranwang/home-manager/profiles/device-type/graphical/nixos/fonts/default.nix rename to users/guanranwang/nixos/profiles/device-type/desktop/home/fonts/default.nix diff --git a/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/fonts/fontconfig/conf.d/nixos-fonts.conf b/users/guanranwang/nixos/profiles/device-type/desktop/home/fonts/fontconfig/conf.d/nixos-fonts.conf similarity index 100% rename from users/guanranwang/home-manager/profiles/device-type/graphical/nixos/fonts/fontconfig/conf.d/nixos-fonts.conf rename to users/guanranwang/nixos/profiles/device-type/desktop/home/fonts/fontconfig/conf.d/nixos-fonts.conf diff --git a/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/fonts/fontconfig/conf.d/old-chinese-fonts.conf b/users/guanranwang/nixos/profiles/device-type/desktop/home/fonts/fontconfig/conf.d/old-chinese-fonts.conf similarity index 100% rename from users/guanranwang/home-manager/profiles/device-type/graphical/nixos/fonts/fontconfig/conf.d/old-chinese-fonts.conf rename to users/guanranwang/nixos/profiles/device-type/desktop/home/fonts/fontconfig/conf.d/old-chinese-fonts.conf diff --git a/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/fonts/fontconfig/conf.d/qt-fonts.conf b/users/guanranwang/nixos/profiles/device-type/desktop/home/fonts/fontconfig/conf.d/qt-fonts.conf similarity index 100% rename from users/guanranwang/home-manager/profiles/device-type/graphical/nixos/fonts/fontconfig/conf.d/qt-fonts.conf rename to users/guanranwang/nixos/profiles/device-type/desktop/home/fonts/fontconfig/conf.d/qt-fonts.conf diff --git a/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/fonts/fontconfig/conf.d/unliked-fonts.conf b/users/guanranwang/nixos/profiles/device-type/desktop/home/fonts/fontconfig/conf.d/unliked-fonts.conf similarity index 100% rename from users/guanranwang/home-manager/profiles/device-type/graphical/nixos/fonts/fontconfig/conf.d/unliked-fonts.conf rename to users/guanranwang/nixos/profiles/device-type/desktop/home/fonts/fontconfig/conf.d/unliked-fonts.conf diff --git a/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/fonts/fontconfig/conf.d/windows-fonts.conf b/users/guanranwang/nixos/profiles/device-type/desktop/home/fonts/fontconfig/conf.d/windows-fonts.conf similarity index 100% rename from users/guanranwang/home-manager/profiles/device-type/graphical/nixos/fonts/fontconfig/conf.d/windows-fonts.conf rename to users/guanranwang/nixos/profiles/device-type/desktop/home/fonts/fontconfig/conf.d/windows-fonts.conf diff --git a/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/fonts/fontconfig/fonts.conf b/users/guanranwang/nixos/profiles/device-type/desktop/home/fonts/fontconfig/fonts.conf similarity index 100% rename from users/guanranwang/home-manager/profiles/device-type/graphical/nixos/fonts/fontconfig/fonts.conf rename to users/guanranwang/nixos/profiles/device-type/desktop/home/fonts/fontconfig/fonts.conf diff --git a/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/packages.nix b/users/guanranwang/nixos/profiles/device-type/desktop/home/packages.nix similarity index 100% rename from users/guanranwang/home-manager/profiles/device-type/graphical/nixos/packages.nix rename to users/guanranwang/nixos/profiles/device-type/desktop/home/packages.nix diff --git a/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/scripts/bin/minecraft-inputfix b/users/guanranwang/nixos/profiles/device-type/desktop/home/scripts/bin/minecraft-inputfix similarity index 100% rename from users/guanranwang/home-manager/profiles/device-type/graphical/nixos/scripts/bin/minecraft-inputfix rename to users/guanranwang/nixos/profiles/device-type/desktop/home/scripts/bin/minecraft-inputfix diff --git a/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/scripts/bin/wrapped-brightnessctl b/users/guanranwang/nixos/profiles/device-type/desktop/home/scripts/bin/wrapped-brightnessctl similarity index 100% rename from users/guanranwang/home-manager/profiles/device-type/graphical/nixos/scripts/bin/wrapped-brightnessctl rename to users/guanranwang/nixos/profiles/device-type/desktop/home/scripts/bin/wrapped-brightnessctl diff --git a/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/scripts/bin/wrapped-mpvpaper b/users/guanranwang/nixos/profiles/device-type/desktop/home/scripts/bin/wrapped-mpvpaper similarity index 100% rename from users/guanranwang/home-manager/profiles/device-type/graphical/nixos/scripts/bin/wrapped-mpvpaper rename to users/guanranwang/nixos/profiles/device-type/desktop/home/scripts/bin/wrapped-mpvpaper diff --git a/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/scripts/bin/wrapped-pamixer b/users/guanranwang/nixos/profiles/device-type/desktop/home/scripts/bin/wrapped-pamixer similarity index 100% rename from users/guanranwang/home-manager/profiles/device-type/graphical/nixos/scripts/bin/wrapped-pamixer rename to users/guanranwang/nixos/profiles/device-type/desktop/home/scripts/bin/wrapped-pamixer diff --git a/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/scripts/bin/wrapped-swww b/users/guanranwang/nixos/profiles/device-type/desktop/home/scripts/bin/wrapped-swww similarity index 100% rename from users/guanranwang/home-manager/profiles/device-type/graphical/nixos/scripts/bin/wrapped-swww rename to users/guanranwang/nixos/profiles/device-type/desktop/home/scripts/bin/wrapped-swww diff --git a/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/scripts/default.nix b/users/guanranwang/nixos/profiles/device-type/desktop/home/scripts/default.nix similarity index 100% rename from users/guanranwang/home-manager/profiles/device-type/graphical/nixos/scripts/default.nix rename to users/guanranwang/nixos/profiles/device-type/desktop/home/scripts/default.nix diff --git a/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/theme.nix b/users/guanranwang/nixos/profiles/device-type/desktop/home/theme.nix similarity index 100% rename from users/guanranwang/home-manager/profiles/device-type/graphical/nixos/theme.nix rename to users/guanranwang/nixos/profiles/device-type/desktop/home/theme.nix diff --git a/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/wallpapers/default.nix b/users/guanranwang/nixos/profiles/device-type/desktop/home/wallpapers/default.nix similarity index 100% rename from users/guanranwang/home-manager/profiles/device-type/graphical/nixos/wallpapers/default.nix rename to users/guanranwang/nixos/profiles/device-type/desktop/home/wallpapers/default.nix diff --git a/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/wallpapers/wallpapers/Mojave Night.jpg b/users/guanranwang/nixos/profiles/device-type/desktop/home/wallpapers/wallpapers/Mojave Night.jpg similarity index 100% rename from users/guanranwang/home-manager/profiles/device-type/graphical/nixos/wallpapers/wallpapers/Mojave Night.jpg rename to users/guanranwang/nixos/profiles/device-type/desktop/home/wallpapers/wallpapers/Mojave Night.jpg diff --git a/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/wallpapers/wallpapers/wallpaper1.png b/users/guanranwang/nixos/profiles/device-type/desktop/home/wallpapers/wallpapers/wallpaper1.png similarity index 100% rename from users/guanranwang/home-manager/profiles/device-type/graphical/nixos/wallpapers/wallpapers/wallpaper1.png rename to users/guanranwang/nixos/profiles/device-type/desktop/home/wallpapers/wallpapers/wallpaper1.png diff --git a/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/wallpapers/wallpapers/wallpaper2.jpg b/users/guanranwang/nixos/profiles/device-type/desktop/home/wallpapers/wallpapers/wallpaper2.jpg similarity index 100% rename from users/guanranwang/home-manager/profiles/device-type/graphical/nixos/wallpapers/wallpapers/wallpaper2.jpg rename to users/guanranwang/nixos/profiles/device-type/desktop/home/wallpapers/wallpapers/wallpaper2.jpg diff --git a/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/wallpapers/wallpapers/wallpaper3.jpg b/users/guanranwang/nixos/profiles/device-type/desktop/home/wallpapers/wallpapers/wallpaper3.jpg similarity index 100% rename from users/guanranwang/home-manager/profiles/device-type/graphical/nixos/wallpapers/wallpapers/wallpaper3.jpg rename to users/guanranwang/nixos/profiles/device-type/desktop/home/wallpapers/wallpapers/wallpaper3.jpg diff --git a/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/wallpapers/wallpapers/wallpaper4.png b/users/guanranwang/nixos/profiles/device-type/desktop/home/wallpapers/wallpapers/wallpaper4.png similarity index 100% rename from users/guanranwang/home-manager/profiles/device-type/graphical/nixos/wallpapers/wallpapers/wallpaper4.png rename to users/guanranwang/nixos/profiles/device-type/desktop/home/wallpapers/wallpapers/wallpaper4.png diff --git a/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/wallpapers/wallpapers/wallpaper5.png b/users/guanranwang/nixos/profiles/device-type/desktop/home/wallpapers/wallpapers/wallpaper5.png similarity index 100% rename from users/guanranwang/home-manager/profiles/device-type/graphical/nixos/wallpapers/wallpapers/wallpaper5.png rename to users/guanranwang/nixos/profiles/device-type/desktop/home/wallpapers/wallpapers/wallpaper5.png diff --git a/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/xdg-mime.nix b/users/guanranwang/nixos/profiles/device-type/desktop/home/xdg-mime.nix similarity index 100% rename from users/guanranwang/home-manager/profiles/device-type/graphical/nixos/xdg-mime.nix rename to users/guanranwang/nixos/profiles/device-type/desktop/home/xdg-mime.nix diff --git a/users/guanranwang/nixos/profiles/device-type/laptop/default.nix b/users/guanranwang/nixos/profiles/device-type/laptop/default.nix index d1e8b2e..d26ea13 100644 --- a/users/guanranwang/nixos/profiles/device-type/laptop/default.nix +++ b/users/guanranwang/nixos/profiles/device-type/laptop/default.nix @@ -3,5 +3,5 @@ ../desktop ]; - home-manager.users.guanranwang.services.batsignal.enable = true; + home-manager.users.guanranwang = import ./home; } diff --git a/users/guanranwang/nixos/profiles/device-type/laptop/home/default.nix b/users/guanranwang/nixos/profiles/device-type/laptop/home/default.nix new file mode 100644 index 0000000..47eb590 --- /dev/null +++ b/users/guanranwang/nixos/profiles/device-type/laptop/home/default.nix @@ -0,0 +1,3 @@ +_: { + services.batsignal.enable = true; +} diff --git a/users/guanranwang/nixos/profiles/opt-in/gaming.nix b/users/guanranwang/nixos/profiles/opt-in/gaming.nix deleted file mode 100644 index 2818720..0000000 --- a/users/guanranwang/nixos/profiles/opt-in/gaming.nix +++ /dev/null @@ -1,5 +0,0 @@ -_: { - home-manager.users.guanranwang.imports = [ - ../../../home-manager/profiles/opt-in/gaming/nixos - ]; -} diff --git a/users/guanranwang/nixos/profiles/opt-in/gaming/default.nix b/users/guanranwang/nixos/profiles/opt-in/gaming/default.nix new file mode 100644 index 0000000..1dfd243 --- /dev/null +++ b/users/guanranwang/nixos/profiles/opt-in/gaming/default.nix @@ -0,0 +1,4 @@ +_: { + ### home-manager + home-manager.users.guanranwang.imports = [./home]; +} diff --git a/users/guanranwang/nixos/profiles/opt-in/gaming/home/default.nix b/users/guanranwang/nixos/profiles/opt-in/gaming/home/default.nix new file mode 100644 index 0000000..1445d1f --- /dev/null +++ b/users/guanranwang/nixos/profiles/opt-in/gaming/home/default.nix @@ -0,0 +1,9 @@ +{...}: { + imports = map (n: ../../../../../home-manager/applications/${n}) [ + "steam" + "prismlauncher" + "osu-lazer" + "mangohud" + "protonup-qt" + ]; +} diff --git a/users/guanranwang/nixos/profiles/opt-in/torrenting.nix b/users/guanranwang/nixos/profiles/opt-in/torrenting.nix deleted file mode 100644 index e16749c..0000000 --- a/users/guanranwang/nixos/profiles/opt-in/torrenting.nix +++ /dev/null @@ -1,5 +0,0 @@ -_: { - home-manager.users.guanranwang.imports = [ - ../../../home-manager/profiles/opt-in/torrenting/nixos - ]; -} diff --git a/users/guanranwang/nixos/profiles/opt-in/torrenting/default.nix b/users/guanranwang/nixos/profiles/opt-in/torrenting/default.nix new file mode 100644 index 0000000..e5bfab2 --- /dev/null +++ b/users/guanranwang/nixos/profiles/opt-in/torrenting/default.nix @@ -0,0 +1,4 @@ +_: { + ### home-manager + home-manager.users.guanranwang = import ./home; +} diff --git a/users/guanranwang/nixos/profiles/opt-in/torrenting/home/default.nix b/users/guanranwang/nixos/profiles/opt-in/torrenting/home/default.nix new file mode 100644 index 0000000..257fdb4 --- /dev/null +++ b/users/guanranwang/nixos/profiles/opt-in/torrenting/home/default.nix @@ -0,0 +1,5 @@ +{...}: { + imports = [ + ../../../../../home-manager/applications/qbittorrent + ]; +}