diff --git a/home/alice/configurations/Cape/default.nix b/home/alice/configurations/Cape/default.nix index 5f6bf3e..1d26bf3 100644 --- a/home/alice/configurations/Cape/default.nix +++ b/home/alice/configurations/Cape/default.nix @@ -5,32 +5,23 @@ ... }: { - youthlic.programs = { - helix.enable = true; - gpg.enable = true; - fish.enable = true; - bash.enable = true; - starship.enable = true; - sops.enable = true; - atuin.enable = true; - git = { - email = "ulic.youthlic@gmail.com"; - name = "ulic-youthlic"; - encrypt-credential = false; + youthlic = { + xdg-dirs.enable = true; + programs = { + helix.enable = true; + gpg.enable = true; + fish.enable = true; + bash.enable = true; + starship.enable = true; + sops.enable = true; + atuin.enable = true; + git = { + 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.homeDirectory = "/home/${unixName}"; home.stateVersion = "24.11"; diff --git a/home/david/configurations/Akun/default.nix b/home/david/configurations/Akun/default.nix index c603d77..f423dcc 100644 --- a/home/david/configurations/Akun/default.nix +++ b/home/david/configurations/Akun/default.nix @@ -6,32 +6,34 @@ ... }: { - youthlic.programs = { - firefox.enable = true; - fuzzel.enable = true; - helix.enable = true; - gpg.enable = true; - git = { - email = "ulic.youthlic@gmail.com"; - name = "ulic-youthlic"; - signKey = "C6FCBD7F49E1CBBABD6661F7FC02063F04331A95"; - encrypt-credential = true; + youthlic = { + xdg-dirs.enable = true; + programs = { + firefox.enable = true; + fuzzel.enable = true; + helix.enable = true; + gpg.enable = true; + git = { + email = "ulic.youthlic@gmail.com"; + 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 = { wallpaper.enable = true; programs.openssh.enable = true; - xdg-dirs.enable = true; }; home.username = "${unixName}"; diff --git a/home/david/configurations/Tytonidae/default.nix b/home/david/configurations/Tytonidae/default.nix index 89868e0..908b254 100644 --- a/home/david/configurations/Tytonidae/default.nix +++ b/home/david/configurations/Tytonidae/default.nix @@ -12,35 +12,37 @@ ./wluma ]; - youthlic.programs = { - firefox.enable = true; - fuzzel.enable = true; - helix.enable = true; - gpg.enable = true; - git = { - email = "ulic.youthlic@gmail.com"; - name = "ulic-youthlic"; - signKey = "C6FCBD7F49E1CBBABD6661F7FC02063F04331A95"; - encrypt-credential = true; + youthlic = { + xdg-dirs.enable = true; + programs = { + firefox.enable = true; + fuzzel.enable = true; + helix.enable = true; + gpg.enable = true; + git = { + email = "ulic.youthlic@gmail.com"; + 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 = { wallpaper.enable = true; programs.openssh.enable = true; - xdg-dirs.enable = true; }; home.username = "${unixName}"; diff --git a/home/david/modules/default.nix b/home/david/modules/default.nix index d71796a..882ebe7 100644 --- a/home/david/modules/default.nix +++ b/home/david/modules/default.nix @@ -3,7 +3,6 @@ imports = [ ./wallpaper.nix ./programs - ./xdg-dirs.nix ]; config = { home.packages = with pkgs; [ diff --git a/home/modules/default.nix b/home/modules/default.nix index 0c4f7a8..a2aa712 100644 --- a/home/modules/default.nix +++ b/home/modules/default.nix @@ -11,6 +11,7 @@ ++ [ ./nix.nix ./programs + ./xdg-dirs.nix ]; options = { diff --git a/home/david/modules/xdg-dirs.nix b/home/modules/xdg-dirs.nix similarity index 91% rename from home/david/modules/xdg-dirs.nix rename to home/modules/xdg-dirs.nix index c1064bf..a84c160 100644 --- a/home/david/modules/xdg-dirs.nix +++ b/home/modules/xdg-dirs.nix @@ -1,10 +1,10 @@ { lib, config, ... }: let - cfg = config.david.xdg-dirs; + cfg = config.youthlic.xdg-dirs; in { options = { - david.xdg-dirs = { + youthlic.xdg-dirs = { enable = lib.mkEnableOption "xdg-dirs"; }; };