diff --git a/Droidnix/README.org b/Droidnix/README.org index 0485ff2ee..921e3123b 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -1181,12 +1181,6 @@ in # Use the .zshrc file from assets xdg.configFile."zsh/.zshrc".source = "${assetsDir}/.zshrc"; - - # Create symlinks or copy files from assets to XDG config - xdg.configFile."zsh/custom.zsh".source = "${assetsDir}/custom.zsh"; - xdg.configFile."zsh/aliases.zsh".source = "${assetsDir}/aliases.zsh"; - xdg.configFile."zsh/history.zsh".source = "${assetsDir}/history.zsh"; - }; } #+END_SRC diff --git a/Droidnix/assets/common/conf/zsh/.zshrc b/Droidnix/assets/common/conf/zsh/.zshrc index a53052a0e..d7b8cfd7e 100644 --- a/Droidnix/assets/common/conf/zsh/.zshrc +++ b/Droidnix/assets/common/conf/zsh/.zshrc @@ -73,11 +73,11 @@ if [ -n "$DIRENV_HOOK" ]; then fi # Aliases -alias -- la='eza -a' -alias -- ll='eza -l' -alias -- lla='eza -la' -alias -- ls='eza' -alias -- lt='eza --tree' +# alias -- la='eza -a' +# alias -- ll='eza -l' +# alias -- lla='eza -la' +# alias -- ls='eza' +# alias -- lt='eza --tree' # Eat shell integration [ -n "$EAT_SHELL_INTEGRATION_DIR" ] && source "$EAT_SHELL_INTEGRATION_DIR/zsh" diff --git a/Droidnix/assets/common/conf/zsh/aliases.zsh b/Droidnix/assets/common/conf/zsh/aliases.zsh new file mode 100644 index 000000000..e69de29bb diff --git a/Droidnix/generated/system/applications/terminal_shell/zsh.nix b/Droidnix/generated/system/applications/terminal_shell/zsh.nix index b376ab69d..f690db10b 100644 --- a/Droidnix/generated/system/applications/terminal_shell/zsh.nix +++ b/Droidnix/generated/system/applications/terminal_shell/zsh.nix @@ -35,10 +35,4 @@ in # Use the .zshrc file from assets xdg.configFile."zsh/.zshrc".source = "${assetsDir}/.zshrc"; - - # Create symlinks or copy files from assets to XDG config - xdg.configFile."zsh/custom.zsh".source = "${assetsDir}/custom.zsh"; - xdg.configFile."zsh/aliases.zsh".source = "${assetsDir}/aliases.zsh"; - xdg.configFile."zsh/history.zsh".source = "${assetsDir}/history.zsh"; - }; } diff --git a/Droidnix/generated/system/applications/top.nix b/Droidnix/generated/system/applications/top.nix index eb7db4f5e..34b4b3294 100644 --- a/Droidnix/generated/system/applications/top.nix +++ b/Droidnix/generated/system/applications/top.nix @@ -1,6 +1,16 @@ -{ config, pkgs, lib, user, inputs, flakeRoot,... }: +{ + config, + pkgs, + lib, + user, + inputs, + flakeRoot, + ... +}: { imports = [ + ./flatpaks.nix + ./packages.nix ./accessibility/top.nix ./file_management/top.nix ./gaming/top.nix