Merge branch 'end-4:main' into parallax

2026-06-05 23:09:26 -05:00 · 2026-03-19 12:09:22 +01:00
parent 673e5ffe2e 7e94ee60aa
commit 4eedd030df
7 changed files with 203 additions and 46 deletions
@@ -35,7 +35,7 @@
   - **Default keybinds**: Should be somewhat familiar to Windows or GNOME users. Important ones:
     - `Super`+`/` = keybind list
     - `Super`+`Enter` = terminal
-     - If for whatever reason the keybind list widget does not work, here's an image:
+     - Should look something like this:
     <img width="1412" height="828" alt="image" src="https://github.com/user-attachments/assets/8f7bd216-9e03-47e3-8709-0008772a4133" />


@@ -50,7 +50,7 @@
  | [Quickshell](https://quickshell.outfoxxed.me/) | A QtQuick-based widget system, used for the status bar, sidebars, etc. |
  | Others | See [deps-info.md](https://github.com/end-4/dots-hyprland/blob/main/sdata/deps-info.md) |

-  _THERE IS NO WAYBAR STOP FUCKING CALLING EVERY BAR WAYBAR_
+  [not every bar is waybar] [not every bar is waybar] [not every bar is waybar] [not every bar is waybar] [not every bar is waybar] 

 </details>

@@ -83,7 +83,7 @@ Widget system: Quickshell | Support: Yes
 | Window management | Built with love |
 | <img width="1920" height="1080" alt="image" src="https://github.com/user-attachments/assets/a7e6d29c-e82c-4934-98db-36c810ec999b" /> | <img width="1920" height="1080" alt="image" src="https://github.com/user-attachments/assets/1b806b53-9310-4c63-84a9-cec9e311d439" /> |

-### Other styles: Available at the end of the readme.
+#### Other older styles are available at the end of the readme

 <div align="center">
    <h2>• thank you •</h2>
@@ -102,22 +102,12 @@ Widget system: Quickshell | Support: Yes
    <h3></h3>
 </div>

- If you would like to give me some milk😳 (i dont drink coffee): https://github.com/sponsors/end-4
- Virtual tentacle cat website points chart
+- I promise not to attempt an +ULTRARICOSHOT irl... Coins can go here: https://github.com/sponsors/end-4
+- Tentacle cat hub twinkle internet points

 [![Stargazers over time](https://starchart.cc/end-4/dots-hyprland.svg?variant=adaptive)](https://starchart.cc/end-4/dots-hyprland)


-<div align="center">
-    <h2>• inspirations/copying •</h2>
-    <h3></h3>
-</div>
-
- - Inspiration: osu!lazer, Windows 11, Material Design 3, AvdanOS (concept)
- - Copying: The license allows you to. Personally I have absolutely no problem with others redistributing/recreating my work. There's no "stealing" (maybe unless you loudly do weird stuff and violate the license) <sub>(some people actually had to ask smh)</sub>
-
---
-
 ---

 <div align="center">
@@ -125,9 +115,9 @@ Widget system: Quickshell | Support: Yes
    <h3></h3>
 </div>

- Source for illogical-impulse AGS available in the `ii-ags` branch, others in the `archive` branch.
- The list goes from newest to the oldest, and the code quality is worse the older a style is
- No bug fix or official support will be provided.
+- **Source**: illogical-impulse AGS in `ii-ags` branch, others in `archive` branch.
+- **No support** will be provided
+- **Reverse chronological order** list. Older = more naive & spaghetti code

 ### illogical-impulse<sup>AGS</sup>

@@ -141,33 +131,43 @@ Widget system: AGS | Support: No

 #### m3ww

-   Widget system: EWW | Support: No, dead
+Widget system: EWW | Support: No, dead

-   <a href="https://streamable.com/85ch8x">
-    <img src="https://github.com/end-4/dots-hyprland/assets/97237370/09533e64-b6d7-47eb-a840-ee90c6776adf" alt="Material Eww!">
-   </a>
+<a href="https://streamable.com/85ch8x">
+<img src="https://github.com/end-4/dots-hyprland/assets/97237370/09533e64-b6d7-47eb-a840-ee90c6776adf" alt="Material Eww!">
+</a>

 #### NovelKnock

-   Widget system: EWW | Support: No
+Widget system: EWW | Support: No

-   <a href="https://streamable.com/7vo61k">
-    <img src="https://github.com/end-4/dots-hyprland/assets/97237370/42903d03-bf6f-49d4-be7f-dd77e6cb389d" alt="Desktop Preview">
-   </a>
+<a href="https://streamable.com/7vo61k">
+<img src="https://github.com/end-4/dots-hyprland/assets/97237370/42903d03-bf6f-49d4-be7f-dd77e6cb389d" alt="Desktop Preview">
+</a>

 #### Hybrid

-   Widget system: EWW | Support: No
-   
-   <a href="https://streamable.com/4oogot">
-    <img src="https://github.com/end-4/dots-hyprland/assets/97237370/190deb1e-f6f5-46ce-8cf0-9b39944c079d" alt="click the circles!">
-   </a>
+Widget system: EWW | Support: No
+
+<a href="https://streamable.com/4oogot">
+<img src="https://github.com/end-4/dots-hyprland/assets/97237370/190deb1e-f6f5-46ce-8cf0-9b39944c079d" alt="click the circles!">
+</a>

 #### Windoes

-   Widget system: EWW | Support: No
-   
-   <a href="https://streamable.com/5qx614">
-    <img src="https://github.com/end-4/dots-hyprland/assets/97237370/b15317b1-f295-49f5-b90c-fb6328b8d886" alt="Desktop Preview">
-   </a>
+Widget system: EWW | Support: No

+<a href="https://streamable.com/5qx614">
+<img src="https://github.com/end-4/dots-hyprland/assets/97237370/b15317b1-f295-49f5-b90c-fb6328b8d886" alt="Desktop Preview">
+</a>
+
+
+
+<div align="center">
+    <h2>• inspirations/copying •</h2>
+    <h3></h3>
+</div>
+
+ - Inspiration: osu!lazer (Hybrid), Windows 11 (Windoes), AvdanOS (NovelKnock), Material Design 3 (m3ww & later)
+ - Copying: Absolutely, feel free. Just follow the license and it's all good
+ 
@@ -25,3 +25,6 @@ source=custom/keybinds.conf
 # nwg-displays support
 source=workspaces.conf
 source=monitors.conf
+
+# Shell overrides
+source=hyprland/shellOverrides/main.conf
@@ -1,11 +1,6 @@
 import QtQuick
-import Quickshell
 import Quickshell.Io
-import qs
 import qs.services
-import qs.modules.common
-import qs.modules.common.functions
-import qs.modules.common.widgets

 QuickToggleModel {
    id: root
@@ -14,11 +9,29 @@ QuickToggleModel {
    icon: "gamepad"

    mainAction: () => {
-        root.toggled = !root.toggled
+        root.toggled = !root.toggled;
        if (root.toggled) {
-            Quickshell.execDetached(["bash", "-c", `hyprctl --batch "keyword animations:enabled 0; keyword decoration:shadow:enabled 0; keyword decoration:blur:enabled 0; keyword general:gaps_in 0; keyword general:gaps_out 0; keyword general:border_size 1; keyword decoration:rounding 0; keyword general:allow_tearing 1"`])
+            HyprlandConfig.setMany({
+                "animations:enabled": 0,
+                "decoration:shadow:enabled": 0,
+                "decoration:blur:enabled": 0,
+                "general:gaps_in": 0,
+                "general:gaps_out": 0,
+                "general:border_size": 1,
+                "decoration:rounding": 0,
+                "general:allow_tearing": 1
+            });
        } else {
-            Quickshell.execDetached(["hyprctl", "reload"])
+            HyprlandConfig.resetMany([ //
+                "animations:enabled", //
+                "decoration:shadow:enabled", //
+                "decoration:blur:enabled", //
+                "general:gaps_in", //
+                "general:gaps_out", //
+                "general:border_size", //
+                "decoration:rounding", //
+                "general:allow_tearing", //
+            ]);
        }
    }
    Process {
@@ -26,7 +39,7 @@ QuickToggleModel {
        running: true
        command: ["bash", "-c", `test "$(hyprctl getoption animations:enabled -j | jq ".int")" -ne 0`]
        onExited: (exitCode, exitStatus) => {
-            root.toggled = exitCode !== 0 // Inverted because enabled = nonzero exit
+            root.toggled = exitCode !== 0; // Inverted because enabled = nonzero exit
        }
    }
    tooltipText: Translation.tr("Game mode")
@@ -0,0 +1,90 @@
+#!/usr/bin/env -S\_/bin/sh\_-c\_"source\_\$(eval\_echo\_\$ILLOGICAL_IMPULSE_VIRTUAL_ENV)/bin/activate&&exec\_python\_-E\_"\$0"\_"\$@""
+import argparse
+import re
+import os
+
+def edit_hyprland_config(file_path, set_args, reset_args):
+    try:
+        with open(file_path, 'r') as file:
+            lines = file.readlines()
+    except FileNotFoundError:
+        print(f"Error: File '{file_path}' not found.")
+        return
+    
+    set_dict = {k: v for k, v in set_args} if set_args else {}
+    reset_set = set(reset_args) if reset_args else set()
+    
+    new_lines = []
+    found_keys = set()
+    
+    patterns = {}
+    for k in list(set_dict.keys()) + list(reset_set):
+        patterns[k] = re.compile(rf'^\s*{re.escape(k)}\s*=')
+        
+    for line in lines:
+        matched = False
+        
+        # Check if line matches a key to be reset
+        for key in reset_set:
+            if patterns[key].match(line):
+                matched = True
+                break
+                
+        if matched:
+            continue
+            
+        # Check if line matches a key to be set
+        for key, value in set_dict.items():
+            if patterns[key].match(line):
+                new_line = f"{key} = {value}\n"
+                new_lines.append(new_line)
+                found_keys.add(key)
+                matched = True
+                break
+                
+        if matched:
+            continue
+            
+        new_lines.append(line)
+        
+    if set_dict:
+        for key, value in set_dict.items():
+            if key not in found_keys:
+                if new_lines and not new_lines[-1].endswith('\n'):
+                    new_lines[-1] += '\n'
+                new_lines.append(f"{key} = {value}\n")
+                
+    with open(file_path, 'w') as file:
+        file.writelines(new_lines)
+        
+    for key in reset_set:
+        print(f"Removed '{key}' from '{file_path}'")
+    for key, value in set_dict.items():
+        print(f"Updated '{file_path}' with {key} = {value}")
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(description="Edit a Hyprland config file.")
+    parser.add_argument("--file", default="~/.config/hypr/hyprland.conf", help="Path to the Hyprland config file (default: ~/.config/hypr/hyprland.conf).")
+    
+    parser.add_argument("--set", nargs=2, action="append", metavar=("KEY", "VALUE"), help="Set a configuration key to a value.")
+    parser.add_argument("--reset", action="append", metavar="KEY", help="Remove a configuration key.")
+    
+    args = parser.parse_args()
+    
+    file_path = os.path.expanduser(args.file)
+    
+    raw_set_args = args.set or []
+    reset_args = args.reset or []
+    
+    set_args = []
+    for key, value in raw_set_args:
+        if value == "[[EMPTY]]":
+            reset_args.append(key)
+        else:
+            set_args.append((key, value))
+    
+    if not set_args and not reset_args:
+        print("Error: Must specify at least one key to set or reset.")
+    else:
+        edit_hyprland_config(file_path, set_args, reset_args)
+        
@@ -0,0 +1,51 @@
+pragma Singleton
+pragma ComponentBehavior: Bound
+
+import QtQuick
+import Quickshell
+import Quickshell.Io
+
+import qs.modules.common
+import qs.modules.common.functions
+
+/**
+ * Configs Hyprland
+ */
+Singleton {
+    id: root
+    
+    readonly property string configuratorScriptPath: Quickshell.shellPath("scripts/hyprland/hyprconfigurator.py")
+    readonly property string shellOverridesPath: FileUtils.trimFileProtocol(`${Directories.config}/hypr/hyprland/shellOverrides/main.conf`)
+
+    function set(key: string, value: var) {
+        Quickshell.execDetached(["bash", "-c", //
+            `${root.configuratorScriptPath} --file ${root.shellOverridesPath} --set "${key}" "${value}"` //
+        ])
+    }
+    
+    function setMany(entries: var) {
+        let args = ""
+        for (let key in entries) {
+            args += `--set "${key}" "${entries[key]}" `
+        }
+        Quickshell.execDetached(["bash", "-c", //
+            `${root.configuratorScriptPath} --file ${root.shellOverridesPath} ${args}` //
+        ])
+    }
+    
+    function reset(key: string) {
+        Quickshell.execDetached(["bash", "-c", //
+            `${root.configuratorScriptPath} --file ${root.shellOverridesPath} --reset "${key}"` //
+        ])
+    }
+    
+    function resetMany(keys: var) {
+        let args = ""
+        for (let i = 0; i < keys.length; i++) {
+            args += `--reset "${keys[i]}" `
+        }
+        Quickshell.execDetached(["bash", "-c", //
+            `${root.configuratorScriptPath} --file ${root.shellOverridesPath} ${args}` //
+        ])
+    }
+}
@@ -23,7 +23,7 @@ Singleton {

    Process {
        id: detectPackageManagerProc
-        command: ["bash", "-c", "pidof pacman yay paru dnf zypper apt apx xbps snap apk yum epsi pikman"]
+        command: ["bash", "-c", "pidof yay paru dnf zypper apt apx xbps snap apk yum epsi pikman || ls /var/lib/pacman/db.lck"]
        onExited: (exitCode, exitStatus) => {
            root.packageManagerRunning = (exitCode === 0);
        }