From 5cb871f7027c533e4f5eecf24ce977601d8b883d Mon Sep 17 00:00:00 2001 From: Bloxx12 Date: Wed, 16 Jul 2025 22:16:27 +0200 Subject: [PATCH 1/2] quickshell: switch to -git again --- flake.lock | 21 +++++++++++++++++++++ flake.nix | 8 ++++++++ modules/style/quickshell/quickshell.mod.nix | 3 ++- 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/flake.lock b/flake.lock index 018c533..749aafc 100644 --- a/flake.lock +++ b/flake.lock @@ -347,12 +347,33 @@ "type": "github" } }, + "quickshell": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1752701746, + "narHash": "sha256-OVqrNbAzMaVOBxdoLqbZyn0vOq9/XwcWVPVKJbHwz5Q=", + "ref": "refs/heads/master", + "rev": "986749cdb9ca9078b66297d60bbf21d48e33a6cf", + "revCount": 639, + "type": "git", + "url": "https://git.outfoxxed.me/outfoxxed/quickshell" + }, + "original": { + "type": "git", + "url": "https://git.outfoxxed.me/outfoxxed/quickshell" + } + }, "root": { "inputs": { "determinate": "determinate", "impermanence": "impermanence", "lanzaboote": "lanzaboote", "nixpkgs": "nixpkgs_2", + "quickshell": "quickshell", "rust-overlay": "rust-overlay_2", "systems": "systems", "watt": "watt" diff --git a/flake.nix b/flake.nix index 064b3c7..2962416 100644 --- a/flake.nix +++ b/flake.nix @@ -53,6 +53,14 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + quickshell = { + # add ?ref= to track a tag + url = "git+https://git.outfoxxed.me/outfoxxed/quickshell"; + + # THIS IS IMPORTANT + # Mismatched system dependencies will lead to crashes and other issues. + inputs.nixpkgs.follows = "nixpkgs"; + }; # secure booting lanzaboote = { url = "github:nix-community/lanzaboote"; diff --git a/modules/style/quickshell/quickshell.mod.nix b/modules/style/quickshell/quickshell.mod.nix index c0635cc..3c41f20 100644 --- a/modules/style/quickshell/quickshell.mod.nix +++ b/modules/style/quickshell/quickshell.mod.nix @@ -1,5 +1,6 @@ { config, + inputs, lib, pkgs, ... @@ -13,7 +14,7 @@ in { config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ - quickshell + inputs.quickshell.packages.${pkgs.stdenv.system}.quickshell qt6.qtimageformats qt6.qt5compat qt6.qtmultimedia From 42b2f141733ab2bdac3e329b8d647aff0f10b106 Mon Sep 17 00:00:00 2001 From: Bloxx12 Date: Thu, 17 Jul 2025 00:53:29 +0200 Subject: [PATCH 2/2] quickshell: update code to work with qmlls --- modules/style/quickshell/shell/.qmlls.ini | 1 + modules/style/quickshell/shell/Launcher.qml | 2 +- .../style/quickshell/shell/modules/BackgroundImage.qml | 2 +- modules/style/quickshell/shell/modules/bar/Bar.qml | 2 +- .../quickshell/shell/modules/bar/components/Clock.qml | 2 +- .../shell/modules/bar/components/Workspaces.qml | 5 ++--- .../quickshell/shell/modules/drawers/Backgrounds.qml | 3 --- modules/style/quickshell/shell/modules/drawers/Border.qml | 3 +-- .../shell/modules/notifications/Notification.qml | 3 +-- .../quickshell/shell/modules/volume/VolumeSlider.qml | 2 +- modules/style/quickshell/shell/services/Hover.qml | 2 +- modules/style/quickshell/shell/shell.qml | 8 +++----- 12 files changed, 14 insertions(+), 21 deletions(-) create mode 100644 modules/style/quickshell/shell/.qmlls.ini diff --git a/modules/style/quickshell/shell/.qmlls.ini b/modules/style/quickshell/shell/.qmlls.ini new file mode 100644 index 0000000..dbd3d39 --- /dev/null +++ b/modules/style/quickshell/shell/.qmlls.ini @@ -0,0 +1 @@ +/run/user/1000/quickshell/vfs/97b86fe3cbb42714790f5e96b44b706b/.qmlls.ini \ No newline at end of file diff --git a/modules/style/quickshell/shell/Launcher.qml b/modules/style/quickshell/shell/Launcher.qml index 183175e..f434f81 100644 --- a/modules/style/quickshell/shell/Launcher.qml +++ b/modules/style/quickshell/shell/Launcher.qml @@ -7,7 +7,7 @@ import Quickshell.Io import Quickshell.Wayland import Quickshell.Widgets -import "./config" +import qs.config Singleton { id: launcher diff --git a/modules/style/quickshell/shell/modules/BackgroundImage.qml b/modules/style/quickshell/shell/modules/BackgroundImage.qml index 9ade40c..600fb74 100644 --- a/modules/style/quickshell/shell/modules/BackgroundImage.qml +++ b/modules/style/quickshell/shell/modules/BackgroundImage.qml @@ -22,7 +22,7 @@ PanelWindow { Image { id: image asynchronous: true - source: "../../../wholefoods.png" + source: "/home/cr/repos/projects/nichts/modules/style/wholefoods.png" } } } diff --git a/modules/style/quickshell/shell/modules/bar/Bar.qml b/modules/style/quickshell/shell/modules/bar/Bar.qml index b0fc519..a7b28d0 100644 --- a/modules/style/quickshell/shell/modules/bar/Bar.qml +++ b/modules/style/quickshell/shell/modules/bar/Bar.qml @@ -3,7 +3,7 @@ import QtQuick import QtQuick.Layouts import Quickshell -import "../../config" +import qs.config import "components" Item { diff --git a/modules/style/quickshell/shell/modules/bar/components/Clock.qml b/modules/style/quickshell/shell/modules/bar/components/Clock.qml index 4826851..a6337fa 100644 --- a/modules/style/quickshell/shell/modules/bar/components/Clock.qml +++ b/modules/style/quickshell/shell/modules/bar/components/Clock.qml @@ -1,7 +1,7 @@ import QtQuick import Quickshell -import "../../../config" +import qs.config Rectangle { id: root diff --git a/modules/style/quickshell/shell/modules/bar/components/Workspaces.qml b/modules/style/quickshell/shell/modules/bar/components/Workspaces.qml index 91bc9d2..1d8b254 100644 --- a/modules/style/quickshell/shell/modules/bar/components/Workspaces.qml +++ b/modules/style/quickshell/shell/modules/bar/components/Workspaces.qml @@ -2,11 +2,10 @@ pragma ComponentBehavior: Bound import QtQuick import Quickshell -import Quickshell.Io import QtQuick.Layouts -import "../../../services/niri" -import "../../../config" +import qs.services.niri +import qs.config Rectangle { id: root diff --git a/modules/style/quickshell/shell/modules/drawers/Backgrounds.qml b/modules/style/quickshell/shell/modules/drawers/Backgrounds.qml index 388efc4..7e50ae9 100644 --- a/modules/style/quickshell/shell/modules/drawers/Backgrounds.qml +++ b/modules/style/quickshell/shell/modules/drawers/Backgrounds.qml @@ -1,8 +1,5 @@ -import Quickshell import QtQuick -import QtQuick.Shapes -import "../notifications" as Notifications Rectangle { required property Item bar diff --git a/modules/style/quickshell/shell/modules/drawers/Border.qml b/modules/style/quickshell/shell/modules/drawers/Border.qml index 7e9c8a8..6fd6538 100644 --- a/modules/style/quickshell/shell/modules/drawers/Border.qml +++ b/modules/style/quickshell/shell/modules/drawers/Border.qml @@ -1,8 +1,7 @@ -import Quickshell import QtQuick import QtQuick.Effects -import "../../config" +import qs.config Item { id: root diff --git a/modules/style/quickshell/shell/modules/notifications/Notification.qml b/modules/style/quickshell/shell/modules/notifications/Notification.qml index 9e6f298..7c147e6 100644 --- a/modules/style/quickshell/shell/modules/notifications/Notification.qml +++ b/modules/style/quickshell/shell/modules/notifications/Notification.qml @@ -1,8 +1,7 @@ import QtQuick import QtQuick.Shapes -import "../../config" -import "../../services" +import qs.config Shape { id: root diff --git a/modules/style/quickshell/shell/modules/volume/VolumeSlider.qml b/modules/style/quickshell/shell/modules/volume/VolumeSlider.qml index a843d0f..e6004b4 100644 --- a/modules/style/quickshell/shell/modules/volume/VolumeSlider.qml +++ b/modules/style/quickshell/shell/modules/volume/VolumeSlider.qml @@ -3,7 +3,7 @@ pragma ComponentBehavior: Bound import Quickshell import QtQuick import QtQuick.Shapes -import "../../config" +import qs.config Rectangle { id: root diff --git a/modules/style/quickshell/shell/services/Hover.qml b/modules/style/quickshell/shell/services/Hover.qml index cd29894..9e76fd3 100644 --- a/modules/style/quickshell/shell/services/Hover.qml +++ b/modules/style/quickshell/shell/services/Hover.qml @@ -1,6 +1,6 @@ import Quickshell import QtQuick -import "../config" +import qs.config MouseArea { id: root diff --git a/modules/style/quickshell/shell/shell.qml b/modules/style/quickshell/shell/shell.qml index 05fea55..2835944 100644 --- a/modules/style/quickshell/shell/shell.qml +++ b/modules/style/quickshell/shell/shell.qml @@ -1,13 +1,11 @@ //@ pragma Env QS_NO_RELOAD_POPUP=1 +//@ pragma Env QT_QML_GENERATE_QMLLS_INI import Quickshell import QtQuick -import "modules" -import "modules/drawers" -import "services" - -// import "modules/background" +import qs.modules.drawers +import qs ShellRoot { id: shellroot