From a811f83835221b4a92470ac94428558d0c96f817 Mon Sep 17 00:00:00 2001 From: Liam Malone Date: Thu, 6 Nov 2025 13:02:47 +0000 Subject: [PATCH] properly use joint hyprland config on desktop --- configs/dms-desktop/settings.json | 87 ++++++++++++++++++++++++++----- hosts/desktop/file.nix | 12 ++++- 2 files changed, 84 insertions(+), 15 deletions(-) diff --git a/configs/dms-desktop/settings.json b/configs/dms-desktop/settings.json index 5d22bb8..1a871a3 100644 --- a/configs/dms-desktop/settings.json +++ b/configs/dms-desktop/settings.json @@ -2,17 +2,24 @@ "currentThemeName": "dynamic", "customThemeFile": "", "matugenScheme": "scheme-fidelity", + "runUserMatugenTemplates": true, + "matugenTargetMonitor": "", "dankBarTransparency": 0, "dankBarWidgetTransparency": 1, "popupTransparency": 1, "dockTransparency": 1, + "widgetBackgroundColor": "sch", + "surfaceBase": "s", + "cornerRadius": 10, "use24HourClock": true, + "showSeconds": false, "useFahrenheit": false, "nightModeEnabled": false, - "weatherLocation": "Dublin, Leinster", - "weatherCoordinates": "53.3493795,-6.2605593", - "useAutoLocation": true, - "weatherEnabled": true, + "animationSpeed": 2, + "customAnimationDuration": 500, + "wallpaperFillMode": "Fill", + "blurredWallpaperLayer": false, + "blurWallpaperOnOverview": false, "showLauncherButton": true, "showWorkspaceSwitcher": true, "showFocusedWindow": true, @@ -67,15 +74,19 @@ ], "showWorkspaceIndex": false, "showWorkspacePadding": false, + "workspaceScrolling": false, "showWorkspaceApps": false, "maxWorkspaceIcons": 3, "workspacesPerMonitor": true, + "dwlShowAllTags": false, "workspaceNameIcons": {}, "waveProgressEnabled": true, "clockCompactMode": false, "focusedWindowCompactMode": false, "runningAppsCompactMode": true, + "keyboardLayoutNameCompactMode": false, "runningAppsCurrentWorkspace": true, + "runningAppsGroupByApp": false, "clockDateFormat": "", "lockDateFormat": "", "mediaSize": 1, @@ -103,26 +114,55 @@ "enabled": true } ], + "dankBarWidgetOrder": [], "appLauncherViewMode": "list", "spotlightModalViewMode": "grid", + "sortAppsAlphabetically": false, + "weatherLocation": "Dublin, Leinster", + "weatherCoordinates": "53.3493795,-6.2605593", + "useAutoLocation": true, + "weatherEnabled": true, "networkPreference": "auto", + "vpnLastConnected": "", "iconTheme": "System Default", - "useOSLogo": false, - "osLogoColorOverride": "", - "osLogoBrightness": 0.5, - "osLogoContrast": 1, + "launcherLogoMode": "apps", + "launcherLogoCustomPath": "", + "launcherLogoColorOverride": "", + "launcherLogoColorInvertOnMode": false, + "launcherLogoBrightness": 0.5, + "launcherLogoContrast": 1, + "launcherLogoSizeOffset": 0, "fontFamily": "FiraCode Nerd Font Med", "monoFontFamily": "Kelmscott Mono", "fontWeight": 400, "fontScale": 1, + "dankBarFontScale": 1, "notepadUseMonospace": true, "notepadFontFamily": "", "notepadFontSize": 14, "notepadShowLineNumbers": true, "notepadTransparencyOverride": -1, "notepadLastCustomTransparency": 0.7, + "soundsEnabled": true, + "useSystemSoundTheme": false, + "soundNewNotification": true, + "soundVolumeChanged": true, + "soundPluggedIn": true, + "acMonitorTimeout": 600, + "acLockTimeout": 300, + "acSuspendTimeout": 900, + "acSuspendBehavior": 0, + "batteryMonitorTimeout": 0, + "batteryLockTimeout": 0, + "batterySuspendTimeout": 0, + "batterySuspendBehavior": 0, + "lockBeforeSuspend": true, + "loginctlLockIntegration": true, + "launchPrefix": "", + "brightnessDevicePins": {}, "gtkThemingEnabled": false, "qtThemingEnabled": false, + "syncModeWithPortal": true, "showDock": false, "dockAutoHide": false, "dockGroupByApp": false, @@ -130,7 +170,8 @@ "dockPosition": 1, "dockSpacing": 4, "dockBottomGap": 0, - "cornerRadius": 10, + "dockIconSize": 40, + "dockIndicatorStyle": "circle", "notificationOverlayEnabled": false, "dankBarAutoHide": false, "dankBarOpenOnOverview": false, @@ -138,18 +179,36 @@ "dankBarSpacing": 3, "dankBarBottomGap": 0, "dankBarInnerPadding": 4, + "dankBarPosition": 2, "dankBarSquareCorners": false, "dankBarNoBackground": false, "dankBarGothCornersEnabled": false, - "dankBarPosition": 2, + "dankBarBorderEnabled": false, + "dankBarBorderColor": "surfaceText", + "dankBarBorderOpacity": 1, + "dankBarBorderThickness": 1, + "popupGapsAuto": true, + "popupGapsManual": 4, + "modalDarkenBackground": true, "lockScreenShowPowerActions": true, + "enableFprint": false, + "maxFprintTries": 3, "hideBrightnessSlider": false, - "widgetBackgroundColor": "sch", - "surfaceBase": "s", "notificationTimeoutLow": 5000, "notificationTimeoutNormal": 5000, "notificationTimeoutCritical": 0, "notificationPopupPosition": 0, + "osdAlwaysShowValue": false, + "powerActionConfirm": true, + "customPowerActionLock": "", + "customPowerActionLogout": "", + "customPowerActionSuspend": "", + "customPowerActionHibernate": "", + "customPowerActionReboot": "", + "customPowerActionPowerOff": "", + "updaterUseCustomCommand": false, + "updaterCustomCommand": "", + "updaterTerminalAdditionalParams": "", "screenPreferences": { "osd": [ "DP-1" @@ -167,6 +226,6 @@ "DP-1" ] }, - "pluginSettings": {}, - "animationSpeed": 2 + "showOnLastDisplay": {}, + "configVersion": 1 } \ No newline at end of file diff --git a/hosts/desktop/file.nix b/hosts/desktop/file.nix index a458f86..2ac5dc2 100644 --- a/hosts/desktop/file.nix +++ b/hosts/desktop/file.nix @@ -22,10 +22,20 @@ in # Configs ".config/hypr" = { - source = ../../configs/hypr-desktop; + source = ../../configs/hypr; outOfStoreSymlink = true; recursive = true; }; + ".config/hypr/hypr-monitors.conf" = { + source = ../../configs/hypr-desktop/hypr-monitors.conf; + outOfStoreSymlink = true; + recursive = false; + }; + ".config/hypr/hypr-colors.conf" = { + source = ../../configs/hypr-desktop/hypr-colors.conf; + outOfStoreSymlink = true; + recursive = false; + }; ".config/DankMaterialShell" = { source = ../../configs/dms-desktop; outOfStoreSymlink = true;