properly use joint hyprland config on desktop

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",
+  "animationSpeed": 2,
-  "weatherCoordinates": "53.3493795,-6.2605593",
+  "customAnimationDuration": 500,
-  "useAutoLocation": true,
+  "wallpaperFillMode": "Fill",
-  "weatherEnabled": true,
+  "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,
+  "launcherLogoMode": "apps",
-  "osLogoColorOverride": "",
+  "launcherLogoCustomPath": "",
-  "osLogoBrightness": 0.5,
+  "launcherLogoColorOverride": "",
-  "osLogoContrast": 1,
+  "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": {},
+  "showOnLastDisplay": {},
-  "animationSpeed": 2
+  "configVersion": 1
 }

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;