move xdg-dirs config to home level

This commit is contained in:
ulic-youthlic 2025-02-01 23:09:24 +08:00
parent 4c7e6e3af3
commit 69e684bd7e
Signed by: youthlic
GPG key ID: 63E86C3C14A0D721
6 changed files with 65 additions and 70 deletions

View file

@ -5,32 +5,23 @@
... ...
}: }:
{ {
youthlic.programs = { youthlic = {
helix.enable = true; xdg-dirs.enable = true;
gpg.enable = true; programs = {
fish.enable = true; helix.enable = true;
bash.enable = true; gpg.enable = true;
starship.enable = true; fish.enable = true;
sops.enable = true; bash.enable = true;
atuin.enable = true; starship.enable = true;
git = { sops.enable = true;
email = "ulic.youthlic@gmail.com"; atuin.enable = true;
name = "ulic-youthlic"; git = {
encrypt-credential = false; email = "ulic.youthlic@gmail.com";
name = "ulic-youthlic";
encrypt-credential = false;
};
}; };
}; };
xdg.userDirs = {
enable = true;
download = "${config.home.homeDirectory}/dls";
documents = "${config.home.homeDirectory}/doc";
music = "${config.home.homeDirectory}/mus";
pictures = "${config.home.homeDirectory}/pic";
videos = "${config.home.homeDirectory}/vid";
templates = "${config.home.homeDirectory}/tpl";
publicShare = "${config.home.homeDirectory}/pub";
desktop = "${config.home.homeDirectory}/dsk";
createDirectories = true;
};
home.username = "${unixName}"; home.username = "${unixName}";
home.homeDirectory = "/home/${unixName}"; home.homeDirectory = "/home/${unixName}";
home.stateVersion = "24.11"; home.stateVersion = "24.11";

View file

@ -6,32 +6,34 @@
... ...
}: }:
{ {
youthlic.programs = { youthlic = {
firefox.enable = true; xdg-dirs.enable = true;
fuzzel.enable = true; programs = {
helix.enable = true; firefox.enable = true;
gpg.enable = true; fuzzel.enable = true;
git = { helix.enable = true;
email = "ulic.youthlic@gmail.com"; gpg.enable = true;
name = "ulic-youthlic"; git = {
signKey = "C6FCBD7F49E1CBBABD6661F7FC02063F04331A95"; email = "ulic.youthlic@gmail.com";
encrypt-credential = true; name = "ulic-youthlic";
signKey = "C6FCBD7F49E1CBBABD6661F7FC02063F04331A95";
encrypt-credential = true;
};
fish.enable = true;
bash.enable = true;
ghostty.enable = true;
starship.enable = true;
sops.enable = true;
mpv.enable = true;
atuin.enable = true;
obs.enable = true;
chromium.enable = true;
}; };
fish.enable = true;
bash.enable = true;
ghostty.enable = true;
starship.enable = true;
sops.enable = true;
mpv.enable = true;
atuin.enable = true;
obs.enable = true;
chromium.enable = true;
}; };
david = { david = {
wallpaper.enable = true; wallpaper.enable = true;
programs.openssh.enable = true; programs.openssh.enable = true;
xdg-dirs.enable = true;
}; };
home.username = "${unixName}"; home.username = "${unixName}";

View file

@ -12,35 +12,37 @@
./wluma ./wluma
]; ];
youthlic.programs = { youthlic = {
firefox.enable = true; xdg-dirs.enable = true;
fuzzel.enable = true; programs = {
helix.enable = true; firefox.enable = true;
gpg.enable = true; fuzzel.enable = true;
git = { helix.enable = true;
email = "ulic.youthlic@gmail.com"; gpg.enable = true;
name = "ulic-youthlic"; git = {
signKey = "C6FCBD7F49E1CBBABD6661F7FC02063F04331A95"; email = "ulic.youthlic@gmail.com";
encrypt-credential = true; name = "ulic-youthlic";
signKey = "C6FCBD7F49E1CBBABD6661F7FC02063F04331A95";
encrypt-credential = true;
};
fish.enable = true;
bash.enable = true;
ghostty.enable = true;
foot.enable = false;
starship.enable = true;
sops.enable = true;
mpv.enable = true;
kvm.enable = true;
atuin.enable = true;
thunderbird.enable = true;
obs.enable = true;
chromium.enable = true;
}; };
fish.enable = true;
bash.enable = true;
ghostty.enable = true;
foot.enable = false;
starship.enable = true;
sops.enable = true;
mpv.enable = true;
kvm.enable = true;
atuin.enable = true;
thunderbird.enable = true;
obs.enable = true;
chromium.enable = true;
}; };
david = { david = {
wallpaper.enable = true; wallpaper.enable = true;
programs.openssh.enable = true; programs.openssh.enable = true;
xdg-dirs.enable = true;
}; };
home.username = "${unixName}"; home.username = "${unixName}";

View file

@ -3,7 +3,6 @@
imports = [ imports = [
./wallpaper.nix ./wallpaper.nix
./programs ./programs
./xdg-dirs.nix
]; ];
config = { config = {
home.packages = with pkgs; [ home.packages = with pkgs; [

View file

@ -11,6 +11,7 @@
++ [ ++ [
./nix.nix ./nix.nix
./programs ./programs
./xdg-dirs.nix
]; ];
options = { options = {

View file

@ -1,10 +1,10 @@
{ lib, config, ... }: { lib, config, ... }:
let let
cfg = config.david.xdg-dirs; cfg = config.youthlic.xdg-dirs;
in in
{ {
options = { options = {
david.xdg-dirs = { youthlic.xdg-dirs = {
enable = lib.mkEnableOption "xdg-dirs"; enable = lib.mkEnableOption "xdg-dirs";
}; };
}; };