Compare commits

...

2 commits

Author SHA1 Message Date
42b2f14173
quickshell: update code to work with qmlls 2025-07-17 00:53:39 +02:00
5cb871f702
quickshell: switch to -git again 2025-07-17 00:53:21 +02:00
15 changed files with 45 additions and 22 deletions

21
flake.lock generated
View file

@ -347,12 +347,33 @@
"type": "github" "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": { "root": {
"inputs": { "inputs": {
"determinate": "determinate", "determinate": "determinate",
"impermanence": "impermanence", "impermanence": "impermanence",
"lanzaboote": "lanzaboote", "lanzaboote": "lanzaboote",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"quickshell": "quickshell",
"rust-overlay": "rust-overlay_2", "rust-overlay": "rust-overlay_2",
"systems": "systems", "systems": "systems",
"watt": "watt" "watt": "watt"

View file

@ -53,6 +53,14 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
quickshell = {
# add ?ref=<tag> 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 # secure booting
lanzaboote = { lanzaboote = {
url = "github:nix-community/lanzaboote"; url = "github:nix-community/lanzaboote";

View file

@ -1,5 +1,6 @@
{ {
config, config,
inputs,
lib, lib,
pkgs, pkgs,
... ...
@ -13,7 +14,7 @@ in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
quickshell inputs.quickshell.packages.${pkgs.stdenv.system}.quickshell
qt6.qtimageformats qt6.qtimageformats
qt6.qt5compat qt6.qt5compat
qt6.qtmultimedia qt6.qtmultimedia

View file

@ -0,0 +1 @@
/run/user/1000/quickshell/vfs/97b86fe3cbb42714790f5e96b44b706b/.qmlls.ini

View file

@ -7,7 +7,7 @@ import Quickshell.Io
import Quickshell.Wayland import Quickshell.Wayland
import Quickshell.Widgets import Quickshell.Widgets
import "./config" import qs.config
Singleton { Singleton {
id: launcher id: launcher

View file

@ -22,7 +22,7 @@ PanelWindow {
Image { Image {
id: image id: image
asynchronous: true asynchronous: true
source: "../../../wholefoods.png" source: "/home/cr/repos/projects/nichts/modules/style/wholefoods.png"
} }
} }
} }

View file

@ -3,7 +3,7 @@ import QtQuick
import QtQuick.Layouts import QtQuick.Layouts
import Quickshell import Quickshell
import "../../config" import qs.config
import "components" import "components"
Item { Item {

View file

@ -1,7 +1,7 @@
import QtQuick import QtQuick
import Quickshell import Quickshell
import "../../../config" import qs.config
Rectangle { Rectangle {
id: root id: root

View file

@ -2,11 +2,10 @@ pragma ComponentBehavior: Bound
import QtQuick import QtQuick
import Quickshell import Quickshell
import Quickshell.Io
import QtQuick.Layouts import QtQuick.Layouts
import "../../../services/niri" import qs.services.niri
import "../../../config" import qs.config
Rectangle { Rectangle {
id: root id: root

View file

@ -1,8 +1,5 @@
import Quickshell
import QtQuick import QtQuick
import QtQuick.Shapes
import "../notifications" as Notifications
Rectangle { Rectangle {
required property Item bar required property Item bar

View file

@ -1,8 +1,7 @@
import Quickshell
import QtQuick import QtQuick
import QtQuick.Effects import QtQuick.Effects
import "../../config" import qs.config
Item { Item {
id: root id: root

View file

@ -1,8 +1,7 @@
import QtQuick import QtQuick
import QtQuick.Shapes import QtQuick.Shapes
import "../../config" import qs.config
import "../../services"
Shape { Shape {
id: root id: root

View file

@ -3,7 +3,7 @@ pragma ComponentBehavior: Bound
import Quickshell import Quickshell
import QtQuick import QtQuick
import QtQuick.Shapes import QtQuick.Shapes
import "../../config" import qs.config
Rectangle { Rectangle {
id: root id: root

View file

@ -1,6 +1,6 @@
import Quickshell import Quickshell
import QtQuick import QtQuick
import "../config" import qs.config
MouseArea { MouseArea {
id: root id: root

View file

@ -1,13 +1,11 @@
//@ pragma Env QS_NO_RELOAD_POPUP=1 //@ pragma Env QS_NO_RELOAD_POPUP=1
//@ pragma Env QT_QML_GENERATE_QMLLS_INI
import Quickshell import Quickshell
import QtQuick import QtQuick
import "modules" import qs.modules.drawers
import "modules/drawers" import qs
import "services"
// import "modules/background"
ShellRoot { ShellRoot {
id: shellroot id: shellroot