From 986a8dd01a9e3a1920a33c0304aa63110a647471 Mon Sep 17 00:00:00 2001 From: Bun Date: Fri, 16 May 2025 02:52:31 -0400 Subject: [PATCH] Standardize formatting --- .../programs/misc/gaming/launchers/default.nix | 12 +++++++----- modules/home/programs/misc/general/default.nix | 9 +++++---- modules/home/programs/misc/production/default.nix | 11 ++++++----- modules/home/programs/misc/school/default.nix | 15 ++++++++------- .../home/programs/terminal/nix-index/default.nix | 4 +++- modules/home/programs/terminal/zsh/default.nix | 3 ++- 6 files changed, 31 insertions(+), 23 deletions(-) diff --git a/modules/home/programs/misc/gaming/launchers/default.nix b/modules/home/programs/misc/gaming/launchers/default.nix index bf58d51f..288d2f80 100644 --- a/modules/home/programs/misc/gaming/launchers/default.nix +++ b/modules/home/programs/misc/gaming/launchers/default.nix @@ -8,11 +8,13 @@ steam steam-run-free ]; - persistence."${config.xdg.userDirs.extraConfig.XDG_PERSIST_DIR}".directories = with lib; with config.home; with config.xdg; [ - "games/${removePrefix "${homeDirectory}/" configHome}/heroic" - "games/${removePrefix "${homeDirectory}/" dataHome}/PrismLauncher" - "games/${removePrefix "${homeDirectory}/" dataHome}/Steam" - ]; + persistence."${config.xdg.userDirs.extraConfig.XDG_PERSIST_DIR}".directories = + with lib; with config.home; with config.xdg; [ + "games/${removePrefix "${homeDirectory}/" configHome}/heroic" + "games/${removePrefix "${homeDirectory}/" dataHome}/PrismLauncher" + "games/${removePrefix "${homeDirectory}/" dataHome}/Steam" + "games/.steam" + ]; }; nixpkgs.allowUnfreePackages = [ diff --git a/modules/home/programs/misc/general/default.nix b/modules/home/programs/misc/general/default.nix index 473872c5..f8e7530e 100644 --- a/modules/home/programs/misc/general/default.nix +++ b/modules/home/programs/misc/general/default.nix @@ -6,9 +6,10 @@ qbittorrent vesktop ]; - persistence."${config.xdg.userDirs.extraConfig.XDG_PERSIST_DIR}".directories = with lib; with config.home; with config.xdg; [ - "data/${removePrefix "${homeDirectory}/" configHome}/qBittorrent" - "data/${removePrefix "${homeDirectory}/" configHome}/vesktop" - ]; + persistence."${config.xdg.userDirs.extraConfig.XDG_PERSIST_DIR}".directories = + with lib; with config.home; with config.xdg; [ + "data/${removePrefix "${homeDirectory}/" configHome}/qBittorrent" + "data/${removePrefix "${homeDirectory}/" configHome}/vesktop" + ]; }; } diff --git a/modules/home/programs/misc/production/default.nix b/modules/home/programs/misc/production/default.nix index f00142e9..a7b62231 100644 --- a/modules/home/programs/misc/production/default.nix +++ b/modules/home/programs/misc/production/default.nix @@ -8,10 +8,11 @@ blender_4_4 krita ]; - persistence."${config.xdg.userDirs.extraConfig.XDG_PERSIST_DIR}".directories = with lib; with config.home; with config.xdg; [ - "data/${removePrefix "${homeDirectory}/" configHome}/audacity" - "data/${removePrefix "${homeDirectory}/" configHome}/blender" - "data/${removePrefix "${homeDirectory}/" dataHome}/krita" - ]; + persistence."${config.xdg.userDirs.extraConfig.XDG_PERSIST_DIR}".directories = + with lib; with config.home; with config.xdg; [ + "data/${removePrefix "${homeDirectory}/" configHome}/audacity" + "data/${removePrefix "${homeDirectory}/" configHome}/blender" + "data/${removePrefix "${homeDirectory}/" dataHome}/krita" + ]; }; } diff --git a/modules/home/programs/misc/school/default.nix b/modules/home/programs/misc/school/default.nix index 1bf20c7a..a4b30480 100644 --- a/modules/home/programs/misc/school/default.nix +++ b/modules/home/programs/misc/school/default.nix @@ -11,12 +11,13 @@ shellAliases.seneca = "ssh jhampton1@matrix.senecapolytechnic.ca"; - persistence."${config.xdg.userDirs.extraConfig.XDG_PERSIST_DIR}".directories = with lib; with config.home; with config.xdg; [ - "school/${removePrefix "${homeDirectory}/" cacheHome}/gpclient" - "school/${removePrefix "${homeDirectory}/" configHome}/com.yuezk.qt" - "school/${removePrefix "${homeDirectory}/" configHome}/remmina" - "school/${removePrefix "${homeDirectory}/" configHome}/teams-for-linux" - "school/.vmware" - ]; + persistence."${config.xdg.userDirs.extraConfig.XDG_PERSIST_DIR}".directories = + with lib; with config.home; with config.xdg; [ + "school/${removePrefix "${homeDirectory}/" cacheHome}/gpclient" + "school/${removePrefix "${homeDirectory}/" configHome}/com.yuezk.qt" + "school/${removePrefix "${homeDirectory}/" configHome}/remmina" + "school/${removePrefix "${homeDirectory}/" configHome}/teams-for-linux" + "school/.vmware" + ]; }; } diff --git a/modules/home/programs/terminal/nix-index/default.nix b/modules/home/programs/terminal/nix-index/default.nix index 448d8677..f3d2d676 100644 --- a/modules/home/programs/terminal/nix-index/default.nix +++ b/modules/home/programs/terminal/nix-index/default.nix @@ -2,5 +2,7 @@ { programs.nix-index.enable = true; - home.persistence."${config.xdg.userDirs.extraConfig.XDG_PERSIST_DIR}".directories = [ "state/.cache/nix-index" ]; + home.persistence."${config.xdg.userDirs.extraConfig.XDG_PERSIST_DIR}".directories = + with lib; with config.home; with config.xdg; + [ "state/${removePrefix "${homeDirectory}/" cacheHome}/nix-index" ]; } diff --git a/modules/home/programs/terminal/zsh/default.nix b/modules/home/programs/terminal/zsh/default.nix index 1353018a..e5345c18 100644 --- a/modules/home/programs/terminal/zsh/default.nix +++ b/modules/home/programs/terminal/zsh/default.nix @@ -27,6 +27,7 @@ ''; }; - home.persistence."${config.xdg.userDirs.extraConfig.XDG_PERSIST_DIR}".directories = with lib; with config.home; with config.xdg; + home.persistence."${config.xdg.userDirs.extraConfig.XDG_PERSIST_DIR}".directories = + with lib; with config.home; with config.xdg; [ "state/${removePrefix "${homeDirectory}/" configHome}/zsh" ]; }