Shinonome/dots-hyprland
1
0
Fork 1
mirror of https://github.com/end-4/dots-hyprland.git synced 2026-06-05 23:09:26 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'main' into hefty-hype

Browse Source
This commit is contained in:
end-4
2026-04-10 22:12:48 +02:00
parent a62e64e2ef 5f9febd4b7
commit 87939110bf
13 changed files with 38 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dots/.config/hypr/custom/env.conf
+1
View File
@@ -1,3 +1,4 @@
# hyprlang noerror false
# You can put extra environment variables here
# https://wiki.hyprland.org/Configuring/Environment-variables/
dots/.config/hypr/custom/execs.conf
+1
View File
@@ -1,3 +1,4 @@
# hyprlang noerror false
# You can make apps auto-start here
# Relevant Hyprland wiki section: https://wiki.hyprland.org/Configuring/Keywords/#executing
dots/.config/hypr/custom/general.conf
+1
View File
@@ -1,3 +1,4 @@
# hyprlang noerror false
# Put general config stuff here
# Here's a list of every variable: https://wiki.hyprland.org/Configuring/Variables/
dots/.config/hypr/custom/keybinds.conf
+1
View File
@@ -1,3 +1,4 @@
# hyprlang noerror false
# See https://wiki.hyprland.org/Configuring/Binds/
#!
##! User
dots/.config/hypr/custom/rules.conf
+1
View File
@@ -1,3 +1,4 @@
# hyprlang noerror false
# You can put custom rules here
# Window/layer rules: https://wiki.hyprland.org/Configuring/Window-Rules/
# Workspace rules: https://wiki.hyprland.org/Configuring/Workspace-Rules/
dots/.config/hypr/custom/variables.conf
+1
View File
@@ -1 +1,2 @@
# hyprlang noerror false
# For all available variables, see ~/.config/hypr/hyprland/variables.conf
dots/.config/hypr/hyprland.conf
+9
View File
@@ -3,11 +3,15 @@
# --- Environment variables ---
source=hyprland/env.conf
# hyprlang noerror true
source=custom/env.conf
# hyprlang noerror false
# --- Other vars ---
source=hyprland/variables.conf
# hyprlang noerror true
source=custom/variables.conf
# hyprlang noerror false
# --- Defaults ---
# hyprlang if !dontLoadDefaultExecs
@@ -27,10 +31,15 @@ source=hyprland/keybinds.conf
# hyprlang endif
# --- Custom ---
# hyprlang noerror true
source=custom/execs.conf
# hyprlang noerror true
source=custom/general.conf
# hyprlang noerror true
source=custom/rules.conf
# hyprlang noerror true
source=custom/keybinds.conf
# hyprlang noerror false
# --- nwg-displays support ---
source=workspaces.conf
dots/.config/hypr/hyprland/general.conf
+3 -3
View File
@@ -72,10 +72,10 @@ decoration {
shadow {
enabled = true
ignore_window = true
range = 50
offset = 0 4
range = 20
offset = 0 2
render_power = 10
color = rgba(00000027)
color = rgba(00000020)
}
# Dim
dots/.config/matugen/templates/hyprland/colors.conf
+2 -2
View File
@@ -1,6 +1,6 @@
general {
col.active_border = rgba({{colors.outline.default.hex_stripped}}77)
col.inactive_border = rgba({{colors.outline_variant.default.hex_stripped}}55)
col.active_border = rgba({{colors.outline_variant.default.hex_stripped}}77)
col.inactive_border = rgba({{colors.surface_container_low.default.hex_stripped}}33)
}
misc {
dots/.config/quickshell/ii/modules/common/Config.qml
+3 -3
View File
@@ -223,9 +223,9 @@ Singleton {
property JsonObject parallax: JsonObject {
property bool vertical: false
property bool autoVertical: false
property bool enableWorkspace: true
property real workspaceZoom: 1.0 // Relative to wallpaper size
property bool enableSidebar: true
property bool enableWorkspace: false
property real workspaceZoom: 1.07 // Relative to wallpaper size
property bool enableSidebar: false
property real widgetsFactor: 1.2
}
}
dots/.config/quickshell/ii/modules/common/widgets/ScrollEdgeFade.qml
+1 -1
View File
@@ -7,7 +7,7 @@ Item {
z: 99
required property Item target
property real fadeSize: Appearance.m3colors.darkmode ? 40 : 20
property color color: ColorUtils.transparentize(Appearance.colors.colShadow, Appearance.m3colors.darkmode ? 0 : 0.7)
property color color: Appearance.colors.colLayer1Base
property bool vertical: true
anchors.fill: target
dots/.config/quickshell/ii/modules/ii/background/Background.qml
+11 -12
View File
@@ -48,9 +48,9 @@ Variants {
const sensitiveNetwork = (CF.StringUtils.stringListContainsSubstring(Network.networkName.toLowerCase(), Config.options.workSafety.triggerCondition.networkNameKeywords));
return enabled && sensitiveWallpaper && sensitiveNetwork;
}
readonly property real parallaxRation: 1.1
readonly property real additionalScaleFactor: Config.options.background.parallax.workspaceZoom
property real effectiveWallpaperScale: 1 // Some reasonable init value, to be updated
readonly property real parallaxRation: Config.options.background.parallax.workspaceZoom
property real minSuitableScale: 1 // Some reasonable init, to be updated
property real effectiveWallpaperScale: minSuitableScale * parallaxRation
property int wallpaperWidth: modelData.width // Some reasonable init value, to be updated
property int wallpaperHeight: modelData.height // Some reasonable init value, to be updated
property real scaledWallpaperWidth: wallpaperWidth * effectiveWallpaperScale
@@ -119,8 +119,7 @@ Variants {
// Small picture; scale > 1; will zoom in the picture
// Big picture; scale < 1; will zoom out the picture
// Choose max number so every side will fit
const minSuitableScale = Math.max(screenWidth / width, screenHeight / height);
bgRoot.effectiveWallpaperScale = minSuitableScale * bgRoot.additionalScaleFactor * bgRoot.parallaxRation;
bgRoot.minSuitableScale = Math.max(screenWidth / width, screenHeight / height);
}
}
}
@@ -167,16 +166,16 @@ Variants {
}
x: {
if (bgRoot.screen.width > bgRoot.scaledWallpaperWidth) {
if (bgRoot.screen.width > width) {
// Center the picture
return (bgRoot.screen.width - bgRoot.scaledWallpaperWidth) / 2;
return (bgRoot.screen.width - width) / 2;
}
return - bgRoot.parallaxTotalPixelsX * usedFractionX;
}
y: {
if (bgRoot.screen.height > bgRoot.scaledWallpaperHeight) {
if (bgRoot.screen.height > height) {
// Center the picture
return (bgRoot.screen.height - bgRoot.scaledWallpaperHeight) / 2;
return (bgRoot.screen.height - height) / 2;
}
return - bgRoot.parallaxTotalPixelsY * usedFractionY;
}
@@ -235,10 +234,10 @@ Variants {
height: parent.height
readonly property real parallaxFactor: {
var f = Config.options.background.parallax.widgetsFactor;
return f / Config.options.background.parallax.workspaceZoom;
return f / bgRoot.parallaxRation;
}
readonly property real baseWallpaperOffsetX: (bgRoot.screen.width - bgRoot.scaledWallpaperWidth) / 2
readonly property real baseWallpaperOffsetY: (bgRoot.screen.height - bgRoot.scaledWallpaperHeight) / 2
readonly property real baseWallpaperOffsetX: (bgRoot.screen.width - wallpaper.width) / 2
readonly property real baseWallpaperOffsetY: (bgRoot.screen.height - wallpaper.height) / 2
readonly property real wallpaperTotalOffsetX: wallpaper.x - baseWallpaperOffsetX
readonly property real wallpaperTotalOffsetY: wallpaper.y - baseWallpaperOffsetY
readonly property bool locked: GlobalStates.screenLocked
sdata/subcmd-install/3.files-exp.yaml
+3 -6
View File
@@ -13,8 +13,8 @@ user_preferences:
keybindings: "default" # default | vim
patterns:
# Always install these files
- from: "dots/.config/quickshell"
to: "$XDG_CONFIG_HOME/quickshell"
- from: "dots/.config/quickshell/ii"
to: "$XDG_CONFIG_HOME/quickshell/ii"
mode: "sync"
# Conditionally install these files
- from: "dots/.config/fish"
@@ -46,11 +46,8 @@ patterns:
- from: "dots/.config/hypr"
to: "$XDG_CONFIG_HOME/hypr"
mode: "sync"
excludes: ["custom", "hyprlock.conf", "hypridle.conf", "hyprland.conf"]
excludes: ["custom", "hyprlock.conf", "hypridle.conf", "monitors.conf", "workspaces.conf"]
# Hyprland special files
- from: "dots/.config/hypr/hyprland.conf"
to: "$XDG_CONFIG_HOME/hypr/hyprland.conf"
mode: "hard-backup"
- from: "dots/.config/hypr/hypridle.conf"
to: "$XDG_CONFIG_HOME/hypr/hypridle.conf"
mode: "soft-backup"