diff --git a/flake.lock b/flake.lock index 5555309..10b71a6 100644 --- a/flake.lock +++ b/flake.lock @@ -730,6 +730,26 @@ "type": "github" } }, + "quickshell": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1749972148, + "narHash": "sha256-asty75gVovgIuspKv7i4KfaZ4Z/QE1lKOOpQinmdfHI=", + "ref": "refs/heads/master", + "rev": "ea0387ffa01fabe57117dec48f88615b3302a095", + "revCount": 579, + "type": "git", + "url": "https://git.outfoxxed.me/outfoxxed/quickshell" + }, + "original": { + "type": "git", + "url": "https://git.outfoxxed.me/outfoxxed/quickshell" + } + }, "root": { "inputs": { "firefox-addons": "firefox-addons", @@ -743,6 +763,7 @@ "nixvim": "nixvim", "nvchad-starter": "nvchad-starter", "nvchad4nix": "nvchad4nix", + "quickshell": "quickshell", "rose-pine-hyprcursor": "rose-pine-hyprcursor", "systems": "systems_6", "utils": "utils_2", diff --git a/flake.nix b/flake.nix index 15c0df9..00f9685 100644 --- a/flake.nix +++ b/flake.nix @@ -41,7 +41,7 @@ zen-browser.url = "github:0xc000022070/zen-browser-flake"; quickshell = { - url = "git+https://git.outfoxxed.me/outfoxxed/quickshell?ref=v0.1.0"; + url = "git+https://git.outfoxxed.me/outfoxxed/quickshell"; inputs.nixpkgs.follows = "nixpkgs"; }; }; diff --git a/home/common/programs/hyprland/quickshell.nix b/home/common/programs/hyprland/quickshell.nix index ebf7a0f..b2304a8 100644 --- a/home/common/programs/hyprland/quickshell.nix +++ b/home/common/programs/hyprland/quickshell.nix @@ -1,7 +1,12 @@ -{ config, pkgs, ... }: +{ + config, + pkgs, + inputs, + ... +}: { home.packages = with pkgs; [ - quickshell + inputs.quickshell.packages.x86_64-linux.quickshell ]; xdg.configFile."quickshell".source = ./quickshell; diff --git a/home/common/programs/hyprland/quickshell/shell.qml b/home/common/programs/hyprland/quickshell/shell.qml index b8edb25..400c8af 100644 --- a/home/common/programs/hyprland/quickshell/shell.qml +++ b/home/common/programs/hyprland/quickshell/shell.qml @@ -1,17 +1,6 @@ import Quickshell -import QtQuick -PanelWindow { - anchors { - top: true - left: true - right: true - } - - implicitHeight: 30 - - Text { - anchors.centerIn: parent - text: "hello world" - } +Scope { + Bar {} } +