From a9fc9cf8832c471854bb7fa61137a5272f1076b6 Mon Sep 17 00:00:00 2001 From: triethyl Date: Wed, 15 Oct 2025 08:39:09 -0400 Subject: niri: rearranged files and small changes --- .../gui/desktops/niri/parts/quickshell/.envrc | 1 - .../gui/desktops/niri/parts/quickshell/default.nix | 15 +++++ .../gui/desktops/niri/parts/quickshell/design.md | 20 +++++++ .../gui/desktops/niri/parts/quickshell/flake.lock | 64 ---------------------- .../gui/desktops/niri/parts/quickshell/flake.nix | 29 ---------- .../gui/desktops/niri/parts/quickshell/qml/Bar.qml | 48 ++++++++++++++++ .../desktops/niri/parts/quickshell/qml/shell.qml | 5 ++ 7 files changed, 88 insertions(+), 94 deletions(-) delete mode 100644 home-manager/features/gui/desktops/niri/parts/quickshell/.envrc create mode 100644 home-manager/features/gui/desktops/niri/parts/quickshell/default.nix create mode 100644 home-manager/features/gui/desktops/niri/parts/quickshell/design.md delete mode 100644 home-manager/features/gui/desktops/niri/parts/quickshell/flake.lock delete mode 100644 home-manager/features/gui/desktops/niri/parts/quickshell/flake.nix create mode 100644 home-manager/features/gui/desktops/niri/parts/quickshell/qml/Bar.qml create mode 100644 home-manager/features/gui/desktops/niri/parts/quickshell/qml/shell.qml (limited to 'home-manager/features/gui/desktops/niri/parts/quickshell') diff --git a/home-manager/features/gui/desktops/niri/parts/quickshell/.envrc b/home-manager/features/gui/desktops/niri/parts/quickshell/.envrc deleted file mode 100644 index 3550a30..0000000 --- a/home-manager/features/gui/desktops/niri/parts/quickshell/.envrc +++ /dev/null @@ -1 +0,0 @@ -use flake diff --git a/home-manager/features/gui/desktops/niri/parts/quickshell/default.nix b/home-manager/features/gui/desktops/niri/parts/quickshell/default.nix new file mode 100644 index 0000000..0fd94d9 --- /dev/null +++ b/home-manager/features/gui/desktops/niri/parts/quickshell/default.nix @@ -0,0 +1,15 @@ +{ + config, + pkgs, + lib, + ... +}: let + cfg = config.features.gui.desktops.niri.parts.quickshell; +in { + options.features.gui.desktops.niri.parts.quickshell.enable = lib.mkEnableOption "quickshell"; + config = lib.mkIf cfg.enable { + programs.quickshell = { + enable = true; + }; + }; +} diff --git a/home-manager/features/gui/desktops/niri/parts/quickshell/design.md b/home-manager/features/gui/desktops/niri/parts/quickshell/design.md new file mode 100644 index 0000000..79f8ee8 --- /dev/null +++ b/home-manager/features/gui/desktops/niri/parts/quickshell/design.md @@ -0,0 +1,20 @@ +# Quickshell Design + +## Bar + +Left Components: + +- Battery Percentage +- Bluetooth Battery Percentage +- Volume +- Brightness + +Center Components: + +- Workspaces + +Right Components: + +- Date +- Time + diff --git a/home-manager/features/gui/desktops/niri/parts/quickshell/flake.lock b/home-manager/features/gui/desktops/niri/parts/quickshell/flake.lock deleted file mode 100644 index 29f5851..0000000 --- a/home-manager/features/gui/desktops/niri/parts/quickshell/flake.lock +++ /dev/null @@ -1,64 +0,0 @@ -{ - "nodes": { - "flake-utils": { - "inputs": { - "systems": [ - "systems" - ] - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1751498133, - "narHash": "sha256-QWJ+NQbMU+NcU2xiyo7SNox1fAuwksGlQhpzBl76g1I=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d55716bb59b91ae9d1ced4b1ccdea7a442ecbfdb", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs", - "systems": "systems" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/home-manager/features/gui/desktops/niri/parts/quickshell/flake.nix b/home-manager/features/gui/desktops/niri/parts/quickshell/flake.nix deleted file mode 100644 index 2122f1f..0000000 --- a/home-manager/features/gui/desktops/niri/parts/quickshell/flake.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - description = "Project flake"; - - inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - systems.url = "github:nix-systems/default"; - flake-utils = { - url = "github:numtide/flake-utils"; - inputs.systems.follows = "systems"; - }; - }; - - outputs = { - nixpkgs, - flake-utils, - ... - }: - flake-utils.lib.eachDefaultSystem ( - system: let - pkgs = nixpkgs.legacyPackages.${system}; - in { - devShells.default = pkgs.mkShell { - packages = with pkgs; [ - quickshell - ]; - }; - } - ); -} diff --git a/home-manager/features/gui/desktops/niri/parts/quickshell/qml/Bar.qml b/home-manager/features/gui/desktops/niri/parts/quickshell/qml/Bar.qml new file mode 100644 index 0000000..8254890 --- /dev/null +++ b/home-manager/features/gui/desktops/niri/parts/quickshell/qml/Bar.qml @@ -0,0 +1,48 @@ +import Quickshell // for PanelWindow +import Quickshell.Io // for Process +import QtQuick // for Text + +Scope { + id: root + property string time + + Variants { + model: Quickshell.screens + + PanelWindow { + required property var modelData + + screen: modelData + + anchors { + bottom: true + left: true + right: true + } + + implicitHeight: 30 + + Text { + anchors.centerIn: parent + text: root.time + } + } + } + + Process { + id: dateProc + command: ["date"] + running: true + + stdout: StdioCollector { + onStreamFinished: root.time = this.text + } + } + + Timer { + interval: 1000 + running: true + repeat: true + onTriggered: dateProc.running = true + } +} diff --git a/home-manager/features/gui/desktops/niri/parts/quickshell/qml/shell.qml b/home-manager/features/gui/desktops/niri/parts/quickshell/qml/shell.qml new file mode 100644 index 0000000..9d093ad --- /dev/null +++ b/home-manager/features/gui/desktops/niri/parts/quickshell/qml/shell.qml @@ -0,0 +1,5 @@ +import Quickshell + +Scope { + Bar {} +} -- cgit v1.2.3