feat: hacky network and notification widget and caffeine widget

Network and notification widgets are just buttons to open nmtui and swaync respectively... what they are doing in my waybar right now anyways. Now I *should* not need waybar anymore. Caffeine widget does what there is to do, set an inhibitor. Restructured the project so that icons are in src/, screenshots are in the renamed screenshots folder
2024-09-21 02:05:00 +02:00 · 2024-09-21 02:05:00 +02:00 · db3042111f
commit db3042111f
parent efa0386ade
22 changed files with 156 additions and 33 deletions
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@ -0,0 +1,20 @@
+default_install_hook_types:
+  - pre-commit
+  - commit-msg
+
+repos:
+  - repo: https://github.com/gitleaks/gitleaks
+    rev: v8.18.2
+    hooks:
+      - id: gitleaks
+        stages: [commit]
+
+  - repo: local
+    hooks:
+      - id: typos
+        name: Check for typos
+        entry: typos
+        language: system
+        files: .*
+        exclude: .*\.(png|jpg|jpeg|age)
+        stages: [commit]
--- a/README.md
+++ b/README.md
@ -15,9 +15,9 @@ Nysh is written in QML using [Quickshell].

 ## Work in Progress Showcase

-![Main Bar](./assets/2024-08-28-main-bar.png)
+![Main Bar](./screenshots/2024-08-28-main-bar.png)

-![Audio Manager](./assets/2024-08-28-audio-manager.png)
+![Audio Manager](./screenshots/2024-08-28-audio-manager.png)

 ## Launching the shell

