mirror of
https://github.com/celesrenata/end-4-flakes.git
synced 2026-06-11 20:39:57 -05:00
Add conflict handling for home-manager symlinks
- Handle conflicting symlinks for icons, konsole, and fish directories - Backup existing directories before home-manager creates new ones - Run conflict handling before linkGeneration phase
This commit is contained in:
@@ -24,15 +24,13 @@
|
||||
{
|
||||
overlays.default = final: prev: {
|
||||
# Enhanced quickshell with Qt5Compat support for dots-hyprland
|
||||
quickshell = final.symlinkJoin {
|
||||
name = "quickshell-with-qt5compat";
|
||||
paths = [ quickshell.packages.${system}.default ];
|
||||
buildInputs = [ final.makeWrapper ];
|
||||
postBuild = ''
|
||||
wrapProgram $out/bin/qs \
|
||||
--prefix QML2_IMPORT_PATH : "${final.qt6.qt5compat}/lib/qt-6/qml"
|
||||
'';
|
||||
};
|
||||
quickshell = final.writeShellScriptBin "qs" ''
|
||||
# Add Qt5Compat and quickshell config directories to QML import path
|
||||
export QML2_IMPORT_PATH="${final.kdePackages.qt5compat}/lib/qt-6/qml:$HOME/.config/quickshell/ii:$HOME/.config/quickshell:$QML2_IMPORT_PATH"
|
||||
|
||||
# Execute the original quickshell
|
||||
exec ${quickshell.packages.${system}.default}/bin/qs "$@"
|
||||
'';
|
||||
};
|
||||
|
||||
packages.${system} = utilityPackages // {
|
||||
@@ -72,7 +70,7 @@
|
||||
enable = true;
|
||||
source = ./configs; # Use local configs
|
||||
packageSet = "essential";
|
||||
mode = "declarative";
|
||||
mode = "hybrid";
|
||||
|
||||
# 🎨 Quickshell Configuration
|
||||
quickshell = {
|
||||
|
||||
Reference in New Issue
Block a user