From 910040bebae3a915e4dcb8d4a85dd1f57441de4c Mon Sep 17 00:00:00 2001 From: Liam Malone Date: Mon, 24 Nov 2025 13:06:56 +0000 Subject: [PATCH] flake update, hyprland windowrule format is changed --- configs/dms-darp8/settings.json | 126 +++++++++++++++++--------------- configs/hypr/hyprland.conf | 86 +++++++++++----------- flake.lock | 42 +++++------ hosts/darp8/configuration.nix | 2 +- 4 files changed, 134 insertions(+), 122 deletions(-) diff --git a/configs/dms-darp8/settings.json b/configs/dms-darp8/settings.json index 87cf1e4..0dee0f0 100644 --- a/configs/dms-darp8/settings.json +++ b/configs/dms-darp8/settings.json @@ -4,8 +4,6 @@ "matugenScheme": "scheme-fidelity", "runUserMatugenTemplates": true, "matugenTargetMonitor": "", - "dankBarTransparency": 0, - "dankBarWidgetTransparency": 1, "popupTransparency": 1, "dockTransparency": 1, "widgetBackgroundColor": "sch", @@ -99,42 +97,6 @@ "clockDateFormat": "", "lockDateFormat": "", "mediaSize": 1, - "dankBarLeftWidgets": [ - "launcherButton", - { - "id": "workspaceSwitcher", - "enabled": true - }, - "focusedWindow" - ], - "dankBarCenterWidgets": [ - "music", - "clock", - "weather" - ], - "dankBarRightWidgets": [ - { - "id": "systemTray", - "enabled": true - }, - { - "id": "privacyIndicator", - "enabled": true - }, - { - "id": "notificationButton", - "enabled": true - }, - { - "id": "battery", - "enabled": true - }, - { - "id": "controlCenterButton", - "enabled": true - } - ], - "dankBarWidgetOrder": [], "appLauncherViewMode": "list", "spotlightModalViewMode": "grid", "sortAppsAlphabetically": false, @@ -195,24 +157,6 @@ "dockIconSize": 40, "dockIndicatorStyle": "circle", "notificationOverlayEnabled": false, - "dankBarAutoHide": false, - "dankBarOpenOnOverview": false, - "dankBarVisible": true, - "dankBarSpacing": 3, - "dankBarBottomGap": 0, - "dankBarInnerPadding": 4, - "dankBarPosition": 0, - "dankBarSquareCorners": false, - "dankBarNoBackground": false, - "dankBarGothCornersEnabled": false, - "dankBarGothCornerRadiusOverride": false, - "dankBarGothCornerRadiusValue": 12, - "dankBarBorderEnabled": false, - "dankBarBorderColor": "surfaceText", - "dankBarBorderOpacity": 1, - "dankBarBorderThickness": 1, - "popupGapsAuto": true, - "popupGapsManual": 4, "modalDarkenBackground": true, "lockScreenShowPowerActions": true, "enableFprint": false, @@ -249,5 +193,73 @@ ] }, "showOnLastDisplay": {}, - "configVersion": 1 + "configVersion": 2, + "barConfigs": [ + { + "id": "default", + "name": "Main Bar", + "enabled": true, + "position": 0, + "screenPreferences": [ + "all" + ], + "showOnLastDisplay": true, + "leftWidgets": [ + "launcherButton", + { + "id": "workspaceSwitcher", + "enabled": true + }, + "focusedWindow" + ], + "centerWidgets": [ + "music", + "clock", + "weather" + ], + "rightWidgets": [ + { + "id": "systemTray", + "enabled": true + }, + { + "id": "privacyIndicator", + "enabled": true + }, + { + "id": "notificationButton", + "enabled": true + }, + { + "id": "battery", + "enabled": true + }, + { + "id": "controlCenterButton", + "enabled": true + } + ], + "spacing": 3, + "innerPadding": 4, + "bottomGap": 0, + "transparency": 0, + "widgetTransparency": 1, + "squareCorners": false, + "noBackground": false, + "gothCornersEnabled": false, + "gothCornerRadiusOverride": false, + "gothCornerRadiusValue": 12, + "borderEnabled": false, + "borderColor": "surfaceText", + "borderOpacity": 1, + "borderThickness": 1, + "fontScale": 1, + "autoHide": false, + "autoHideDelay": 250, + "openOnOverview": false, + "visible": true, + "popupGapsAuto": true, + "popupGapsManual": 4 + } + ] } \ No newline at end of file diff --git a/configs/hypr/hyprland.conf b/configs/hypr/hyprland.conf index fe317bf..9b0e56f 100644 --- a/configs/hypr/hyprland.conf +++ b/configs/hypr/hyprland.conf @@ -128,49 +128,49 @@ $idleInhibFs = idleinhibit fullscreen $idleInhibFo = idleinhibit focus $ws = workspace - windowrule = $idleInhibFs, class:^(floorp)$ - windowrule = $idleInhibFs, class:^(firefox)$ - windowrule = $idleInhibFs, class:^(ghostty)$ - windowrule = $idleInhibFs, class:^(brave-browser)$ - - windowrule = $idleInhibFo, class:^(mpv)$ - windowrule = $idleInhibFo, class:^(firefox)$ - windowrule = $idleInhibFo, class:^(floorp)$ - windowrule = $idleInhibFo, class:^(spotify)$ - windowrule = $idleInhibFo, class:^(Emacs|emacs)$ - windowrule = $idleInhibFo, class:^(brave-browser)$ - windowrule = $idleInhibFo, class:^(Discord|discord)$ - - windowrule = opacity 0.98 0.90, class:^(Discord|discord)$ - windowrule = opacity 0.96 0.90, class:^(Emacs|emacs)$ - - windowrule = float, class:^(.*desktop-portal.*)$ - windowrule = float, class:^(polkit.*agent.*)$ - windowrule = float, class:^(praat)$ - windowrule = float, class:^(network)$ - windowrule = float, class:^(nm-)$ - windowrule = float, class:^(Network)$ - windowrule = float, class:^(Rofi)$ - windowrule = float, class:^(Gimp)$ - windowrule = float, class:^(thunar)$ - windowrule = float, class:^(Nautilus)$ - windowrule = float, title:^(LmDev-.*)$ - windowrule = float, class:^(notification)$ - windowrule = float, class:^(Genymotion Player)$ - windowrule = float, class:^(launcher)$ - - windowrule = tile, class:^(Spotify)$ - windowrule = tile, title:^(Minecraft)$ - - windowrule = $ws $ws_shell, class:^(KeePassXC)$ - windowrule = $ws $ws_web, class:^(firefox)$ - windowrule = $ws $ws_web, class:^(floorp)$ - windowrule = $ws $ws_web, class:^(brave-browser)$ - windowrule = $ws $ws_music, class:^(Spotify)$ - windowrule = $ws $ws_chat, class:^(discord)$ - windowrule = $ws $ws_chat, class:^(signal)$, title:^(Signal)$ - windowrule = $ws $ws_video, class:^(.*obs.*)$ - windowrule = $ws $ws_game, title:^(Minecraft)$ +# windowrule = $idleInhibFs, class:^(floorp)$ +# windowrule = $idleInhibFs, class:^(firefox)$ +# windowrule = $idleInhibFs, class:^(ghostty)$ +# windowrule = $idleInhibFs, class:^(brave-browser)$ +# +# windowrule = $idleInhibFo, class:^(mpv)$ +# windowrule = $idleInhibFo, class:^(firefox)$ +# windowrule = $idleInhibFo, class:^(floorp)$ +# windowrule = $idleInhibFo, class:^(spotify)$ +# windowrule = $idleInhibFo, class:^(Emacs|emacs)$ +# windowrule = $idleInhibFo, class:^(brave-browser)$ +# windowrule = $idleInhibFo, class:^(Discord|discord)$ +# +# windowrule = opacity 0.98 0.90, class:^(Discord|discord)$ +# windowrule = opacity 0.96 0.90, class:^(Emacs|emacs)$ +# +# windowrule = float, class:^(.*desktop-portal.*)$ +# windowrule = float, class:^(polkit.*agent.*)$ +# windowrule = float, class:^(praat)$ +# windowrule = float, class:^(network)$ +# windowrule = float, class:^(nm-)$ +# windowrule = float, class:^(Network)$ +# windowrule = float, class:^(Rofi)$ +# windowrule = float, class:^(Gimp)$ +# windowrule = float, class:^(thunar)$ +# windowrule = float, class:^(Nautilus)$ +# windowrule = float, title:^(LmDev-.*)$ +# windowrule = float, class:^(notification)$ +# windowrule = float, class:^(Genymotion Player)$ +# windowrule = float, class:^(launcher)$ +# +# windowrule = tile, class:^(Spotify)$ +# windowrule = tile, title:^(Minecraft)$ +# +# windowrule = $ws $ws_shell, class:^(KeePassXC)$ +# windowrule = $ws $ws_web, class:^(firefox)$ +# windowrule = $ws $ws_web, class:^(floorp)$ +# windowrule = $ws $ws_web, class:^(brave-browser)$ +# windowrule = $ws $ws_music, class:^(Spotify)$ +# windowrule = $ws $ws_chat, class:^(discord)$ +# windowrule = $ws $ws_chat, class:^(signal)$, title:^(Signal)$ +# windowrule = $ws $ws_video, class:^(.*obs.*)$ +# windowrule = $ws $ws_game, title:^(Minecraft)$ # Commands # :Alias: :Command: diff --git a/flake.lock b/flake.lock index 3b4d846..1bebb5b 100644 --- a/flake.lock +++ b/flake.lock @@ -71,11 +71,11 @@ ] }, "locked": { - "lastModified": 1763042087, - "narHash": "sha256-8zxTTLmZBFaw7BsU4TdgPspHXgXO3rzCW1GqGgcL5uo=", + "lastModified": 1763939855, + "narHash": "sha256-mG+v5TPArZmBw3XQBe5JSiuIS1Nm9CpsiCsfz25suL8=", "owner": "AvengeMedia", "repo": "DankMaterialShell", - "rev": "76a60df88bc248c99212450626bf7a43d05faaf9", + "rev": "43bea80cad922edea93544a5b96993fedaba0a6c", "type": "github" }, "original": { @@ -266,11 +266,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1762992484, - "narHash": "sha256-KsMb0niSk2zxZcSWjIkgcDIGwoKZXDYXdw9lVKdgga8=", + "lastModified": 1763912895, + "narHash": "sha256-tTdCVeROhYTwV510tygS5AMutJGz5imM++P4+cXAy2w=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "64ee8f8a72d62069a6bef45ca05bef1d0d412e1f", + "rev": "2b0fd417d32278159d0ca1d23fb997588c37995b", "type": "github" }, "original": { @@ -422,11 +422,11 @@ ] }, "locked": { - "lastModified": 1758927902, - "narHash": "sha256-LZgMds7M94+vuMql2bERQ6LiFFdhgsEFezE4Vn+Ys3A=", + "lastModified": 1763254292, + "narHash": "sha256-JNgz3Fz2KMzkT7aR72wsgu/xNeJB//LSmdilh8Z/Zao=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "4dafa28d4f79877d67a7d1a654cddccf8ebf15da", + "rev": "deea98d5b61d066bdc7a68163edd2c4bd28d3a6b", "type": "github" }, "original": { @@ -642,11 +642,11 @@ ] }, "locked": { - "lastModified": 1762387740, - "narHash": "sha256-gQ9zJ+pUI4o+Gh4Z6jhJll7jjCSwi8ZqJIhCE2oqwhQ=", + "lastModified": 1763323331, + "narHash": "sha256-+Z0OfCo1MS8/aIutSAW5aJR9zTae1wz9kcJYMgpwN6M=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "926689ddb9c0a8787e58c02c765a62e32d63d1f7", + "rev": "0c6411851cc779d551edc89b83966696201611aa", "type": "github" }, "original": { @@ -815,11 +815,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1762363567, - "narHash": "sha256-YRqMDEtSMbitIMj+JLpheSz0pwEr0Rmy5mC7myl17xs=", + "lastModified": 1763283776, + "narHash": "sha256-Y7TDFPK4GlqrKrivOcsHG8xSGqQx3A6c+i7novT85Uk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ae814fd3904b621d8ab97418f1d0f2eb0d3716f4", + "rev": "50a96edd8d0db6cc8db57dab6bb6d6ee1f3dc49a", "type": "github" }, "original": { @@ -887,11 +887,11 @@ ] }, "locked": { - "lastModified": 1762441963, - "narHash": "sha256-j+rNQ119ffYUkYt2YYS6rnd6Jh/crMZmbqpkGLXaEt0=", + "lastModified": 1763319842, + "narHash": "sha256-YG19IyrTdnVn0l3DvcUYm85u3PaqBt6tI6VvolcuHnA=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "8e7576e79b88c16d7ee3bbd112c8d90070832885", + "rev": "7275fa67fbbb75891c16d9dee7d88e58aea2d761", "type": "github" }, "original": { @@ -907,11 +907,11 @@ ] }, "locked": { - "lastModified": 1761897390, - "narHash": "sha256-er4gYrIoThYLjlsOMTysoRfn67d1Gci+ZpqDrtQxrA0=", + "lastModified": 1763629934, + "narHash": "sha256-jWz10RbNAyylJbH4cUTLS/CsDjkd8gxfT8OsIgQIgEg=", "owner": "quickshell-mirror", "repo": "quickshell", - "rev": "fc704e6b5d445899a1565955268c91942a4f263f", + "rev": "ed036d514b0fdbce03158a0b331305be166f4555", "type": "github" }, "original": { diff --git a/hosts/darp8/configuration.nix b/hosts/darp8/configuration.nix index 678e1b4..03de0ee 100644 --- a/hosts/darp8/configuration.nix +++ b/hosts/darp8/configuration.nix @@ -65,7 +65,7 @@ }; sleep.extraConfig = '' - HibernateDelaySec=20m + HibernateDelaySec=15m SuspendState=mem ''; };