--- a/flake.lock
+++ b/flake.lock
@ -2,11 +2,11 @@
  "nodes": {
    "nixpkgs": {
      "locked": {
-        "lastModified": 1726243404,
-        "narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=",
+        "lastModified": 1726755586,
+        "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059",
+        "rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e",
        "type": "github"
      },
      "original": {
@ -23,11 +23,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1726441580,
-        "narHash": "sha256-/uiDpaZUZVwqI4d0rPjT2N4qp2+eQA4GZQwEr8e+0XM=",
+        "lastModified": 1726641881,
+        "narHash": "sha256-ee2YIeFbYhm/gGs26grUW37BxqqDoFNElW1Vy5PIuHA=",
        "ref": "refs/heads/master",
-        "rev": "c57ac4b1f283896bab7fb91e8fdc9249c18d3afe",
-        "revCount": 344,
+        "rev": "7f9762be5368ca33b84e7b2b3e23a626d432436d",
+        "revCount": 348,
        "type": "git",
        "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
      },
@ -63,11 +63,11 @@
        "systems": "systems"
      },
      "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "lastModified": 1726560853,
+        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -24,11 +24,15 @@
          buildInputs = [
            quickshell
            pkgs.kdePackages.qtdeclarative
+            pkgs.pre-commit
+            pkgs.typos
+
          ];
          shellHook = ''
            # Required for qmlls to find the correct type declarations
            # Sadly Quickshell doesn't export some types declaratively
            export QMLLS_BUILD_DIRS=${pkgs.kdePackages.qtdeclarative}/lib/qt-6/qml/:${quickshell}/lib/qt-6/qml/
+            ${pkgs.pre-commit}/bin/pre-commit install -f
          '';
        };
        defaultPackage = import ./nix/package.nix {
--- a/screenshots/2024-08-28-audio-manager.png
+++ b/screenshots/2024-08-28-audio-manager.png
--- a/screenshots/2024-08-28-main-bar.png
+++ b/screenshots/2024-08-28-main-bar.png
--- a/src/AudioOutput.qml
+++ b/src/AudioOutput.qml
@ -48,7 +48,7 @@ BRectangle {
            // TODO: Make icon depend on sink type and volume level
            Image {
                id: icon
-                source: "root:/../assets/speaker.png"
+                source: "root:/assets/speaker.png"
                width: parent.width * (2 / 3)

                anchors.horizontalCenter: parent.horizontalCenter
--- a/src/Bar.qml
+++ b/src/Bar.qml
@ -5,6 +5,9 @@ import "widgets/systray"
 import "widgets/workspaces"
 import "widgets/privacy"
 import "widgets/battery"
+import "widgets/network"
+import "widgets/notifcenter"
+import "widgets/caffeine"

 Scope {
    Variants {
@ -40,7 +43,14 @@ Scope {
                Workspaces {}

                Battery {}
-                Privacy {}
+
+                //Privacy {}
+
+                Network {}
+
+                Notifcenter {}
+
+                Caffeine {}

                Item {
                    Layout.fillHeight: true
--- a/src/assets/audio-volume-high.svg
+++ b/src/assets/audio-volume-high.svg
--- a/src/assets/audio-volume-muted.svg
+++ b/src/assets/audio-volume-muted.svg
--- a/src/assets/eye-closed.svg
+++ b/src/assets/eye-closed.svg
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2.99902 3L20.999 21M9.8433 9.91364C9.32066 10.4536 8.99902 11.1892 8.99902 12C8.99902 13.6569 10.3422 15 11.999 15C12.8215 15 13.5667 14.669 14.1086 14.133M6.49902 6.64715C4.59972 7.90034 3.15305 9.78394 2.45703 12C3.73128 16.0571 7.52159 19 11.9992 19C13.9881 19 15.8414 18.4194 17.3988 17.4184M10.999 5.04939C11.328 5.01673 11.6617 5 11.9992 5C16.4769 5 20.2672 7.94291 21.5414 12C21.2607 12.894 20.8577 13.7338 20.3522 14.5" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
--- a/src/assets/eye-open.svg
+++ b/src/assets/eye-open.svg
@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15.0007 12C15.0007 13.6569 13.6576 15 12.0007 15C10.3439 15 9.00073 13.6569 9.00073 12C9.00073 10.3431 10.3439 9 12.0007 9C13.6576 9 15.0007 10.3431 15.0007 12Z" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12.0012 5C7.52354 5 3.73326 7.94288 2.45898 12C3.73324 16.0571 7.52354 19 12.0012 19C16.4788 19 20.2691 16.0571 21.5434 12C20.2691 7.94291 16.4788 5 12.0012 5Z" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
--- a/src/assets/folder-music.svg
+++ b/src/assets/folder-music.svg
--- a/src/assets/mute.png
+++ b/src/assets/mute.png
--- a/src/assets/speaker.png
+++ b/src/assets/speaker.png
--- a/src/assets/volume-mute.png
+++ b/src/assets/volume-mute.png
--- a/src/base/BRectangle.qml
+++ b/src/base/BRectangle.qml
@ -2,8 +2,9 @@ import QtQuick

 Rectangle {
    width: parent.width
-    height: parent.height
+    height: width
    border.color: "black"
    border.width: 2
    radius: 5
+    color: "#BD93F9"
 }
--- a/src/widgets/caffeine/Caffeine.qml
+++ b/src/widgets/caffeine/Caffeine.qml
@ -0,0 +1,30 @@
+import "root:base"
+import QtQuick
+import Quickshell.Io
+import Quickshell.Widgets
+import Quickshell
+
+BRectangle {
+    id: caffeine
+    property bool inhibiting: false
+
+    MouseArea {
+        anchors.fill: parent
+
+        IconImage {
+            anchors.fill: parent
+            anchors.margins: 4
+            source: caffeine.inhibiting ? "root:assets/eye-open.svg" : "root:assets/eye-closed.svg"
+        }
+
+        onClicked: () => {
+            caffeine.inhibiting = !caffeine.inhibiting;
+        }
+
+        Process {
+            id: inhibitor
+            running: caffeine.inhibiting
+            command: ["systemd-inhibit", "sleep", "infinity"]
+        }
+    }
+}
--- a/src/widgets/network/Network.qml
+++ b/src/widgets/network/Network.qml
@ -0,0 +1,30 @@
+import "root:base"
+import QtQuick
+import Quickshell.Io
+import Quickshell.Widgets
+import Quickshell
+
+BRectangle {
+    MouseArea {
+        anchors.fill: parent
+
+        IconImage {
+            anchors.fill: parent
+            anchors.margins: 2
+            source: Quickshell.iconPath("wifi-radar")
+        }
+
+        onClicked: () => {
+            gui.running = true;
+        }
+
+        Process {
+            id: gui
+            running: false
+            command: ["foot", "nmtui"]
+            stdout: SplitParser {
+                onRead: data => console.log(`line read: ${data}`)
+            }
+        }
+    }
+}
--- a/src/widgets/notifcenter/Notifcenter.qml
+++ b/src/widgets/notifcenter/Notifcenter.qml
@ -0,0 +1,30 @@
+import "root:base"
+import Quickshell
+import Quickshell.Widgets
+import Quickshell.Io
+import QtQuick
+
+BRectangle {
+    MouseArea {
+        anchors.fill: parent
+
+        IconImage {
+            anchors.fill: parent
+            anchors.margins: 2
+            source: Quickshell.iconPath("notification-active")
+        }
+
+        onClicked: () => {
+            gui.running = true;
+        }
+
+        Process {
+            id: gui
+            running: false
+            command: ["swaync-client", "-t"]
+            stdout: SplitParser {
+                onRead: data => console.log(`line read: ${data}`)
+            }
+        }
+    }
+}
--- a/src/widgets/systray/SysTrayItem.qml
+++ b/src/widgets/systray/SysTrayItem.qml
@ -2,6 +2,7 @@ import Quickshell.Services.SystemTray
 import QtQuick
 import QtQuick.Layouts
 import Quickshell
+import Quickshell.Widgets

 MouseArea {
    id: root
@ -29,22 +30,10 @@ MouseArea {
        anchor.window: lbar
    }

-    Rectangle {
-        Layout.fillWidth: true
-        Layout.preferredHeight: parent.width
-        Layout.alignment: Qt.AlignHCenter
+    IconImage {
+        source: root.item.icon

-        color: "black"
-        radius: 3
-        height: width
        width: parent.width
-
-        Image {
-            source: root.item.icon
-
-            width: parent.width
-            height: parent.height
-            fillMode: Image.Stretch
-        }
+        height: parent.height
    }
 }
--- a/src/windows/audioman/AudioEntry.qml
+++ b/src/windows/audioman/AudioEntry.qml
@ -14,7 +14,7 @@ RowLayout {

    Image {
        source: {
-            const getFallback = () => node.isStream ? "root:/../assets/folder-music.svg" : "root:/../assets/audio-volume-high.svg";
+            const getFallback = () => node.isStream ? "root:/assets/folder-music.svg" : "root:/assets/audio-volume-high.svg";
            root.node.properties["application.icon-name"] ? `image://icon/${root.node.properties["application.icon-name"]}` : getFallback();
        }

@ -40,7 +40,7 @@ RowLayout {
                    const app = root.node.isStream ? `[${root.node.properties["application.name"]}] ` : "";
                    return app + (root.node.properties["media.name"] ?? root.node.description);
                }
-                // Cede space to other elements -> don't have stupidly long names detroying the layout
+                // Cede space to other elements -> don't have stupidly long names destroying the layout
                Layout.maximumWidth: 0
            }

@ -54,7 +54,7 @@ RowLayout {
                width: 10
                checkable: true
                Image {
-                    source: node.audio.muted ? "root:/../assets/audio-volume-muted.svg" : "root:/../assets/audio-volume-high.svg"
+                    source: node.audio.muted ? "root:/assets/audio-volume-muted.svg" : "root:/assets/audio-volume-high.svg"
                    height: parent.height * (2 / 3)

                    anchors.centerIn: parent