diff --git a/.agents/skills/README.md b/.agents/skills/README.md index c9926effe..a55a8dd23 100644 --- a/.agents/skills/README.md +++ b/.agents/skills/README.md @@ -8,7 +8,7 @@ Each skill is a directory with a `SKILL.md` entrypoint, optional reference docs, | Skill | Description | |-------|-------------| -| [dms-plugin-dev](dms-plugin-dev/) | Develop plugins for DankMaterialShell - covers all 4 plugin types (widget, daemon, launcher, desktop), manifest creation, QML components, settings UI, data persistence, theme integration, and PopoutService usage. | +| [dms-plugin-dev](dms-plugin-dev/) | Develop plugins for Dux Shell - covers all 4 plugin types (widget, daemon, launcher, desktop), manifest creation, QML components, settings UI, data persistence, theme integration, and PopoutService usage. | ## Installation @@ -28,7 +28,7 @@ ln -s ../../.agents/skills/dms-plugin-dev .claude/skills/dms-plugin-dev **Personal** (all your projects): ```bash -ln -s /path/to/DankMaterialShell/.agents/skills/dms-plugin-dev ~/.claude/skills/dms-plugin-dev +ln -s /path/to/dms/.agents/skills/dms-plugin-dev ~/.claude/skills/dms-plugin-dev ``` After linking, the skill appears in Claude Code's `/` menu as `/dms-plugin-dev`, and Claude loads it automatically when you ask about DMS plugin development. diff --git a/.agents/skills/dms-plugin-dev/SKILL.md b/.agents/skills/dms-plugin-dev/SKILL.md index b081351d3..0ef2e99e2 100644 --- a/.agents/skills/dms-plugin-dev/SKILL.md +++ b/.agents/skills/dms-plugin-dev/SKILL.md @@ -1,7 +1,7 @@ --- name: dms-plugin-dev description: > - Develop plugins for DankMaterialShell (DMS), a QML-based Linux desktop shell built on + Develop plugins for Dux Shell (DMS), a QML-based Linux desktop shell built on Quickshell. Supports widget (bar, dock + Control Center), daemon (background service), launcher (search + actions), desktop (draggable desktop widgets), dash (dash tab), dashCard (dash overview card), and composite (multi-surface) plugins. Covers manifest @@ -11,33 +11,33 @@ description: > or debug a DMS plugin, or asks about the DMS plugin API. compatibility: Designed for Claude Code (or similar products) metadata: - author: DankMaterialShell + author: Dux Shell version: "1.2" domain: qml-desktop-development - framework: DankMaterialShell + framework: Dux Shell languages: qml, javascript allowed-tools: Bash Read Write Edit --- -# DankMaterialShell Plugin Development +# Dux Shell Plugin Development ## Overview DMS plugins extend the desktop shell with bar and dock widgets, background services, launcher integrations, desktop widgets, and dash tabs and cards. Plugins are QML components discovered from -`~/.config/DankMaterialShell/plugins/`. +`~/.config/dms/plugins/`. **Minimum plugin structure:** ``` -~/.config/DankMaterialShell/plugins/YourPlugin/ +~/.config/dms/plugins/YourPlugin/ plugin.json # Required: manifest with metadata YourComponent.qml # Required: main QML component YourSettings.qml # Optional: settings UI *.js # Optional: JavaScript utilities ``` -**Plugin registry:** Community plugins are available at https://plugins.danklinux.com/ +**Plugin registry:** Community plugins are available at https://plugins.duxlabs.dev/ **Plugin types:** @@ -480,7 +480,7 @@ Always use `Theme.*` properties from `qs.Common` - never hardcode colors or size - Radius: `Theme.cornerRadius`, `Theme.cornerRadiusSmall`, `Theme.cornerRadiusLarge` - Icons: `Theme.iconSizeSmall` (16), `Theme.iconSize` (24), `Theme.iconSizeLarge` (32) -**Common widgets from `qs.Widgets`:** `StyledText`, `StyledRect`, `DankIcon`, `DankButton`, `DankToggle`, `DankTextField`, `DankSlider`, `DankGridView`, `CachingImage`. +**Common widgets from `qs.DCommon.Widgets`:** `StyledText`, `StyledRect`, `DIcon`, `DButton`, `DToggle`, `DTextField`, `DSlider`, `DGridView`, `CachingImage`. The old `Dank*` names in `qs.Widgets` are deprecated. See [theme-reference.md](references/theme-reference.md) for the complete property list. diff --git a/.agents/skills/dms-plugin-dev/assets/plugin-schema.json b/.agents/skills/dms-plugin-dev/assets/plugin-schema.json index cd6e6d8c6..04bd64b2a 100644 --- a/.agents/skills/dms-plugin-dev/assets/plugin-schema.json +++ b/.agents/skills/dms-plugin-dev/assets/plugin-schema.json @@ -1,8 +1,8 @@ { "$schema": "http://json-schema.org/draft-07/schema#", - "$id": "https://danklinux.com/schemas/plugin.json", - "title": "DankMaterialShell Plugin Manifest", - "description": "Schema for DankMaterialShell plugin.json manifest files", + "$id": "https://duxlabs.dev/schemas/plugin.json", + "title": "Dux Shell Plugin Manifest", + "description": "Schema for Dux Shell plugin.json manifest files", "type": "object", "required": [ "id", diff --git a/.agents/skills/dms-plugin-dev/references/advanced-patterns.md b/.agents/skills/dms-plugin-dev/references/advanced-patterns.md index 40a6bdfdb..b09b556c4 100644 --- a/.agents/skills/dms-plugin-dev/references/advanced-patterns.md +++ b/.agents/skills/dms-plugin-dev/references/advanced-patterns.md @@ -43,7 +43,7 @@ PluginSettings { pluginId: "exampleVariants" // Variant creation UI - DankButton { + DButton { text: "Add New Instance" onClicked: { var id = "variant_" + Date.now() diff --git a/.agents/skills/dms-plugin-dev/references/dash-plugin-guide.md b/.agents/skills/dms-plugin-dev/references/dash-plugin-guide.md index d195ea7b5..3ebe342d7 100644 --- a/.agents/skills/dms-plugin-dev/references/dash-plugin-guide.md +++ b/.agents/skills/dms-plugin-dev/references/dash-plugin-guide.md @@ -32,6 +32,7 @@ Add the optional `dash` block for labels, card size and options (see plugin-mani import QtQuick import qs.Common import qs.Widgets +import qs.DCommon.Widgets import qs.Modules.Plugins import qs.Modules.DankDash @@ -79,7 +80,7 @@ DashTabComponent { color: Theme.surfaceText } - DankButton { + DButton { id: button text: I18n.trFor("myPlugin", "Refresh") onClicked: root.refresh() diff --git a/.agents/skills/dms-plugin-dev/references/data-persistence-guide.md b/.agents/skills/dms-plugin-dev/references/data-persistence-guide.md index fd3648c94..793e28c4b 100644 --- a/.agents/skills/dms-plugin-dev/references/data-persistence-guide.md +++ b/.agents/skills/dms-plugin-dev/references/data-persistence-guide.md @@ -174,7 +174,7 @@ Retrieve a plugin's installation directory at runtime: var dir = pluginService.getPluginPath(pluginId) ``` -Returns the absolute path to the plugin's directory (e.g., `~/.config/DankMaterialShell/plugins/MyPlugin`), or an empty string if the plugin is not found. Useful for loading bundled assets (images, data files) relative to the plugin's location. +Returns the absolute path to the plugin's directory (e.g., `~/.config/dms/plugins/MyPlugin`), or an empty string if the plugin is not found. Useful for loading bundled assets (images, data files) relative to the plugin's location. ## Important Notes diff --git a/.agents/skills/dms-plugin-dev/references/theme-reference.md b/.agents/skills/dms-plugin-dev/references/theme-reference.md index 373da8224..932439672 100644 --- a/.agents/skills/dms-plugin-dev/references/theme-reference.md +++ b/.agents/skills/dms-plugin-dev/references/theme-reference.md @@ -83,11 +83,12 @@ Theme.popupBackground() // Popup background with proper opacity ```qml import qs.Widgets +import qs.DCommon.Widgets Row { spacing: Theme.spacingS - DankIcon { + DIcon { name: "icon_name" color: Theme.onSurface font.pixelSize: Theme.iconSize @@ -151,7 +152,7 @@ StyledRect { anchors.centerIn: parent spacing: Theme.spacingS - DankIcon { + DIcon { name: "star" color: Theme.surfaceText font.pixelSize: Theme.iconSize @@ -191,17 +192,17 @@ font.pixelSize: 14 // Use Theme.fontSizeMedium |--------|-------------| | `StyledText` | Themed text with proper color defaults | | `StyledRect` | Themed rectangle | -| `DankIcon` | Material Symbols icon renderer | +| `DIcon` | Material Symbols icon renderer | | `DankNFIcon` | Nerd Font icon renderer | -| `DankButton` | Themed button | -| `DankToggle` | Toggle switch | -| `DankTextField` | Text input field | -| `DankSlider` | Slider control | -| `DankDropdown` | Dropdown menu | -| `DankGridView` | Grid layout view | -| `DankListView` | List layout view | -| `DankFlickable` | Scrollable container | -| `DankTabBar` | Tab bar navigation | +| `DButton` | Themed button | +| `DToggle` | Toggle switch | +| `DTextField` | Text input field | +| `DSlider` | Slider control | +| `DDropdown` | Dropdown menu | +| `DGridView` | Grid layout view | +| `DListView` | List layout view | +| `DFlickable` | Scrollable container | +| `DTabBar` | Tab bar navigation | | `DankCollapsibleSection` | Collapsible content section | | `DankTooltip` | Hover tooltip | | `DankNumberStepper` | Number +/- control | diff --git a/.agents/skills/dms-plugin-dev/references/widget-plugin-guide.md b/.agents/skills/dms-plugin-dev/references/widget-plugin-guide.md index 1a5afbbe7..355c96e70 100644 --- a/.agents/skills/dms-plugin-dev/references/widget-plugin-guide.md +++ b/.agents/skills/dms-plugin-dev/references/widget-plugin-guide.md @@ -59,7 +59,7 @@ horizontalBarPill: Component { anchors.centerIn: parent spacing: Theme.spacingS - DankIcon { + DIcon { name: "star" color: Theme.surfaceText font.pixelSize: Theme.iconSize @@ -92,7 +92,7 @@ verticalBarPill: Component { anchors.centerIn: parent spacing: Theme.spacingS - DankIcon { + DIcon { name: "star" color: Theme.surfaceText font.pixelSize: Theme.iconSizeSmall @@ -261,7 +261,7 @@ PluginComponent { padding: Theme.spacingM spacing: Theme.spacingM - DankButton { + DButton { text: I18n.trFor("myPlugin", "Close") onClicked: root.surfaceContext.dismissExpansion() } @@ -311,6 +311,7 @@ import QtQuick import Quickshell import qs.Common import qs.Widgets +import qs.DCommon.Widgets import qs.Services import qs.Modules.Plugins @@ -367,7 +368,7 @@ PluginComponent { PopoutComponent { headerText: "Emoji Picker" - DankGridView { + DGridView { width: parent.width height: 300 cellWidth: 50 diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 3971c58c3..c8b63031b 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -6,7 +6,7 @@ body: - type: markdown attributes: value: | - ## DankMaterialShell Bug Report + ## Dux Shell Bug Report Limit your report to one issue per submission unless similarly related - type: dropdown id: compositor diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml index 446b4c394..3c9a55426 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yml +++ b/.github/ISSUE_TEMPLATE/feature_request.yml @@ -6,7 +6,7 @@ body: - type: markdown attributes: value: | - ## DankMaterialShell Feature Request + ## Dux Shell Feature Request - type: textarea id: feature_description attributes: diff --git a/.github/ISSUE_TEMPLATE/support_request.yml b/.github/ISSUE_TEMPLATE/support_request.yml index 2408b5eda..62185cb74 100644 --- a/.github/ISSUE_TEMPLATE/support_request.yml +++ b/.github/ISSUE_TEMPLATE/support_request.yml @@ -1,12 +1,12 @@ name: Support Request -description: Help with installation, usage, or general questions about DankMaterialShell +description: Help with installation, usage, or general questions about Dux Shell labels: - support body: - type: markdown attributes: value: | - ## DankMaterialShell Support Request + ## Dux Shell Support Request - type: dropdown id: compositor attributes: diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index ea098e9c6..2d9088f36 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -28,4 +28,4 @@ - [ ] New user-facing strings are wrapped in `I18n.tr()` with translator context, reusing existing terms where possible - [ ] Go changes: ran `make fmt`, added/updated tests, `make test` passes, and `go mod tidy` is clean - [ ] QML changes: ran `make lint-qml` with no new warnings -- [ ] I have opened a corresponding pull request in dlx-docs to document any new behaviors: https://github.com/AvengeMedia/DankLinux-Docs +- [ ] I have opened a corresponding pull request in dlx-docs to document any new behaviors: https://github.com/duxlabs-dev/dux-docs diff --git a/.github/workflows/common-parity.yml b/.github/workflows/common-parity.yml index 3a60ada3b..4ec516667 100644 --- a/.github/workflows/common-parity.yml +++ b/.github/workflows/common-parity.yml @@ -38,7 +38,7 @@ jobs: submodule_rev=$(git ls-tree HEAD dank-qml-common --object-only) flake_rev=$(python3 -c "import json; print(json.load(open('flake.lock'))['nodes']['dank-qml-common']['locked']['rev'])") [ "$submodule_rev" = "$flake_rev" ] && { echo "flake.lock already matches $submodule_rev"; exit 0; } - nix flake lock --override-input dank-qml-common "github:AvengeMedia/dank-qml-common/$submodule_rev" + nix flake lock --override-input dank-qml-common "github:duxlabs-dev/dux-qml-common/$submodule_rev" - name: Commit and push flake.lock update env: diff --git a/.github/workflows/prune-r2.yml b/.github/workflows/prune-r2.yml index 21969e8cf..c8aec5f43 100644 --- a/.github/workflows/prune-r2.yml +++ b/.github/workflows/prune-r2.yml @@ -42,7 +42,7 @@ jobs: prune: name: Prune archive snapshots runs-on: ubuntu-latest - if: github.repository == 'AvengeMedia/DankMaterialShell' + if: github.repository == 'duxlabs-dev/dux-shell' env: AWS_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4df3c3d4b..31a19fa55 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -280,7 +280,7 @@ jobs: ## Installation ```bash - curl -fsSL https://install.danklinux.com | sh + curl -fsSL https://install.duxlabs.dev | sh ``` ## Assets @@ -420,7 +420,7 @@ jobs: # Create installation guide cat > _temp_full/INSTALL.md << 'EOFINSTALL' - # DankMaterialShell Installation + # Dux Shell Installation ## Requirements @@ -458,8 +458,8 @@ jobs: ## Configuration - - Settings are stored in `~/.config/DankMaterialShell/settings.json` - - Plugins go in `~/.config/DankMaterialShell/plugins/` + - Settings are stored in `~/.config/dms/settings.json` + - Plugins go in `~/.config/dms/plugins/` - See the documentation in the `dms/` directory for more details ## Troubleshooting @@ -531,13 +531,13 @@ jobs: fail-fast: false matrix: repo: - - dgop - - dankgo - - dank-qml-common - - dankcalendar - - danksearch - - dank-greeter - - dfiles + - dux-gop + - dux-go + - dux-qml-common + - dux-calendar + - dux-search + - dux-greeter + - dux-files steps: - name: Create GitHub App token id: app_token diff --git a/.github/workflows/run-copr.yml b/.github/workflows/run-copr.yml index 834e44eaa..1cd02dc33 100644 --- a/.github/workflows/run-copr.yml +++ b/.github/workflows/run-copr.yml @@ -78,7 +78,7 @@ jobs: echo "📦 Downloading DMS QML source for v${VERSION}..." # Download DMS QML source - wget "https://github.com/AvengeMedia/DankMaterialShell/releases/download/v${VERSION}/dms-qml.tar.gz" || { + wget "https://github.com/duxlabs-dev/dux-shell/releases/download/v${VERSION}/dms-qml.tar.gz" || { echo "❌ Failed to download dms-qml.tar.gz for v${VERSION}" exit 1 } diff --git a/.github/workflows/run-obs.yml b/.github/workflows/run-obs.yml index 87989ffb4..ee6e437c6 100644 --- a/.github/workflows/run-obs.yml +++ b/.github/workflows/run-obs.yml @@ -23,7 +23,7 @@ jobs: check-updates: name: Check for updates runs-on: ubuntu-latest - if: github.repository == 'AvengeMedia/DankMaterialShell' + if: github.repository == 'duxlabs-dev/dux-shell' outputs: has_updates: ${{ steps.check.outputs.has_updates }} @@ -61,7 +61,7 @@ jobs: # Helper function to check dms stable tag # Sets LATEST_TAG variable in parent scope if update needed check_dms_stable() { - LATEST_TAG=$(curl -s https://api.github.com/repos/AvengeMedia/DankMaterialShell/releases/latest | grep '"tag_name"' | sed 's/.*"tag_name": "\([^"]*\)".*/\1/' || echo "") + LATEST_TAG=$(curl -s https://api.github.com/repos/duxlabs-dev/dux-shell/releases/latest | grep '"tag_name"' | sed 's/.*"tag_name": "\([^"]*\)".*/\1/' || echo "") local OBS_SPEC=$(curl -s -u "$OBS_USERNAME:$OBS_PASSWORD" "https://api.opensuse.org/source/home:AvengeMedia:dms/dms/dms.spec" 2>/dev/null || echo "") local OBS_VERSION=$(echo "$OBS_SPEC" | grep "^Version:" | awk '{print $2}' | xargs || echo "") @@ -192,7 +192,7 @@ jobs: # Determine version for dms stable using the API # GITHUB_REF is unreliable when "Use workflow from" a tag; API works from any ref if [[ "${{ github.event.inputs.package }}" == "dms" ]] || [[ "${{ github.event.inputs.package }}" == "all" ]]; then - LATEST_TAG=$(curl -s https://api.github.com/repos/AvengeMedia/DankMaterialShell/releases/latest | grep '"tag_name"' | sed 's/.*"tag_name": "\([^"]*\)".*/\1/' || echo "") + LATEST_TAG=$(curl -s https://api.github.com/repos/duxlabs-dev/dux-shell/releases/latest | grep '"tag_name"' | sed 's/.*"tag_name": "\([^"]*\)".*/\1/' || echo "") if [[ -n "$LATEST_TAG" ]]; then echo "version=$LATEST_TAG" >> $GITHUB_OUTPUT echo "Using latest release from API: $LATEST_TAG" diff --git a/.github/workflows/run-ppa.yml b/.github/workflows/run-ppa.yml index 58c5c2e1b..9a4a64b55 100644 --- a/.github/workflows/run-ppa.yml +++ b/.github/workflows/run-ppa.yml @@ -23,7 +23,7 @@ jobs: check-updates: name: Check package/series updates runs-on: ubuntu-latest - if: github.repository == 'AvengeMedia/DankMaterialShell' + if: github.repository == 'duxlabs-dev/dux-shell' outputs: has_updates: ${{ steps.check.outputs.has_updates }} diff --git a/.github/workflows/run-xbps.yml b/.github/workflows/run-xbps.yml index 51a796ead..401ba3507 100644 --- a/.github/workflows/run-xbps.yml +++ b/.github/workflows/run-xbps.yml @@ -61,7 +61,7 @@ jobs: name: Build & Deploy XBPS packages runs-on: ubuntu-latest needs: preflight - if: github.repository == 'AvengeMedia/DankMaterialShell' && needs.preflight.outputs.should_build == 'true' + if: github.repository == 'duxlabs-dev/dux-shell' && needs.preflight.outputs.should_build == 'true' env: AWS_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }} diff --git a/.gitignore b/.gitignore index 27f64c82e..9fbe65bc4 100644 --- a/.gitignore +++ b/.gitignore @@ -64,7 +64,7 @@ AGENTS-temp.md niri-colors.generated.kdl ghostty-colors.generated.conf -# Notepad files (should be in ~/.local/state/DankMaterialShell/) +# Notepad files (should be in ~/.local/state/dms/) untitled-*.txt file:* notepad-files/ diff --git a/.gitmodules b/.gitmodules index 7825e2bef..e99d025bc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "dank-qml-common"] path = dank-qml-common - url = https://github.com/AvengeMedia/dank-qml-common.git + url = https://github.com/duxlabs-dev/dux-qml-common.git branch = master diff --git a/AGENTS.md b/AGENTS.md index 46f6e89a3..648e37b1e 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -5,7 +5,7 @@ DMS is an open-source desktop shell for Wayland compositors on linux, built to w ## Repo Structure - core/ - Go. `cmd/dms` runs quickshell, CLI utilities, and the unix socket server the UI depends on. `cmd/dankinstall` is a separate installer TUI. -- quickshell/ - the entire UI: Common/ (singletons, Theme, settings), Services/ (system and core access), Modules/ (bar, dock, lock, ...), Modals/, Widgets/ (Dank* components), PLUGINS/, translations/ +- quickshell/ - the entire UI: Common/ (singletons, Theme, settings), Services/ (system and core access), Modules/ (bar, dock, lock, ...), Modals/, Widgets/ (shell-specific widgets and deprecated Dank* shims), PLUGINS/, translations/ - dank-qml-common/ - submodule of shared QML widgets - docs/, distro/ - IPC and theme docs, packaging @@ -18,7 +18,7 @@ DMS is an open-source desktop shell for Wayland compositors on linux, built to w - The shell runs 24/7. Audit every change for idle CPU, extra processes, timers, and retained memory. - `core` and `quickshell` share the socket protocol. Changing one means checking the other. - QML uses Theme tokens, never hardcoded colors, spacing, or constants. -- Use the Dank* wrappers in Widgets/ instead of raw ListView/Flickable/ScrollView. +- Use the D* widgets from qs.DCommon.Widgets (DListView, DFlickable, and so on) instead of raw ListView/Flickable/ScrollView. The Dank* names in Widgets/ are deprecated shims. - User-facing text goes through I18n.tr(). Reuse catalog terms. Never edit translation catalogs. - Guard clauses, early returns. - Comment only what the code cannot say: a non-obvious why, a trap, a workaround. Never narrate what the code does or restate a name. Keep it to a line or two, and delete useless or paragraph comments you come across. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7dc4b9d05..11c6a1379 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -6,10 +6,10 @@ To contribute fork this repository, make your changes, and open a pull request. ## Setup -Clone with submodules — the shared widget library ([dank-qml-common](https://github.com/AvengeMedia/dank-qml-common)) is vendored at `dank-qml-common/` and symlinked into `quickshell/DCommon`: +Clone with submodules — the shared widget library ([dank-qml-common](https://github.com/duxlabs-dev/dux-qml-common)) is vendored at `dank-qml-common/` and symlinked into `quickshell/DCommon`: ```bash -git clone --recurse-submodules https://github.com/AvengeMedia/DankMaterialShell.git +git clone --recurse-submodules https://github.com/duxlabs-dev/dux-shell.git # or, in an existing clone: git submodule update --init ``` @@ -54,7 +54,7 @@ make run # dev build, then launch against the live quickshell/ tree The UI config dir resolves in order: `-c `, `DMS_SHELL_DIR`, the dir a running instance is using, then the embedded UI. Each candidate must contain `shell.qml`. `make run` uses `-c $(pwd)/quickshell`, so QML edits hot-reload from the working tree. -The Go core depends on [dankgo](https://github.com/AvengeMedia/dankgo) for logging, XDG paths, the IPC transport, and the quickshell process lifecycle. To develop against a local dankgo checkout, create a gitignored `go.work` at the repo root: +The Go core depends on [dankgo](https://github.com/duxlabs-dev/dux-go) for logging, XDG paths, the IPC transport, and the quickshell process lifecycle. To develop against a local dankgo checkout, create a gitignored `go.work` at the repo root: ``` go work init ./core ../dankgo @@ -71,12 +71,12 @@ Everything under `quickshell/DCommon/` (core widgets, the file browser, scroll p The submodule URL in `.gitmodules` is HTTPS so CI and anonymous clones keep working. To push over SSH instead of being prompted for credentials, add a push rewrite to your git config — fetches stay HTTPS, pushes use SSH: ```bash -git config --global url."git@github.com:AvengeMedia/".pushInsteadOf "https://github.com/AvengeMedia/" +git config --global url."git@github.com:duxlabs-dev/".pushInsteadOf "https://github.com/duxlabs-dev/" ``` Shared widgets read app-provided singletons (`Theme`, `SettingsData`, ...) through a documented contract — see the dank-qml-common README. If your change needs a new contract property, add it to the library's stub singletons in the same PR, then to `quickshell/Common/` here when you bump. -Files in `quickshell/Widgets/`, `quickshell/Common/`, and `quickshell/Modals/FileBrowser/` that moved to the library remain in place as thin wrappers, so `import qs.Widgets`, `qs.Common`, and `qs.Modals.FileBrowser` keep working for the shell and for plugins. +Files in `quickshell/Widgets/`, `quickshell/Common/`, and `quickshell/Modals/FileBrowser/` that moved to the library remain in place as thin wrappers, so existing `qs.Widgets`, `qs.Common`, and `qs.Modals.FileBrowser` imports keep working for the shell and for plugins. The `Dank*` widget names are deprecated: each one logs a warning naming its replacement. New code imports `qs.DCommon.Widgets` and uses the `D*` names (`DButton`, `DIcon`, `DListView`, and so on). ## VSCode Setup diff --git a/Makefile b/Makefile index f7a7b8837..d38a8e6fa 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# Root Makefile for DankMaterialShell (DMS) +# Root Makefile for Dux Shell (DMS) # Orchestrates building, installation, and systemd management # Build configuration @@ -83,15 +83,17 @@ endif install-icon: @echo "Installing icon..." - @install -D -m 644 $(ASSETS_DIR)/com.danklinux.dms.svg $(ICON_DIR)/com.danklinux.dms.svg + @install -D -m 644 $(ASSETS_DIR)/dev.duxlabs.shell.svg $(ICON_DIR)/dev.duxlabs.shell.svg + @rm -f $(ICON_DIR)/com.danklinux.dms.svg @gtk-update-icon-cache -q $(DATA_DIR)/icons/hicolor 2>/dev/null || true @echo "Icon installed" install-desktop: @echo "Installing desktop entries..." @install -D -m 644 $(ASSETS_DIR)/dms-open.desktop $(APPLICATIONS_DIR)/dms-open.desktop - @install -D -m 644 $(ASSETS_DIR)/com.danklinux.dms.desktop $(APPLICATIONS_DIR)/com.danklinux.dms.desktop - @install -D -m 644 $(ASSETS_DIR)/com.danklinux.dms.notepad.desktop $(APPLICATIONS_DIR)/com.danklinux.dms.notepad.desktop + @install -D -m 644 $(ASSETS_DIR)/dev.duxlabs.shell.desktop $(APPLICATIONS_DIR)/dev.duxlabs.shell.desktop + @install -D -m 644 $(ASSETS_DIR)/dev.duxlabs.shell.notepad.desktop $(APPLICATIONS_DIR)/dev.duxlabs.shell.notepad.desktop + @rm -f $(APPLICATIONS_DIR)/com.danklinux.dms.desktop $(APPLICATIONS_DIR)/com.danklinux.dms.notepad.desktop @update-desktop-database -q $(APPLICATIONS_DIR) 2>/dev/null || true @echo "Desktop entries installed" @@ -127,6 +129,7 @@ uninstall-systemd: uninstall-icon: @echo "Removing icon..." + @rm -f $(ICON_DIR)/dev.duxlabs.shell.svg @rm -f $(ICON_DIR)/com.danklinux.dms.svg @rm -f $(ICON_DIR)/danklogo.svg @gtk-update-icon-cache -q $(DATA_DIR)/icons/hicolor 2>/dev/null || true @@ -135,8 +138,9 @@ uninstall-icon: uninstall-desktop: @echo "Removing desktop entries..." @rm -f $(APPLICATIONS_DIR)/dms-open.desktop - @rm -f $(APPLICATIONS_DIR)/com.danklinux.dms.desktop - @rm -f $(APPLICATIONS_DIR)/com.danklinux.dms.notepad.desktop + @rm -f $(APPLICATIONS_DIR)/dev.duxlabs.shell.desktop + @rm -f $(APPLICATIONS_DIR)/dev.duxlabs.shell.notepad.desktop + @rm -f $(APPLICATIONS_DIR)/com.danklinux.dms.desktop $(APPLICATIONS_DIR)/com.danklinux.dms.notepad.desktop @update-desktop-database -q $(APPLICATIONS_DIR) 2>/dev/null || true @echo "Desktop entries removed" diff --git a/README.md b/README.md index 38d9d798c..0fa0ec4fd 100644 --- a/README.md +++ b/README.md @@ -1,32 +1,32 @@ -# DankMaterialShell +# Dux Shell
- - DankMaterialShell + + Dux Shell ### A modern desktop shell for Wayland Built with [Quickshell](https://quickshell.org/) and [Go](https://go.dev/) -[![Documentation](https://img.shields.io/badge/docs-danklinux.com-9ccbfb?style=for-the-badge&labelColor=101418)](https://danklinux.com/docs) -[![GitHub stars](https://img.shields.io/github/stars/AvengeMedia/DankMaterialShell?style=for-the-badge&labelColor=101418&color=ffd700)](https://github.com/AvengeMedia/DankMaterialShell/stargazers) -[![GitHub License](https://img.shields.io/github/license/AvengeMedia/DankMaterialShell?style=for-the-badge&labelColor=101418&color=b9c8da)](https://github.com/AvengeMedia/DankMaterialShell/blob/master/LICENSE) -[![GitHub release](https://img.shields.io/github/v/release/AvengeMedia/DankMaterialShell?style=for-the-badge&labelColor=101418&color=9ccbfb)](https://github.com/AvengeMedia/DankMaterialShell/releases) +[![Documentation](https://img.shields.io/badge/docs-duxlabs.dev-9ccbfb?style=for-the-badge&labelColor=101418)](https://duxlabs.dev/docs) +[![GitHub stars](https://img.shields.io/github/stars/duxlabs-dev/dux-shell?style=for-the-badge&labelColor=101418&color=ffd700)](https://github.com/duxlabs-dev/dux-shell/stargazers) +[![GitHub License](https://img.shields.io/github/license/duxlabs-dev/dux-shell?style=for-the-badge&labelColor=101418&color=b9c8da)](https://github.com/duxlabs-dev/dux-shell/blob/master/LICENSE) +[![GitHub release](https://img.shields.io/github/v/release/duxlabs-dev/dux-shell?style=for-the-badge&labelColor=101418&color=9ccbfb)](https://github.com/duxlabs-dev/dux-shell/releases) [![Arch version](https://img.shields.io/archlinux/v/extra/x86_64/dms-shell?style=for-the-badge&labelColor=101418&color=9ccbfb)](https://archlinux.org/packages/extra/x86_64/dms-shell/) [![AUR version (git)]()](https://aur.archlinux.org/packages/dms-shell-git) [![Ko-Fi donate](https://img.shields.io/badge/donate-kofi?style=for-the-badge&logo=ko-fi&logoColor=ffffff&label=ko-fi&labelColor=101418&color=f16061&link=https%3A%2F%2Fko-fi.com%2Fdanklinux)](https://ko-fi.com/danklinux)
-DankMaterialShell is a complete desktop shell for [niri](https://github.com/YaLTeR/niri), [Hyprland](https://hyprland.org/), [MangoWC](https://github.com/DreamMaoMao/mangowc), [Sway](https://swaywm.org), [labwc](https://labwc.github.io/), [Scroll](https://github.com/dawsers/scroll), [Miracle WM](https://github.com/miracle-wm-org/miracle-wm), and other Wayland compositors. It replaces waybar, swaylock, swayidle, mako, fuzzel, polkit, and everything else you'd normally stitch together to make a desktop. +Dux Shell is a complete desktop shell for [niri](https://github.com/YaLTeR/niri), [Hyprland](https://hyprland.org/), [MangoWC](https://github.com/DreamMaoMao/mangowc), [Sway](https://swaywm.org), [labwc](https://labwc.github.io/), [Scroll](https://github.com/dawsers/scroll), [Miracle WM](https://github.com/miracle-wm-org/miracle-wm), and other Wayland compositors. It replaces waybar, swaylock, swayidle, mako, fuzzel, polkit, and everything else you'd normally stitch together to make a desktop. ## Repository Structure This is a monorepo containing both the shell interface and the core backend services: ``` -DankMaterialShell/ +dux-shell/ ├── quickshell/ # QML-based shell interface │ ├── Modules/ # UI components (panels, widgets, overlays) │ ├── Services/ # System integration (audio, network, bluetooth) @@ -70,14 +70,14 @@ https://github.com/user-attachments/assets/d310418b-cc44-4ace-ac0d-2fc0c851291d ## Installation ```bash -curl -fsSL https://install.danklinux.com | sh +curl -fsSL https://install.duxlabs.dev | sh ``` One command installs DMS and all dependencies on Arch, Fedora, Debian, Ubuntu, openSUSE, or Gentoo. **FreeBSD:** native support is included in-tree; see [distro/freebsd/README.md](distro/freebsd/README.md) for supported integrations and setup notes. -**[Manual installation guide](https://danklinux.com/docs/dankmaterialshell/installation)** +**[Manual installation guide](https://duxlabs.dev/docs/dms/installation)** ## Features @@ -85,10 +85,10 @@ One command installs DMS and all dependencies on Arch, Fedora, Debian, Ubuntu, o Wallpaper-based color schemes that automatically theme GTK, Qt, terminals, editors (vscode, vscodium), and more using [matugen](https://github.com/InioX/matugen) and dank16. **System Monitoring** -Real-time CPU, RAM, GPU metrics and temperatures built into the dms daemon (powered by [dgop](https://github.com/AvengeMedia/dgop)). Process list with search and management. +Real-time CPU, RAM, GPU metrics and temperatures built into the dms daemon (powered by [dgop](https://github.com/duxlabs-dev/dux-gop)). Process list with search and management. **Powerful Launcher** -Spotlight-style search for applications, files ([dsearch](https://github.com/AvengeMedia/danksearch)), emojis, running windows, calculator, and commands. Extensible with plugins. +Spotlight-style search for applications, files ([dsearch](https://github.com/duxlabs-dev/dux-search)), emojis, running windows, calculator, and commands. Extensible with plugins. **Control Center** Unified interface for network, Bluetooth, audio devices, display settings, and night mode. @@ -100,18 +100,18 @@ Notification center with grouping, rich text support, and keyboard navigation. MPRIS player controls, calendar sync, weather widgets, and clipboard history with image previews. **Session Management** -Lock screen, idle detection, auto-lock/suspend with separate AC/battery settings, and a settings front-end for [dank-greeter](https://github.com/AvengeMedia/dank-greeter). +Lock screen, idle detection, auto-lock/suspend with separate AC/battery settings, and a settings front-end for [dank-greeter](https://github.com/duxlabs-dev/dux-greeter). **Plugin System** -Extend functionality with the [plugin registry](https://plugins.danklinux.com). DMS keeps -`~/.config/DankMaterialShell/plugins.lock.json` synchronized with managed plugin installs and +Extend functionality with the [plugin registry](https://plugins.duxlabs.dev). DMS keeps +`~/.config/dms/plugins.lock.json` synchronized with managed plugin installs and their exact Git commits, so the same plugins can be reproduced on another machine. ## Supported Compositors Works best with [niri](https://github.com/YaLTeR/niri), [Hyprland](https://hyprland.org/), [Sway](https://swaywm.org/), [MangoWC](https://github.com/DreamMaoMao/mangowc), [labwc](https://labwc.github.io/), [Scroll](https://github.com/dawsers/scroll), and [Miracle WM](https://github.com/miracle-wm-org/miracle-wm) with full workspace switching, overview integration, and monitor management. Other Wayland compositors work with reduced features. -[Compositor configuration guide](https://danklinux.com/docs/dankmaterialshell/compositors) +[Compositor configuration guide](https://duxlabs.dev/docs/dms/compositors) ## Command Line Interface @@ -128,26 +128,26 @@ dms plugins lock # Refresh the portable plugin lockfile dms plugins restore ~/plugins.lock.json ``` -[Full CLI and IPC documentation](https://danklinux.com/docs/dankmaterialshell/keybinds-ipc) +[Full CLI and IPC documentation](https://duxlabs.dev/docs/dms/keybinds-ipc) ## Documentation -- **Website:** [danklinux.com](https://danklinux.com) -- **Docs:** [danklinux.com/docs](https://danklinux.com/docs/) -- **Theming:** [Application themes](https://danklinux.com/docs/dankmaterialshell/application-themes) | [Custom themes](https://danklinux.com/docs/dankmaterialshell/custom-themes) -- **Plugins:** [Development guide](https://danklinux.com/docs/dankmaterialshell/plugins-overview) +- **Website:** [duxlabs.dev](https://duxlabs.dev) +- **Docs:** [duxlabs.dev/docs](https://duxlabs.dev/docs/) +- **Theming:** [Application themes](https://duxlabs.dev/docs/dms/application-themes) | [Custom themes](https://duxlabs.dev/docs/dms/custom-themes) +- **Plugins:** [Development guide](https://duxlabs.dev/docs/dms/plugins-overview) - **Support:** [Ko-fi](https://ko-fi.com/danklinux) ## Dank Projects DMS is one piece of the suite. The rest lives in its own repos: -- [dank-greeter](https://github.com/AvengeMedia/dank-greeter) - greetd login screen with the Dank Material aesthetic. The Greeter tab in DMS settings is the front-end for it. -- [dankcalendar](https://github.com/AvengeMedia/dankcalendar) - Local, Google, Microsoft, and CalDAV calendars for the dank desktop. -- [dgop](https://github.com/AvengeMedia/dgop) - System monitoring TUI and Go library; its library powers the process list and dashboard widgets inside the dms daemon. -- [dsearch](https://github.com/AvengeMedia/danksearch) - Fast file search that powers file results in the launcher. -- [dank-qml-common](https://github.com/AvengeMedia/dank-qml-common) - Shared QML widgets and components used by DMS, dank-greeter, and dankcalendar. -- [dankgo](https://github.com/AvengeMedia/dankgo) - Common Go modules behind the single binary apps. +- [dank-greeter](https://github.com/duxlabs-dev/dux-greeter) - greetd login screen with the Dank Material aesthetic. The Greeter tab in DMS settings is the front-end for it. +- [dankcalendar](https://github.com/duxlabs-dev/dux-calendar) - Local, Google, Microsoft, and CalDAV calendars for the dank desktop. +- [dgop](https://github.com/duxlabs-dev/dux-gop) - System monitoring TUI and Go library; its library powers the process list and dashboard widgets inside the dms daemon. +- [dsearch](https://github.com/duxlabs-dev/dux-search) - Fast file search that powers file results in the launcher. +- [dank-qml-common](https://github.com/duxlabs-dev/dux-qml-common) - Shared QML widgets and components used by DMS, dank-greeter, and dankcalendar. +- [dankgo](https://github.com/duxlabs-dev/dux-go) - Common Go modules behind the single binary apps. ## Development @@ -177,7 +177,7 @@ quickshell -p quickshell/ ```nix { - inputs.dms.url = "github:AvengeMedia/DankMaterialShell"; + inputs.dms.url = "github:duxlabs-dev/dux-shell"; # Use in home-manager or NixOS configuration imports = [ inputs.dms.homeModules.dank-material-shell ]; @@ -193,7 +193,7 @@ Contributions welcome. Bug fixes, widgets, features, documentation, and plugins 3. Test thoroughly 4. Open a pull request -For documentation contributions, see [DankLinux-Docs](https://github.com/AvengeMedia/DankLinux-Docs). +For documentation contributions, see [DankLinux-Docs](https://github.com/duxlabs-dev/dux-docs). ## Credits @@ -206,7 +206,7 @@ For documentation contributions, see [DankLinux-Docs](https://github.com/AvengeM ## Star History -[![Star History Chart](https://star-history.dera.page/svg?repos=AvengeMedia/DankMaterialShell&type=date&legend=top-left)](https://star-history.dera.page/#AvengeMedia/DankMaterialShell&type=date&legend=top-left) +[![Star History Chart](https://star-history.dera.page/svg?repos=duxlabs-dev/dux-shell&type=date&legend=top-left)](https://star-history.dera.page/#duxlabs-dev/dux-shell&type=date&legend=top-left) ## License diff --git a/assets/com.danklinux.dms.desktop b/assets/dev.duxlabs.shell.desktop similarity index 81% rename from assets/com.danklinux.dms.desktop rename to assets/dev.duxlabs.shell.desktop index 0bec21d46..280c4ca50 100644 --- a/assets/com.danklinux.dms.desktop +++ b/assets/dev.duxlabs.shell.desktop @@ -1,10 +1,10 @@ [Desktop Entry] Type=Application -Name=DankMaterialShell +Name=Dux Shell GenericName=Desktop Shell Comment=Material 3 inspired shell for Wayland compositors Exec=dms run -Icon=com.danklinux.dms +Icon=dev.duxlabs.shell Terminal=false NoDisplay=true StartupNotify=false diff --git a/assets/com.danklinux.dms.notepad.desktop b/assets/dev.duxlabs.shell.notepad.desktop similarity index 92% rename from assets/com.danklinux.dms.notepad.desktop rename to assets/dev.duxlabs.shell.notepad.desktop index 827d101c8..4cf91004e 100644 --- a/assets/com.danklinux.dms.notepad.desktop +++ b/assets/dev.duxlabs.shell.notepad.desktop @@ -4,7 +4,7 @@ Name=DMS Notepad GenericName=Text Editor Comment=Quick notes and text files in the dank desktop shell Exec=dms ipc call notepad openFile %f -Icon=com.danklinux.dms +Icon=dev.duxlabs.shell Terminal=false NoDisplay=true Categories=Utility;TextEditor; diff --git a/assets/com.danklinux.dms.svg b/assets/dev.duxlabs.shell.svg similarity index 100% rename from assets/com.danklinux.dms.svg rename to assets/dev.duxlabs.shell.svg diff --git a/assets/dms-open.desktop b/assets/dms-open.desktop index a55a4b354..6d236812b 100644 --- a/assets/dms-open.desktop +++ b/assets/dms-open.desktop @@ -3,7 +3,7 @@ Type=Application Name=DMS Comment=Select an application to open links and files Exec=dms open %u -Icon=com.danklinux.dms +Icon=dev.duxlabs.shell Terminal=false NoDisplay=true MimeType=x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/dms;text/html;application/xhtml+xml; diff --git a/assets/systemd/dms.service b/assets/systemd/dms.service index 49dcffaf8..203bafd9c 100644 --- a/assets/systemd/dms.service +++ b/assets/systemd/dms.service @@ -1,5 +1,5 @@ [Unit] -Description=Dank Material Shell (DMS) +Description=Dux Shell (DMS) PartOf=graphical-session.target After=graphical-session.target Requisite=graphical-session.target diff --git a/core/.mockery.yml b/core/.mockery.yml index f009e3563..99bd2855f 100644 --- a/core/.mockery.yml +++ b/core/.mockery.yml @@ -6,13 +6,13 @@ template: testify template-data: unroll-variadic: true packages: - github.com/AvengeMedia/DankMaterialShell/core/internal/geolocation: + github.com/duxlabs-dev/dux-shell/core/internal/geolocation: config: dir: internal/mocks/geolocation pkgname: mocks_geolocation interfaces: Client: {} - github.com/AvengeMedia/DankMaterialShell/core/internal/server/cups: + github.com/duxlabs-dev/dux-shell/core/internal/server/cups: config: dir: internal/mocks/cups pkgname: mocks_cups @@ -22,46 +22,46 @@ packages: config: dir: internal/mocks/cups_pkhelper pkgname: mocks_cups_pkhelper - github.com/AvengeMedia/DankMaterialShell/core/internal/server/evdev: + github.com/duxlabs-dev/dux-shell/core/internal/server/evdev: config: dir: internal/mocks/evdev pkgname: mocks_evdev interfaces: EvdevDevice: {} - github.com/AvengeMedia/DankMaterialShell/core/internal/server/network: + github.com/duxlabs-dev/dux-shell/core/internal/server/network: config: dir: internal/mocks/network pkgname: mocks_network interfaces: Backend: {} - github.com/AvengeMedia/DankMaterialShell/core/internal/server/wlcontext: + github.com/duxlabs-dev/dux-shell/core/internal/server/wlcontext: config: dir: internal/mocks/wlcontext pkgname: mocks_wlcontext interfaces: WaylandContext: {} - github.com/AvengeMedia/DankMaterialShell/core/internal/utils: + github.com/duxlabs-dev/dux-shell/core/internal/utils: config: dir: internal/mocks/utils pkgname: mocks_utils interfaces: AppChecker: {} - github.com/AvengeMedia/DankMaterialShell/core/internal/version: + github.com/duxlabs-dev/dux-shell/core/internal/version: config: dir: internal/mocks/version pkgname: mocks_version interfaces: VersionFetcher: {} - github.com/AvengeMedia/dankgo/wayland/client: + github.com/duxlabs-dev/dux-go/wayland/client: config: dir: internal/mocks/wlclient pkgname: mocks_wlclient interfaces: WaylandDisplay: {} - github.com/AvengeMedia/DankMaterialShell/core/internal/plugins: + github.com/duxlabs-dev/dux-shell/core/internal/plugins: interfaces: GitClient: {} - github.com/AvengeMedia/DankMaterialShell/core/internal/server/brightness: + github.com/duxlabs-dev/dux-shell/core/internal/server/brightness: config: dir: internal/mocks/brightness pkgname: mocks_brightness diff --git a/core/README.md b/core/README.md index c80bbcd50..66779bc6d 100644 --- a/core/README.md +++ b/core/README.md @@ -1,6 +1,6 @@ # DMS Backend & CLI -Go-based backend for DankMaterialShell providing system integration, IPC, and installation tools. +Go-based backend for Dux Shell providing system integration, IPC, and installation tools. **See [root README](../README.md) for project overview and installation.** @@ -78,7 +78,7 @@ Custom IPC via unix socket (JSON API) for shell communication. - `dms brightness [list|set]` - Control display/monitor brightness - `dms color pick` - Native color picker (see below) - `dms update` - Update DMS and dependencies (disabled in distro packages) -- `dms greeter` - Deprecated; forwards to the standalone [dms-greeter](https://github.com/AvengeMedia/dank-greeter) binary +- `dms greeter` - Deprecated; forwards to the standalone [dms-greeter](https://github.com/duxlabs-dev/dux-greeter) binary ### Color Picker @@ -132,10 +132,10 @@ This runs gofmt, golangci-lint, tests, and builds before each commit when `core/ **Regenerating Wayland Protocol Bindings:** -Protocol XML files live in `internal/proto/xml/`. Bindings are generated with the [dankgo](https://github.com/AvengeMedia/dankgo) `go-wayland-scanner`: +Protocol XML files live in `internal/proto/xml/`. Bindings are generated with the [dankgo](https://github.com/duxlabs-dev/dux-go) `go-wayland-scanner`: ```bash -go run github.com/AvengeMedia/dankgo/cmd/go-wayland-scanner@latest \ +go run github.com/duxlabs-dev/dux-go/cmd/go-wayland-scanner@latest \ -i internal/proto/xml/wlr-gamma-control-unstable-v1.xml \ -pkg wlr_gamma_control -o internal/proto/wlr_gamma_control/gamma_control.go ``` @@ -152,7 +152,7 @@ go run github.com/AvengeMedia/dankgo/cmd/go-wayland-scanner@latest \ **Interactive (TUI):** ```bash -curl -fsSL https://install.danklinux.com | sh +curl -fsSL https://install.duxlabs.dev | sh ``` **Headless (unattended):** @@ -160,9 +160,9 @@ curl -fsSL https://install.danklinux.com | sh Headless mode requires cached credentials or a passwordless rule for your privilege escalation tool (sudo, doas, or run0). With sudo, run `sudo -v` first: ```bash -sudo -v && curl -fsSL https://install.danklinux.com | sh -s -- -c niri -t ghostty -y -sudo -v && curl -fsSL https://install.danklinux.com | sh -s -- -c hyprland -t kitty --dms-greeter -y -sudo -v && curl -fsSL https://install.danklinux.com | sh -s -- -c niri -t ghostty --git-deps niri,quickshell --all-features -y +sudo -v && curl -fsSL https://install.duxlabs.dev | sh -s -- -c niri -t ghostty -y +sudo -v && curl -fsSL https://install.duxlabs.dev | sh -s -- -c hyprland -t kitty --dms-greeter -y +sudo -v && curl -fsSL https://install.duxlabs.dev | sh -s -- -c niri -t ghostty --git-deps niri,quickshell --all-features -y ``` | Flag | Short | Description | @@ -225,6 +225,6 @@ Most packages available in standard repos. Minimal building required. Uses Portage with GURU overlay. Automatically configures USE flags. Variable success depending on system configuration. **Void Linux** -Uses XBPS with the DMS and DankLinux self-hosted repositories. +Uses XBPS with the DMS and Dux Linux self-hosted repositories. See installer output for distribution-specific details during installation. diff --git a/core/cmd/dankinstall/main.go b/core/cmd/dankinstall/main.go index e8fed369a..73db7970a 100644 --- a/core/cmd/dankinstall/main.go +++ b/core/cmd/dankinstall/main.go @@ -5,10 +5,10 @@ import ( "os" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/headless" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" - "github.com/AvengeMedia/DankMaterialShell/core/internal/tui" tea "github.com/charmbracelet/bubbletea" + "github.com/duxlabs-dev/dux-shell/core/internal/headless" + "github.com/duxlabs-dev/dux-shell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/tui" "github.com/spf13/cobra" ) @@ -33,8 +33,8 @@ var ( var rootCmd = &cobra.Command{ Use: "dankinstall", - Short: "Install DankMaterialShell and its dependencies", - Long: `dankinstall sets up DankMaterialShell with your chosen compositor and terminal. + Short: "Install Dux Shell and its dependencies", + Long: `dankinstall sets up Dux Shell with your chosen compositor and terminal. Without flags, it launches an interactive TUI. Providing either --compositor or --term activates headless (unattended) mode, which requires both flags. diff --git a/core/cmd/dms/commands_auth.go b/core/cmd/dms/commands_auth.go index 8214869f8..deb2ffc39 100644 --- a/core/cmd/dms/commands_auth.go +++ b/core/cmd/dms/commands_auth.go @@ -8,8 +8,8 @@ import ( "path/filepath" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" - sharedpam "github.com/AvengeMedia/DankMaterialShell/core/internal/pam" + "github.com/duxlabs-dev/dux-shell/core/internal/log" + sharedpam "github.com/duxlabs-dev/dux-shell/core/internal/pam" "github.com/spf13/cobra" ) diff --git a/core/cmd/dms/commands_backup.go b/core/cmd/dms/commands_backup.go index cbe5a214b..90c4b30ee 100644 --- a/core/cmd/dms/commands_backup.go +++ b/core/cmd/dms/commands_backup.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "github.com/AvengeMedia/DankMaterialShell/core/internal/backup" + "github.com/duxlabs-dev/dux-shell/core/internal/backup" "github.com/spf13/cobra" ) @@ -17,7 +17,7 @@ var backupCmd = &cobra.Command{ var backupCreateCmd = &cobra.Command{ Use: "create", - Short: "Create a tar.gz backup of ~/.config/DankMaterialShell (settings, plugins, themes)", + Short: "Create a tar.gz backup of ~/.config/dms (settings, plugins, themes)", Args: cobra.NoArgs, Run: runBackupCreate, } diff --git a/core/cmd/dms/commands_blur.go b/core/cmd/dms/commands_blur.go index d01eb932d..82f0497d8 100644 --- a/core/cmd/dms/commands_blur.go +++ b/core/cmd/dms/commands_blur.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "github.com/AvengeMedia/DankMaterialShell/core/internal/blur" + "github.com/duxlabs-dev/dux-shell/core/internal/blur" "github.com/spf13/cobra" ) diff --git a/core/cmd/dms/commands_brightness.go b/core/cmd/dms/commands_brightness.go index 0f7349376..5f8ef2899 100644 --- a/core/cmd/dms/commands_brightness.go +++ b/core/cmd/dms/commands_brightness.go @@ -5,8 +5,8 @@ import ( "strings" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/brightness" + "github.com/duxlabs-dev/dux-shell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/server/brightness" "github.com/spf13/cobra" ) diff --git a/core/cmd/dms/commands_chroma.go b/core/cmd/dms/commands_chroma.go index 63b9e1f36..1cf4abd3c 100644 --- a/core/cmd/dms/commands_chroma.go +++ b/core/cmd/dms/commands_chroma.go @@ -8,11 +8,11 @@ import ( "strings" "sync" - "github.com/AvengeMedia/DankMaterialShell/core/internal/highlight" - "github.com/AvengeMedia/DankMaterialShell/core/internal/highlight/lexers" - "github.com/AvengeMedia/DankMaterialShell/core/internal/highlight/styles" "github.com/alecthomas/chroma/v2" "github.com/alecthomas/chroma/v2/formatters/html" + "github.com/duxlabs-dev/dux-shell/core/internal/highlight" + "github.com/duxlabs-dev/dux-shell/core/internal/highlight/lexers" + "github.com/duxlabs-dev/dux-shell/core/internal/highlight/styles" "github.com/spf13/cobra" "github.com/yuin/goldmark" "github.com/yuin/goldmark/extension" diff --git a/core/cmd/dms/commands_clipboard.go b/core/cmd/dms/commands_clipboard.go index 748268bab..7e79d9cd9 100644 --- a/core/cmd/dms/commands_clipboard.go +++ b/core/cmd/dms/commands_clipboard.go @@ -28,10 +28,10 @@ import ( _ "golang.org/x/image/tiff" _ "golang.org/x/image/webp" - "github.com/AvengeMedia/DankMaterialShell/core/internal/clipboard" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" - "github.com/AvengeMedia/dankgo/ipc" - "github.com/AvengeMedia/dankgo/wlclipboard" + "github.com/duxlabs-dev/dux-go/ipc" + "github.com/duxlabs-dev/dux-go/wlclipboard" + "github.com/duxlabs-dev/dux-shell/core/internal/clipboard" + "github.com/duxlabs-dev/dux-shell/core/internal/log" "github.com/spf13/cobra" ) diff --git a/core/cmd/dms/commands_colorpicker.go b/core/cmd/dms/commands_colorpicker.go index 0bb39465e..73538d491 100644 --- a/core/cmd/dms/commands_colorpicker.go +++ b/core/cmd/dms/commands_colorpicker.go @@ -5,9 +5,9 @@ import ( "os" "runtime/debug" - "github.com/AvengeMedia/DankMaterialShell/core/internal/clipboard" - "github.com/AvengeMedia/DankMaterialShell/core/internal/colorpicker" - "github.com/AvengeMedia/DankMaterialShell/core/internal/site" + "github.com/duxlabs-dev/dux-shell/core/internal/clipboard" + "github.com/duxlabs-dev/dux-shell/core/internal/colorpicker" + "github.com/duxlabs-dev/dux-shell/core/internal/site" "github.com/spf13/cobra" ) @@ -27,7 +27,7 @@ var colorCmd = &cobra.Command{ This is the screen eyedropper CLI. To open the in-shell color modal, use: dms ipc call color-picker toggle -See: ` + site.Docs + "/dankmaterialshell/keybinds-ipc", +See: ` + site.Docs + "/dms/keybinds-ipc", } var colorPickCmd = &cobra.Command{ diff --git a/core/cmd/dms/commands_common.go b/core/cmd/dms/commands_common.go index ec30fca5a..f6bb90447 100644 --- a/core/cmd/dms/commands_common.go +++ b/core/cmd/dms/commands_common.go @@ -6,12 +6,12 @@ import ( "regexp" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" - "github.com/AvengeMedia/DankMaterialShell/core/internal/plugins" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/sysupdate" - "github.com/AvengeMedia/DankMaterialShell/core/internal/shellembed" - "github.com/AvengeMedia/DankMaterialShell/core/internal/site" + "github.com/duxlabs-dev/dux-shell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/plugins" + "github.com/duxlabs-dev/dux-shell/core/internal/server" + "github.com/duxlabs-dev/dux-shell/core/internal/server/sysupdate" + "github.com/duxlabs-dev/dux-shell/core/internal/shellembed" + "github.com/duxlabs-dev/dux-shell/core/internal/site" "github.com/spf13/cobra" ) @@ -29,7 +29,7 @@ var ipcCmd = &cobra.Command{ dms ipc call [args...] invoke a command dms ipc list list all targets and functions -Full reference: ` + site.Docs + "/dankmaterialshell/keybinds-ipc", +Full reference: ` + site.Docs + "/dms/keybinds-ipc", ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) { return getShellIPCCompletions(args, toComplete), cobra.ShellCompDirectiveNoFileComp }, diff --git a/core/cmd/dms/commands_config.go b/core/cmd/dms/commands_config.go index 6e8523974..37568a40e 100644 --- a/core/cmd/dms/commands_config.go +++ b/core/cmd/dms/commands_config.go @@ -7,10 +7,10 @@ import ( "path/filepath" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" - "github.com/AvengeMedia/DankMaterialShell/core/internal/luaconfig" - "github.com/AvengeMedia/DankMaterialShell/core/internal/mangoconf" - "github.com/AvengeMedia/DankMaterialShell/core/internal/utils" + "github.com/duxlabs-dev/dux-shell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/luaconfig" + "github.com/duxlabs-dev/dux-shell/core/internal/mangoconf" + "github.com/duxlabs-dev/dux-shell/core/internal/utils" "github.com/spf13/cobra" ) diff --git a/core/cmd/dms/commands_dank16.go b/core/cmd/dms/commands_dank16.go index 2e21a0b70..d027efdb4 100644 --- a/core/cmd/dms/commands_dank16.go +++ b/core/cmd/dms/commands_dank16.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/dank16" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/dank16" + "github.com/duxlabs-dev/dux-shell/core/internal/log" "github.com/spf13/cobra" ) diff --git a/core/cmd/dms/commands_dmenu.go b/core/cmd/dms/commands_dmenu.go index 80840074e..7b8141952 100644 --- a/core/cmd/dms/commands_dmenu.go +++ b/core/cmd/dms/commands_dmenu.go @@ -10,9 +10,9 @@ import ( "strings" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/dmenuipc" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" - "github.com/AvengeMedia/DankMaterialShell/core/internal/qsipc" + "github.com/duxlabs-dev/dux-shell/core/internal/dmenuipc" + "github.com/duxlabs-dev/dux-shell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/qsipc" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/core/cmd/dms/commands_dmenu_test.go b/core/cmd/dms/commands_dmenu_test.go index a99846980..659509fda 100644 --- a/core/cmd/dms/commands_dmenu_test.go +++ b/core/cmd/dms/commands_dmenu_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/AvengeMedia/DankMaterialShell/core/internal/dmenuipc" + "github.com/duxlabs-dev/dux-shell/core/internal/dmenuipc" ) func TestParseIndexSpec(t *testing.T) { diff --git a/core/cmd/dms/commands_doctor.go b/core/cmd/dms/commands_doctor.go index 1d057044f..1d207d7cc 100644 --- a/core/cmd/dms/commands_doctor.go +++ b/core/cmd/dms/commands_doctor.go @@ -14,19 +14,19 @@ import ( "slices" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/blur" - "github.com/AvengeMedia/DankMaterialShell/core/internal/clipboard" - "github.com/AvengeMedia/DankMaterialShell/core/internal/config" - "github.com/AvengeMedia/DankMaterialShell/core/internal/distros" - "github.com/AvengeMedia/DankMaterialShell/core/internal/mangoconf" - "github.com/AvengeMedia/DankMaterialShell/core/internal/matugen" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/brightness" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/network" - "github.com/AvengeMedia/DankMaterialShell/core/internal/site" - "github.com/AvengeMedia/DankMaterialShell/core/internal/tui" - "github.com/AvengeMedia/DankMaterialShell/core/internal/utils" - "github.com/AvengeMedia/DankMaterialShell/core/internal/version" "github.com/charmbracelet/lipgloss" + "github.com/duxlabs-dev/dux-shell/core/internal/blur" + "github.com/duxlabs-dev/dux-shell/core/internal/clipboard" + "github.com/duxlabs-dev/dux-shell/core/internal/config" + "github.com/duxlabs-dev/dux-shell/core/internal/distros" + "github.com/duxlabs-dev/dux-shell/core/internal/mangoconf" + "github.com/duxlabs-dev/dux-shell/core/internal/matugen" + "github.com/duxlabs-dev/dux-shell/core/internal/server/brightness" + "github.com/duxlabs-dev/dux-shell/core/internal/server/network" + "github.com/duxlabs-dev/dux-shell/core/internal/site" + "github.com/duxlabs-dev/dux-shell/core/internal/tui" + "github.com/duxlabs-dev/dux-shell/core/internal/utils" + "github.com/duxlabs-dev/dux-shell/core/internal/version" "github.com/godbus/dbus/v5" "github.com/spf13/cobra" ) @@ -166,7 +166,7 @@ func (c category) String() string { const ( checkNameMaxLength = 21 - doctorDocsURL = site.Docs + "/dankmaterialshell/cli-doctor" + doctorDocsURL = site.Docs + "/dms/cli-doctor" ) type checkResult struct { @@ -1407,7 +1407,7 @@ func checkAdwGtk3() checkResult { func checkConfigurationFiles() []checkResult { configDir, _ := os.UserConfigDir() cacheDir, _ := os.UserCacheDir() - dmsDir := "DankMaterialShell" + dmsDir := "dms" configFiles := []struct{ name, path string }{ {"settings.json", filepath.Join(configDir, dmsDir, "settings.json")}, @@ -1826,7 +1826,7 @@ func checkFonts() []checkResult { displayFontFamily := defaultDoctorDisplayFamily if configDir, err := os.UserConfigDir(); err == nil { - settingsPath := filepath.Join(configDir, "DankMaterialShell", "settings.json") + settingsPath := filepath.Join(configDir, "dms", "settings.json") if data, err := os.ReadFile(settingsPath); err == nil { var settings struct { FontFamily string `json:"fontFamily"` diff --git a/core/cmd/dms/commands_doctor_test.go b/core/cmd/dms/commands_doctor_test.go index 4c903e235..e419165e5 100644 --- a/core/cmd/dms/commands_doctor_test.go +++ b/core/cmd/dms/commands_doctor_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "github.com/AvengeMedia/DankMaterialShell/core/internal/mangoconf" + "github.com/duxlabs-dev/dux-shell/core/internal/mangoconf" ) func TestQuickshellVersionFailureDetails(t *testing.T) { diff --git a/core/cmd/dms/commands_download.go b/core/cmd/dms/commands_download.go index b5b4121cb..8b05a2a7d 100644 --- a/core/cmd/dms/commands_download.go +++ b/core/cmd/dms/commands_download.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/netfetch" + "github.com/duxlabs-dev/dux-shell/core/internal/netfetch" "github.com/spf13/cobra" ) diff --git a/core/cmd/dms/commands_dpms.go b/core/cmd/dms/commands_dpms.go index 77eff1ab5..9c3c3a33f 100644 --- a/core/cmd/dms/commands_dpms.go +++ b/core/cmd/dms/commands_dpms.go @@ -3,7 +3,7 @@ package main import ( "fmt" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/log" "github.com/spf13/cobra" ) diff --git a/core/cmd/dms/commands_features.go b/core/cmd/dms/commands_features.go index d4a45d237..01d0eff8d 100644 --- a/core/cmd/dms/commands_features.go +++ b/core/cmd/dms/commands_features.go @@ -13,21 +13,21 @@ import ( "strings" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/distros" - "github.com/AvengeMedia/DankMaterialShell/core/internal/errdefs" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" - "github.com/AvengeMedia/DankMaterialShell/core/internal/netfetch" - "github.com/AvengeMedia/DankMaterialShell/core/internal/privesc" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/sysupdate" - "github.com/AvengeMedia/DankMaterialShell/core/internal/utils" - "github.com/AvengeMedia/DankMaterialShell/core/internal/version" + "github.com/duxlabs-dev/dux-shell/core/internal/distros" + "github.com/duxlabs-dev/dux-shell/core/internal/errdefs" + "github.com/duxlabs-dev/dux-shell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/netfetch" + "github.com/duxlabs-dev/dux-shell/core/internal/privesc" + "github.com/duxlabs-dev/dux-shell/core/internal/server/sysupdate" + "github.com/duxlabs-dev/dux-shell/core/internal/utils" + "github.com/duxlabs-dev/dux-shell/core/internal/version" "github.com/spf13/cobra" ) var updateCmd = &cobra.Command{ Use: "update", - Short: "Update DankMaterialShell to the latest version", - Long: "Update DankMaterialShell to the latest version using the appropriate package manager for your distribution", + Short: "Update Dux Shell to the latest version", + Long: "Update Dux Shell to the latest version using the appropriate package manager for your distribution", PreRunE: shellApp.ResolveConfig, Run: func(cmd *cobra.Command, args []string) { runUpdate() @@ -36,7 +36,7 @@ var updateCmd = &cobra.Command{ var updateCheckCmd = &cobra.Command{ Use: "check", - Short: "Check if updates are available for DankMaterialShell", + Short: "Check if updates are available for Dux Shell", Long: "Check for available updates without performing the actual update", Run: func(cmd *cobra.Command, args []string) { runUpdateCheck() @@ -44,7 +44,7 @@ var updateCheckCmd = &cobra.Command{ } func runUpdateCheck() { - fmt.Println("Checking for DankMaterialShell updates...") + fmt.Println("Checking for Dux Shell updates...") fmt.Println() shell := sysupdate.ProbeShell(context.Background(), Version) @@ -169,7 +169,7 @@ func updateArchLinux() error { return updateOtherDistros() } - fmt.Printf("This will update DankMaterialShell using %s.\n", helper) + fmt.Printf("This will update Dux Shell using %s.\n", helper) if !confirmUpdate() { return errdefs.ErrUpdateCancelled } @@ -224,7 +224,7 @@ func updateOtherDistros() error { fmt.Println("\nThis will update:") fmt.Println(" 1. The dms binary from GitHub releases") - fmt.Println(" 2. DankMaterialShell configuration using git") + fmt.Println(" 2. Dux Shell configuration using git") if !confirmUpdate() { return errdefs.ErrUpdateCancelled } @@ -385,7 +385,7 @@ func offerReclone(dmsPath string) bool { } fmt.Println("Cloning fresh copy...") - cloneCmd := exec.Command("git", "clone", "--recurse-submodules", "https://github.com/AvengeMedia/DankMaterialShell.git", dmsPath) + cloneCmd := exec.Command("git", "clone", "--recurse-submodules", "https://github.com/duxlabs-dev/dux-shell.git", dmsPath) cloneCmd.Stdout = os.Stdout cloneCmd.Stderr = os.Stderr if err := cloneCmd.Run(); err != nil { @@ -449,8 +449,8 @@ func updateDMSBinary() error { } defer os.RemoveAll(tempDir) - binaryURL := fmt.Sprintf("https://github.com/AvengeMedia/DankMaterialShell/releases/download/%s/dms-cli-%s.gz", version, arch) - checksumURL := fmt.Sprintf("https://github.com/AvengeMedia/DankMaterialShell/releases/download/%s/dms-cli-%s.gz.sha256", version, arch) + binaryURL := fmt.Sprintf("https://github.com/duxlabs-dev/dux-shell/releases/download/%s/dms-cli-%s.gz", version, arch) + checksumURL := fmt.Sprintf("https://github.com/duxlabs-dev/dux-shell/releases/download/%s/dms-cli-%s.gz.sha256", version, arch) binaryPath := filepath.Join(tempDir, "dms.gz") checksumPath := filepath.Join(tempDir, "dms.gz.sha256") diff --git a/core/cmd/dms/commands_greeter.go b/core/cmd/dms/commands_greeter.go index afd41ef2b..eea225f69 100644 --- a/core/cmd/dms/commands_greeter.go +++ b/core/cmd/dms/commands_greeter.go @@ -6,8 +6,8 @@ import ( "os/exec" "syscall" - "github.com/AvengeMedia/DankMaterialShell/core/internal/distros" - "github.com/AvengeMedia/DankMaterialShell/core/internal/site" + "github.com/duxlabs-dev/dux-shell/core/internal/distros" + "github.com/duxlabs-dev/dux-shell/core/internal/site" "github.com/spf13/cobra" ) @@ -59,9 +59,9 @@ func greeterPackageInstallHint() string { switch config.Family { case distros.FamilyDebian: - return "Install with 'sudo apt install dms-greeter' (requires DankLinux OBS repo — see " + site.Docs + "/dankgreeter/installation#debian)" + return "Install with 'sudo apt install dms-greeter' (requires Dux Linux OBS repo — see " + site.Docs + "/dms-greeter/installation#debian)" case distros.FamilySUSE: - return "Install with 'sudo zypper install dms-greeter' (requires DankLinux OBS repo — see " + site.Docs + "/dankgreeter/installation#opensuse)" + return "Install with 'sudo zypper install dms-greeter' (requires Dux Linux OBS repo — see " + site.Docs + "/dms-greeter/installation#opensuse)" case distros.FamilyUbuntu: return "Install with 'sudo apt install dms-greeter' (requires ppa:avengemedia/danklinux: sudo add-apt-repository ppa:avengemedia/danklinux)" case distros.FamilyFedora: diff --git a/core/cmd/dms/commands_icc.go b/core/cmd/dms/commands_icc.go index de14e190d..ea4e7255b 100644 --- a/core/cmd/dms/commands_icc.go +++ b/core/cmd/dms/commands_icc.go @@ -8,10 +8,10 @@ import ( "strconv" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/icc" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/wayland" - "github.com/AvengeMedia/dankgo/ipc" + "github.com/duxlabs-dev/dux-go/ipc" + "github.com/duxlabs-dev/dux-shell/core/internal/icc" + "github.com/duxlabs-dev/dux-shell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/server/wayland" "github.com/spf13/cobra" ) diff --git a/core/cmd/dms/commands_keybinds.go b/core/cmd/dms/commands_keybinds.go index 268c468fe..f11760e96 100644 --- a/core/cmd/dms/commands_keybinds.go +++ b/core/cmd/dms/commands_keybinds.go @@ -10,10 +10,10 @@ import ( "slices" "strconv" - "github.com/AvengeMedia/DankMaterialShell/core/internal/keybinds" - "github.com/AvengeMedia/DankMaterialShell/core/internal/keybinds/providers" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" - "github.com/AvengeMedia/DankMaterialShell/core/internal/wayland/keymap" + "github.com/duxlabs-dev/dux-shell/core/internal/keybinds" + "github.com/duxlabs-dev/dux-shell/core/internal/keybinds/providers" + "github.com/duxlabs-dev/dux-shell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/wayland/keymap" "github.com/spf13/cobra" ) diff --git a/core/cmd/dms/commands_keybinds_test.go b/core/cmd/dms/commands_keybinds_test.go index a36356764..f0ba75628 100644 --- a/core/cmd/dms/commands_keybinds_test.go +++ b/core/cmd/dms/commands_keybinds_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/AvengeMedia/DankMaterialShell/core/internal/keybinds/providers" + "github.com/duxlabs-dev/dux-shell/core/internal/keybinds/providers" ) func TestKeybindEditFailure(t *testing.T) { diff --git a/core/cmd/dms/commands_matugen.go b/core/cmd/dms/commands_matugen.go index 2148973cb..6997a1381 100644 --- a/core/cmd/dms/commands_matugen.go +++ b/core/cmd/dms/commands_matugen.go @@ -8,9 +8,9 @@ import ( "os" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" - "github.com/AvengeMedia/DankMaterialShell/core/internal/matugen" - "github.com/AvengeMedia/dankgo/ipc" + "github.com/duxlabs-dev/dux-go/ipc" + "github.com/duxlabs-dev/dux-shell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/matugen" "github.com/spf13/cobra" ) diff --git a/core/cmd/dms/commands_notify.go b/core/cmd/dms/commands_notify.go index 99cc4b154..f6ca13f0e 100644 --- a/core/cmd/dms/commands_notify.go +++ b/core/cmd/dms/commands_notify.go @@ -7,8 +7,8 @@ import ( "strings" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/notify" - "github.com/AvengeMedia/dankgo/ipc" + "github.com/duxlabs-dev/dux-go/ipc" + "github.com/duxlabs-dev/dux-shell/core/internal/notify" "github.com/godbus/dbus/v5" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/core/cmd/dms/commands_open.go b/core/cmd/dms/commands_open.go index 0b2db0a48..74eb61e38 100644 --- a/core/cmd/dms/commands_open.go +++ b/core/cmd/dms/commands_open.go @@ -8,8 +8,8 @@ import ( "path/filepath" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" - "github.com/AvengeMedia/dankgo/ipc" + "github.com/duxlabs-dev/dux-go/ipc" + "github.com/duxlabs-dev/dux-shell/core/internal/log" "github.com/spf13/cobra" ) diff --git a/core/cmd/dms/commands_qr.go b/core/cmd/dms/commands_qr.go index 4cd491490..fc150a2f3 100644 --- a/core/cmd/dms/commands_qr.go +++ b/core/cmd/dms/commands_qr.go @@ -6,9 +6,9 @@ import ( "os" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/clipboard" - "github.com/AvengeMedia/DankMaterialShell/core/internal/qrcode" - "github.com/AvengeMedia/dankgo/ipc" + "github.com/duxlabs-dev/dux-go/ipc" + "github.com/duxlabs-dev/dux-shell/core/internal/clipboard" + "github.com/duxlabs-dev/dux-shell/core/internal/qrcode" "github.com/mattn/go-isatty" "github.com/spf13/cobra" ) diff --git a/core/cmd/dms/commands_randr.go b/core/cmd/dms/commands_randr.go index fa0c99023..44893d6cb 100644 --- a/core/cmd/dms/commands_randr.go +++ b/core/cmd/dms/commands_randr.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/log" "github.com/spf13/cobra" ) diff --git a/core/cmd/dms/commands_registry.go b/core/cmd/dms/commands_registry.go index 4be2796ac..49f335d1d 100644 --- a/core/cmd/dms/commands_registry.go +++ b/core/cmd/dms/commands_registry.go @@ -3,8 +3,8 @@ package main import ( "fmt" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" - "github.com/AvengeMedia/DankMaterialShell/core/internal/registries" + "github.com/duxlabs-dev/dux-shell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/registries" "github.com/spf13/afero" "github.com/spf13/cobra" ) diff --git a/core/cmd/dms/commands_root.go b/core/cmd/dms/commands_root.go index 9d6bb757b..a32be0628 100644 --- a/core/cmd/dms/commands_root.go +++ b/core/cmd/dms/commands_root.go @@ -7,7 +7,7 @@ import ( var rootCmd = &cobra.Command{ Use: "dms", Short: "dms CLI", - Long: "dms is the DankMaterialShell management CLI and backend server.", + Long: "dms is the Dux Shell management CLI and backend server.", } func init() { diff --git a/core/cmd/dms/commands_screenshot.go b/core/cmd/dms/commands_screenshot.go index b950a9b8c..71d7ee9b0 100644 --- a/core/cmd/dms/commands_screenshot.go +++ b/core/cmd/dms/commands_screenshot.go @@ -11,10 +11,10 @@ import ( "runtime/debug" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/clipboard" - "github.com/AvengeMedia/DankMaterialShell/core/internal/notify" - "github.com/AvengeMedia/DankMaterialShell/core/internal/qsipc" - "github.com/AvengeMedia/DankMaterialShell/core/internal/screenshot" + "github.com/duxlabs-dev/dux-shell/core/internal/clipboard" + "github.com/duxlabs-dev/dux-shell/core/internal/notify" + "github.com/duxlabs-dev/dux-shell/core/internal/qsipc" + "github.com/duxlabs-dev/dux-shell/core/internal/screenshot" "github.com/spf13/cobra" ) diff --git a/core/cmd/dms/commands_screenshot_test.go b/core/cmd/dms/commands_screenshot_test.go index f84706f2a..0760d5245 100644 --- a/core/cmd/dms/commands_screenshot_test.go +++ b/core/cmd/dms/commands_screenshot_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/AvengeMedia/DankMaterialShell/core/internal/screenshot" + "github.com/duxlabs-dev/dux-shell/core/internal/screenshot" ) func thumbnailTestBuffer(t testing.TB, width, height int) *screenshot.ShmBuffer { diff --git a/core/cmd/dms/commands_session.go b/core/cmd/dms/commands_session.go index 396ffa976..c9cfd5f80 100644 --- a/core/cmd/dms/commands_session.go +++ b/core/cmd/dms/commands_session.go @@ -8,7 +8,7 @@ import ( "sort" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/log" "github.com/spf13/cobra" ) diff --git a/core/cmd/dms/commands_setup.go b/core/cmd/dms/commands_setup.go index 87d98e9c9..226dc2e97 100644 --- a/core/cmd/dms/commands_setup.go +++ b/core/cmd/dms/commands_setup.go @@ -8,13 +8,13 @@ import ( "path/filepath" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/config" - "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" - "github.com/AvengeMedia/DankMaterialShell/core/internal/distros" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" - "github.com/AvengeMedia/DankMaterialShell/core/internal/mangoconf" - "github.com/AvengeMedia/DankMaterialShell/core/internal/privesc" - "github.com/AvengeMedia/DankMaterialShell/core/internal/utils" + "github.com/duxlabs-dev/dux-shell/core/internal/config" + "github.com/duxlabs-dev/dux-shell/core/internal/deps" + "github.com/duxlabs-dev/dux-shell/core/internal/distros" + "github.com/duxlabs-dev/dux-shell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/mangoconf" + "github.com/duxlabs-dev/dux-shell/core/internal/privesc" + "github.com/duxlabs-dev/dux-shell/core/internal/utils" "github.com/spf13/cobra" ) diff --git a/core/cmd/dms/commands_setup_headless.go b/core/cmd/dms/commands_setup_headless.go index 71a66f2af..96a4946d4 100644 --- a/core/cmd/dms/commands_setup_headless.go +++ b/core/cmd/dms/commands_setup_headless.go @@ -3,8 +3,8 @@ package main import ( "fmt" - "github.com/AvengeMedia/DankMaterialShell/core/internal/config" - "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" + "github.com/duxlabs-dev/dux-shell/core/internal/config" + "github.com/duxlabs-dev/dux-shell/core/internal/deps" "github.com/spf13/cobra" ) diff --git a/core/cmd/dms/commands_switch.go b/core/cmd/dms/commands_switch.go index 13f75fce6..b00d0aae8 100644 --- a/core/cmd/dms/commands_switch.go +++ b/core/cmd/dms/commands_switch.go @@ -11,14 +11,14 @@ import ( "syscall" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/backup" - "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" - "github.com/AvengeMedia/DankMaterialShell/core/internal/distros" - "github.com/AvengeMedia/DankMaterialShell/core/internal/privesc" + "github.com/duxlabs-dev/dux-shell/core/internal/backup" + "github.com/duxlabs-dev/dux-shell/core/internal/deps" + "github.com/duxlabs-dev/dux-shell/core/internal/distros" + "github.com/duxlabs-dev/dux-shell/core/internal/privesc" "github.com/spf13/cobra" ) -const switchDMSDep = "dms (DankMaterialShell)" +const switchDMSDep = "dms (Dux Shell)" // The greeter runs the shell's QML, so it moves with dms or the login screen can break. var switchFamily = []string{switchDMSDep, "quickshell", "dms-greeter"} diff --git a/core/cmd/dms/commands_system.go b/core/cmd/dms/commands_system.go index 06ea96282..5f42887d1 100644 --- a/core/cmd/dms/commands_system.go +++ b/core/cmd/dms/commands_system.go @@ -10,11 +10,11 @@ import ( "strings" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" - "github.com/AvengeMedia/DankMaterialShell/core/internal/lowprio" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/sysupdate" - "github.com/AvengeMedia/dankgo/ipc" "github.com/charmbracelet/lipgloss" + "github.com/duxlabs-dev/dux-go/ipc" + "github.com/duxlabs-dev/dux-shell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/lowprio" + "github.com/duxlabs-dev/dux-shell/core/internal/server/sysupdate" "github.com/spf13/cobra" ) diff --git a/core/cmd/dms/commands_systemd.go b/core/cmd/dms/commands_systemd.go index c6cbd5ab6..fb6722f6b 100644 --- a/core/cmd/dms/commands_systemd.go +++ b/core/cmd/dms/commands_systemd.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/config" - "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" + "github.com/duxlabs-dev/dux-shell/core/internal/config" + "github.com/duxlabs-dev/dux-shell/core/internal/deps" "github.com/spf13/cobra" ) diff --git a/core/cmd/dms/commands_trash.go b/core/cmd/dms/commands_trash.go index e99cfdbfc..c81e274f6 100644 --- a/core/cmd/dms/commands_trash.go +++ b/core/cmd/dms/commands_trash.go @@ -5,8 +5,8 @@ import ( "fmt" "os" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" - "github.com/AvengeMedia/dankgo/trash" + "github.com/duxlabs-dev/dux-go/trash" + "github.com/duxlabs-dev/dux-shell/core/internal/log" "github.com/spf13/cobra" ) diff --git a/core/cmd/dms/commands_windowrules.go b/core/cmd/dms/commands_windowrules.go index 9b8431a6d..4f87ff41b 100644 --- a/core/cmd/dms/commands_windowrules.go +++ b/core/cmd/dms/commands_windowrules.go @@ -8,11 +8,11 @@ import ( "strings" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" - "github.com/AvengeMedia/DankMaterialShell/core/internal/mangoconf" - "github.com/AvengeMedia/DankMaterialShell/core/internal/utils" - "github.com/AvengeMedia/DankMaterialShell/core/internal/windowrules" - "github.com/AvengeMedia/DankMaterialShell/core/internal/windowrules/providers" + "github.com/duxlabs-dev/dux-shell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/mangoconf" + "github.com/duxlabs-dev/dux-shell/core/internal/utils" + "github.com/duxlabs-dev/dux-shell/core/internal/windowrules" + "github.com/duxlabs-dev/dux-shell/core/internal/windowrules/providers" "github.com/spf13/cobra" ) diff --git a/core/cmd/dms/dpms_client.go b/core/cmd/dms/dpms_client.go index 130b52f64..720e99fa9 100644 --- a/core/cmd/dms/dpms_client.go +++ b/core/cmd/dms/dpms_client.go @@ -5,8 +5,8 @@ import ( "sync" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/proto/wlr_output_power" - wlclient "github.com/AvengeMedia/dankgo/wayland/client" + wlclient "github.com/duxlabs-dev/dux-go/wayland/client" + "github.com/duxlabs-dev/dux-shell/core/internal/proto/wlr_output_power" ) type cmd struct { diff --git a/core/cmd/dms/immutable_policy.go b/core/cmd/dms/immutable_policy.go index 19d841ad7..37c032328 100644 --- a/core/cmd/dms/immutable_policy.go +++ b/core/cmd/dms/immutable_policy.go @@ -9,8 +9,8 @@ import ( "strings" "sync" - "github.com/AvengeMedia/DankMaterialShell/core/internal/clipolicy" - "github.com/AvengeMedia/DankMaterialShell/core/internal/privesc" + "github.com/duxlabs-dev/dux-shell/core/internal/clipolicy" + "github.com/duxlabs-dev/dux-shell/core/internal/privesc" "github.com/spf13/afero" "github.com/spf13/cobra" ) diff --git a/core/cmd/dms/immutable_policy_test.go b/core/cmd/dms/immutable_policy_test.go index 2a5df0504..4c1d27013 100644 --- a/core/cmd/dms/immutable_policy_test.go +++ b/core/cmd/dms/immutable_policy_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "testing" - "github.com/AvengeMedia/DankMaterialShell/core/internal/clipolicy" + "github.com/duxlabs-dev/dux-shell/core/internal/clipolicy" ) func TestDefaultImmutablePolicyAllowsSyncButBlocksEnable(t *testing.T) { diff --git a/core/cmd/dms/main.go b/core/cmd/dms/main.go index dd8c9fcd2..e9c390b01 100644 --- a/core/cmd/dms/main.go +++ b/core/cmd/dms/main.go @@ -5,8 +5,9 @@ package main import ( "os" - "github.com/AvengeMedia/DankMaterialShell/core/internal/clipboard" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/clipboard" + "github.com/duxlabs-dev/dux-shell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/utils" ) var Version = "dev" @@ -33,6 +34,12 @@ func main() { log.Fatal("This program should not be run as root. Exiting.") } + if os.Geteuid() != 0 { + for _, err := range utils.MigrateLegacyDirs() { + log.Warnf("dms dir migration: %v", err) + } + } + os.Args = normalizeDmenuArgv(os.Args) if err := rootCmd.Execute(); err != nil { log.Fatal(err) diff --git a/core/cmd/dms/main_distro.go b/core/cmd/dms/main_distro.go index a304c75f2..05a4a2d74 100644 --- a/core/cmd/dms/main_distro.go +++ b/core/cmd/dms/main_distro.go @@ -5,8 +5,9 @@ package main import ( "os" - "github.com/AvengeMedia/DankMaterialShell/core/internal/clipboard" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/clipboard" + "github.com/duxlabs-dev/dux-shell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/utils" ) var Version = "dev" @@ -29,6 +30,12 @@ func main() { log.Fatal("This program should not be run as root. Exiting.") } + if os.Geteuid() != 0 { + for _, err := range utils.MigrateLegacyDirs() { + log.Warnf("dms dir migration: %v", err) + } + } + os.Args = normalizeDmenuArgv(os.Args) if err := rootCmd.Execute(); err != nil { log.Fatal(err) diff --git a/core/cmd/dms/randr_client.go b/core/cmd/dms/randr_client.go index b6480438b..9cd62d0b9 100644 --- a/core/cmd/dms/randr_client.go +++ b/core/cmd/dms/randr_client.go @@ -3,8 +3,8 @@ package main import ( "fmt" - "github.com/AvengeMedia/DankMaterialShell/core/internal/proto/wlr_output_management" - wlclient "github.com/AvengeMedia/dankgo/wayland/client" + wlclient "github.com/duxlabs-dev/dux-go/wayland/client" + "github.com/duxlabs-dev/dux-shell/core/internal/proto/wlr_output_management" ) type randrOutput struct { diff --git a/core/cmd/dms/server_client.go b/core/cmd/dms/server_client.go index 56a9023ac..19923bbf2 100644 --- a/core/cmd/dms/server_client.go +++ b/core/cmd/dms/server_client.go @@ -8,11 +8,12 @@ import ( "net" "os" "path/filepath" + "strings" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server" - "github.com/AvengeMedia/DankMaterialShell/core/internal/utils" - "github.com/AvengeMedia/dankgo/ipc" + "github.com/duxlabs-dev/dux-go/ipc" + "github.com/duxlabs-dev/dux-shell/core/internal/server" + "github.com/duxlabs-dev/dux-shell/core/internal/utils" ) // maxIPCMessageSize allows room for a 50 MB clipboard entry plus JSON/base64 @@ -121,16 +122,18 @@ func getServerSocketPath() string { entries, err := os.ReadDir(runtimeDir) if err != nil { - return filepath.Join(runtimeDir, "danklinux.sock") + return server.GetSocketPath() } - for _, entry := range entries { - name := entry.Name() - if name == "danklinux.sock" { - return filepath.Join(runtimeDir, name) - } - if len(name) > 10 && name[:10] == "danklinux-" && filepath.Ext(name) == ".sock" { - return filepath.Join(runtimeDir, name) + for _, id := range []string{"dms", "danklinux"} { + for _, entry := range entries { + name := entry.Name() + if filepath.Ext(name) != ".sock" { + continue + } + if name == id+".sock" || strings.HasPrefix(name, id+"-") { + return filepath.Join(runtimeDir, name) + } } } diff --git a/core/cmd/dms/server_client_test.go b/core/cmd/dms/server_client_test.go index 479099e6e..7078eb7a6 100644 --- a/core/cmd/dms/server_client_test.go +++ b/core/cmd/dms/server_client_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/AvengeMedia/dankgo/ipc" + "github.com/duxlabs-dev/dux-go/ipc" ) func fakeServer(t *testing.T, handle func(net.Conn)) { diff --git a/core/cmd/dms/shell.go b/core/cmd/dms/shell.go index 19b5a7b67..c8834c21f 100644 --- a/core/cmd/dms/shell.go +++ b/core/cmd/dms/shell.go @@ -13,9 +13,9 @@ import ( "sync" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" - "github.com/AvengeMedia/DankMaterialShell/core/internal/qsipc" - "github.com/AvengeMedia/DankMaterialShell/core/internal/site" + "github.com/duxlabs-dev/dux-shell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/qsipc" + "github.com/duxlabs-dev/dux-shell/core/internal/site" ) type ipcTargets map[string]map[string][]string @@ -228,7 +228,7 @@ func printIPCHelpFailure(err error) { fmt.Printf(" %v\n", err) } fmt.Println() - fmt.Println(" Full docs: " + site.Docs + "/dankmaterialshell/keybinds-ipc") + fmt.Println(" Full docs: " + site.Docs + "/dms/keybinds-ipc") fmt.Println(" Try: dms ipc call ") } @@ -243,7 +243,7 @@ func ensureFontCache() { var fontsToCheck []string if configDir, err := os.UserConfigDir(); err == nil { - settingsPath := filepath.Join(configDir, "DankMaterialShell", "settings.json") + settingsPath := filepath.Join(configDir, "dms", "settings.json") if data, err := os.ReadFile(settingsPath); err == nil { var settings struct { FontFamily string `json:"fontFamily"` diff --git a/core/cmd/dms/shellapp.go b/core/cmd/dms/shellapp.go index aeb30795f..0568cacfd 100644 --- a/core/cmd/dms/shellapp.go +++ b/core/cmd/dms/shellapp.go @@ -6,19 +6,20 @@ import ( "os" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/config" - "github.com/AvengeMedia/DankMaterialShell/core/internal/gpu" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server" - "github.com/AvengeMedia/DankMaterialShell/core/internal/shellembed" - "github.com/AvengeMedia/DankMaterialShell/core/internal/utils" - "github.com/AvengeMedia/dankgo/shellapp" + "github.com/duxlabs-dev/dux-go/shellapp" + "github.com/duxlabs-dev/dux-shell/core/internal/config" + "github.com/duxlabs-dev/dux-shell/core/internal/gpu" + "github.com/duxlabs-dev/dux-shell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/server" + "github.com/duxlabs-dev/dux-shell/core/internal/shellembed" + "github.com/duxlabs-dev/dux-shell/core/internal/utils" ) var shellApp = shellapp.New(shellapp.Config{ - ID: "danklinux", + ID: "dms", + LegacyIDs: []string{"danklinux"}, EnvPrefix: "DMS", - QSAppID: "com.danklinux.dms", + QSAppID: "dev.duxlabs.shell", Version: Version, Embedded: embeddedShell{}, Boot: bootBackend, diff --git a/core/cmd/dms/ui.go b/core/cmd/dms/ui.go index 07784d854..313b44b8e 100644 --- a/core/cmd/dms/ui.go +++ b/core/cmd/dms/ui.go @@ -3,8 +3,8 @@ package main import ( "fmt" - "github.com/AvengeMedia/DankMaterialShell/core/internal/tui" "github.com/charmbracelet/lipgloss" + "github.com/duxlabs-dev/dux-shell/core/internal/tui" ) func printASCII() { diff --git a/core/go.mod b/core/go.mod index 8b6fcd874..24a52b620 100644 --- a/core/go.mod +++ b/core/go.mod @@ -1,10 +1,10 @@ -module github.com/AvengeMedia/DankMaterialShell/core +module github.com/duxlabs-dev/dux-shell/core go 1.27.1 require ( - github.com/AvengeMedia/dankgo v1.6.3-0.20261019192939-46e7a10c933f - github.com/AvengeMedia/dgop v1.6.3-0.20261015133851-bf93d6b75cf2 + github.com/duxlabs-dev/dux-go v0.0.0-00010101000000-000000000000 + github.com/duxlabs-dev/dux-gop v0.0.0-00010101000000-000000000000 github.com/Wifx/gonetworkmanager/v2 v2.2.0 github.com/alecthomas/chroma/v2 v2.27.0 github.com/charmbracelet/bubbles v1.0.0 diff --git a/core/go.sum b/core/go.sum index d9ff1de7c..e4d3a4cc3 100644 --- a/core/go.sum +++ b/core/go.sum @@ -1,9 +1,5 @@ filippo.io/edwards25519 v1.2.0 h1:crnVqOiS4jqYleHd9vaKZ+HKtHfllngJIiOpNpoJsjo= filippo.io/edwards25519 v1.2.0/go.mod h1:xzAOLCNug/yB62zG1bQ8uziwrIqIuxhctzJT18Q77mc= -github.com/AvengeMedia/dankgo v1.6.3-0.20261019192939-46e7a10c933f h1:DpJ4MnFdtsa/FouZICTZeZlqXYTNQ342/7vImWXcSJM= -github.com/AvengeMedia/dankgo v1.6.3-0.20261019192939-46e7a10c933f/go.mod h1:oNWfG/2In/Znsrq03ZhNP1dCwHmHHm3nOVu6oXgkYIc= -github.com/AvengeMedia/dgop v1.6.3-0.20261015133851-bf93d6b75cf2 h1:oOkpidPu7DJENdRTseCMw6pqyo12KNoGEC+Uim9pFHo= -github.com/AvengeMedia/dgop v1.6.3-0.20261015133851-bf93d6b75cf2/go.mod h1:8TFIP72NLxCbogF2hHU6sXj3RoTbHQW8beeCrisHs/Y= github.com/Microsoft/go-winio v0.6.4 h1:kJF2pamtYCWXf0xAT8sAkwKC0pMl2HYBrRPHAqyUc+g= github.com/Microsoft/go-winio v0.6.4/go.mod h1:1xl5JXG4ze/m74GH6Dc4Mwxfc3VL5siRVQjIAlHH07U= github.com/ProtonMail/go-crypto v1.5.2 h1:cucYnvqcY7UOXVD//mSyjeaPY0SSN3v5cDkYPxumINk= diff --git a/core/install.sh b/core/install.sh index 2aff192b1..67846850a 100755 --- a/core/install.sh +++ b/core/install.sh @@ -36,7 +36,7 @@ aarch64) esac # Get the latest release version -LATEST_VERSION=$(curl -s https://api.github.com/repos/AvengeMedia/DankMaterialShell/releases/latest | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/') +LATEST_VERSION=$(curl -sL https://api.github.com/repos/duxlabs-dev/dux-shell/releases/latest | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/') if [ -z "$LATEST_VERSION" ]; then printf "%bError: Could not fetch latest version%b\n" "$RED" "$NC" @@ -52,8 +52,8 @@ cd "$TEMP_DIR" || exit 1 # Download the gzipped binary and its checksum printf "%bDownloading installer...%b\n" "$GREEN" "$NC" -curl -L "https://github.com/AvengeMedia/DankMaterialShell/releases/download/$LATEST_VERSION/dankinstall-$ARCH.gz" -o "installer.gz" -curl -L "https://github.com/AvengeMedia/DankMaterialShell/releases/download/$LATEST_VERSION/dankinstall-$ARCH.gz.sha256" -o "expected.sha256" +curl -L "https://github.com/duxlabs-dev/dux-shell/releases/download/$LATEST_VERSION/dankinstall-$ARCH.gz" -o "installer.gz" +curl -L "https://github.com/duxlabs-dev/dux-shell/releases/download/$LATEST_VERSION/dankinstall-$ARCH.gz.sha256" -o "expected.sha256" # Get the expected checksum EXPECTED_CHECKSUM=$(awk '{print $1}' expected.sha256) diff --git a/core/internal/backup/backup.go b/core/internal/backup/backup.go index 487ca0d01..560b8c6d8 100644 --- a/core/internal/backup/backup.go +++ b/core/internal/backup/backup.go @@ -11,7 +11,7 @@ import ( "time" ) -const dirName = "DankMaterialShell" +const dirName = "dms" func ConfigDir() (string, error) { configDir, err := os.UserConfigDir() diff --git a/core/internal/backup/snapshot_test.go b/core/internal/backup/snapshot_test.go index a45b0f981..25a512460 100644 --- a/core/internal/backup/snapshot_test.go +++ b/core/internal/backup/snapshot_test.go @@ -39,11 +39,11 @@ func TestSnapshotRestoresThroughSymlinkedConfig(t *testing.T) { if err := os.MkdirAll(filepath.Join(home, ".config"), 0o755); err != nil { t.Fatal(err) } - configLink := filepath.Join(home, ".config", "DankMaterialShell") + configLink := filepath.Join(home, ".config", "dms") if err := os.Symlink(dotfiles, configLink); err != nil { t.Fatal(err) } - session := filepath.Join(home, ".local", "state", "DankMaterialShell", "session.json") + session := filepath.Join(home, ".local", "state", "dms", "session.json") writeFile(t, session, `{"wallpaper":"a"}`) path, err := Snapshot("stable") @@ -73,7 +73,7 @@ func TestSnapshotKeepsNewestPerLabel(t *testing.T) { t.Setenv("XDG_CONFIG_HOME", filepath.Join(home, ".config")) t.Setenv("XDG_STATE_HOME", filepath.Join(home, ".local", "state")) t.Setenv("XDG_CACHE_HOME", filepath.Join(home, ".cache")) - writeFile(t, filepath.Join(home, ".config", "DankMaterialShell", "settings.json"), "{}") + writeFile(t, filepath.Join(home, ".config", "dms", "settings.json"), "{}") dir, _ := SnapshotDir() for _, stamp := range []string{"20260101-000000", "20260102-000000", "20260103-000000"} { @@ -98,7 +98,7 @@ func TestRestoreSnapshotRejectsForeignEntries(t *testing.T) { t.Setenv("XDG_CONFIG_HOME", filepath.Join(home, ".config")) t.Setenv("XDG_STATE_HOME", filepath.Join(home, ".local", "state")) t.Setenv("XDG_CACHE_HOME", filepath.Join(home, ".cache")) - writeFile(t, filepath.Join(home, ".config", "DankMaterialShell", "settings.json"), "{}") + writeFile(t, filepath.Join(home, ".config", "dms", "settings.json"), "{}") archive := filepath.Join(home, "backup.tar.gz") if err := Create(archive); err != nil { @@ -123,7 +123,7 @@ func TestRestoreSnapshotRejectsEscapingSymlink(t *testing.T) { } gz := gzip.NewWriter(f) tw := tar.NewWriter(gz) - if err := tw.WriteHeader(&tar.Header{Name: "config/DankMaterialShell/plugins", Typeflag: tar.TypeSymlink, Linkname: "../../../.ssh", Mode: 0o777}); err != nil { + if err := tw.WriteHeader(&tar.Header{Name: "config/dms/plugins", Typeflag: tar.TypeSymlink, Linkname: "../../../.ssh", Mode: 0o777}); err != nil { t.Fatal(err) } for _, c := range []interface{ Close() error }{tw, gz, f} { @@ -135,7 +135,7 @@ func TestRestoreSnapshotRejectsEscapingSymlink(t *testing.T) { if err := RestoreSnapshot(archive); err == nil { t.Fatal("RestoreSnapshot followed a symlink that points outside the config dir") } - if _, err := os.Lstat(filepath.Join(home, ".config", "DankMaterialShell", "plugins")); err == nil { + if _, err := os.Lstat(filepath.Join(home, ".config", "dms", "plugins")); err == nil { t.Fatal("the escaping symlink was created") } } diff --git a/core/internal/blur/probe.go b/core/internal/blur/probe.go index 8cb3971b4..e06553217 100644 --- a/core/internal/blur/probe.go +++ b/core/internal/blur/probe.go @@ -1,8 +1,8 @@ package blur import ( - wlhelpers "github.com/AvengeMedia/DankMaterialShell/core/internal/wayland/client" - client "github.com/AvengeMedia/dankgo/wayland/client" + client "github.com/duxlabs-dev/dux-go/wayland/client" + wlhelpers "github.com/duxlabs-dev/dux-shell/core/internal/wayland/client" ) const extBackgroundEffectInterface = "ext_background_effect_manager_v1" diff --git a/core/internal/clipboard/clipboard.go b/core/internal/clipboard/clipboard.go index c97db73d8..5671b585e 100644 --- a/core/internal/clipboard/clipboard.go +++ b/core/internal/clipboard/clipboard.go @@ -11,8 +11,8 @@ import ( "path/filepath" "syscall" - "github.com/AvengeMedia/dankgo/wayland/ext_data_control" - "github.com/AvengeMedia/dankgo/wlclipboard" + "github.com/duxlabs-dev/dux-go/wayland/ext_data_control" + "github.com/duxlabs-dev/dux-go/wlclipboard" ) const envServe = "_DMS_CLIPBOARD_SERVE" diff --git a/core/internal/clipboard/clipboard_test.go b/core/internal/clipboard/clipboard_test.go index 57fe54918..e13d656aa 100644 --- a/core/internal/clipboard/clipboard_test.go +++ b/core/internal/clipboard/clipboard_test.go @@ -6,7 +6,7 @@ import ( "image/png" "testing" - "github.com/AvengeMedia/dankgo/wlclipboard" + "github.com/duxlabs-dev/dux-go/wlclipboard" "github.com/stretchr/testify/assert" ) diff --git a/core/internal/clipboard/pastekey.go b/core/internal/clipboard/pastekey.go index aff24b250..e6e78fcb1 100644 --- a/core/internal/clipboard/pastekey.go +++ b/core/internal/clipboard/pastekey.go @@ -3,8 +3,8 @@ package clipboard import ( "fmt" - "github.com/AvengeMedia/DankMaterialShell/core/internal/wayland/keymap" - wlclient "github.com/AvengeMedia/dankgo/wayland/client" + wlclient "github.com/duxlabs-dev/dux-go/wayland/client" + "github.com/duxlabs-dev/dux-shell/core/internal/wayland/keymap" "golang.org/x/sys/unix" ) diff --git a/core/internal/clipboard/store.go b/core/internal/clipboard/store.go index bf7ad6cd4..6d3c183a2 100644 --- a/core/internal/clipboard/store.go +++ b/core/internal/clipboard/store.go @@ -129,7 +129,7 @@ func GetDBPath() (string, error) { cacheDir = filepath.Join(homeDir, ".cache") } - newDir := filepath.Join(cacheDir, "DankMaterialShell", "clipboard") + newDir := filepath.Join(cacheDir, "dms", "clipboard") newPath := filepath.Join(newDir, "db") if _, err := os.Stat(newPath); err == nil { diff --git a/core/internal/clipboard/watch.go b/core/internal/clipboard/watch.go index 585d9a206..0d6065f03 100644 --- a/core/internal/clipboard/watch.go +++ b/core/internal/clipboard/watch.go @@ -8,7 +8,7 @@ import ( "os" "time" - "github.com/AvengeMedia/dankgo/wayland/ext_data_control" + "github.com/duxlabs-dev/dux-go/wayland/ext_data_control" ) // WatchAll subscribes to clipboard selection changes like wlclipboard.Watch, diff --git a/core/internal/clipboard/wl.go b/core/internal/clipboard/wl.go index b6f4f7d7c..27059ad25 100644 --- a/core/internal/clipboard/wl.go +++ b/core/internal/clipboard/wl.go @@ -3,9 +3,9 @@ package clipboard import ( "fmt" - "github.com/AvengeMedia/DankMaterialShell/core/internal/proto/virtual_keyboard" - wlclient "github.com/AvengeMedia/dankgo/wayland/client" - "github.com/AvengeMedia/dankgo/wayland/ext_data_control" + wlclient "github.com/duxlabs-dev/dux-go/wayland/client" + "github.com/duxlabs-dev/dux-go/wayland/ext_data_control" + "github.com/duxlabs-dev/dux-shell/core/internal/proto/virtual_keyboard" ) type session struct { diff --git a/core/internal/colorpicker/picker.go b/core/internal/colorpicker/picker.go index 0b9c01834..02d6d5e24 100644 --- a/core/internal/colorpicker/picker.go +++ b/core/internal/colorpicker/picker.go @@ -4,16 +4,16 @@ import ( "fmt" "sync" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" - "github.com/AvengeMedia/DankMaterialShell/core/internal/proto/keyboard_shortcuts_inhibit" - "github.com/AvengeMedia/DankMaterialShell/core/internal/proto/wlr_layer_shell" - "github.com/AvengeMedia/DankMaterialShell/core/internal/proto/wlr_screencopy" - "github.com/AvengeMedia/DankMaterialShell/core/internal/proto/wp_color_management" - "github.com/AvengeMedia/DankMaterialShell/core/internal/proto/wp_viewporter" - "github.com/AvengeMedia/DankMaterialShell/core/internal/utils" - wlhelpers "github.com/AvengeMedia/DankMaterialShell/core/internal/wayland/client" - "github.com/AvengeMedia/DankMaterialShell/core/internal/wayland/keymap" - "github.com/AvengeMedia/dankgo/wayland/client" + "github.com/duxlabs-dev/dux-go/wayland/client" + "github.com/duxlabs-dev/dux-shell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/proto/keyboard_shortcuts_inhibit" + "github.com/duxlabs-dev/dux-shell/core/internal/proto/wlr_layer_shell" + "github.com/duxlabs-dev/dux-shell/core/internal/proto/wlr_screencopy" + "github.com/duxlabs-dev/dux-shell/core/internal/proto/wp_color_management" + "github.com/duxlabs-dev/dux-shell/core/internal/proto/wp_viewporter" + "github.com/duxlabs-dev/dux-shell/core/internal/utils" + wlhelpers "github.com/duxlabs-dev/dux-shell/core/internal/wayland/client" + "github.com/duxlabs-dev/dux-shell/core/internal/wayland/keymap" ) type Config struct { diff --git a/core/internal/colorpicker/shm.go b/core/internal/colorpicker/shm.go index 6ee9dc034..db345b4ce 100644 --- a/core/internal/colorpicker/shm.go +++ b/core/internal/colorpicker/shm.go @@ -1,6 +1,6 @@ package colorpicker -import "github.com/AvengeMedia/DankMaterialShell/core/internal/wayland/shm" +import "github.com/duxlabs-dev/dux-shell/core/internal/wayland/shm" type ShmBuffer = shm.Buffer diff --git a/core/internal/colorpicker/state.go b/core/internal/colorpicker/state.go index 8bb3a3631..ba739c7e7 100644 --- a/core/internal/colorpicker/state.go +++ b/core/internal/colorpicker/state.go @@ -6,7 +6,7 @@ import ( "strings" "sync" - "github.com/AvengeMedia/DankMaterialShell/core/internal/wayland/shm" + "github.com/duxlabs-dev/dux-shell/core/internal/wayland/shm" ) type PixelFormat = shm.PixelFormat diff --git a/core/internal/config/deployer.go b/core/internal/config/deployer.go index 436afae67..abeba13dd 100644 --- a/core/internal/config/deployer.go +++ b/core/internal/config/deployer.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" - "github.com/AvengeMedia/DankMaterialShell/core/internal/version" + "github.com/duxlabs-dev/dux-shell/core/internal/deps" + "github.com/duxlabs-dev/dux-shell/core/internal/version" ) const hyprlandBackupDirName = ".dms-backups" diff --git a/core/internal/config/deployer_test.go b/core/internal/config/deployer_test.go index 003c1b668..dec61b20b 100644 --- a/core/internal/config/deployer_test.go +++ b/core/internal/config/deployer_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" + "github.com/duxlabs-dev/dux-shell/core/internal/deps" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/core/internal/config/embedded/mango.conf b/core/internal/config/embedded/mango.conf index d81977141..472b686e0 100644 --- a/core/internal/config/embedded/mango.conf +++ b/core/internal/config/embedded/mango.conf @@ -1,4 +1,4 @@ -# DankMaterialShell — MangoWM configuration (managed by `dms setup`) +# Dux Shell — MangoWM configuration (managed by `dms setup`) # Keybinds, colors, layout, outputs, cursor and window rules are pulled from the # ./dms fragments below. Add your own binds/rules here; they sit alongside DMS's. diff --git a/core/internal/config/mango_deploy.go b/core/internal/config/mango_deploy.go index dcc6f6c74..92429369f 100644 --- a/core/internal/config/mango_deploy.go +++ b/core/internal/config/mango_deploy.go @@ -8,8 +8,8 @@ import ( "strings" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" - "github.com/AvengeMedia/DankMaterialShell/core/internal/mangoconf" + "github.com/duxlabs-dev/dux-shell/core/internal/deps" + "github.com/duxlabs-dev/dux-shell/core/internal/mangoconf" ) // BindsConfigType is the replaceConfigs key choosing stock DMS binds over the user's. diff --git a/core/internal/config/mango_deploy_test.go b/core/internal/config/mango_deploy_test.go index 1eff67ac7..9b08c22e8 100644 --- a/core/internal/config/mango_deploy_test.go +++ b/core/internal/config/mango_deploy_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" - "github.com/AvengeMedia/DankMaterialShell/core/internal/mangoconf" + "github.com/duxlabs-dev/dux-shell/core/internal/deps" + "github.com/duxlabs-dev/dux-shell/core/internal/mangoconf" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/core/internal/config/session_units.go b/core/internal/config/session_units.go index 103e96985..07b6a22f4 100644 --- a/core/internal/config/session_units.go +++ b/core/internal/config/session_units.go @@ -8,8 +8,8 @@ import ( "path/filepath" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" - "github.com/AvengeMedia/DankMaterialShell/core/internal/mangoconf" + "github.com/duxlabs-dev/dux-shell/core/internal/deps" + "github.com/duxlabs-dev/dux-shell/core/internal/mangoconf" ) // dms.service is wanted by the compositor's own session unit rather than enabled diff --git a/core/internal/config/session_units_test.go b/core/internal/config/session_units_test.go index 2f059f303..cde61d312 100644 --- a/core/internal/config/session_units_test.go +++ b/core/internal/config/session_units_test.go @@ -5,8 +5,8 @@ import ( "path/filepath" "testing" - "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" - "github.com/AvengeMedia/DankMaterialShell/core/internal/mangoconf" + "github.com/duxlabs-dev/dux-shell/core/internal/deps" + "github.com/duxlabs-dev/dux-shell/core/internal/mangoconf" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/core/internal/configfrag/walk.go b/core/internal/configfrag/walk.go index fb49713b8..444a8c0ba 100644 --- a/core/internal/configfrag/walk.go +++ b/core/internal/configfrag/walk.go @@ -4,7 +4,7 @@ import ( "path/filepath" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/utils" + "github.com/duxlabs-dev/dux-shell/core/internal/utils" ) type IncludeScan struct { diff --git a/core/internal/dank16/dank16.go b/core/internal/dank16/dank16.go index 2dbf09f3d..0e3e1ee68 100644 --- a/core/internal/dank16/dank16.go +++ b/core/internal/dank16/dank16.go @@ -6,8 +6,8 @@ import ( "strconv" "strings" - "github.com/AvengeMedia/dankgo/material/color" - "github.com/AvengeMedia/dankgo/material/num" + "github.com/duxlabs-dev/dux-go/material/color" + "github.com/duxlabs-dev/dux-go/material/num" "github.com/lucasb-eyer/go-colorful" ) diff --git a/core/internal/dank16/dank16_test.go b/core/internal/dank16/dank16_test.go index b90a5c16d..8bb53d611 100644 --- a/core/internal/dank16/dank16_test.go +++ b/core/internal/dank16/dank16_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/AvengeMedia/dankgo/material/color" - "github.com/AvengeMedia/dankgo/material/num" + "github.com/duxlabs-dev/dux-go/material/color" + "github.com/duxlabs-dev/dux-go/material/num" ) func TestHexToRGB(t *testing.T) { diff --git a/core/internal/distros/arch.go b/core/internal/distros/arch.go index d9fd991c5..c25e99f0a 100644 --- a/core/internal/distros/arch.go +++ b/core/internal/distros/arch.go @@ -10,8 +10,8 @@ import ( "slices" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" - "github.com/AvengeMedia/DankMaterialShell/core/internal/privesc" + "github.com/duxlabs-dev/dux-shell/core/internal/deps" + "github.com/duxlabs-dev/dux-shell/core/internal/privesc" ) func init() { @@ -156,7 +156,7 @@ func (a *ArchDistribution) detectAccountsService() deps.Dependency { func (a *ArchDistribution) detectDMSGreeter() deps.Dependency { installed := a.packageInstalled("greetd-dms-greeter-git") || a.packageInstalled("greetd-dms-greeter-bin") - dep := a.detectOptionalPackage("dms-greeter", "DankMaterialShell greetd greeter", installed) + dep := a.detectOptionalPackage("dms-greeter", "Dux Shell greetd greeter", installed) dep.CanToggle = true if a.packageInstalled("greetd-dms-greeter-git") { dep.Variant = deps.VariantGit @@ -217,18 +217,18 @@ func (a *ArchDistribution) GetPackageMapping(wm deps.WindowManager) map[string]P func (a *ArchDistribution) GetPackageMappingWithVariants(wm deps.WindowManager, variants map[string]deps.PackageVariant) map[string]PackageMapping { packages := map[string]PackageMapping{ - "dms (DankMaterialShell)": a.getDMSMapping(variants["dms (DankMaterialShell)"]), - "git": {Name: "git", Repository: RepoTypeSystem}, - "quickshell": a.getQuickshellMapping(variants["quickshell"]), - "dms-greeter": a.getDMSGreeterMapping(variants["dms-greeter"]), - "matugen": a.getMatugenMapping(variants["matugen"]), - "ghostty": {Name: "ghostty", Repository: RepoTypeSystem}, - "kitty": {Name: "kitty", Repository: RepoTypeSystem}, - "alacritty": {Name: "alacritty", Repository: RepoTypeSystem}, - "xdg-desktop-portal-gtk": {Name: "xdg-desktop-portal-gtk", Repository: RepoTypeSystem}, - "accountsservice": {Name: "accountsservice", Repository: RepoTypeSystem}, - "danksearch": a.getDanksearchMapping(variants["danksearch"]), - "dankcalendar": a.getDankCalendarMapping(variants["dankcalendar"]), + "dms (Dux Shell)": a.getDMSMapping(variants["dms (Dux Shell)"]), + "git": {Name: "git", Repository: RepoTypeSystem}, + "quickshell": a.getQuickshellMapping(variants["quickshell"]), + "dms-greeter": a.getDMSGreeterMapping(variants["dms-greeter"]), + "matugen": a.getMatugenMapping(variants["matugen"]), + "ghostty": {Name: "ghostty", Repository: RepoTypeSystem}, + "kitty": {Name: "kitty", Repository: RepoTypeSystem}, + "alacritty": {Name: "alacritty", Repository: RepoTypeSystem}, + "xdg-desktop-portal-gtk": {Name: "xdg-desktop-portal-gtk", Repository: RepoTypeSystem}, + "accountsservice": {Name: "accountsservice", Repository: RepoTypeSystem}, + "danksearch": a.getDanksearchMapping(variants["danksearch"]), + "dankcalendar": a.getDankCalendarMapping(variants["dankcalendar"]), } switch wm { diff --git a/core/internal/distros/base.go b/core/internal/distros/base.go index 0ea5826a7..3a076be8c 100644 --- a/core/internal/distros/base.go +++ b/core/internal/distros/base.go @@ -13,11 +13,11 @@ import ( "strings" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/config" - "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" - "github.com/AvengeMedia/DankMaterialShell/core/internal/netfetch" - "github.com/AvengeMedia/DankMaterialShell/core/internal/privesc" - "github.com/AvengeMedia/DankMaterialShell/core/internal/version" + "github.com/duxlabs-dev/dux-shell/core/internal/config" + "github.com/duxlabs-dev/dux-shell/core/internal/deps" + "github.com/duxlabs-dev/dux-shell/core/internal/netfetch" + "github.com/duxlabs-dev/dux-shell/core/internal/privesc" + "github.com/duxlabs-dev/dux-shell/core/internal/version" ) const ( @@ -146,7 +146,7 @@ func (b *BaseDistribution) detectDMS() deps.Dependency { } dep := deps.Dependency{ - Name: "dms (DankMaterialShell)", + Name: "dms (Dux Shell)", Status: status, Description: "Desktop Management System configuration", Required: true, @@ -666,7 +666,7 @@ func (b *BaseDistribution) installDMSBinary(ctx context.Context, sudoPassword st defer os.RemoveAll(tmpDir) // Download the gzipped binary - downloadURL := fmt.Sprintf("https://github.com/AvengeMedia/DankMaterialShell/releases/download/%s/dms-cli-%s.gz", version, arch) + downloadURL := fmt.Sprintf("https://github.com/duxlabs-dev/dux-shell/releases/download/%s/dms-cli-%s.gz", version, arch) gzPath := filepath.Join(tmpDir, "dms.gz") if err := netfetch.ToFile(ctx, downloadURL, netfetch.Options{Timeout: 5 * time.Minute}, gzPath); err != nil { diff --git a/core/internal/distros/base_test.go b/core/internal/distros/base_test.go index d454f9aa5..60c7d1426 100644 --- a/core/internal/distros/base_test.go +++ b/core/internal/distros/base_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" + "github.com/duxlabs-dev/dux-shell/core/internal/deps" ) func TestBaseDistribution_detectDMS_NotInstalled(t *testing.T) { diff --git a/core/internal/distros/debian.go b/core/internal/distros/debian.go index 9cb0f52f4..e3eca75b3 100644 --- a/core/internal/distros/debian.go +++ b/core/internal/distros/debian.go @@ -7,8 +7,8 @@ import ( "os/exec" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" - "github.com/AvengeMedia/DankMaterialShell/core/internal/privesc" + "github.com/duxlabs-dev/dux-shell/core/internal/deps" + "github.com/duxlabs-dev/dux-shell/core/internal/privesc" ) func init() { @@ -96,7 +96,7 @@ func (d *DebianDistribution) detectAccountsService() deps.Dependency { func (d *DebianDistribution) detectDMSGreeter() deps.Dependency { gitInstalled := d.packageInstalled("dms-greeter-git") - dep := d.detectOptionalPackage("dms-greeter", "DankMaterialShell greetd greeter", gitInstalled || d.packageInstalled("dms-greeter")) + dep := d.detectOptionalPackage("dms-greeter", "Dux Shell greetd greeter", gitInstalled || d.packageInstalled("dms-greeter")) return withGitVariant(dep, gitInstalled) } @@ -157,13 +157,13 @@ func (d *DebianDistribution) GetPackageMappingWithVariants(wm deps.WindowManager "accountsservice": {Name: "accountsservice", Repository: RepoTypeSystem}, // DMS packages from OBS with variant support - "dms (DankMaterialShell)": d.getDmsMapping(variants["dms (DankMaterialShell)"]), - "quickshell": d.getQuickshellMapping(variants["quickshell"]), - "dms-greeter": variantMapping("dms-greeter", variants["dms-greeter"], RepoTypeOBS, "home:AvengeMedia:danklinux"), - "matugen": {Name: "matugen", Repository: RepoTypeOBS, RepoURL: "home:AvengeMedia:danklinux"}, - "ghostty": {Name: "ghostty", Repository: RepoTypeOBS, RepoURL: "home:AvengeMedia:danklinux"}, - "danksearch": {Name: "danksearch", Repository: RepoTypeOBS, RepoURL: "home:AvengeMedia:danklinux"}, - "dankcalendar": variantMapping("dankcalendar", variants["dankcalendar"], RepoTypeOBS, "home:AvengeMedia:danklinux"), + "dms (Dux Shell)": d.getDmsMapping(variants["dms (Dux Shell)"]), + "quickshell": d.getQuickshellMapping(variants["quickshell"]), + "dms-greeter": variantMapping("dms-greeter", variants["dms-greeter"], RepoTypeOBS, "home:AvengeMedia:danklinux"), + "matugen": {Name: "matugen", Repository: RepoTypeOBS, RepoURL: "home:AvengeMedia:danklinux"}, + "ghostty": {Name: "ghostty", Repository: RepoTypeOBS, RepoURL: "home:AvengeMedia:danklinux"}, + "danksearch": {Name: "danksearch", Repository: RepoTypeOBS, RepoURL: "home:AvengeMedia:danklinux"}, + "dankcalendar": variantMapping("dankcalendar", variants["dankcalendar"], RepoTypeOBS, "home:AvengeMedia:danklinux"), } if wm == deps.WindowManagerNiri { diff --git a/core/internal/distros/factory.go b/core/internal/distros/factory.go index 9c3826a20..a0e405d41 100644 --- a/core/internal/distros/factory.go +++ b/core/internal/distros/factory.go @@ -1,7 +1,7 @@ package distros import ( - "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" + "github.com/duxlabs-dev/dux-shell/core/internal/deps" ) // NewDependencyDetector creates a DependencyDetector for the specified distribution diff --git a/core/internal/distros/fedora.go b/core/internal/distros/fedora.go index 9ad61a097..4622709e4 100644 --- a/core/internal/distros/fedora.go +++ b/core/internal/distros/fedora.go @@ -6,8 +6,8 @@ import ( "os/exec" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" - "github.com/AvengeMedia/DankMaterialShell/core/internal/privesc" + "github.com/duxlabs-dev/dux-shell/core/internal/deps" + "github.com/duxlabs-dev/dux-shell/core/internal/privesc" ) func init() { @@ -220,12 +220,12 @@ func (f *FedoraDistribution) GetPackageMappingWithVariants(wm deps.WindowManager "accountsservice": {Name: "accountsservice", Repository: RepoTypeSystem}, // COPR packages - "quickshell": f.getQuickshellMapping(variants["quickshell"]), - "dms-greeter": variantMapping("dms-greeter", variants["dms-greeter"], RepoTypeCOPR, "avengemedia/danklinux"), - "matugen": {Name: "matugen", Repository: RepoTypeCOPR, RepoURL: "avengemedia/danklinux"}, - "dms (DankMaterialShell)": f.getDmsMapping(variants["dms (DankMaterialShell)"]), - "danksearch": {Name: "danksearch", Repository: RepoTypeCOPR, RepoURL: "avengemedia/danklinux"}, - "dankcalendar": variantMapping("dankcalendar", variants["dankcalendar"], RepoTypeCOPR, "avengemedia/danklinux"), + "quickshell": f.getQuickshellMapping(variants["quickshell"]), + "dms-greeter": variantMapping("dms-greeter", variants["dms-greeter"], RepoTypeCOPR, "avengemedia/danklinux"), + "matugen": {Name: "matugen", Repository: RepoTypeCOPR, RepoURL: "avengemedia/danklinux"}, + "dms (Dux Shell)": f.getDmsMapping(variants["dms (Dux Shell)"]), + "danksearch": {Name: "danksearch", Repository: RepoTypeCOPR, RepoURL: "avengemedia/danklinux"}, + "dankcalendar": variantMapping("dankcalendar", variants["dankcalendar"], RepoTypeCOPR, "avengemedia/danklinux"), } switch wm { @@ -310,7 +310,7 @@ func (f *FedoraDistribution) detectAccountsService() deps.Dependency { func (f *FedoraDistribution) detectDMSGreeter() deps.Dependency { gitInstalled := f.packageInstalled("dms-greeter-git") - dep := f.detectOptionalPackage("dms-greeter", "DankMaterialShell greetd greeter", gitInstalled || f.packageInstalled("dms-greeter")) + dep := f.detectOptionalPackage("dms-greeter", "Dux Shell greetd greeter", gitInstalled || f.packageInstalled("dms-greeter")) return withGitVariant(dep, gitInstalled) } diff --git a/core/internal/distros/fedora_test.go b/core/internal/distros/fedora_test.go index 1eea6db01..0dd393c8b 100644 --- a/core/internal/distros/fedora_test.go +++ b/core/internal/distros/fedora_test.go @@ -3,7 +3,7 @@ package distros import ( "testing" - "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" + "github.com/duxlabs-dev/dux-shell/core/internal/deps" ) func TestFedoraPackageMapping_EnterpriseLinuxUsesCOPRForMissingEPELPackages(t *testing.T) { diff --git a/core/internal/distros/gentoo.go b/core/internal/distros/gentoo.go index ed1a1e863..1a19e4433 100644 --- a/core/internal/distros/gentoo.go +++ b/core/internal/distros/gentoo.go @@ -7,8 +7,8 @@ import ( "runtime" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" - "github.com/AvengeMedia/DankMaterialShell/core/internal/privesc" + "github.com/duxlabs-dev/dux-shell/core/internal/deps" + "github.com/duxlabs-dev/dux-shell/core/internal/privesc" ) var GentooGlobalUseFlags = []string{ @@ -128,7 +128,7 @@ func (g *GentooDistribution) detectXDGPortal() deps.Dependency { func (g *GentooDistribution) detectDMS() deps.Dependency { dep := deps.Dependency{ - Name: "dms (DankMaterialShell)", + Name: "dms (Dux Shell)", Status: deps.StatusMissing, Description: "Desktop Management System configuration", Required: true, @@ -172,10 +172,10 @@ func (g *GentooDistribution) GetPackageMappingWithVariants(wm deps.WindowManager "qtwayland": {Name: "dev-qt/qtwayland", Repository: RepoTypeSystem}, "mesa": {Name: "media-libs/mesa", Repository: RepoTypeSystem, UseFlags: "opengl vulkan"}, - "quickshell": g.getQuickshellMapping(variants["quickshell"]), - "matugen": {Name: "x11-misc/matugen", Repository: RepoTypeGURU, AcceptKeywords: archKeyword}, - "dms (DankMaterialShell)": g.getDmsMapping(), - "danksearch": {Name: "gui-apps/danksearch", Repository: RepoTypeGURU, AcceptKeywords: archKeyword}, + "quickshell": g.getQuickshellMapping(variants["quickshell"]), + "matugen": {Name: "x11-misc/matugen", Repository: RepoTypeGURU, AcceptKeywords: archKeyword}, + "dms (Dux Shell)": g.getDmsMapping(), + "danksearch": {Name: "gui-apps/danksearch", Repository: RepoTypeGURU, AcceptKeywords: archKeyword}, } switch wm { diff --git a/core/internal/distros/interface.go b/core/internal/distros/interface.go index 07fa433ea..9773b1024 100644 --- a/core/internal/distros/interface.go +++ b/core/internal/distros/interface.go @@ -3,7 +3,7 @@ package distros import ( "context" - "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" + "github.com/duxlabs-dev/dux-shell/core/internal/deps" ) // DistroFamily represents a family of related distributions diff --git a/core/internal/distros/manual_packages.go b/core/internal/distros/manual_packages.go index 9ef218864..8c5e99d77 100644 --- a/core/internal/distros/manual_packages.go +++ b/core/internal/distros/manual_packages.go @@ -8,8 +8,8 @@ import ( "path/filepath" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" - "github.com/AvengeMedia/DankMaterialShell/core/internal/privesc" + "github.com/duxlabs-dev/dux-shell/core/internal/deps" + "github.com/duxlabs-dev/dux-shell/core/internal/privesc" ) // ManualPackageInstaller provides methods for installing packages from source @@ -55,9 +55,9 @@ func (m *ManualPackageInstaller) InstallManualPackages(ctx context.Context, pack for _, pkg := range packages { variant := variantMap[pkg] switch pkg { - case "dms (DankMaterialShell)", "dms": + case "dms (Dux Shell)", "dms": if err := m.installDankMaterialShell(ctx, variant, sudoPassword, progressChan); err != nil { - return fmt.Errorf("failed to install DankMaterialShell: %w", err) + return fmt.Errorf("failed to install Dux Shell: %w", err) } case "niri": if err := m.installNiri(ctx, sudoPassword, progressChan); err != nil { @@ -442,7 +442,7 @@ func (m *ManualPackageInstaller) installMatugen(ctx context.Context, sudoPasswor } func (m *ManualPackageInstaller) installDankMaterialShell(ctx context.Context, variant deps.PackageVariant, sudoPassword string, progressChan chan<- InstallProgressMsg) error { - m.log("Installing DankMaterialShell (DMS)...") + m.log("Installing Dux Shell (DMS)...") if err := m.installDMSBinary(ctx, sudoPassword, progressChan); err != nil { m.logError("Failed to install DMS binary", err) @@ -454,9 +454,9 @@ func (m *ManualPackageInstaller) installDankMaterialShell(ctx context.Context, v progressChan <- InstallProgressMsg{ Phase: PhaseSystemPackages, Progress: 0.90, - Step: "Cloning DankMaterialShell...", + Step: "Cloning Dux Shell...", IsComplete: false, - CommandInfo: "git clone --recurse-submodules https://github.com/AvengeMedia/DankMaterialShell.git", + CommandInfo: "git clone --recurse-submodules https://github.com/duxlabs-dev/dux-shell.git", } configDir := filepath.Dir(dmsPath) @@ -465,9 +465,9 @@ func (m *ManualPackageInstaller) installDankMaterialShell(ctx context.Context, v } cloneCmd := exec.CommandContext(ctx, "git", "clone", "--recurse-submodules", - "https://github.com/AvengeMedia/DankMaterialShell.git", dmsPath) + "https://github.com/duxlabs-dev/dux-shell.git", dmsPath) if err := cloneCmd.Run(); err != nil { - return fmt.Errorf("failed to clone DankMaterialShell: %w", err) + return fmt.Errorf("failed to clone Dux Shell: %w", err) } if forceDMSGit || variant == deps.VariantGit { @@ -492,14 +492,14 @@ func (m *ManualPackageInstaller) installDankMaterialShell(ctx context.Context, v m.syncDMSSubmodules(ctx, dmsPath) m.log(fmt.Sprintf("Checked out latest tag: %s", latestTag)) - m.log("DankMaterialShell cloned successfully") + m.log("Dux Shell cloned successfully") return nil } progressChan <- InstallProgressMsg{ Phase: PhaseSystemPackages, Progress: 0.90, - Step: "Updating DankMaterialShell...", + Step: "Updating Dux Shell...", IsComplete: false, CommandInfo: "Updating ~/.config/quickshell/dms", } @@ -531,7 +531,7 @@ func (m *ManualPackageInstaller) installDankMaterialShell(ctx context.Context, v m.syncDMSSubmodules(ctx, dmsPath) - m.log("DankMaterialShell updated successfully (git variant)") + m.log("Dux Shell updated successfully (git variant)") return nil } diff --git a/core/internal/distros/opensuse.go b/core/internal/distros/opensuse.go index d9d195db1..703312b9d 100644 --- a/core/internal/distros/opensuse.go +++ b/core/internal/distros/opensuse.go @@ -9,8 +9,8 @@ import ( "slices" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" - "github.com/AvengeMedia/DankMaterialShell/core/internal/privesc" + "github.com/duxlabs-dev/dux-shell/core/internal/deps" + "github.com/duxlabs-dev/dux-shell/core/internal/privesc" ) func init() { @@ -134,7 +134,7 @@ func (o *OpenSUSEDistribution) SwapVariants(ctx context.Context, swaps []Variant func (o *OpenSUSEDistribution) detectDMSGreeter() deps.Dependency { gitInstalled := o.packageInstalled("dms-greeter-git") - dep := o.detectOptionalPackage("dms-greeter", "DankMaterialShell greetd greeter", gitInstalled || o.packageInstalled("dms-greeter")) + dep := o.detectOptionalPackage("dms-greeter", "Dux Shell greetd greeter", gitInstalled || o.packageInstalled("dms-greeter")) return withGitVariant(dep, gitInstalled) } @@ -152,13 +152,13 @@ func (o *OpenSUSEDistribution) GetPackageMappingWithVariants(wm deps.WindowManag "accountsservice": {Name: "accountsservice", Repository: RepoTypeSystem}, // DMS packages from OBS - "dms (DankMaterialShell)": o.getDmsMapping(variants["dms (DankMaterialShell)"]), - "quickshell": o.getQuickshellMapping(variants["quickshell"]), - "dms-greeter": variantMapping("dms-greeter", variants["dms-greeter"], RepoTypeOBS, "home:AvengeMedia:danklinux"), - "ghostty": {Name: "ghostty", Repository: RepoTypeOBS, RepoURL: "home:AvengeMedia:danklinux"}, - "matugen": {Name: "matugen", Repository: RepoTypeOBS, RepoURL: "home:AvengeMedia:danklinux"}, - "danksearch": {Name: "danksearch", Repository: RepoTypeOBS, RepoURL: "home:AvengeMedia:danklinux"}, - "dankcalendar": variantMapping("dankcalendar", variants["dankcalendar"], RepoTypeOBS, "home:AvengeMedia:danklinux"), + "dms (Dux Shell)": o.getDmsMapping(variants["dms (Dux Shell)"]), + "quickshell": o.getQuickshellMapping(variants["quickshell"]), + "dms-greeter": variantMapping("dms-greeter", variants["dms-greeter"], RepoTypeOBS, "home:AvengeMedia:danklinux"), + "ghostty": {Name: "ghostty", Repository: RepoTypeOBS, RepoURL: "home:AvengeMedia:danklinux"}, + "matugen": {Name: "matugen", Repository: RepoTypeOBS, RepoURL: "home:AvengeMedia:danklinux"}, + "danksearch": {Name: "danksearch", Repository: RepoTypeOBS, RepoURL: "home:AvengeMedia:danklinux"}, + "dankcalendar": variantMapping("dankcalendar", variants["dankcalendar"], RepoTypeOBS, "home:AvengeMedia:danklinux"), } switch wm { diff --git a/core/internal/distros/osinfo.go b/core/internal/distros/osinfo.go index 80eef9a95..97f54134e 100644 --- a/core/internal/distros/osinfo.go +++ b/core/internal/distros/osinfo.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/errdefs" + "github.com/duxlabs-dev/dux-shell/core/internal/errdefs" ) // DistroInfo contains basic information about a distribution diff --git a/core/internal/distros/pgpkey.go b/core/internal/distros/pgpkey.go index c603965d2..ff68d7560 100644 --- a/core/internal/distros/pgpkey.go +++ b/core/internal/distros/pgpkey.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/netfetch" + "github.com/duxlabs-dev/dux-shell/core/internal/netfetch" ) const ( diff --git a/core/internal/distros/pika.go b/core/internal/distros/pika.go index 5c017e3d9..ef6e90b9c 100644 --- a/core/internal/distros/pika.go +++ b/core/internal/distros/pika.go @@ -1,7 +1,7 @@ package distros import ( - "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" + "github.com/duxlabs-dev/dux-shell/core/internal/deps" ) // PikaOS carries the whole DMS stack in its own apt repo, so no OBS repos or backports. @@ -20,18 +20,18 @@ func (d *DebianDistribution) pikaPackageMapping(wm deps.WindowManager, variants return PackageMapping{Name: name, Repository: RepoTypeSystem} } packages := map[string]PackageMapping{ - "git": system("git"), - "kitty": system("kitty"), - "alacritty": system("alacritty"), - "ghostty": system("ghostty"), - "xdg-desktop-portal-gtk": system("xdg-desktop-portal-gtk"), - "accountsservice": system("accountsservice"), - "dms (DankMaterialShell)": variantMapping("dms", variants["dms (DankMaterialShell)"], RepoTypeSystem, ""), - "quickshell": variantMapping("quickshell", variants["quickshell"], RepoTypeSystem, ""), - "dms-greeter": variantMapping("dms-greeter", variants["dms-greeter"], RepoTypeSystem, ""), - "matugen": system("matugen"), - "danksearch": system("danksearch"), - "dankcalendar": variantMapping("dankcalendar", variants["dankcalendar"], RepoTypeSystem, ""), + "git": system("git"), + "kitty": system("kitty"), + "alacritty": system("alacritty"), + "ghostty": system("ghostty"), + "xdg-desktop-portal-gtk": system("xdg-desktop-portal-gtk"), + "accountsservice": system("accountsservice"), + "dms (Dux Shell)": variantMapping("dms", variants["dms (Dux Shell)"], RepoTypeSystem, ""), + "quickshell": variantMapping("quickshell", variants["quickshell"], RepoTypeSystem, ""), + "dms-greeter": variantMapping("dms-greeter", variants["dms-greeter"], RepoTypeSystem, ""), + "matugen": system("matugen"), + "danksearch": system("danksearch"), + "dankcalendar": variantMapping("dankcalendar", variants["dankcalendar"], RepoTypeSystem, ""), } switch wm { diff --git a/core/internal/distros/pika_test.go b/core/internal/distros/pika_test.go index 01fc5ac28..df56d51e8 100644 --- a/core/internal/distros/pika_test.go +++ b/core/internal/distros/pika_test.go @@ -3,14 +3,14 @@ package distros import ( "testing" - "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" + "github.com/duxlabs-dev/dux-shell/core/internal/deps" ) func TestPikaPackageMapping_SystemRepoOnly(t *testing.T) { d := NewDebianDistribution(Registry["pika"], nil) variants := map[string]deps.PackageVariant{ - "quickshell": deps.VariantGit, - "dms (DankMaterialShell)": deps.VariantGit, + "quickshell": deps.VariantGit, + "dms (Dux Shell)": deps.VariantGit, } for _, wm := range []deps.WindowManager{deps.WindowManagerNiri, deps.WindowManagerHyprland} { packages := d.GetPackageMappingWithVariants(wm, variants) @@ -19,8 +19,8 @@ func TestPikaPackageMapping_SystemRepoOnly(t *testing.T) { t.Errorf("%v: pika maps %s to %s, want system repo", wm, name, pkg.Repository) } } - if packages["dms (DankMaterialShell)"].Name != "dms-git" { - t.Errorf("%v: dms git variant = %s, want dms-git", wm, packages["dms (DankMaterialShell)"].Name) + if packages["dms (Dux Shell)"].Name != "dms-git" { + t.Errorf("%v: dms git variant = %s, want dms-git", wm, packages["dms (Dux Shell)"].Name) } } hypr := d.GetPackageMapping(deps.WindowManagerHyprland) diff --git a/core/internal/distros/ubuntu.go b/core/internal/distros/ubuntu.go index 1deccf08e..81e9355be 100644 --- a/core/internal/distros/ubuntu.go +++ b/core/internal/distros/ubuntu.go @@ -6,8 +6,8 @@ import ( "os/exec" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" - "github.com/AvengeMedia/DankMaterialShell/core/internal/privesc" + "github.com/duxlabs-dev/dux-shell/core/internal/deps" + "github.com/duxlabs-dev/dux-shell/core/internal/privesc" ) func init() { @@ -100,7 +100,7 @@ func (u *UbuntuDistribution) detectAccountsService() deps.Dependency { func (u *UbuntuDistribution) detectDMSGreeter() deps.Dependency { gitInstalled := u.packageInstalled("dms-greeter-git") - dep := u.detectOptionalPackage("dms-greeter", "DankMaterialShell greetd greeter", gitInstalled || u.packageInstalled("dms-greeter")) + dep := u.detectOptionalPackage("dms-greeter", "Dux Shell greetd greeter", gitInstalled || u.packageInstalled("dms-greeter")) return withGitVariant(dep, gitInstalled) } @@ -137,13 +137,13 @@ func (u *UbuntuDistribution) GetPackageMappingWithVariants(wm deps.WindowManager "accountsservice": {Name: "accountsservice", Repository: RepoTypeSystem}, // DMS packages from PPAs - "dms (DankMaterialShell)": u.getDmsMapping(variants["dms (DankMaterialShell)"]), - "quickshell": u.getQuickshellMapping(variants["quickshell"]), - "dms-greeter": variantMapping("dms-greeter", variants["dms-greeter"], RepoTypePPA, "ppa:avengemedia/danklinux"), - "matugen": {Name: "matugen", Repository: RepoTypePPA, RepoURL: "ppa:avengemedia/danklinux"}, - "ghostty": {Name: "ghostty", Repository: RepoTypePPA, RepoURL: "ppa:avengemedia/danklinux"}, - "danksearch": {Name: "danksearch", Repository: RepoTypePPA, RepoURL: "ppa:avengemedia/danklinux"}, - "dankcalendar": variantMapping("dankcalendar", variants["dankcalendar"], RepoTypePPA, "ppa:avengemedia/danklinux"), + "dms (Dux Shell)": u.getDmsMapping(variants["dms (Dux Shell)"]), + "quickshell": u.getQuickshellMapping(variants["quickshell"]), + "dms-greeter": variantMapping("dms-greeter", variants["dms-greeter"], RepoTypePPA, "ppa:avengemedia/danklinux"), + "matugen": {Name: "matugen", Repository: RepoTypePPA, RepoURL: "ppa:avengemedia/danklinux"}, + "ghostty": {Name: "ghostty", Repository: RepoTypePPA, RepoURL: "ppa:avengemedia/danklinux"}, + "danksearch": {Name: "danksearch", Repository: RepoTypePPA, RepoURL: "ppa:avengemedia/danklinux"}, + "dankcalendar": variantMapping("dankcalendar", variants["dankcalendar"], RepoTypePPA, "ppa:avengemedia/danklinux"), } switch wm { diff --git a/core/internal/distros/variant_swap.go b/core/internal/distros/variant_swap.go index 1da078f7a..8aa7c71c7 100644 --- a/core/internal/distros/variant_swap.go +++ b/core/internal/distros/variant_swap.go @@ -6,7 +6,7 @@ import ( "maps" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" + "github.com/duxlabs-dev/dux-shell/core/internal/deps" ) // VariantSwap replaces the installed variant of a dependency with its other variant. diff --git a/core/internal/distros/variant_swap_test.go b/core/internal/distros/variant_swap_test.go index a129e6574..9965eee00 100644 --- a/core/internal/distros/variant_swap_test.go +++ b/core/internal/distros/variant_swap_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" + "github.com/duxlabs-dev/dux-shell/core/internal/deps" ) type swapFake struct { diff --git a/core/internal/distros/void.go b/core/internal/distros/void.go index d5e6f6b28..e7cd9083a 100644 --- a/core/internal/distros/void.go +++ b/core/internal/distros/void.go @@ -8,9 +8,9 @@ import ( "path/filepath" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" - "github.com/AvengeMedia/DankMaterialShell/core/internal/privesc" - "github.com/AvengeMedia/DankMaterialShell/core/internal/site" + "github.com/duxlabs-dev/dux-shell/core/internal/deps" + "github.com/duxlabs-dev/dux-shell/core/internal/privesc" + "github.com/duxlabs-dev/dux-shell/core/internal/site" ) const ( @@ -108,7 +108,7 @@ func (v *VoidDistribution) detectDMS() deps.Dependency { } return deps.Dependency{ - Name: "dms (DankMaterialShell)", + Name: "dms (Dux Shell)", Status: status, Version: version, Description: "Desktop Management System package", @@ -130,7 +130,7 @@ func (v *VoidDistribution) detectXDGPortal() deps.Dependency { func (v *VoidDistribution) detectDMSGreeter() deps.Dependency { gitInstalled := v.packageInstalled("dms-greeter-git") - dep := v.detectOptionalPackage("dms-greeter", "DankMaterialShell greetd greeter", gitInstalled || v.packageInstalled("dms-greeter")) + dep := v.detectOptionalPackage("dms-greeter", "Dux Shell greetd greeter", gitInstalled || v.packageInstalled("dms-greeter")) return withGitVariant(dep, gitInstalled) } @@ -217,12 +217,12 @@ func (v *VoidDistribution) GetPackageMappingWithVariants(wm deps.WindowManager, "elogind": {Name: "elogind", Repository: RepoTypeSystem}, "mesa-dri": {Name: "mesa-dri", Repository: RepoTypeSystem}, - "quickshell": {Name: "quickshell", Repository: RepoTypeSystem}, - "matugen": {Name: "matugen", Repository: RepoTypeSystem}, - "dms (DankMaterialShell)": v.getDmsMapping(variants["dms (DankMaterialShell)"]), - "dms-greeter": variantMapping("dms-greeter", variants["dms-greeter"], RepoTypeXBPS, VoidDMSRepo), - "danksearch": {Name: "danksearch", Repository: RepoTypeXBPS, RepoURL: VoidDankLinuxRepo}, - "dankcalendar": {Name: "dankcalendar", Repository: RepoTypeXBPS, RepoURL: VoidDankLinuxRepo}, + "quickshell": {Name: "quickshell", Repository: RepoTypeSystem}, + "matugen": {Name: "matugen", Repository: RepoTypeSystem}, + "dms (Dux Shell)": v.getDmsMapping(variants["dms (Dux Shell)"]), + "dms-greeter": variantMapping("dms-greeter", variants["dms-greeter"], RepoTypeXBPS, VoidDMSRepo), + "danksearch": {Name: "danksearch", Repository: RepoTypeXBPS, RepoURL: VoidDankLinuxRepo}, + "dankcalendar": {Name: "dankcalendar", Repository: RepoTypeXBPS, RepoURL: VoidDankLinuxRepo}, } switch wm { diff --git a/core/internal/dmenuipc/queue.go b/core/internal/dmenuipc/queue.go index 4ea00ed76..512c7e4d5 100644 --- a/core/internal/dmenuipc/queue.go +++ b/core/internal/dmenuipc/queue.go @@ -6,7 +6,7 @@ import ( "path/filepath" "syscall" - "github.com/AvengeMedia/DankMaterialShell/core/internal/utils" + "github.com/duxlabs-dev/dux-shell/core/internal/utils" ) func AcquireQueueSlot(onWait func()) (release func(), err error) { diff --git a/core/internal/dmenuipc/socket.go b/core/internal/dmenuipc/socket.go index ec9536217..561cee8c2 100644 --- a/core/internal/dmenuipc/socket.go +++ b/core/internal/dmenuipc/socket.go @@ -11,7 +11,7 @@ import ( "path/filepath" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/utils" + "github.com/duxlabs-dev/dux-shell/core/internal/utils" ) type Range struct { diff --git a/core/internal/errdefs/errdefs.go b/core/internal/errdefs/errdefs.go index db459076b..5e4b1506d 100644 --- a/core/internal/errdefs/errdefs.go +++ b/core/internal/errdefs/errdefs.go @@ -1,7 +1,7 @@ package errdefs import ( - dankerrdefs "github.com/AvengeMedia/dankgo/errdefs" + dankerrdefs "github.com/duxlabs-dev/dux-go/errdefs" ) type ErrorType = dankerrdefs.ErrorType diff --git a/core/internal/geolocation/client.go b/core/internal/geolocation/client.go index fbf04a935..49b3a6085 100644 --- a/core/internal/geolocation/client.go +++ b/core/internal/geolocation/client.go @@ -1,6 +1,6 @@ package geolocation -import "github.com/AvengeMedia/DankMaterialShell/core/internal/log" +import "github.com/duxlabs-dev/dux-shell/core/internal/log" func NewClient() Client { geoclueClient, err := newGeoClueClient() diff --git a/core/internal/geolocation/client_geoclue.go b/core/internal/geolocation/client_geoclue.go index b77bd237c..5900fd7d3 100644 --- a/core/internal/geolocation/client_geoclue.go +++ b/core/internal/geolocation/client_geoclue.go @@ -4,9 +4,9 @@ import ( "fmt" "sync" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" - "github.com/AvengeMedia/dankgo/dbusutil" - "github.com/AvengeMedia/dankgo/syncmap" + "github.com/duxlabs-dev/dux-go/dbusutil" + "github.com/duxlabs-dev/dux-go/syncmap" + "github.com/duxlabs-dev/dux-shell/core/internal/log" "github.com/godbus/dbus/v5" ) diff --git a/core/internal/gpu/eglvendor.go b/core/internal/gpu/eglvendor.go index d21b4c907..56efb4911 100644 --- a/core/internal/gpu/eglvendor.go +++ b/core/internal/gpu/eglvendor.go @@ -10,9 +10,9 @@ import ( "strings" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" - "github.com/AvengeMedia/DankMaterialShell/core/internal/proto/linux_dmabuf" - wlclient "github.com/AvengeMedia/dankgo/wayland/client" + wlclient "github.com/duxlabs-dev/dux-go/wayland/client" + "github.com/duxlabs-dev/dux-shell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/proto/linux_dmabuf" "golang.org/x/sys/unix" ) diff --git a/core/internal/headless/runner.go b/core/internal/headless/runner.go index 6ada8078b..abdd176fc 100644 --- a/core/internal/headless/runner.go +++ b/core/internal/headless/runner.go @@ -6,11 +6,11 @@ import ( "os" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/config" - "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" - "github.com/AvengeMedia/DankMaterialShell/core/internal/distros" - "github.com/AvengeMedia/DankMaterialShell/core/internal/privesc" - "github.com/AvengeMedia/DankMaterialShell/core/internal/utils" + "github.com/duxlabs-dev/dux-shell/core/internal/config" + "github.com/duxlabs-dev/dux-shell/core/internal/deps" + "github.com/duxlabs-dev/dux-shell/core/internal/distros" + "github.com/duxlabs-dev/dux-shell/core/internal/privesc" + "github.com/duxlabs-dev/dux-shell/core/internal/utils" ) // ErrConfirmationRequired is returned when --yes is not set and the user @@ -366,7 +366,7 @@ func (r *Runner) applyGitVariants(dependencies []deps.Dependency, hasGitVariant func findDepFold(dependencies []deps.Dependency, lowerName string) *deps.Dependency { if lowerName == "dms" { - lowerName = "dms (dankmaterialshell)" + lowerName = "dms (dux shell)" } for i := range dependencies { if strings.ToLower(dependencies[i].Name) == lowerName { @@ -432,7 +432,7 @@ func (r *Runner) buildDisabledItems(dependencies []deps.Dependency) (map[string] return nil, fmt.Errorf("--exclude-deps: unknown dependency %q", name) } // Don't allow excluding DMS itself - if name == "dms (DankMaterialShell)" { + if name == "dms (Dux Shell)" { return nil, fmt.Errorf("--exclude-deps: cannot exclude required package %q", name) } disabledItems[name] = true diff --git a/core/internal/headless/runner_test.go b/core/internal/headless/runner_test.go index 89e0e4015..d740e0761 100644 --- a/core/internal/headless/runner_test.go +++ b/core/internal/headless/runner_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" + "github.com/duxlabs-dev/dux-shell/core/internal/deps" ) func TestParseWindowManager(t *testing.T) { @@ -200,7 +200,7 @@ func TestBuildDisabledItems(t *testing.T) { dependencies := []deps.Dependency{ {Name: "niri", Status: deps.StatusInstalled, Required: true}, {Name: "ghostty", Status: deps.StatusMissing, Required: true}, - {Name: "dms (DankMaterialShell)", Status: deps.StatusInstalled, Required: true}, + {Name: "dms (Dux Shell)", Status: deps.StatusInstalled, Required: true}, {Name: "dms-greeter", Status: deps.StatusMissing}, {Name: "danksearch", Status: deps.StatusMissing}, {Name: "dankcalendar", Status: deps.StatusMissing}, @@ -251,7 +251,7 @@ func TestBuildDisabledItems(t *testing.T) { }, { name: "exclude DMS itself is forbidden", - excludeDeps: []string{"dms (DankMaterialShell)"}, + excludeDeps: []string{"dms (Dux Shell)"}, wantErr: true, errContains: "cannot exclude required package", }, @@ -383,7 +383,7 @@ func TestApplyGitVariants(t *testing.T) { {Name: "niri", Status: deps.StatusInstalled, Variant: deps.VariantStable, CanToggle: true}, {Name: "quickshell", Status: deps.StatusMissing, Variant: deps.VariantStable, CanToggle: true}, {Name: "hyprland", Status: deps.StatusInstalled, Variant: deps.VariantGit, CanToggle: true}, - {Name: "dms (DankMaterialShell)", Status: deps.StatusMissing, Variant: deps.VariantStable, CanToggle: true}, + {Name: "dms (Dux Shell)", Status: deps.StatusMissing, Variant: deps.VariantStable, CanToggle: true}, {Name: "ghostty", Status: deps.StatusInstalled, Variant: deps.VariantStable, CanToggle: false}, } } @@ -402,19 +402,19 @@ func TestApplyGitVariants(t *testing.T) { { name: "no git flags leaves variants untouched", wantGit: []string{"hyprland"}, - wantStable: []string{"niri", "quickshell", "dms (DankMaterialShell)", "ghostty"}, + wantStable: []string{"niri", "quickshell", "dms (Dux Shell)", "ghostty"}, }, { name: "git-deps flips only the named deps", gitDeps: []string{"niri", "quickshell"}, wantGit: []string{"niri", "quickshell", "hyprland"}, - wantStable: []string{"dms (DankMaterialShell)", "ghostty"}, + wantStable: []string{"dms (Dux Shell)", "ghostty"}, wantReinstall: []string{"niri"}, }, { name: "git-deps matches names case-insensitively and accepts the dms alias", gitDeps: []string{"NIRI", "dms"}, - wantGit: []string{"niri", "dms (DankMaterialShell)", "hyprland"}, + wantGit: []string{"niri", "dms (Dux Shell)", "hyprland"}, wantStable: []string{"quickshell", "ghostty"}, wantReinstall: []string{"niri"}, }, @@ -422,7 +422,7 @@ func TestApplyGitVariants(t *testing.T) { name: "empty and whitespace entries are skipped", gitDeps: []string{"", " "}, wantGit: []string{"hyprland"}, - wantStable: []string{"niri", "quickshell", "dms (DankMaterialShell)", "ghostty"}, + wantStable: []string{"niri", "quickshell", "dms (Dux Shell)", "ghostty"}, }, { name: "unknown dep errors", @@ -439,7 +439,7 @@ func TestApplyGitVariants(t *testing.T) { { name: "git flips every toggleable dep", gitAll: true, - wantGit: []string{"niri", "quickshell", "hyprland", "dms (DankMaterialShell)"}, + wantGit: []string{"niri", "quickshell", "hyprland", "dms (Dux Shell)"}, wantStable: []string{"ghostty"}, wantReinstall: []string{"niri"}, }, @@ -454,7 +454,7 @@ func TestApplyGitVariants(t *testing.T) { name: "git skips deps without a distinct git package", gitAll: true, noGitVariant: []string{"niri"}, - wantGit: []string{"quickshell", "hyprland", "dms (DankMaterialShell)"}, + wantGit: []string{"quickshell", "hyprland", "dms (Dux Shell)"}, wantStable: []string{"niri", "ghostty"}, wantReinstall: nil, }, diff --git a/core/internal/highlight/highlight_test.go b/core/internal/highlight/highlight_test.go index a20d5b224..90b5059c0 100644 --- a/core/internal/highlight/highlight_test.go +++ b/core/internal/highlight/highlight_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/AvengeMedia/DankMaterialShell/core/internal/highlight/styles" "github.com/alecthomas/chroma/v2/formatters/html" + "github.com/duxlabs-dev/dux-shell/core/internal/highlight/styles" "github.com/yuin/goldmark" ) diff --git a/core/internal/highlight/markdown.go b/core/internal/highlight/markdown.go index e671245dc..7466f6fcf 100644 --- a/core/internal/highlight/markdown.go +++ b/core/internal/highlight/markdown.go @@ -3,9 +3,9 @@ package highlight import ( "bytes" - "github.com/AvengeMedia/DankMaterialShell/core/internal/highlight/lexers" "github.com/alecthomas/chroma/v2" "github.com/alecthomas/chroma/v2/formatters/html" + "github.com/duxlabs-dev/dux-shell/core/internal/highlight/lexers" "github.com/yuin/goldmark" "github.com/yuin/goldmark/ast" "github.com/yuin/goldmark/renderer" diff --git a/core/internal/keybinds/discovery.go b/core/internal/keybinds/discovery.go index 499097559..59ed089de 100644 --- a/core/internal/keybinds/discovery.go +++ b/core/internal/keybinds/discovery.go @@ -6,7 +6,7 @@ import ( "path/filepath" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/utils" + "github.com/duxlabs-dev/dux-shell/core/internal/utils" ) type DiscoveryConfig struct { @@ -18,14 +18,14 @@ func DefaultDiscoveryConfig() *DiscoveryConfig { configDir, err := os.UserConfigDir() if err == nil && configDir != "" { - searchPaths = append(searchPaths, filepath.Join(configDir, "DankMaterialShell", "cheatsheets")) + searchPaths = append(searchPaths, filepath.Join(configDir, "dms", "cheatsheets")) } configDirs := os.Getenv("XDG_CONFIG_DIRS") if configDirs != "" { for dir := range strings.SplitSeq(configDirs, ":") { if dir != "" { - searchPaths = append(searchPaths, filepath.Join(dir, "DankMaterialShell", "cheatsheets")) + searchPaths = append(searchPaths, filepath.Join(dir, "dms", "cheatsheets")) } } } diff --git a/core/internal/keybinds/discovery_test.go b/core/internal/keybinds/discovery_test.go index 306c3625c..ffe23a529 100644 --- a/core/internal/keybinds/discovery_test.go +++ b/core/internal/keybinds/discovery_test.go @@ -28,7 +28,7 @@ func TestDefaultDiscoveryConfig(t *testing.T) { configDirs: "", expectedCount: 1, checkFirstPath: true, - firstPath: "/custom/config/DankMaterialShell/cheatsheets", + firstPath: "/custom/config/dms/cheatsheets", }, { name: "with XDG_CONFIG_DIRS set", diff --git a/core/internal/keybinds/providers/aqueous.go b/core/internal/keybinds/providers/aqueous.go index b3ba72ff7..38b0295c7 100644 --- a/core/internal/keybinds/providers/aqueous.go +++ b/core/internal/keybinds/providers/aqueous.go @@ -7,7 +7,7 @@ import ( "slices" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/keybinds" + "github.com/duxlabs-dev/dux-shell/core/internal/keybinds" ) type AqueousProvider struct{} diff --git a/core/internal/keybinds/providers/aqueous_config.go b/core/internal/keybinds/providers/aqueous_config.go index 25ab8d2c6..4705d2158 100644 --- a/core/internal/keybinds/providers/aqueous_config.go +++ b/core/internal/keybinds/providers/aqueous_config.go @@ -9,7 +9,7 @@ import ( "path/filepath" "slices" - "github.com/AvengeMedia/DankMaterialShell/core/internal/utils" + "github.com/duxlabs-dev/dux-shell/core/internal/utils" ) func helperResult(ctx context.Context, verb string, input []byte) (aqueousConfig, error) { @@ -91,7 +91,7 @@ func aqueousHelper(ctx context.Context, verb string, request aqueousConfig) (aqu if err != nil { return nil, err } - request["backup_dir"] = filepath.Join(configDir, "DankMaterialShell", "aqueous-backups") + request["backup_dir"] = filepath.Join(configDir, "dms", "aqueous-backups") } input, err := json.Marshal(request) if err != nil { diff --git a/core/internal/keybinds/providers/aqueous_test.go b/core/internal/keybinds/providers/aqueous_test.go index 4db378f95..78c4844d0 100644 --- a/core/internal/keybinds/providers/aqueous_test.go +++ b/core/internal/keybinds/providers/aqueous_test.go @@ -9,7 +9,7 @@ import ( "reflect" "testing" - "github.com/AvengeMedia/DankMaterialShell/core/internal/utils" + "github.com/duxlabs-dev/dux-shell/core/internal/utils" ) func aqueousFixture(t *testing.T) aqueousConfig { diff --git a/core/internal/keybinds/providers/hyprland.go b/core/internal/keybinds/providers/hyprland.go index 2b0dcc831..cf3f269b8 100644 --- a/core/internal/keybinds/providers/hyprland.go +++ b/core/internal/keybinds/providers/hyprland.go @@ -9,8 +9,8 @@ import ( "strconv" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/keybinds" - "github.com/AvengeMedia/DankMaterialShell/core/internal/utils" + "github.com/duxlabs-dev/dux-shell/core/internal/keybinds" + "github.com/duxlabs-dev/dux-shell/core/internal/utils" ) type HyprlandProvider struct { diff --git a/core/internal/keybinds/providers/hyprland_parser.go b/core/internal/keybinds/providers/hyprland_parser.go index d83f29601..abdac8473 100644 --- a/core/internal/keybinds/providers/hyprland_parser.go +++ b/core/internal/keybinds/providers/hyprland_parser.go @@ -1,7 +1,7 @@ package providers import ( - "github.com/AvengeMedia/DankMaterialShell/core/internal/configfrag" + "github.com/duxlabs-dev/dux-shell/core/internal/configfrag" "os" "path/filepath" "regexp" @@ -9,8 +9,8 @@ import ( "strconv" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/luaconfig" - "github.com/AvengeMedia/DankMaterialShell/core/internal/utils" + "github.com/duxlabs-dev/dux-shell/core/internal/luaconfig" + "github.com/duxlabs-dev/dux-shell/core/internal/utils" ) const ( diff --git a/core/internal/keybinds/providers/hyprland_parser_test.go b/core/internal/keybinds/providers/hyprland_parser_test.go index 1ca389c0a..fc979217f 100644 --- a/core/internal/keybinds/providers/hyprland_parser_test.go +++ b/core/internal/keybinds/providers/hyprland_parser_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/AvengeMedia/DankMaterialShell/core/internal/keybinds" + "github.com/duxlabs-dev/dux-shell/core/internal/keybinds" ) func TestHyprlandAutogenerateComment(t *testing.T) { diff --git a/core/internal/keybinds/providers/hyprland_test.go b/core/internal/keybinds/providers/hyprland_test.go index e3b94b071..360a7cd93 100644 --- a/core/internal/keybinds/providers/hyprland_test.go +++ b/core/internal/keybinds/providers/hyprland_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - "github.com/AvengeMedia/DankMaterialShell/core/internal/keybinds" + "github.com/duxlabs-dev/dux-shell/core/internal/keybinds" ) func TestHyprlandProviderGetCheatSheet(t *testing.T) { diff --git a/core/internal/keybinds/providers/jsonfile.go b/core/internal/keybinds/providers/jsonfile.go index 34f672299..e9576adaf 100644 --- a/core/internal/keybinds/providers/jsonfile.go +++ b/core/internal/keybinds/providers/jsonfile.go @@ -6,8 +6,8 @@ import ( "os" "path/filepath" - "github.com/AvengeMedia/DankMaterialShell/core/internal/keybinds" - "github.com/AvengeMedia/DankMaterialShell/core/internal/utils" + "github.com/duxlabs-dev/dux-shell/core/internal/keybinds" + "github.com/duxlabs-dev/dux-shell/core/internal/utils" ) type JSONFileProvider struct { diff --git a/core/internal/keybinds/providers/mangowc.go b/core/internal/keybinds/providers/mangowc.go index ab87c3d94..ee957f2c0 100644 --- a/core/internal/keybinds/providers/mangowc.go +++ b/core/internal/keybinds/providers/mangowc.go @@ -9,10 +9,10 @@ import ( "sort" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/config" - "github.com/AvengeMedia/DankMaterialShell/core/internal/keybinds" - "github.com/AvengeMedia/DankMaterialShell/core/internal/mangoconf" - "github.com/AvengeMedia/DankMaterialShell/core/internal/utils" + "github.com/duxlabs-dev/dux-shell/core/internal/config" + "github.com/duxlabs-dev/dux-shell/core/internal/keybinds" + "github.com/duxlabs-dev/dux-shell/core/internal/mangoconf" + "github.com/duxlabs-dev/dux-shell/core/internal/utils" ) type MangoWCProvider struct { diff --git a/core/internal/keybinds/providers/mangowc_parser.go b/core/internal/keybinds/providers/mangowc_parser.go index 199f21a90..22862c8e2 100644 --- a/core/internal/keybinds/providers/mangowc_parser.go +++ b/core/internal/keybinds/providers/mangowc_parser.go @@ -1,14 +1,14 @@ package providers import ( - "github.com/AvengeMedia/DankMaterialShell/core/internal/configfrag" + "github.com/duxlabs-dev/dux-shell/core/internal/configfrag" "os" "path/filepath" "regexp" "slices" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/utils" + "github.com/duxlabs-dev/dux-shell/core/internal/utils" ) const ( diff --git a/core/internal/keybinds/providers/mangowc_test.go b/core/internal/keybinds/providers/mangowc_test.go index fd718518e..6e3304b2b 100644 --- a/core/internal/keybinds/providers/mangowc_test.go +++ b/core/internal/keybinds/providers/mangowc_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/AvengeMedia/DankMaterialShell/core/internal/config" - "github.com/AvengeMedia/DankMaterialShell/core/internal/mangoconf" + "github.com/duxlabs-dev/dux-shell/core/internal/config" + "github.com/duxlabs-dev/dux-shell/core/internal/mangoconf" ) func TestMangoWCCategorizeByCommand(t *testing.T) { diff --git a/core/internal/keybinds/providers/miracle.go b/core/internal/keybinds/providers/miracle.go index 1abdd7374..c81f4c25b 100644 --- a/core/internal/keybinds/providers/miracle.go +++ b/core/internal/keybinds/providers/miracle.go @@ -6,8 +6,8 @@ import ( "path/filepath" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/keybinds" - "github.com/AvengeMedia/DankMaterialShell/core/internal/utils" + "github.com/duxlabs-dev/dux-shell/core/internal/keybinds" + "github.com/duxlabs-dev/dux-shell/core/internal/utils" ) type MiracleProvider struct { diff --git a/core/internal/keybinds/providers/miracle_parser.go b/core/internal/keybinds/providers/miracle_parser.go index 557c0b571..bbae260b8 100644 --- a/core/internal/keybinds/providers/miracle_parser.go +++ b/core/internal/keybinds/providers/miracle_parser.go @@ -5,7 +5,7 @@ import ( "path/filepath" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/utils" + "github.com/duxlabs-dev/dux-shell/core/internal/utils" "gopkg.in/yaml.v3" ) diff --git a/core/internal/keybinds/providers/niri.go b/core/internal/keybinds/providers/niri.go index aef65a57d..7c638a828 100644 --- a/core/internal/keybinds/providers/niri.go +++ b/core/internal/keybinds/providers/niri.go @@ -13,7 +13,7 @@ import ( "strings" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/keybinds" + "github.com/duxlabs-dev/dux-shell/core/internal/keybinds" "github.com/sblinch/kdl-go/document" ) diff --git a/core/internal/keybinds/providers/niri_parser.go b/core/internal/keybinds/providers/niri_parser.go index 276fae589..81a4ca998 100644 --- a/core/internal/keybinds/providers/niri_parser.go +++ b/core/internal/keybinds/providers/niri_parser.go @@ -2,7 +2,7 @@ package providers import ( "fmt" - "github.com/AvengeMedia/DankMaterialShell/core/internal/configfrag" + "github.com/duxlabs-dev/dux-shell/core/internal/configfrag" "os" "path/filepath" "strconv" diff --git a/core/internal/keybinds/providers/niri_test.go b/core/internal/keybinds/providers/niri_test.go index 357d655ef..474f251cd 100644 --- a/core/internal/keybinds/providers/niri_test.go +++ b/core/internal/keybinds/providers/niri_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - "github.com/AvengeMedia/DankMaterialShell/core/internal/keybinds" + "github.com/duxlabs-dev/dux-shell/core/internal/keybinds" ) func TestNiriProviderGetCheatSheet(t *testing.T) { diff --git a/core/internal/keybinds/providers/sway.go b/core/internal/keybinds/providers/sway.go index 666fa46b4..bd1288940 100644 --- a/core/internal/keybinds/providers/sway.go +++ b/core/internal/keybinds/providers/sway.go @@ -6,7 +6,7 @@ import ( "path/filepath" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/keybinds" + "github.com/duxlabs-dev/dux-shell/core/internal/keybinds" ) type SwayProvider struct { diff --git a/core/internal/keybinds/providers/sway_parser.go b/core/internal/keybinds/providers/sway_parser.go index c5c23e5d4..7bfc32ff5 100644 --- a/core/internal/keybinds/providers/sway_parser.go +++ b/core/internal/keybinds/providers/sway_parser.go @@ -7,7 +7,7 @@ import ( "slices" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/utils" + "github.com/duxlabs-dev/dux-shell/core/internal/utils" ) const ( diff --git a/core/internal/keybinds/providers/sway_test.go b/core/internal/keybinds/providers/sway_test.go index 6cf6efcba..294ef7176 100644 --- a/core/internal/keybinds/providers/sway_test.go +++ b/core/internal/keybinds/providers/sway_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - "github.com/AvengeMedia/DankMaterialShell/core/internal/keybinds" + "github.com/duxlabs-dev/dux-shell/core/internal/keybinds" ) func TestSwayCategorizeByCommand(t *testing.T) { diff --git a/core/internal/keybinds/status_wire_test.go b/core/internal/keybinds/status_wire_test.go index a53d69e8c..158e79b6b 100644 --- a/core/internal/keybinds/status_wire_test.go +++ b/core/internal/keybinds/status_wire_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "testing" - "github.com/AvengeMedia/DankMaterialShell/core/internal/configfrag" + "github.com/duxlabs-dev/dux-shell/core/internal/configfrag" ) func marshalKeys(t *testing.T, v any) map[string]json.RawMessage { diff --git a/core/internal/keybinds/types.go b/core/internal/keybinds/types.go index 51f28065c..3c49415e0 100644 --- a/core/internal/keybinds/types.go +++ b/core/internal/keybinds/types.go @@ -3,7 +3,7 @@ package keybinds import ( "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/configfrag" + "github.com/duxlabs-dev/dux-shell/core/internal/configfrag" ) type Keybind struct { diff --git a/core/internal/log/log.go b/core/internal/log/log.go index fdf465f97..955627db3 100644 --- a/core/internal/log/log.go +++ b/core/internal/log/log.go @@ -1,7 +1,7 @@ package log import ( - danklog "github.com/AvengeMedia/dankgo/log" + danklog "github.com/duxlabs-dev/dux-go/log" ) type Logger = danklog.Logger diff --git a/core/internal/matugen/matugen.go b/core/internal/matugen/matugen.go index 16b3ffc98..72ce55084 100644 --- a/core/internal/matugen/matugen.go +++ b/core/internal/matugen/matugen.go @@ -18,10 +18,10 @@ import ( "syscall" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/dank16" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" - "github.com/AvengeMedia/DankMaterialShell/core/internal/mangoconf" - "github.com/AvengeMedia/DankMaterialShell/core/internal/utils" + "github.com/duxlabs-dev/dux-shell/core/internal/dank16" + "github.com/duxlabs-dev/dux-shell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/mangoconf" + "github.com/duxlabs-dev/dux-shell/core/internal/utils" "github.com/godbus/dbus/v5" "github.com/lucasb-eyer/go-colorful" ) diff --git a/core/internal/matugen/matugen_test.go b/core/internal/matugen/matugen_test.go index 952540f75..6a37cc984 100644 --- a/core/internal/matugen/matugen_test.go +++ b/core/internal/matugen/matugen_test.go @@ -14,9 +14,9 @@ import ( "testing" "time" - mocks_utils "github.com/AvengeMedia/DankMaterialShell/core/internal/mocks/utils" - "github.com/AvengeMedia/DankMaterialShell/core/internal/utils" - matcolor "github.com/AvengeMedia/dankgo/material/color" + matcolor "github.com/duxlabs-dev/dux-go/material/color" + mocks_utils "github.com/duxlabs-dev/dux-shell/core/internal/mocks/utils" + "github.com/duxlabs-dev/dux-shell/core/internal/utils" "github.com/stretchr/testify/assert" ) diff --git a/core/internal/matugen/paletteinject.go b/core/internal/matugen/paletteinject.go index b310b4b7b..89edb9a02 100644 --- a/core/internal/matugen/paletteinject.go +++ b/core/internal/matugen/paletteinject.go @@ -10,8 +10,8 @@ import ( "strings" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" - "github.com/AvengeMedia/DankMaterialShell/core/internal/utils" + "github.com/duxlabs-dev/dux-shell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/utils" ) // paletteEntry runs an external command that emits a JSON object of colors and diff --git a/core/internal/matugen/qtengine.go b/core/internal/matugen/qtengine.go index f74aace36..558fa782e 100644 --- a/core/internal/matugen/qtengine.go +++ b/core/internal/matugen/qtengine.go @@ -7,7 +7,7 @@ import ( "os" "path/filepath" - "github.com/AvengeMedia/DankMaterialShell/core/internal/utils" + "github.com/duxlabs-dev/dux-shell/core/internal/utils" ) // Options.IconTheme defaults to this UI label rather than a real icon theme name. diff --git a/core/internal/matugen/queue.go b/core/internal/matugen/queue.go index 327a1024d..81db1d9f1 100644 --- a/core/internal/matugen/queue.go +++ b/core/internal/matugen/queue.go @@ -6,8 +6,8 @@ import ( "runtime" "sync" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" - "github.com/AvengeMedia/DankMaterialShell/core/internal/lowprio" + "github.com/duxlabs-dev/dux-shell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/lowprio" ) type Result struct { diff --git a/core/internal/matugen/sourcecolor.go b/core/internal/matugen/sourcecolor.go index c87b08017..b37a7f2e7 100644 --- a/core/internal/matugen/sourcecolor.go +++ b/core/internal/matugen/sourcecolor.go @@ -11,10 +11,10 @@ import ( "os" "slices" - "github.com/AvengeMedia/dankgo/material/color" - "github.com/AvengeMedia/dankgo/material/dislike" - "github.com/AvengeMedia/dankgo/material/num" - "github.com/AvengeMedia/dankgo/material/quantizer" + "github.com/duxlabs-dev/dux-go/material/color" + "github.com/duxlabs-dev/dux-go/material/dislike" + "github.com/duxlabs-dev/dux-go/material/num" + "github.com/duxlabs-dev/dux-go/material/quantizer" _ "golang.org/x/image/bmp" xdraw "golang.org/x/image/draw" _ "golang.org/x/image/tiff" diff --git a/core/internal/matugen/spec.go b/core/internal/matugen/spec.go index 5130e4563..35aea9bac 100644 --- a/core/internal/matugen/spec.go +++ b/core/internal/matugen/spec.go @@ -6,9 +6,9 @@ import ( "regexp" "strings" - "github.com/AvengeMedia/dankgo/material/color" - "github.com/AvengeMedia/dankgo/material/dynamic" - "github.com/AvengeMedia/dankgo/material/palettes" + "github.com/duxlabs-dev/dux-go/material/color" + "github.com/duxlabs-dev/dux-go/material/dynamic" + "github.com/duxlabs-dev/dux-go/material/palettes" ) // Palette spec versions. Spec2021 is matugen's own output and the historical diff --git a/core/internal/mocks/cups/mock_CUPSClientInterface.go b/core/internal/mocks/cups/mock_CUPSClientInterface.go index 10bb3b1eb..56459f6db 100644 --- a/core/internal/mocks/cups/mock_CUPSClientInterface.go +++ b/core/internal/mocks/cups/mock_CUPSClientInterface.go @@ -7,7 +7,7 @@ package mocks_cups import ( "io" - "github.com/AvengeMedia/DankMaterialShell/core/pkg/ipp" + "github.com/duxlabs-dev/dux-shell/core/pkg/ipp" mock "github.com/stretchr/testify/mock" ) diff --git a/core/internal/mocks/cups_pkhelper/mock_PkHelper.go b/core/internal/mocks/cups_pkhelper/mock_PkHelper.go index 54d281226..404d6970e 100644 --- a/core/internal/mocks/cups_pkhelper/mock_PkHelper.go +++ b/core/internal/mocks/cups_pkhelper/mock_PkHelper.go @@ -5,7 +5,7 @@ package mocks_cups_pkhelper import ( - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/cups" + "github.com/duxlabs-dev/dux-shell/core/internal/server/cups" mock "github.com/stretchr/testify/mock" ) diff --git a/core/internal/mocks/geolocation/mock_Client.go b/core/internal/mocks/geolocation/mock_Client.go index 7252bbf52..1c1d2be12 100644 --- a/core/internal/mocks/geolocation/mock_Client.go +++ b/core/internal/mocks/geolocation/mock_Client.go @@ -5,7 +5,7 @@ package mocks_geolocation import ( - "github.com/AvengeMedia/DankMaterialShell/core/internal/geolocation" + "github.com/duxlabs-dev/dux-shell/core/internal/geolocation" mock "github.com/stretchr/testify/mock" ) diff --git a/core/internal/mocks/network/mock_Backend.go b/core/internal/mocks/network/mock_Backend.go index 5c32106b4..71319354f 100644 --- a/core/internal/mocks/network/mock_Backend.go +++ b/core/internal/mocks/network/mock_Backend.go @@ -5,7 +5,7 @@ package mocks_network import ( - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/network" + "github.com/duxlabs-dev/dux-shell/core/internal/server/network" mock "github.com/stretchr/testify/mock" ) diff --git a/core/internal/mocks/wlclient/mock_WaylandDisplay.go b/core/internal/mocks/wlclient/mock_WaylandDisplay.go index 447614186..fb0de7242 100644 --- a/core/internal/mocks/wlclient/mock_WaylandDisplay.go +++ b/core/internal/mocks/wlclient/mock_WaylandDisplay.go @@ -5,7 +5,7 @@ package mocks_wlclient import ( - "github.com/AvengeMedia/dankgo/wayland/client" + "github.com/duxlabs-dev/dux-go/wayland/client" mock "github.com/stretchr/testify/mock" ) diff --git a/core/internal/mocks/wlcontext/mock_WaylandContext.go b/core/internal/mocks/wlcontext/mock_WaylandContext.go index 7b9b1bcd3..9f243ab44 100644 --- a/core/internal/mocks/wlcontext/mock_WaylandContext.go +++ b/core/internal/mocks/wlcontext/mock_WaylandContext.go @@ -5,7 +5,7 @@ package mocks_wlcontext import ( - "github.com/AvengeMedia/dankgo/wayland/client" + "github.com/duxlabs-dev/dux-go/wayland/client" mock "github.com/stretchr/testify/mock" ) diff --git a/core/internal/netfetch/netfetch.go b/core/internal/netfetch/netfetch.go index dd191e287..2db55ba46 100644 --- a/core/internal/netfetch/netfetch.go +++ b/core/internal/netfetch/netfetch.go @@ -12,7 +12,7 @@ import ( "time" ) -const DefaultUserAgent = "DankMaterialShell/1.0 (Linux)" +const DefaultUserAgent = "DuxShell/1.0 (Linux)" type Options struct { Headers map[string]string diff --git a/core/internal/netfetch/release.go b/core/internal/netfetch/release.go index fc1caa727..f36e4c415 100644 --- a/core/internal/netfetch/release.go +++ b/core/internal/netfetch/release.go @@ -7,7 +7,7 @@ import ( "time" ) -const latestReleaseURL = "https://api.github.com/repos/AvengeMedia/DankMaterialShell/releases/latest" +const latestReleaseURL = "https://api.github.com/repos/duxlabs-dev/dux-shell/releases/latest" func LatestReleaseTag(ctx context.Context) (string, error) { body, err := Bytes(ctx, latestReleaseURL, Options{Timeout: 10 * time.Second}) diff --git a/core/internal/notify/notify.go b/core/internal/notify/notify.go index 40e327faf..2ac6e4222 100644 --- a/core/internal/notify/notify.go +++ b/core/internal/notify/notify.go @@ -14,7 +14,7 @@ import ( ) const ( - AppID = "com.danklinux.dms" + AppID = "dev.duxlabs.shell" appName = "DMS" diff --git a/core/internal/pam/pam.go b/core/internal/pam/pam.go index 2aa718340..a7ea3911a 100644 --- a/core/internal/pam/pam.go +++ b/core/internal/pam/pam.go @@ -9,8 +9,8 @@ import ( "slices" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/privesc" - "github.com/AvengeMedia/DankMaterialShell/core/internal/utils" + "github.com/duxlabs-dev/dux-shell/core/internal/privesc" + "github.com/duxlabs-dev/dux-shell/core/internal/utils" ) const ( @@ -157,7 +157,7 @@ func IsNixOS() bool { } func ReadAuthSettings(homeDir string) (AuthSettings, error) { - settingsPath := filepath.Join(homeDir, ".config", "DankMaterialShell", "settings.json") + settingsPath := filepath.Join(homeDir, ".config", "dms", "settings.json") data, err := os.ReadFile(settingsPath) if err != nil { if os.IsNotExist(err) { @@ -807,7 +807,7 @@ session required pam_deny.so ` func UserLockscreenPamDir() string { - return filepath.Join(utils.XDGStateHome(), "DankMaterialShell", "pam") + return filepath.Join(utils.XDGStateHome(), "dms", "pam") } // WriteUserLockscreenPamConfig resolves the distro's real auth stack into a diff --git a/core/internal/pam/pam_test.go b/core/internal/pam/pam_test.go index 9483a9ea6..a03117bcc 100644 --- a/core/internal/pam/pam_test.go +++ b/core/internal/pam/pam_test.go @@ -25,7 +25,7 @@ func (e *pamTestEnv) writePamFile(t *testing.T, name string, content string) { func (e *pamTestEnv) writeSettings(t *testing.T, content string) { t.Helper() - writeTestFile(t, filepath.Join(e.homeDir, ".config", "DankMaterialShell", "settings.json"), content) + writeTestFile(t, filepath.Join(e.homeDir, ".config", "dms", "settings.json"), content) } func readFileString(t *testing.T, path string) string { diff --git a/core/internal/plugins/feedback.go b/core/internal/plugins/feedback.go index 78b73b45c..8ea1874ec 100644 --- a/core/internal/plugins/feedback.go +++ b/core/internal/plugins/feedback.go @@ -5,7 +5,7 @@ import ( "net/http" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/site" + "github.com/duxlabs-dev/dux-shell/core/internal/site" ) const feedbackURL = site.API + "/plugins" diff --git a/core/internal/plugins/manager.go b/core/internal/plugins/manager.go index 7000129a9..5b75187ac 100644 --- a/core/internal/plugins/manager.go +++ b/core/internal/plugins/manager.go @@ -9,7 +9,7 @@ import ( "path/filepath" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/log" "github.com/spf13/afero" ) @@ -40,7 +40,7 @@ func getPluginsDir() string { log.Error("failed to get user config dir", "err", err) return "" } - path := filepath.Join(configDir, "DankMaterialShell", "plugins") + path := filepath.Join(configDir, "dms", "plugins") if resolved, err := filepath.EvalSymlinks(path); err == nil { return resolved } @@ -56,7 +56,7 @@ func getPluginLockPath() string { log.Error("failed to get user config dir", "err", err) return "" } - return filepath.Join(configDir, "DankMaterialShell", "plugins.lock.json") + return filepath.Join(configDir, "dms", "plugins.lock.json") } func (m *Manager) IsInstalled(plugin Plugin) (bool, error) { diff --git a/core/internal/plugins/manager_test.go b/core/internal/plugins/manager_test.go index 9edd37fba..78040c5c3 100644 --- a/core/internal/plugins/manager_test.go +++ b/core/internal/plugins/manager_test.go @@ -28,7 +28,7 @@ func TestGetPluginsDir(t *testing.T) { configHome := t.TempDir() t.Setenv("XDG_CONFIG_HOME", configHome) - assert.Equal(t, filepath.Join(configHome, "DankMaterialShell", "plugins"), getPluginsDir()) + assert.Equal(t, filepath.Join(configHome, "dms", "plugins"), getPluginsDir()) }) t.Run("falls back to home directory", func(t *testing.T) { @@ -36,7 +36,7 @@ func TestGetPluginsDir(t *testing.T) { t.Setenv("XDG_CONFIG_HOME", "") t.Setenv("HOME", home) - assert.Equal(t, filepath.Join(home, ".config", "DankMaterialShell", "plugins"), getPluginsDir()) + assert.Equal(t, filepath.Join(home, ".config", "dms", "plugins"), getPluginsDir()) }) } diff --git a/core/internal/plugins/registry.go b/core/internal/plugins/registry.go index 7460cb389..ac76befda 100644 --- a/core/internal/plugins/registry.go +++ b/core/internal/plugins/registry.go @@ -8,7 +8,7 @@ import ( "path/filepath" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/registries" + "github.com/duxlabs-dev/dux-shell/core/internal/registries" "github.com/go-git/go-git/v6" "github.com/go-git/go-git/v6/plumbing" "github.com/spf13/afero" diff --git a/core/internal/plugins/registry_test.go b/core/internal/plugins/registry_test.go index c3a502a31..e8ecedbf3 100644 --- a/core/internal/plugins/registry_test.go +++ b/core/internal/plugins/registry_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/clipolicy" - "github.com/AvengeMedia/DankMaterialShell/core/internal/registries" + "github.com/duxlabs-dev/dux-shell/core/internal/clipolicy" + "github.com/duxlabs-dev/dux-shell/core/internal/registries" "github.com/go-git/go-git/v6" "github.com/go-git/go-git/v6/plumbing" "github.com/go-git/go-git/v6/plumbing/object" diff --git a/core/internal/plugins/search.go b/core/internal/plugins/search.go index 833158f41..796bd7e42 100644 --- a/core/internal/plugins/search.go +++ b/core/internal/plugins/search.go @@ -4,7 +4,7 @@ import ( "sort" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/utils" + "github.com/duxlabs-dev/dux-shell/core/internal/utils" ) func FuzzySearch(query string, plugins []Plugin) []Plugin { @@ -70,8 +70,8 @@ func SortByFirstParty(plugins []Plugin) []Plugin { if plugins[i].Featured != plugins[j].Featured { return plugins[i].Featured } - isFirstPartyI := strings.HasPrefix(plugins[i].Repo, "https://github.com/AvengeMedia") - isFirstPartyJ := strings.HasPrefix(plugins[j].Repo, "https://github.com/AvengeMedia") + isFirstPartyI := IsFirstPartyRepo(plugins[i].Repo) + isFirstPartyJ := IsFirstPartyRepo(plugins[j].Repo) if isFirstPartyI != isFirstPartyJ { return isFirstPartyI } @@ -89,3 +89,7 @@ func FindByIDOrName(idOrName string, plugins []Plugin) *Plugin { } return nil } + +func IsFirstPartyRepo(repo string) bool { + return strings.HasPrefix(repo, "https://github.com/duxlabs-dev/") || strings.HasPrefix(repo, "https://github.com/AvengeMedia/") +} diff --git a/core/internal/proto/keyboard_shortcuts_inhibit/keyboard_shortcuts_inhibit.go b/core/internal/proto/keyboard_shortcuts_inhibit/keyboard_shortcuts_inhibit.go index 74b91dce0..467b1bb1d 100644 --- a/core/internal/proto/keyboard_shortcuts_inhibit/keyboard_shortcuts_inhibit.go +++ b/core/internal/proto/keyboard_shortcuts_inhibit/keyboard_shortcuts_inhibit.go @@ -1,5 +1,5 @@ // Generated by go-wayland-scanner -// https://github.com/AvengeMedia/dankgo/cmd/go-wayland-scanner +// https://github.com/duxlabs-dev/dux-go/cmd/go-wayland-scanner // XML file : internal/proto/xml/keyboard-shortcuts-inhibit-unstable-v1.xml // // keyboard_shortcuts_inhibit_unstable_v1 Protocol Copyright: @@ -27,7 +27,7 @@ package keyboard_shortcuts_inhibit -import "github.com/AvengeMedia/dankgo/wayland/client" +import "github.com/duxlabs-dev/dux-go/wayland/client" // ZwpKeyboardShortcutsInhibitManagerV1InterfaceName is the name of the interface as it appears in the [client.Registry]. // It can be used to match the [client.RegistryGlobalEvent.Interface] in the diff --git a/core/internal/proto/linux_dmabuf/linux_dmabuf.go b/core/internal/proto/linux_dmabuf/linux_dmabuf.go index 6a2da2ce8..24a1dd9a8 100644 --- a/core/internal/proto/linux_dmabuf/linux_dmabuf.go +++ b/core/internal/proto/linux_dmabuf/linux_dmabuf.go @@ -1,5 +1,5 @@ // Generated by go-wayland-scanner -// https://github.com/AvengeMedia/dankgo/cmd/go-wayland-scanner +// https://github.com/duxlabs-dev/dux-go/cmd/go-wayland-scanner // XML file : internal/proto/xml/linux-dmabuf-v1.xml // // linux_dmabuf_v1 Protocol Copyright: @@ -28,7 +28,7 @@ package linux_dmabuf import ( - "github.com/AvengeMedia/dankgo/wayland/client" + "github.com/duxlabs-dev/dux-go/wayland/client" "golang.org/x/sys/unix" ) diff --git a/core/internal/proto/virtual_keyboard/virtual_keyboard.go b/core/internal/proto/virtual_keyboard/virtual_keyboard.go index 14e17a7e3..e373c71dd 100644 --- a/core/internal/proto/virtual_keyboard/virtual_keyboard.go +++ b/core/internal/proto/virtual_keyboard/virtual_keyboard.go @@ -1,5 +1,5 @@ // Generated by go-wayland-scanner -// https://github.com/AvengeMedia/dankgo/cmd/go-wayland-scanner +// https://github.com/duxlabs-dev/dux-go/cmd/go-wayland-scanner // XML file : internal/proto/xml/virtual-keyboard-unstable-v1.xml // // virtual_keyboard_unstable_v1 Protocol Copyright: @@ -31,7 +31,7 @@ package virtual_keyboard import ( - "github.com/AvengeMedia/dankgo/wayland/client" + "github.com/duxlabs-dev/dux-go/wayland/client" "golang.org/x/sys/unix" ) diff --git a/core/internal/proto/wlr_gamma_control/gamma_control.go b/core/internal/proto/wlr_gamma_control/gamma_control.go index bd48cab0e..4d9f7bc18 100644 --- a/core/internal/proto/wlr_gamma_control/gamma_control.go +++ b/core/internal/proto/wlr_gamma_control/gamma_control.go @@ -1,5 +1,5 @@ // Generated by go-wayland-scanner -// https://github.com/AvengeMedia/dankgo/cmd/go-wayland-scanner +// https://github.com/duxlabs-dev/dux-go/cmd/go-wayland-scanner // XML file : internal/proto/xml/wlr-gamma-control-unstable-v1.xml // // wlr_gamma_control_unstable_v1 Protocol Copyright: @@ -31,7 +31,7 @@ package wlr_gamma_control import ( - "github.com/AvengeMedia/dankgo/wayland/client" + "github.com/duxlabs-dev/dux-go/wayland/client" "golang.org/x/sys/unix" ) diff --git a/core/internal/proto/wlr_layer_shell/layer_shell.go b/core/internal/proto/wlr_layer_shell/layer_shell.go index e2b0c96dd..b8ee6b192 100644 --- a/core/internal/proto/wlr_layer_shell/layer_shell.go +++ b/core/internal/proto/wlr_layer_shell/layer_shell.go @@ -1,5 +1,5 @@ // Generated by go-wayland-scanner -// https://github.com/AvengeMedia/dankgo/cmd/go-wayland-scanner +// https://github.com/duxlabs-dev/dux-go/cmd/go-wayland-scanner // XML file : internal/proto/xml/wlr-layer-shell-unstable-v1.xml // // wlr_layer_shell_unstable_v1 Protocol Copyright: @@ -30,8 +30,8 @@ package wlr_layer_shell import ( - "github.com/AvengeMedia/dankgo/wayland/client" - xdg_shell "github.com/AvengeMedia/dankgo/wayland/xdg_shell" + "github.com/duxlabs-dev/dux-go/wayland/client" + xdg_shell "github.com/duxlabs-dev/dux-go/wayland/xdg_shell" ) // ZwlrLayerShellV1InterfaceName is the name of the interface as it appears in the [client.Registry]. diff --git a/core/internal/proto/wlr_output_management/output_management.go b/core/internal/proto/wlr_output_management/output_management.go index cfb3e028e..ff17e743f 100644 --- a/core/internal/proto/wlr_output_management/output_management.go +++ b/core/internal/proto/wlr_output_management/output_management.go @@ -1,5 +1,5 @@ // Generated by go-wayland-scanner -// https://github.com/AvengeMedia/dankgo/cmd/go-wayland-scanner +// https://github.com/duxlabs-dev/dux-go/cmd/go-wayland-scanner // XML file : internal/proto/xml/wlr-output-management-unstable-v1.xml // // wlr_output_management_unstable_v1 Protocol Copyright: @@ -29,7 +29,7 @@ package wlr_output_management -import "github.com/AvengeMedia/dankgo/wayland/client" +import "github.com/duxlabs-dev/dux-go/wayland/client" // ZwlrOutputManagerV1InterfaceName is the name of the interface as it appears in the [client.Registry]. // It can be used to match the [client.RegistryGlobalEvent.Interface] in the diff --git a/core/internal/proto/wlr_output_power/output_power.go b/core/internal/proto/wlr_output_power/output_power.go index 7be60e73c..2dca9ed80 100644 --- a/core/internal/proto/wlr_output_power/output_power.go +++ b/core/internal/proto/wlr_output_power/output_power.go @@ -1,5 +1,5 @@ // Generated by go-wayland-scanner -// https://github.com/AvengeMedia/dankgo/cmd/go-wayland-scanner +// https://github.com/duxlabs-dev/dux-go/cmd/go-wayland-scanner // XML file : internal/proto/xml/wlr-output-power-management-unstable-v1.xml // // wlr_output_power_management_unstable_v1 Protocol Copyright: @@ -27,7 +27,7 @@ package wlr_output_power -import "github.com/AvengeMedia/dankgo/wayland/client" +import "github.com/duxlabs-dev/dux-go/wayland/client" // ZwlrOutputPowerManagerV1InterfaceName is the name of the interface as it appears in the [client.Registry]. // It can be used to match the [client.RegistryGlobalEvent.Interface] in the diff --git a/core/internal/proto/wlr_screencopy/screencopy.go b/core/internal/proto/wlr_screencopy/screencopy.go index 1c910a266..8a0f8ef0c 100644 --- a/core/internal/proto/wlr_screencopy/screencopy.go +++ b/core/internal/proto/wlr_screencopy/screencopy.go @@ -1,5 +1,5 @@ // Generated by go-wayland-scanner -// https://github.com/AvengeMedia/dankgo/cmd/go-wayland-scanner +// https://github.com/duxlabs-dev/dux-go/cmd/go-wayland-scanner // XML file : internal/proto/xml/wlr-screencopy-unstable-v1.xml // // wlr_screencopy_unstable_v1 Protocol Copyright: @@ -28,7 +28,7 @@ package wlr_screencopy -import "github.com/AvengeMedia/dankgo/wayland/client" +import "github.com/duxlabs-dev/dux-go/wayland/client" // ZwlrScreencopyManagerV1InterfaceName is the name of the interface as it appears in the [client.Registry]. // It can be used to match the [client.RegistryGlobalEvent.Interface] in the diff --git a/core/internal/proto/wp_color_management/color_management.go b/core/internal/proto/wp_color_management/color_management.go index 5852d3652..99bf5d52b 100644 --- a/core/internal/proto/wp_color_management/color_management.go +++ b/core/internal/proto/wp_color_management/color_management.go @@ -1,5 +1,5 @@ // Generated by go-wayland-scanner -// https://github.com/AvengeMedia/dankgo/cmd/go-wayland-scanner +// https://github.com/duxlabs-dev/dux-go/cmd/go-wayland-scanner // XML file : internal/proto/xml/color-management-v1.xml // // color_management_v1 Protocol Copyright: @@ -33,7 +33,7 @@ package wp_color_management import ( - "github.com/AvengeMedia/dankgo/wayland/client" + "github.com/duxlabs-dev/dux-go/wayland/client" "golang.org/x/sys/unix" ) diff --git a/core/internal/proto/wp_color_management/query.go b/core/internal/proto/wp_color_management/query.go index 3ae035387..d113ca078 100644 --- a/core/internal/proto/wp_color_management/query.go +++ b/core/internal/proto/wp_color_management/query.go @@ -1,7 +1,7 @@ package wp_color_management import ( - "github.com/AvengeMedia/dankgo/wayland/client" + "github.com/duxlabs-dev/dux-go/wayland/client" ) // OutputDescription is the named color encoding of an output's current image diff --git a/core/internal/proto/wp_cursor_shape/cursor_shape.go b/core/internal/proto/wp_cursor_shape/cursor_shape.go index 3a88c04db..89e1fcacd 100644 --- a/core/internal/proto/wp_cursor_shape/cursor_shape.go +++ b/core/internal/proto/wp_cursor_shape/cursor_shape.go @@ -1,5 +1,5 @@ // Generated by go-wayland-scanner -// https://github.com/AvengeMedia/dankgo/cmd/go-wayland-scanner +// https://github.com/duxlabs-dev/dux-go/cmd/go-wayland-scanner // XML file : internal/proto/xml/cursor-shape-v1.xml // // cursor_shape_v1 Protocol Copyright: @@ -28,7 +28,7 @@ package wp_cursor_shape -import "github.com/AvengeMedia/dankgo/wayland/client" +import "github.com/duxlabs-dev/dux-go/wayland/client" // WpCursorShapeManagerV1InterfaceName is the name of the interface as it appears in the [client.Registry]. // It can be used to match the [client.RegistryGlobalEvent.Interface] in the diff --git a/core/internal/proto/wp_viewporter/viewporter.go b/core/internal/proto/wp_viewporter/viewporter.go index d08e8ed65..1415dc7e9 100644 --- a/core/internal/proto/wp_viewporter/viewporter.go +++ b/core/internal/proto/wp_viewporter/viewporter.go @@ -1,5 +1,5 @@ // Generated by go-wayland-scanner -// https://github.com/AvengeMedia/dankgo/cmd/go-wayland-scanner +// https://github.com/duxlabs-dev/dux-go/cmd/go-wayland-scanner // XML file : internal/proto/xml/viewporter.xml // // viewporter Protocol Copyright: @@ -27,7 +27,7 @@ package wp_viewporter -import "github.com/AvengeMedia/dankgo/wayland/client" +import "github.com/duxlabs-dev/dux-go/wayland/client" // WpViewporterInterfaceName is the name of the interface as it appears in the [client.Registry]. // It can be used to match the [client.RegistryGlobalEvent.Interface] in the diff --git a/core/internal/qsipc/client.go b/core/internal/qsipc/client.go index 1469904cd..d83bd8eca 100644 --- a/core/internal/qsipc/client.go +++ b/core/internal/qsipc/client.go @@ -12,7 +12,7 @@ import ( "time" "unicode/utf16" - "github.com/AvengeMedia/DankMaterialShell/core/internal/utils" + "github.com/duxlabs-dev/dux-shell/core/internal/utils" ) const ( diff --git a/core/internal/registries/lock.go b/core/internal/registries/lock.go index bfb83e812..b4e6873b6 100644 --- a/core/internal/registries/lock.go +++ b/core/internal/registries/lock.go @@ -6,7 +6,7 @@ import ( "path/filepath" "syscall" - "github.com/AvengeMedia/DankMaterialShell/core/internal/utils" + "github.com/duxlabs-dev/dux-shell/core/internal/utils" ) // flock is per open file, so concurrent goroutines contend like separate processes. diff --git a/core/internal/registries/registries.go b/core/internal/registries/registries.go index a2a36f464..55167e06a 100644 --- a/core/internal/registries/registries.go +++ b/core/internal/registries/registries.go @@ -8,13 +8,13 @@ import ( "regexp" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/clipolicy" + "github.com/duxlabs-dev/dux-shell/core/internal/clipolicy" "github.com/spf13/afero" ) const ( OfficialName = "official" - officialURL = "https://github.com/AvengeMedia/dms-plugin-registry.git" + officialURL = "https://github.com/duxlabs-dev/dux-plugin-registry.git" ) // Source identifies a registry repository. Name doubles as the per-registry @@ -35,7 +35,7 @@ func configPath() (string, error) { if err != nil { return "", fmt.Errorf("failed to get user config dir: %w", err) } - return filepath.Join(configDir, "DankMaterialShell", "registries.json"), nil + return filepath.Join(configDir, "dms", "registries.json"), nil } // Load returns the official registry followed by any user-configured extras. diff --git a/core/internal/registries/registries_test.go b/core/internal/registries/registries_test.go index 33b9f1188..46d0f9469 100644 --- a/core/internal/registries/registries_test.go +++ b/core/internal/registries/registries_test.go @@ -3,7 +3,7 @@ package registries import ( "testing" - "github.com/AvengeMedia/DankMaterialShell/core/internal/clipolicy" + "github.com/duxlabs-dev/dux-shell/core/internal/clipolicy" "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -57,12 +57,12 @@ func TestRemove(t *testing.T) { func TestLoadIgnoresInvalidConfig(t *testing.T) { fs := setupFs(t) - require.NoError(t, fs.MkdirAll("/xdg/DankMaterialShell", 0o755)) - require.NoError(t, afero.WriteFile(fs, "/xdg/DankMaterialShell/registries.json", []byte("{not json"), 0o644)) + require.NoError(t, fs.MkdirAll("/xdg/dms", 0o755)) + require.NoError(t, afero.WriteFile(fs, "/xdg/dms/registries.json", []byte("{not json"), 0o644)) assert.Len(t, Load(fs), 1) entries := `[{"name":"ok","url":"https://example.com/ok.git"},{"name":"Bad Name","url":"https://example.com/bad.git"},{"name":"official","url":"https://example.com/spoof.git"},{"name":"nourl","url":""}]` - require.NoError(t, afero.WriteFile(fs, "/xdg/DankMaterialShell/registries.json", []byte(entries), 0o644)) + require.NoError(t, afero.WriteFile(fs, "/xdg/dms/registries.json", []byte(entries), 0o644)) sources := Load(fs) require.Len(t, sources, 2, "invalid entries dropped") assert.Equal(t, "ok", sources[1].Name) diff --git a/core/internal/screenshot/aqueous_snapshot.go b/core/internal/screenshot/aqueous_snapshot.go index c9a39a196..167ab5421 100644 --- a/core/internal/screenshot/aqueous_snapshot.go +++ b/core/internal/screenshot/aqueous_snapshot.go @@ -10,7 +10,7 @@ import ( "os" "regexp" - "github.com/AvengeMedia/DankMaterialShell/core/internal/utils" + "github.com/duxlabs-dev/dux-shell/core/internal/utils" ) func aqueousSnapshot(ctx context.Context) (aqueousSnapshotModel, error) { diff --git a/core/internal/screenshot/cicp.go b/core/internal/screenshot/cicp.go index ca2f7a6c9..5f3f80c5b 100644 --- a/core/internal/screenshot/cicp.go +++ b/core/internal/screenshot/cicp.go @@ -4,7 +4,7 @@ import ( "encoding/binary" "hash/crc32" - "github.com/AvengeMedia/DankMaterialShell/core/internal/proto/wp_color_management" + "github.com/duxlabs-dev/dux-shell/core/internal/proto/wp_color_management" ) // CICP holds H.273 coding-independent code points describing the color diff --git a/core/internal/screenshot/compositor.go b/core/internal/screenshot/compositor.go index fe36b834a..3464f62ca 100644 --- a/core/internal/screenshot/compositor.go +++ b/core/internal/screenshot/compositor.go @@ -7,9 +7,9 @@ import ( "os" "os/exec" - "github.com/AvengeMedia/DankMaterialShell/core/internal/proto/wlr_output_management" - wlhelpers "github.com/AvengeMedia/DankMaterialShell/core/internal/wayland/client" - "github.com/AvengeMedia/dankgo/wayland/client" + "github.com/duxlabs-dev/dux-go/wayland/client" + "github.com/duxlabs-dev/dux-shell/core/internal/proto/wlr_output_management" + wlhelpers "github.com/duxlabs-dev/dux-shell/core/internal/wayland/client" ) type Compositor int diff --git a/core/internal/screenshot/encode.go b/core/internal/screenshot/encode.go index 63de738a5..770be6868 100644 --- a/core/internal/screenshot/encode.go +++ b/core/internal/screenshot/encode.go @@ -11,7 +11,7 @@ import ( "path/filepath" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/utils" + "github.com/duxlabs-dev/dux-shell/core/internal/utils" ) func BufferToImage(buf *ShmBuffer) *image.RGBA { diff --git a/core/internal/screenshot/niri_window.go b/core/internal/screenshot/niri_window.go index 0a66a9e85..8d291df69 100644 --- a/core/internal/screenshot/niri_window.go +++ b/core/internal/screenshot/niri_window.go @@ -11,7 +11,7 @@ import ( "path/filepath" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/utils" + "github.com/duxlabs-dev/dux-shell/core/internal/utils" ) const niriScreenshotTimeout = 5 * time.Second diff --git a/core/internal/screenshot/notify.go b/core/internal/screenshot/notify.go index 0a310b5ce..8d849b4cf 100644 --- a/core/internal/screenshot/notify.go +++ b/core/internal/screenshot/notify.go @@ -4,8 +4,8 @@ import ( "fmt" "path/filepath" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" - "github.com/AvengeMedia/DankMaterialShell/core/internal/notify" + "github.com/duxlabs-dev/dux-shell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/notify" "github.com/godbus/dbus/v5" ) diff --git a/core/internal/screenshot/region.go b/core/internal/screenshot/region.go index 0af76ed4b..3da2fd5bc 100644 --- a/core/internal/screenshot/region.go +++ b/core/internal/screenshot/region.go @@ -5,15 +5,15 @@ import ( "math" "sync" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" - "github.com/AvengeMedia/DankMaterialShell/core/internal/proto/keyboard_shortcuts_inhibit" - "github.com/AvengeMedia/DankMaterialShell/core/internal/proto/wlr_layer_shell" - "github.com/AvengeMedia/DankMaterialShell/core/internal/proto/wlr_screencopy" - "github.com/AvengeMedia/DankMaterialShell/core/internal/proto/wp_cursor_shape" - "github.com/AvengeMedia/DankMaterialShell/core/internal/proto/wp_viewporter" - wlhelpers "github.com/AvengeMedia/DankMaterialShell/core/internal/wayland/client" - "github.com/AvengeMedia/DankMaterialShell/core/internal/wayland/keymap" - "github.com/AvengeMedia/dankgo/wayland/client" + "github.com/duxlabs-dev/dux-go/wayland/client" + "github.com/duxlabs-dev/dux-shell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/proto/keyboard_shortcuts_inhibit" + "github.com/duxlabs-dev/dux-shell/core/internal/proto/wlr_layer_shell" + "github.com/duxlabs-dev/dux-shell/core/internal/proto/wlr_screencopy" + "github.com/duxlabs-dev/dux-shell/core/internal/proto/wp_cursor_shape" + "github.com/duxlabs-dev/dux-shell/core/internal/proto/wp_viewporter" + wlhelpers "github.com/duxlabs-dev/dux-shell/core/internal/wayland/client" + "github.com/duxlabs-dev/dux-shell/core/internal/wayland/keymap" ) type resizeHandle int diff --git a/core/internal/screenshot/region_input.go b/core/internal/screenshot/region_input.go index 89daa09f1..033bb1892 100644 --- a/core/internal/screenshot/region_input.go +++ b/core/internal/screenshot/region_input.go @@ -3,8 +3,8 @@ package screenshot import ( "math" - "github.com/AvengeMedia/DankMaterialShell/core/internal/wayland/keymap" - "github.com/AvengeMedia/dankgo/wayland/client" + "github.com/duxlabs-dev/dux-go/wayland/client" + "github.com/duxlabs-dev/dux-shell/core/internal/wayland/keymap" ) func (r *RegionSelector) setupInput() { diff --git a/core/internal/screenshot/region_touch_test.go b/core/internal/screenshot/region_touch_test.go index b7d91db44..c656ec283 100644 --- a/core/internal/screenshot/region_touch_test.go +++ b/core/internal/screenshot/region_touch_test.go @@ -3,7 +3,7 @@ package screenshot import ( "testing" - "github.com/AvengeMedia/dankgo/wayland/client" + "github.com/duxlabs-dev/dux-go/wayland/client" ) func newTestSurface(id uint32) *client.Surface { diff --git a/core/internal/screenshot/screenshot.go b/core/internal/screenshot/screenshot.go index ce6e523dc..1646a24a8 100644 --- a/core/internal/screenshot/screenshot.go +++ b/core/internal/screenshot/screenshot.go @@ -5,12 +5,12 @@ import ( "math" "sync" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" - "github.com/AvengeMedia/DankMaterialShell/core/internal/proto/wlr_screencopy" - "github.com/AvengeMedia/DankMaterialShell/core/internal/proto/wp_color_management" - "github.com/AvengeMedia/DankMaterialShell/core/internal/utils" - wlhelpers "github.com/AvengeMedia/DankMaterialShell/core/internal/wayland/client" - "github.com/AvengeMedia/dankgo/wayland/client" + "github.com/duxlabs-dev/dux-go/wayland/client" + "github.com/duxlabs-dev/dux-shell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/proto/wlr_screencopy" + "github.com/duxlabs-dev/dux-shell/core/internal/proto/wp_color_management" + "github.com/duxlabs-dev/dux-shell/core/internal/utils" + wlhelpers "github.com/duxlabs-dev/dux-shell/core/internal/wayland/client" ) type WaylandOutput struct { diff --git a/core/internal/screenshot/scroll.go b/core/internal/screenshot/scroll.go index a376fa68f..687be9b7c 100644 --- a/core/internal/screenshot/scroll.go +++ b/core/internal/screenshot/scroll.go @@ -8,10 +8,10 @@ import ( "os/signal" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" - "github.com/AvengeMedia/DankMaterialShell/core/internal/proto/wlr_layer_shell" - "github.com/AvengeMedia/DankMaterialShell/core/internal/proto/wlr_screencopy" - "github.com/AvengeMedia/dankgo/wayland/client" + "github.com/duxlabs-dev/dux-go/wayland/client" + "github.com/duxlabs-dev/dux-shell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/proto/wlr_layer_shell" + "github.com/duxlabs-dev/dux-shell/core/internal/proto/wlr_screencopy" "golang.org/x/sys/unix" ) diff --git a/core/internal/screenshot/shm.go b/core/internal/screenshot/shm.go index 17291fe64..275e558c3 100644 --- a/core/internal/screenshot/shm.go +++ b/core/internal/screenshot/shm.go @@ -1,6 +1,6 @@ package screenshot -import "github.com/AvengeMedia/DankMaterialShell/core/internal/wayland/shm" +import "github.com/duxlabs-dev/dux-shell/core/internal/wayland/shm" type PixelFormat = shm.PixelFormat diff --git a/core/internal/screenshot/theme.go b/core/internal/screenshot/theme.go index d605267a1..55a495477 100644 --- a/core/internal/screenshot/theme.go +++ b/core/internal/screenshot/theme.go @@ -7,8 +7,8 @@ import ( "strings" "sync" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" - "github.com/AvengeMedia/DankMaterialShell/core/internal/utils" + "github.com/duxlabs-dev/dux-shell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/utils" ) type ThemeColors struct { @@ -87,7 +87,7 @@ func getColorsFilePath() string { log.Error("Failed to get user cache dir", "err", err) return "" } - return filepath.Join(cacheDir, "DankMaterialShell", "dms-colors.json") + return filepath.Join(cacheDir, "dms", "dms-colors.json") } func isLightMode() bool { diff --git a/core/internal/server/apppicker/handlers.go b/core/internal/server/apppicker/handlers.go index 114c9dca1..0f2d11172 100644 --- a/core/internal/server/apppicker/handlers.go +++ b/core/internal/server/apppicker/handlers.go @@ -1,9 +1,9 @@ package apppicker import ( - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" - "github.com/AvengeMedia/dankgo/desktop" - "github.com/AvengeMedia/dankgo/ipc" + "github.com/duxlabs-dev/dux-go/desktop" + "github.com/duxlabs-dev/dux-go/ipc" + "github.com/duxlabs-dev/dux-shell/core/internal/log" ) func HandleRequest(conn *ipc.ConnWriter, req ipc.Request, manager *Manager) { diff --git a/core/internal/server/apppicker/manager.go b/core/internal/server/apppicker/manager.go index c3a158afe..b462b5e7f 100644 --- a/core/internal/server/apppicker/manager.go +++ b/core/internal/server/apppicker/manager.go @@ -3,7 +3,7 @@ package apppicker import ( "sync" - "github.com/AvengeMedia/dankgo/syncmap" + "github.com/duxlabs-dev/dux-go/syncmap" ) type Manager struct { diff --git a/core/internal/server/bluez/agent.go b/core/internal/server/bluez/agent.go index d6281fcad..1fc492efb 100644 --- a/core/internal/server/bluez/agent.go +++ b/core/internal/server/bluez/agent.go @@ -7,8 +7,8 @@ import ( "strconv" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/errdefs" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/errdefs" + "github.com/duxlabs-dev/dux-shell/core/internal/log" "github.com/godbus/dbus/v5" ) diff --git a/core/internal/server/bluez/handlers.go b/core/internal/server/bluez/handlers.go index fcb5a33e1..28d578ba6 100644 --- a/core/internal/server/bluez/handlers.go +++ b/core/internal/server/bluez/handlers.go @@ -5,9 +5,9 @@ import ( "fmt" "math" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/models" - "github.com/AvengeMedia/dankgo/ipc" - "github.com/AvengeMedia/dankgo/ipc/params" + "github.com/duxlabs-dev/dux-go/ipc" + "github.com/duxlabs-dev/dux-go/ipc/params" + "github.com/duxlabs-dev/dux-shell/core/internal/server/models" ) type PoweredResult struct { diff --git a/core/internal/server/bluez/manager.go b/core/internal/server/bluez/manager.go index 502e3e53f..1464b74e7 100644 --- a/core/internal/server/bluez/manager.go +++ b/core/internal/server/bluez/manager.go @@ -9,8 +9,8 @@ import ( "sync" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" - "github.com/AvengeMedia/dankgo/dbusutil" + "github.com/duxlabs-dev/dux-go/dbusutil" + "github.com/duxlabs-dev/dux-shell/core/internal/log" "github.com/godbus/dbus/v5" ) diff --git a/core/internal/server/bluez/player_test.go b/core/internal/server/bluez/player_test.go index 07996b34b..071847f6e 100644 --- a/core/internal/server/bluez/player_test.go +++ b/core/internal/server/bluez/player_test.go @@ -124,7 +124,7 @@ func TestPlayerTrackIDIsStableAndMetadataDependent(t *testing.T) { func TestStalePlayerPropertiesClearMetadataAndCapabilities(t *testing.T) { old := PlayerSnapshot{ Enabled: true, - Identity: "DankMaterialShell", + Identity: "Dux Shell", PlaybackStatus: "Playing", Title: "Title", Artist: "Artist", @@ -366,7 +366,7 @@ func TestPlayerCommandOwnerLossWithoutWaiterDisablesPlayer(t *testing.T) { player := newMPRISPlayer(nil, nil) player.snapshot = PlayerSnapshot{ Enabled: true, - Identity: "DankMaterialShell", + Identity: "Dux Shell", PlaybackStatus: "Playing", Title: "Title", CanControl: true, @@ -388,7 +388,7 @@ func TestPlayerCommandOwnerLossClearsStaleStateAndPromotesWaiter(t *testing.T) { player := newMPRISPlayer(nil, nil) player.snapshot = PlayerSnapshot{ Enabled: true, - Identity: "DankMaterialShell", + Identity: "Dux Shell", PlaybackStatus: "Playing", Title: "Title", Artist: "Artist", @@ -412,7 +412,7 @@ func TestPlayerCommandOwnerLossClearsStaleStateAndPromotesWaiter(t *testing.T) { manager.UnsubscribePlayerCommands("owner") assert.Equal(t, PlayerSnapshot{ Enabled: true, - Identity: "DankMaterialShell", + Identity: "Dux Shell", PlaybackStatus: "Stopped", }, player.currentSnapshot()) waiterLease := (<-waiter).Lease diff --git a/core/internal/server/bluez/subscription_broker.go b/core/internal/server/bluez/subscription_broker.go index e0d5873d9..3ef8f8bf9 100644 --- a/core/internal/server/bluez/subscription_broker.go +++ b/core/internal/server/bluez/subscription_broker.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/AvengeMedia/DankMaterialShell/core/internal/errdefs" - "github.com/AvengeMedia/dankgo/syncmap" + "github.com/duxlabs-dev/dux-go/syncmap" + "github.com/duxlabs-dev/dux-shell/core/internal/errdefs" ) type SubscriptionBroker struct { diff --git a/core/internal/server/bluez/types.go b/core/internal/server/bluez/types.go index 7d2661a6b..3a18d31b8 100644 --- a/core/internal/server/bluez/types.go +++ b/core/internal/server/bluez/types.go @@ -3,7 +3,7 @@ package bluez import ( "sync" - "github.com/AvengeMedia/dankgo/syncmap" + "github.com/duxlabs-dev/dux-go/syncmap" "github.com/godbus/dbus/v5" ) diff --git a/core/internal/server/brightness/backlight_freebsd.go b/core/internal/server/brightness/backlight_freebsd.go index 1fc0d19f7..a5ce1a61d 100644 --- a/core/internal/server/brightness/backlight_freebsd.go +++ b/core/internal/server/brightness/backlight_freebsd.go @@ -8,8 +8,8 @@ import ( "strings" "unsafe" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" - "github.com/AvengeMedia/dankgo/syncmap" + "github.com/duxlabs-dev/dux-go/syncmap" + "github.com/duxlabs-dev/dux-shell/core/internal/log" "golang.org/x/sys/unix" ) diff --git a/core/internal/server/brightness/ddc.go b/core/internal/server/brightness/ddc.go index 693b886f3..ccdb5c4ab 100644 --- a/core/internal/server/brightness/ddc.go +++ b/core/internal/server/brightness/ddc.go @@ -10,7 +10,7 @@ import ( "syscall" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/log" "golang.org/x/sys/unix" ) diff --git a/core/internal/server/brightness/ddc_filter.go b/core/internal/server/brightness/ddc_filter.go index 68fb834ee..616590c02 100644 --- a/core/internal/server/brightness/ddc_filter.go +++ b/core/internal/server/brightness/ddc_filter.go @@ -10,7 +10,7 @@ import ( "strconv" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/log" ) func isIgnorableI2CBus(busno int) bool { diff --git a/core/internal/server/brightness/devd_freebsd.go b/core/internal/server/brightness/devd_freebsd.go index 2d2863e59..f6d1728da 100644 --- a/core/internal/server/brightness/devd_freebsd.go +++ b/core/internal/server/brightness/devd_freebsd.go @@ -6,7 +6,7 @@ import ( "sync" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/log" ) // devd(8) publishes device events on this SOCK_SEQPACKET socket, one diff --git a/core/internal/server/brightness/handlers.go b/core/internal/server/brightness/handlers.go index b43d1999a..61c64dbd9 100644 --- a/core/internal/server/brightness/handlers.go +++ b/core/internal/server/brightness/handlers.go @@ -3,8 +3,8 @@ package brightness import ( "fmt" - "github.com/AvengeMedia/dankgo/ipc" - "github.com/AvengeMedia/dankgo/ipc/params" + "github.com/duxlabs-dev/dux-go/ipc" + "github.com/duxlabs-dev/dux-go/ipc/params" ) func HandleRequest(conn *ipc.ConnWriter, req ipc.Request, m *Manager) { diff --git a/core/internal/server/brightness/logind.go b/core/internal/server/brightness/logind.go index 4ab4950ba..4db7e7caa 100644 --- a/core/internal/server/brightness/logind.go +++ b/core/internal/server/brightness/logind.go @@ -3,7 +3,7 @@ package brightness import ( "fmt" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/log" "github.com/godbus/dbus/v5" ) diff --git a/core/internal/server/brightness/logind_test.go b/core/internal/server/brightness/logind_test.go index 144f6bfcd..c11ef100a 100644 --- a/core/internal/server/brightness/logind_test.go +++ b/core/internal/server/brightness/logind_test.go @@ -4,8 +4,8 @@ import ( "errors" "testing" - mocks_brightness "github.com/AvengeMedia/DankMaterialShell/core/internal/mocks/brightness" - mock_dbus "github.com/AvengeMedia/DankMaterialShell/core/internal/mocks/github.com/godbus/dbus/v5" + mocks_brightness "github.com/duxlabs-dev/dux-shell/core/internal/mocks/brightness" + mock_dbus "github.com/duxlabs-dev/dux-shell/core/internal/mocks/github.com/godbus/dbus/v5" "github.com/godbus/dbus/v5" "github.com/stretchr/testify/mock" ) diff --git a/core/internal/server/brightness/manager.go b/core/internal/server/brightness/manager.go index b8b4af2e2..287d0135d 100644 --- a/core/internal/server/brightness/manager.go +++ b/core/internal/server/brightness/manager.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/log" ) func NewManager() (*Manager, error) { diff --git a/core/internal/server/brightness/native_freebsd.go b/core/internal/server/brightness/native_freebsd.go index fce414dd6..f24093932 100644 --- a/core/internal/server/brightness/native_freebsd.go +++ b/core/internal/server/brightness/native_freebsd.go @@ -1,7 +1,7 @@ package brightness import ( - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/log" ) func (m *Manager) initNative() { diff --git a/core/internal/server/brightness/native_linux.go b/core/internal/server/brightness/native_linux.go index fea40b730..de654f9ce 100644 --- a/core/internal/server/brightness/native_linux.go +++ b/core/internal/server/brightness/native_linux.go @@ -1,7 +1,7 @@ package brightness import ( - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/log" ) func (m *Manager) initNative() { diff --git a/core/internal/server/brightness/software.go b/core/internal/server/brightness/software.go index bd16b598b..a3eae4684 100644 --- a/core/internal/server/brightness/software.go +++ b/core/internal/server/brightness/software.go @@ -6,8 +6,8 @@ import ( "slices" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/wayland" + "github.com/duxlabs-dev/dux-shell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/server/wayland" ) const softwareIDPrefix = "software:" diff --git a/core/internal/server/brightness/sysfs.go b/core/internal/server/brightness/sysfs.go index 6bb5578fb..da69be43c 100644 --- a/core/internal/server/brightness/sysfs.go +++ b/core/internal/server/brightness/sysfs.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/log" ) func NewSysfsBackend() (*SysfsBackend, error) { diff --git a/core/internal/server/brightness/sysfs_logind_linux_test.go b/core/internal/server/brightness/sysfs_logind_linux_test.go index 00aa2fa22..ea6f3776c 100644 --- a/core/internal/server/brightness/sysfs_logind_linux_test.go +++ b/core/internal/server/brightness/sysfs_logind_linux_test.go @@ -5,8 +5,8 @@ import ( "path/filepath" "testing" - mocks_brightness "github.com/AvengeMedia/DankMaterialShell/core/internal/mocks/brightness" - mock_dbus "github.com/AvengeMedia/DankMaterialShell/core/internal/mocks/github.com/godbus/dbus/v5" + mocks_brightness "github.com/duxlabs-dev/dux-shell/core/internal/mocks/brightness" + mock_dbus "github.com/duxlabs-dev/dux-shell/core/internal/mocks/github.com/godbus/dbus/v5" "github.com/godbus/dbus/v5" "github.com/stretchr/testify/mock" ) diff --git a/core/internal/server/brightness/types.go b/core/internal/server/brightness/types.go index 57bfd0a6f..91636736e 100644 --- a/core/internal/server/brightness/types.go +++ b/core/internal/server/brightness/types.go @@ -5,8 +5,8 @@ import ( "sync/atomic" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/wayland" - "github.com/AvengeMedia/dankgo/syncmap" + "github.com/duxlabs-dev/dux-go/syncmap" + "github.com/duxlabs-dev/dux-shell/core/internal/server/wayland" ) type DeviceClass string diff --git a/core/internal/server/brightness/udev_linux.go b/core/internal/server/brightness/udev_linux.go index d27a72136..9cad6b679 100644 --- a/core/internal/server/brightness/udev_linux.go +++ b/core/internal/server/brightness/udev_linux.go @@ -10,7 +10,7 @@ import ( "sync" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/log" "github.com/pilebones/go-udev/netlink" ) diff --git a/core/internal/server/browser/handlers.go b/core/internal/server/browser/handlers.go index ae4ae3198..d160545d5 100644 --- a/core/internal/server/browser/handlers.go +++ b/core/internal/server/browser/handlers.go @@ -1,7 +1,7 @@ package browser import ( - "github.com/AvengeMedia/dankgo/ipc" + "github.com/duxlabs-dev/dux-go/ipc" ) func HandleRequest(conn *ipc.ConnWriter, req ipc.Request, manager *Manager) { diff --git a/core/internal/server/browser/manager.go b/core/internal/server/browser/manager.go index 5aecfbade..e3bc3b9cf 100644 --- a/core/internal/server/browser/manager.go +++ b/core/internal/server/browser/manager.go @@ -3,7 +3,7 @@ package browser import ( "sync" - "github.com/AvengeMedia/dankgo/syncmap" + "github.com/duxlabs-dev/dux-go/syncmap" ) type Manager struct { diff --git a/core/internal/server/clipboard/handlers.go b/core/internal/server/clipboard/handlers.go index 0a8f2c719..bc2f53c05 100644 --- a/core/internal/server/clipboard/handlers.go +++ b/core/internal/server/clipboard/handlers.go @@ -6,10 +6,10 @@ import ( "fmt" "math" - clipboardstore "github.com/AvengeMedia/DankMaterialShell/core/internal/clipboard" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/models" - "github.com/AvengeMedia/dankgo/ipc" - "github.com/AvengeMedia/dankgo/ipc/params" + "github.com/duxlabs-dev/dux-go/ipc" + "github.com/duxlabs-dev/dux-go/ipc/params" + clipboardstore "github.com/duxlabs-dev/dux-shell/core/internal/clipboard" + "github.com/duxlabs-dev/dux-shell/core/internal/server/models" ) func HandleRequest(conn *ipc.ConnWriter, req ipc.Request, m *Manager) { diff --git a/core/internal/server/clipboard/manager.go b/core/internal/server/clipboard/manager.go index 0eb0c353b..9995cdfa5 100644 --- a/core/internal/server/clipboard/manager.go +++ b/core/internal/server/clipboard/manager.go @@ -30,13 +30,13 @@ import ( bolt "go.etcd.io/bbolt" - clipboardstore "github.com/AvengeMedia/DankMaterialShell/core/internal/clipboard" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" - "github.com/AvengeMedia/DankMaterialShell/core/internal/proto/virtual_keyboard" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/wlcontext" - wlclient "github.com/AvengeMedia/dankgo/wayland/client" - "github.com/AvengeMedia/dankgo/wayland/ext_data_control" - "github.com/AvengeMedia/dankgo/wlclipboard" + wlclient "github.com/duxlabs-dev/dux-go/wayland/client" + "github.com/duxlabs-dev/dux-go/wayland/ext_data_control" + "github.com/duxlabs-dev/dux-go/wlclipboard" + clipboardstore "github.com/duxlabs-dev/dux-shell/core/internal/clipboard" + "github.com/duxlabs-dev/dux-shell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/proto/virtual_keyboard" + "github.com/duxlabs-dev/dux-shell/core/internal/server/wlcontext" ) var errEntryNotFound = errors.New("entry not found") diff --git a/core/internal/server/clipboard/manager_test.go b/core/internal/server/clipboard/manager_test.go index 6c4083f18..8c21518c2 100644 --- a/core/internal/server/clipboard/manager_test.go +++ b/core/internal/server/clipboard/manager_test.go @@ -17,10 +17,10 @@ import ( "github.com/stretchr/testify/require" bolt "go.etcd.io/bbolt" - mocks_wlcontext "github.com/AvengeMedia/DankMaterialShell/core/internal/mocks/wlcontext" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/models" - "github.com/AvengeMedia/dankgo/ipc" - "github.com/AvengeMedia/dankgo/wayland/ext_data_control" + "github.com/duxlabs-dev/dux-go/ipc" + "github.com/duxlabs-dev/dux-go/wayland/ext_data_control" + mocks_wlcontext "github.com/duxlabs-dev/dux-shell/core/internal/mocks/wlcontext" + "github.com/duxlabs-dev/dux-shell/core/internal/server/models" ) type clipboardTestConn struct { diff --git a/core/internal/server/clipboard/types.go b/core/internal/server/clipboard/types.go index 195c0c6fa..a3931b53a 100644 --- a/core/internal/server/clipboard/types.go +++ b/core/internal/server/clipboard/types.go @@ -10,8 +10,8 @@ import ( "github.com/godbus/dbus/v5" bolt "go.etcd.io/bbolt" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/wlcontext" - wlclient "github.com/AvengeMedia/dankgo/wayland/client" + wlclient "github.com/duxlabs-dev/dux-go/wayland/client" + "github.com/duxlabs-dev/dux-shell/core/internal/server/wlcontext" ) const largeEntryBytes = 1 << 20 @@ -40,7 +40,7 @@ func getConfigPath() (string, error) { if err != nil { return "", err } - return filepath.Join(configDir, "DankMaterialShell", "clsettings.json"), nil + return filepath.Join(configDir, "dms", "clsettings.json"), nil } func LoadConfig() Config { diff --git a/core/internal/server/cups/actions.go b/core/internal/server/cups/actions.go index e557bffe5..29c5a74a6 100644 --- a/core/internal/server/cups/actions.go +++ b/core/internal/server/cups/actions.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/config" - "github.com/AvengeMedia/DankMaterialShell/core/pkg/ipp" + "github.com/duxlabs-dev/dux-shell/core/internal/config" + "github.com/duxlabs-dev/dux-shell/core/pkg/ipp" ) func isAuthError(err error) bool { diff --git a/core/internal/server/cups/actions_pkhelper_test.go b/core/internal/server/cups/actions_pkhelper_test.go index ad16a8a03..ae7c5b17e 100644 --- a/core/internal/server/cups/actions_pkhelper_test.go +++ b/core/internal/server/cups/actions_pkhelper_test.go @@ -3,10 +3,10 @@ package cups_test import ( "testing" - mocks_cups "github.com/AvengeMedia/DankMaterialShell/core/internal/mocks/cups" - mocks_pkhelper "github.com/AvengeMedia/DankMaterialShell/core/internal/mocks/cups_pkhelper" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/cups" - "github.com/AvengeMedia/DankMaterialShell/core/pkg/ipp" + mocks_cups "github.com/duxlabs-dev/dux-shell/core/internal/mocks/cups" + mocks_pkhelper "github.com/duxlabs-dev/dux-shell/core/internal/mocks/cups_pkhelper" + "github.com/duxlabs-dev/dux-shell/core/internal/server/cups" + "github.com/duxlabs-dev/dux-shell/core/pkg/ipp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/core/internal/server/cups/actions_test.go b/core/internal/server/cups/actions_test.go index 33864bfda..7330b5136 100644 --- a/core/internal/server/cups/actions_test.go +++ b/core/internal/server/cups/actions_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - mocks_cups "github.com/AvengeMedia/DankMaterialShell/core/internal/mocks/cups" - "github.com/AvengeMedia/DankMaterialShell/core/pkg/ipp" + mocks_cups "github.com/duxlabs-dev/dux-shell/core/internal/mocks/cups" + "github.com/duxlabs-dev/dux-shell/core/pkg/ipp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/core/internal/server/cups/handlers.go b/core/internal/server/cups/handlers.go index bbb0d6db1..b28ae7cfc 100644 --- a/core/internal/server/cups/handlers.go +++ b/core/internal/server/cups/handlers.go @@ -3,9 +3,9 @@ package cups import ( "fmt" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/models" - "github.com/AvengeMedia/dankgo/ipc" - "github.com/AvengeMedia/dankgo/ipc/params" + "github.com/duxlabs-dev/dux-go/ipc" + "github.com/duxlabs-dev/dux-go/ipc/params" + "github.com/duxlabs-dev/dux-shell/core/internal/server/models" ) type CUPSEvent struct { diff --git a/core/internal/server/cups/handlers_test.go b/core/internal/server/cups/handlers_test.go index 1a2ae4227..09dcc7b06 100644 --- a/core/internal/server/cups/handlers_test.go +++ b/core/internal/server/cups/handlers_test.go @@ -8,10 +8,10 @@ import ( "testing" "time" - mocks_cups "github.com/AvengeMedia/DankMaterialShell/core/internal/mocks/cups" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/models" - "github.com/AvengeMedia/DankMaterialShell/core/pkg/ipp" - "github.com/AvengeMedia/dankgo/ipc" + "github.com/duxlabs-dev/dux-go/ipc" + mocks_cups "github.com/duxlabs-dev/dux-shell/core/internal/mocks/cups" + "github.com/duxlabs-dev/dux-shell/core/internal/server/models" + "github.com/duxlabs-dev/dux-shell/core/pkg/ipp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/core/internal/server/cups/manager.go b/core/internal/server/cups/manager.go index f66b95837..6b126571c 100644 --- a/core/internal/server/cups/manager.go +++ b/core/internal/server/cups/manager.go @@ -8,8 +8,8 @@ import ( "sync" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" - "github.com/AvengeMedia/DankMaterialShell/core/pkg/ipp" + "github.com/duxlabs-dev/dux-shell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/pkg/ipp" ) func NewManager() (*Manager, error) { diff --git a/core/internal/server/cups/manager_test.go b/core/internal/server/cups/manager_test.go index 56001ce53..c19f02189 100644 --- a/core/internal/server/cups/manager_test.go +++ b/core/internal/server/cups/manager_test.go @@ -6,8 +6,8 @@ import ( "sync" "testing" - mocks_cups "github.com/AvengeMedia/DankMaterialShell/core/internal/mocks/cups" - "github.com/AvengeMedia/DankMaterialShell/core/pkg/ipp" + mocks_cups "github.com/duxlabs-dev/dux-shell/core/internal/mocks/cups" + "github.com/duxlabs-dev/dux-shell/core/pkg/ipp" "github.com/stretchr/testify/assert" ) diff --git a/core/internal/server/cups/subscription.go b/core/internal/server/cups/subscription.go index fcafd63b4..0520a4f3b 100644 --- a/core/internal/server/cups/subscription.go +++ b/core/internal/server/cups/subscription.go @@ -5,8 +5,8 @@ import ( "sync" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" - "github.com/AvengeMedia/DankMaterialShell/core/pkg/ipp" + "github.com/duxlabs-dev/dux-shell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/pkg/ipp" ) type SubscriptionManager struct { diff --git a/core/internal/server/cups/subscription_dbus.go b/core/internal/server/cups/subscription_dbus.go index 4fc54dae4..6f24930d8 100644 --- a/core/internal/server/cups/subscription_dbus.go +++ b/core/internal/server/cups/subscription_dbus.go @@ -5,8 +5,8 @@ import ( "strings" "sync" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" - "github.com/AvengeMedia/DankMaterialShell/core/pkg/ipp" + "github.com/duxlabs-dev/dux-shell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/pkg/ipp" "github.com/godbus/dbus/v5" ) diff --git a/core/internal/server/cups/test_connection.go b/core/internal/server/cups/test_connection.go index c83a27a53..2a0d68deb 100644 --- a/core/internal/server/cups/test_connection.go +++ b/core/internal/server/cups/test_connection.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/AvengeMedia/DankMaterialShell/core/pkg/ipp" + "github.com/duxlabs-dev/dux-shell/core/pkg/ipp" ) var validProtocols = map[string]bool{ diff --git a/core/internal/server/cups/test_connection_test.go b/core/internal/server/cups/test_connection_test.go index 7b85baf96..a24af889c 100644 --- a/core/internal/server/cups/test_connection_test.go +++ b/core/internal/server/cups/test_connection_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/AvengeMedia/dankgo/ipc" + "github.com/duxlabs-dev/dux-go/ipc" "github.com/stretchr/testify/assert" ) diff --git a/core/internal/server/cups/types.go b/core/internal/server/cups/types.go index e560af6b0..585ebee12 100644 --- a/core/internal/server/cups/types.go +++ b/core/internal/server/cups/types.go @@ -6,8 +6,8 @@ import ( "sync" "time" - "github.com/AvengeMedia/DankMaterialShell/core/pkg/ipp" - "github.com/AvengeMedia/dankgo/syncmap" + "github.com/duxlabs-dev/dux-go/syncmap" + "github.com/duxlabs-dev/dux-shell/core/pkg/ipp" ) type CUPSState struct { diff --git a/core/internal/server/dbus/handlers.go b/core/internal/server/dbus/handlers.go index 8fd5c89f3..6c1b7fead 100644 --- a/core/internal/server/dbus/handlers.go +++ b/core/internal/server/dbus/handlers.go @@ -3,9 +3,9 @@ package dbus import ( "fmt" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/models" - "github.com/AvengeMedia/dankgo/ipc" - "github.com/AvengeMedia/dankgo/ipc/params" + "github.com/duxlabs-dev/dux-go/ipc" + "github.com/duxlabs-dev/dux-go/ipc/params" + "github.com/duxlabs-dev/dux-shell/core/internal/server/models" ) type objectParams struct { diff --git a/core/internal/server/dbus/manager.go b/core/internal/server/dbus/manager.go index 8297dd31d..41fd265dd 100644 --- a/core/internal/server/dbus/manager.go +++ b/core/internal/server/dbus/manager.go @@ -6,8 +6,8 @@ import ( "fmt" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" - "github.com/AvengeMedia/dankgo/dbusutil" + "github.com/duxlabs-dev/dux-go/dbusutil" + "github.com/duxlabs-dev/dux-shell/core/internal/log" "github.com/godbus/dbus/v5" ) diff --git a/core/internal/server/dbus/types.go b/core/internal/server/dbus/types.go index 762d32df5..5d8d159a0 100644 --- a/core/internal/server/dbus/types.go +++ b/core/internal/server/dbus/types.go @@ -1,7 +1,7 @@ package dbus import ( - "github.com/AvengeMedia/dankgo/syncmap" + "github.com/duxlabs-dev/dux-go/syncmap" "github.com/godbus/dbus/v5" ) diff --git a/core/internal/server/dgop/handlers.go b/core/internal/server/dgop/handlers.go index 0c9a7bddf..6c840fe33 100644 --- a/core/internal/server/dgop/handlers.go +++ b/core/internal/server/dgop/handlers.go @@ -5,9 +5,9 @@ import ( "fmt" "time" - "github.com/AvengeMedia/dankgo/ipc" - "github.com/AvengeMedia/dankgo/ipc/params" - "github.com/AvengeMedia/dgop/gops" + "github.com/duxlabs-dev/dux-go/ipc" + "github.com/duxlabs-dev/dux-go/ipc/params" + "github.com/duxlabs-dev/dux-gop/gops" ) const metaTimeout = 10 * time.Second diff --git a/core/internal/server/dgop/worker.go b/core/internal/server/dgop/worker.go index 769b2a391..0a1dd55fa 100644 --- a/core/internal/server/dgop/worker.go +++ b/core/internal/server/dgop/worker.go @@ -4,7 +4,7 @@ import ( "runtime" "sync" - "github.com/AvengeMedia/DankMaterialShell/core/internal/lowprio" + "github.com/duxlabs-dev/dux-shell/core/internal/lowprio" ) var ( diff --git a/core/internal/server/evdev/handlers.go b/core/internal/server/evdev/handlers.go index 70ccba699..6979e462a 100644 --- a/core/internal/server/evdev/handlers.go +++ b/core/internal/server/evdev/handlers.go @@ -1,7 +1,7 @@ package evdev import ( - "github.com/AvengeMedia/dankgo/ipc" + "github.com/duxlabs-dev/dux-go/ipc" ) func HandleRequest(conn *ipc.ConnWriter, req ipc.Request, m *Manager) { diff --git a/core/internal/server/evdev/handlers_test.go b/core/internal/server/evdev/handlers_test.go index 2eacf3836..0aefc7235 100644 --- a/core/internal/server/evdev/handlers_test.go +++ b/core/internal/server/evdev/handlers_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - mocks "github.com/AvengeMedia/DankMaterialShell/core/internal/mocks/evdev" - "github.com/AvengeMedia/dankgo/ipc" + "github.com/duxlabs-dev/dux-go/ipc" + mocks "github.com/duxlabs-dev/dux-shell/core/internal/mocks/evdev" ) type mockNetConn struct { diff --git a/core/internal/server/evdev/manager.go b/core/internal/server/evdev/manager.go index 0c2efb0a3..e35dec7ca 100644 --- a/core/internal/server/evdev/manager.go +++ b/core/internal/server/evdev/manager.go @@ -8,8 +8,8 @@ import ( "sync" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" - "github.com/AvengeMedia/dankgo/syncmap" + "github.com/duxlabs-dev/dux-go/syncmap" + "github.com/duxlabs-dev/dux-shell/core/internal/log" "github.com/fsnotify/fsnotify" evdev "github.com/holoplot/go-evdev" ) diff --git a/core/internal/server/evdev/manager_test.go b/core/internal/server/evdev/manager_test.go index fab1087b8..f9611e381 100644 --- a/core/internal/server/evdev/manager_test.go +++ b/core/internal/server/evdev/manager_test.go @@ -7,7 +7,7 @@ import ( evdev "github.com/holoplot/go-evdev" "github.com/stretchr/testify/assert" - mocks "github.com/AvengeMedia/DankMaterialShell/core/internal/mocks/evdev" + mocks "github.com/duxlabs-dev/dux-shell/core/internal/mocks/evdev" ) func TestManager_Unsubscribe(t *testing.T) { diff --git a/core/internal/server/files.go b/core/internal/server/files.go index 877512fbd..4c26ab11a 100644 --- a/core/internal/server/files.go +++ b/core/internal/server/files.go @@ -3,9 +3,9 @@ package server import ( "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/utils" - "github.com/AvengeMedia/dankgo/files" - "github.com/AvengeMedia/dankgo/syncmap" + "github.com/duxlabs-dev/dux-go/files" + "github.com/duxlabs-dev/dux-go/syncmap" + "github.com/duxlabs-dev/dux-shell/core/internal/utils" ) const filesEventBuffer = 256 diff --git a/core/internal/server/freedesktop/actions.go b/core/internal/server/freedesktop/actions.go index 2d6416d8a..7848fdde1 100644 --- a/core/internal/server/freedesktop/actions.go +++ b/core/internal/server/freedesktop/actions.go @@ -5,7 +5,7 @@ import ( "io" "os" - "github.com/AvengeMedia/DankMaterialShell/core/internal/utils" + "github.com/duxlabs-dev/dux-shell/core/internal/utils" "github.com/godbus/dbus/v5" ) diff --git a/core/internal/server/freedesktop/handlers.go b/core/internal/server/freedesktop/handlers.go index d4c2fdf25..719fe90bf 100644 --- a/core/internal/server/freedesktop/handlers.go +++ b/core/internal/server/freedesktop/handlers.go @@ -3,9 +3,9 @@ package freedesktop import ( "fmt" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/models" - "github.com/AvengeMedia/dankgo/ipc" - "github.com/AvengeMedia/dankgo/ipc/params" + "github.com/duxlabs-dev/dux-go/ipc" + "github.com/duxlabs-dev/dux-go/ipc/params" + "github.com/duxlabs-dev/dux-shell/core/internal/server/models" ) func HandleRequest(conn *ipc.ConnWriter, req ipc.Request, manager *Manager) { diff --git a/core/internal/server/freedesktop/handlers_test.go b/core/internal/server/freedesktop/handlers_test.go index 438b3ec16..efa80d1e9 100644 --- a/core/internal/server/freedesktop/handlers_test.go +++ b/core/internal/server/freedesktop/handlers_test.go @@ -10,9 +10,9 @@ import ( "testing" "time" - mockdbus "github.com/AvengeMedia/DankMaterialShell/core/internal/mocks/github.com/godbus/dbus/v5" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/models" - "github.com/AvengeMedia/dankgo/ipc" + "github.com/duxlabs-dev/dux-go/ipc" + mockdbus "github.com/duxlabs-dev/dux-shell/core/internal/mocks/github.com/godbus/dbus/v5" + "github.com/duxlabs-dev/dux-shell/core/internal/server/models" "github.com/godbus/dbus/v5" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/core/internal/server/freedesktop/manager.go b/core/internal/server/freedesktop/manager.go index 0dc7ade50..371776ae4 100644 --- a/core/internal/server/freedesktop/manager.go +++ b/core/internal/server/freedesktop/manager.go @@ -7,8 +7,8 @@ import ( "sync" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" - "github.com/AvengeMedia/dankgo/dbusutil" + "github.com/duxlabs-dev/dux-go/dbusutil" + "github.com/duxlabs-dev/dux-shell/core/internal/log" "github.com/godbus/dbus/v5" ) diff --git a/core/internal/server/freedesktop/screensaver.go b/core/internal/server/freedesktop/screensaver.go index 320f13e26..5f996e0a9 100644 --- a/core/internal/server/freedesktop/screensaver.go +++ b/core/internal/server/freedesktop/screensaver.go @@ -7,7 +7,7 @@ import ( "sync/atomic" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/log" "github.com/godbus/dbus/v5" "github.com/godbus/dbus/v5/introspect" ) diff --git a/core/internal/server/freedesktop/types.go b/core/internal/server/freedesktop/types.go index 47a350424..7c21008f5 100644 --- a/core/internal/server/freedesktop/types.go +++ b/core/internal/server/freedesktop/types.go @@ -4,7 +4,7 @@ import ( "sync" "time" - "github.com/AvengeMedia/dankgo/syncmap" + "github.com/duxlabs-dev/dux-go/syncmap" "github.com/godbus/dbus/v5" ) diff --git a/core/internal/server/location/handlers.go b/core/internal/server/location/handlers.go index 9833a9920..0bc691e02 100644 --- a/core/internal/server/location/handlers.go +++ b/core/internal/server/location/handlers.go @@ -3,7 +3,7 @@ package location import ( "fmt" - "github.com/AvengeMedia/dankgo/ipc" + "github.com/duxlabs-dev/dux-go/ipc" ) type LocationEvent struct { diff --git a/core/internal/server/location/manager.go b/core/internal/server/location/manager.go index 9e61823c4..94702f602 100644 --- a/core/internal/server/location/manager.go +++ b/core/internal/server/location/manager.go @@ -3,8 +3,8 @@ package location import ( "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/geolocation" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/geolocation" + "github.com/duxlabs-dev/dux-shell/core/internal/log" ) func NewManager(client geolocation.Client) (*Manager, error) { diff --git a/core/internal/server/location/types.go b/core/internal/server/location/types.go index c2407a7c3..821095fce 100644 --- a/core/internal/server/location/types.go +++ b/core/internal/server/location/types.go @@ -3,8 +3,8 @@ package location import ( "sync" - "github.com/AvengeMedia/DankMaterialShell/core/internal/geolocation" - "github.com/AvengeMedia/dankgo/syncmap" + "github.com/duxlabs-dev/dux-go/syncmap" + "github.com/duxlabs-dev/dux-shell/core/internal/geolocation" ) type State struct { diff --git a/core/internal/server/loginctl/handlers.go b/core/internal/server/loginctl/handlers.go index 2f0d24eaf..c7e93ebe7 100644 --- a/core/internal/server/loginctl/handlers.go +++ b/core/internal/server/loginctl/handlers.go @@ -3,9 +3,9 @@ package loginctl import ( "fmt" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/models" - "github.com/AvengeMedia/dankgo/ipc" - "github.com/AvengeMedia/dankgo/ipc/params" + "github.com/duxlabs-dev/dux-go/ipc" + "github.com/duxlabs-dev/dux-go/ipc/params" + "github.com/duxlabs-dev/dux-shell/core/internal/server/models" ) func HandleRequest(conn *ipc.ConnWriter, req ipc.Request, manager *Manager) { diff --git a/core/internal/server/loginctl/handlers_test.go b/core/internal/server/loginctl/handlers_test.go index f9b14f62f..25a094846 100644 --- a/core/internal/server/loginctl/handlers_test.go +++ b/core/internal/server/loginctl/handlers_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - mockdbus "github.com/AvengeMedia/DankMaterialShell/core/internal/mocks/github.com/godbus/dbus/v5" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/models" - "github.com/AvengeMedia/dankgo/ipc" + "github.com/duxlabs-dev/dux-go/ipc" + mockdbus "github.com/duxlabs-dev/dux-shell/core/internal/mocks/github.com/godbus/dbus/v5" + "github.com/duxlabs-dev/dux-shell/core/internal/server/models" "github.com/godbus/dbus/v5" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/core/internal/server/loginctl/manager.go b/core/internal/server/loginctl/manager.go index 3537458a0..2a96485bd 100644 --- a/core/internal/server/loginctl/manager.go +++ b/core/internal/server/loginctl/manager.go @@ -7,7 +7,7 @@ import ( "sync" "time" - "github.com/AvengeMedia/dankgo/dbusutil" + "github.com/duxlabs-dev/dux-go/dbusutil" "github.com/godbus/dbus/v5" ) @@ -380,7 +380,7 @@ func (m *Manager) acquireSleepInhibitor() error { return fmt.Errorf("manager object not available") } - file, err := m.inhibit("sleep", "DankMaterialShell", "Lock before suspend", "delay") + file, err := m.inhibit("sleep", "Dux Shell", "Lock before suspend", "delay") if err != nil { return err } diff --git a/core/internal/server/loginctl/monitor.go b/core/internal/server/loginctl/monitor.go index 116a73b2a..ea46385d9 100644 --- a/core/internal/server/loginctl/monitor.go +++ b/core/internal/server/loginctl/monitor.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/AvengeMedia/dankgo/dbusutil" + "github.com/duxlabs-dev/dux-go/dbusutil" "github.com/godbus/dbus/v5" ) diff --git a/core/internal/server/loginctl/monitor_test.go b/core/internal/server/loginctl/monitor_test.go index 8086f8883..1c9b3c02c 100644 --- a/core/internal/server/loginctl/monitor_test.go +++ b/core/internal/server/loginctl/monitor_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - mockdbus "github.com/AvengeMedia/DankMaterialShell/core/internal/mocks/github.com/godbus/dbus/v5" + mockdbus "github.com/duxlabs-dev/dux-shell/core/internal/mocks/github.com/godbus/dbus/v5" "github.com/godbus/dbus/v5" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/core/internal/server/loginctl/types.go b/core/internal/server/loginctl/types.go index 926f37640..e72d30b38 100644 --- a/core/internal/server/loginctl/types.go +++ b/core/internal/server/loginctl/types.go @@ -6,7 +6,7 @@ import ( "sync/atomic" "time" - "github.com/AvengeMedia/dankgo/syncmap" + "github.com/duxlabs-dev/dux-go/syncmap" "github.com/godbus/dbus/v5" ) diff --git a/core/internal/server/lyrics/handlers.go b/core/internal/server/lyrics/handlers.go index 1292294c4..bf8946af1 100644 --- a/core/internal/server/lyrics/handlers.go +++ b/core/internal/server/lyrics/handlers.go @@ -7,12 +7,12 @@ import ( "strings" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/lowprio" - "github.com/AvengeMedia/DankMaterialShell/core/internal/plugins" - "github.com/AvengeMedia/DankMaterialShell/core/internal/utils" - "github.com/AvengeMedia/dankgo/ipc" - "github.com/AvengeMedia/dankgo/ipc/params" - corelyrics "github.com/AvengeMedia/dankgo/lyrics" + "github.com/duxlabs-dev/dux-go/ipc" + "github.com/duxlabs-dev/dux-go/ipc/params" + corelyrics "github.com/duxlabs-dev/dux-go/lyrics" + "github.com/duxlabs-dev/dux-shell/core/internal/lowprio" + "github.com/duxlabs-dev/dux-shell/core/internal/plugins" + "github.com/duxlabs-dev/dux-shell/core/internal/utils" ) func HandleRequest(conn *ipc.ConnWriter, req ipc.Request) { @@ -27,8 +27,8 @@ func HandleRequest(conn *ipc.ConnWriter, req ipc.Request) { const pluginPrefix = "plugin_" var client = corelyrics.New(corelyrics.Options{ - CacheDir: filepath.Join(utils.XDGCacheHome(), "DankMaterialShell", "lyrics"), - UserAgent: "DankMaterialShell/1 (+https://github.com/AvengeMedia/DankMaterialShell)", + CacheDir: filepath.Join(utils.XDGCacheHome(), "dms", "lyrics"), + UserAgent: "DuxShell/1 (+https://github.com/duxlabs-dev/dux-shell)", Resolve: pluginSource, }) diff --git a/core/internal/server/matugen_handler.go b/core/internal/server/matugen_handler.go index ed09dc96d..c4096478c 100644 --- a/core/internal/server/matugen_handler.go +++ b/core/internal/server/matugen_handler.go @@ -4,8 +4,8 @@ import ( "context" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/matugen" - "github.com/AvengeMedia/dankgo/ipc" + "github.com/duxlabs-dev/dux-go/ipc" + "github.com/duxlabs-dev/dux-shell/core/internal/matugen" ) type MatugenQueueResult struct { diff --git a/core/internal/server/mime/detect.go b/core/internal/server/mime/detect.go index bd3cd2daa..2456dc76c 100644 --- a/core/internal/server/mime/detect.go +++ b/core/internal/server/mime/detect.go @@ -7,7 +7,7 @@ import ( "strconv" "strings" - "github.com/AvengeMedia/dankgo/paths" + "github.com/duxlabs-dev/dux-go/paths" ) const noGlobs = "__NOGLOBS__" diff --git a/core/internal/server/mime/handlers.go b/core/internal/server/mime/handlers.go index e7ec37e7f..8c45b91ba 100644 --- a/core/internal/server/mime/handlers.go +++ b/core/internal/server/mime/handlers.go @@ -3,10 +3,10 @@ package mime import ( "fmt" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/models" - "github.com/AvengeMedia/dankgo/desktop" - "github.com/AvengeMedia/dankgo/ipc" - "github.com/AvengeMedia/dankgo/ipc/params" + "github.com/duxlabs-dev/dux-go/desktop" + "github.com/duxlabs-dev/dux-go/ipc" + "github.com/duxlabs-dev/dux-go/ipc/params" + "github.com/duxlabs-dev/dux-shell/core/internal/server/models" ) type defaultResult struct { diff --git a/core/internal/server/network/agent_iwd.go b/core/internal/server/network/agent_iwd.go index 861516104..d88c2f149 100644 --- a/core/internal/server/network/agent_iwd.go +++ b/core/internal/server/network/agent_iwd.go @@ -6,7 +6,7 @@ import ( "fmt" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/errdefs" + "github.com/duxlabs-dev/dux-shell/core/internal/errdefs" "github.com/godbus/dbus/v5" ) diff --git a/core/internal/server/network/agent_networkmanager.go b/core/internal/server/network/agent_networkmanager.go index 9597d84c6..741389a10 100644 --- a/core/internal/server/network/agent_networkmanager.go +++ b/core/internal/server/network/agent_networkmanager.go @@ -8,8 +8,8 @@ import ( "strings" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/errdefs" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/errdefs" + "github.com/duxlabs-dev/dux-shell/core/internal/log" "github.com/godbus/dbus/v5" "golang.org/x/text/cases" "golang.org/x/text/language" @@ -20,7 +20,7 @@ const ( nmAgentManagerIface = "org.freedesktop.NetworkManager.AgentManager" nmSecretAgentIface = "org.freedesktop.NetworkManager.SecretAgent" agentObjectPath = "/org/freedesktop/NetworkManager/SecretAgent" - agentIdentifier = "com.danklinux.NMAgent" + agentIdentifier = "dev.duxlabs.NMAgent" ) const ( diff --git a/core/internal/server/network/backend_iwd.go b/core/internal/server/network/backend_iwd.go index 002e73c88..3bb65724e 100644 --- a/core/internal/server/network/backend_iwd.go +++ b/core/internal/server/network/backend_iwd.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/log" "github.com/godbus/dbus/v5" ) diff --git a/core/internal/server/network/backend_iwd_signals.go b/core/internal/server/network/backend_iwd_signals.go index 60ea87625..f465c2b13 100644 --- a/core/internal/server/network/backend_iwd_signals.go +++ b/core/internal/server/network/backend_iwd_signals.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/log" "github.com/godbus/dbus/v5" ) diff --git a/core/internal/server/network/backend_iwd_wifi.go b/core/internal/server/network/backend_iwd_wifi.go index 5c89e331c..80cef15d5 100644 --- a/core/internal/server/network/backend_iwd_wifi.go +++ b/core/internal/server/network/backend_iwd_wifi.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/errdefs" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/errdefs" + "github.com/duxlabs-dev/dux-shell/core/internal/log" "github.com/godbus/dbus/v5" ) diff --git a/core/internal/server/network/backend_networkd.go b/core/internal/server/network/backend_networkd.go index f5baea603..2ecb6e952 100644 --- a/core/internal/server/network/backend_networkd.go +++ b/core/internal/server/network/backend_networkd.go @@ -8,7 +8,7 @@ import ( "strings" "sync" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/log" "github.com/godbus/dbus/v5" ) diff --git a/core/internal/server/network/backend_networkd_signals.go b/core/internal/server/network/backend_networkd_signals.go index 0f47ddbf6..c53367e81 100644 --- a/core/internal/server/network/backend_networkd_signals.go +++ b/core/internal/server/network/backend_networkd_signals.go @@ -3,7 +3,7 @@ package network import ( "fmt" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/log" "github.com/godbus/dbus/v5" ) diff --git a/core/internal/server/network/backend_networkmanager.go b/core/internal/server/network/backend_networkmanager.go index fc2354892..95fc4e164 100644 --- a/core/internal/server/network/backend_networkmanager.go +++ b/core/internal/server/network/backend_networkmanager.go @@ -6,8 +6,8 @@ import ( "sync" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" "github.com/Wifx/gonetworkmanager/v2" + "github.com/duxlabs-dev/dux-shell/core/internal/log" "github.com/godbus/dbus/v5" ) diff --git a/core/internal/server/network/backend_networkmanager_cellular.go b/core/internal/server/network/backend_networkmanager_cellular.go index 0b1fd7c25..f8409f12e 100644 --- a/core/internal/server/network/backend_networkmanager_cellular.go +++ b/core/internal/server/network/backend_networkmanager_cellular.go @@ -3,8 +3,8 @@ package network import ( "fmt" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" "github.com/Wifx/gonetworkmanager/v2" + "github.com/duxlabs-dev/dux-shell/core/internal/log" "github.com/godbus/dbus/v5" ) diff --git a/core/internal/server/network/backend_networkmanager_ethernet.go b/core/internal/server/network/backend_networkmanager_ethernet.go index dd96a5132..85f1e6261 100644 --- a/core/internal/server/network/backend_networkmanager_ethernet.go +++ b/core/internal/server/network/backend_networkmanager_ethernet.go @@ -6,8 +6,8 @@ import ( "strconv" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" "github.com/Wifx/gonetworkmanager/v2" + "github.com/duxlabs-dev/dux-shell/core/internal/log" ) func (b *NetworkManagerBackend) GetWiredConnections() ([]WiredConnection, error) { diff --git a/core/internal/server/network/backend_networkmanager_ethernet_test.go b/core/internal/server/network/backend_networkmanager_ethernet_test.go index 8f751cb70..3272d6e16 100644 --- a/core/internal/server/network/backend_networkmanager_ethernet_test.go +++ b/core/internal/server/network/backend_networkmanager_ethernet_test.go @@ -3,7 +3,7 @@ package network import ( "testing" - mock_gonetworkmanager "github.com/AvengeMedia/DankMaterialShell/core/internal/mocks/github.com/Wifx/gonetworkmanager/v2" + mock_gonetworkmanager "github.com/duxlabs-dev/dux-shell/core/internal/mocks/github.com/Wifx/gonetworkmanager/v2" "github.com/stretchr/testify/assert" ) diff --git a/core/internal/server/network/backend_networkmanager_fortinet_saml.go b/core/internal/server/network/backend_networkmanager_fortinet_saml.go index bd9806f39..77c3130ff 100644 --- a/core/internal/server/network/backend_networkmanager_fortinet_saml.go +++ b/core/internal/server/network/backend_networkmanager_fortinet_saml.go @@ -19,8 +19,8 @@ import ( "syscall" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" "github.com/Wifx/gonetworkmanager/v2" + "github.com/duxlabs-dev/dux-shell/core/internal/log" ) const ( diff --git a/core/internal/server/network/backend_networkmanager_gp_saml.go b/core/internal/server/network/backend_networkmanager_gp_saml.go index 33d313294..ffcddd331 100644 --- a/core/internal/server/network/backend_networkmanager_gp_saml.go +++ b/core/internal/server/network/backend_networkmanager_gp_saml.go @@ -8,7 +8,7 @@ import ( "os/exec" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/log" ) type openConnectAuthResult struct { diff --git a/core/internal/server/network/backend_networkmanager_hotspot.go b/core/internal/server/network/backend_networkmanager_hotspot.go index cd88ce469..078206abc 100644 --- a/core/internal/server/network/backend_networkmanager_hotspot.go +++ b/core/internal/server/network/backend_networkmanager_hotspot.go @@ -5,9 +5,9 @@ import ( "fmt" "sort" - "github.com/AvengeMedia/DankMaterialShell/core/internal/errdefs" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" "github.com/Wifx/gonetworkmanager/v2" + "github.com/duxlabs-dev/dux-shell/core/internal/errdefs" + "github.com/duxlabs-dev/dux-shell/core/internal/log" ) const ( diff --git a/core/internal/server/network/backend_networkmanager_hotspot_test.go b/core/internal/server/network/backend_networkmanager_hotspot_test.go index 34a5396da..bb549b230 100644 --- a/core/internal/server/network/backend_networkmanager_hotspot_test.go +++ b/core/internal/server/network/backend_networkmanager_hotspot_test.go @@ -4,8 +4,8 @@ import ( "strings" "testing" - mock_gonetworkmanager "github.com/AvengeMedia/DankMaterialShell/core/internal/mocks/github.com/Wifx/gonetworkmanager/v2" "github.com/Wifx/gonetworkmanager/v2" + mock_gonetworkmanager "github.com/duxlabs-dev/dux-shell/core/internal/mocks/github.com/Wifx/gonetworkmanager/v2" "github.com/godbus/dbus/v5" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/core/internal/server/network/backend_networkmanager_signals.go b/core/internal/server/network/backend_networkmanager_signals.go index db777e28f..684a03c20 100644 --- a/core/internal/server/network/backend_networkmanager_signals.go +++ b/core/internal/server/network/backend_networkmanager_signals.go @@ -3,8 +3,8 @@ package network import ( "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" "github.com/Wifx/gonetworkmanager/v2" + "github.com/duxlabs-dev/dux-shell/core/internal/log" "github.com/godbus/dbus/v5" ) diff --git a/core/internal/server/network/backend_networkmanager_signals_test.go b/core/internal/server/network/backend_networkmanager_signals_test.go index e882fa5ff..1123acb64 100644 --- a/core/internal/server/network/backend_networkmanager_signals_test.go +++ b/core/internal/server/network/backend_networkmanager_signals_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - mock_gonetworkmanager "github.com/AvengeMedia/DankMaterialShell/core/internal/mocks/github.com/Wifx/gonetworkmanager/v2" "github.com/Wifx/gonetworkmanager/v2" + mock_gonetworkmanager "github.com/duxlabs-dev/dux-shell/core/internal/mocks/github.com/Wifx/gonetworkmanager/v2" "github.com/godbus/dbus/v5" "github.com/stretchr/testify/assert" ) diff --git a/core/internal/server/network/backend_networkmanager_state.go b/core/internal/server/network/backend_networkmanager_state.go index 706b06902..584d36809 100644 --- a/core/internal/server/network/backend_networkmanager_state.go +++ b/core/internal/server/network/backend_networkmanager_state.go @@ -4,9 +4,9 @@ import ( "sort" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/errdefs" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" "github.com/Wifx/gonetworkmanager/v2" + "github.com/duxlabs-dev/dux-shell/core/internal/errdefs" + "github.com/duxlabs-dev/dux-shell/core/internal/log" ) func (b *NetworkManagerBackend) updatePrimaryConnection() error { diff --git a/core/internal/server/network/backend_networkmanager_state_test.go b/core/internal/server/network/backend_networkmanager_state_test.go index 04abd66ff..d1f57c85f 100644 --- a/core/internal/server/network/backend_networkmanager_state_test.go +++ b/core/internal/server/network/backend_networkmanager_state_test.go @@ -3,9 +3,9 @@ package network import ( "testing" - "github.com/AvengeMedia/DankMaterialShell/core/internal/errdefs" - mock_gonetworkmanager "github.com/AvengeMedia/DankMaterialShell/core/internal/mocks/github.com/Wifx/gonetworkmanager/v2" "github.com/Wifx/gonetworkmanager/v2" + "github.com/duxlabs-dev/dux-shell/core/internal/errdefs" + mock_gonetworkmanager "github.com/duxlabs-dev/dux-shell/core/internal/mocks/github.com/Wifx/gonetworkmanager/v2" "github.com/stretchr/testify/assert" ) diff --git a/core/internal/server/network/backend_networkmanager_test.go b/core/internal/server/network/backend_networkmanager_test.go index 8b7fd7345..0bd5a87eb 100644 --- a/core/internal/server/network/backend_networkmanager_test.go +++ b/core/internal/server/network/backend_networkmanager_test.go @@ -3,7 +3,7 @@ package network import ( "testing" - mock_gonetworkmanager "github.com/AvengeMedia/DankMaterialShell/core/internal/mocks/github.com/Wifx/gonetworkmanager/v2" + mock_gonetworkmanager "github.com/duxlabs-dev/dux-shell/core/internal/mocks/github.com/Wifx/gonetworkmanager/v2" "github.com/stretchr/testify/assert" ) diff --git a/core/internal/server/network/backend_networkmanager_vpn.go b/core/internal/server/network/backend_networkmanager_vpn.go index 947f655de..1eb6f7727 100644 --- a/core/internal/server/network/backend_networkmanager_vpn.go +++ b/core/internal/server/network/backend_networkmanager_vpn.go @@ -13,8 +13,8 @@ import ( "strings" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" "github.com/Wifx/gonetworkmanager/v2" + "github.com/duxlabs-dev/dux-shell/core/internal/log" "github.com/godbus/dbus/v5" ) diff --git a/core/internal/server/network/backend_networkmanager_vpn_test.go b/core/internal/server/network/backend_networkmanager_vpn_test.go index 69a6d70ac..5c478bc8a 100644 --- a/core/internal/server/network/backend_networkmanager_vpn_test.go +++ b/core/internal/server/network/backend_networkmanager_vpn_test.go @@ -6,8 +6,8 @@ import ( "path/filepath" "testing" - mock_gonetworkmanager "github.com/AvengeMedia/DankMaterialShell/core/internal/mocks/github.com/Wifx/gonetworkmanager/v2" "github.com/Wifx/gonetworkmanager/v2" + mock_gonetworkmanager "github.com/duxlabs-dev/dux-shell/core/internal/mocks/github.com/Wifx/gonetworkmanager/v2" "github.com/godbus/dbus/v5" "github.com/stretchr/testify/assert" ) diff --git a/core/internal/server/network/backend_networkmanager_wifi.go b/core/internal/server/network/backend_networkmanager_wifi.go index bf30b4ac3..9c70d9c70 100644 --- a/core/internal/server/network/backend_networkmanager_wifi.go +++ b/core/internal/server/network/backend_networkmanager_wifi.go @@ -5,8 +5,8 @@ import ( "fmt" "sort" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" "github.com/Wifx/gonetworkmanager/v2" + "github.com/duxlabs-dev/dux-shell/core/internal/log" ) func (b *NetworkManagerBackend) GetWiFiEnabled() (bool, error) { diff --git a/core/internal/server/network/backend_networkmanager_wifi_test.go b/core/internal/server/network/backend_networkmanager_wifi_test.go index 48225166d..4735194de 100644 --- a/core/internal/server/network/backend_networkmanager_wifi_test.go +++ b/core/internal/server/network/backend_networkmanager_wifi_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - mock_gonetworkmanager "github.com/AvengeMedia/DankMaterialShell/core/internal/mocks/github.com/Wifx/gonetworkmanager/v2" "github.com/Wifx/gonetworkmanager/v2" + mock_gonetworkmanager "github.com/duxlabs-dev/dux-shell/core/internal/mocks/github.com/Wifx/gonetworkmanager/v2" "github.com/godbus/dbus/v5" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/core/internal/server/network/backend_wpa.go b/core/internal/server/network/backend_wpa.go index 827fde90e..27e1b0ef2 100644 --- a/core/internal/server/network/backend_wpa.go +++ b/core/internal/server/network/backend_wpa.go @@ -11,7 +11,7 @@ import ( "sync" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/log" ) // Default ctrl_interface directory on FreeBSD and minimal Linux setups; see diff --git a/core/internal/server/network/backend_wpa_ctrl.go b/core/internal/server/network/backend_wpa_ctrl.go index d71e10944..bbc94fe60 100644 --- a/core/internal/server/network/backend_wpa_ctrl.go +++ b/core/internal/server/network/backend_wpa_ctrl.go @@ -9,7 +9,7 @@ import ( "sync" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/utils" + "github.com/duxlabs-dev/dux-shell/core/internal/utils" ) const ( diff --git a/core/internal/server/network/backend_wpa_events.go b/core/internal/server/network/backend_wpa_events.go index 300959385..458bfcc84 100644 --- a/core/internal/server/network/backend_wpa_events.go +++ b/core/internal/server/network/backend_wpa_events.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/errdefs" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/errdefs" + "github.com/duxlabs-dev/dux-shell/core/internal/log" ) // Event strings per WPA_EVENT_* in contrib/wpa/src/common/wpa_ctrl.h diff --git a/core/internal/server/network/backend_wpa_wifi.go b/core/internal/server/network/backend_wpa_wifi.go index 951387c45..e052fe41c 100644 --- a/core/internal/server/network/backend_wpa_wifi.go +++ b/core/internal/server/network/backend_wpa_wifi.go @@ -8,8 +8,8 @@ import ( "strings" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/errdefs" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/errdefs" + "github.com/duxlabs-dev/dux-shell/core/internal/log" ) type wpaScanResult struct { diff --git a/core/internal/server/network/handlers.go b/core/internal/server/network/handlers.go index a1dec281a..51d8af56a 100644 --- a/core/internal/server/network/handlers.go +++ b/core/internal/server/network/handlers.go @@ -4,10 +4,10 @@ import ( "fmt" "os" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/models" - "github.com/AvengeMedia/dankgo/ipc" - "github.com/AvengeMedia/dankgo/ipc/params" + "github.com/duxlabs-dev/dux-go/ipc" + "github.com/duxlabs-dev/dux-go/ipc/params" + "github.com/duxlabs-dev/dux-shell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/server/models" ) func HandleRequest(conn *ipc.ConnWriter, req ipc.Request, manager *Manager) { diff --git a/core/internal/server/network/handlers_test.go b/core/internal/server/network/handlers_test.go index 39363ab42..db5138efe 100644 --- a/core/internal/server/network/handlers_test.go +++ b/core/internal/server/network/handlers_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/models" - "github.com/AvengeMedia/dankgo/ipc" + "github.com/duxlabs-dev/dux-go/ipc" + "github.com/duxlabs-dev/dux-shell/core/internal/server/models" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/core/internal/server/network/manager.go b/core/internal/server/network/manager.go index c615876f3..53232f388 100644 --- a/core/internal/server/network/manager.go +++ b/core/internal/server/network/manager.go @@ -6,7 +6,7 @@ import ( "sync" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/log" "github.com/yeqown/go-qrcode/v2" "github.com/yeqown/go-qrcode/writer/standard" ) diff --git a/core/internal/server/network/openfortivpn_import.go b/core/internal/server/network/openfortivpn_import.go index 5a760957f..108f06cf0 100644 --- a/core/internal/server/network/openfortivpn_import.go +++ b/core/internal/server/network/openfortivpn_import.go @@ -10,8 +10,8 @@ import ( "strconv" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" "github.com/Wifx/gonetworkmanager/v2" + "github.com/duxlabs-dev/dux-shell/core/internal/log" ) // openfortivpnConfig holds the parts of an openfortivpn config file that map diff --git a/core/internal/server/network/priority.go b/core/internal/server/network/priority.go index b53dc96a2..5083d36ec 100644 --- a/core/internal/server/network/priority.go +++ b/core/internal/server/network/priority.go @@ -5,7 +5,7 @@ import ( "os/exec" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/log" "github.com/godbus/dbus/v5" ) diff --git a/core/internal/server/network/secret_service.go b/core/internal/server/network/secret_service.go index 9abd9d92f..fc38f9fed 100644 --- a/core/internal/server/network/secret_service.go +++ b/core/internal/server/network/secret_service.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/log" "github.com/godbus/dbus/v5" ) diff --git a/core/internal/server/network/subscription_broker.go b/core/internal/server/network/subscription_broker.go index 5985a815d..524619ec7 100644 --- a/core/internal/server/network/subscription_broker.go +++ b/core/internal/server/network/subscription_broker.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/AvengeMedia/DankMaterialShell/core/internal/errdefs" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" - "github.com/AvengeMedia/dankgo/syncmap" + "github.com/duxlabs-dev/dux-go/syncmap" + "github.com/duxlabs-dev/dux-shell/core/internal/errdefs" + "github.com/duxlabs-dev/dux-shell/core/internal/log" ) type SubscriptionBroker struct { diff --git a/core/internal/server/network/types.go b/core/internal/server/network/types.go index e5f71ed7f..5f462f4e8 100644 --- a/core/internal/server/network/types.go +++ b/core/internal/server/network/types.go @@ -3,7 +3,7 @@ package network import ( "sync" - "github.com/AvengeMedia/dankgo/syncmap" + "github.com/duxlabs-dev/dux-go/syncmap" "github.com/godbus/dbus/v5" ) diff --git a/core/internal/server/network/wifi_qrcode.go b/core/internal/server/network/wifi_qrcode.go index 90858ba89..b727c6b1b 100644 --- a/core/internal/server/network/wifi_qrcode.go +++ b/core/internal/server/network/wifi_qrcode.go @@ -6,7 +6,7 @@ import ( "regexp" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/qrcode" + "github.com/duxlabs-dev/dux-shell/core/internal/qrcode" ) const qrCodeTmpPrefix = "/tmp/dank-wifi-qrcode-" diff --git a/core/internal/server/notifyactions/handlers.go b/core/internal/server/notifyactions/handlers.go index ca35374f8..ef3e8883a 100644 --- a/core/internal/server/notifyactions/handlers.go +++ b/core/internal/server/notifyactions/handlers.go @@ -3,9 +3,9 @@ package notifyactions import ( "os" - "github.com/AvengeMedia/DankMaterialShell/core/internal/notify" - "github.com/AvengeMedia/dankgo/ipc" - "github.com/AvengeMedia/dankgo/ipc/params" + "github.com/duxlabs-dev/dux-go/ipc" + "github.com/duxlabs-dev/dux-go/ipc/params" + "github.com/duxlabs-dev/dux-shell/core/internal/notify" ) func HandleRequest(conn *ipc.ConnWriter, req ipc.Request, manager *Manager) { diff --git a/core/internal/server/notifyactions/manager.go b/core/internal/server/notifyactions/manager.go index 5d1dc6d7e..409f341e2 100644 --- a/core/internal/server/notifyactions/manager.go +++ b/core/internal/server/notifyactions/manager.go @@ -8,7 +8,7 @@ import ( "github.com/godbus/dbus/v5" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/log" ) const ( diff --git a/core/internal/server/plugins/handlers.go b/core/internal/server/plugins/handlers.go index 5c63e6c6f..bedd3477d 100644 --- a/core/internal/server/plugins/handlers.go +++ b/core/internal/server/plugins/handlers.go @@ -3,7 +3,7 @@ package plugins import ( "fmt" - "github.com/AvengeMedia/dankgo/ipc" + "github.com/duxlabs-dev/dux-go/ipc" ) func HandleRequest(conn *ipc.ConnWriter, req ipc.Request) { diff --git a/core/internal/server/plugins/handlers_test.go b/core/internal/server/plugins/handlers_test.go index be111d67b..739e977aa 100644 --- a/core/internal/server/plugins/handlers_test.go +++ b/core/internal/server/plugins/handlers_test.go @@ -4,9 +4,9 @@ import ( "encoding/json" "testing" - "github.com/AvengeMedia/DankMaterialShell/core/internal/mocks/net" - coreplugins "github.com/AvengeMedia/DankMaterialShell/core/internal/plugins" - "github.com/AvengeMedia/dankgo/ipc" + "github.com/duxlabs-dev/dux-go/ipc" + "github.com/duxlabs-dev/dux-shell/core/internal/mocks/net" + coreplugins "github.com/duxlabs-dev/dux-shell/core/internal/plugins" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) @@ -164,11 +164,11 @@ func TestPluginInfoFromPluginIncludesScreenshot(t *testing.T) { info := pluginInfoFromPlugin(coreplugins.Plugin{ ID: "dankVault", Name: "Vault", - Repo: "https://github.com/AvengeMedia/dms-plugins", - Screenshot: "https://github.com/AvengeMedia/dms-plugins/blob/master/DankNotepadModule/screenshot.png", + Repo: "https://github.com/duxlabs-dev/dux-plugins", + Screenshot: "https://github.com/duxlabs-dev/dux-plugins/blob/master/DankNotepadModule/screenshot.png", }) - assert.Equal(t, "https://raw.githubusercontent.com/AvengeMedia/dms-plugins/master/DankNotepadModule/screenshot.png", info.Screenshot) + assert.Equal(t, "https://raw.githubusercontent.com/duxlabs-dev/dux-plugins/master/DankNotepadModule/screenshot.png", info.Screenshot) assert.True(t, info.FirstParty) } diff --git a/core/internal/server/plugins/install.go b/core/internal/server/plugins/install.go index 6756ff424..e9b495620 100644 --- a/core/internal/server/plugins/install.go +++ b/core/internal/server/plugins/install.go @@ -3,8 +3,8 @@ package plugins import ( "fmt" - "github.com/AvengeMedia/DankMaterialShell/core/internal/plugins" - "github.com/AvengeMedia/dankgo/ipc" + "github.com/duxlabs-dev/dux-go/ipc" + "github.com/duxlabs-dev/dux-shell/core/internal/plugins" ) func HandleInstall(conn *ipc.ConnWriter, req ipc.Request) { diff --git a/core/internal/server/plugins/list.go b/core/internal/server/plugins/list.go index 3436410b1..c5af54271 100644 --- a/core/internal/server/plugins/list.go +++ b/core/internal/server/plugins/list.go @@ -3,8 +3,8 @@ package plugins import ( "fmt" - "github.com/AvengeMedia/DankMaterialShell/core/internal/plugins" - "github.com/AvengeMedia/dankgo/ipc" + "github.com/duxlabs-dev/dux-go/ipc" + "github.com/duxlabs-dev/dux-shell/core/internal/plugins" ) func HandleList(conn *ipc.ConnWriter, req ipc.Request) { diff --git a/core/internal/server/plugins/list_installed.go b/core/internal/server/plugins/list_installed.go index e485841ac..faabbb9ff 100644 --- a/core/internal/server/plugins/list_installed.go +++ b/core/internal/server/plugins/list_installed.go @@ -3,8 +3,8 @@ package plugins import ( "fmt" - "github.com/AvengeMedia/DankMaterialShell/core/internal/plugins" - "github.com/AvengeMedia/dankgo/ipc" + "github.com/duxlabs-dev/dux-go/ipc" + "github.com/duxlabs-dev/dux-shell/core/internal/plugins" ) func HandleListInstalled(conn *ipc.ConnWriter, req ipc.Request) { diff --git a/core/internal/server/plugins/search.go b/core/internal/server/plugins/search.go index 32fc45d04..0d542a135 100644 --- a/core/internal/server/plugins/search.go +++ b/core/internal/server/plugins/search.go @@ -3,8 +3,8 @@ package plugins import ( "fmt" - "github.com/AvengeMedia/DankMaterialShell/core/internal/plugins" - "github.com/AvengeMedia/dankgo/ipc" + "github.com/duxlabs-dev/dux-go/ipc" + "github.com/duxlabs-dev/dux-shell/core/internal/plugins" ) func HandleSearch(conn *ipc.ConnWriter, req ipc.Request) { diff --git a/core/internal/server/plugins/uninstall.go b/core/internal/server/plugins/uninstall.go index dae923272..8ca3dd232 100644 --- a/core/internal/server/plugins/uninstall.go +++ b/core/internal/server/plugins/uninstall.go @@ -3,8 +3,8 @@ package plugins import ( "fmt" - "github.com/AvengeMedia/DankMaterialShell/core/internal/plugins" - "github.com/AvengeMedia/dankgo/ipc" + "github.com/duxlabs-dev/dux-go/ipc" + "github.com/duxlabs-dev/dux-shell/core/internal/plugins" ) func HandleUninstall(conn *ipc.ConnWriter, req ipc.Request) { diff --git a/core/internal/server/plugins/update.go b/core/internal/server/plugins/update.go index e550d4739..2533c669e 100644 --- a/core/internal/server/plugins/update.go +++ b/core/internal/server/plugins/update.go @@ -3,8 +3,8 @@ package plugins import ( "fmt" - "github.com/AvengeMedia/DankMaterialShell/core/internal/plugins" - "github.com/AvengeMedia/dankgo/ipc" + "github.com/duxlabs-dev/dux-go/ipc" + "github.com/duxlabs-dev/dux-shell/core/internal/plugins" ) func HandleUpdate(conn *ipc.ConnWriter, req ipc.Request) { diff --git a/core/internal/server/plugins/utils.go b/core/internal/server/plugins/utils.go index 8e36ff7f6..c929426c9 100644 --- a/core/internal/server/plugins/utils.go +++ b/core/internal/server/plugins/utils.go @@ -5,7 +5,7 @@ import ( "sort" "strings" - coreplugins "github.com/AvengeMedia/DankMaterialShell/core/internal/plugins" + coreplugins "github.com/duxlabs-dev/dux-shell/core/internal/plugins" ) func pluginInfoFromPlugin(plugin coreplugins.Plugin) PluginInfo { @@ -21,7 +21,7 @@ func pluginInfoFromPlugin(plugin coreplugins.Plugin) PluginInfo { Capabilities: plugin.Capabilities, Compositors: plugin.Compositors, Dependencies: plugin.Dependencies, - FirstParty: isFirstPartyRepo(plugin.Repo), + FirstParty: coreplugins.IsFirstPartyRepo(plugin.Repo), Featured: plugin.Featured, RequiresDMS: plugin.RequiresDMS, } @@ -39,10 +39,6 @@ func applyFeedback(info *PluginInfo, fb coreplugins.Feedback) { info.UpdatedAt = fb.UpdatedAt } -func isFirstPartyRepo(repo string) bool { - return strings.HasPrefix(repo, "https://github.com/AvengeMedia") -} - func normalizeScreenshotURL(raw string) string { screenshotURL := strings.TrimSpace(raw) if screenshotURL == "" { @@ -70,8 +66,8 @@ func normalizeScreenshotURL(raw string) string { func SortPluginInfoByFirstParty(pluginInfos []PluginInfo) { sort.SliceStable(pluginInfos, func(i, j int) bool { - isFirstPartyI := isFirstPartyRepo(pluginInfos[i].Repo) - isFirstPartyJ := isFirstPartyRepo(pluginInfos[j].Repo) + isFirstPartyI := coreplugins.IsFirstPartyRepo(pluginInfos[i].Repo) + isFirstPartyJ := coreplugins.IsFirstPartyRepo(pluginInfos[j].Repo) if isFirstPartyI != isFirstPartyJ { return isFirstPartyI } diff --git a/core/internal/server/registries/handlers.go b/core/internal/server/registries/handlers.go index 5da8e4a48..2b050e288 100644 --- a/core/internal/server/registries/handlers.go +++ b/core/internal/server/registries/handlers.go @@ -3,8 +3,8 @@ package registries import ( "fmt" - "github.com/AvengeMedia/DankMaterialShell/core/internal/registries" - "github.com/AvengeMedia/dankgo/ipc" + "github.com/duxlabs-dev/dux-go/ipc" + "github.com/duxlabs-dev/dux-shell/core/internal/registries" "github.com/spf13/afero" ) diff --git a/core/internal/server/router.go b/core/internal/server/router.go index 8939c2d61..8ae953c18 100644 --- a/core/internal/server/router.go +++ b/core/internal/server/router.go @@ -4,35 +4,35 @@ import ( "context" "fmt" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/apppicker" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/bluez" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/brightness" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/clipboard" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/cups" - serverDbus "github.com/AvengeMedia/DankMaterialShell/core/internal/server/dbus" - serverDgop "github.com/AvengeMedia/DankMaterialShell/core/internal/server/dgop" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/evdev" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/freedesktop" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/location" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/loginctl" - serverLyrics "github.com/AvengeMedia/DankMaterialShell/core/internal/server/lyrics" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/mime" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/models" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/network" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/notifyactions" - serverPlugins "github.com/AvengeMedia/DankMaterialShell/core/internal/server/plugins" - serverRegistries "github.com/AvengeMedia/DankMaterialShell/core/internal/server/registries" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/sysupdate" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/tailscale" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/thememode" - serverThemes "github.com/AvengeMedia/DankMaterialShell/core/internal/server/themes" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/wallpaper" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/wayland" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/wellbeing" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/wlroutput" - "github.com/AvengeMedia/DankMaterialShell/core/internal/systemd" - "github.com/AvengeMedia/dankgo/ipc" - "github.com/AvengeMedia/dankgo/ipc/params" + "github.com/duxlabs-dev/dux-go/ipc" + "github.com/duxlabs-dev/dux-go/ipc/params" + "github.com/duxlabs-dev/dux-shell/core/internal/server/apppicker" + "github.com/duxlabs-dev/dux-shell/core/internal/server/bluez" + "github.com/duxlabs-dev/dux-shell/core/internal/server/brightness" + "github.com/duxlabs-dev/dux-shell/core/internal/server/clipboard" + "github.com/duxlabs-dev/dux-shell/core/internal/server/cups" + serverDbus "github.com/duxlabs-dev/dux-shell/core/internal/server/dbus" + serverDgop "github.com/duxlabs-dev/dux-shell/core/internal/server/dgop" + "github.com/duxlabs-dev/dux-shell/core/internal/server/evdev" + "github.com/duxlabs-dev/dux-shell/core/internal/server/freedesktop" + "github.com/duxlabs-dev/dux-shell/core/internal/server/location" + "github.com/duxlabs-dev/dux-shell/core/internal/server/loginctl" + serverLyrics "github.com/duxlabs-dev/dux-shell/core/internal/server/lyrics" + "github.com/duxlabs-dev/dux-shell/core/internal/server/mime" + "github.com/duxlabs-dev/dux-shell/core/internal/server/models" + "github.com/duxlabs-dev/dux-shell/core/internal/server/network" + "github.com/duxlabs-dev/dux-shell/core/internal/server/notifyactions" + serverPlugins "github.com/duxlabs-dev/dux-shell/core/internal/server/plugins" + serverRegistries "github.com/duxlabs-dev/dux-shell/core/internal/server/registries" + "github.com/duxlabs-dev/dux-shell/core/internal/server/sysupdate" + "github.com/duxlabs-dev/dux-shell/core/internal/server/tailscale" + "github.com/duxlabs-dev/dux-shell/core/internal/server/thememode" + serverThemes "github.com/duxlabs-dev/dux-shell/core/internal/server/themes" + "github.com/duxlabs-dev/dux-shell/core/internal/server/wallpaper" + "github.com/duxlabs-dev/dux-shell/core/internal/server/wayland" + "github.com/duxlabs-dev/dux-shell/core/internal/server/wellbeing" + "github.com/duxlabs-dev/dux-shell/core/internal/server/wlroutput" + "github.com/duxlabs-dev/dux-shell/core/internal/systemd" ) var requestMux = newRequestMux(nil) diff --git a/core/internal/server/router_test.go b/core/internal/server/router_test.go index 20b379b43..cfb537a65 100644 --- a/core/internal/server/router_test.go +++ b/core/internal/server/router_test.go @@ -9,10 +9,10 @@ import ( "testing" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/apppicker" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/clipboard" - "github.com/AvengeMedia/dankgo/files" - "github.com/AvengeMedia/dankgo/ipc" + "github.com/duxlabs-dev/dux-go/files" + "github.com/duxlabs-dev/dux-go/ipc" + "github.com/duxlabs-dev/dux-shell/core/internal/server/apppicker" + "github.com/duxlabs-dev/dux-shell/core/internal/server/clipboard" "github.com/stretchr/testify/require" ) diff --git a/core/internal/server/runtime.go b/core/internal/server/runtime.go index c6f5cfc2e..5854269d9 100644 --- a/core/internal/server/runtime.go +++ b/core/internal/server/runtime.go @@ -7,7 +7,7 @@ import ( "runtime" "runtime/debug" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/log" ) const ( diff --git a/core/internal/server/server.go b/core/internal/server/server.go index 2d7cedf76..54f3148c0 100644 --- a/core/internal/server/server.go +++ b/core/internal/server/server.go @@ -9,34 +9,34 @@ import ( "sync" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/geolocation" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" - "github.com/AvengeMedia/DankMaterialShell/core/internal/matugen" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/apppicker" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/bluez" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/brightness" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/clipboard" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/cups" - serverDbus "github.com/AvengeMedia/DankMaterialShell/core/internal/server/dbus" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/evdev" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/freedesktop" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/location" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/loginctl" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/network" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/notifyactions" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/sysupdate" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/tailscale" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/thememode" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/trayrecovery" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/wallpaper" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/wayland" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/wellbeing" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/wlcontext" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/wlroutput" - "github.com/AvengeMedia/DankMaterialShell/core/internal/systemd" - "github.com/AvengeMedia/DankMaterialShell/core/internal/utils" - "github.com/AvengeMedia/dankgo/ipc" - "github.com/AvengeMedia/dankgo/syncmap" + "github.com/duxlabs-dev/dux-go/ipc" + "github.com/duxlabs-dev/dux-go/syncmap" + "github.com/duxlabs-dev/dux-shell/core/internal/geolocation" + "github.com/duxlabs-dev/dux-shell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/matugen" + "github.com/duxlabs-dev/dux-shell/core/internal/server/apppicker" + "github.com/duxlabs-dev/dux-shell/core/internal/server/bluez" + "github.com/duxlabs-dev/dux-shell/core/internal/server/brightness" + "github.com/duxlabs-dev/dux-shell/core/internal/server/clipboard" + "github.com/duxlabs-dev/dux-shell/core/internal/server/cups" + serverDbus "github.com/duxlabs-dev/dux-shell/core/internal/server/dbus" + "github.com/duxlabs-dev/dux-shell/core/internal/server/evdev" + "github.com/duxlabs-dev/dux-shell/core/internal/server/freedesktop" + "github.com/duxlabs-dev/dux-shell/core/internal/server/location" + "github.com/duxlabs-dev/dux-shell/core/internal/server/loginctl" + "github.com/duxlabs-dev/dux-shell/core/internal/server/network" + "github.com/duxlabs-dev/dux-shell/core/internal/server/notifyactions" + "github.com/duxlabs-dev/dux-shell/core/internal/server/sysupdate" + "github.com/duxlabs-dev/dux-shell/core/internal/server/tailscale" + "github.com/duxlabs-dev/dux-shell/core/internal/server/thememode" + "github.com/duxlabs-dev/dux-shell/core/internal/server/trayrecovery" + "github.com/duxlabs-dev/dux-shell/core/internal/server/wallpaper" + "github.com/duxlabs-dev/dux-shell/core/internal/server/wayland" + "github.com/duxlabs-dev/dux-shell/core/internal/server/wellbeing" + "github.com/duxlabs-dev/dux-shell/core/internal/server/wlcontext" + "github.com/duxlabs-dev/dux-shell/core/internal/server/wlroutput" + "github.com/duxlabs-dev/dux-shell/core/internal/systemd" + "github.com/duxlabs-dev/dux-shell/core/internal/utils" ) const APIVersion = 38 diff --git a/core/internal/server/server_test.go b/core/internal/server/server_test.go index 1dc9a8de6..77d906533 100644 --- a/core/internal/server/server_test.go +++ b/core/internal/server/server_test.go @@ -7,9 +7,9 @@ import ( "testing" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/bluez" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/network" - "github.com/AvengeMedia/dankgo/ipc" + "github.com/duxlabs-dev/dux-go/ipc" + "github.com/duxlabs-dev/dux-shell/core/internal/server/bluez" + "github.com/duxlabs-dev/dux-shell/core/internal/server/network" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/core/internal/server/shell_ready_test.go b/core/internal/server/shell_ready_test.go index 821f83787..63068e120 100644 --- a/core/internal/server/shell_ready_test.go +++ b/core/internal/server/shell_ready_test.go @@ -6,9 +6,9 @@ import ( "os" "testing" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/models" - "github.com/AvengeMedia/DankMaterialShell/core/internal/systemd" - "github.com/AvengeMedia/dankgo/ipc" + "github.com/duxlabs-dev/dux-go/ipc" + "github.com/duxlabs-dev/dux-shell/core/internal/server/models" + "github.com/duxlabs-dev/dux-shell/core/internal/systemd" "github.com/stretchr/testify/require" ) diff --git a/core/internal/server/subscribe_test.go b/core/internal/server/subscribe_test.go index c6fe9ed60..785765822 100644 --- a/core/internal/server/subscribe_test.go +++ b/core/internal/server/subscribe_test.go @@ -11,10 +11,10 @@ import ( "testing/synctest" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/apppicker" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/wlroutput" - "github.com/AvengeMedia/dankgo/files" - "github.com/AvengeMedia/dankgo/ipc" + "github.com/duxlabs-dev/dux-go/files" + "github.com/duxlabs-dev/dux-go/ipc" + "github.com/duxlabs-dev/dux-shell/core/internal/server/apppicker" + "github.com/duxlabs-dev/dux-shell/core/internal/server/wlroutput" "github.com/stretchr/testify/require" ) diff --git a/core/internal/server/sysupdate/backend_pacman.go b/core/internal/server/sysupdate/backend_pacman.go index c5a5df92e..9808238e2 100644 --- a/core/internal/server/sysupdate/backend_pacman.go +++ b/core/internal/server/sysupdate/backend_pacman.go @@ -11,7 +11,7 @@ import ( "regexp" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/log" ) func init() { diff --git a/core/internal/server/sysupdate/backend_portage.go b/core/internal/server/sysupdate/backend_portage.go index 45404e7ba..152867510 100644 --- a/core/internal/server/sysupdate/backend_portage.go +++ b/core/internal/server/sysupdate/backend_portage.go @@ -8,8 +8,8 @@ import ( "regexp" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" - "github.com/AvengeMedia/DankMaterialShell/core/internal/notify" + "github.com/duxlabs-dev/dux-shell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/notify" ) func init() { diff --git a/core/internal/server/sysupdate/backend_xbps_test.go b/core/internal/server/sysupdate/backend_xbps_test.go index 7356fd688..3af7fb87c 100644 --- a/core/internal/server/sysupdate/backend_xbps_test.go +++ b/core/internal/server/sysupdate/backend_xbps_test.go @@ -15,7 +15,7 @@ func TestParseXbpsInstalled(t *testing.T) { name: "splits on the last dash so hyphenated names survive", input: `ii bash-5.2.21_1 GNU Bourne Again Shell ii xorg-server-xwayland-24.1.2_1 Nested X server that runs as a wayland client -ii dms-shell-git-1.7.0+git4915_1 DankMaterialShell +ii dms-shell-git-1.7.0+git4915_1 Dux Shell `, want: map[string]string{ "bash": "5.2.21_1", diff --git a/core/internal/server/sysupdate/executor.go b/core/internal/server/sysupdate/executor.go index b3a7e4932..88a9fb5af 100644 --- a/core/internal/server/sysupdate/executor.go +++ b/core/internal/server/sysupdate/executor.go @@ -11,7 +11,7 @@ import ( "sync" "syscall" - "github.com/AvengeMedia/DankMaterialShell/core/internal/privesc" + "github.com/duxlabs-dev/dux-shell/core/internal/privesc" ) type RunOptions struct { @@ -138,7 +138,7 @@ func findTerminal(override string) string { } func wrapInTerminal(term, title, shellCmd string, extraArgs []string) []string { - const appID = "com.danklinux.dms" + const appID = "dev.duxlabs.shell" banner := fmt.Sprintf( `printf '\033[1;36m=== %s ===\033[0m\n'; printf '\033[2m$ %s\033[0m\n'; printf '\033[33mYou may be prompted for your sudo password to apply system updates.\033[0m\n\n'`, title, shellCmd, diff --git a/core/internal/server/sysupdate/executor_test.go b/core/internal/server/sysupdate/executor_test.go index f6141ac83..7d6fb1da4 100644 --- a/core/internal/server/sysupdate/executor_test.go +++ b/core/internal/server/sysupdate/executor_test.go @@ -13,12 +13,12 @@ func TestTerminalWrapperWezterm(t *testing.T) { }{ { name: "update", - want: []string{"wezterm", "start", "--always-new-process", "--class", "com.danklinux.dms", "--", "sh", "-c"}, + want: []string{"wezterm", "start", "--always-new-process", "--class", "dev.duxlabs.shell", "--", "sh", "-c"}, }, { name: "extra arguments", extraArgs: []string{"--cwd", "/tmp/system update"}, - want: []string{"wezterm", "start", "--always-new-process", "--class", "com.danklinux.dms", "--cwd", "/tmp/system update", "--", "sh", "-c"}, + want: []string{"wezterm", "start", "--always-new-process", "--class", "dev.duxlabs.shell", "--cwd", "/tmp/system update", "--", "sh", "-c"}, }, } { t.Run(tt.name, func(t *testing.T) { diff --git a/core/internal/server/sysupdate/handlers.go b/core/internal/server/sysupdate/handlers.go index 324e86e41..1ade320fd 100644 --- a/core/internal/server/sysupdate/handlers.go +++ b/core/internal/server/sysupdate/handlers.go @@ -3,9 +3,9 @@ package sysupdate import ( "context" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/models" - "github.com/AvengeMedia/dankgo/ipc" - "github.com/AvengeMedia/dankgo/ipc/params" + "github.com/duxlabs-dev/dux-go/ipc" + "github.com/duxlabs-dev/dux-go/ipc/params" + "github.com/duxlabs-dev/dux-shell/core/internal/server/models" ) func HandleRequest(ctx context.Context, conn *ipc.ConnWriter, req ipc.Request, m *Manager) { diff --git a/core/internal/server/sysupdate/manager.go b/core/internal/server/sysupdate/manager.go index cbea360ce..ce3681e5d 100644 --- a/core/internal/server/sysupdate/manager.go +++ b/core/internal/server/sysupdate/manager.go @@ -10,9 +10,9 @@ import ( "sync" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" - "github.com/AvengeMedia/DankMaterialShell/core/internal/lowprio" - "github.com/AvengeMedia/dankgo/syncmap" + "github.com/duxlabs-dev/dux-go/syncmap" + "github.com/duxlabs-dev/dux-shell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/lowprio" ) const ( diff --git a/core/internal/server/sysupdate/releases.go b/core/internal/server/sysupdate/releases.go index 086c8fc7a..956b50f71 100644 --- a/core/internal/server/sysupdate/releases.go +++ b/core/internal/server/sysupdate/releases.go @@ -7,10 +7,10 @@ import ( "path/filepath" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" - "github.com/AvengeMedia/DankMaterialShell/core/internal/netfetch" - "github.com/AvengeMedia/DankMaterialShell/core/internal/site" - "github.com/AvengeMedia/DankMaterialShell/core/internal/utils" + "github.com/duxlabs-dev/dux-shell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/netfetch" + "github.com/duxlabs-dev/dux-shell/core/internal/site" + "github.com/duxlabs-dev/dux-shell/core/internal/utils" ) const ( diff --git a/core/internal/server/sysupdate/shell.go b/core/internal/server/sysupdate/shell.go index 6acad9ce3..c09f13d43 100644 --- a/core/internal/server/sysupdate/shell.go +++ b/core/internal/server/sysupdate/shell.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/log" ) const ownerQueryTimeout = 10 * time.Second diff --git a/core/internal/server/sysupdate/shell_test.go b/core/internal/server/sysupdate/shell_test.go index badc3aadc..c83d5fb39 100644 --- a/core/internal/server/sysupdate/shell_test.go +++ b/core/internal/server/sysupdate/shell_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/netfetch" + "github.com/duxlabs-dev/dux-shell/core/internal/netfetch" ) func TestGitBuildCount(t *testing.T) { diff --git a/core/internal/server/sysupdate/upgrade_commands_test.go b/core/internal/server/sysupdate/upgrade_commands_test.go index a13dbb11e..3754e51ab 100644 --- a/core/internal/server/sysupdate/upgrade_commands_test.go +++ b/core/internal/server/sysupdate/upgrade_commands_test.go @@ -272,9 +272,9 @@ func TestWrapInTerminal(t *testing.T) { term string wantPrefix []string }{ - {"kitty", []string{"kitty", "--class", "com.danklinux.dms", "-T", "Title"}}, + {"kitty", []string{"kitty", "--class", "dev.duxlabs.shell", "-T", "Title"}}, {"gnome-terminal", []string{"gnome-terminal", "--wait", "--title=Title"}}, - {"foot", []string{"foot", "--app-id=com.danklinux.dms", "--title=Title"}}, + {"foot", []string{"foot", "--app-id=dev.duxlabs.shell", "--title=Title"}}, } for _, tt := range tests { got := wrapInTerminal(tt.term, "Title", "echo hi", nil) diff --git a/core/internal/server/tailscale/handlers.go b/core/internal/server/tailscale/handlers.go index 5822baf7c..5f6006bd7 100644 --- a/core/internal/server/tailscale/handlers.go +++ b/core/internal/server/tailscale/handlers.go @@ -3,8 +3,8 @@ package tailscale import ( "fmt" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/models" - "github.com/AvengeMedia/dankgo/ipc" + "github.com/duxlabs-dev/dux-go/ipc" + "github.com/duxlabs-dev/dux-shell/core/internal/server/models" ) // HandleRequest routes an IPC request to the appropriate handler. diff --git a/core/internal/server/tailscale/handlers_test.go b/core/internal/server/tailscale/handlers_test.go index f4cbeb97a..5d84fdf3c 100644 --- a/core/internal/server/tailscale/handlers_test.go +++ b/core/internal/server/tailscale/handlers_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/models" - "github.com/AvengeMedia/dankgo/ipc" + "github.com/duxlabs-dev/dux-go/ipc" + "github.com/duxlabs-dev/dux-shell/core/internal/server/models" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "tailscale.com/ipn" diff --git a/core/internal/server/tailscale/manager.go b/core/internal/server/tailscale/manager.go index 25ceb0eed..7155c5286 100644 --- a/core/internal/server/tailscale/manager.go +++ b/core/internal/server/tailscale/manager.go @@ -6,8 +6,8 @@ import ( "sync/atomic" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" - "github.com/AvengeMedia/dankgo/syncmap" + "github.com/duxlabs-dev/dux-go/syncmap" + "github.com/duxlabs-dev/dux-shell/core/internal/log" "tailscale.com/client/local" "tailscale.com/ipn" "tailscale.com/ipn/ipnstate" diff --git a/core/internal/server/thememode/handlers.go b/core/internal/server/thememode/handlers.go index aa68ef00f..ab9b6b529 100644 --- a/core/internal/server/thememode/handlers.go +++ b/core/internal/server/thememode/handlers.go @@ -3,9 +3,9 @@ package thememode import ( "fmt" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/models" - "github.com/AvengeMedia/dankgo/ipc" - "github.com/AvengeMedia/dankgo/ipc/params" + "github.com/duxlabs-dev/dux-go/ipc" + "github.com/duxlabs-dev/dux-go/ipc/params" + "github.com/duxlabs-dev/dux-shell/core/internal/server/models" ) func HandleRequest(conn *ipc.ConnWriter, req ipc.Request, manager *Manager) { diff --git a/core/internal/server/thememode/manager.go b/core/internal/server/thememode/manager.go index 7c3f1053e..7bc44ce6e 100644 --- a/core/internal/server/thememode/manager.go +++ b/core/internal/server/thememode/manager.go @@ -5,10 +5,10 @@ import ( "sync" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/geolocation" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/loginctl" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/wayland" - "github.com/AvengeMedia/dankgo/syncmap" + "github.com/duxlabs-dev/dux-go/syncmap" + "github.com/duxlabs-dev/dux-shell/core/internal/geolocation" + "github.com/duxlabs-dev/dux-shell/core/internal/server/loginctl" + "github.com/duxlabs-dev/dux-shell/core/internal/server/wayland" ) const ( diff --git a/core/internal/server/themes/handlers.go b/core/internal/server/themes/handlers.go index 0f34d5cdf..6efcb5274 100644 --- a/core/internal/server/themes/handlers.go +++ b/core/internal/server/themes/handlers.go @@ -3,7 +3,7 @@ package themes import ( "fmt" - "github.com/AvengeMedia/dankgo/ipc" + "github.com/duxlabs-dev/dux-go/ipc" ) func HandleRequest(conn *ipc.ConnWriter, req ipc.Request) { diff --git a/core/internal/server/themes/install.go b/core/internal/server/themes/install.go index 3c20db5ba..72e40be5c 100644 --- a/core/internal/server/themes/install.go +++ b/core/internal/server/themes/install.go @@ -3,9 +3,9 @@ package themes import ( "fmt" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/models" - "github.com/AvengeMedia/DankMaterialShell/core/internal/themes" - "github.com/AvengeMedia/dankgo/ipc" + "github.com/duxlabs-dev/dux-go/ipc" + "github.com/duxlabs-dev/dux-shell/core/internal/server/models" + "github.com/duxlabs-dev/dux-shell/core/internal/themes" ) func HandleInstall(conn *ipc.ConnWriter, req ipc.Request) { diff --git a/core/internal/server/themes/list.go b/core/internal/server/themes/list.go index 7eb959720..d5c6ce5ae 100644 --- a/core/internal/server/themes/list.go +++ b/core/internal/server/themes/list.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/themes" - "github.com/AvengeMedia/dankgo/ipc" + "github.com/duxlabs-dev/dux-go/ipc" + "github.com/duxlabs-dev/dux-shell/core/internal/themes" ) func HandleList(conn *ipc.ConnWriter, req ipc.Request) { @@ -50,5 +50,5 @@ func HandleList(conn *ipc.ConnWriter, req ipc.Request) { } func isFirstParty(author string) bool { - return strings.EqualFold(author, "Avenge Media") || strings.EqualFold(author, "AvengeMedia") + return strings.EqualFold(author, "Dux Labs") || strings.EqualFold(author, "Avenge Media") || strings.EqualFold(author, "AvengeMedia") } diff --git a/core/internal/server/themes/list_installed.go b/core/internal/server/themes/list_installed.go index b3fe070f8..1fb6b467d 100644 --- a/core/internal/server/themes/list_installed.go +++ b/core/internal/server/themes/list_installed.go @@ -3,8 +3,8 @@ package themes import ( "fmt" - "github.com/AvengeMedia/DankMaterialShell/core/internal/themes" - "github.com/AvengeMedia/dankgo/ipc" + "github.com/duxlabs-dev/dux-go/ipc" + "github.com/duxlabs-dev/dux-shell/core/internal/themes" ) func addVariantsInfo(info *ThemeInfo, variants *themes.ThemeVariants) { diff --git a/core/internal/server/themes/list_installed_test.go b/core/internal/server/themes/list_installed_test.go index e30f20d9d..94b266d46 100644 --- a/core/internal/server/themes/list_installed_test.go +++ b/core/internal/server/themes/list_installed_test.go @@ -3,7 +3,7 @@ package themes import ( "testing" - "github.com/AvengeMedia/DankMaterialShell/core/internal/themes" + "github.com/duxlabs-dev/dux-shell/core/internal/themes" "github.com/stretchr/testify/require" ) diff --git a/core/internal/server/themes/search.go b/core/internal/server/themes/search.go index 7098fe3a8..40df518b6 100644 --- a/core/internal/server/themes/search.go +++ b/core/internal/server/themes/search.go @@ -3,8 +3,8 @@ package themes import ( "fmt" - "github.com/AvengeMedia/DankMaterialShell/core/internal/themes" - "github.com/AvengeMedia/dankgo/ipc" + "github.com/duxlabs-dev/dux-go/ipc" + "github.com/duxlabs-dev/dux-shell/core/internal/themes" ) func HandleSearch(conn *ipc.ConnWriter, req ipc.Request) { diff --git a/core/internal/server/themes/types.go b/core/internal/server/themes/types.go index ab3b23ddd..98b65d9b5 100644 --- a/core/internal/server/themes/types.go +++ b/core/internal/server/themes/types.go @@ -1,7 +1,7 @@ package themes import ( - "github.com/AvengeMedia/DankMaterialShell/core/internal/themes" + "github.com/duxlabs-dev/dux-shell/core/internal/themes" ) type VariantInfo struct { diff --git a/core/internal/server/themes/uninstall.go b/core/internal/server/themes/uninstall.go index afe91b817..531f92f42 100644 --- a/core/internal/server/themes/uninstall.go +++ b/core/internal/server/themes/uninstall.go @@ -3,9 +3,9 @@ package themes import ( "fmt" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/models" - "github.com/AvengeMedia/DankMaterialShell/core/internal/themes" - "github.com/AvengeMedia/dankgo/ipc" + "github.com/duxlabs-dev/dux-go/ipc" + "github.com/duxlabs-dev/dux-shell/core/internal/server/models" + "github.com/duxlabs-dev/dux-shell/core/internal/themes" ) func HandleUninstall(conn *ipc.ConnWriter, req ipc.Request) { diff --git a/core/internal/server/themes/update.go b/core/internal/server/themes/update.go index a5625513e..472a18be1 100644 --- a/core/internal/server/themes/update.go +++ b/core/internal/server/themes/update.go @@ -3,9 +3,9 @@ package themes import ( "fmt" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/models" - "github.com/AvengeMedia/DankMaterialShell/core/internal/themes" - "github.com/AvengeMedia/dankgo/ipc" + "github.com/duxlabs-dev/dux-go/ipc" + "github.com/duxlabs-dev/dux-shell/core/internal/server/models" + "github.com/duxlabs-dev/dux-shell/core/internal/themes" ) func HandleUpdate(conn *ipc.ConnWriter, req ipc.Request) { diff --git a/core/internal/server/trayrecovery/manager.go b/core/internal/server/trayrecovery/manager.go index 9f383cdba..8015fbc8f 100644 --- a/core/internal/server/trayrecovery/manager.go +++ b/core/internal/server/trayrecovery/manager.go @@ -5,8 +5,8 @@ import ( "sync" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/loginctl" + "github.com/duxlabs-dev/dux-shell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/server/loginctl" "github.com/godbus/dbus/v5" ) diff --git a/core/internal/server/trayrecovery/recovery.go b/core/internal/server/trayrecovery/recovery.go index 3c858b3b6..fbfc2c0fb 100644 --- a/core/internal/server/trayrecovery/recovery.go +++ b/core/internal/server/trayrecovery/recovery.go @@ -6,7 +6,7 @@ import ( "sync" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/log" "github.com/godbus/dbus/v5" ) diff --git a/core/internal/server/wallpaper/handlers.go b/core/internal/server/wallpaper/handlers.go index d63cd54c3..2a4d0aa64 100644 --- a/core/internal/server/wallpaper/handlers.go +++ b/core/internal/server/wallpaper/handlers.go @@ -4,9 +4,9 @@ import ( "encoding/json" "fmt" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/models" - "github.com/AvengeMedia/dankgo/ipc" - "github.com/AvengeMedia/dankgo/ipc/params" + "github.com/duxlabs-dev/dux-go/ipc" + "github.com/duxlabs-dev/dux-go/ipc/params" + "github.com/duxlabs-dev/dux-shell/core/internal/server/models" ) func HandleRequest(conn *ipc.ConnWriter, req ipc.Request, manager *Manager) { diff --git a/core/internal/server/wallpaper/manager.go b/core/internal/server/wallpaper/manager.go index e6e17407c..99d9bb954 100644 --- a/core/internal/server/wallpaper/manager.go +++ b/core/internal/server/wallpaper/manager.go @@ -7,8 +7,8 @@ import ( "sync" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/loginctl" - "github.com/AvengeMedia/dankgo/syncmap" + "github.com/duxlabs-dev/dux-go/syncmap" + "github.com/duxlabs-dev/dux-shell/core/internal/server/loginctl" ) type activeSchedule struct { diff --git a/core/internal/server/wallpaper/state.go b/core/internal/server/wallpaper/state.go index 7432014c4..e0d88d780 100644 --- a/core/internal/server/wallpaper/state.go +++ b/core/internal/server/wallpaper/state.go @@ -6,8 +6,8 @@ import ( "path/filepath" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" - "github.com/AvengeMedia/DankMaterialShell/core/internal/utils" + "github.com/duxlabs-dev/dux-shell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/utils" ) type persistentState struct { diff --git a/core/internal/server/wayland/gamma.go b/core/internal/server/wayland/gamma.go index c61ffaa6c..b9152f593 100644 --- a/core/internal/server/wayland/gamma.go +++ b/core/internal/server/wayland/gamma.go @@ -3,7 +3,7 @@ package wayland import ( "math" - "github.com/AvengeMedia/DankMaterialShell/core/internal/icc" + "github.com/duxlabs-dev/dux-shell/core/internal/icc" ) type GammaRamp struct { diff --git a/core/internal/server/wayland/gamma_test.go b/core/internal/server/wayland/gamma_test.go index 94a8ee628..7d7beaf30 100644 --- a/core/internal/server/wayland/gamma_test.go +++ b/core/internal/server/wayland/gamma_test.go @@ -5,7 +5,7 @@ import ( "slices" "testing" - "github.com/AvengeMedia/DankMaterialShell/core/internal/icc" + "github.com/duxlabs-dev/dux-shell/core/internal/icc" ) func TestGenerateGammaRamp(t *testing.T) { diff --git a/core/internal/server/wayland/geolocation.go b/core/internal/server/wayland/geolocation.go index ba99b5f59..3098acfac 100644 --- a/core/internal/server/wayland/geolocation.go +++ b/core/internal/server/wayland/geolocation.go @@ -7,7 +7,7 @@ import ( "net/http" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/log" ) type ipAPIResponse struct { diff --git a/core/internal/server/wayland/handlers.go b/core/internal/server/wayland/handlers.go index dac9d3067..4a480b81f 100644 --- a/core/internal/server/wayland/handlers.go +++ b/core/internal/server/wayland/handlers.go @@ -4,9 +4,9 @@ import ( "fmt" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/models" - "github.com/AvengeMedia/dankgo/ipc" - "github.com/AvengeMedia/dankgo/ipc/params" + "github.com/duxlabs-dev/dux-go/ipc" + "github.com/duxlabs-dev/dux-go/ipc/params" + "github.com/duxlabs-dev/dux-shell/core/internal/server/models" ) func HandleRequest(conn *ipc.ConnWriter, req ipc.Request, manager *Manager) { diff --git a/core/internal/server/wayland/iccconfig.go b/core/internal/server/wayland/iccconfig.go index 6e5a5e575..bd92a065d 100644 --- a/core/internal/server/wayland/iccconfig.go +++ b/core/internal/server/wayland/iccconfig.go @@ -10,9 +10,9 @@ import ( "path/filepath" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" - "github.com/AvengeMedia/DankMaterialShell/core/internal/screenshot" - "github.com/AvengeMedia/DankMaterialShell/core/internal/utils" + "github.com/duxlabs-dev/dux-shell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/screenshot" + "github.com/duxlabs-dev/dux-shell/core/internal/utils" ) type iccConfig struct { @@ -22,7 +22,7 @@ type iccConfig struct { } func dmsConfigDir() string { - return filepath.Join(utils.XDGConfigHome(), "DankMaterialShell") + return filepath.Join(utils.XDGConfigHome(), "dms") } func iccConfigPath() string { diff --git a/core/internal/server/wayland/manager.go b/core/internal/server/wayland/manager.go index 1911f4632..1f8951836 100644 --- a/core/internal/server/wayland/manager.go +++ b/core/internal/server/wayland/manager.go @@ -14,16 +14,16 @@ import ( "syscall" "time" - "github.com/AvengeMedia/dankgo/boottimer" - wlclient "github.com/AvengeMedia/dankgo/wayland/client" + "github.com/duxlabs-dev/dux-go/boottimer" + wlclient "github.com/duxlabs-dev/dux-go/wayland/client" "github.com/godbus/dbus/v5" - "github.com/AvengeMedia/DankMaterialShell/core/internal/errdefs" - "github.com/AvengeMedia/DankMaterialShell/core/internal/geolocation" - "github.com/AvengeMedia/DankMaterialShell/core/internal/icc" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" - "github.com/AvengeMedia/DankMaterialShell/core/internal/proto/wlr_gamma_control" - "github.com/AvengeMedia/DankMaterialShell/core/internal/wayland/shm" + "github.com/duxlabs-dev/dux-shell/core/internal/errdefs" + "github.com/duxlabs-dev/dux-shell/core/internal/geolocation" + "github.com/duxlabs-dev/dux-shell/core/internal/icc" + "github.com/duxlabs-dev/dux-shell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/proto/wlr_gamma_control" + "github.com/duxlabs-dev/dux-shell/core/internal/wayland/shm" ) const animKelvinStep = 25 diff --git a/core/internal/server/wayland/manager_test.go b/core/internal/server/wayland/manager_test.go index 6653c964b..306c3ae0d 100644 --- a/core/internal/server/wayland/manager_test.go +++ b/core/internal/server/wayland/manager_test.go @@ -13,11 +13,11 @@ import ( "github.com/stretchr/testify/assert" - wlclient "github.com/AvengeMedia/dankgo/wayland/client" + wlclient "github.com/duxlabs-dev/dux-go/wayland/client" - "github.com/AvengeMedia/DankMaterialShell/core/internal/icc" - mocks_wlclient "github.com/AvengeMedia/DankMaterialShell/core/internal/mocks/wlclient" - "github.com/AvengeMedia/DankMaterialShell/core/internal/proto/wlr_gamma_control" + "github.com/duxlabs-dev/dux-shell/core/internal/icc" + mocks_wlclient "github.com/duxlabs-dev/dux-shell/core/internal/mocks/wlclient" + "github.com/duxlabs-dev/dux-shell/core/internal/proto/wlr_gamma_control" ) func TestManager_ActorSerializesOutputStateAccess(t *testing.T) { diff --git a/core/internal/server/wayland/types.go b/core/internal/server/wayland/types.go index 193940222..9aa1385e4 100644 --- a/core/internal/server/wayland/types.go +++ b/core/internal/server/wayland/types.go @@ -8,11 +8,11 @@ import ( "sync/atomic" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/errdefs" - "github.com/AvengeMedia/DankMaterialShell/core/internal/geolocation" - "github.com/AvengeMedia/DankMaterialShell/core/internal/icc" - "github.com/AvengeMedia/dankgo/syncmap" - wlclient "github.com/AvengeMedia/dankgo/wayland/client" + "github.com/duxlabs-dev/dux-go/syncmap" + wlclient "github.com/duxlabs-dev/dux-go/wayland/client" + "github.com/duxlabs-dev/dux-shell/core/internal/errdefs" + "github.com/duxlabs-dev/dux-shell/core/internal/geolocation" + "github.com/duxlabs-dev/dux-shell/core/internal/icc" "github.com/godbus/dbus/v5" ) diff --git a/core/internal/server/wellbeing/handlers.go b/core/internal/server/wellbeing/handlers.go index 8bb80aae2..79a1b4209 100644 --- a/core/internal/server/wellbeing/handlers.go +++ b/core/internal/server/wellbeing/handlers.go @@ -3,9 +3,9 @@ package wellbeing import ( "fmt" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/models" - "github.com/AvengeMedia/dankgo/ipc" - "github.com/AvengeMedia/dankgo/ipc/params" + "github.com/duxlabs-dev/dux-go/ipc" + "github.com/duxlabs-dev/dux-go/ipc/params" + "github.com/duxlabs-dev/dux-shell/core/internal/server/models" ) func HandleRequest(conn *ipc.ConnWriter, req ipc.Request, manager *Manager) { diff --git a/core/internal/server/wellbeing/manager.go b/core/internal/server/wellbeing/manager.go index ab2061c7b..a51370032 100644 --- a/core/internal/server/wellbeing/manager.go +++ b/core/internal/server/wellbeing/manager.go @@ -5,7 +5,7 @@ import ( "slices" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/log" bolt "go.etcd.io/bbolt" ) diff --git a/core/internal/server/wellbeing/store.go b/core/internal/server/wellbeing/store.go index eecedfbe4..37558dac1 100644 --- a/core/internal/server/wellbeing/store.go +++ b/core/internal/server/wellbeing/store.go @@ -8,8 +8,8 @@ import ( "runtime/debug" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" - "github.com/AvengeMedia/DankMaterialShell/core/internal/utils" + "github.com/duxlabs-dev/dux-shell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/utils" bolt "go.etcd.io/bbolt" ) @@ -20,7 +20,7 @@ var ( ) func DBPath() string { - return filepath.Join(utils.XDGStateHome(), "DankMaterialShell", "wellbeing", "db") + return filepath.Join(utils.XDGStateHome(), "dms", "wellbeing", "db") } func openDB(path string) (*bolt.DB, error) { diff --git a/core/internal/server/wellbeing/types.go b/core/internal/server/wellbeing/types.go index 1c97d332e..499099600 100644 --- a/core/internal/server/wellbeing/types.go +++ b/core/internal/server/wellbeing/types.go @@ -4,7 +4,7 @@ import ( "sync" "time" - "github.com/AvengeMedia/dankgo/syncmap" + "github.com/duxlabs-dev/dux-go/syncmap" bolt "go.etcd.io/bbolt" ) diff --git a/core/internal/server/wlcontext/context.go b/core/internal/server/wlcontext/context.go index dbdf9c058..ae5c75962 100644 --- a/core/internal/server/wlcontext/context.go +++ b/core/internal/server/wlcontext/context.go @@ -7,9 +7,9 @@ import ( "sync" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/errdefs" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" - wlclient "github.com/AvengeMedia/dankgo/wayland/client" + wlclient "github.com/duxlabs-dev/dux-go/wayland/client" + "github.com/duxlabs-dev/dux-shell/core/internal/errdefs" + "github.com/duxlabs-dev/dux-shell/core/internal/log" ) type WaylandContext interface { diff --git a/core/internal/server/wlroutput/handlers.go b/core/internal/server/wlroutput/handlers.go index 00dedb646..4fa2e5c0b 100644 --- a/core/internal/server/wlroutput/handlers.go +++ b/core/internal/server/wlroutput/handlers.go @@ -5,10 +5,10 @@ import ( "fmt" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" - "github.com/AvengeMedia/DankMaterialShell/core/internal/proto/wlr_output_management" - "github.com/AvengeMedia/DankMaterialShell/core/internal/server/models" - "github.com/AvengeMedia/dankgo/ipc" + "github.com/duxlabs-dev/dux-go/ipc" + "github.com/duxlabs-dev/dux-shell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/proto/wlr_output_management" + "github.com/duxlabs-dev/dux-shell/core/internal/server/models" ) type HeadConfig struct { diff --git a/core/internal/server/wlroutput/manager.go b/core/internal/server/wlroutput/manager.go index f0b500e4c..b19c4a3f5 100644 --- a/core/internal/server/wlroutput/manager.go +++ b/core/internal/server/wlroutput/manager.go @@ -4,9 +4,9 @@ import ( "fmt" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" - "github.com/AvengeMedia/DankMaterialShell/core/internal/proto/wlr_output_management" - wlclient "github.com/AvengeMedia/dankgo/wayland/client" + wlclient "github.com/duxlabs-dev/dux-go/wayland/client" + "github.com/duxlabs-dev/dux-shell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/proto/wlr_output_management" ) func NewManager(display wlclient.WaylandDisplay) (*Manager, error) { diff --git a/core/internal/server/wlroutput/types.go b/core/internal/server/wlroutput/types.go index 4e0019395..c5fbe1123 100644 --- a/core/internal/server/wlroutput/types.go +++ b/core/internal/server/wlroutput/types.go @@ -3,9 +3,9 @@ package wlroutput import ( "sync" - "github.com/AvengeMedia/DankMaterialShell/core/internal/proto/wlr_output_management" - "github.com/AvengeMedia/dankgo/syncmap" - wlclient "github.com/AvengeMedia/dankgo/wayland/client" + "github.com/duxlabs-dev/dux-go/syncmap" + wlclient "github.com/duxlabs-dev/dux-go/wayland/client" + "github.com/duxlabs-dev/dux-shell/core/internal/proto/wlr_output_management" ) type OutputMode struct { diff --git a/core/internal/shellembed/shellembed.go b/core/internal/shellembed/shellembed.go index c09843e6e..c54e9501b 100644 --- a/core/internal/shellembed/shellembed.go +++ b/core/internal/shellembed/shellembed.go @@ -9,7 +9,7 @@ import ( "path" "strings" - "github.com/AvengeMedia/dankgo/shellapp/shellfs" + "github.com/duxlabs-dev/dux-go/shellapp/shellfs" ) const ( diff --git a/core/internal/site/site.go b/core/internal/site/site.go index 22bf92055..619ea49ae 100644 --- a/core/internal/site/site.go +++ b/core/internal/site/site.go @@ -1,9 +1,9 @@ package site const ( - Domain = "danklinux.com" + Domain = "duxlabs.dev" Web = "https://" + Domain Docs = Web + "/docs" - API = "https://api." + Domain - VoidRepo = "https://void." + Domain + API = "https://api.danklinux.com" + VoidRepo = "https://void.danklinux.com" ) diff --git a/core/internal/systemd/notify.go b/core/internal/systemd/notify.go index c5d1a8a3c..15564acb2 100644 --- a/core/internal/systemd/notify.go +++ b/core/internal/systemd/notify.go @@ -10,7 +10,7 @@ import ( "sync" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/log" "github.com/godbus/dbus/v5" ) diff --git a/core/internal/systemd/notify_test.go b/core/internal/systemd/notify_test.go index 7ddff15ee..902703a04 100644 --- a/core/internal/systemd/notify_test.go +++ b/core/internal/systemd/notify_test.go @@ -16,7 +16,7 @@ import ( "testing/synctest" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/log" "github.com/godbus/dbus/v5" "github.com/godbus/dbus/v5/prop" "github.com/stretchr/testify/assert" diff --git a/core/internal/themes/manager.go b/core/internal/themes/manager.go index 1bbe744a7..e6ede02a8 100644 --- a/core/internal/themes/manager.go +++ b/core/internal/themes/manager.go @@ -6,8 +6,8 @@ import ( "os" "path/filepath" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" - "github.com/AvengeMedia/DankMaterialShell/core/internal/version" + "github.com/duxlabs-dev/dux-shell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/version" "github.com/spf13/afero" ) @@ -34,7 +34,7 @@ func getThemesDir() string { log.Error("failed to get user config dir", "err", err) return "" } - return filepath.Join(configDir, "DankMaterialShell", "themes") + return filepath.Join(configDir, "dms", "themes") } func (m *Manager) IsInstalled(theme Theme) (bool, error) { diff --git a/core/internal/themes/registry.go b/core/internal/themes/registry.go index 1460301fa..6f3ad69ee 100644 --- a/core/internal/themes/registry.go +++ b/core/internal/themes/registry.go @@ -7,7 +7,7 @@ import ( "os" "path/filepath" - "github.com/AvengeMedia/DankMaterialShell/core/internal/registries" + "github.com/duxlabs-dev/dux-shell/core/internal/registries" "github.com/go-git/go-git/v6" "github.com/spf13/afero" ) diff --git a/core/internal/themes/registry_test.go b/core/internal/themes/registry_test.go index c2b8c26da..b79e97a00 100644 --- a/core/internal/themes/registry_test.go +++ b/core/internal/themes/registry_test.go @@ -4,8 +4,8 @@ import ( "os" "testing" - "github.com/AvengeMedia/DankMaterialShell/core/internal/clipolicy" - "github.com/AvengeMedia/DankMaterialShell/core/internal/registries" + "github.com/duxlabs-dev/dux-shell/core/internal/clipolicy" + "github.com/duxlabs-dev/dux-shell/core/internal/registries" "github.com/spf13/afero" ) diff --git a/core/internal/themes/search.go b/core/internal/themes/search.go index 347f791ed..b8c9afa55 100644 --- a/core/internal/themes/search.go +++ b/core/internal/themes/search.go @@ -3,7 +3,7 @@ package themes import ( "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/utils" + "github.com/duxlabs-dev/dux-shell/core/internal/utils" ) func FuzzySearch(query string, themes []Theme) []Theme { diff --git a/core/internal/tui/app.go b/core/internal/tui/app.go index c29ee20ab..b63898e6a 100644 --- a/core/internal/tui/app.go +++ b/core/internal/tui/app.go @@ -1,12 +1,12 @@ package tui import ( - "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" - "github.com/AvengeMedia/DankMaterialShell/core/internal/distros" - "github.com/AvengeMedia/DankMaterialShell/core/internal/privesc" "github.com/charmbracelet/bubbles/spinner" "github.com/charmbracelet/bubbles/textinput" tea "github.com/charmbracelet/bubbletea" + "github.com/duxlabs-dev/dux-shell/core/internal/deps" + "github.com/duxlabs-dev/dux-shell/core/internal/distros" + "github.com/duxlabs-dev/dux-shell/core/internal/privesc" ) type Model struct { diff --git a/core/internal/tui/app_test.go b/core/internal/tui/app_test.go index a239257e7..c998914a5 100644 --- a/core/internal/tui/app_test.go +++ b/core/internal/tui/app_test.go @@ -1,12 +1,12 @@ package tui import ( - "github.com/AvengeMedia/DankMaterialShell/core/internal/config" + "github.com/duxlabs-dev/dux-shell/core/internal/config" "testing" - "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" - "github.com/AvengeMedia/DankMaterialShell/core/internal/distros" tea "github.com/charmbracelet/bubbletea" + "github.com/duxlabs-dev/dux-shell/core/internal/deps" + "github.com/duxlabs-dev/dux-shell/core/internal/distros" ) func archModel() Model { diff --git a/core/internal/tui/messages.go b/core/internal/tui/messages.go index 7c030988d..c570afc34 100644 --- a/core/internal/tui/messages.go +++ b/core/internal/tui/messages.go @@ -1,8 +1,8 @@ package tui import ( - "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" - "github.com/AvengeMedia/DankMaterialShell/core/internal/distros" + "github.com/duxlabs-dev/dux-shell/core/internal/deps" + "github.com/duxlabs-dev/dux-shell/core/internal/distros" ) type logMsg struct { diff --git a/core/internal/tui/views_config.go b/core/internal/tui/views_config.go index 3d4ee2264..58147dab0 100644 --- a/core/internal/tui/views_config.go +++ b/core/internal/tui/views_config.go @@ -7,11 +7,11 @@ import ( "path/filepath" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/config" - "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" - "github.com/AvengeMedia/DankMaterialShell/core/internal/distros" - "github.com/AvengeMedia/DankMaterialShell/core/internal/mangoconf" tea "github.com/charmbracelet/bubbletea" + "github.com/duxlabs-dev/dux-shell/core/internal/config" + "github.com/duxlabs-dev/dux-shell/core/internal/deps" + "github.com/duxlabs-dev/dux-shell/core/internal/distros" + "github.com/duxlabs-dev/dux-shell/core/internal/mangoconf" ) type configDeploymentResult struct { diff --git a/core/internal/tui/views_dependencies.go b/core/internal/tui/views_dependencies.go index d3fb1dea1..5fea758b8 100644 --- a/core/internal/tui/views_dependencies.go +++ b/core/internal/tui/views_dependencies.go @@ -5,13 +5,13 @@ import ( "fmt" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" - "github.com/AvengeMedia/DankMaterialShell/core/internal/distros" - "github.com/AvengeMedia/DankMaterialShell/core/internal/utils" tea "github.com/charmbracelet/bubbletea" + "github.com/duxlabs-dev/dux-shell/core/internal/deps" + "github.com/duxlabs-dev/dux-shell/core/internal/distros" + "github.com/duxlabs-dev/dux-shell/core/internal/utils" ) -const dmsDepName = "dms (DankMaterialShell)" +const dmsDepName = "dms (Dux Shell)" func (m Model) viewDetectingDeps() string { var b strings.Builder diff --git a/core/internal/tui/views_gentoo_use_flags.go b/core/internal/tui/views_gentoo_use_flags.go index ee272947c..1ce440789 100644 --- a/core/internal/tui/views_gentoo_use_flags.go +++ b/core/internal/tui/views_gentoo_use_flags.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" - "github.com/AvengeMedia/DankMaterialShell/core/internal/distros" tea "github.com/charmbracelet/bubbletea" + "github.com/duxlabs-dev/dux-shell/core/internal/deps" + "github.com/duxlabs-dev/dux-shell/core/internal/distros" ) func (m Model) viewGentooUseFlags() string { diff --git a/core/internal/tui/views_install.go b/core/internal/tui/views_install.go index 718d84840..ca9ae2940 100644 --- a/core/internal/tui/views_install.go +++ b/core/internal/tui/views_install.go @@ -4,10 +4,10 @@ import ( "fmt" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" - "github.com/AvengeMedia/DankMaterialShell/core/internal/distros" - "github.com/AvengeMedia/DankMaterialShell/core/internal/mangoconf" tea "github.com/charmbracelet/bubbletea" + "github.com/duxlabs-dev/dux-shell/core/internal/deps" + "github.com/duxlabs-dev/dux-shell/core/internal/distros" + "github.com/duxlabs-dev/dux-shell/core/internal/mangoconf" ) func wrapText(text string, width int) string { @@ -225,7 +225,7 @@ func (m Model) viewInstallComplete() string { "• Window manager and dependencies installed", "• Terminal and development tools configured", "• Configuration files deployed with backups", - "• System optimized for DankMaterialShell", + "• System optimized for Dux Shell", } for _, item := range accomplishments { b.WriteString(m.styles.Subtle.Render(item)) diff --git a/core/internal/tui/views_password.go b/core/internal/tui/views_password.go index 431c78b38..5e792b761 100644 --- a/core/internal/tui/views_password.go +++ b/core/internal/tui/views_password.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "github.com/AvengeMedia/DankMaterialShell/core/internal/privesc" tea "github.com/charmbracelet/bubbletea" + "github.com/duxlabs-dev/dux-shell/core/internal/privesc" ) func (m Model) viewAuthMethodChoice() string { @@ -190,7 +190,7 @@ func (m Model) tryFingerprint() tea.Cmd { return func() tea.Msg { _ = privesc.ClearCache(context.Background()) - askpassScript := filepath.Join(os.TempDir(), fmt.Sprintf("danklinux-fp-%d.sh", time.Now().UnixNano())) + askpassScript := filepath.Join(os.TempDir(), fmt.Sprintf("dms-fp-%d.sh", time.Now().UnixNano())) if err := os.WriteFile(askpassScript, []byte("#!/bin/sh\nexit 1\n"), 0o700); err != nil { return passwordValidMsg{valid: false} } diff --git a/core/internal/tui/views_privesc.go b/core/internal/tui/views_privesc.go index 432d3e3fd..5776bcd91 100644 --- a/core/internal/tui/views_privesc.go +++ b/core/internal/tui/views_privesc.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/privesc" tea "github.com/charmbracelet/bubbletea" + "github.com/duxlabs-dev/dux-shell/core/internal/privesc" ) func (m Model) viewSelectPrivesc() string { diff --git a/core/internal/tui/views_selection.go b/core/internal/tui/views_selection.go index 75474cb1f..ff77d564a 100644 --- a/core/internal/tui/views_selection.go +++ b/core/internal/tui/views_selection.go @@ -5,9 +5,9 @@ import ( "fmt" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" - "github.com/AvengeMedia/DankMaterialShell/core/internal/distros" tea "github.com/charmbracelet/bubbletea" + "github.com/duxlabs-dev/dux-shell/core/internal/deps" + "github.com/duxlabs-dev/dux-shell/core/internal/distros" ) type listOption struct { diff --git a/core/internal/tui/views_welcome.go b/core/internal/tui/views_welcome.go index dc450483c..a3b6e144d 100644 --- a/core/internal/tui/views_welcome.go +++ b/core/internal/tui/views_welcome.go @@ -4,10 +4,10 @@ import ( "fmt" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/distros" - "github.com/AvengeMedia/DankMaterialShell/core/internal/site" tea "github.com/charmbracelet/bubbletea" "github.com/charmbracelet/lipgloss" + "github.com/duxlabs-dev/dux-shell/core/internal/distros" + "github.com/duxlabs-dev/dux-shell/core/internal/site" ) func (m Model) viewWelcome() string { @@ -18,7 +18,7 @@ func (m Model) viewWelcome() string { b.WriteString(m.styles.Accent.Render(strings.Repeat("━", 58))) b.WriteByte('\n') b.WriteString(m.styles.TitleBox.Render( - m.styles.Highlight.Render("dankinstall") + m.styles.AccentItalic.Render(" // Dank Linux Installer"))) + m.styles.Highlight.Render("dankinstall") + m.styles.AccentItalic.Render(" // Dux Labs Installer"))) b.WriteByte('\n') b.WriteString(m.styles.SubtleItalic.Render("Quickstart for a Dank Desktop")) b.WriteString("\n\n") @@ -53,11 +53,11 @@ func unsupportedDistroMessage(info *distros.OSInfo) string { case "debian": return fmt.Sprintf("Debian %s is not supported.\n\nOnly Debian 13+ (Trixie) is supported.\n\nPlease upgrade to Debian 13 or later.", info.VersionID) case "nixos": - return "See the NixOS documentation for installation instructions: " + site.Docs + "/dankmaterialshell/nixos." + return "See the NixOS documentation for installation instructions: " + site.Docs + "/dms/nixos." case "rhel", "centos", "rocky", "almalinux": return fmt.Sprintf("%s is not supported.\n\nOnly Enterprise Linux 10+ (RHEL, CentOS Stream, Rocky, AlmaLinux) is supported.", info.PrettyName) default: - return fmt.Sprintf("%s is not supported.\nFeel free to request on https://github.com/AvengeMedia/DankMaterialShell", info.PrettyName) + return fmt.Sprintf("%s is not supported.\nFeel free to request on https://github.com/duxlabs-dev/dux-shell", info.PrettyName) } } @@ -77,7 +77,7 @@ func (m Model) writeSystemSummary(b *strings.Builder) { tag string desc string }{ - {"[shell]", "dms (DankMaterialShell)"}, + {"[shell]", "dms (Dux Shell)"}, {"[wm]", "niri or Hyprland"}, {"[term]", "Ghostty, kitty, or Alacritty"}, {"[style]", "All the themes, automatically."}, diff --git a/core/internal/utils/dirs.go b/core/internal/utils/dirs.go new file mode 100644 index 000000000..e3003875b --- /dev/null +++ b/core/internal/utils/dirs.go @@ -0,0 +1,121 @@ +package utils + +import ( + "bytes" + "errors" + "fmt" + "os" + "path/filepath" + "syscall" +) + +const ( + AppDirName = "dms" + legacyDirName = "DankMaterialShell" + migrateLock = "dms-migrate" + maxCompareFileLen = 1 << 20 +) + +// MigrateLegacyDirs moves the pre-2.0 DankMaterialShell config, state, cache and +// data dirs to dms and leaves a symlink at the old path for older binaries and plugins. +func MigrateLegacyDirs() []error { + lock, err := TryLock(migrateLock) + if err != nil { + return nil + } + defer lock.Release() + + var errs []error + for _, base := range []string{XDGConfigHome(), XDGStateHome(), XDGCacheHome(), XDGDataHome()} { + if err := migrateLegacyDir(filepath.Join(base, legacyDirName), filepath.Join(base, AppDirName)); err != nil { + errs = append(errs, err) + } + } + return errs +} + +func migrateLegacyDir(oldDir, newDir string) error { + oldInfo, err := os.Lstat(oldDir) + if err != nil { + return nil + } + _, newErr := os.Lstat(newDir) + newExists := newErr == nil + + switch { + case oldInfo.Mode()&os.ModeSymlink != 0: + if newExists { + return nil + } + return os.Symlink(legacyDirName, newDir) + case !oldInfo.IsDir(): + return nil + case !newExists: + if err := os.Rename(oldDir, newDir); err != nil { + // A bind-mounted or persisted legacy dir cannot be renamed; read it through a link instead. + return os.Symlink(legacyDirName, newDir) + } + return os.Symlink(AppDirName, oldDir) + } + + if err := mergeDir(oldDir, newDir); err != nil { + if errors.Is(err, syscall.EXDEV) { + return fmt.Errorf("%s is on another filesystem, persist %s instead: %w", oldDir, newDir, err) + } + return err + } + if err := os.Remove(oldDir); err != nil { + return errors.New("legacy dir " + oldDir + " still has entries that also exist in " + newDir) + } + return os.Symlink(AppDirName, oldDir) +} + +func mergeDir(src, dst string) error { + entries, err := os.ReadDir(src) + if err != nil { + return err + } + for _, entry := range entries { + from := filepath.Join(src, entry.Name()) + to := filepath.Join(dst, entry.Name()) + toInfo, err := os.Lstat(to) + if err != nil { + if err := os.Rename(from, to); err != nil { + return err + } + continue + } + if sameFileContent(from, to) { + os.Remove(from) + continue + } + if !entry.IsDir() || !toInfo.IsDir() { + continue + } + if err := mergeDir(from, to); err != nil { + return err + } + os.Remove(from) + } + return nil +} + +func sameFileContent(a, b string) bool { + aInfo, err := os.Lstat(a) + if err != nil || !aInfo.Mode().IsRegular() { + return false + } + bInfo, err := os.Lstat(b) + if err != nil || !bInfo.Mode().IsRegular() || aInfo.Size() != bInfo.Size() || aInfo.Size() > maxCompareFileLen { + return false + } + aData, err := os.ReadFile(a) + if err != nil { + return false + } + bData, err := os.ReadFile(b) + if err != nil { + return false + } + return bytes.Equal(aData, bData) +} diff --git a/core/internal/utils/dirs_test.go b/core/internal/utils/dirs_test.go new file mode 100644 index 000000000..7c459d166 --- /dev/null +++ b/core/internal/utils/dirs_test.go @@ -0,0 +1,125 @@ +package utils + +import ( + "os" + "path/filepath" + "testing" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" +) + +func setupMigrationHome(t *testing.T) string { + t.Helper() + home := t.TempDir() + t.Setenv("XDG_RUNTIME_DIR", t.TempDir()) + t.Setenv("XDG_CONFIG_HOME", filepath.Join(home, "config")) + t.Setenv("XDG_STATE_HOME", filepath.Join(home, "state")) + t.Setenv("XDG_CACHE_HOME", filepath.Join(home, "cache")) + t.Setenv("XDG_DATA_HOME", filepath.Join(home, "data")) + return home +} + +func writeMigrationFile(t *testing.T, path, content string) { + t.Helper() + require.NoError(t, os.MkdirAll(filepath.Dir(path), 0o755)) + require.NoError(t, os.WriteFile(path, []byte(content), 0o644)) +} + +func readMigrationFile(t *testing.T, path string) string { + t.Helper() + data, err := os.ReadFile(path) + require.NoError(t, err) + return string(data) +} + +func TestMigrateLegacyDirs(t *testing.T) { + tests := []struct { + name string + conflict bool + setup func(t *testing.T, home string) + verify func(t *testing.T, home string) + }{ + { + name: "fresh install creates nothing", + setup: func(t *testing.T, home string) {}, + verify: func(t *testing.T, home string) { + _, err := os.Lstat(filepath.Join(home, "config", "DankMaterialShell")) + assert.True(t, os.IsNotExist(err)) + _, err = os.Lstat(filepath.Join(home, "config", "dms")) + assert.True(t, os.IsNotExist(err)) + }, + }, + { + name: "legacy config moves and leaves a symlink", + setup: func(t *testing.T, home string) { + writeMigrationFile(t, filepath.Join(home, "config", "DankMaterialShell", "settings.json"), "settings") + }, + verify: func(t *testing.T, home string) { + assert.Equal(t, "settings", readMigrationFile(t, filepath.Join(home, "config", "dms", "settings.json"))) + target, err := os.Readlink(filepath.Join(home, "config", "DankMaterialShell")) + require.NoError(t, err) + assert.Equal(t, "dms", target) + assert.Equal(t, "settings", readMigrationFile(t, filepath.Join(home, "config", "DankMaterialShell", "settings.json"))) + }, + }, + { + name: "legacy cache merges into an existing dms cache", + setup: func(t *testing.T, home string) { + writeMigrationFile(t, filepath.Join(home, "cache", "DankMaterialShell", "clipboard", "db"), "history") + writeMigrationFile(t, filepath.Join(home, "cache", "DankMaterialShell", "dms-colors.json"), "colors") + writeMigrationFile(t, filepath.Join(home, "cache", "dms", "clipboard", "tmp-1"), "tmp") + writeMigrationFile(t, filepath.Join(home, "cache", "DankMaterialShell", "lyrics", ".lastprune"), "") + writeMigrationFile(t, filepath.Join(home, "cache", "dms", "lyrics", ".lastprune"), "") + }, + verify: func(t *testing.T, home string) { + assert.Equal(t, "history", readMigrationFile(t, filepath.Join(home, "cache", "dms", "clipboard", "db"))) + assert.Equal(t, "tmp", readMigrationFile(t, filepath.Join(home, "cache", "dms", "clipboard", "tmp-1"))) + assert.Equal(t, "colors", readMigrationFile(t, filepath.Join(home, "cache", "dms", "dms-colors.json"))) + target, err := os.Readlink(filepath.Join(home, "cache", "DankMaterialShell")) + require.NoError(t, err) + assert.Equal(t, "dms", target) + }, + }, + { + name: "conflicting file keeps the legacy dir in place", + conflict: true, + setup: func(t *testing.T, home string) { + writeMigrationFile(t, filepath.Join(home, "state", "DankMaterialShell", "session.json"), "old") + writeMigrationFile(t, filepath.Join(home, "state", "dms", "session.json"), "new") + }, + verify: func(t *testing.T, home string) { + assert.Equal(t, "new", readMigrationFile(t, filepath.Join(home, "state", "dms", "session.json"))) + assert.Equal(t, "old", readMigrationFile(t, filepath.Join(home, "state", "DankMaterialShell", "session.json"))) + }, + }, + { + name: "symlinked legacy dir gets a dms link to it", + setup: func(t *testing.T, home string) { + dotfiles := filepath.Join(home, "dotfiles", "dms") + writeMigrationFile(t, filepath.Join(dotfiles, "settings.json"), "dotfiles") + require.NoError(t, os.MkdirAll(filepath.Join(home, "config"), 0o755)) + require.NoError(t, os.Symlink(dotfiles, filepath.Join(home, "config", "DankMaterialShell"))) + }, + verify: func(t *testing.T, home string) { + assert.Equal(t, "dotfiles", readMigrationFile(t, filepath.Join(home, "config", "dms", "settings.json"))) + }, + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + home := setupMigrationHome(t) + tt.setup(t, home) + + wantErrs := 0 + if tt.conflict { + wantErrs = 1 + } + for range 2 { + assert.Len(t, MigrateLegacyDirs(), wantErrs) + tt.verify(t, home) + } + }) + } +} diff --git a/core/internal/utils/instancelock.go b/core/internal/utils/instancelock.go index 2984a8899..9b3d375a8 100644 --- a/core/internal/utils/instancelock.go +++ b/core/internal/utils/instancelock.go @@ -9,7 +9,7 @@ import ( "strings" "syscall" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/log" ) const ( diff --git a/core/internal/utils/paths.go b/core/internal/utils/paths.go index 805e03b4c..f030cc34f 100644 --- a/core/internal/utils/paths.go +++ b/core/internal/utils/paths.go @@ -5,10 +5,10 @@ import ( "path/filepath" "strings" - "github.com/AvengeMedia/dankgo/paths" + "github.com/duxlabs-dev/dux-go/paths" ) -var app = paths.New("danklinux") +var app = paths.New("dms") func App() paths.App { return app } diff --git a/core/internal/version/version.go b/core/internal/version/version.go index ccc923c3b..c48f63a61 100644 --- a/core/internal/version/version.go +++ b/core/internal/version/version.go @@ -8,8 +8,8 @@ import ( "path/filepath" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/log" - "github.com/AvengeMedia/DankMaterialShell/core/internal/netfetch" + "github.com/duxlabs-dev/dux-shell/core/internal/log" + "github.com/duxlabs-dev/dux-shell/core/internal/netfetch" ) type VersionInfo struct { diff --git a/core/internal/version/version_test.go b/core/internal/version/version_test.go index f1d126310..eb53f058f 100644 --- a/core/internal/version/version_test.go +++ b/core/internal/version/version_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - mocks_version "github.com/AvengeMedia/DankMaterialShell/core/internal/mocks/version" + mocks_version "github.com/duxlabs-dev/dux-shell/core/internal/mocks/version" ) func TestCompareVersions(t *testing.T) { diff --git a/core/internal/wayland/client/helpers.go b/core/internal/wayland/client/helpers.go index dbad81bc6..336bd8f32 100644 --- a/core/internal/wayland/client/helpers.go +++ b/core/internal/wayland/client/helpers.go @@ -1,6 +1,6 @@ package client -import wlclient "github.com/AvengeMedia/dankgo/wayland/client" +import wlclient "github.com/duxlabs-dev/dux-go/wayland/client" func Roundtrip(display *wlclient.Display, ctx *wlclient.Context) error { callback, err := display.Sync() diff --git a/core/internal/wayland/keymap/keymap.go b/core/internal/wayland/keymap/keymap.go index bd419e7e7..ca24c1eb0 100644 --- a/core/internal/wayland/keymap/keymap.go +++ b/core/internal/wayland/keymap/keymap.go @@ -5,7 +5,7 @@ import ( "strconv" "strings" - "github.com/AvengeMedia/dankgo/wayland/client" + "github.com/duxlabs-dev/dux-go/wayland/client" "golang.org/x/sys/unix" ) diff --git a/core/internal/wayland/keymap/seat.go b/core/internal/wayland/keymap/seat.go index 0947491cc..7c597d040 100644 --- a/core/internal/wayland/keymap/seat.go +++ b/core/internal/wayland/keymap/seat.go @@ -3,7 +3,7 @@ package keymap import ( "fmt" - wlclient "github.com/AvengeMedia/dankgo/wayland/client" + wlclient "github.com/duxlabs-dev/dux-go/wayland/client" ) // FromSeat opens a short-lived Wayland connection just to receive the xkb diff --git a/core/internal/windowrules/providers/hyprland_parser.go b/core/internal/windowrules/providers/hyprland_parser.go index b90983eb7..274e5f4af 100644 --- a/core/internal/windowrules/providers/hyprland_parser.go +++ b/core/internal/windowrules/providers/hyprland_parser.go @@ -8,10 +8,10 @@ import ( "strconv" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/configfrag" - "github.com/AvengeMedia/DankMaterialShell/core/internal/luaconfig" - "github.com/AvengeMedia/DankMaterialShell/core/internal/utils" - "github.com/AvengeMedia/DankMaterialShell/core/internal/windowrules" + "github.com/duxlabs-dev/dux-shell/core/internal/configfrag" + "github.com/duxlabs-dev/dux-shell/core/internal/luaconfig" + "github.com/duxlabs-dev/dux-shell/core/internal/utils" + "github.com/duxlabs-dev/dux-shell/core/internal/windowrules" ) type HyprlandWindowRule struct { @@ -827,7 +827,7 @@ func (p *HyprlandWritableProvider) WriteDMSRules(rules []windowrules.WindowRule) } var lines []string - lines = append(lines, "-- DMS Window Rules — managed by DankMaterialShell") + lines = append(lines, "-- DMS Window Rules — managed by Dux Shell") lines = append(lines, "-- Do not edit manually; changes may be overwritten") lines = append(lines, "") diff --git a/core/internal/windowrules/providers/hyprland_parser_test.go b/core/internal/windowrules/providers/hyprland_parser_test.go index d72ea8575..486ac6d2c 100644 --- a/core/internal/windowrules/providers/hyprland_parser_test.go +++ b/core/internal/windowrules/providers/hyprland_parser_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/AvengeMedia/DankMaterialShell/core/internal/windowrules" + "github.com/duxlabs-dev/dux-shell/core/internal/windowrules" ) func TestParseWindowRuleV1(t *testing.T) { diff --git a/core/internal/windowrules/providers/mango_parser.go b/core/internal/windowrules/providers/mango_parser.go index eb28b565c..cb888f698 100644 --- a/core/internal/windowrules/providers/mango_parser.go +++ b/core/internal/windowrules/providers/mango_parser.go @@ -7,8 +7,8 @@ import ( "regexp" "strings" - "github.com/AvengeMedia/DankMaterialShell/core/internal/mangoconf" - "github.com/AvengeMedia/DankMaterialShell/core/internal/windowrules" + "github.com/duxlabs-dev/dux-shell/core/internal/mangoconf" + "github.com/duxlabs-dev/dux-shell/core/internal/windowrules" ) // Mango window rules are flat `windowrule=key:value,...` lines (`window_rule=` diff --git a/core/internal/windowrules/providers/mango_parser_test.go b/core/internal/windowrules/providers/mango_parser_test.go index ddd52e184..1953bc6eb 100644 --- a/core/internal/windowrules/providers/mango_parser_test.go +++ b/core/internal/windowrules/providers/mango_parser_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - "github.com/AvengeMedia/DankMaterialShell/core/internal/mangoconf" - "github.com/AvengeMedia/DankMaterialShell/core/internal/windowrules" + "github.com/duxlabs-dev/dux-shell/core/internal/mangoconf" + "github.com/duxlabs-dev/dux-shell/core/internal/windowrules" ) func TestParseMangoWindowRuleLineReadsBothDialects(t *testing.T) { diff --git a/core/internal/windowrules/providers/niri_parser.go b/core/internal/windowrules/providers/niri_parser.go index f77c64a41..16adee282 100644 --- a/core/internal/windowrules/providers/niri_parser.go +++ b/core/internal/windowrules/providers/niri_parser.go @@ -2,7 +2,7 @@ package providers import ( "fmt" - "github.com/AvengeMedia/DankMaterialShell/core/internal/configfrag" + "github.com/duxlabs-dev/dux-shell/core/internal/configfrag" "os" "path/filepath" "regexp" @@ -12,7 +12,7 @@ import ( "github.com/sblinch/kdl-go" "github.com/sblinch/kdl-go/document" - "github.com/AvengeMedia/DankMaterialShell/core/internal/windowrules" + "github.com/duxlabs-dev/dux-shell/core/internal/windowrules" ) type NiriMatch struct { @@ -804,7 +804,7 @@ func (p *NiriWritableProvider) WriteDMSRules(rules []windowrules.WindowRule) err } var lines []string - lines = append(lines, "// DMS Window Rules - Managed by DankMaterialShell") + lines = append(lines, "// DMS Window Rules - Managed by Dux Shell") lines = append(lines, "// Do not edit manually - changes may be overwritten") lines = append(lines, "") diff --git a/core/internal/windowrules/providers/providers_test.go b/core/internal/windowrules/providers/providers_test.go index d84ae8e6e..82772bd9d 100644 --- a/core/internal/windowrules/providers/providers_test.go +++ b/core/internal/windowrules/providers/providers_test.go @@ -1,6 +1,6 @@ package providers -import "github.com/AvengeMedia/DankMaterialShell/core/internal/windowrules" +import "github.com/duxlabs-dev/dux-shell/core/internal/windowrules" func newTestWindowRule(id, name, appID string) windowrules.WindowRule { return windowrules.WindowRule{ diff --git a/core/internal/windowrules/status_wire_test.go b/core/internal/windowrules/status_wire_test.go index ebf633445..dacf11420 100644 --- a/core/internal/windowrules/status_wire_test.go +++ b/core/internal/windowrules/status_wire_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "testing" - "github.com/AvengeMedia/DankMaterialShell/core/internal/configfrag" + "github.com/duxlabs-dev/dux-shell/core/internal/configfrag" ) func marshalKeys(t *testing.T, v any) map[string]json.RawMessage { diff --git a/core/internal/windowrules/types.go b/core/internal/windowrules/types.go index 32f7fa6cd..8e0f8127c 100644 --- a/core/internal/windowrules/types.go +++ b/core/internal/windowrules/types.go @@ -1,6 +1,6 @@ package windowrules -import "github.com/AvengeMedia/DankMaterialShell/core/internal/configfrag" +import "github.com/duxlabs-dev/dux-shell/core/internal/configfrag" type MatchCriteria struct { AppID string `json:"appId,omitempty"` diff --git a/distro/debian/dms-git/_service b/distro/debian/dms-git/_service index c4d11c90b..9d2026f57 100644 --- a/distro/debian/dms-git/_service +++ b/distro/debian/dms-git/_service @@ -2,7 +2,7 @@ git - https://github.com/AvengeMedia/DankMaterialShell.git + https://github.com/duxlabs-dev/dux-shell.git master dms-git-source @@ -14,12 +14,12 @@ https github.com - /AvengeMedia/DankMaterialShell/releases/latest/download/dms-distropkg-amd64.gz + /duxlabs-dev/dux-shell/releases/latest/download/dms-distropkg-amd64.gz https github.com - /AvengeMedia/DankMaterialShell/releases/latest/download/dms-distropkg-arm64.gz + /duxlabs-dev/dux-shell/releases/latest/download/dms-distropkg-arm64.gz --> diff --git a/distro/debian/dms-git/debian/control b/distro/debian/dms-git/debian/control index 7dcf4a16a..34d85a6d3 100644 --- a/distro/debian/dms-git/debian/control +++ b/distro/debian/dms-git/debian/control @@ -4,9 +4,9 @@ Priority: optional Maintainer: Avenge Media Build-Depends: debhelper-compat (= 13), Standards-Version: 4.6.2 -Homepage: https://github.com/AvengeMedia/DankMaterialShell -Vcs-Browser: https://github.com/AvengeMedia/DankMaterialShell -Vcs-Git: https://github.com/AvengeMedia/DankMaterialShell.git +Homepage: https://github.com/duxlabs-dev/dux-shell +Vcs-Browser: https://github.com/duxlabs-dev/dux-shell +Vcs-Git: https://github.com/duxlabs-dev/dux-shell.git Package: dms-git Architecture: amd64 arm64 @@ -31,8 +31,8 @@ Suggests: cups-pk-helper Provides: dms Conflicts: dms Replaces: dms -Description: DankMaterialShell - Modern Wayland Desktop Shell (git nightly) - DMS (DankMaterialShell) is a feature-rich desktop shell built on +Description: Dux Shell - Modern Wayland Desktop Shell (git nightly) + DMS (Dux Shell) is a feature-rich desktop shell built on Quickshell, providing a modern and customizable user interface for Wayland compositors like niri, hyprland, and sway. . diff --git a/distro/debian/dms-git/debian/rules b/distro/debian/dms-git/debian/rules index c4fea527f..8c1ee1851 100755 --- a/distro/debian/dms-git/debian/rules +++ b/distro/debian/dms-git/debian/rules @@ -70,9 +70,9 @@ override_dh_auto_install: install -Dm644 assets/systemd/dms.service debian/dms-git/usr/lib/systemd/user/dms.service install -Dm644 assets/dms-open.desktop debian/dms-git/usr/share/applications/dms-open.desktop - install -Dm644 assets/com.danklinux.dms.desktop debian/dms-git/usr/share/applications/com.danklinux.dms.desktop - install -Dm644 assets/com.danklinux.dms.notepad.desktop debian/dms-git/usr/share/applications/com.danklinux.dms.notepad.desktop - install -Dm644 assets/com.danklinux.dms.svg debian/dms-git/usr/share/icons/hicolor/scalable/apps/com.danklinux.dms.svg + install -Dm644 assets/dev.duxlabs.shell.desktop debian/dms-git/usr/share/applications/dev.duxlabs.shell.desktop + install -Dm644 assets/dev.duxlabs.shell.notepad.desktop debian/dms-git/usr/share/applications/dev.duxlabs.shell.notepad.desktop + install -Dm644 assets/dev.duxlabs.shell.svg debian/dms-git/usr/share/icons/hicolor/scalable/apps/dev.duxlabs.shell.svg override_dh_auto_clean: # Clean up build artifacts diff --git a/distro/debian/dms/_service b/distro/debian/dms/_service index 7e0b75fb4..b81ccde7a 100644 --- a/distro/debian/dms/_service +++ b/distro/debian/dms/_service @@ -3,19 +3,19 @@ https github.com - /AvengeMedia/DankMaterialShell/releases/download/v1.2.3/dms-source.tar.gz + /duxlabs-dev/dux-shell/releases/download/v1.2.3/dms-source.tar.gz dms-source.tar.gz https github.com - /AvengeMedia/DankMaterialShell/releases/download/v1.2.3/dms-distropkg-amd64.gz + /duxlabs-dev/dux-shell/releases/download/v1.2.3/dms-distropkg-amd64.gz https github.com - /AvengeMedia/DankMaterialShell/releases/download/v1.2.3/dms-distropkg-arm64.gz + /duxlabs-dev/dux-shell/releases/download/v1.2.3/dms-distropkg-arm64.gz diff --git a/distro/debian/dms/debian/control b/distro/debian/dms/debian/control index bc8613df4..5cab08dc7 100644 --- a/distro/debian/dms/debian/control +++ b/distro/debian/dms/debian/control @@ -4,9 +4,9 @@ Priority: optional Maintainer: Avenge Media Build-Depends: debhelper-compat (= 13) Standards-Version: 4.6.2 -Homepage: https://github.com/AvengeMedia/DankMaterialShell -Vcs-Browser: https://github.com/AvengeMedia/DankMaterialShell -Vcs-Git: https://github.com/AvengeMedia/DankMaterialShell.git +Homepage: https://github.com/duxlabs-dev/dux-shell +Vcs-Browser: https://github.com/duxlabs-dev/dux-shell +Vcs-Git: https://github.com/duxlabs-dev/dux-shell.git Package: dms Architecture: amd64 arm64 @@ -31,8 +31,8 @@ Depends: ${misc:Depends}, Suggests: cups-pk-helper Conflicts: dms-git Replaces: dms-git -Description: DankMaterialShell - Modern Wayland Desktop Shell - DMS (DankMaterialShell) is a feature-rich desktop shell built on +Description: Dux Shell - Modern Wayland Desktop Shell + DMS (Dux Shell) is a feature-rich desktop shell built on Quickshell, providing a modern and customizable user interface for Wayland compositors like niri, hyprland, and sway. . diff --git a/distro/debian/dms/debian/rules b/distro/debian/dms/debian/rules index 014a8f8e5..1b8e33c22 100755 --- a/distro/debian/dms/debian/rules +++ b/distro/debian/dms/debian/rules @@ -66,9 +66,9 @@ override_dh_auto_install: cp -rL DankMaterialShell-$(UPSTREAM_VERSION)/quickshell/* debian/dms/usr/share/quickshell/dms/; \ install -Dm644 DankMaterialShell-$(UPSTREAM_VERSION)/assets/systemd/dms.service debian/dms/usr/lib/systemd/user/dms.service; \ install -Dm644 DankMaterialShell-$(UPSTREAM_VERSION)/assets/dms-open.desktop debian/dms/usr/share/applications/dms-open.desktop; \ - install -Dm644 DankMaterialShell-$(UPSTREAM_VERSION)/assets/com.danklinux.dms.desktop debian/dms/usr/share/applications/com.danklinux.dms.desktop; \ - install -Dm644 DankMaterialShell-$(UPSTREAM_VERSION)/assets/com.danklinux.dms.notepad.desktop debian/dms/usr/share/applications/com.danklinux.dms.notepad.desktop; \ - install -Dm644 DankMaterialShell-$(UPSTREAM_VERSION)/assets/com.danklinux.dms.svg debian/dms/usr/share/icons/hicolor/scalable/apps/com.danklinux.dms.svg; \ + install -Dm644 DankMaterialShell-$(UPSTREAM_VERSION)/assets/dev.duxlabs.shell.desktop debian/dms/usr/share/applications/dev.duxlabs.shell.desktop; \ + install -Dm644 DankMaterialShell-$(UPSTREAM_VERSION)/assets/dev.duxlabs.shell.notepad.desktop debian/dms/usr/share/applications/dev.duxlabs.shell.notepad.desktop; \ + install -Dm644 DankMaterialShell-$(UPSTREAM_VERSION)/assets/dev.duxlabs.shell.svg debian/dms/usr/share/icons/hicolor/scalable/apps/dev.duxlabs.shell.svg; \ else \ echo "ERROR: DankMaterialShell-$(UPSTREAM_VERSION) directory not found!" && \ echo "Contents of current directory:" && ls -la && \ diff --git a/distro/fedora/dms-git.spec b/distro/fedora/dms-git.spec index 2415ba12f..c9319f8e7 100644 --- a/distro/fedora/dms-git.spec +++ b/distro/fedora/dms-git.spec @@ -14,7 +14,7 @@ printf '0.0.git.%s.%s\n' \ "$(git rev-list --count HEAD)" \ "$(git rev-parse --short=8 HEAD)" }}} -%global pkg_summary DankMaterialShell - Material 3 inspired shell for Wayland compositors +%global pkg_summary Dux Shell - Material 3 inspired shell for Wayland compositors %global go_toolchain_version 1.27.1 Name: dms @@ -24,7 +24,7 @@ Release: 1%{?dist} Summary: %{pkg_summary} License: MIT -URL: https://github.com/AvengeMedia/DankMaterialShell +URL: https://github.com/duxlabs-dev/dux-shell VCS: {{{ git_repo_vcs }}} Source0: {{{ git_repo_pack }}} Source1: https://go.dev/dl/go%{go_toolchain_version}.linux-amd64.tar.gz @@ -55,7 +55,7 @@ Suggests: cups-pk-helper Suggests: qt6ct %description -DankMaterialShell (DMS) is a modern Wayland desktop shell built with Quickshell +Dux Shell (DMS) is a modern Wayland desktop shell built with Quickshell and optimized for the niri, hyprland, sway, and dwl (MangoWC) compositors. Features notifications, app launcher, wallpaper customization, and fully customizable with plugins. @@ -64,12 +64,12 @@ process monitoring, notification center, clipboard history, dock, control center lock screen, and comprehensive plugin system. %package -n dms-cli -Summary: DankMaterialShell CLI tool +Summary: Dux Shell CLI tool License: MIT -URL: https://github.com/AvengeMedia/DankMaterialShell +URL: https://github.com/duxlabs-dev/dux-shell %description -n dms-cli -Command-line interface for DankMaterialShell configuration and management. +Command-line interface for Dux Shell configuration and management. Provides native DBus bindings, NetworkManager integration, and system utilities. %prep @@ -137,9 +137,9 @@ core/bin/${DMS_BINARY} completion fish > %{buildroot}%{_datadir}/fish/vendor_com install -Dm644 assets/systemd/dms.service %{buildroot}%{_userunitdir}/dms.service install -Dm644 assets/dms-open.desktop %{buildroot}%{_datadir}/applications/dms-open.desktop -install -Dm644 assets/com.danklinux.dms.desktop %{buildroot}%{_datadir}/applications/com.danklinux.dms.desktop -install -Dm644 assets/com.danklinux.dms.notepad.desktop %{buildroot}%{_datadir}/applications/com.danklinux.dms.notepad.desktop -install -Dm644 assets/com.danklinux.dms.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/com.danklinux.dms.svg +install -Dm644 assets/dev.duxlabs.shell.desktop %{buildroot}%{_datadir}/applications/dev.duxlabs.shell.desktop +install -Dm644 assets/dev.duxlabs.shell.notepad.desktop %{buildroot}%{_datadir}/applications/dev.duxlabs.shell.notepad.desktop +install -Dm644 assets/dev.duxlabs.shell.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/dev.duxlabs.shell.svg %posttrans # Signal running DMS instances to reload @@ -151,9 +151,9 @@ pkill -USR1 -x dms >/dev/null 2>&1 || : %doc quickshell/README.md %{_userunitdir}/dms.service %{_datadir}/applications/dms-open.desktop -%{_datadir}/applications/com.danklinux.dms.desktop -%{_datadir}/applications/com.danklinux.dms.notepad.desktop -%{_datadir}/icons/hicolor/scalable/apps/com.danklinux.dms.svg +%{_datadir}/applications/dev.duxlabs.shell.desktop +%{_datadir}/applications/dev.duxlabs.shell.notepad.desktop +%{_datadir}/icons/hicolor/scalable/apps/dev.duxlabs.shell.svg %files -n dms-cli %{_bindir}/dms diff --git a/distro/fedora/dms.spec b/distro/fedora/dms.spec index 822cebdec..26e1b6deb 100644 --- a/distro/fedora/dms.spec +++ b/distro/fedora/dms.spec @@ -2,7 +2,7 @@ %global debug_package %{nil} %global version VERSION_PLACEHOLDER -%global pkg_summary DankMaterialShell - Material 3 inspired shell for Wayland compositors +%global pkg_summary Dux Shell - Material 3 inspired shell for Wayland compositors Name: dms Version: %{version} @@ -10,7 +10,7 @@ Release: RELEASE_PLACEHOLDER%{?dist} Summary: %{pkg_summary} License: MIT -URL: https://github.com/AvengeMedia/DankMaterialShell +URL: https://github.com/duxlabs-dev/dux-shell Source0: dms-qml.tar.gz @@ -32,7 +32,7 @@ Suggests: cups-pk-helper Suggests: qt6ct %description -DankMaterialShell (DMS) is a modern Wayland desktop shell built with Quickshell +Dux Shell (DMS) is a modern Wayland desktop shell built with Quickshell and optimized for the niri and hyprland compositors. Features notifications, app launcher, wallpaper customization, and fully customizable with plugins. @@ -41,12 +41,12 @@ process monitoring, notification center, clipboard history, dock, control center lock screen, and comprehensive plugin system. %package -n dms-cli -Summary: DankMaterialShell CLI tool +Summary: Dux Shell CLI tool License: MIT -URL: https://github.com/AvengeMedia/DankMaterialShell +URL: https://github.com/duxlabs-dev/dux-shell %description -n dms-cli -Command-line interface for DankMaterialShell configuration and management. +Command-line interface for Dux Shell configuration and management. Provides native DBus bindings, NetworkManager integration, and system utilities. %prep @@ -66,7 +66,7 @@ case "%{_arch}" in esac # Download dms-cli for target architecture -wget -O %{_builddir}/dms-cli.gz "https://github.com/AvengeMedia/DankMaterialShell/releases/latest/download/dms-distropkg-${ARCH_SUFFIX}.gz" || { +wget -O %{_builddir}/dms-cli.gz "https://github.com/duxlabs-dev/dux-shell/releases/latest/download/dms-distropkg-${ARCH_SUFFIX}.gz" || { echo "Failed to download dms-cli for architecture %{_arch}" exit 1 } @@ -89,9 +89,9 @@ install -d %{buildroot}%{_datadir}/fish/vendor_completions.d install -Dm644 %{_builddir}/dms-qml/assets/systemd/dms.service %{buildroot}%{_userunitdir}/dms.service install -Dm644 %{_builddir}/dms-qml/assets/dms-open.desktop %{buildroot}%{_datadir}/applications/dms-open.desktop -install -Dm644 %{_builddir}/dms-qml/assets/com.danklinux.dms.desktop %{buildroot}%{_datadir}/applications/com.danklinux.dms.desktop -install -Dm644 %{_builddir}/dms-qml/assets/com.danklinux.dms.notepad.desktop %{buildroot}%{_datadir}/applications/com.danklinux.dms.notepad.desktop -install -Dm644 %{_builddir}/dms-qml/assets/com.danklinux.dms.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/com.danklinux.dms.svg +install -Dm644 %{_builddir}/dms-qml/assets/dev.duxlabs.shell.desktop %{buildroot}%{_datadir}/applications/dev.duxlabs.shell.desktop +install -Dm644 %{_builddir}/dms-qml/assets/dev.duxlabs.shell.notepad.desktop %{buildroot}%{_datadir}/applications/dev.duxlabs.shell.notepad.desktop +install -Dm644 %{_builddir}/dms-qml/assets/dev.duxlabs.shell.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/dev.duxlabs.shell.svg install -dm755 %{buildroot}%{_datadir}/quickshell/dms cp -r %{_builddir}/dms-qml/* %{buildroot}%{_datadir}/quickshell/dms/ @@ -113,9 +113,9 @@ pkill -USR1 -x dms >/dev/null 2>&1 || : %{_datadir}/quickshell/dms/ %{_userunitdir}/dms.service %{_datadir}/applications/dms-open.desktop -%{_datadir}/applications/com.danklinux.dms.desktop -%{_datadir}/applications/com.danklinux.dms.notepad.desktop -%{_datadir}/icons/hicolor/scalable/apps/com.danklinux.dms.svg +%{_datadir}/applications/dev.duxlabs.shell.desktop +%{_datadir}/applications/dev.duxlabs.shell.notepad.desktop +%{_datadir}/icons/hicolor/scalable/apps/dev.duxlabs.shell.svg %files -n dms-cli %{_bindir}/dms diff --git a/distro/freebsd/README.md b/distro/freebsd/README.md index 10879fdac..7b841248c 100644 --- a/distro/freebsd/README.md +++ b/distro/freebsd/README.md @@ -1,6 +1,6 @@ # FreeBSD support -DankMaterialShell contains native FreeBSD code paths and does not require +Dux Shell contains native FreeBSD code paths and does not require PulseAudio, PipeWire, systemd, NetworkManager, or Linux sysfs to provide its core shell features. diff --git a/distro/nix/home.nix b/distro/nix/home.nix index 81501f846..eb736efe2 100644 --- a/distro/nix/home.nix +++ b/distro/nix/home.nix @@ -51,19 +51,19 @@ in settings = lib.mkOption { type = jsonFormat.type; default = { }; - description = "DankMaterialShell configuration settings as an attribute set, to be written to ~/.config/DankMaterialShell/settings.json."; + description = "Dux Shell configuration settings as an attribute set, to be written to ~/.config/dms/settings.json."; }; clipboardSettings = lib.mkOption { type = jsonFormat.type; default = { }; - description = "DankMaterialShell clipboard settings as an attribute set, to be written to ~/.config/DankMaterialShell/clsettings.json."; + description = "Dux Shell clipboard settings as an attribute set, to be written to ~/.config/dms/clsettings.json."; }; session = lib.mkOption { type = jsonFormat.type; default = { }; - description = "DankMaterialShell session settings as an attribute set, to be written to ~/.local/state/DankMaterialShell/session.json."; + description = "Dux Shell session settings as an attribute set, to be written to ~/.local/state/dms/session.json."; }; managePluginSettings = lib.mkOption { @@ -88,7 +88,7 @@ in systemd.user.services.dms = lib.mkIf cfg.systemd.enable { Unit = { - Description = "DankMaterialShell"; + Description = "Dux Shell"; PartOf = [ cfg.systemd.target ]; After = [ cfg.systemd.target ]; }; @@ -106,23 +106,23 @@ in Install.WantedBy = [ cfg.systemd.target ]; }; - xdg.stateFile."DankMaterialShell/session.json" = lib.mkIf (cfg.session != { }) { + xdg.stateFile."dms/session.json" = lib.mkIf (cfg.session != { }) { source = jsonFormat.generate "session.json" cfg.session; }; xdg.configFile = { - "DankMaterialShell/settings.json" = lib.mkIf (cfg.settings != { }) { + "dms/settings.json" = lib.mkIf (cfg.settings != { }) { source = jsonFormat.generate "settings.json" cfg.settings; }; - "DankMaterialShell/clsettings.json" = lib.mkIf (cfg.clipboardSettings != { }) { + "dms/clsettings.json" = lib.mkIf (cfg.clipboardSettings != { }) { source = jsonFormat.generate "clsettings.json" cfg.clipboardSettings; }; - "DankMaterialShell/plugin_settings.json" = lib.mkIf cfg.managePluginSettings { + "dms/plugin_settings.json" = lib.mkIf cfg.managePluginSettings { source = jsonFormat.generate "plugin_settings.json" pluginSettings; }; } // (lib.mapAttrs' (name: value: { - name = "DankMaterialShell/plugins/${name}"; + name = "dms/plugins/${name}"; inherit value; }) common.plugins); warnings = diff --git a/distro/nix/niri.nix b/distro/nix/niri.nix index 05cf297bc..b2f257391 100644 --- a/distro/nix/niri.nix +++ b/distro/nix/niri.nix @@ -11,8 +11,8 @@ in { options.programs.dank-material-shell = { niri = { - enableKeybinds = lib.mkEnableOption "DankMaterialShell niri keybinds"; - enableSpawn = lib.mkEnableOption "DankMaterialShell niri spawn-at-startup"; + enableKeybinds = lib.mkEnableOption "Dux Shell niri keybinds"; + enableSpawn = lib.mkEnableOption "Dux Shell niri spawn-at-startup"; includes = { enable = (lib.mkEnableOption "includes for niri-flake") diff --git a/distro/nix/nixos.nix b/distro/nix/nixos.nix index b1f525138..f515f570a 100644 --- a/distro/nix/nixos.nix +++ b/distro/nix/nixos.nix @@ -34,7 +34,7 @@ in }; config = lib.mkIf cfg.enable { systemd.user.services.dms = lib.mkIf cfg.systemd.enable { - description = "DankMaterialShell"; + description = "Dux Shell"; path = lib.mkForce [ ]; partOf = [ cfg.systemd.target ]; diff --git a/distro/nix/options.nix b/distro/nix/options.nix index 8b4b676ea..934c49cd6 100644 --- a/distro/nix/options.nix +++ b/distro/nix/options.nix @@ -25,13 +25,13 @@ in ]; options.programs.dank-material-shell = { - enable = lib.mkEnableOption "DankMaterialShell"; + enable = lib.mkEnableOption "Dux Shell"; package = lib.mkPackageOption dmsPkgs "dms-shell" { - extraDescription = "The DankMaterialShell package to use (defaults to be built from source)"; + extraDescription = "The Dux Shell package to use (defaults to be built from source)"; }; systemd = { - enable = lib.mkEnableOption "DankMaterialShell systemd startup"; + enable = lib.mkEnableOption "Dux Shell systemd startup"; restartIfChanged = lib.mkOption { type = types.bool; default = true; diff --git a/distro/nix/tests/home-manager-module.nix b/distro/nix/tests/home-manager-module.nix index 877b504e8..53240cec4 100644 --- a/distro/nix/tests/home-manager-module.nix +++ b/distro/nix/tests/home-manager-module.nix @@ -85,16 +85,16 @@ pkgs.testers.runNixOSTest { machine.wait_for_unit("multi-user.target") machine.succeed("su -- danklinux -c 'command -v dms'") - machine.succeed("su -- danklinux -c 'test -f ~/.config/DankMaterialShell/settings.json'") - machine.succeed("su -- danklinux -c 'test -f ~/.config/DankMaterialShell/clsettings.json'") - machine.succeed("su -- danklinux -c 'test -f ~/.config/DankMaterialShell/plugin_settings.json'") - machine.succeed("su -- danklinux -c 'test -e ~/.config/DankMaterialShell/plugins/TestPlugin'") - machine.succeed("su -- danklinux -c 'test -f ~/.local/state/DankMaterialShell/session.json'") + machine.succeed("su -- danklinux -c 'test -f ~/.config/dms/settings.json'") + machine.succeed("su -- danklinux -c 'test -f ~/.config/dms/clsettings.json'") + machine.succeed("su -- danklinux -c 'test -f ~/.config/dms/plugin_settings.json'") + machine.succeed("su -- danklinux -c 'test -e ~/.config/dms/plugins/TestPlugin'") + machine.succeed("su -- danklinux -c 'test -f ~/.local/state/dms/session.json'") - settings = json.loads(machine.succeed("su -- danklinux -c 'cat ~/.config/DankMaterialShell/settings.json'")) - clipboard = json.loads(machine.succeed("su -- danklinux -c 'cat ~/.config/DankMaterialShell/clsettings.json'")) - session = json.loads(machine.succeed("su -- danklinux -c 'cat ~/.local/state/DankMaterialShell/session.json'")) - plugins = json.loads(machine.succeed("su -- danklinux -c 'cat ~/.config/DankMaterialShell/plugin_settings.json'")) + settings = json.loads(machine.succeed("su -- danklinux -c 'cat ~/.config/dms/settings.json'")) + clipboard = json.loads(machine.succeed("su -- danklinux -c 'cat ~/.config/dms/clsettings.json'")) + session = json.loads(machine.succeed("su -- danklinux -c 'cat ~/.local/state/dms/session.json'")) + plugins = json.loads(machine.succeed("su -- danklinux -c 'cat ~/.config/dms/plugin_settings.json'")) doctor = json.loads(machine.succeed("su -- danklinux -c 'dms doctor --json'")) t.assertEqual(settings["theme"], "integration-test") diff --git a/distro/opensuse/dms-git.spec b/distro/opensuse/dms-git.spec index 72202ef29..e3d438b35 100644 --- a/distro/opensuse/dms-git.spec +++ b/distro/opensuse/dms-git.spec @@ -5,10 +5,10 @@ Name: dms-git Version: 1.4.0+git2528.d336866f Release: 1%{?dist} Epoch: 2 -Summary: DankMaterialShell - Material 3 inspired shell (git nightly) +Summary: Dux Shell - Material 3 inspired shell (git nightly) License: MIT -URL: https://github.com/AvengeMedia/DankMaterialShell +URL: https://github.com/duxlabs-dev/dux-shell Source0: dms-git-source.tar.gz Source1: go%{go_toolchain_version}.linux-amd64.tar.gz Source2: go%{go_toolchain_version}.linux-arm64.tar.gz @@ -33,7 +33,7 @@ Conflicts: dms Obsoletes: dms %description -DankMaterialShell (DMS) is a modern Wayland desktop shell built with Quickshell +Dux Shell (DMS) is a modern Wayland desktop shell built with Quickshell and optimized for niri, Hyprland, Sway, and other wlroots compositors. This git version tracks the master branch and includes the latest features @@ -115,9 +115,9 @@ install -d %{buildroot}%{_datadir}/fish/vendor_completions.d install -Dm644 assets/systemd/dms.service %{buildroot}%{_userunitdir}/dms.service install -Dm644 assets/dms-open.desktop %{buildroot}%{_datadir}/applications/dms-open.desktop -install -Dm644 assets/com.danklinux.dms.desktop %{buildroot}%{_datadir}/applications/com.danklinux.dms.desktop -install -Dm644 assets/com.danklinux.dms.notepad.desktop %{buildroot}%{_datadir}/applications/com.danklinux.dms.notepad.desktop -install -Dm644 assets/com.danklinux.dms.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/com.danklinux.dms.svg +install -Dm644 assets/dev.duxlabs.shell.desktop %{buildroot}%{_datadir}/applications/dev.duxlabs.shell.desktop +install -Dm644 assets/dev.duxlabs.shell.notepad.desktop %{buildroot}%{_datadir}/applications/dev.duxlabs.shell.notepad.desktop +install -Dm644 assets/dev.duxlabs.shell.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/dev.duxlabs.shell.svg %posttrans if [ -d "%{_sysconfdir}/xdg/quickshell/dms" ]; then @@ -141,12 +141,12 @@ pkill -USR1 -x dms >/dev/null 2>&1 || : %{_datadir}/bash-completion/completions/dms %{_userunitdir}/dms.service %{_datadir}/applications/dms-open.desktop -%{_datadir}/applications/com.danklinux.dms.desktop -%{_datadir}/applications/com.danklinux.dms.notepad.desktop +%{_datadir}/applications/dev.duxlabs.shell.desktop +%{_datadir}/applications/dev.duxlabs.shell.notepad.desktop %dir %{_datadir}/icons/hicolor %dir %{_datadir}/icons/hicolor/scalable %dir %{_datadir}/icons/hicolor/scalable/apps -%{_datadir}/icons/hicolor/scalable/apps/com.danklinux.dms.svg +%{_datadir}/icons/hicolor/scalable/apps/dev.duxlabs.shell.svg %changelog * Sun Dec 14 2025 Avenge Media - 1.0.2+git2528.d336866f-1 diff --git a/distro/opensuse/dms.spec b/distro/opensuse/dms.spec index fef509698..6369dfd0e 100644 --- a/distro/opensuse/dms.spec +++ b/distro/opensuse/dms.spec @@ -5,10 +5,10 @@ Name: dms Version: 1.2.3 Release: 1%{?dist} -Summary: DankMaterialShell - Material 3 inspired shell for Wayland compositors +Summary: Dux Shell - Material 3 inspired shell for Wayland compositors License: MIT -URL: https://github.com/AvengeMedia/DankMaterialShell +URL: https://github.com/duxlabs-dev/dux-shell Source0: dms-source.tar.gz Source1: dms-distropkg-amd64.gz Source2: dms-distropkg-arm64.gz @@ -31,7 +31,7 @@ Suggests: cups-pk-helper Suggests: qt6ct %description -DankMaterialShell (DMS) is a modern Wayland desktop shell built with Quickshell +Dux Shell (DMS) is a modern Wayland desktop shell built with Quickshell and optimized for niri, Hyprland, Sway, and other wlroots compositors. Features notifications, app launcher, wallpaper customization, and plugin system. @@ -65,9 +65,9 @@ install -d %{buildroot}%{_datadir}/fish/vendor_completions.d install -Dm644 assets/systemd/dms.service %{buildroot}%{_userunitdir}/dms.service install -Dm644 assets/dms-open.desktop %{buildroot}%{_datadir}/applications/dms-open.desktop -install -Dm644 assets/com.danklinux.dms.desktop %{buildroot}%{_datadir}/applications/com.danklinux.dms.desktop -install -Dm644 assets/com.danklinux.dms.notepad.desktop %{buildroot}%{_datadir}/applications/com.danklinux.dms.notepad.desktop -install -Dm644 assets/com.danklinux.dms.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/com.danklinux.dms.svg +install -Dm644 assets/dev.duxlabs.shell.desktop %{buildroot}%{_datadir}/applications/dev.duxlabs.shell.desktop +install -Dm644 assets/dev.duxlabs.shell.notepad.desktop %{buildroot}%{_datadir}/applications/dev.duxlabs.shell.notepad.desktop +install -Dm644 assets/dev.duxlabs.shell.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/dev.duxlabs.shell.svg install -dm755 %{buildroot}%{_datadir}/quickshell/dms cp -r quickshell/* %{buildroot}%{_datadir}/quickshell/dms/ @@ -101,12 +101,12 @@ pkill -USR1 -x dms >/dev/null 2>&1 || : %{_datadir}/quickshell/dms/ %{_userunitdir}/dms.service %{_datadir}/applications/dms-open.desktop -%{_datadir}/applications/com.danklinux.dms.desktop -%{_datadir}/applications/com.danklinux.dms.notepad.desktop +%{_datadir}/applications/dev.duxlabs.shell.desktop +%{_datadir}/applications/dev.duxlabs.shell.notepad.desktop %dir %{_datadir}/icons/hicolor %dir %{_datadir}/icons/hicolor/scalable %dir %{_datadir}/icons/hicolor/scalable/apps -%{_datadir}/icons/hicolor/scalable/apps/com.danklinux.dms.svg +%{_datadir}/icons/hicolor/scalable/apps/dev.duxlabs.shell.svg %changelog * Mon Dec 16 2025 AvengeMedia - 1.0.3-1 diff --git a/distro/scripts/copr-upload.sh b/distro/scripts/copr-upload.sh index 31db344dd..001f36c6e 100755 --- a/distro/scripts/copr-upload.sh +++ b/distro/scripts/copr-upload.sh @@ -25,7 +25,7 @@ fi # Get version from latest release if not provided if [ -z "$VERSION" ]; then echo "📦 Determining latest version..." - VERSION=$(curl -s https://api.github.com/repos/AvengeMedia/DankMaterialShell/releases/latest | jq -r '.tag_name' | sed 's/^v//') + VERSION=$(curl -s https://api.github.com/repos/duxlabs-dev/dux-shell/releases/latest | jq -r '.tag_name' | sed 's/^v//') if [ -z "$VERSION" ] || [ "$VERSION" = "null" ]; then echo "❌ Failed to determine version. Please specify manually." exit 1 @@ -42,7 +42,7 @@ cd ~/rpmbuild/SOURCES # Download source tarball from GitHub releases echo "📦 Downloading source tarball for v${VERSION}..." if [ ! -f ~/rpmbuild/SOURCES/dms-qml.tar.gz ]; then - wget -O ~/rpmbuild/SOURCES/dms-qml.tar.gz "https://github.com/AvengeMedia/DankMaterialShell/releases/download/v${VERSION}/dms-qml.tar.gz" || { + wget -O ~/rpmbuild/SOURCES/dms-qml.tar.gz "https://github.com/duxlabs-dev/dux-shell/releases/download/v${VERSION}/dms-qml.tar.gz" || { echo "❌ Failed to download dms-qml.tar.gz for v${VERSION}" exit 1 } diff --git a/distro/scripts/ppa-build.sh b/distro/scripts/ppa-build.sh index 7ee4ecde4..66de413e2 100755 --- a/distro/scripts/ppa-build.sh +++ b/distro/scripts/ppa-build.sh @@ -237,17 +237,17 @@ fi case "$PACKAGE_NAME" in dms-git) IS_GIT_PACKAGE=true - GIT_REPO="AvengeMedia/DankMaterialShell" + GIT_REPO="duxlabs-dev/dux-shell" SOURCE_DIR="dms-git-repo" ;; dms) - GIT_REPO="AvengeMedia/DankMaterialShell" + GIT_REPO="duxlabs-dev/dux-shell" ;; danksearch) - GIT_REPO="AvengeMedia/danksearch" + GIT_REPO="duxlabs-dev/dux-search" ;; dgop) - GIT_REPO="AvengeMedia/dgop" + GIT_REPO="duxlabs-dev/dux-gop" ;; esac @@ -336,7 +336,7 @@ EOF info "Downloading pre-built binaries and source for dms..." if [ ! -f "dms-distropkg-amd64.gz" ]; then info "Downloading dms binary for amd64..." - if wget -O dms-distropkg-amd64.gz "https://github.com/AvengeMedia/DankMaterialShell/releases/download/v${VERSION}/dms-distropkg-amd64.gz"; then + if wget -O dms-distropkg-amd64.gz "https://github.com/duxlabs-dev/dux-shell/releases/download/v${VERSION}/dms-distropkg-amd64.gz"; then success "amd64 binary downloaded" else error "Failed to download dms-distropkg-amd64.gz" @@ -347,7 +347,7 @@ EOF if [ ! -f "dms-distropkg-arm64.gz" ]; then info "Downloading dms binary for arm64..." # Try to download arm64 binary, but don't fail if it doesn't exist (yet) - if wget -O dms-distropkg-arm64.gz "https://github.com/AvengeMedia/DankMaterialShell/releases/download/v${VERSION}/dms-distropkg-arm64.gz"; then + if wget -O dms-distropkg-arm64.gz "https://github.com/duxlabs-dev/dux-shell/releases/download/v${VERSION}/dms-distropkg-arm64.gz"; then success "arm64 binary downloaded" else warn "Failed to download dms-distropkg-arm64.gz (skipping)" @@ -357,7 +357,7 @@ EOF if [ ! -f "dms-source.tar.gz" ]; then info "Downloading dms source for QML files..." - if wget -O dms-source.tar.gz "https://github.com/AvengeMedia/DankMaterialShell/releases/download/v${VERSION}/dms-source.tar.gz"; then + if wget -O dms-source.tar.gz "https://github.com/duxlabs-dev/dux-shell/releases/download/v${VERSION}/dms-source.tar.gz"; then success "source tarball downloaded" else error "Failed to download dms-source.tar.gz" @@ -544,7 +544,7 @@ danksearch) if [ ! -f "dsearch-amd64" ]; then info "Downloading dsearch binary for amd64..." - if wget -O dsearch-amd64.gz "https://github.com/AvengeMedia/danksearch/releases/download/v${VERSION}/dsearch-linux-amd64.gz"; then + if wget -O dsearch-amd64.gz "https://github.com/duxlabs-dev/dux-search/releases/download/v${VERSION}/dsearch-linux-amd64.gz"; then gunzip dsearch-amd64.gz chmod +x dsearch-amd64 success "amd64 binary downloaded" @@ -556,7 +556,7 @@ danksearch) if [ ! -f "dsearch-arm64" ]; then info "Downloading dsearch binary for arm64..." - if wget -O dsearch-arm64.gz "https://github.com/AvengeMedia/danksearch/releases/download/v${VERSION}/dsearch-linux-arm64.gz"; then + if wget -O dsearch-arm64.gz "https://github.com/duxlabs-dev/dux-search/releases/download/v${VERSION}/dsearch-linux-arm64.gz"; then gunzip dsearch-arm64.gz chmod +x dsearch-arm64 success "arm64 binary downloaded" diff --git a/distro/scripts/ppa-sync-plan.sh b/distro/scripts/ppa-sync-plan.sh index c4f668d23..5809fc609 100755 --- a/distro/scripts/ppa-sync-plan.sh +++ b/distro/scripts/ppa-sync-plan.sh @@ -37,7 +37,7 @@ while [[ $# -gt 0 ]]; do done latest_tag() { - git ls-remote --tags --refs --sort='-v:refname' https://github.com/AvengeMedia/DankMaterialShell.git | + git ls-remote --tags --refs --sort='-v:refname' https://github.com/duxlabs-dev/dux-shell.git | sed -n '1s|.*/v\{0,1\}||p' } diff --git a/distro/ubuntu/dms-git/debian/control b/distro/ubuntu/dms-git/debian/control index 0924c35c4..f01b9457a 100644 --- a/distro/ubuntu/dms-git/debian/control +++ b/distro/ubuntu/dms-git/debian/control @@ -4,9 +4,9 @@ Priority: optional Maintainer: Avenge Media Build-Depends: debhelper-compat (= 13) Standards-Version: 4.6.2 -Homepage: https://github.com/AvengeMedia/DankMaterialShell -Vcs-Browser: https://github.com/AvengeMedia/DankMaterialShell -Vcs-Git: https://github.com/AvengeMedia/DankMaterialShell.git +Homepage: https://github.com/duxlabs-dev/dux-shell +Vcs-Browser: https://github.com/duxlabs-dev/dux-shell +Vcs-Git: https://github.com/duxlabs-dev/dux-shell.git Package: dms-git Architecture: any @@ -30,8 +30,8 @@ Depends: ${misc:Depends}, Provides: dms Conflicts: dms Replaces: dms -Description: DankMaterialShell - Modern Wayland Desktop Shell (git nightly) - DMS (DankMaterialShell) is a feature-rich desktop shell built on +Description: Dux Shell - Modern Wayland Desktop Shell (git nightly) + DMS (Dux Shell) is a feature-rich desktop shell built on Quickshell, providing a modern and customizable user interface for Wayland compositors like niri, hyprland, and sway. . diff --git a/distro/ubuntu/dms-git/debian/rules b/distro/ubuntu/dms-git/debian/rules index 4bf891b6a..3c11191fa 100755 --- a/distro/ubuntu/dms-git/debian/rules +++ b/distro/ubuntu/dms-git/debian/rules @@ -61,12 +61,12 @@ override_dh_auto_install: # Install desktop file and icon install -Dm644 dms-git-repo/assets/dms-open.desktop \ debian/dms-git/usr/share/applications/dms-open.desktop - install -Dm644 dms-git-repo/assets/com.danklinux.dms.desktop \ - debian/dms-git/usr/share/applications/com.danklinux.dms.desktop - install -Dm644 dms-git-repo/assets/com.danklinux.dms.notepad.desktop \ - debian/dms-git/usr/share/applications/com.danklinux.dms.notepad.desktop - install -Dm644 dms-git-repo/assets/com.danklinux.dms.svg \ - debian/dms-git/usr/share/icons/hicolor/scalable/apps/com.danklinux.dms.svg + install -Dm644 dms-git-repo/assets/dev.duxlabs.shell.desktop \ + debian/dms-git/usr/share/applications/dev.duxlabs.shell.desktop + install -Dm644 dms-git-repo/assets/dev.duxlabs.shell.notepad.desktop \ + debian/dms-git/usr/share/applications/dev.duxlabs.shell.notepad.desktop + install -Dm644 dms-git-repo/assets/dev.duxlabs.shell.svg \ + debian/dms-git/usr/share/icons/hicolor/scalable/apps/dev.duxlabs.shell.svg override_dh_auto_clean: # Don't delete dms-git-repo directory - it's part of the source package (native format) diff --git a/distro/ubuntu/dms/debian/control b/distro/ubuntu/dms/debian/control index 1a3699a48..09315e505 100644 --- a/distro/ubuntu/dms/debian/control +++ b/distro/ubuntu/dms/debian/control @@ -4,9 +4,9 @@ Priority: optional Maintainer: Avenge Media Build-Depends: debhelper-compat (= 13) Standards-Version: 4.6.2 -Homepage: https://github.com/AvengeMedia/DankMaterialShell -Vcs-Browser: https://github.com/AvengeMedia/DankMaterialShell -Vcs-Git: https://github.com/AvengeMedia/DankMaterialShell.git +Homepage: https://github.com/duxlabs-dev/dux-shell +Vcs-Browser: https://github.com/duxlabs-dev/dux-shell +Vcs-Git: https://github.com/duxlabs-dev/dux-shell.git Package: dms Architecture: any @@ -30,8 +30,8 @@ Depends: ${misc:Depends}, qt6ct Conflicts: dms-git Replaces: dms-git -Description: DankMaterialShell - Modern Wayland Desktop Shell - DMS (DankMaterialShell) is a feature-rich desktop shell built on +Description: Dux Shell - Modern Wayland Desktop Shell + DMS (Dux Shell) is a feature-rich desktop shell built on Quickshell, providing a modern and customizable user interface for Wayland compositors like niri, hyprland, and sway. . diff --git a/distro/ubuntu/dms/debian/rules b/distro/ubuntu/dms/debian/rules index 4a351953a..bd0d91bcb 100755 --- a/distro/ubuntu/dms/debian/rules +++ b/distro/ubuntu/dms/debian/rules @@ -38,7 +38,7 @@ override_dh_auto_build: echo "Renaming $$SOURCE_DIR to DankMaterialShell-$(BASE_VERSION)"; \ mv "$$SOURCE_DIR" DankMaterialShell-$(BASE_VERSION); \ elif [ ! -d "DankMaterialShell-$(BASE_VERSION)" ]; then \ - echo "ERROR: No DankMaterialShell directory found after extraction!"; \ + echo "ERROR: No Dux Shell directory found after extraction!"; \ ls -la; \ exit 1; \ fi @@ -54,12 +54,12 @@ override_dh_auto_install: # Install desktop file and icon install -Dm644 DankMaterialShell-$(BASE_VERSION)/assets/dms-open.desktop \ debian/dms/usr/share/applications/dms-open.desktop - install -Dm644 DankMaterialShell-$(BASE_VERSION)/assets/com.danklinux.dms.desktop \ - debian/dms/usr/share/applications/com.danklinux.dms.desktop - install -Dm644 DankMaterialShell-$(BASE_VERSION)/assets/com.danklinux.dms.notepad.desktop \ - debian/dms/usr/share/applications/com.danklinux.dms.notepad.desktop - install -Dm644 DankMaterialShell-$(BASE_VERSION)/assets/com.danklinux.dms.svg \ - debian/dms/usr/share/icons/hicolor/scalable/apps/com.danklinux.dms.svg + install -Dm644 DankMaterialShell-$(BASE_VERSION)/assets/dev.duxlabs.shell.desktop \ + debian/dms/usr/share/applications/dev.duxlabs.shell.desktop + install -Dm644 DankMaterialShell-$(BASE_VERSION)/assets/dev.duxlabs.shell.notepad.desktop \ + debian/dms/usr/share/applications/dev.duxlabs.shell.notepad.desktop + install -Dm644 DankMaterialShell-$(BASE_VERSION)/assets/dev.duxlabs.shell.svg \ + debian/dms/usr/share/icons/hicolor/scalable/apps/dev.duxlabs.shell.svg # Install QML files from source tarball mkdir -p debian/dms/usr/share/quickshell/dms diff --git a/distro/void/README.md b/distro/void/README.md index 8c9882b4e..6b9049d14 100644 --- a/distro/void/README.md +++ b/distro/void/README.md @@ -1,12 +1,12 @@ # Void Linux packaging -XBPS templates for DankMaterialShell on [Void Linux](https://voidlinux.org). +XBPS templates for Dux Shell on [Void Linux](https://voidlinux.org). | Package | Source repo | Template | | --- | --- | --- | -| `dms` | DankMaterialShell | [`srcpkgs/dms/template`](srcpkgs/dms/template) | -| `dgop` | AvengeMedia/dgop | maintained in the **danklinux** repo (`distro/void/srcpkgs/dgop`) | -| `danksearch` | AvengeMedia/danksearch | maintained in the **danklinux** repo (`distro/void/srcpkgs/danksearch`) | +| `dms` | Dux Shell | [`srcpkgs/dms/template`](srcpkgs/dms/template) | +| `dgop` | duxlabs-dev/dux-gop | maintained in the **danklinux** repo (`distro/void/srcpkgs/dgop`) | +| `danksearch` | duxlabs-dev/dux-search | maintained in the **danklinux** repo (`distro/void/srcpkgs/danksearch`) | All build from source. diff --git a/distro/void/srcpkgs/dms-git/template b/distro/void/srcpkgs/dms-git/template index df1900966..48aa23201 100644 --- a/distro/void/srcpkgs/dms-git/template +++ b/distro/void/srcpkgs/dms-git/template @@ -1,6 +1,6 @@ # Template file for 'dms-git' # -# DankMaterialShell git development release +# Dux Shell git development release # # NOTE: This template is built exclusively by CI. The workflow stages a local # source tarball and dynamically patches version, checksum, and distfiles @@ -17,16 +17,16 @@ create_wrksrc=yes build_style=go build_wrksrc="core" hostmakedepends="make tar" -go_import_path="github.com/AvengeMedia/DankMaterialShell/core" +go_import_path="github.com/duxlabs-dev/dux-shell/core" go_package="${go_import_path}/cmd/dms" go_build_tags="distro_binary withshell" go_ldflags="-X main.Version=${version}" -short_desc="DankMaterialShell — Material 3 desktop shell for Wayland (git variant)" +short_desc="Dux Shell — Material 3 desktop shell for Wayland (git variant)" maintainer="AvengeMedia " license="MIT" -homepage="https://danklinux.com" +homepage="https://duxlabs.dev" # CI populates distfiles/checksum dynamically; these are placeholders. -distfiles="https://github.com/AvengeMedia/DankMaterialShell/archive/refs/tags/v${version}.tar.gz" +distfiles="https://github.com/duxlabs-dev/dux-shell/archive/refs/tags/v${version}.tar.gz" checksum=badbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadb # Conflicts and provides @@ -43,9 +43,9 @@ pre_build() { post_install() { # Desktop entry + icon vinstall "${wrksrc}/assets/dms-open.desktop" 644 usr/share/applications - vinstall "${wrksrc}/assets/com.danklinux.dms.desktop" 644 usr/share/applications - vinstall "${wrksrc}/assets/com.danklinux.dms.notepad.desktop" 644 usr/share/applications - vinstall "${wrksrc}/assets/com.danklinux.dms.svg" 644 usr/share/icons/hicolor/scalable/apps + vinstall "${wrksrc}/assets/dev.duxlabs.shell.desktop" 644 usr/share/applications + vinstall "${wrksrc}/assets/dev.duxlabs.shell.notepad.desktop" 644 usr/share/applications + vinstall "${wrksrc}/assets/dev.duxlabs.shell.svg" 644 usr/share/icons/hicolor/scalable/apps # Shell completions (generated by the built binary; skip when cross-building) vmkdir usr/share/bash-completion/completions diff --git a/distro/void/srcpkgs/dms/template b/distro/void/srcpkgs/dms/template index 937cb7a72..f04893133 100644 --- a/distro/void/srcpkgs/dms/template +++ b/distro/void/srcpkgs/dms/template @@ -1,6 +1,6 @@ # Template file for 'dms' # -# DankMaterialShell stable release +# Dux Shell stable release # # NOTE: the binary is built with the `distro_binary` build tag (drops the # in-app self-update command) and `withshell` (embeds the Quickshell UI; the @@ -12,16 +12,16 @@ revision=2 build_style=go build_wrksrc="core" hostmakedepends="make tar" -go_import_path="github.com/AvengeMedia/DankMaterialShell/core" +go_import_path="github.com/duxlabs-dev/dux-shell/core" go_package="${go_import_path}/cmd/dms" go_build_tags="distro_binary withshell" go_ldflags="-X main.Version=${version}" -short_desc="DankMaterialShell — Material 3 desktop shell for Wayland" +short_desc="Dux Shell — Material 3 desktop shell for Wayland" maintainer="AvengeMedia " license="MIT" -homepage="https://danklinux.com" -changelog="https://github.com/AvengeMedia/DankMaterialShell/releases" -distfiles="https://github.com/AvengeMedia/DankMaterialShell/releases/download/v${version}/dms-source.tar.gz" +homepage="https://duxlabs.dev" +changelog="https://github.com/duxlabs-dev/dux-shell/releases" +distfiles="https://github.com/duxlabs-dev/dux-shell/releases/download/v${version}/dms-source.tar.gz" checksum=14f2678d6a15223ba069d1b8c8a21a5564b735d190c231f62ed44fd8bf48677c # Optional feature deps are listed in distro/void/README.md. @@ -34,9 +34,9 @@ pre_build() { post_install() { # Desktop entry + icon vinstall "${wrksrc}/assets/dms-open.desktop" 644 usr/share/applications - vinstall "${wrksrc}/assets/com.danklinux.dms.desktop" 644 usr/share/applications - vinstall "${wrksrc}/assets/com.danklinux.dms.notepad.desktop" 644 usr/share/applications - vinstall "${wrksrc}/assets/com.danklinux.dms.svg" 644 usr/share/icons/hicolor/scalable/apps + vinstall "${wrksrc}/assets/dev.duxlabs.shell.desktop" 644 usr/share/applications + vinstall "${wrksrc}/assets/dev.duxlabs.shell.notepad.desktop" 644 usr/share/applications + vinstall "${wrksrc}/assets/dev.duxlabs.shell.svg" 644 usr/share/icons/hicolor/scalable/apps # Shell completions (generated by the built binary; skip when cross-building) vmkdir usr/share/bash-completion/completions diff --git a/flake.lock b/flake.lock index 501e804e2..ab7ce8621 100644 --- a/flake.lock +++ b/flake.lock @@ -11,8 +11,8 @@ "type": "github" }, "original": { - "owner": "AvengeMedia", - "repo": "dank-qml-common", + "owner": "duxlabs-dev", + "repo": "dux-qml-common", "type": "github" } }, diff --git a/flake.nix b/flake.nix index d652b03b6..1b643a53d 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,5 @@ { - description = "Dank Material Shell"; + description = "Dux Shell"; inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; @@ -8,7 +8,7 @@ flake = false; }; dank-qml-common = { - url = "github:AvengeMedia/dank-qml-common"; + url = "github:duxlabs-dev/dux-qml-common"; flake = false; }; }; @@ -140,12 +140,12 @@ # Install desktop file and icon install -D ${rootSrc}/assets/dms-open.desktop \ $out/share/applications/dms-open.desktop - install -D ${rootSrc}/assets/com.danklinux.dms.desktop \ - $out/share/applications/com.danklinux.dms.desktop - install -D ${rootSrc}/assets/com.danklinux.dms.notepad.desktop \ - $out/share/applications/com.danklinux.dms.notepad.desktop - install -D ${rootSrc}/assets/com.danklinux.dms.svg \ - $out/share/icons/hicolor/scalable/apps/com.danklinux.dms.svg + install -D ${rootSrc}/assets/dev.duxlabs.shell.desktop \ + $out/share/applications/dev.duxlabs.shell.desktop + install -D ${rootSrc}/assets/dev.duxlabs.shell.notepad.desktop \ + $out/share/applications/dev.duxlabs.shell.notepad.desktop + install -D ${rootSrc}/assets/dev.duxlabs.shell.svg \ + $out/share/icons/hicolor/scalable/apps/dev.duxlabs.shell.svg # Snapshot pre-wrap Qt paths so launched apps get their own, not DMS's pins. wrapProgram $out/bin/dms \ @@ -183,8 +183,8 @@ meta = { description = "Desktop shell for wayland compositors built with Quickshell & GO"; - homepage = "https://danklinux.com"; - changelog = "https://github.com/AvengeMedia/DankMaterialShell/releases/tag/v${version}"; + homepage = "https://duxlabs.dev"; + changelog = "https://github.com/duxlabs-dev/dux-shell/releases/tag/v${version}"; license = pkgs.lib.licenses.mit; mainProgram = "dms"; platforms = pkgs.lib.platforms.linux; @@ -222,7 +222,7 @@ nixosModules.default = self.nixosModules.dank-material-shell; - nixosModules.greeter = builtins.warn "dank-material-shell: the greeter moved to the dank-greeter repo; use `inputs.dank-greeter.nixosModules.default` and `programs.dms-greeter` (https://github.com/AvengeMedia/dank-greeter)" { }; + nixosModules.greeter = builtins.warn "dank-material-shell: the greeter moved to the dank-greeter repo; use `inputs.dank-greeter.nixosModules.default` and `programs.dms-greeter` (https://github.com/duxlabs-dev/dux-greeter)" { }; nixosModules.dankMaterialShell = builtins.warn "dank-material-shell: flake output `nixosModules.dankMaterialShell` has been renamed to `nixosModules.dank-material-shell`" self.nixosModules.dank-material-shell; diff --git a/quickshell/Common/AppUsageHistoryData.qml b/quickshell/Common/AppUsageHistoryData.qml index cd6dd4a38..8cf649f58 100644 --- a/quickshell/Common/AppUsageHistoryData.qml +++ b/quickshell/Common/AppUsageHistoryData.qml @@ -122,7 +122,7 @@ Singleton { FileView { id: settingsFile - path: StandardPaths.writableLocation(StandardPaths.GenericStateLocation) + "/DankMaterialShell/appusage.json" + path: StandardPaths.writableLocation(StandardPaths.GenericStateLocation) + "/dms/appusage.json" blockLoading: true blockWrites: true watchChanges: SettingsData.launcherHistoryEnabled diff --git a/quickshell/Common/CacheData.qml b/quickshell/Common/CacheData.qml index 6af147a1f..5772db6b2 100644 --- a/quickshell/Common/CacheData.qml +++ b/quickshell/Common/CacheData.qml @@ -280,7 +280,7 @@ Singleton { FileView { id: launcherCacheFile - path: isGreeterMode ? "" : _stateDir + "/DankMaterialShell/launcher_cache.json" + path: isGreeterMode ? "" : _stateDir + "/dms/launcher_cache.json" blockLoading: true blockWrites: true atomicWrites: true @@ -290,7 +290,7 @@ Singleton { FileView { id: cacheFile - path: isGreeterMode ? "" : _stateDir + "/DankMaterialShell/cache.json" + path: isGreeterMode ? "" : _stateDir + "/dms/cache.json" blockLoading: true blockWrites: true atomicWrites: true diff --git a/quickshell/Common/Paths.qml b/quickshell/Common/Paths.qml index e826dc7f5..7d5a759f3 100644 --- a/quickshell/Common/Paths.qml +++ b/quickshell/Common/Paths.qml @@ -15,10 +15,10 @@ Singleton { readonly property url pictures: StandardPaths.standardLocations(StandardPaths.PicturesLocation)[0] readonly property url xdgCache: StandardPaths.standardLocations(StandardPaths.GenericCacheLocation)[0] - readonly property url data: `${StandardPaths.standardLocations(StandardPaths.GenericDataLocation)[0]}/DankMaterialShell` - readonly property url state: `${StandardPaths.standardLocations(StandardPaths.GenericStateLocation)[0]}/DankMaterialShell` - readonly property url cache: `${StandardPaths.standardLocations(StandardPaths.GenericCacheLocation)[0]}/DankMaterialShell` - readonly property url config: `${StandardPaths.standardLocations(StandardPaths.GenericConfigLocation)[0]}/DankMaterialShell` + readonly property url data: `${StandardPaths.standardLocations(StandardPaths.GenericDataLocation)[0]}/dms` + readonly property url state: `${StandardPaths.standardLocations(StandardPaths.GenericStateLocation)[0]}/dms` + readonly property url cache: `${StandardPaths.standardLocations(StandardPaths.GenericCacheLocation)[0]}/dms` + readonly property url config: `${StandardPaths.standardLocations(StandardPaths.GenericConfigLocation)[0]}/dms` readonly property url imagecache: `${cache}/imagecache` @@ -161,8 +161,14 @@ Singleton { return desktopIconResolver(appId); } + readonly property var dmsAppIds: ["org.quickshell", "dev.duxlabs.shell", "com.danklinux.dms"] + + function isDmsAppId(appId: string): bool { + return dmsAppIds.includes(appId); + } + function getAppName(appId: string, desktopEntry: var): string { - if (appId === "org.quickshell" || appId === "com.danklinux.dms") { + if (isDmsAppId(appId)) { return "dms"; } diff --git a/quickshell/Common/SessionData.qml b/quickshell/Common/SessionData.qml index 4e8ebe9ff..747674c14 100644 --- a/quickshell/Common/SessionData.qml +++ b/quickshell/Common/SessionData.qml @@ -1883,7 +1883,7 @@ Singleton { FileView { id: settingsFile - path: isGreeterMode ? "" : StandardPaths.writableLocation(StandardPaths.GenericStateLocation) + "/DankMaterialShell/session.json" + path: isGreeterMode ? "" : StandardPaths.writableLocation(StandardPaths.GenericStateLocation) + "/dms/session.json" blockLoading: true blockWrites: true atomicWrites: true diff --git a/quickshell/Common/SettingsData.qml b/quickshell/Common/SettingsData.qml index 614546aa2..0b9b55a14 100644 --- a/quickshell/Common/SettingsData.qml +++ b/quickshell/Common/SettingsData.qml @@ -81,7 +81,7 @@ Singleton { readonly property string _homeUrl: StandardPaths.writableLocation(StandardPaths.HomeLocation) readonly property string _configUrl: StandardPaths.writableLocation(StandardPaths.ConfigLocation) readonly property string _configDir: Paths.strip(_configUrl) - readonly property string pluginSettingsPath: _configDir + "/DankMaterialShell/plugin_settings.json" + readonly property string pluginSettingsPath: _configDir + "/dms/plugin_settings.json" readonly property bool qtengineActive: Quickshell.env("QT_QPA_PLATFORMTHEME") === "qtengine" || Quickshell.env("QT_QPA_PLATFORMTHEME_QT6") === "qtengine" property bool _loading: false @@ -1841,7 +1841,7 @@ Singleton { const oldVersion = obj?.configVersion ?? 0; if (oldVersion > settingsConfigVersion && !isGreeterMode) { - newerSettingsBackup.path = `${_configDir}/DankMaterialShell/settings.v${oldVersion}.json`; + newerSettingsBackup.path = `${_configDir}/dms/settings.v${oldVersion}.json`; newerSettingsBackup.setText(JSON.stringify(obj, null, 2)); } const legacyPins = oldVersion < 13 ? Store.extractPins(obj) : null; @@ -3914,7 +3914,7 @@ Singleton { SettingsFile { id: defaultSettingsFile - filePath: StandardPaths.writableLocation(StandardPaths.ConfigLocation) + "/DankMaterialShell/settings.json" + filePath: StandardPaths.writableLocation(StandardPaths.ConfigLocation) + "/dms/settings.json" Component.onCompleted: { _registerSettingsFile(defaultSettingsFile); @@ -3970,7 +3970,7 @@ Singleton { sourceComponent: FolderListModel { id: settingsFolderModel - property url dir: StandardPaths.writableLocation(StandardPaths.ConfigLocation) + "/DankMaterialShell/config.d" + property url dir: StandardPaths.writableLocation(StandardPaths.ConfigLocation) + "/dms/config.d" folder: dir showDirs: false diff --git a/quickshell/Common/Site.qml b/quickshell/Common/Site.qml index 03b18e2a5..bc24ce5f4 100644 --- a/quickshell/Common/Site.qml +++ b/quickshell/Common/Site.qml @@ -3,10 +3,10 @@ pragma Singleton import Quickshell Singleton { - readonly property string domain: "danklinux.com" + readonly property string domain: "duxlabs.dev" readonly property string web: "https://" + domain readonly property string docs: web + "/docs" - readonly property string api: "https://api." + domain + readonly property string api: "https://api.danklinux.com" readonly property string plugins: "https://plugins." + domain readonly property string wallpaperCreator: "https://wallpaper." + domain } diff --git a/quickshell/Common/StockThemes.js b/quickshell/Common/StockThemes.js index 9e87a8c57..ac864c2b5 100644 --- a/quickshell/Common/StockThemes.js +++ b/quickshell/Common/StockThemes.js @@ -1,4 +1,4 @@ -// Stock theme definitions for DankMaterialShell +// Stock theme definitions for Dux Shell // Separated from Theme.qml to keep that file clean const StockThemes = { diff --git a/quickshell/Common/Theme.qml b/quickshell/Common/Theme.qml index 6b753465b..d40f6b670 100644 --- a/quickshell/Common/Theme.qml +++ b/quickshell/Common/Theme.qml @@ -21,7 +21,7 @@ Singleton { id: root readonly property var log: Log.scoped("Theme") - readonly property string stateDir: Paths.strip(StandardPaths.writableLocation(StandardPaths.GenericCacheLocation).toString()) + "/DankMaterialShell" + readonly property string stateDir: Paths.strip(StandardPaths.writableLocation(StandardPaths.GenericCacheLocation).toString()) + "/dms" readonly property bool envDisableMatugen: Quickshell.env("DMS_DISABLE_MATUGEN") === "1" || Quickshell.env("DMS_DISABLE_MATUGEN") === "true" readonly property string defaultFontFamily: "Google Sans Flex" readonly property string defaultMonoFontFamily: "Fira Code" @@ -72,7 +72,7 @@ Singleton { property var _workerStderr: [] property bool _workerStderrUsage: false readonly property int _workerStderrKeep: 8 - readonly property string themeTroubleshootingUrl: "https://danklinux.com/docs/dankmaterialshell/application-themes#troubleshooting" + readonly property string themeTroubleshootingUrl: "https://duxlabs.dev/docs/dms/application-themes#troubleshooting" property bool blurLayersActive: false property bool matugenToastSuppressed: false diff --git a/quickshell/Modals/Changelog/ChangelogContent.qml b/quickshell/Modals/Changelog/ChangelogContent.qml index fede064d4..eb86526d4 100644 --- a/quickshell/Modals/Changelog/ChangelogContent.qml +++ b/quickshell/Modals/Changelog/ChangelogContent.qml @@ -56,7 +56,7 @@ Column { "hoverShape": "cookie6", "accent": "orange", "heading": "Material wallpapers", - "description": "Presets from your seed color, plus layouts from wallpaper.danklinux.com", + "description": "Presets from your seed color, plus layouts from wallpaper.duxlabs.dev", "target": "personalization" }, { diff --git a/quickshell/Modals/DLauncherV2/ResultsList.qml b/quickshell/Modals/DLauncherV2/ResultsList.qml index dff222121..dc01afbeb 100644 --- a/quickshell/Modals/DLauncherV2/ResultsList.qml +++ b/quickshell/Modals/DLauncherV2/ResultsList.qml @@ -634,7 +634,7 @@ Item { switch (mode) { case "files": if (!DSearchService.dsearchAvailable) - return I18n.tr("File search requires dsearch\nInstall from github.com/AvengeMedia/danksearch"); + return I18n.tr("File search requires dsearch\nInstall from github.com/duxlabs-dev/dux-search"); if (!hasQuery) return I18n.tr("Type to search files"); if (root.controller.searchQuery.length < 2) diff --git a/quickshell/Modals/Greeter/GreeterCompletePage.qml b/quickshell/Modals/Greeter/GreeterCompletePage.qml index 45624a616..9eb90f050 100644 --- a/quickshell/Modals/Greeter/GreeterCompletePage.qml +++ b/quickshell/Modals/Greeter/GreeterCompletePage.qml @@ -329,13 +329,13 @@ Item { hoverEnabled: true cursorShape: Qt.PointingHandCursor onClicked: { - let url = Site.docs + "/dankmaterialshell/keybinds-ipc"; + let url = Site.docs + "/dms/keybinds-ipc"; if (CompositorService.isNiri) - url = Site.docs + "/dankmaterialshell/compositors#dms-keybindings"; + url = Site.docs + "/dms/compositors#dms-keybindings"; else if (CompositorService.isHyprland) - url = Site.docs + "/dankmaterialshell/compositors#dms-keybindings-1"; + url = Site.docs + "/dms/compositors#dms-keybindings-1"; else if (CompositorService.isMango) - url = Site.docs + "/dankmaterialshell/compositors#dms-keybindings-2"; + url = Site.docs + "/dms/compositors#dms-keybindings-2"; Qt.openUrlExternally(url); } } diff --git a/quickshell/Modals/Greeter/GreeterWelcomePage.qml b/quickshell/Modals/Greeter/GreeterWelcomePage.qml index 2d0f86d25..3565957e6 100644 --- a/quickshell/Modals/Greeter/GreeterWelcomePage.qml +++ b/quickshell/Modals/Greeter/GreeterWelcomePage.qml @@ -133,7 +133,7 @@ Item { StyledText { width: parent.width - text: I18n.tr("Welcome to %1", "greeter welcome page title, %1 is the product name").arg("DankMaterialShell") + text: I18n.tr("Welcome to %1", "greeter welcome page title, %1 is the product name").arg("Dux Shell") font.pixelSize: Theme.fontSizeXXLarge font.weight: Theme.fontWeightBold color: hero.contentColor diff --git a/quickshell/Modules/DBar/Widgets/FocusedApp.qml b/quickshell/Modules/DBar/Widgets/FocusedApp.qml index 49714381d..93b9c801b 100644 --- a/quickshell/Modules/DBar/Widgets/FocusedApp.qml +++ b/quickshell/Modules/DBar/Widgets/FocusedApp.qml @@ -157,7 +157,7 @@ BasePill { smooth: true mipmap: true asynchronous: true - layer.enabled: activeWindow && (activeWindow.appId === "org.quickshell" || activeWindow.appId === "com.danklinux.dms") + layer.enabled: activeWindow && Paths.isDmsAppId(activeWindow.appId) layer.smooth: true layer.mipmap: true layer.effect: MultiEffect { @@ -217,7 +217,7 @@ BasePill { smooth: true mipmap: true asynchronous: true - layer.enabled: activeWindow && (activeWindow.appId === "org.quickshell" || activeWindow.appId === "com.danklinux.dms") + layer.enabled: activeWindow && Paths.isDmsAppId(activeWindow.appId) layer.smooth: true layer.mipmap: true layer.effect: MultiEffect { diff --git a/quickshell/Modules/DBar/Widgets/RunningApps.qml b/quickshell/Modules/DBar/Widgets/RunningApps.qml index 6e32155d2..b2a43df78 100644 --- a/quickshell/Modules/DBar/Widgets/RunningApps.qml +++ b/quickshell/Modules/DBar/Widgets/RunningApps.qml @@ -312,7 +312,7 @@ BasePill { asynchronous: true visible: status === Image.Ready opacity: delegateItem.isMinimized ? 0.4 : 1 - layer.enabled: appId === "org.quickshell" || appId === "com.danklinux.dms" + layer.enabled: Paths.isDmsAppId(appId) layer.smooth: true layer.mipmap: true layer.effect: MultiEffect { diff --git a/quickshell/Modules/DBar/Widgets/WorkspaceSwitcher.qml b/quickshell/Modules/DBar/Widgets/WorkspaceSwitcher.qml index 6c05b594b..a3b3c44d1 100644 --- a/quickshell/Modules/DBar/Widgets/WorkspaceSwitcher.qml +++ b/quickshell/Modules/DBar/Widgets/WorkspaceSwitcher.qml @@ -97,7 +97,7 @@ BasePill { const key = groupThisWs ? moddedId : (w.aqueousKey || `${moddedId}_${i}`); if (!byApp[key]) { - const isQuickshell = keyBase === "org.quickshell" || keyBase === "com.danklinux.dms"; + const isQuickshell = Paths.isDmsAppId(keyBase); const isSteamApp = Paths.isSteamApp(moddedId); const desktopEntry = DesktopEntries.heuristicLookup(moddedId); const icon = Paths.getAppIcon(moddedId, desktopEntry); diff --git a/quickshell/Modules/DDash/Overview/CalendarOverviewCard.qml b/quickshell/Modules/DDash/Overview/CalendarOverviewCard.qml index a5e96d563..073c78db8 100644 --- a/quickshell/Modules/DDash/Overview/CalendarOverviewCard.qml +++ b/quickshell/Modules/DDash/Overview/CalendarOverviewCard.qml @@ -223,7 +223,7 @@ Card { StyledText { width: parent.width - Theme.iconSizeSmall - Theme.spacingS - (launchButton.visible ? launchButton.width + Theme.spacingS : 0) anchors.verticalCenter: parent.verticalCenter - text: CalendarService.dankBinaryExists ? I18n.tr("DankCalendar isn't running") : I18n.tr("DankCalendar isn't installed") + text: CalendarService.dankBinaryExists ? I18n.tr("Dux Calendar isn't running") : I18n.tr("Dux Calendar isn't installed") font.pixelSize: Theme.fontSizeSmall color: Theme.surfaceText wrapMode: Text.Wrap diff --git a/quickshell/Modules/Dock/DockAppButton.qml b/quickshell/Modules/Dock/DockAppButton.qml index 9d1c0b192..14f5671a7 100644 --- a/quickshell/Modules/Dock/DockAppButton.qml +++ b/quickshell/Modules/Dock/DockAppButton.qml @@ -164,7 +164,7 @@ Item { function showContextMenu() { if (!contextMenu) return; - const shouldHidePin = appData.appId === "org.quickshell" || appData.appId === "com.danklinux.dms"; + const shouldHidePin = Paths.isDmsAppId(appData.appId); contextMenu.showForButton(root, appData, root.height, shouldHidePin, cachedDesktopEntry, parentDockScreen, dockApps); } function activate() { @@ -466,7 +466,7 @@ Item { id: iconImg anchors.centerIn: parent - implicitSize: appData && (appData.appId === "org.quickshell" || appData.appId === "com.danklinux.dms") ? actualIconSize * 0.85 : actualIconSize + implicitSize: appData && Paths.isDmsAppId(appData.appId) ? actualIconSize * 0.85 : actualIconSize source: { if (!appData || appData.appId === "__SEPARATOR__") { return ""; @@ -481,7 +481,7 @@ Item { asynchronous: true visible: status === Image.Ready && !coreIcon.visible opacity: root.isMinimized ? 0.4 : 1 - layer.enabled: appData && (appData.appId === "org.quickshell" || appData.appId === "com.danklinux.dms") + layer.enabled: appData && Paths.isDmsAppId(appData.appId) layer.smooth: true layer.mipmap: true layer.effect: MultiEffect { diff --git a/quickshell/Modules/Dock/DockContextMenu.qml b/quickshell/Modules/Dock/DockContextMenu.qml index 831bdfcbc..6cd129198 100644 --- a/quickshell/Modules/Dock/DockContextMenu.qml +++ b/quickshell/Modules/Dock/DockContextMenu.qml @@ -11,7 +11,7 @@ DockContextMenuBase { property bool hidePin: false property var desktopEntry: null property var dockApps: null - readonly property bool isDmsWindow: appData?.appId === "org.quickshell" || appData?.appId === "com.danklinux.dms" + readonly property bool isDmsWindow: Paths.isDmsAppId(appData?.appId) readonly property var settingsJumpGroups: visible && appData?.appId === "dms_settings" ? buildSettingsJumpGroups() : [] layerNamespace: "dms:dock-context-menu" diff --git a/quickshell/Modules/Greetd/README.md b/quickshell/Modules/Greetd/README.md index accc46ff2..ee55c2ffe 100644 --- a/quickshell/Modules/Greetd/README.md +++ b/quickshell/Modules/Greetd/README.md @@ -2,6 +2,6 @@ TODO: remove when dank-greeter is available in the Arch extra repos. -The greeter moved to [dank-greeter](https://github.com/AvengeMedia/dank-greeter). This embedded copy exists only for archinstall compatibility: the `niri - DankMaterialShell` archinstall profile writes an `/etc/greetd/config.toml` that launches `Modules/Greetd/assets/dms-greeter` from the packaged DMS tree, and dank-greeter is not installable from the official Arch repos yet. +The greeter moved to [dank-greeter](https://github.com/duxlabs-dev/dux-greeter). This embedded copy exists only for archinstall compatibility: the `niri - Dux Shell` archinstall profile writes an `/etc/greetd/config.toml` that launches `Modules/Greetd/assets/dms-greeter` from the packaged DMS tree, and dank-greeter is not installable from the official Arch repos yet. Do not extend this module. New greeter work goes to dank-greeter. Installing greetd-dms-greeter-bin from the AUR and running `dms-greeter sync` migrates a system off this embedded copy. diff --git a/quickshell/Modules/Greetd/assets/dms-greeter b/quickshell/Modules/Greetd/assets/dms-greeter index c87ba14b6..5906b71b9 100755 --- a/quickshell/Modules/Greetd/assets/dms-greeter +++ b/quickshell/Modules/Greetd/assets/dms-greeter @@ -12,7 +12,7 @@ DEBUG_MODE=0 show_help() { cat << EOF -dms-greeter - DankMaterialShell greeter launcher +dms-greeter - Dux Shell greeter launcher Usage: dms-greeter --command COMPOSITOR [OPTIONS] diff --git a/quickshell/Modules/Lock/Widgets/LockAuthWidget.qml b/quickshell/Modules/Lock/Widgets/LockAuthWidget.qml index 832a6afb7..2cd785936 100644 --- a/quickshell/Modules/Lock/Widgets/LockAuthWidget.qml +++ b/quickshell/Modules/Lock/Widgets/LockAuthWidget.qml @@ -788,8 +788,8 @@ Item { } } - // IME commits use a hidden password input: https://github.com/AvengeMedia/DankMaterialShell/issues/2950 - // An in-process module like fcitx5-qt draws its popup as an xdg_popup, which the lock surface cannot parent: https://github.com/AvengeMedia/DankMaterialShell/issues/3669 + // IME commits use a hidden password input: https://github.com/duxlabs-dev/dux-shell/issues/2950 + // An in-process module like fcitx5-qt draws its popup as an xdg_popup, which the lock surface cannot parent: https://github.com/duxlabs-dev/dux-shell/issues/3669 Loader { focus: true active: KeyUtils.compositorTextInputSelected(Quickshell.env("QT_IM_MODULES"), Quickshell.env("QT_IM_MODULE")) diff --git a/quickshell/Modules/Notifications/NotificationCard.qml b/quickshell/Modules/Notifications/NotificationCard.qml index 47db5ab5f..e68514837 100644 --- a/quickshell/Modules/Notifications/NotificationCard.qml +++ b/quickshell/Modules/Notifications/NotificationCard.qml @@ -37,7 +37,7 @@ Rectangle { readonly property bool hasMoreText: bodyText.truncated || summaryText.truncated readonly property bool hasBody: (notificationData?.htmlBody || "").replace(/<[^>]*>/g, "").trim().length > 0 readonly property string appIcon: NotificationService.notificationAppIcon(notificationData?.appIcon || "", notificationData?.desktopEntry || "") - readonly property bool dmsIcon: appIcon === "com.danklinux.dms" + readonly property bool dmsIcon: appIcon === "dev.duxlabs.shell" || appIcon === "com.danklinux.dms" readonly property string contentImageSource: notificationData?.hasDisplayImage ? notificationData?.displayImage || "" : "" readonly property bool hasContentImage: contentImageSource.length > 0 && contentImage.status !== Image.Error readonly property bool contentVisible: !headerOnly && (!privacyMode || descriptionExpanded) diff --git a/quickshell/Modules/Settings/AboutTab.qml b/quickshell/Modules/Settings/AboutTab.qml index cac939f9e..ef618eecb 100644 --- a/quickshell/Modules/Settings/AboutTab.qml +++ b/quickshell/Modules/Settings/AboutTab.qml @@ -15,7 +15,7 @@ Item { LayoutMirroring.childrenInherit: true readonly property string assetsDir: "file://" + Theme.shellDir + "/assets/" - readonly property string githubUrl: "https://github.com/AvengeMedia/DankMaterialShell" + readonly property string githubUrl: "https://github.com/duxlabs-dev/dux-shell" readonly property string kofiUrl: "https://ko-fi.com/danklinux" readonly property string discordUrl: "https://discord.gg/ppWTpKmPgT" @@ -184,7 +184,7 @@ Item { } SettingsLinkRow { - title: I18n.tr("niri/dms Discord") + title: "niri/dux Discord" subtitle: root.host(root.discordUrl) url: root.discordUrl leading: LogoImage { diff --git a/quickshell/Modules/Settings/AutoStartTab.qml b/quickshell/Modules/Settings/AutoStartTab.qml index 7a081b9a9..ba8483251 100644 --- a/quickshell/Modules/Settings/AutoStartTab.qml +++ b/quickshell/Modules/Settings/AutoStartTab.qml @@ -388,7 +388,7 @@ Item { iconName: "menu_book" title: I18n.tr("Docs") subtitle: Site.domain - url: Site.docs + "/dankmaterialshell/autostart#target-not-active" + url: Site.docs + "/dms/autostart#target-not-active" } SettingsCard { diff --git a/quickshell/Modules/Settings/ChangelogTab.qml b/quickshell/Modules/Settings/ChangelogTab.qml index 9e0e57d3a..976b4a1ef 100644 --- a/quickshell/Modules/Settings/ChangelogTab.qml +++ b/quickshell/Modules/Settings/ChangelogTab.qml @@ -48,7 +48,7 @@ Item { iconName: "open_in_new" backgroundColor: SettingsMetrics.controlSurface textColor: Theme.surfaceText - onClicked: Qt.openUrlExternally("https://github.com/AvengeMedia/DankMaterialShell/releases") + onClicked: Qt.openUrlExternally("https://github.com/duxlabs-dev/dux-shell/releases") } } diff --git a/quickshell/Modules/Settings/GreeterTab.qml b/quickshell/Modules/Settings/GreeterTab.qml index 27d6a0a91..34d4bacbc 100644 --- a/quickshell/Modules/Settings/GreeterTab.qml +++ b/quickshell/Modules/Settings/GreeterTab.qml @@ -490,7 +490,7 @@ Item { SettingsRow { body: StyledText { - text: I18n.tr("Installation and PAM setup are documented in the ") + "DankGreeter docs. " + text: I18n.tr("Installation and PAM setup are documented in the ") + "Dux Greeter docs. " textFormat: Text.RichText font.pixelSize: Theme.fontSizeSmall color: Theme.surfaceVariantText diff --git a/quickshell/Modules/Settings/PluginBrowser.qml b/quickshell/Modules/Settings/PluginBrowser.qml index 98df82ac1..daeccbfc1 100644 --- a/quickshell/Modules/Settings/PluginBrowser.qml +++ b/quickshell/Modules/Settings/PluginBrowser.qml @@ -739,7 +739,7 @@ RegistryBrowserWindow { } thirdPartyConfirm.showWithOptions({ title: I18n.tr("Third-Party Plugin Warning"), - message: I18n.tr("Third-party plugins are created by the community and are not officially supported by %1.\n\nThese plugins may pose security and privacy risks - install at your own risk.", "third-party plugin warning, %1 is the product name").arg("DankMaterialShell"), + message: I18n.tr("Third-party plugins are created by the community and are not officially supported by %1.\n\nThese plugins may pose security and privacy risks - install at your own risk.", "third-party plugin warning, %1 is the product name").arg("Dux Shell"), confirmText: I18n.tr("I Understand"), cancelText: I18n.tr("Cancel"), onConfirm: () => { diff --git a/quickshell/Modules/Settings/PluginsHubHeader.qml b/quickshell/Modules/Settings/PluginsHubHeader.qml index 27da9deef..c526209dd 100644 --- a/quickshell/Modules/Settings/PluginsHubHeader.qml +++ b/quickshell/Modules/Settings/PluginsHubHeader.qml @@ -493,7 +493,7 @@ Column { } StyledText { Layout.fillWidth: true - text: I18n.tr("Extend %1 with powerful plugins for widgets, launchers, and more", "plugins hub description, %1 is the product name").arg("DankMaterialShell") + text: I18n.tr("Extend %1 with powerful plugins for widgets, launchers, and more", "plugins hub description, %1 is the product name").arg("Dux Shell") color: storeCard.mutedColor wrapMode: Text.Wrap } diff --git a/quickshell/Modules/Settings/SoftwareUpdatesTab.qml b/quickshell/Modules/Settings/SoftwareUpdatesTab.qml index dddfd65b7..0e4cbdfa7 100644 --- a/quickshell/Modules/Settings/SoftwareUpdatesTab.qml +++ b/quickshell/Modules/Settings/SoftwareUpdatesTab.qml @@ -294,7 +294,7 @@ Item { SettingsCard { width: parent.width - title: "DankMaterialShell" + title: "Dux Shell" iconName: "deployed_code" settingKey: "softwareUpdatesShell" tags: ["dms", "shell", "version", "channel", "restart"] @@ -380,7 +380,7 @@ Item { iconColor: Theme.primary backgroundColor: SettingsMetrics.controlSurface tooltipText: I18n.tr("View on GitHub", "link to the release on GitHub") - onClicked: Qt.openUrlExternally("https://github.com/AvengeMedia/DankMaterialShell/commits/master") + onClicked: Qt.openUrlExternally("https://github.com/duxlabs-dev/dux-shell/commits/master") } } diff --git a/quickshell/Modules/Settings/ThemeAppsTab.qml b/quickshell/Modules/Settings/ThemeAppsTab.qml index 3c38ed29d..779be7c4e 100644 --- a/quickshell/Modules/Settings/ThemeAppsTab.qml +++ b/quickshell/Modules/Settings/ThemeAppsTab.qml @@ -87,7 +87,7 @@ Item { SettingsRow { body: StyledText { - text: I18n.tr('Generate baseline GTK3/4, QT5/QT6, or qtengine configurations to follow DMS colors (only qt6ct requires qt6ct-kde). Only needed once.

It is recommended to configure %1 prior to applying GTK themes.', 'app theming help text, %1 is a link to adw-gtk3').arg(`adw-gtk3`) + text: I18n.tr('Generate baseline GTK3/4, QT5/QT6, or qtengine configurations to follow DMS colors (only qt6ct requires qt6ct-kde). Only needed once.

It is recommended to configure %1 prior to applying GTK themes.', 'app theming help text, %1 is a link to adw-gtk3').arg(`adw-gtk3`) textFormat: Text.RichText linkColor: Theme.primary onLinkActivated: url => Qt.openUrlExternally(url) @@ -413,7 +413,7 @@ Item { tags: ["matugen", "neovim", "terminal", "template"] settingKey: "matugenTemplateNeovim" text: "neovim" - description: root.getTemplateDescription("nvim", I18n.tr("Required plugin: ") + "https://github.com/AvengeMedia/base46") + description: root.getTemplateDescription("nvim", I18n.tr("Required plugin: ") + "https://github.com/duxlabs-dev/base46") descriptionColor: root.getTemplateDescriptionColor("nvim") checked: SettingsData.matugenTemplateNeovim onToggled: checked => SettingsData.set("matugenTemplateNeovim", checked) diff --git a/quickshell/Modules/Settings/ThemeBrowser.qml b/quickshell/Modules/Settings/ThemeBrowser.qml index c52ae3a3e..d4ba2ded7 100644 --- a/quickshell/Modules/Settings/ThemeBrowser.qml +++ b/quickshell/Modules/Settings/ThemeBrowser.qml @@ -111,7 +111,7 @@ RegistryBrowserWindow { } function themePreviewUrl(theme) { - const base = "https://raw.githubusercontent.com/AvengeMedia/dms-plugin-registry/main/themes/" + (theme.sourceDir || theme.id) + "/"; + const base = "https://raw.githubusercontent.com/duxlabs-dev/dux-plugin-registry/master/themes/" + (theme.sourceDir || theme.id) + "/"; const variants = theme.variants || null; if (!variants) return base + "preview.svg"; @@ -171,7 +171,7 @@ RegistryBrowserWindow { var theme = installedThemes[i]; if (theme.id === themeId) { var sourceDir = theme.sourceDir || theme.id; - var themePath = Quickshell.env("HOME") + "/.config/DankMaterialShell/themes/" + sourceDir + "/theme.json"; + var themePath = Quickshell.env("HOME") + "/.config/dms/themes/" + sourceDir + "/theme.json"; SettingsData.set("customThemeFile", themePath); Theme.switchThemeCategory("registry", "custom"); Theme.switchTheme("custom", true, true); diff --git a/quickshell/Modules/Settings/ThemeColorsTab.qml b/quickshell/Modules/Settings/ThemeColorsTab.qml index ae2b71a07..dc866fc58 100644 --- a/quickshell/Modules/Settings/ThemeColorsTab.qml +++ b/quickshell/Modules/Settings/ThemeColorsTab.qml @@ -40,7 +40,7 @@ Item { } function registryThemeDir(theme) { - return Quickshell.env("HOME") + "/.config/DankMaterialShell/themes/" + (theme.sourceDir || theme.id); + return Quickshell.env("HOME") + "/.config/dms/themes/" + (theme.sourceDir || theme.id); } Component.onCompleted: { if (DMSService.dmsAvailable) diff --git a/quickshell/Modules/Settings/TimeWeatherTab.qml b/quickshell/Modules/Settings/TimeWeatherTab.qml index f24a5d69c..3d5377433 100644 --- a/quickshell/Modules/Settings/TimeWeatherTab.qml +++ b/quickshell/Modules/Settings/TimeWeatherTab.qml @@ -384,7 +384,7 @@ Item { settingKey: "calendarBackend" text: I18n.tr("Calendar backend") readonly property var _backendValues: ["auto", "khal", "dankcal"] - readonly property var _backendLabels: [I18n.tr("Auto", "calendar backend option"), I18n.tr("khal", "calendar backend option"), I18n.tr("DankCalendar", "calendar backend option")] + readonly property var _backendLabels: [I18n.tr("Auto", "calendar backend option"), I18n.tr("khal", "calendar backend option"), I18n.tr("Dux Calendar", "calendar backend option")] options: _backendLabels currentValue: _backendLabels[Math.max(0, _backendValues.indexOf(SettingsData.calendarBackend))] onValueChanged: value => { diff --git a/quickshell/Modules/SurfaceWidgets/ApplicationModel.js b/quickshell/Modules/SurfaceWidgets/ApplicationModel.js index b4ac88cac..5360f57ae 100644 --- a/quickshell/Modules/SurfaceWidgets/ApplicationModel.js +++ b/quickshell/Modules/SurfaceWidgets/ApplicationModel.js @@ -1,7 +1,7 @@ .pragma library function windowIdentity(toplevel, appId, coreApps) { - const core = ["org.quickshell", "com.danklinux.dms"].includes(toplevel.appId) + const core = ["org.quickshell", "dev.duxlabs.shell", "com.danklinux.dms"].includes(toplevel.appId) ? coreApps.find(app => app.name === toplevel.title) ?? null : null; return { appId: core?.builtInPluginId ?? appId, coreAppData: core, isCoreApp: core !== null }; } diff --git a/quickshell/Modules/SurfaceWidgets/ApplicationStrip.qml b/quickshell/Modules/SurfaceWidgets/ApplicationStrip.qml index 48662a438..d1ceb6e5f 100644 --- a/quickshell/Modules/SurfaceWidgets/ApplicationStrip.qml +++ b/quickshell/Modules/SurfaceWidgets/ApplicationStrip.qml @@ -433,7 +433,7 @@ Item { onDockScreenChanged: modelUpdate.schedule() readonly property var visibleWindows: options.currentWorkspace && dockScreen ? CompositorService.filterCurrentWorkspace(CompositorService.sortedToplevels, dockScreen.name) : CompositorService.sortedToplevels onVisibleWindowsChanged: modelUpdate.schedule() - readonly property string windowMetadata: JSON.stringify(visibleWindows.map(toplevel => [toplevel.appId, ["org.quickshell", "com.danklinux.dms"].includes(toplevel.appId) ? toplevel.title : "", options.isolateDisplays ? (toplevel.screens || []).map(screen => screen.name) : null])) + readonly property string windowMetadata: JSON.stringify(visibleWindows.map(toplevel => [toplevel.appId, ["org.quickshell", "dev.duxlabs.shell", "com.danklinux.dms"].includes(toplevel.appId) ? toplevel.title : "", options.isolateDisplays ? (toplevel.screens || []).map(screen => screen.name) : null])) onWindowMetadataChanged: modelUpdate.schedule() readonly property var searchCoreApps: AppSearchService.coreApps diff --git a/quickshell/PLUGINS/ControlCenterDetailExample/plugin.json b/quickshell/PLUGINS/ControlCenterDetailExample/plugin.json index 00fc9f961..e535d6025 100644 --- a/quickshell/PLUGINS/ControlCenterDetailExample/plugin.json +++ b/quickshell/PLUGINS/ControlCenterDetailExample/plugin.json @@ -3,7 +3,7 @@ "name": "CC Detail Example", "description": "Example plugin with Control Center detail dropdown", "version": "1.0.0", - "author": "DankMaterialShell", + "author": "Dux Shell", "type": "widget", "capabilities": ["control-center"], "component": "./DetailExampleWidget.qml", diff --git a/quickshell/PLUGINS/ControlCenterExample/plugin.json b/quickshell/PLUGINS/ControlCenterExample/plugin.json index f573ae68c..eed072885 100644 --- a/quickshell/PLUGINS/ControlCenterExample/plugin.json +++ b/quickshell/PLUGINS/ControlCenterExample/plugin.json @@ -3,7 +3,7 @@ "name": "CC Toggle Example", "description": "Example plugin with Control Center toggle widget", "version": "1.0.0", - "author": "DankMaterialShell", + "author": "Dux Shell", "type": "widget", "capabilities": ["control-center"], "component": "./ControlCenterExampleWidget.qml", diff --git a/quickshell/PLUGINS/DashCardExample/plugin.json b/quickshell/PLUGINS/DashCardExample/plugin.json index 2b56cfa50..215f69e70 100644 --- a/quickshell/PLUGINS/DashCardExample/plugin.json +++ b/quickshell/PLUGINS/DashCardExample/plugin.json @@ -3,7 +3,7 @@ "name": "Progress Example", "description": "A standalone overview card showing how much of the day, week, month or year has passed", "version": "1.0.0", - "author": "DankMaterialShell", + "author": "Dux Shell", "type": "dashCard", "capabilities": ["dash-card"], "component": "./ProgressCard.qml", diff --git a/quickshell/PLUGINS/DashCounterExample/plugin.json b/quickshell/PLUGINS/DashCounterExample/plugin.json index 3e1d2990d..c728f6fbe 100644 --- a/quickshell/PLUGINS/DashCounterExample/plugin.json +++ b/quickshell/PLUGINS/DashCounterExample/plugin.json @@ -3,7 +3,7 @@ "name": "Counter Example", "description": "One counter shared by a dash tab, an overview card and a bar or dock widget", "version": "1.0.0", - "author": "DankMaterialShell", + "author": "Dux Shell", "type": "composite", "capabilities": ["dash-tab", "dash-card", "dankbar-widget"], "icon": "counter_1", diff --git a/quickshell/PLUGINS/DashTabExample/plugin.json b/quickshell/PLUGINS/DashTabExample/plugin.json index 8f2fe7cd7..6da9ccf25 100644 --- a/quickshell/PLUGINS/DashTabExample/plugin.json +++ b/quickshell/PLUGINS/DashTabExample/plugin.json @@ -3,7 +3,7 @@ "name": "Stopwatch Example", "description": "A standalone dash tab: a stopwatch with laps that keeps time while the dash is closed", "version": "1.0.0", - "author": "DankMaterialShell", + "author": "Dux Shell", "type": "dash", "capabilities": ["dash-tab"], "component": "./StopwatchTab.qml", diff --git a/quickshell/PLUGINS/ExampleCompositePlugin/README.md b/quickshell/PLUGINS/ExampleCompositePlugin/README.md index fc34906a4..27636b377 100644 --- a/quickshell/PLUGINS/ExampleCompositePlugin/README.md +++ b/quickshell/PLUGINS/ExampleCompositePlugin/README.md @@ -35,7 +35,7 @@ namespace (`exampleComposite`), so `pluginData` is the same for every surface. ## Usage -1. Copy this directory into `$CONFIGPATH/DankMaterialShell/plugins/`. +1. Copy this directory into `$CONFIGPATH/dms/plugins/`. 2. Settings → Plugins → **Scan for Plugins**, then enable **Composite Example**. (Composite plugins respect the enable toggle — unlike a pure `desktop` plugin they do not auto-load, because they also carry a daemon.) diff --git a/quickshell/PLUGINS/ExampleCompositePlugin/plugin.json b/quickshell/PLUGINS/ExampleCompositePlugin/plugin.json index cbba695b8..2ee26b5e7 100644 --- a/quickshell/PLUGINS/ExampleCompositePlugin/plugin.json +++ b/quickshell/PLUGINS/ExampleCompositePlugin/plugin.json @@ -3,7 +3,7 @@ "name": "Composite Example", "description": "One plugin providing all three surfaces at once: a wallpaper-watcher daemon, an emoji bar widget with popout, and a desktop clock", "version": "1.0.0", - "author": "DankMaterialShell", + "author": "Dux Shell", "type": "composite", "capabilities": ["daemon", "dankbar-widget", "desktop-widget", "clipboard"], "icon": "extension", diff --git a/quickshell/PLUGINS/ExampleDesktopClock/plugin.json b/quickshell/PLUGINS/ExampleDesktopClock/plugin.json index efa80c879..8b8355f2f 100644 --- a/quickshell/PLUGINS/ExampleDesktopClock/plugin.json +++ b/quickshell/PLUGINS/ExampleDesktopClock/plugin.json @@ -3,7 +3,7 @@ "name": "Desktop Clock", "description": "An example desktop widget displaying an analog clock", "version": "1.0.0", - "author": "DankMaterialShell", + "author": "Dux Shell", "type": "desktop", "capabilities": ["desktop-widget", "clock"], "component": "./DesktopClock.qml", diff --git a/quickshell/PLUGINS/ExampleEmojiPlugin/README.md b/quickshell/PLUGINS/ExampleEmojiPlugin/README.md index 3e0b9743d..a5364126e 100644 --- a/quickshell/PLUGINS/ExampleEmojiPlugin/README.md +++ b/quickshell/PLUGINS/ExampleEmojiPlugin/README.md @@ -11,7 +11,7 @@ An example dms plugin that displays cycling emojis in your bar with an emoji pic ## Installation -1. Copy this directory to `~/.config/DankMaterialShell/plugins/ExampleEmojiPlugin` +1. Copy this directory to `~/.config/dms/plugins/ExampleEmojiPlugin` 2. Open DMS Settings → Plugins 3. Click "Scan for Plugins" 4. Enable "Emoji Cycler" diff --git a/quickshell/PLUGINS/ExampleEmojiPlugin/plugin.json b/quickshell/PLUGINS/ExampleEmojiPlugin/plugin.json index ef16d01fc..786e3006b 100644 --- a/quickshell/PLUGINS/ExampleEmojiPlugin/plugin.json +++ b/quickshell/PLUGINS/ExampleEmojiPlugin/plugin.json @@ -3,7 +3,7 @@ "name": "Emoji Cycler", "description": "Display cycling emojis in your bar with a handy emoji picker popout", "version": "1.0.0", - "author": "AvengeMedia", + "author": "Dux Labs", "type": "widget", "capabilities": ["emoji-search", "clipboard", "dankbar-widget"], "component": "./EmojiWidget.qml", diff --git a/quickshell/PLUGINS/ExampleStartupCheck/plugin.json b/quickshell/PLUGINS/ExampleStartupCheck/plugin.json index 07d82c428..989fa8f98 100644 --- a/quickshell/PLUGINS/ExampleStartupCheck/plugin.json +++ b/quickshell/PLUGINS/ExampleStartupCheck/plugin.json @@ -3,7 +3,7 @@ "name": "Startup Check Example", "description": "Demonstrates startupCheck - blocks activation when the 'boregard' dependency is missing", "version": "1.0.0", - "author": "AvengeMedia", + "author": "Dux Labs", "type": "widget", "capabilities": ["dankbar-widget"], "component": "./StartupCheckWidget.qml", diff --git a/quickshell/PLUGINS/ExampleWithVariants/README.md b/quickshell/PLUGINS/ExampleWithVariants/README.md index 833572e19..9210dc0e4 100644 --- a/quickshell/PLUGINS/ExampleWithVariants/README.md +++ b/quickshell/PLUGINS/ExampleWithVariants/README.md @@ -1,6 +1,6 @@ # Example with Variants Plugin -This plugin demonstrates the dynamic variant system for DankMaterialShell plugins. +This plugin demonstrates the dynamic variant system for Dux Shell plugins. ## What are Variants? diff --git a/quickshell/PLUGINS/LauncherExample/README.md b/quickshell/PLUGINS/LauncherExample/README.md index db34b8326..3c90fe16a 100644 --- a/quickshell/PLUGINS/LauncherExample/README.md +++ b/quickshell/PLUGINS/LauncherExample/README.md @@ -42,7 +42,7 @@ PLUGINS/LauncherExample/ ## Installation -1. **Plugin Directory**: Copy to `~/.config/DankMaterialShell/plugins/LauncherExample` +1. **Plugin Directory**: Copy to `~/.config/dms/plugins/LauncherExample` 2. **Enable Plugin**: Settings → Plugins → Enable "LauncherExample" 3. **Configure**: Set custom trigger in plugin settings if desired diff --git a/quickshell/PLUGINS/LauncherImageExample/LauncherImageExample.qml b/quickshell/PLUGINS/LauncherImageExample/LauncherImageExample.qml index 9a3ab4f41..d7f8a1783 100644 --- a/quickshell/PLUGINS/LauncherImageExample/LauncherImageExample.qml +++ b/quickshell/PLUGINS/LauncherImageExample/LauncherImageExample.qml @@ -15,7 +15,7 @@ QtObject { { name: "DankDash", imageUrl: Site.web + "/img/dankdash.png", - comment: "DankMaterialShell Dashboard" + comment: "Dux Shell Dashboard" }, { name: "Control Center", diff --git a/quickshell/PLUGINS/LauncherImageExample/README.md b/quickshell/PLUGINS/LauncherImageExample/README.md index 13b608db0..05f0402d9 100644 --- a/quickshell/PLUGINS/LauncherImageExample/README.md +++ b/quickshell/PLUGINS/LauncherImageExample/README.md @@ -12,7 +12,7 @@ Example launcher plugin demonstrating tile mode with URL-based images. 1. Open the launcher (DankLauncherV2) 2. Type `img` to activate the plugin -3. Browse DankMaterialShell screenshots in tile view +3. Browse Dux Shell screenshots in tile view ## Plugin Configuration diff --git a/quickshell/PLUGINS/POPOUT_SERVICE.md b/quickshell/PLUGINS/POPOUT_SERVICE.md index 5fdac1eb2..a7d617309 100644 --- a/quickshell/PLUGINS/POPOUT_SERVICE.md +++ b/quickshell/PLUGINS/POPOUT_SERVICE.md @@ -2,7 +2,7 @@ ## Overview -The `PopoutService` singleton provides plugins with access to all DankMaterialShell popouts and modals. It's automatically injected into plugin widgets and daemons, enabling them to control shell UI elements. +The `PopoutService` singleton provides plugins with access to all Dux Shell popouts and modals. It's automatically injected into plugin widgets and daemons, enabling them to control shell UI elements. ## Automatic Injection diff --git a/quickshell/PLUGINS/PopoutControlExample/README.md b/quickshell/PLUGINS/PopoutControlExample/README.md index d1fb54ae7..ddbacb0c2 100644 --- a/quickshell/PLUGINS/PopoutControlExample/README.md +++ b/quickshell/PLUGINS/PopoutControlExample/README.md @@ -194,7 +194,7 @@ Error: Cannot assign to non-existent property "popoutService" ## Installation -1. Copy the plugin directory to `~/.config/DankMaterialShell/plugins/` +1. Copy the plugin directory to `~/.config/dms/plugins/` 2. Open Settings → Plugins 3. Click "Scan for Plugins" 4. Enable "Popout Control Example" diff --git a/quickshell/PLUGINS/PopoutControlExample/plugin.json b/quickshell/PLUGINS/PopoutControlExample/plugin.json index 02042a054..0e7989d3a 100644 --- a/quickshell/PLUGINS/PopoutControlExample/plugin.json +++ b/quickshell/PLUGINS/PopoutControlExample/plugin.json @@ -3,7 +3,7 @@ "name": "Popout Control Example", "description": "Example widget demonstrating PopoutService usage with pillClickAction", "version": "1.0.0", - "author": "DankMaterialShell", + "author": "Dux Shell", "type": "widget", "capabilities": ["dankbar-widget"], "component": "./PopoutControlWidget.qml", diff --git a/quickshell/PLUGINS/QuickNotesExample/plugin.json b/quickshell/PLUGINS/QuickNotesExample/plugin.json index fcf345895..9c7e1a701 100644 --- a/quickshell/PLUGINS/QuickNotesExample/plugin.json +++ b/quickshell/PLUGINS/QuickNotesExample/plugin.json @@ -3,7 +3,7 @@ "name": "Quick Notes", "description": "Example launcher plugin demonstrating the plugin state API for persistent data like history and notes", "version": "1.0.0", - "author": "DankMaterialShell", + "author": "Dux Shell", "icon": "sticky_note_2", "type": "launcher", "capabilities": ["clipboard"], diff --git a/quickshell/PLUGINS/README.md b/quickshell/PLUGINS/README.md index 510ba2797..51b0d095c 100644 --- a/quickshell/PLUGINS/README.md +++ b/quickshell/PLUGINS/README.md @@ -4,11 +4,11 @@ Extend DMS with dynamically loaded QML components: bar and dock widgets, Control ## Plugin Registry -Browse and discover community plugins at **https://plugins.danklinux.com/** +Browse and discover community plugins at **https://plugins.duxlabs.dev/** ## Overview -Plugins are discovered from `~/.config/DankMaterialShell/plugins/` and managed by PluginService. One plugin can provide a single surface or several (see [Composite Plugins](#composite-plugins)). +Plugins are discovered from `~/.config/dms/plugins/` and managed by PluginService. One plugin can provide a single surface or several (see [Composite Plugins](#composite-plugins)). ## Architecture @@ -16,7 +16,7 @@ Plugins are discovered from `~/.config/DankMaterialShell/plugins/` and managed b 1. **PluginService** (`Services/PluginService.qml`) - Singleton service managing plugin lifecycle - - Discovers plugins from `$CONFIGPATH/DankMaterialShell/plugins/` + - Discovers plugins from `$CONFIGPATH/dms/plugins/` - Handles loading, unloading, and state management - Provides data persistence for plugin settings @@ -35,14 +35,14 @@ Plugins are discovered from `~/.config/DankMaterialShell/plugins/` and managed b - Lists built-in and plugin tabs and overview cards - Hosts plugin tabs in `DashTabHost.qml` and cards in `Overview/DashCardSlot.qml` -Many widgets are implemented in the shared [dank-qml-common](https://github.com/AvengeMedia/dank-qml-common) library and re-exported by DMS. Plugins should keep importing `qs.Common`, `qs.Services`, `qs.Widgets`, and `qs.Modules.Plugins` — these remain the supported plugin API and are unaffected by where a widget is implemented. +Many widgets are implemented in the shared [dank-qml-common](https://github.com/duxlabs-dev/dux-qml-common) library and re-exported by DMS. Plugins should keep importing `qs.Common`, `qs.Services`, `qs.Widgets`, and `qs.Modules.Plugins` — these remain the supported plugin API and are unaffected by where a widget is implemented. ## Plugin Structure -Each plugin must be a directory in `$CONFIGPATH/DankMaterialShell/plugins/` containing: +Each plugin must be a directory in `$CONFIGPATH/dms/plugins/` containing: ``` -$CONFIGPATH/DankMaterialShell/plugins/YourPlugin/ +$CONFIGPATH/dms/plugins/YourPlugin/ ├── plugin.json # Required: Plugin manifest ├── YourWidget.qml # Required: Widget component ├── YourSettings.qml # Optional: Settings UI @@ -245,7 +245,7 @@ shrinks below the minimum size. Keep persistent state in the plugin instance. ```qml ccExpandedContent: Component { CcTileContent { - DankButton { + DButton { maximumWidth: parent.width text: I18n.trFor("myPlugin", "Run") onClicked: root.runAction() @@ -292,6 +292,7 @@ PopoutComponent provides a consistent header/content layout for plugin popouts: ```qml import qs.Modules.Plugins +import qs.DCommon.Widgets PopoutComponent { headerText: "Header Title" // Main header text (bold, large) @@ -303,7 +304,7 @@ PopoutComponent { // Your content here - use parent.width for full width // Calculate available height: root.popoutHeight - headerHeight - detailsHeight - spacing - DankGridView { + DGridView { width: parent.width height: parent.height // ... @@ -633,7 +634,7 @@ File names match what DMS ships in its own catalog (`es.json`, `pt.json`, `zh_CN ### Central Translation via POEditor -Plugins in the [plugin registry](https://github.com/AvengeMedia/dms-plugin-registry) can apply to join the DankPlugins POEditor project, translated by the same community that translates DMS itself. Approved plugins get every `I18n.trFor()` string uploaded under a `:` context, so your "Auto" and another plugin's "Auto" are separate terms with separate translations. Finished translations come back to the plugin repo as PRs to `translations/`, in the file format above. See the registry's CONTRIBUTING guide for the application process. +Plugins in the [plugin registry](https://github.com/duxlabs-dev/dux-plugin-registry) can apply to join the DankPlugins POEditor project, translated by the same community that translates DMS itself. Approved plugins get every `I18n.trFor()` string uploaded under a `:` context, so your "Auto" and another plugin's "Auto" are separate terms with separate translations. Finished translations come back to the plugin repo as PRs to `translations/`, in the file format above. See the registry's CONTRIBUTING guide for the application process. Strings you wrap in plain `I18n.tr()` are not uploaded. They resolve from the shell catalog only, which is the right choice for terms DMS already has ("Cancel", "Settings"). A term DMS does not have stays English, and the sync warns about it. @@ -643,7 +644,7 @@ Strings you wrap in plain `I18n.tr()` are not uploaded. They resolve from the sh ```qml PluginService.pluginDirectory: string -// Path to plugins directory ($CONFIGPATH/DankMaterialShell/plugins) +// Path to plugins directory ($CONFIGPATH/dms/plugins) PluginService.availablePlugins: object // Map of all discovered plugins {pluginId: pluginInfo} @@ -716,7 +717,7 @@ QtObject { } done({ title: I18n.tr("boregard is required"), - details: I18n.tr("Install it from https://danklinux.com, then re-enable this plugin.") + details: I18n.tr("Install it from https://duxlabs.dev, then re-enable this plugin.") }) }) } @@ -845,8 +846,8 @@ PluginComponent { ### Step 1: Create Plugin Directory ```bash -mkdir -p $CONFIGPATH/DankMaterialShell/plugins/MyPlugin -cd $CONFIGPATH/DankMaterialShell/plugins/MyPlugin +mkdir -p $CONFIGPATH/dms/plugins/MyPlugin +cd $CONFIGPATH/dms/plugins/MyPlugin ``` ### Step 2: Create Manifest @@ -988,7 +989,7 @@ Or edit `$CONFIGPATH/quickshell/dms/config.json`: ## Best Practices -1. **Use Existing Widgets**: Leverage `qs.Widgets` components (DankIcon, DankToggle, etc.) for consistency +1. **Use Existing Widgets**: Leverage `qs.DCommon.Widgets` components (DIcon, DToggle, etc.) for consistency 2. **Follow Theme**: Use `Theme` singleton for colors, spacing, and fonts 3. **Data Persistence**: Use PluginService data APIs instead of manual file operations 4. **Error Handling**: Gracefully handle missing dependencies and invalid data @@ -1177,9 +1178,10 @@ Item { import QtQuick import qs.Common import qs.Widgets +import qs.DCommon.Widgets Item { - DankTextField { + DTextField { id: searchField placeholderText: "Search files..." @@ -1240,7 +1242,7 @@ Look for lines prefixed with: 1. **Plugin Not Detected** - Check plugin.json syntax (use `jq` or JSON validator) - - Verify directory is in `$CONFIGPATH/DankMaterialShell/plugins/` + - Verify directory is in `$CONFIGPATH/dms/plugins/` - Click "Scan for Plugins" in Settings 2. **Widget Not Displaying** @@ -1256,7 +1258,7 @@ Look for lines prefixed with: 4. **Data Not Persisting** - Confirm pluginService.savePluginData() calls (with injection) - - Check `$CONFIGPATH/DankMaterialShell/settings.json` for pluginSettings data + - Check `$CONFIGPATH/dms/settings.json` for pluginSettings data - Verify plugin has settings permissions - Ensure PluginService was properly injected into settings component @@ -1452,6 +1454,7 @@ Provide a settings component with trigger configuration: import QtQuick import QtQuick.Controls import qs.Widgets +import qs.DCommon.Widgets FocusScope { id: root @@ -1476,7 +1479,7 @@ FocusScope { } } - DankTextField { + DTextField { id: triggerField visible: !noTriggerToggle.checked text: loadSettings("trigger", "#") diff --git a/quickshell/PLUGINS/THEME_REFERENCE.md b/quickshell/PLUGINS/THEME_REFERENCE.md index 922f5960d..28c8af140 100644 --- a/quickshell/PLUGINS/THEME_REFERENCE.md +++ b/quickshell/PLUGINS/THEME_REFERENCE.md @@ -92,7 +92,7 @@ Theme.foregroundColor(Theme.cardSurface, Theme.isFloatingWindow(root)) ### Icon with Text ```qml -DankIcon { +DIcon { name: "icon_name" color: Theme.onSurface font.pixelSize: Theme.iconSize diff --git a/quickshell/PLUGINS/WallpaperWatcherDaemon/plugin.json b/quickshell/PLUGINS/WallpaperWatcherDaemon/plugin.json index 6e0839561..cb482f96d 100644 --- a/quickshell/PLUGINS/WallpaperWatcherDaemon/plugin.json +++ b/quickshell/PLUGINS/WallpaperWatcherDaemon/plugin.json @@ -3,7 +3,7 @@ "name": "Wallpaper Watcher Daemon", "description": "Background daemon that monitors wallpaper changes and logs them", "version": "1.0.0", - "author": "DankMaterialShell", + "author": "Dux Shell", "type": "daemon", "capabilities": ["wallpaper", "monitoring"], "component": "./WallpaperWatcherDaemon.qml", diff --git a/quickshell/PLUGINS/plugin-schema.json b/quickshell/PLUGINS/plugin-schema.json index 4625c0bd6..146e5d9a9 100644 --- a/quickshell/PLUGINS/plugin-schema.json +++ b/quickshell/PLUGINS/plugin-schema.json @@ -1,8 +1,8 @@ { "$schema": "http://json-schema.org/draft-07/schema#", - "$id": "https://danklinux.com/schemas/plugin.json", - "title": "DankMaterialShell Plugin Manifest", - "description": "Schema for DankMaterialShell plugin.json manifest files", + "$id": "https://duxlabs.dev/schemas/plugin.json", + "title": "Dux Shell Plugin Manifest", + "description": "Schema for Dux Shell plugin.json manifest files", "type": "object", "required": [ "id", diff --git a/quickshell/README.md b/quickshell/README.md index 288ec737a..4f8f100bf 100644 --- a/quickshell/README.md +++ b/quickshell/README.md @@ -1,6 +1,6 @@ # DMS Quickshell Interface -QML-based desktop shell interface for DankMaterialShell providing panels, widgets, and overlays. +QML-based desktop shell interface for Dux Shell providing panels, widgets, and overlays. **See [root README](../README.md) for project overview and installation.** @@ -82,15 +82,15 @@ Singletons providing system integration: ## Widgets -Reusable Material Design 3 components in `Widgets/`: +Reusable Material Design 3 components from the shared library (`qs.DCommon.Widgets`): -- `DankIcon` - Icon component with Material font -- `DankSlider` - Enhanced slider with animations -- `DankToggle` - Toggle switch component -- `DankTabBar` - Tab bar implementation -- `DankGridView` - Grid layout with adaptive columns -- `DankListView` - Scrollable list view -- `DankTextField` - Text input with validation +- `DIcon` - Icon component with Material font +- `DSlider` - Enhanced slider with animations +- `DToggle` - Toggle switch component +- `DTabBar` - Tab bar implementation +- `DGridView` - Grid layout with adaptive columns +- `DListView` - Scrollable list view +- `DTextField` - Text input with validation - `DDropdown` - Dropdown selection - `DPopout` - Base for overlay components - `StateLayer` - Material interaction states @@ -140,7 +140,7 @@ Workspace switchers adapt to compositor (Niri/Hyprland). ## Plugin System -External plugins in `~/.config/DankMaterialShell/plugins/`: +External plugins in `~/.config/dms/plugins/`: **Widget plugins** - UI components in DankBar **Daemon plugins** - Background processes without UI @@ -219,7 +219,7 @@ Singleton { **Guidelines:** - Use `Theme.propertyName` for consistent styling - Bind directly to service properties for reactivity -- Use `DankIcon` for all icons +- Use `DIcon` for all icons - Implement feature detection and graceful degradation - 4-space indentation, no unnecessary comments diff --git a/quickshell/Services/AqueousConfigService.qml b/quickshell/Services/AqueousConfigService.qml index e4ea816ae..3184cb6be 100644 --- a/quickshell/Services/AqueousConfigService.qml +++ b/quickshell/Services/AqueousConfigService.qml @@ -65,7 +65,7 @@ Singleton { const request = Object.assign({}, draft, { protocol: 1 }); - request.backup_dir = request.backup_dir || (Quickshell.env("XDG_CONFIG_HOME") || Quickshell.env("HOME") + "/.config") + "/DankMaterialShell/aqueous-backups"; + request.backup_dir = request.backup_dir || (Quickshell.env("XDG_CONFIG_HOME") || Quickshell.env("HOME") + "/.config") + "/dms/aqueous-backups"; const input = JSON.stringify(request); const required = ["validate", "stdin_requests", "generation_check", "atomic_file_replace", "shell_dms"]; for (const [key, capability] of Object.entries({ diff --git a/quickshell/Services/AudioService.qml b/quickshell/Services/AudioService.qml index c9b6a6772..1d938e2b5 100644 --- a/quickshell/Services/AudioService.qml +++ b/quickshell/Services/AudioService.qml @@ -740,7 +740,7 @@ EOFCONFIG } function generateWireplumberConfig() { - let config = "# Generated by DankMaterialShell - Audio Device Aliases\n"; + let config = "# Generated by Dux Shell - Audio Device Aliases\n"; config += "# Do not edit manually - changes will be overwritten\n"; config += "# Last updated: " + new Date().toISOString() + "\n\n"; @@ -1190,11 +1190,12 @@ EOFCONFIG if (!runtimeDir) return; - const loginFile = `${runtimeDir}/danklinux.login-${sessionId}`; + const loginFile = `${runtimeDir}/dms.login-${sessionId}`; + const legacyLoginFile = `${runtimeDir}/danklinux.login-${sessionId}`; // if file doesn't exist, touch it (0) // If it exists, do nothing (1) - loginSoundChecker.command = ["sh", "-c", `[ ! -f ${loginFile} ] && touch ${loginFile}`]; + loginSoundChecker.command = ["sh", "-c", `[ ! -f ${loginFile} ] && [ ! -f ${legacyLoginFile} ] && touch ${loginFile}`]; loginSoundChecker.running = true; } } diff --git a/quickshell/Services/CalendarDankBackend.qml b/quickshell/Services/CalendarDankBackend.qml index 29ec8d584..e68f5cd66 100644 --- a/quickshell/Services/CalendarDankBackend.qml +++ b/quickshell/Services/CalendarDankBackend.qml @@ -23,6 +23,7 @@ Item { property bool binaryChecked: false // "dcal" for a host install, "flatpak" for a sandboxed one, "" for neither. property string launchKind: "" + property string flatpakId: "" property var calendars: [] property var events: [] @@ -68,11 +69,13 @@ Item { Process { id: binaryCheck - command: ["sh", "-c", "if command -v dcal >/dev/null 2>&1; then echo dcal; elif command -v flatpak >/dev/null 2>&1 && flatpak info com.danklinux.dankcalendar >/dev/null 2>&1; then echo flatpak; fi"] + command: ["sh", "-c", "if command -v dcal >/dev/null 2>&1; then echo dcal; exit 0; fi; command -v flatpak >/dev/null 2>&1 || exit 0; for id in dev.duxlabs.calendar com.danklinux.dankcalendar; do if flatpak info \"$id\" >/dev/null 2>&1; then echo \"flatpak $id\"; exit 0; fi; done"] running: false stdout: StdioCollector { onStreamFinished: { - root.launchKind = text.trim(); + const parts = text.trim().split(" "); + root.launchKind = parts[0] || ""; + root.flatpakId = parts[1] || ""; root.binaryChecked = true; } } @@ -81,7 +84,7 @@ Item { Process { id: discoverProcess running: false - command: ["sh", "-c", "s=\"${DANKCAL_SOCKET:-}\"; if [ -S \"$s\" ]; then echo \"$s\"; exit 0; fi; for f in \"${XDG_RUNTIME_DIR:-/tmp}\"/app/com.danklinux.dankcalendar/dankcal-*.sock; do if [ -S \"$f\" ]; then echo \"$f\"; exit 0; fi; done; for f in \"${XDG_RUNTIME_DIR:-/tmp}\"/dankcal-*.sock /tmp/dankcal-*.sock; do [ -S \"$f\" ] || continue; p=$(basename \"$f\" .sock); p=${p#dankcal-}; if kill -0 \"$p\" 2>/dev/null; then echo \"$f\"; exit 0; fi; done"] + command: ["sh", "-c", "s=\"${DANKCAL_SOCKET:-}\"; if [ -S \"$s\" ]; then echo \"$s\"; exit 0; fi; for f in \"${XDG_RUNTIME_DIR:-/tmp}\"/app/dev.duxlabs.calendar/dankcal-*.sock \"${XDG_RUNTIME_DIR:-/tmp}\"/app/com.danklinux.dankcalendar/dankcal-*.sock; do if [ -S \"$f\" ]; then echo \"$f\"; exit 0; fi; done; for f in \"${XDG_RUNTIME_DIR:-/tmp}\"/dankcal-*.sock /tmp/dankcal-*.sock; do [ -S \"$f\" ] || continue; p=$(basename \"$f\" .sock); p=${p#dankcal-}; if kill -0 \"$p\" 2>/dev/null; then echo \"$f\"; exit 0; fi; done"] stdout: StdioCollector { onStreamFinished: { @@ -121,7 +124,7 @@ Item { Quickshell.execDetached(["dcal", "run", "-d", "--hidden"]); break; case "flatpak": - Quickshell.execDetached(["flatpak", "run", "com.danklinux.dankcalendar", "run", "-d", "--hidden"]); + Quickshell.execDetached(["flatpak", "run", flatpakId, "run", "-d", "--hidden"]); break; default: return; diff --git a/quickshell/Services/ChangelogService.qml b/quickshell/Services/ChangelogService.qml index 1a74d3232..c1784a39d 100644 --- a/quickshell/Services/ChangelogService.qml +++ b/quickshell/Services/ChangelogService.qml @@ -21,7 +21,7 @@ Singleton { } readonly property bool changelogEnabled: true // A dotfile in the config dir, not session.json: the Nix home module can make session.json read-only - readonly property string markerPath: currentVersion !== "" ? Paths.strip(StandardPaths.writableLocation(StandardPaths.ConfigLocation)) + "/DankMaterialShell/.changelog-" + currentVersion : "" + readonly property string markerPath: currentVersion !== "" ? Paths.strip(StandardPaths.writableLocation(StandardPaths.ConfigLocation)) + "/dms/.changelog-" + currentVersion : "" property bool markerChecked: false property bool markerSeen: false readonly property bool ready: !SessionData.isGreeterMode && FirstLaunchService.checkComplete && markerChecked diff --git a/quickshell/Services/CompositorService.qml b/quickshell/Services/CompositorService.qml index 67ebe68f7..ced030d92 100644 --- a/quickshell/Services/CompositorService.qml +++ b/quickshell/Services/CompositorService.qml @@ -1490,14 +1490,26 @@ Singleton { log.warn("failed to parse window rules", e); return; } - syncDmsWindowFloatingRule(rules); - if (ensureOpaque) - ensureDmsOpaqueRule(rules); + // Each rule write rewrites the whole rules file, so writes must not overlap. + syncDmsWindowFloatingRule(rules, () => { + if (ensureOpaque) + ensureDmsOpaqueRule(rules); + }); }); } - function syncDmsWindowFloatingRule(rules) { - dmsWindowFloatingActive = rules.some(rule => rule.id === dmsFloatingRuleId && rule.enabled !== false && rule.actions?.openFloating === true); + function dmsRuleMatchesCurrentAppId(rule) { + return (rule.matchCriteria?.appId || "").includes("duxlabs"); + } + + function syncDmsWindowFloatingRule(rules, onDone) { + const rule = rules.find(rule => rule.id === dmsFloatingRuleId && rule.enabled !== false && rule.actions?.openFloating === true); + dmsWindowFloatingActive = rule !== undefined; + if (!rule || dmsRuleMatchesCurrentAppId(rule)) { + onDone?.(); + return; + } + setDmsWindowFloatingRule(true, onDone); } function reloadAfterWindowRuleWrite() { @@ -1530,7 +1542,7 @@ Singleton { setDmsRule(dmsFloatingRuleId, enabled ? { "name": "DMS Floating Windows", "matchCriteria": { - "appId": "^com.danklinux.dms$" + "appId": "^(dev\\.duxlabs\\.shell|com\\.danklinux\\.dms)$" }, "actions": { "openFloating": true @@ -1542,7 +1554,7 @@ Singleton { } function ensureDmsOpaqueRule(rules) { - if (rules.some(rule => rule.id === dmsOpaqueRuleId)) + if (rules.some(rule => rule.id === dmsOpaqueRuleId && dmsRuleMatchesCurrentAppId(rule))) return; // DMS windows are translucent via client alpha; Hyprland's opaque keeps that alpha, force_rgbx would drop it. let actions; @@ -1559,7 +1571,7 @@ Singleton { setDmsRule(dmsOpaqueRuleId, { "name": "DMS Window Opaque", "matchCriteria": { - "appId": "^com\\.danklinux\\.dms$" + "appId": "^(dev\\.duxlabs\\.shell|com\\.danklinux\\.dms)$" }, "actions": actions }); diff --git a/quickshell/Services/FirstLaunchService.qml b/quickshell/Services/FirstLaunchService.qml index b93218f8a..8d310667d 100644 --- a/quickshell/Services/FirstLaunchService.qml +++ b/quickshell/Services/FirstLaunchService.qml @@ -12,7 +12,7 @@ Singleton { id: root readonly property var log: Log.scoped("FirstLaunchService") - readonly property string configDir: Paths.strip(StandardPaths.writableLocation(StandardPaths.ConfigLocation)) + "/DankMaterialShell" + readonly property string configDir: Paths.strip(StandardPaths.writableLocation(StandardPaths.ConfigLocation)) + "/dms" readonly property string settingsPath: configDir + "/settings.json" readonly property string firstLaunchMarkerPath: configDir + "/.firstlaunch" diff --git a/quickshell/Services/GreeterService.qml b/quickshell/Services/GreeterService.qml index 26d9d68f9..e4c30525b 100644 --- a/quickshell/Services/GreeterService.qml +++ b/quickshell/Services/GreeterService.qml @@ -97,7 +97,7 @@ Singleton { grep -qs dms-greeter /etc/greetd/config.toml && echo config [ "$(systemctl is-enabled greetd 2>/dev/null)" = enabled ] && echo enabled id -nG | tr ' ' '\n' | grep -qxE 'greeter|greetd|_greeter' && echo group -own=$(readlink -f "$HOME/.config/DankMaterialShell/settings.json") +own=$(readlink -f "$HOME/.config/dms/settings.json") for f in "/var/cache/dms-greeter/users/$USER/settings.json" /var/cache/dms-greeter/settings.json; do [ -L "$f" ] && [ "$(readlink -f "$f")" = "$own" ] && echo live && break done diff --git a/quickshell/Services/MprisController.qml b/quickshell/Services/MprisController.qml index f7f94812e..faa9148bc 100644 --- a/quickshell/Services/MprisController.qml +++ b/quickshell/Services/MprisController.qml @@ -496,7 +496,7 @@ Singleton { return { "lease": lease, "enabled": enabled, - "identity": "DankMaterialShell", + "identity": "Dux Shell", "playbackStatus": _mprisPlaybackStatus(player), "title": player ? stableTitle : "", "artist": player ? stableArtist : "", diff --git a/quickshell/Services/NiriService.qml b/quickshell/Services/NiriService.qml index 581350481..ff13a51fb 100644 --- a/quickshell/Services/NiriService.qml +++ b/quickshell/Services/NiriService.qml @@ -1283,7 +1283,7 @@ layer-rule {${excludeLines} } window-rule { - match app-id="^com.danklinux.dms$" + match app-id="^(dev.duxlabs.shell|com.danklinux.dms)$" background-effect { xray false } diff --git a/quickshell/Services/NotepadStorageService.qml b/quickshell/Services/NotepadStorageService.qml index e2aad48f5..acb2730e0 100644 --- a/quickshell/Services/NotepadStorageService.qml +++ b/quickshell/Services/NotepadStorageService.qml @@ -16,7 +16,7 @@ Singleton { readonly property int largeFileBytes: 5 * 1024 * 1024 property var approvedLargeFiles: ({}) - readonly property string baseDir: Paths.strip(StandardPaths.writableLocation(StandardPaths.GenericStateLocation) + "/DankMaterialShell") + readonly property string baseDir: Paths.strip(StandardPaths.writableLocation(StandardPaths.GenericStateLocation) + "/dms") readonly property string filesDir: baseDir + "/notepad-files" readonly property string metadataPath: baseDir + "/notepad-session.json" diff --git a/quickshell/Services/WeatherService.qml b/quickshell/Services/WeatherService.qml index 5f751ed0e..a3d26211e 100644 --- a/quickshell/Services/WeatherService.qml +++ b/quickshell/Services/WeatherService.qml @@ -604,7 +604,7 @@ Singleton { function tryNominatim(lat, lon, reqId) { const url = "https://nominatim.openstreetmap.org/reverse?lat=" + lat + "&lon=" + lon + "&format=json&addressdetails=1&accept-language=en"; - nominatimFetcher.command = lowPriorityCmd.concat(fetchCmd, ["--user-agent", "DankMaterialShell Weather Widget", url]); + nominatimFetcher.command = lowPriorityCmd.concat(fetchCmd, ["--user-agent", "Dux Shell Weather Widget", url]); nominatimFetcher.reqId = reqId; nominatimFetcher.running = true; } diff --git a/quickshell/Services/WellbeingService.qml b/quickshell/Services/WellbeingService.qml index 5cacc3c9b..2b8ed8cd9 100644 --- a/quickshell/Services/WellbeingService.qml +++ b/quickshell/Services/WellbeingService.qml @@ -14,7 +14,7 @@ Singleton { readonly property int idleTimeoutSeconds: 300 readonly property int summaryDays: Wellbeing.retentionDays - readonly property var ownAppIds: ["com.danklinux.dms", "org.quickshell", "quickshell"] + readonly property var ownAppIds: ["dev.duxlabs.shell", "com.danklinux.dms", "org.quickshell", "quickshell"] readonly property bool available: DMSService.isConnected && DMSService.capabilities.includes("wellbeing") readonly property bool enabled: SettingsData.wellbeingEnabled readonly property bool tracking: available && enabled diff --git a/quickshell/matugen/configs/firefox.toml b/quickshell/matugen/configs/firefox.toml index 3f048d27a..358166674 100644 --- a/quickshell/matugen/configs/firefox.toml +++ b/quickshell/matugen/configs/firefox.toml @@ -1,3 +1,3 @@ [templates.dmsfirefox] input_path = 'SHELL_DIR/matugen/templates/firefox-userchrome.css' -output_path = 'CONFIG_DIR/DankMaterialShell/firefox.css' +output_path = 'CONFIG_DIR/dms/firefox.css' diff --git a/quickshell/matugen/configs/zenbrowser.toml b/quickshell/matugen/configs/zenbrowser.toml index 6cd4eca01..b5b4af3a4 100644 --- a/quickshell/matugen/configs/zenbrowser.toml +++ b/quickshell/matugen/configs/zenbrowser.toml @@ -1,3 +1,3 @@ [templates.dmszenbrowser] input_path = 'SHELL_DIR/matugen/templates/zen-userchrome.css' -output_path = 'CONFIG_DIR/DankMaterialShell/zen.css' +output_path = 'CONFIG_DIR/dms/zen.css' diff --git a/quickshell/matugen/templates/fcitx5/theme.conf b/quickshell/matugen/templates/fcitx5/theme.conf index 49652adff..efc64bfba 100644 --- a/quickshell/matugen/templates/fcitx5/theme.conf +++ b/quickshell/matugen/templates/fcitx5/theme.conf @@ -1,8 +1,8 @@ [Metadata] Name=DMS Version=0.1 -Author=DankMaterialShell -Description=A Fcitx5 theme generated by DankMaterialShell. +Author=Dux Shell +Description=A Fcitx5 theme generated by Dux Shell. ScaleWithDPI=True [InputPanel] diff --git a/quickshell/matugen/templates/neovim-colors.lua b/quickshell/matugen/templates/neovim-colors.lua index 9f1c45754..b5ffd4324 100644 --- a/quickshell/matugen/templates/neovim-colors.lua +++ b/quickshell/matugen/templates/neovim-colors.lua @@ -1,7 +1,7 @@ local present, base46 = pcall(require, "base46") if not present or not base46._DMS_SUPPORT then vim.notify( - "base46 plugin not found or incorrect, make sure to install AvengeMedia/base46", + "base46 plugin not found or incorrect, make sure to install duxlabs-dev/base46", vim.log.levels.ERROR, { title = "dms integration" } ) @@ -12,7 +12,7 @@ local config_home = vim.env.XDG_CONFIG_HOME if config_home == nil or #config_home == 0 then config_home = vim.fs.joinpath(vim.env.HOME, ".config") end -local settings_file_path = vim.fs.joinpath(config_home, "DankMaterialShell", "settings.json") +local settings_file_path = vim.fs.joinpath(config_home, "Dux Shell", "settings.json") local settings_file = io.open(settings_file_path, "r") if settings_file == nil then vim.notify( diff --git a/quickshell/matugen/templates/neovim-lualine.lua b/quickshell/matugen/templates/neovim-lualine.lua index 0e86d5fe1..06b0e9e59 100644 --- a/quickshell/matugen/templates/neovim-lualine.lua +++ b/quickshell/matugen/templates/neovim-lualine.lua @@ -1,3 +1,3 @@ --- NOTE: this file should never be accessed if AvengeMedia/base46 is not installed, +-- NOTE: this file should never be accessed if duxlabs-dev/base46 is not installed, -- the neovim-colors.lua template will fail first. return require("lualine.themes._base46")("dms") diff --git a/quickshell/matugen/templates/vesktop.css b/quickshell/matugen/templates/vesktop.css index 786e5b128..6136d6e5e 100644 --- a/quickshell/matugen/templates/vesktop.css +++ b/quickshell/matugen/templates/vesktop.css @@ -1,9 +1,9 @@ /** * @name DMS - * @description Material Design 3 recolor generated by DankMaterialShell (matugen). Stock layout, colors only. - * @author DankMaterialShell + * @description Material Design 3 recolor generated by Dux Shell (matugen). Stock layout, colors only. + * @author Dux Shell * @version 1.0.0 - * @website https://github.com/AvengeMedia/DankMaterialShell + * @website https://github.com/duxlabs-dev/dux-shell */ .theme-dark, diff --git a/quickshell/matugen/vsix-build/README.md b/quickshell/matugen/vsix-build/README.md index 56b424598..d58942020 100644 --- a/quickshell/matugen/vsix-build/README.md +++ b/quickshell/matugen/vsix-build/README.md @@ -1,12 +1,12 @@ # Dynamic Base16 DankShell Theme -A VSCode theme for [DankMaterialShell](https://github.com/AvengeMedia/DankMaterialShell). +A VSCode theme for [Dux Shell](https://github.com/duxlabs-dev/dux-shell). ## How It Works 1. Install this extension 2. Select one of the "Dynamic Base16 DankShell" themes in VSCode -3. DankMaterialShell automatically updates the theme files when you change themes. +3. Dux Shell automatically updates the theme files when you change themes. The theme files are located in your VSCode extensions directory and are updated by matugen when generating new colors. diff --git a/quickshell/matugen/vsix-build/package.json b/quickshell/matugen/vsix-build/package.json index 91be6c484..9de07730f 100644 --- a/quickshell/matugen/vsix-build/package.json +++ b/quickshell/matugen/vsix-build/package.json @@ -1,8 +1,8 @@ { "name": "dms-theme", - "displayName": "DMS - Dank Material Shell Theme", - "description": "Dynamic theme using matugen & dank16 terminal colors - auto-updated by DankMaterialShell", - "publisher": "DankLinux", + "displayName": "DMS - Dux Shell Theme", + "description": "Dynamic theme using matugen & dank16 terminal colors - auto-updated by Dux Shell", + "publisher": "Dux Linux", "version": "0.0.3", "icon": "danklogo.png", "engines": { @@ -20,7 +20,7 @@ ], "repository": { "type": "git", - "url": "https://github.com/AvengeMedia/DankMaterialShell" + "url": "https://github.com/duxlabs-dev/dux-shell" }, "contributes": { "themes": [ diff --git a/quickshell/scripts/i18nsync.py b/quickshell/scripts/i18nsync.py index 5ba96c44a..8a98f7fe1 100755 --- a/quickshell/scripts/i18nsync.py +++ b/quickshell/scripts/i18nsync.py @@ -26,7 +26,7 @@ COMMON_POEXPORTS_DIR = COMMON_ROOT / "DCommon" / "translations" / "poexports" # I18n.tr, so their terms belong to the shell catalog. I18n.trFor terms # (external registry plugins) are owned by the DankPlugins project, see # i18nsync_plugins.py. -OFFICIAL_PLUGINS_REPO = "https://github.com/AvengeMedia/dms-plugins.git" +OFFICIAL_PLUGINS_REPO = "https://github.com/duxlabs-dev/dux-plugins.git" OFFICIAL_PLUGINS_DIR = REPO_ROOT / "dms-plugins" RATE_LIMIT_CODE = '4048' diff --git a/quickshell/scripts/i18nsync_plugins.py b/quickshell/scripts/i18nsync_plugins.py index 2220d91af..9c804d666 100755 --- a/quickshell/scripts/i18nsync_plugins.py +++ b/quickshell/scripts/i18nsync_plugins.py @@ -23,7 +23,7 @@ from extract_translations import extract_plugin_strings, create_plugin_poeditor_ # monorepo plus every registry plugin flagged "i18n": true. Exports are # written back into each checkout's translations/ dir with the prefix # stripped, which is the shape PluginService loads at runtime. -PLUGIN_REGISTRY_REPO = "https://github.com/AvengeMedia/dms-plugin-registry.git" +PLUGIN_REGISTRY_REPO = "https://github.com/duxlabs-dev/dux-plugin-registry.git" EXTERNAL_PLUGINS_DIR = REPO_ROOT / "dms-plugins-external" REGISTRY_DIR = EXTERNAL_PLUGINS_DIR / ".registry" SYNC_STATE = REPO_ROOT / ".git" / "i18n_plugins_sync_state.json" diff --git a/quickshell/shell.qml b/quickshell/shell.qml index 60a68149d..0729ff8b8 100644 --- a/quickshell/shell.qml +++ b/quickshell/shell.qml @@ -4,7 +4,7 @@ //@ pragma Env QT_FFMPEG_ENCODING_HW_DEVICE_TYPES=vaapi //@ pragma Env QT_QUICK_CONTROLS_STYLE=Material //@ pragma UseQApplication -//@ pragma AppId com.danklinux.dms +//@ pragma AppId dev.duxlabs.shell import QtQuick import Quickshell diff --git a/quickshell/tests/plugin-ranking.test.mjs b/quickshell/tests/plugin-ranking.test.mjs index 672db5fde..1cda47b9e 100644 --- a/quickshell/tests/plugin-ranking.test.mjs +++ b/quickshell/tests/plugin-ranking.test.mjs @@ -96,7 +96,7 @@ test("no taste, no dates, no votes: still a deterministic order", () => { }); test("an upvote is posted to the reactions of the plugin's GitHub issue only", () => { - assert.equal(rank.issueReactionsPath("https://github.com/AvengeMedia/dms-plugin-registry/issues/42"), "repos/AvengeMedia/dms-plugin-registry/issues/42/reactions"); + assert.equal(rank.issueReactionsPath("https://github.com/duxlabs-dev/dux-plugin-registry/issues/42"), "repos/duxlabs-dev/dux-plugin-registry/issues/42/reactions"); assert.equal(rank.issueReactionsPath("https://github.com/a/b.c/issues/7#issuecomment-1"), "repos/a/b.c/issues/7/reactions"); for (const url of ["", undefined, "https://example.com/a/b/issues/1", "https://github.com/a/b/pull/1", "https://github.com/a/b/issues/1/../../x", "https://github.com/a/b/issues/1 -f x=y", "http://github.com/a/b/issues/1", "https://github.com/../b/issues/1", "https://github.com/a/../issues/1", "https://github.com/./b/issues/1", "https://github.com/a/./issues/1"]) assert.equal(rank.issueReactionsPath(url), ""); diff --git a/quickshell/translations/README.md b/quickshell/translations/README.md index 19fc17809..7cca75f9f 100644 --- a/quickshell/translations/README.md +++ b/quickshell/translations/README.md @@ -1,6 +1,6 @@ -# DankMaterialShell Translations +# Dux Shell Translations -This directory contains translation files for DankMaterialShell extracted from all qsTr() calls in the QML codebase. +This directory contains translation files for Dux Shell extracted from all qsTr() calls in the QML codebase. ## Files diff --git a/quickshell/translations/WORKFLOW.md b/quickshell/translations/WORKFLOW.md index 1bd2da86a..e92651662 100644 --- a/quickshell/translations/WORKFLOW.md +++ b/quickshell/translations/WORKFLOW.md @@ -1,4 +1,4 @@ -# Translation Workflow for DankMaterialShell +# Translation Workflow for Dux Shell ## POEditor Integration Guide @@ -6,7 +6,7 @@ 1. **Create POEditor Project** - Go to https://poeditor.com - - Create new project "DankMaterialShell" + - Create new project "Dux Shell" - Add languages you want to support (es, fr, de, etc.) 2. **Import Source Strings** @@ -172,7 +172,7 @@ curl -X POST https://api.poeditor.com/v2/projects/upload \ ### Troubleshooting **Translations not loading?** -- Check file exists: `~/.config/DankMaterialShell/translations/{language_code}.json` +- Check file exists: `~/.config/dms/translations/{language_code}.json` - Verify JSON syntax: `python3 -m json.tool translations/es.json` - Check console for errors: `qs -v -p .` diff --git a/quickshell/translations/settings_search_index.json b/quickshell/translations/settings_search_index.json index 428ca6f12..62e4ca8bc 100644 --- a/quickshell/translations/settings_search_index.json +++ b/quickshell/translations/settings_search_index.json @@ -8818,13 +8818,13 @@ }, { "section": "softwareUpdatesShell", - "label": "DankMaterialShell", + "label": "Dux Shell", "tabIndex": 20, "category": "Software updates", "keywords": [ "channel", - "dankmaterialshell", "dms", + "dux", "integrations", "restart", "shell", diff --git a/quickshell/translations/term_renames.json b/quickshell/translations/term_renames.json new file mode 100644 index 000000000..b4efaa6b5 --- /dev/null +++ b/quickshell/translations/term_renames.json @@ -0,0 +1,5 @@ +{ + "DankCalendar": "Dux Calendar", + "DankCalendar isn't installed": "Dux Calendar isn't installed", + "DankCalendar isn't running": "Dux Calendar isn't running" +} diff --git a/scripts/release-notes.py b/scripts/release-notes.py index b32ed26b6..924f1edf2 100755 --- a/scripts/release-notes.py +++ b/scripts/release-notes.py @@ -360,7 +360,7 @@ def main(): if not repo: url = run(["git", "remote", "get-url", "origin"]).strip() m = re.search(r"github\.com[:/]([^/]+/[^/.]+)", url) - repo = m.group(1) if m else "AvengeMedia/DankMaterialShell" + repo = m.group(1) if m else "duxlabs-dev/dux-shell" entries = build_entries(repo, args.range, use_api=not args.no_api) if not entries: