From 185273a9f49dd6c1adaecdaba8f133592f7d2689 Mon Sep 17 00:00:00 2001 From: Javier Feliz Date: Sun, 10 Aug 2025 00:41:06 -0400 Subject: [PATCH] Let's see if flake works --- Makefile | 2 +- default/shell.qml | 29 ------------------- flake.nix | 26 +++++++++++++++++ {default => hyprshell}/bars/TopBar.qml | 0 {default => hyprshell}/bars/modules/Clock.qml | 0 hyprshell/shell.qml | 10 +++++++ .../widgets/HyprlandWorkspaces.qml | 0 .../widgets/VolumeMixer.qml | 0 8 files changed, 37 insertions(+), 30 deletions(-) delete mode 100644 default/shell.qml create mode 100644 flake.nix rename {default => hyprshell}/bars/TopBar.qml (100%) rename {default => hyprshell}/bars/modules/Clock.qml (100%) create mode 100644 hyprshell/shell.qml rename {default => hyprshell}/widgets/HyprlandWorkspaces.qml (100%) rename {default => hyprshell}/widgets/VolumeMixer.qml (100%) diff --git a/Makefile b/Makefile index d628a21..057a60b 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ dev: ln -s $(PWD) $(HOME)/.config/quickshell - quickshell -c default + quickshell -c hyprshell cleanup: unlink $(HOME)/.config/quickshell \ No newline at end of file diff --git a/default/shell.qml b/default/shell.qml deleted file mode 100644 index 8aa6f54..0000000 --- a/default/shell.qml +++ /dev/null @@ -1,29 +0,0 @@ -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 { - } - - } - - } - -} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..fd3bbd2 --- /dev/null +++ b/flake.nix @@ -0,0 +1,26 @@ +{ + description = "Quickshell Hyprshell config"; + + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + home-manager = { + url = "github:nix-community/home-manager"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + }; + + outputs = + { + self, + nixpkgs, + home-manager, + ... + }: + { + homeManagerModules.default = + { config, lib, ... }: + { + xdg.configFile."quickshell/hyprshell".source = ./hyprshell; + }; + }; +} diff --git a/default/bars/TopBar.qml b/hyprshell/bars/TopBar.qml similarity index 100% rename from default/bars/TopBar.qml rename to hyprshell/bars/TopBar.qml diff --git a/default/bars/modules/Clock.qml b/hyprshell/bars/modules/Clock.qml similarity index 100% rename from default/bars/modules/Clock.qml rename to hyprshell/bars/modules/Clock.qml diff --git a/hyprshell/shell.qml b/hyprshell/shell.qml new file mode 100644 index 0000000..57519eb --- /dev/null +++ b/hyprshell/shell.qml @@ -0,0 +1,10 @@ +import "./bars" +import QtQuick +import Quickshell +import Quickshell.Io + +ShellRoot { + TopBar { + } + +} diff --git a/default/widgets/HyprlandWorkspaces.qml b/hyprshell/widgets/HyprlandWorkspaces.qml similarity index 100% rename from default/widgets/HyprlandWorkspaces.qml rename to hyprshell/widgets/HyprlandWorkspaces.qml diff --git a/default/widgets/VolumeMixer.qml b/hyprshell/widgets/VolumeMixer.qml similarity index 100% rename from default/widgets/VolumeMixer.qml rename to hyprshell/widgets/VolumeMixer.qml