diff --git a/flake.nix b/flake.nix index d6ccd76..e864fc6 100644 --- a/flake.nix +++ b/flake.nix @@ -139,13 +139,10 @@ treefmt-config = { projectRootFile = "flake.nix"; programs = { - # keep-sorted start - jsonfmt.enable = true; - keep-sorted.enable = true; nixfmt.enable = true; + jsonfmt.enable = true; prettier.enable = true; - qmlformat.enable = true; - # keep-sorted end + keep-sorted.enable = true; }; }; forAllSystems = diff --git a/homeConfigurations/muede/.config/quickshell/Bar.qml b/homeConfigurations/muede/.config/quickshell/Bar.qml deleted file mode 100644 index 7fc25e9..0000000 --- a/homeConfigurations/muede/.config/quickshell/Bar.qml +++ /dev/null @@ -1,77 +0,0 @@ -import QtQuick -import QtQuick.Controls -import Quickshell - -PanelWindow { - anchors { - top: true - left: true - right: true - } - - //implicitHeight: 24 - color: "transparent" - - Item { - anchors { - leftMargin: 8 - rightMargin: 8 - fill: parent - } - - // left - Pill { - anchors.left: parent.left - - Label { - text: "TODO: Niri Workspaces" - } - Label { - text: "TODO: System Tray" - } - Label { - text: "TODO: Niri Active Window" - } - } - - // center - Pill { - anchors.horizontalCenter: parent.horizontalCenter - pillAccentColor: Theme.colors.accent0 - - Clock { - time: Time.currentTime - } - - Label { - text: "swaync" - } - - Label { - text: "Privacy" - } - } - - // right - Pill { - anchors.right: parent.right - - Label { - text: "TODO: MPRIS" - } - Label { - text: "TODO: Vol/BT/Net" - } - Label { - text: "TODO: Hardware/Bat" - } - - RoundButton { - text: "" - // textColor: "red" - - onClicked: console.log("TODO: Execute wlogout") - } - } - } -} diff --git a/homeConfigurations/muede/.config/quickshell/Clock.qml b/homeConfigurations/muede/.config/quickshell/Clock.qml deleted file mode 100644 index 161fafc..0000000 --- a/homeConfigurations/muede/.config/quickshell/Clock.qml +++ /dev/null @@ -1,7 +0,0 @@ -import QtQuick.Controls - -Label { - required property string time - - text: time -} diff --git a/homeConfigurations/muede/.config/quickshell/Pill.qml b/homeConfigurations/muede/.config/quickshell/Pill.qml deleted file mode 100644 index 7824888..0000000 --- a/homeConfigurations/muede/.config/quickshell/Pill.qml +++ /dev/null @@ -1,30 +0,0 @@ -import Quickshell -import QtQuick.Layouts -import QtQuick - -Rectangle { - default property alias content: container.data - - property color pillAccentColor: Theme.colors.foreground - property color backgroundColor: Theme.colors.background - - palette { - text: pillAccentColor - windowText: pillAccentColor - } - - color: backgroundColor - border.color: pillAccentColor - - border.width: 2 - radius: 15 - - implicitHeight: container.implicitHeight - implicitWidth: container.implicitWidth + 16 - - RowLayout { - id: container - anchors.centerIn: parent - spacing: 8 - } -} diff --git a/homeConfigurations/muede/.config/quickshell/Theme.qml b/homeConfigurations/muede/.config/quickshell/Theme.qml deleted file mode 100644 index baeb104..0000000 --- a/homeConfigurations/muede/.config/quickshell/Theme.qml +++ /dev/null @@ -1,50 +0,0 @@ -pragma Singleton -import QtQuick - -QtObject { - // TODO: get those from stylix - property QtObject colors: QtObject { - id: colors // for recursive reference - property color base00: "#1e1e2e" - property color base01: "#181825" - property color base02: "#313244" - property color base03: "#45475a" - property color base04: "#585b70" - property color base05: "#cdd6f4" - property color base06: "#f5e0dc" - property color base07: "#b4befe" - property color base08: "#f38ba8" - property color base09: "#6f9dff" - property color base0A: "#d162a4" - property color base0B: "#a8c9ff" - property color base0C: "#a30262" - property color base0D: "#89b4fa" - property color base0E: "#cba6f7" - property color base0F: "#f2cdcd" - property color base10: "#1e1e2e" - property color base11: "#1e1e2e" - property color base12: "#f38ba8" - property color base13: "#f9e2af" - property color base14: "#a6e3a1" - property color base15: "#94e2d5" - property color base16: "#89b4fa" - property color base17: "#cba6f7" - - property alias background: colors.base00 - property alias backgroundLight: colors.base01 - property alias backgroundSelection: colors.base02 - property alias comments: colors.base03 - property alias foregroundDark: colors.base04 - property alias foreground: colors.base05 - property alias foregroundLight1: colors.base06 - property alias foregroundLight2: colors.base07 - property alias accent0: colors.base08 - property alias accent1: colors.base09 - property alias accent2: colors.base0A - property alias accent3: colors.base0B - property alias accent4: colors.base0C - property alias accent5: colors.base0D - property alias accent6: colors.base0E - property alias accent7: colors.base0F - } -} diff --git a/homeConfigurations/muede/.config/quickshell/Time.qml b/homeConfigurations/muede/.config/quickshell/Time.qml deleted file mode 100644 index 52e5a35..0000000 --- a/homeConfigurations/muede/.config/quickshell/Time.qml +++ /dev/null @@ -1,13 +0,0 @@ -pragma Singleton -import Quickshell -import QtQuick - -Singleton { - property string currentTime: { - Qt.formatDateTime(clock.date, "ddd, dd. MMM hh:mm:ss"); - } - SystemClock { - id: clock - precision: SystemClock.Seconds - } -} diff --git a/homeConfigurations/muede/.config/quickshell/shell.qml b/homeConfigurations/muede/.config/quickshell/shell.qml deleted file mode 100644 index 53ca2cc..0000000 --- a/homeConfigurations/muede/.config/quickshell/shell.qml +++ /dev/null @@ -1,17 +0,0 @@ -import QtQuick -import QtQuick.Layouts -import QtQuick.Controls -import Quickshell - -Scope { - id: root - - Variants { - model: Quickshell.screens - - Bar { - required property var modelData - screen: modelData - } - } -} diff --git a/homeConfigurations/muede/default.nix b/homeConfigurations/muede/default.nix index e9e7d54..4b5e1ec 100644 --- a/homeConfigurations/muede/default.nix +++ b/homeConfigurations/muede/default.nix @@ -48,12 +48,6 @@ }; chromium.enable = true; - - quickshell = { - enable = true; - systemd.enable = true; - #activeConfig = "~/.config/"; - }; }; home.packages = with pkgs; [ @@ -91,17 +85,6 @@ home.file = { "idea.properties".text = "idea.filewatcher.executable.path = ${pkgs.fsnotifier}/bin/fsnotifier"; - ".config/quickshell" = { - source = ./.config/quickshell; - recursive = true; - }; - }; - - home.sessionVariables = { - XDG_CACHE_HOME = "$HOME/.cache"; - XDG_CONFIG_HOME = "$HOME/.config"; - XDG_DATA_HOME = "$HOME/.local/share"; - XDG_STATE_HOME = "$HOME/.local/state"; }; services = { diff --git a/homeConfigurations/muede/vscode.nix b/homeConfigurations/muede/vscode.nix index 72351bd..b7e01ab 100644 --- a/homeConfigurations/muede/vscode.nix +++ b/homeConfigurations/muede/vscode.nix @@ -25,7 +25,6 @@ redhat.vscode-yaml rust-lang.rust-analyzer tamasfe.even-better-toml - theqtcompany.qt-qml yzhang.markdown-all-in-one # keep-sorted end ]