diff --git a/flake.lock b/flake.lock index 749aafc..018c533 100644 --- a/flake.lock +++ b/flake.lock @@ -347,33 +347,12 @@ "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 2962416..064b3c7 100644 --- a/flake.nix +++ b/flake.nix @@ -53,14 +53,6 @@ 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 3c41f20..c0635cc 100644 --- a/modules/style/quickshell/quickshell.mod.nix +++ b/modules/style/quickshell/quickshell.mod.nix @@ -1,6 +1,5 @@ { config, - inputs, lib, pkgs, ... @@ -14,7 +13,7 @@ in { config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ - inputs.quickshell.packages.${pkgs.stdenv.system}.quickshell + quickshell qt6.qtimageformats qt6.qt5compat qt6.qtmultimedia diff --git a/modules/style/quickshell/shell/.qmlls.ini b/modules/style/quickshell/shell/.qmlls.ini deleted file mode 100644 index dbd3d39..0000000 --- a/modules/style/quickshell/shell/.qmlls.ini +++ /dev/null @@ -1 +0,0 @@ -/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 f434f81..183175e 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 qs.config +import "./config" Singleton { id: launcher diff --git a/modules/style/quickshell/shell/modules/BackgroundImage.qml b/modules/style/quickshell/shell/modules/BackgroundImage.qml index 600fb74..9ade40c 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: "/home/cr/repos/projects/nichts/modules/style/wholefoods.png" + source: "../../../wholefoods.png" } } } diff --git a/modules/style/quickshell/shell/modules/bar/Bar.qml b/modules/style/quickshell/shell/modules/bar/Bar.qml index a7b28d0..b0fc519 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 qs.config +import "../../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 a6337fa..4826851 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 qs.config +import "../../../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 1d8b254..91bc9d2 100644 --- a/modules/style/quickshell/shell/modules/bar/components/Workspaces.qml +++ b/modules/style/quickshell/shell/modules/bar/components/Workspaces.qml @@ -2,10 +2,11 @@ pragma ComponentBehavior: Bound import QtQuick import Quickshell +import Quickshell.Io import QtQuick.Layouts -import qs.services.niri -import qs.config +import "../../../services/niri" +import "../../../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 7e50ae9..388efc4 100644 --- a/modules/style/quickshell/shell/modules/drawers/Backgrounds.qml +++ b/modules/style/quickshell/shell/modules/drawers/Backgrounds.qml @@ -1,5 +1,8 @@ +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 6fd6538..7e9c8a8 100644 --- a/modules/style/quickshell/shell/modules/drawers/Border.qml +++ b/modules/style/quickshell/shell/modules/drawers/Border.qml @@ -1,7 +1,8 @@ +import Quickshell import QtQuick import QtQuick.Effects -import qs.config +import "../../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 7c147e6..9e6f298 100644 --- a/modules/style/quickshell/shell/modules/notifications/Notification.qml +++ b/modules/style/quickshell/shell/modules/notifications/Notification.qml @@ -1,7 +1,8 @@ import QtQuick import QtQuick.Shapes -import qs.config +import "../../config" +import "../../services" Shape { id: root diff --git a/modules/style/quickshell/shell/modules/volume/VolumeSlider.qml b/modules/style/quickshell/shell/modules/volume/VolumeSlider.qml index e6004b4..a843d0f 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 qs.config +import "../../config" Rectangle { id: root diff --git a/modules/style/quickshell/shell/services/Hover.qml b/modules/style/quickshell/shell/services/Hover.qml index 9e76fd3..cd29894 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 qs.config +import "../config" MouseArea { id: root diff --git a/modules/style/quickshell/shell/shell.qml b/modules/style/quickshell/shell/shell.qml index 2835944..05fea55 100644 --- a/modules/style/quickshell/shell/shell.qml +++ b/modules/style/quickshell/shell/shell.qml @@ -1,11 +1,13 @@ //@ pragma Env QS_NO_RELOAD_POPUP=1 -//@ pragma Env QT_QML_GENERATE_QMLLS_INI import Quickshell import QtQuick -import qs.modules.drawers -import qs +import "modules" +import "modules/drawers" +import "services" + +// import "modules/background" ShellRoot { id: shellroot