Makefile

@@ -1,9 +1,6 @@
-.ONESHELL:
-
 dev:
-	ln -s $(PWD)/hyprshell $(HOME)/.config/quickshell/hyprshell-dev
+	ln -s $(PWD) $(HOME)/.config/quickshell
-	quickshell -c hyprshell-dev &
+	quickshell -c default
 
 cleanup:
-	pkill quickshell
+	unlink $(HOME)/.config/quickshell
-	unlink $(HOME)/.config/quickshell/hyprshell-dev

README.md

@@ -5,49 +5,12 @@ A future starter shell for HyprLand.
 ## Testing and Development
 
 1. Clone the repository and cd into it
-2. `make dev` to get a working quickshell
+2. `make dev`
-3. `make cleanup` to stop the `quickshell` process and unlink the directories
 
 This will symlink the repo to `~/.config/quickshell` and start the quickshell process. You'll be able to see your
 changes as you work.
 
-## Installation 
+## Installation
-
-### Touch Grass Method
 
 To install it permanently, you just have to copy the contents of the repo
-to `~/.config/quickshell`. Do that how you must.
+to `~/.config/quickshell`. Do that how you must.
-
-After it's installed, just add `quickshell -c hyprshell &` to your hyprland `exec-once` block.
-
-### Nix Flake (The Real Cool Way)
-
-Add this to your `flake.nix`. Make sure you have the home manager module.
-
-```nix
-inputs = {
-    hyprshell.url = "git+https://gitgud.foo/thegrind/hypr-shell.git";
-};
-```
-
-Then, either throw this in your `configuration.nix`:
-
-```nix
-# Enable home manager
-home-manager = {
-    extraSpecialArgs = { inherit inputs; };
-    users.[your username].imports =  inputs.hyprshell.homeManagerModules.default;
-}
-```
-
-Or, if you load home manager in your flake:
-
-```nix
-    homeConfigurations = {
-        modules = [
-        inputs.hyprshell.homeManagerModules.default
-        # Other files/inputs
-        ];
-    };
-    };
-```

default/shell.qml

@@ -0,0 +1,29 @@
+import "./bars"
+import QtQuick
+import Quickshell
+import Quickshell.Io
+
+ShellRoot {
+    // PanelWindow {
+    //     exclusiveZone: 0
+    //     implicitWidth: 600
+    //     implicitHeight: 300
+    //     anchors.top: true
+    //     Rectangle {
+    //         anchors.fill: parent
+    //         color: "black"
+    //     }
+    // }
+
+    Variants {
+        model: Quickshell.screens
+
+        delegate: Component {
+            TopBar {
+            }
+
+        }
+
+    }
+
+}

default/widgets/VolumeMixer.qml

@@ -6,7 +6,7 @@ import Quickshell.Services.Pipewire
 import Quickshell.Widgets
 
 Item {
-    property bool showPopup: false
+    property bool showPopup: true
     // Get the default audio sink
     property var audioSink: Pipewire.defaultAudioSink
 

flake.nix

@@ -1,20 +0,0 @@
-{
-  description = "Quickshell Hyprshell config";
-  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-  };
-  outputs =
-    { self, nixpkgs }:
-    {
-      homeManagerModules.default =
-        {
-          config,
-          lib,
-          pkgs,
-          ...
-        }:
-        {
-          home.file.".config/quickshell/hyprshell".source = ./hyprshell;
-        };
-    };
-}

hyprshell/hyprshell

@@ -1 +0,0 @@
-/home/xbazzi/repos/hypr-shell/hyprshell

hyprshell/shell.qml

@@ -1,10 +0,0 @@
-import "./bars"
-import QtQuick
-import Quickshell
-import Quickshell.Io
-
-ShellRoot {
-    TopBar {
-    }
-
-}