From db584b789704ea721c601b632778f492737c671a Mon Sep 17 00:00:00 2001 From: bbedward Date: Wed, 12 Nov 2025 23:12:31 -0500 Subject: [PATCH] rename backend to core --- .github/workflows/go-ci.yml | 6 +- .github/workflows/release.yml | 72 +++++++++---------- .github/workflows/update-vendor-hash.yml | 14 ++-- README.md | 10 +-- {backend => core}/Makefile | 0 {backend => core}/README.md | 0 {backend => core}/assets/dank.svg | 0 {backend => core}/assets/danklogo.svg | 0 {backend => core}/build_dankinstall.sh | 0 {backend => core}/cmd/dankinstall/main.go | 4 +- .../cmd/dms/commands_brightness.go | 4 +- {backend => core}/cmd/dms/commands_common.go | 6 +- {backend => core}/cmd/dms/commands_dank16.go | 4 +- .../cmd/dms/commands_features.go | 8 +-- {backend => core}/cmd/dms/commands_greeter.go | 4 +- .../cmd/dms/commands_keybinds.go | 6 +- {backend => core}/cmd/dms/commands_root.go | 8 +-- {backend => core}/cmd/dms/commands_setup.go | 6 +- {backend => core}/cmd/dms/main.go | 2 +- {backend => core}/cmd/dms/main_distro.go | 2 +- {backend => core}/cmd/dms/shell.go | 4 +- {backend => core}/cmd/dms/ui.go | 2 +- {backend => core}/cmd/dms/utils.go | 0 {backend => core}/go.mod | 2 +- {backend => core}/go.sum | 0 {backend => core}/install.sh | 0 {backend => core}/internal/config/deployer.go | 2 +- .../internal/config/deployer_test.go | 2 +- {backend => core}/internal/config/dms.go | 0 .../config/embedded/alacritty-theme.toml | 0 .../internal/config/embedded/alacritty.toml | 0 .../config/embedded/ghostty-colors.conf | 0 .../internal/config/embedded/ghostty.conf | 0 .../internal/config/embedded/hyprland.conf | 0 .../internal/config/embedded/kitty-tabs.conf | 0 .../internal/config/embedded/kitty-theme.conf | 0 .../internal/config/embedded/kitty.conf | 0 .../internal/config/embedded/niri.kdl | 0 {backend => core}/internal/config/hyprland.go | 0 {backend => core}/internal/config/niri.go | 0 .../internal/config/terminals.go | 0 {backend => core}/internal/dank16/dank16.go | 0 .../internal/dank16/dank16_test.go | 0 .../internal/dank16/terminals.go | 0 {backend => core}/internal/dank16/vscode.go | 0 {backend => core}/internal/deps/detector.go | 0 {backend => core}/internal/distros/arch.go | 2 +- {backend => core}/internal/distros/base.go | 4 +- .../internal/distros/base_test.go | 2 +- {backend => core}/internal/distros/debian.go | 2 +- {backend => core}/internal/distros/factory.go | 2 +- {backend => core}/internal/distros/fedora.go | 2 +- {backend => core}/internal/distros/gentoo.go | 2 +- .../internal/distros/interface.go | 2 +- .../internal/distros/manual_packages.go | 0 .../internal/distros/manual_packages_test.go | 0 {backend => core}/internal/distros/nixos.go | 2 +- .../internal/distros/opensuse.go | 2 +- {backend => core}/internal/distros/osinfo.go | 2 +- {backend => core}/internal/distros/ubuntu.go | 2 +- {backend => core}/internal/dms/app.go | 2 +- {backend => core}/internal/dms/app_distro.go | 0 {backend => core}/internal/dms/detector.go | 6 +- .../internal/dms/handlers_common.go | 2 +- .../internal/dms/handlers_features.go | 6 +- .../internal/dms/handlers_mainmenu.go | 0 .../internal/dms/handlers_mainmenu_distro.go | 0 .../internal/dms/plugins_handlers.go | 2 +- .../internal/dms/plugins_views.go | 0 .../internal/dms/views_common.go | 2 +- .../internal/dms/views_features.go | 0 {backend => core}/internal/errdefs/errdefs.go | 0 .../internal/greeter/installer.go | 4 +- .../internal/hyprland/keybinds.go | 0 .../internal/hyprland/keybinds_test.go | 0 .../internal/keybinds/discovery.go | 0 .../internal/keybinds/discovery_test.go | 0 .../internal/keybinds/providers/hyprland.go | 4 +- .../keybinds/providers/hyprland_test.go | 0 .../internal/keybinds/providers/jsonfile.go | 2 +- .../keybinds/providers/jsonfile_test.go | 0 .../internal/keybinds/providers/mangowc.go | 4 +- .../keybinds/providers/mangowc_test.go | 2 +- .../internal/keybinds/providers/sway.go | 4 +- .../internal/keybinds/providers/sway_test.go | 2 +- .../internal/keybinds/registry.go | 0 .../internal/keybinds/registry_test.go | 0 {backend => core}/internal/keybinds/types.go | 0 {backend => core}/internal/log/log.go | 0 .../internal/logger/filelogger.go | 0 .../internal/mangowc/keybinds.go | 0 .../internal/mangowc/keybinds_test.go | 0 .../mocks/brightness/mock_DBusConn.go | 0 .../mocks/cups/mock_CUPSClientInterface.go | 2 +- .../gonetworkmanager/v2/mock_AccessPoint.go | 0 .../v2/mock_ActiveConnection.go | 0 .../gonetworkmanager/v2/mock_Connection.go | 0 .../Wifx/gonetworkmanager/v2/mock_Device.go | 0 .../v2/mock_DeviceWireless.go | 0 .../gonetworkmanager/v2/mock_IP4Config.go | 0 .../v2/mock_NetworkManager.go | 0 .../Wifx/gonetworkmanager/v2/mock_Settings.go | 0 .../godbus/dbus/v5/mock_BusObject.go | 0 .../mocks/internal/plugins/mock_GitClient.go | 0 .../internal/mocks/net/mock_Conn.go | 0 .../internal/mocks/network/mock_Backend.go | 2 +- {backend => core}/internal/plugins/manager.go | 0 .../internal/plugins/manager_test.go | 0 .../internal/plugins/registry.go | 0 .../internal/plugins/registry_test.go | 0 {backend => core}/internal/plugins/search.go | 0 .../internal/proto/dwl_ipc/dwl_ipc.go | 0 .../internal/proto/ext_workspace/workspace.go | 0 .../proto/wlr_gamma_control/gamma_control.go | 0 .../output_management.go | 0 .../proto/xml/dwl-ipc-unstable-v2.xml | 0 .../internal/proto/xml/ext-workspace-v1.xml | 0 .../xml/wlr-gamma-control-unstable-v1.xml | 0 .../xml/wlr-output-management-unstable-v1.xml | 0 .../internal/server/bluez/agent.go | 4 +- .../internal/server/bluez/broker.go | 0 .../internal/server/bluez/broker_test.go | 0 .../internal/server/bluez/handlers.go | 2 +- .../internal/server/bluez/handlers_test.go | 0 .../internal/server/bluez/manager.go | 2 +- .../server/bluez/subscription_broker.go | 2 +- .../internal/server/bluez/types.go | 0 .../internal/server/bluez/types_test.go | 0 .../internal/server/brightness/ddc.go | 2 +- .../internal/server/brightness/ddc_filter.go | 2 +- .../server/brightness/ddc_filter_test.go | 0 .../internal/server/brightness/ddc_test.go | 0 .../internal/server/brightness/handlers.go | 2 +- .../internal/server/brightness/logind.go | 2 +- .../internal/server/brightness/logind_test.go | 4 +- .../internal/server/brightness/manager.go | 2 +- .../server/brightness/manager_test.go | 0 .../internal/server/brightness/sysfs.go | 2 +- .../server/brightness/sysfs_logind_test.go | 4 +- .../internal/server/brightness/sysfs_test.go | 0 .../internal/server/brightness/types.go | 0 .../internal/server/cups/actions.go | 2 +- .../internal/server/cups/actions_test.go | 4 +- .../internal/server/cups/handlers.go | 2 +- .../internal/server/cups/handlers_test.go | 6 +- .../internal/server/cups/manager.go | 4 +- .../internal/server/cups/manager_test.go | 4 +- .../internal/server/cups/subscription.go | 4 +- .../internal/server/cups/subscription_dbus.go | 4 +- .../internal/server/cups/types.go | 2 +- .../internal/server/dwl/handlers.go | 2 +- .../internal/server/dwl/manager.go | 4 +- .../internal/server/dwl/types.go | 0 .../internal/server/extworkspace/handlers.go | 2 +- .../internal/server/extworkspace/manager.go | 4 +- .../internal/server/extworkspace/types.go | 2 +- .../internal/server/freedesktop/actions.go | 0 .../server/freedesktop/actions_test.go | 0 .../internal/server/freedesktop/constants.go | 0 .../internal/server/freedesktop/handlers.go | 2 +- .../server/freedesktop/handlers_test.go | 4 +- .../internal/server/freedesktop/manager.go | 0 .../server/freedesktop/manager_test.go | 0 .../internal/server/freedesktop/types.go | 0 .../internal/server/freedesktop/types_test.go | 0 .../internal/server/loginctl/actions.go | 0 .../internal/server/loginctl/constants.go | 0 .../internal/server/loginctl/handlers.go | 2 +- .../internal/server/loginctl/handlers_test.go | 4 +- .../internal/server/loginctl/manager.go | 0 .../internal/server/loginctl/manager_test.go | 0 .../internal/server/loginctl/monitor.go | 0 .../internal/server/loginctl/monitor_test.go | 0 .../internal/server/loginctl/types.go | 0 .../internal/server/loginctl/types_test.go | 0 .../internal/server/models/types.go | 2 +- .../internal/server/network/API.md | 0 .../internal/server/network/agent_iwd.go | 2 +- .../server/network/agent_networkmanager.go | 4 +- .../internal/server/network/backend.go | 0 .../network/backend_hybrid_iwd_networkd.go | 0 .../server/network/backend_hybrid_test.go | 0 .../internal/server/network/backend_iwd.go | 0 .../server/network/backend_iwd_signals.go | 0 .../server/network/backend_iwd_test.go | 0 .../network/backend_iwd_unimplemented.go | 0 .../server/network/backend_iwd_wifi.go | 2 +- .../server/network/backend_networkd.go | 2 +- .../network/backend_networkd_ethernet.go | 0 .../network/backend_networkd_signals.go | 2 +- .../server/network/backend_networkd_test.go | 0 .../network/backend_networkd_unimplemented.go | 0 .../server/network/backend_networkmanager.go | 2 +- .../backend_networkmanager_ethernet.go | 2 +- .../backend_networkmanager_ethernet_test.go | 0 .../network/backend_networkmanager_signals.go | 0 .../backend_networkmanager_signals_test.go | 0 .../network/backend_networkmanager_state.go | 4 +- .../backend_networkmanager_state_test.go | 4 +- .../network/backend_networkmanager_test.go | 0 .../network/backend_networkmanager_vpn.go | 2 +- .../backend_networkmanager_vpn_test.go | 2 +- .../network/backend_networkmanager_wifi.go | 2 +- .../backend_networkmanager_wifi_test.go | 2 +- .../internal/server/network/broker.go | 0 .../server/network/connection_test.go | 4 +- .../internal/server/network/detect.go | 0 .../internal/server/network/detect_test.go | 0 .../internal/server/network/handlers.go | 4 +- .../internal/server/network/handlers_test.go | 2 +- .../internal/server/network/helpers.go | 0 .../internal/server/network/manager.go | 2 +- .../internal/server/network/manager_test.go | 0 .../internal/server/network/monitor.go | 0 .../internal/server/network/priority.go | 0 .../internal/server/network/priority_test.go | 0 .../server/network/subscription_broker.go | 4 +- .../internal/server/network/testing.go | 0 .../internal/server/network/types.go | 0 .../internal/server/network/types_test.go | 0 .../internal/server/network/wifi_test.go | 0 .../internal/server/network/wired_test.go | 0 .../internal/server/plugins/handlers.go | 2 +- .../internal/server/plugins/handlers_test.go | 4 +- .../internal/server/plugins/install.go | 4 +- .../internal/server/plugins/list.go | 4 +- .../internal/server/plugins/list_installed.go | 4 +- .../internal/server/plugins/search.go | 4 +- .../internal/server/plugins/types.go | 0 .../internal/server/plugins/uninstall.go | 4 +- .../internal/server/plugins/update.go | 4 +- .../internal/server/plugins/utils.go | 0 {backend => core}/internal/server/router.go | 24 +++---- {backend => core}/internal/server/server.go | 26 +++---- .../internal/server/server_test.go | 4 +- .../internal/server/wayland/gamma.go | 2 +- .../internal/server/wayland/gamma_test.go | 2 +- .../internal/server/wayland/geolocation.go | 2 +- .../internal/server/wayland/handlers.go | 2 +- .../internal/server/wayland/manager.go | 6 +- .../internal/server/wayland/suncalc.go | 0 .../internal/server/wayland/suncalc_test.go | 0 .../internal/server/wayland/types.go | 2 +- .../internal/server/wayland/types_test.go | 0 .../internal/server/wlcontext/context.go | 4 +- .../internal/server/wlroutput/handlers.go | 6 +- .../internal/server/wlroutput/manager.go | 4 +- .../internal/server/wlroutput/types.go | 2 +- {backend => core}/internal/sway/keybinds.go | 0 .../internal/sway/keybinds_test.go | 0 {backend => core}/internal/tui/app.go | 4 +- {backend => core}/internal/tui/banner.go | 0 {backend => core}/internal/tui/messages.go | 4 +- {backend => core}/internal/tui/states.go | 0 {backend => core}/internal/tui/styles.go | 0 .../internal/tui/views_config.go | 4 +- .../internal/tui/views_dependencies.go | 4 +- .../internal/tui/views_gentoo_gcc.go | 0 .../internal/tui/views_gentoo_use_flags.go | 2 +- .../internal/tui/views_install.go | 0 .../internal/tui/views_nixos_wm.go | 0 .../internal/tui/views_password.go | 0 .../internal/tui/views_selection.go | 4 +- .../internal/tui/views_welcome.go | 2 +- {backend => core}/internal/utils/math.go | 0 {backend => core}/internal/version/version.go | 0 .../internal/version/version_test.go | 0 {backend => core}/pkg/ipp/CREDITS.MD | 0 {backend => core}/pkg/ipp/LICENSE | 0 {backend => core}/pkg/ipp/adapter-http.go | 0 {backend => core}/pkg/ipp/adapter.go | 0 {backend => core}/pkg/ipp/attribute.go | 0 {backend => core}/pkg/ipp/constants.go | 0 {backend => core}/pkg/ipp/cups-client.go | 0 {backend => core}/pkg/ipp/error.go | 0 {backend => core}/pkg/ipp/ipp-client.go | 0 {backend => core}/pkg/ipp/request.go | 0 {backend => core}/pkg/ipp/response.go | 0 {backend => core}/pkg/ipp/utils.go | 0 distro/fedora/dms.spec | 12 ++-- 280 files changed, 265 insertions(+), 265 deletions(-) rename {backend => core}/Makefile (100%) rename {backend => core}/README.md (100%) rename {backend => core}/assets/dank.svg (100%) rename {backend => core}/assets/danklogo.svg (100%) rename {backend => core}/build_dankinstall.sh (100%) rename {backend => core}/cmd/dankinstall/main.go (88%) rename {backend => core}/cmd/dms/commands_brightness.go (98%) rename {backend => core}/cmd/dms/commands_common.go (97%) rename {backend => core}/cmd/dms/commands_dank16.go (95%) rename {backend => core}/cmd/dms/commands_features.go (98%) rename {backend => core}/cmd/dms/commands_greeter.go (99%) rename {backend => core}/cmd/dms/commands_keybinds.go (94%) rename {backend => core}/cmd/dms/commands_root.go (91%) rename {backend => core}/cmd/dms/commands_setup.go (95%) rename {backend => core}/cmd/dms/main.go (94%) rename {backend => core}/cmd/dms/main_distro.go (93%) rename {backend => core}/cmd/dms/shell.go (98%) rename {backend => core}/cmd/dms/ui.go (96%) rename {backend => core}/cmd/dms/utils.go (100%) rename {backend => core}/go.mod (97%) rename {backend => core}/go.sum (100%) rename {backend => core}/install.sh (100%) rename {backend => core}/internal/config/deployer.go (99%) rename {backend => core}/internal/config/deployer_test.go (99%) rename {backend => core}/internal/config/dms.go (100%) rename {backend => core}/internal/config/embedded/alacritty-theme.toml (100%) rename {backend => core}/internal/config/embedded/alacritty.toml (100%) rename {backend => core}/internal/config/embedded/ghostty-colors.conf (100%) rename {backend => core}/internal/config/embedded/ghostty.conf (100%) rename {backend => core}/internal/config/embedded/hyprland.conf (100%) rename {backend => core}/internal/config/embedded/kitty-tabs.conf (100%) rename {backend => core}/internal/config/embedded/kitty-theme.conf (100%) rename {backend => core}/internal/config/embedded/kitty.conf (100%) rename {backend => core}/internal/config/embedded/niri.kdl (100%) rename {backend => core}/internal/config/hyprland.go (100%) rename {backend => core}/internal/config/niri.go (100%) rename {backend => core}/internal/config/terminals.go (100%) rename {backend => core}/internal/dank16/dank16.go (100%) rename {backend => core}/internal/dank16/dank16_test.go (100%) rename {backend => core}/internal/dank16/terminals.go (100%) rename {backend => core}/internal/dank16/vscode.go (100%) rename {backend => core}/internal/deps/detector.go (100%) rename {backend => core}/internal/distros/arch.go (99%) rename {backend => core}/internal/distros/base.go (99%) rename {backend => core}/internal/distros/base_test.go (98%) rename {backend => core}/internal/distros/debian.go (99%) rename {backend => core}/internal/distros/factory.go (89%) rename {backend => core}/internal/distros/fedora.go (99%) rename {backend => core}/internal/distros/gentoo.go (99%) rename {backend => core}/internal/distros/interface.go (98%) rename {backend => core}/internal/distros/manual_packages.go (100%) rename {backend => core}/internal/distros/manual_packages_test.go (100%) rename {backend => core}/internal/distros/nixos.go (99%) rename {backend => core}/internal/distros/opensuse.go (99%) rename {backend => core}/internal/distros/osinfo.go (97%) rename {backend => core}/internal/distros/ubuntu.go (99%) rename {backend => core}/internal/dms/app.go (99%) rename {backend => core}/internal/dms/app_distro.go (100%) rename {backend => core}/internal/dms/detector.go (94%) rename {backend => core}/internal/dms/handlers_common.go (93%) rename {backend => core}/internal/dms/handlers_features.go (97%) rename {backend => core}/internal/dms/handlers_mainmenu.go (100%) rename {backend => core}/internal/dms/handlers_mainmenu_distro.go (100%) rename {backend => core}/internal/dms/plugins_handlers.go (99%) rename {backend => core}/internal/dms/plugins_views.go (100%) rename {backend => core}/internal/dms/views_common.go (98%) rename {backend => core}/internal/dms/views_features.go (100%) rename {backend => core}/internal/errdefs/errdefs.go (100%) rename {backend => core}/internal/greeter/installer.go (99%) rename {backend => core}/internal/hyprland/keybinds.go (100%) rename {backend => core}/internal/hyprland/keybinds_test.go (100%) rename {backend => core}/internal/keybinds/discovery.go (100%) rename {backend => core}/internal/keybinds/discovery_test.go (100%) rename {backend => core}/internal/keybinds/providers/hyprland.go (95%) rename {backend => core}/internal/keybinds/providers/hyprland_test.go (100%) rename {backend => core}/internal/keybinds/providers/jsonfile.go (97%) rename {backend => core}/internal/keybinds/providers/jsonfile_test.go (100%) rename {backend => core}/internal/keybinds/providers/mangowc.go (95%) rename {backend => core}/internal/keybinds/providers/mangowc_test.go (99%) rename {backend => core}/internal/keybinds/providers/sway.go (95%) rename {backend => core}/internal/keybinds/providers/sway_test.go (99%) rename {backend => core}/internal/keybinds/registry.go (100%) rename {backend => core}/internal/keybinds/registry_test.go (100%) rename {backend => core}/internal/keybinds/types.go (100%) rename {backend => core}/internal/log/log.go (100%) rename {backend => core}/internal/logger/filelogger.go (100%) rename {backend => core}/internal/mangowc/keybinds.go (100%) rename {backend => core}/internal/mangowc/keybinds_test.go (100%) rename {backend => core}/internal/mocks/brightness/mock_DBusConn.go (100%) rename {backend => core}/internal/mocks/cups/mock_CUPSClientInterface.go (99%) rename {backend => core}/internal/mocks/github.com/Wifx/gonetworkmanager/v2/mock_AccessPoint.go (100%) rename {backend => core}/internal/mocks/github.com/Wifx/gonetworkmanager/v2/mock_ActiveConnection.go (100%) rename {backend => core}/internal/mocks/github.com/Wifx/gonetworkmanager/v2/mock_Connection.go (100%) rename {backend => core}/internal/mocks/github.com/Wifx/gonetworkmanager/v2/mock_Device.go (100%) rename {backend => core}/internal/mocks/github.com/Wifx/gonetworkmanager/v2/mock_DeviceWireless.go (100%) rename {backend => core}/internal/mocks/github.com/Wifx/gonetworkmanager/v2/mock_IP4Config.go (100%) rename {backend => core}/internal/mocks/github.com/Wifx/gonetworkmanager/v2/mock_NetworkManager.go (100%) rename {backend => core}/internal/mocks/github.com/Wifx/gonetworkmanager/v2/mock_Settings.go (100%) rename {backend => core}/internal/mocks/github.com/godbus/dbus/v5/mock_BusObject.go (100%) rename {backend => core}/internal/mocks/internal/plugins/mock_GitClient.go (100%) rename {backend => core}/internal/mocks/net/mock_Conn.go (100%) rename {backend => core}/internal/mocks/network/mock_Backend.go (99%) rename {backend => core}/internal/plugins/manager.go (100%) rename {backend => core}/internal/plugins/manager_test.go (100%) rename {backend => core}/internal/plugins/registry.go (100%) rename {backend => core}/internal/plugins/registry_test.go (100%) rename {backend => core}/internal/plugins/search.go (100%) rename {backend => core}/internal/proto/dwl_ipc/dwl_ipc.go (100%) rename {backend => core}/internal/proto/ext_workspace/workspace.go (100%) rename {backend => core}/internal/proto/wlr_gamma_control/gamma_control.go (100%) rename {backend => core}/internal/proto/wlr_output_management/output_management.go (100%) rename {backend => core}/internal/proto/xml/dwl-ipc-unstable-v2.xml (100%) rename {backend => core}/internal/proto/xml/ext-workspace-v1.xml (100%) rename {backend => core}/internal/proto/xml/wlr-gamma-control-unstable-v1.xml (100%) rename {backend => core}/internal/proto/xml/wlr-output-management-unstable-v1.xml (100%) rename {backend => core}/internal/server/bluez/agent.go (98%) rename {backend => core}/internal/server/bluez/broker.go (100%) rename {backend => core}/internal/server/bluez/broker_test.go (100%) rename {backend => core}/internal/server/bluez/handlers.go (98%) rename {backend => core}/internal/server/bluez/handlers_test.go (100%) rename {backend => core}/internal/server/bluez/manager.go (99%) rename {backend => core}/internal/server/bluez/subscription_broker.go (96%) rename {backend => core}/internal/server/bluez/types.go (100%) rename {backend => core}/internal/server/bluez/types_test.go (100%) rename {backend => core}/internal/server/brightness/ddc.go (99%) rename {backend => core}/internal/server/brightness/ddc_filter.go (98%) rename {backend => core}/internal/server/brightness/ddc_filter_test.go (100%) rename {backend => core}/internal/server/brightness/ddc_test.go (100%) rename {backend => core}/internal/server/brightness/handlers.go (98%) rename {backend => core}/internal/server/brightness/logind.go (95%) rename {backend => core}/internal/server/brightness/logind_test.go (92%) rename {backend => core}/internal/server/brightness/manager.go (99%) rename {backend => core}/internal/server/brightness/manager_test.go (100%) rename {backend => core}/internal/server/brightness/sysfs.go (98%) rename {backend => core}/internal/server/brightness/sysfs_logind_test.go (97%) rename {backend => core}/internal/server/brightness/sysfs_test.go (100%) rename {backend => core}/internal/server/brightness/types.go (100%) rename {backend => core}/internal/server/cups/actions.go (97%) rename {backend => core}/internal/server/cups/actions_test.go (97%) rename {backend => core}/internal/server/cups/handlers.go (98%) rename {backend => core}/internal/server/cups/handlers_test.go (96%) rename {backend => core}/internal/server/cups/manager.go (98%) rename {backend => core}/internal/server/cups/manager_test.go (97%) rename {backend => core}/internal/server/cups/subscription.go (97%) rename {backend => core}/internal/server/cups/subscription_dbus.go (98%) rename {backend => core}/internal/server/cups/types.go (97%) rename {backend => core}/internal/server/dwl/handlers.go (98%) rename {backend => core}/internal/server/dwl/manager.go (98%) rename {backend => core}/internal/server/dwl/types.go (100%) rename {backend => core}/internal/server/extworkspace/handlers.go (98%) rename {backend => core}/internal/server/extworkspace/manager.go (98%) rename {backend => core}/internal/server/extworkspace/types.go (97%) rename {backend => core}/internal/server/freedesktop/actions.go (100%) rename {backend => core}/internal/server/freedesktop/actions_test.go (100%) rename {backend => core}/internal/server/freedesktop/constants.go (100%) rename {backend => core}/internal/server/freedesktop/handlers.go (98%) rename {backend => core}/internal/server/freedesktop/handlers_test.go (98%) rename {backend => core}/internal/server/freedesktop/manager.go (100%) rename {backend => core}/internal/server/freedesktop/manager_test.go (100%) rename {backend => core}/internal/server/freedesktop/types.go (100%) rename {backend => core}/internal/server/freedesktop/types_test.go (100%) rename {backend => core}/internal/server/loginctl/actions.go (100%) rename {backend => core}/internal/server/loginctl/constants.go (100%) rename {backend => core}/internal/server/loginctl/handlers.go (98%) rename {backend => core}/internal/server/loginctl/handlers_test.go (98%) rename {backend => core}/internal/server/loginctl/manager.go (100%) rename {backend => core}/internal/server/loginctl/manager_test.go (100%) rename {backend => core}/internal/server/loginctl/monitor.go (100%) rename {backend => core}/internal/server/loginctl/monitor_test.go (100%) rename {backend => core}/internal/server/loginctl/types.go (100%) rename {backend => core}/internal/server/loginctl/types_test.go (100%) rename {backend => core}/internal/server/models/types.go (91%) rename {backend => core}/internal/server/network/API.md (100%) rename {backend => core}/internal/server/network/agent_iwd.go (99%) rename {backend => core}/internal/server/network/agent_networkmanager.go (99%) rename {backend => core}/internal/server/network/backend.go (100%) rename {backend => core}/internal/server/network/backend_hybrid_iwd_networkd.go (100%) rename {backend => core}/internal/server/network/backend_hybrid_test.go (100%) rename {backend => core}/internal/server/network/backend_iwd.go (100%) rename {backend => core}/internal/server/network/backend_iwd_signals.go (100%) rename {backend => core}/internal/server/network/backend_iwd_test.go (100%) rename {backend => core}/internal/server/network/backend_iwd_unimplemented.go (100%) rename {backend => core}/internal/server/network/backend_iwd_wifi.go (99%) rename {backend => core}/internal/server/network/backend_networkd.go (99%) rename {backend => core}/internal/server/network/backend_networkd_ethernet.go (100%) rename {backend => core}/internal/server/network/backend_networkd_signals.go (95%) rename {backend => core}/internal/server/network/backend_networkd_test.go (100%) rename {backend => core}/internal/server/network/backend_networkd_unimplemented.go (100%) rename {backend => core}/internal/server/network/backend_networkmanager.go (99%) rename {backend => core}/internal/server/network/backend_networkmanager_ethernet.go (99%) rename {backend => core}/internal/server/network/backend_networkmanager_ethernet_test.go (100%) rename {backend => core}/internal/server/network/backend_networkmanager_signals.go (100%) rename {backend => core}/internal/server/network/backend_networkmanager_signals_test.go (100%) rename {backend => core}/internal/server/network/backend_networkmanager_state.go (98%) rename {backend => core}/internal/server/network/backend_networkmanager_state_test.go (94%) rename {backend => core}/internal/server/network/backend_networkmanager_test.go (100%) rename {backend => core}/internal/server/network/backend_networkmanager_vpn.go (99%) rename {backend => core}/internal/server/network/backend_networkmanager_vpn_test.go (98%) rename {backend => core}/internal/server/network/backend_networkmanager_wifi.go (99%) rename {backend => core}/internal/server/network/backend_networkmanager_wifi_test.go (98%) rename {backend => core}/internal/server/network/broker.go (100%) rename {backend => core}/internal/server/network/connection_test.go (95%) rename {backend => core}/internal/server/network/detect.go (100%) rename {backend => core}/internal/server/network/detect_test.go (100%) rename {backend => core}/internal/server/network/handlers.go (99%) rename {backend => core}/internal/server/network/handlers_test.go (98%) rename {backend => core}/internal/server/network/helpers.go (100%) rename {backend => core}/internal/server/network/manager.go (99%) rename {backend => core}/internal/server/network/manager_test.go (100%) rename {backend => core}/internal/server/network/monitor.go (100%) rename {backend => core}/internal/server/network/priority.go (100%) rename {backend => core}/internal/server/network/priority_test.go (100%) rename {backend => core}/internal/server/network/subscription_broker.go (96%) rename {backend => core}/internal/server/network/testing.go (100%) rename {backend => core}/internal/server/network/types.go (100%) rename {backend => core}/internal/server/network/types_test.go (100%) rename {backend => core}/internal/server/network/wifi_test.go (100%) rename {backend => core}/internal/server/network/wired_test.go (100%) rename {backend => core}/internal/server/plugins/handlers.go (87%) rename {backend => core}/internal/server/plugins/handlers_test.go (96%) rename {backend => core}/internal/server/plugins/install.go (90%) rename {backend => core}/internal/server/plugins/list.go (88%) rename {backend => core}/internal/server/plugins/list_installed.go (92%) rename {backend => core}/internal/server/plugins/search.go (92%) rename {backend => core}/internal/server/plugins/types.go (100%) rename {backend => core}/internal/server/plugins/uninstall.go (91%) rename {backend => core}/internal/server/plugins/update.go (91%) rename {backend => core}/internal/server/plugins/utils.go (100%) rename {backend => core}/internal/server/router.go (80%) rename {backend => core}/internal/server/server.go (97%) rename {backend => core}/internal/server/server_test.go (96%) rename {backend => core}/internal/server/wayland/gamma.go (96%) rename {backend => core}/internal/server/wayland/gamma_test.go (97%) rename {backend => core}/internal/server/wayland/geolocation.go (94%) rename {backend => core}/internal/server/wayland/handlers.go (98%) rename {backend => core}/internal/server/wayland/manager.go (99%) rename {backend => core}/internal/server/wayland/suncalc.go (100%) rename {backend => core}/internal/server/wayland/suncalc_test.go (100%) rename {backend => core}/internal/server/wayland/types.go (98%) rename {backend => core}/internal/server/wayland/types_test.go (100%) rename {backend => core}/internal/server/wlcontext/context.go (89%) rename {backend => core}/internal/server/wlroutput/handlers.go (96%) rename {backend => core}/internal/server/wlroutput/manager.go (98%) rename {backend => core}/internal/server/wlroutput/types.go (97%) rename {backend => core}/internal/sway/keybinds.go (100%) rename {backend => core}/internal/sway/keybinds_test.go (100%) rename {backend => core}/internal/tui/app.go (97%) rename {backend => core}/internal/tui/banner.go (100%) rename {backend => core}/internal/tui/messages.go (79%) rename {backend => core}/internal/tui/states.go (100%) rename {backend => core}/internal/tui/styles.go (100%) rename {backend => core}/internal/tui/views_config.go (98%) rename {backend => core}/internal/tui/views_dependencies.go (98%) rename {backend => core}/internal/tui/views_gentoo_gcc.go (100%) rename {backend => core}/internal/tui/views_gentoo_use_flags.go (97%) rename {backend => core}/internal/tui/views_install.go (100%) rename {backend => core}/internal/tui/views_nixos_wm.go (100%) rename {backend => core}/internal/tui/views_password.go (100%) rename {backend => core}/internal/tui/views_selection.go (97%) rename {backend => core}/internal/tui/views_welcome.go (98%) rename {backend => core}/internal/utils/math.go (100%) rename {backend => core}/internal/version/version.go (100%) rename {backend => core}/internal/version/version_test.go (100%) rename {backend => core}/pkg/ipp/CREDITS.MD (100%) rename {backend => core}/pkg/ipp/LICENSE (100%) rename {backend => core}/pkg/ipp/adapter-http.go (100%) rename {backend => core}/pkg/ipp/adapter.go (100%) rename {backend => core}/pkg/ipp/attribute.go (100%) rename {backend => core}/pkg/ipp/constants.go (100%) rename {backend => core}/pkg/ipp/cups-client.go (100%) rename {backend => core}/pkg/ipp/error.go (100%) rename {backend => core}/pkg/ipp/ipp-client.go (100%) rename {backend => core}/pkg/ipp/request.go (100%) rename {backend => core}/pkg/ipp/response.go (100%) rename {backend => core}/pkg/ipp/utils.go (100%) diff --git a/.github/workflows/go-ci.yml b/.github/workflows/go-ci.yml index cbb9905e..71b9836f 100644 --- a/.github/workflows/go-ci.yml +++ b/.github/workflows/go-ci.yml @@ -5,7 +5,7 @@ on: branches: - '**' paths: - - 'backend/**' + - 'core/**' - '.github/workflows/go-ci.yml' jobs: @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest defaults: run: - working-directory: backend + working-directory: core steps: - name: Checkout @@ -22,7 +22,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version-file: ./backend/go.mod + go-version-file: ./core/go.mod - name: Format check run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2dac6fd4..f71669f8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,7 +14,7 @@ concurrency: cancel-in-progress: true jobs: - build-backend: + build-core: runs-on: ubuntu-latest strategy: matrix: @@ -22,7 +22,7 @@ jobs: defaults: run: - working-directory: backend + working-directory: core steps: - name: Checkout @@ -33,7 +33,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version-file: ./backend/go.mod + go-version-file: ./core/go.mod - name: Run tests run: go test -v ./... @@ -93,31 +93,31 @@ jobs: if: matrix.arch == 'arm64' uses: actions/upload-artifact@v4 with: - name: backend-assets-${{ matrix.arch }} + name: core-assets-${{ matrix.arch }} path: | - backend/dankinstall-${{ matrix.arch }}.gz - backend/dankinstall-${{ matrix.arch }}.gz.sha256 - backend/dms-${{ matrix.arch }}.gz - backend/dms-${{ matrix.arch }}.gz.sha256 - backend/dms-distropkg-${{ matrix.arch }}.gz - backend/dms-distropkg-${{ matrix.arch }}.gz.sha256 + core/dankinstall-${{ matrix.arch }}.gz + core/dankinstall-${{ matrix.arch }}.gz.sha256 + core/dms-${{ matrix.arch }}.gz + core/dms-${{ matrix.arch }}.gz.sha256 + core/dms-distropkg-${{ matrix.arch }}.gz + core/dms-distropkg-${{ matrix.arch }}.gz.sha256 if-no-files-found: error - name: Upload artifacts with completions if: matrix.arch == 'amd64' uses: actions/upload-artifact@v4 with: - name: backend-assets-${{ matrix.arch }} + name: core-assets-${{ matrix.arch }} path: | - backend/dankinstall-${{ matrix.arch }}.gz - backend/dankinstall-${{ matrix.arch }}.gz.sha256 - backend/dms-${{ matrix.arch }}.gz - backend/dms-${{ matrix.arch }}.gz.sha256 - backend/dms-distropkg-${{ matrix.arch }}.gz - backend/dms-distropkg-${{ matrix.arch }}.gz.sha256 - backend/completion.bash - backend/completion.fish - backend/completion.zsh + core/dankinstall-${{ matrix.arch }}.gz + core/dankinstall-${{ matrix.arch }}.gz.sha256 + core/dms-${{ matrix.arch }}.gz + core/dms-${{ matrix.arch }}.gz.sha256 + core/dms-distropkg-${{ matrix.arch }}.gz + core/dms-distropkg-${{ matrix.arch }}.gz.sha256 + core/completion.bash + core/completion.fish + core/completion.zsh if-no-files-found: error update-versions: @@ -142,10 +142,10 @@ jobs: # Update VERSION file in quickshell/ echo "${version}" > quickshell/VERSION - # Update version in backend/flake.nix - sed -i "s/version = \"[^\"]*\"/version = \"$version_no_v\"/" backend/flake.nix + # Update version in core/flake.nix + sed -i "s/version = \"[^\"]*\"/version = \"$version_no_v\"/" core/flake.nix - git add quickshell/VERSION backend/flake.nix + git add quickshell/VERSION core/flake.nix if ! git diff --cached --quiet; then git commit -m "chore: bump version to $version" @@ -157,7 +157,7 @@ jobs: release: runs-on: ubuntu-24.04 - needs: build-backend + needs: build-core env: TAG: ${{ github.ref_name }} steps: @@ -166,12 +166,12 @@ jobs: with: fetch-depth: 0 - - name: Download backend artifacts + - name: Download core artifacts uses: actions/download-artifact@v4 with: - pattern: backend-assets-* + pattern: core-assets-* merge-multiple: true - path: ./_backend_assets + path: ./_core_assets - name: Generate Changelog id: changelog @@ -233,8 +233,8 @@ jobs: mkdir -p _release_assets - # Copy backend binaries and rename dms-*.gz to dms-cli-*.gz - for file in _backend_assets/dms-*.gz*; do + # Copy core binaries and rename dms-*.gz to dms-cli-*.gz + for file in _core_assets/dms-*.gz*; do if [ -f "$file" ]; then basename=$(basename "$file") if [[ "$basename" == dms-distropkg-* ]]; then @@ -247,10 +247,10 @@ jobs: done # Copy dankinstall binaries - cp _backend_assets/dankinstall-*.gz* _release_assets/ + cp _core_assets/dankinstall-*.gz* _release_assets/ # Copy completions - cp _backend_assets/completion.* _release_assets/ 2>/dev/null || true + cp _core_assets/completion.* _release_assets/ 2>/dev/null || true # Create QML source package (exclude build artifacts and git files) # Tar the CONTENTS of quickshell/, not the directory itself @@ -272,18 +272,18 @@ jobs: tar -xzf _release_assets/dms-qml.tar.gz -C _temp_full/dms # Add CLI binaries - if [ -f "_backend_assets/dms-${arch}.gz" ]; then - gunzip -c "_backend_assets/dms-${arch}.gz" > _temp_full/bin/dms + if [ -f "_core_assets/dms-${arch}.gz" ]; then + gunzip -c "_core_assets/dms-${arch}.gz" > _temp_full/bin/dms chmod +x _temp_full/bin/dms fi - if [ -f "_backend_assets/dms-distropkg-${arch}.gz" ]; then - gunzip -c "_backend_assets/dms-distropkg-${arch}.gz" > _temp_full/bin/dms-distropkg + if [ -f "_core_assets/dms-distropkg-${arch}.gz" ]; then + gunzip -c "_core_assets/dms-distropkg-${arch}.gz" > _temp_full/bin/dms-distropkg chmod +x _temp_full/bin/dms-distropkg fi # Add shell completions - for completion in _backend_assets/completion.*; do + for completion in _core_assets/completion.*; do if [ -f "$completion" ]; then cp "$completion" _temp_full/completions/ fi diff --git a/.github/workflows/update-vendor-hash.yml b/.github/workflows/update-vendor-hash.yml index 0187e291..0bd9b6d4 100644 --- a/.github/workflows/update-vendor-hash.yml +++ b/.github/workflows/update-vendor-hash.yml @@ -3,8 +3,8 @@ name: Update Vendor Hash on: push: paths: - - "backend/go.mod" - - "backend/go.sum" + - "core/go.mod" + - "core/go.sum" branches: - NOOP @@ -20,13 +20,13 @@ jobs: - name: Install Nix uses: cachix/install-nix-action@v31 - - name: Update vendorHash in backend/flake.nix + - name: Update vendorHash in core/flake.nix run: | set -euo pipefail # Try to build and capture the expected hash from error message echo "Attempting nix build to get new vendorHash..." - cd backend + cd core if output=$(nix build .#dms-cli 2>&1); then echo "Build succeeded, no hash update needed" exit 0 @@ -66,11 +66,11 @@ jobs: run: | set -euo pipefail - if ! git diff --quiet backend/flake.nix; then + if ! git diff --quiet core/flake.nix; then git config user.name "github-actions[bot]" git config user.email "github-actions[bot]@users.noreply.github.com" - git add backend/flake.nix + git add core/flake.nix git commit -m "flake: update vendorHash for go.mod changes" for attempt in 1 2 3; do @@ -86,5 +86,5 @@ jobs: echo "Failed to push after retries" >&2 exit 1 else - echo "No changes to backend/flake.nix" + echo "No changes to core/flake.nix" fi diff --git a/README.md b/README.md index 7dfe519d..a215b9a6 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ DankMaterialShell is a complete desktop shell for [niri](https://github.com/YaLT ## Repository Structure -This is a monorepo containing both the shell interface and backend services: +This is a monorepo containing both the shell interface and the core backend services: ``` DankMaterialShell/ @@ -32,7 +32,7 @@ DankMaterialShell/ │ ├── Services/ # System integration (audio, network, bluetooth) │ ├── Widgets/ # Reusable UI controls │ └── Common/ # Shared resources and themes -├── backend/ # Go backend and CLI +├── core/ # Go backend and CLI │ ├── cmd/ # dms CLI and dankinstall binaries │ ├── internal/ # System integration, IPC, distro support │ └── pkg/ # Shared packages @@ -135,15 +135,15 @@ dms plugins search # Browse plugin registry See component-specific documentation: - **[quickshell/](quickshell/)** - QML shell development, widgets, and modules -- **[backend/](backend/)** - Go backend, CLI tools, and system integration +- **[core/](core/)** - Go backend, CLI tools, and system integration - **[distro/](distro/)** - Distribution packaging - **[nix/](nix/)** - NixOS and home-manager modules ### Building from Source -**Backend:** +**Core + Dankinstall:** ```bash -cd backend +cd core make # Build dms CLI make dankinstall # Build installer ``` diff --git a/backend/Makefile b/core/Makefile similarity index 100% rename from backend/Makefile rename to core/Makefile diff --git a/backend/README.md b/core/README.md similarity index 100% rename from backend/README.md rename to core/README.md diff --git a/backend/assets/dank.svg b/core/assets/dank.svg similarity index 100% rename from backend/assets/dank.svg rename to core/assets/dank.svg diff --git a/backend/assets/danklogo.svg b/core/assets/danklogo.svg similarity index 100% rename from backend/assets/danklogo.svg rename to core/assets/danklogo.svg diff --git a/backend/build_dankinstall.sh b/core/build_dankinstall.sh similarity index 100% rename from backend/build_dankinstall.sh rename to core/build_dankinstall.sh diff --git a/backend/cmd/dankinstall/main.go b/core/cmd/dankinstall/main.go similarity index 88% rename from backend/cmd/dankinstall/main.go rename to core/cmd/dankinstall/main.go index 09cac8d4..0e6afcbf 100644 --- a/backend/cmd/dankinstall/main.go +++ b/core/cmd/dankinstall/main.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/logger" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/tui" + "github.com/AvengeMedia/DankMaterialShell/core/internal/logger" + "github.com/AvengeMedia/DankMaterialShell/core/internal/tui" tea "github.com/charmbracelet/bubbletea" ) diff --git a/backend/cmd/dms/commands_brightness.go b/core/cmd/dms/commands_brightness.go similarity index 98% rename from backend/cmd/dms/commands_brightness.go rename to core/cmd/dms/commands_brightness.go index 5570e57b..88c287a3 100644 --- a/backend/cmd/dms/commands_brightness.go +++ b/core/cmd/dms/commands_brightness.go @@ -5,8 +5,8 @@ import ( "strings" "time" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/log" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/server/brightness" + "github.com/AvengeMedia/DankMaterialShell/core/internal/log" + "github.com/AvengeMedia/DankMaterialShell/core/internal/server/brightness" "github.com/spf13/cobra" ) diff --git a/backend/cmd/dms/commands_common.go b/core/cmd/dms/commands_common.go similarity index 97% rename from backend/cmd/dms/commands_common.go rename to core/cmd/dms/commands_common.go index 7873ff75..79054feb 100644 --- a/backend/cmd/dms/commands_common.go +++ b/core/cmd/dms/commands_common.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/log" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/plugins" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/server" + "github.com/AvengeMedia/DankMaterialShell/core/internal/log" + "github.com/AvengeMedia/DankMaterialShell/core/internal/plugins" + "github.com/AvengeMedia/DankMaterialShell/core/internal/server" "github.com/spf13/cobra" ) diff --git a/backend/cmd/dms/commands_dank16.go b/core/cmd/dms/commands_dank16.go similarity index 95% rename from backend/cmd/dms/commands_dank16.go rename to core/cmd/dms/commands_dank16.go index bfb2d8fb..f3b6b128 100644 --- a/backend/cmd/dms/commands_dank16.go +++ b/core/cmd/dms/commands_dank16.go @@ -5,8 +5,8 @@ import ( "os" "strings" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/dank16" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/log" + "github.com/AvengeMedia/DankMaterialShell/core/internal/dank16" + "github.com/AvengeMedia/DankMaterialShell/core/internal/log" "github.com/spf13/cobra" ) diff --git a/backend/cmd/dms/commands_features.go b/core/cmd/dms/commands_features.go similarity index 98% rename from backend/cmd/dms/commands_features.go rename to core/cmd/dms/commands_features.go index 0ea5c572..4eb82ebf 100644 --- a/backend/cmd/dms/commands_features.go +++ b/core/cmd/dms/commands_features.go @@ -12,10 +12,10 @@ import ( "strings" "time" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/distros" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/errdefs" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/log" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/version" + "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/version" "github.com/spf13/cobra" ) diff --git a/backend/cmd/dms/commands_greeter.go b/core/cmd/dms/commands_greeter.go similarity index 99% rename from backend/cmd/dms/commands_greeter.go rename to core/cmd/dms/commands_greeter.go index d24f6ca3..176cce23 100644 --- a/backend/cmd/dms/commands_greeter.go +++ b/core/cmd/dms/commands_greeter.go @@ -8,8 +8,8 @@ import ( "path/filepath" "strings" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/greeter" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/log" + "github.com/AvengeMedia/DankMaterialShell/core/internal/greeter" + "github.com/AvengeMedia/DankMaterialShell/core/internal/log" "github.com/spf13/cobra" ) diff --git a/backend/cmd/dms/commands_keybinds.go b/core/cmd/dms/commands_keybinds.go similarity index 94% rename from backend/cmd/dms/commands_keybinds.go rename to core/cmd/dms/commands_keybinds.go index ddd73947..0cc0db40 100644 --- a/backend/cmd/dms/commands_keybinds.go +++ b/core/cmd/dms/commands_keybinds.go @@ -5,9 +5,9 @@ import ( "fmt" "os" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/keybinds" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/keybinds/providers" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/log" + "github.com/AvengeMedia/DankMaterialShell/core/internal/keybinds" + "github.com/AvengeMedia/DankMaterialShell/core/internal/keybinds/providers" + "github.com/AvengeMedia/DankMaterialShell/core/internal/log" "github.com/spf13/cobra" ) diff --git a/backend/cmd/dms/commands_root.go b/core/cmd/dms/commands_root.go similarity index 91% rename from backend/cmd/dms/commands_root.go rename to core/cmd/dms/commands_root.go index dc5f2437..531c8275 100644 --- a/backend/cmd/dms/commands_root.go +++ b/core/cmd/dms/commands_root.go @@ -7,10 +7,10 @@ import ( "path/filepath" "strings" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/config" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/distros" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/dms" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/log" + "github.com/AvengeMedia/DankMaterialShell/core/internal/config" + "github.com/AvengeMedia/DankMaterialShell/core/internal/distros" + "github.com/AvengeMedia/DankMaterialShell/core/internal/dms" + "github.com/AvengeMedia/DankMaterialShell/core/internal/log" tea "github.com/charmbracelet/bubbletea" "github.com/spf13/cobra" ) diff --git a/backend/cmd/dms/commands_setup.go b/core/cmd/dms/commands_setup.go similarity index 95% rename from backend/cmd/dms/commands_setup.go rename to core/cmd/dms/commands_setup.go index 5e58d61f..e6281dfe 100644 --- a/backend/cmd/dms/commands_setup.go +++ b/core/cmd/dms/commands_setup.go @@ -7,9 +7,9 @@ import ( "path/filepath" "strings" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/config" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/deps" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/log" + "github.com/AvengeMedia/DankMaterialShell/core/internal/config" + "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" + "github.com/AvengeMedia/DankMaterialShell/core/internal/log" "github.com/spf13/cobra" ) diff --git a/backend/cmd/dms/main.go b/core/cmd/dms/main.go similarity index 94% rename from backend/cmd/dms/main.go rename to core/cmd/dms/main.go index a65ab1f7..74dfe2b0 100644 --- a/backend/cmd/dms/main.go +++ b/core/cmd/dms/main.go @@ -5,7 +5,7 @@ package main import ( "os" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/log" + "github.com/AvengeMedia/DankMaterialShell/core/internal/log" ) var Version = "dev" diff --git a/backend/cmd/dms/main_distro.go b/core/cmd/dms/main_distro.go similarity index 93% rename from backend/cmd/dms/main_distro.go rename to core/cmd/dms/main_distro.go index a0a03132..86d6cfd2 100644 --- a/backend/cmd/dms/main_distro.go +++ b/core/cmd/dms/main_distro.go @@ -5,7 +5,7 @@ package main import ( "os" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/log" + "github.com/AvengeMedia/DankMaterialShell/core/internal/log" ) var Version = "dev" diff --git a/backend/cmd/dms/shell.go b/core/cmd/dms/shell.go similarity index 98% rename from backend/cmd/dms/shell.go rename to core/cmd/dms/shell.go index b9bd0e1e..b10d96ea 100644 --- a/backend/cmd/dms/shell.go +++ b/core/cmd/dms/shell.go @@ -12,8 +12,8 @@ import ( "syscall" "time" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/log" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/server" + "github.com/AvengeMedia/DankMaterialShell/core/internal/log" + "github.com/AvengeMedia/DankMaterialShell/core/internal/server" ) var isSessionManaged bool diff --git a/backend/cmd/dms/ui.go b/core/cmd/dms/ui.go similarity index 96% rename from backend/cmd/dms/ui.go rename to core/cmd/dms/ui.go index ed20ac81..a551eba8 100644 --- a/backend/cmd/dms/ui.go +++ b/core/cmd/dms/ui.go @@ -3,7 +3,7 @@ package main import ( "fmt" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/tui" + "github.com/AvengeMedia/DankMaterialShell/core/internal/tui" "github.com/charmbracelet/lipgloss" ) diff --git a/backend/cmd/dms/utils.go b/core/cmd/dms/utils.go similarity index 100% rename from backend/cmd/dms/utils.go rename to core/cmd/dms/utils.go diff --git a/backend/go.mod b/core/go.mod similarity index 97% rename from backend/go.mod rename to core/go.mod index ba864610..7b3fe28a 100644 --- a/backend/go.mod +++ b/core/go.mod @@ -1,4 +1,4 @@ -module github.com/AvengeMedia/DankMaterialShell/backend +module github.com/AvengeMedia/DankMaterialShell/core go 1.24.6 diff --git a/backend/go.sum b/core/go.sum similarity index 100% rename from backend/go.sum rename to core/go.sum diff --git a/backend/install.sh b/core/install.sh similarity index 100% rename from backend/install.sh rename to core/install.sh diff --git a/backend/internal/config/deployer.go b/core/internal/config/deployer.go similarity index 99% rename from backend/internal/config/deployer.go rename to core/internal/config/deployer.go index 823c1664..bd0f6913 100644 --- a/backend/internal/config/deployer.go +++ b/core/internal/config/deployer.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/deps" + "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" ) type ConfigDeployer struct { diff --git a/backend/internal/config/deployer_test.go b/core/internal/config/deployer_test.go similarity index 99% rename from backend/internal/config/deployer_test.go rename to core/internal/config/deployer_test.go index 92df7b5d..cfb32ad3 100644 --- a/backend/internal/config/deployer_test.go +++ b/core/internal/config/deployer_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/deps" + "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/backend/internal/config/dms.go b/core/internal/config/dms.go similarity index 100% rename from backend/internal/config/dms.go rename to core/internal/config/dms.go diff --git a/backend/internal/config/embedded/alacritty-theme.toml b/core/internal/config/embedded/alacritty-theme.toml similarity index 100% rename from backend/internal/config/embedded/alacritty-theme.toml rename to core/internal/config/embedded/alacritty-theme.toml diff --git a/backend/internal/config/embedded/alacritty.toml b/core/internal/config/embedded/alacritty.toml similarity index 100% rename from backend/internal/config/embedded/alacritty.toml rename to core/internal/config/embedded/alacritty.toml diff --git a/backend/internal/config/embedded/ghostty-colors.conf b/core/internal/config/embedded/ghostty-colors.conf similarity index 100% rename from backend/internal/config/embedded/ghostty-colors.conf rename to core/internal/config/embedded/ghostty-colors.conf diff --git a/backend/internal/config/embedded/ghostty.conf b/core/internal/config/embedded/ghostty.conf similarity index 100% rename from backend/internal/config/embedded/ghostty.conf rename to core/internal/config/embedded/ghostty.conf diff --git a/backend/internal/config/embedded/hyprland.conf b/core/internal/config/embedded/hyprland.conf similarity index 100% rename from backend/internal/config/embedded/hyprland.conf rename to core/internal/config/embedded/hyprland.conf diff --git a/backend/internal/config/embedded/kitty-tabs.conf b/core/internal/config/embedded/kitty-tabs.conf similarity index 100% rename from backend/internal/config/embedded/kitty-tabs.conf rename to core/internal/config/embedded/kitty-tabs.conf diff --git a/backend/internal/config/embedded/kitty-theme.conf b/core/internal/config/embedded/kitty-theme.conf similarity index 100% rename from backend/internal/config/embedded/kitty-theme.conf rename to core/internal/config/embedded/kitty-theme.conf diff --git a/backend/internal/config/embedded/kitty.conf b/core/internal/config/embedded/kitty.conf similarity index 100% rename from backend/internal/config/embedded/kitty.conf rename to core/internal/config/embedded/kitty.conf diff --git a/backend/internal/config/embedded/niri.kdl b/core/internal/config/embedded/niri.kdl similarity index 100% rename from backend/internal/config/embedded/niri.kdl rename to core/internal/config/embedded/niri.kdl diff --git a/backend/internal/config/hyprland.go b/core/internal/config/hyprland.go similarity index 100% rename from backend/internal/config/hyprland.go rename to core/internal/config/hyprland.go diff --git a/backend/internal/config/niri.go b/core/internal/config/niri.go similarity index 100% rename from backend/internal/config/niri.go rename to core/internal/config/niri.go diff --git a/backend/internal/config/terminals.go b/core/internal/config/terminals.go similarity index 100% rename from backend/internal/config/terminals.go rename to core/internal/config/terminals.go diff --git a/backend/internal/dank16/dank16.go b/core/internal/dank16/dank16.go similarity index 100% rename from backend/internal/dank16/dank16.go rename to core/internal/dank16/dank16.go diff --git a/backend/internal/dank16/dank16_test.go b/core/internal/dank16/dank16_test.go similarity index 100% rename from backend/internal/dank16/dank16_test.go rename to core/internal/dank16/dank16_test.go diff --git a/backend/internal/dank16/terminals.go b/core/internal/dank16/terminals.go similarity index 100% rename from backend/internal/dank16/terminals.go rename to core/internal/dank16/terminals.go diff --git a/backend/internal/dank16/vscode.go b/core/internal/dank16/vscode.go similarity index 100% rename from backend/internal/dank16/vscode.go rename to core/internal/dank16/vscode.go diff --git a/backend/internal/deps/detector.go b/core/internal/deps/detector.go similarity index 100% rename from backend/internal/deps/detector.go rename to core/internal/deps/detector.go diff --git a/backend/internal/distros/arch.go b/core/internal/distros/arch.go similarity index 99% rename from backend/internal/distros/arch.go rename to core/internal/distros/arch.go index b778c264..48ca5c87 100644 --- a/backend/internal/distros/arch.go +++ b/core/internal/distros/arch.go @@ -9,7 +9,7 @@ import ( "runtime" "strings" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/deps" + "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" ) func init() { diff --git a/backend/internal/distros/base.go b/core/internal/distros/base.go similarity index 99% rename from backend/internal/distros/base.go rename to core/internal/distros/base.go index 371fa31f..85e72ee5 100644 --- a/backend/internal/distros/base.go +++ b/core/internal/distros/base.go @@ -13,8 +13,8 @@ import ( "strings" "time" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/deps" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/version" + "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" + "github.com/AvengeMedia/DankMaterialShell/core/internal/version" ) const forceQuickshellGit = false diff --git a/backend/internal/distros/base_test.go b/core/internal/distros/base_test.go similarity index 98% rename from backend/internal/distros/base_test.go rename to core/internal/distros/base_test.go index 5cbcb769..16987ae4 100644 --- a/backend/internal/distros/base_test.go +++ b/core/internal/distros/base_test.go @@ -6,7 +6,7 @@ import ( "path/filepath" "testing" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/deps" + "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" ) func TestBaseDistribution_detectDMS_NotInstalled(t *testing.T) { diff --git a/backend/internal/distros/debian.go b/core/internal/distros/debian.go similarity index 99% rename from backend/internal/distros/debian.go rename to core/internal/distros/debian.go index fb12765a..8e45afa7 100644 --- a/backend/internal/distros/debian.go +++ b/core/internal/distros/debian.go @@ -6,7 +6,7 @@ import ( "os/exec" "strings" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/deps" + "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" ) func init() { diff --git a/backend/internal/distros/factory.go b/core/internal/distros/factory.go similarity index 89% rename from backend/internal/distros/factory.go rename to core/internal/distros/factory.go index fb5ecf94..9c3826a2 100644 --- a/backend/internal/distros/factory.go +++ b/core/internal/distros/factory.go @@ -1,7 +1,7 @@ package distros import ( - "github.com/AvengeMedia/DankMaterialShell/backend/internal/deps" + "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" ) // NewDependencyDetector creates a DependencyDetector for the specified distribution diff --git a/backend/internal/distros/fedora.go b/core/internal/distros/fedora.go similarity index 99% rename from backend/internal/distros/fedora.go rename to core/internal/distros/fedora.go index f9a601c7..145b55f8 100644 --- a/backend/internal/distros/fedora.go +++ b/core/internal/distros/fedora.go @@ -6,7 +6,7 @@ import ( "os/exec" "strings" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/deps" + "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" ) func init() { diff --git a/backend/internal/distros/gentoo.go b/core/internal/distros/gentoo.go similarity index 99% rename from backend/internal/distros/gentoo.go rename to core/internal/distros/gentoo.go index b7281c47..c29106b3 100644 --- a/backend/internal/distros/gentoo.go +++ b/core/internal/distros/gentoo.go @@ -7,7 +7,7 @@ import ( "runtime" "strings" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/deps" + "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" ) var GentooGlobalUseFlags = []string{ diff --git a/backend/internal/distros/interface.go b/core/internal/distros/interface.go similarity index 98% rename from backend/internal/distros/interface.go rename to core/internal/distros/interface.go index 5256d3c8..70a86873 100644 --- a/backend/internal/distros/interface.go +++ b/core/internal/distros/interface.go @@ -3,7 +3,7 @@ package distros import ( "context" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/deps" + "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" ) // DistroFamily represents a family of related distributions diff --git a/backend/internal/distros/manual_packages.go b/core/internal/distros/manual_packages.go similarity index 100% rename from backend/internal/distros/manual_packages.go rename to core/internal/distros/manual_packages.go diff --git a/backend/internal/distros/manual_packages_test.go b/core/internal/distros/manual_packages_test.go similarity index 100% rename from backend/internal/distros/manual_packages_test.go rename to core/internal/distros/manual_packages_test.go diff --git a/backend/internal/distros/nixos.go b/core/internal/distros/nixos.go similarity index 99% rename from backend/internal/distros/nixos.go rename to core/internal/distros/nixos.go index 0284e741..9f876e7d 100644 --- a/backend/internal/distros/nixos.go +++ b/core/internal/distros/nixos.go @@ -6,7 +6,7 @@ import ( "os/exec" "strings" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/deps" + "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" ) func init() { diff --git a/backend/internal/distros/opensuse.go b/core/internal/distros/opensuse.go similarity index 99% rename from backend/internal/distros/opensuse.go rename to core/internal/distros/opensuse.go index e9936235..bce9096c 100644 --- a/backend/internal/distros/opensuse.go +++ b/core/internal/distros/opensuse.go @@ -8,7 +8,7 @@ import ( "path/filepath" "strings" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/deps" + "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" ) func init() { diff --git a/backend/internal/distros/osinfo.go b/core/internal/distros/osinfo.go similarity index 97% rename from backend/internal/distros/osinfo.go rename to core/internal/distros/osinfo.go index 6a6e4422..90a86cf0 100644 --- a/backend/internal/distros/osinfo.go +++ b/core/internal/distros/osinfo.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/errdefs" + "github.com/AvengeMedia/DankMaterialShell/core/internal/errdefs" ) // DistroInfo contains basic information about a distribution diff --git a/backend/internal/distros/ubuntu.go b/core/internal/distros/ubuntu.go similarity index 99% rename from backend/internal/distros/ubuntu.go rename to core/internal/distros/ubuntu.go index 741f5882..e4a30d97 100644 --- a/backend/internal/distros/ubuntu.go +++ b/core/internal/distros/ubuntu.go @@ -8,7 +8,7 @@ import ( "path/filepath" "strings" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/deps" + "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" ) func init() { diff --git a/backend/internal/dms/app.go b/core/internal/dms/app.go similarity index 99% rename from backend/internal/dms/app.go rename to core/internal/dms/app.go index 2f7fb8cc..82f85e47 100644 --- a/backend/internal/dms/app.go +++ b/core/internal/dms/app.go @@ -6,7 +6,7 @@ import ( "os/exec" "strings" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/deps" + "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" tea "github.com/charmbracelet/bubbletea" ) diff --git a/backend/internal/dms/app_distro.go b/core/internal/dms/app_distro.go similarity index 100% rename from backend/internal/dms/app_distro.go rename to core/internal/dms/app_distro.go diff --git a/backend/internal/dms/detector.go b/core/internal/dms/detector.go similarity index 94% rename from backend/internal/dms/detector.go rename to core/internal/dms/detector.go index 7c3d528b..37ea1e6a 100644 --- a/backend/internal/dms/detector.go +++ b/core/internal/dms/detector.go @@ -5,9 +5,9 @@ import ( "os" "os/exec" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/config" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/deps" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/distros" + "github.com/AvengeMedia/DankMaterialShell/core/internal/config" + "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" + "github.com/AvengeMedia/DankMaterialShell/core/internal/distros" ) type Detector struct { diff --git a/backend/internal/dms/handlers_common.go b/core/internal/dms/handlers_common.go similarity index 93% rename from backend/internal/dms/handlers_common.go rename to core/internal/dms/handlers_common.go index 764a9b54..58c2df55 100644 --- a/backend/internal/dms/handlers_common.go +++ b/core/internal/dms/handlers_common.go @@ -4,7 +4,7 @@ import ( "os/exec" "time" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/log" + "github.com/AvengeMedia/DankMaterialShell/core/internal/log" tea "github.com/charmbracelet/bubbletea" ) diff --git a/backend/internal/dms/handlers_features.go b/core/internal/dms/handlers_features.go similarity index 97% rename from backend/internal/dms/handlers_features.go rename to core/internal/dms/handlers_features.go index cef1a9e4..5103b4ba 100644 --- a/backend/internal/dms/handlers_features.go +++ b/core/internal/dms/handlers_features.go @@ -9,9 +9,9 @@ import ( "strings" "time" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/deps" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/distros" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/greeter" + "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" + "github.com/AvengeMedia/DankMaterialShell/core/internal/distros" + "github.com/AvengeMedia/DankMaterialShell/core/internal/greeter" tea "github.com/charmbracelet/bubbletea" ) diff --git a/backend/internal/dms/handlers_mainmenu.go b/core/internal/dms/handlers_mainmenu.go similarity index 100% rename from backend/internal/dms/handlers_mainmenu.go rename to core/internal/dms/handlers_mainmenu.go diff --git a/backend/internal/dms/handlers_mainmenu_distro.go b/core/internal/dms/handlers_mainmenu_distro.go similarity index 100% rename from backend/internal/dms/handlers_mainmenu_distro.go rename to core/internal/dms/handlers_mainmenu_distro.go diff --git a/backend/internal/dms/plugins_handlers.go b/core/internal/dms/plugins_handlers.go similarity index 99% rename from backend/internal/dms/plugins_handlers.go rename to core/internal/dms/plugins_handlers.go index debcf946..ae2493fe 100644 --- a/backend/internal/dms/plugins_handlers.go +++ b/core/internal/dms/plugins_handlers.go @@ -3,7 +3,7 @@ package dms import ( "strings" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/plugins" + "github.com/AvengeMedia/DankMaterialShell/core/internal/plugins" tea "github.com/charmbracelet/bubbletea" ) diff --git a/backend/internal/dms/plugins_views.go b/core/internal/dms/plugins_views.go similarity index 100% rename from backend/internal/dms/plugins_views.go rename to core/internal/dms/plugins_views.go diff --git a/backend/internal/dms/views_common.go b/core/internal/dms/views_common.go similarity index 98% rename from backend/internal/dms/views_common.go rename to core/internal/dms/views_common.go index 621de71d..ff5d9e85 100644 --- a/backend/internal/dms/views_common.go +++ b/core/internal/dms/views_common.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/tui" + "github.com/AvengeMedia/DankMaterialShell/core/internal/tui" "github.com/charmbracelet/lipgloss" ) diff --git a/backend/internal/dms/views_features.go b/core/internal/dms/views_features.go similarity index 100% rename from backend/internal/dms/views_features.go rename to core/internal/dms/views_features.go diff --git a/backend/internal/errdefs/errdefs.go b/core/internal/errdefs/errdefs.go similarity index 100% rename from backend/internal/errdefs/errdefs.go rename to core/internal/errdefs/errdefs.go diff --git a/backend/internal/greeter/installer.go b/core/internal/greeter/installer.go similarity index 99% rename from backend/internal/greeter/installer.go rename to core/internal/greeter/installer.go index c16431bf..bf78e7ac 100644 --- a/backend/internal/greeter/installer.go +++ b/core/internal/greeter/installer.go @@ -9,8 +9,8 @@ import ( "path/filepath" "strings" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/config" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/distros" + "github.com/AvengeMedia/DankMaterialShell/core/internal/config" + "github.com/AvengeMedia/DankMaterialShell/core/internal/distros" ) // DetectDMSPath checks for DMS installation following XDG Base Directory specification diff --git a/backend/internal/hyprland/keybinds.go b/core/internal/hyprland/keybinds.go similarity index 100% rename from backend/internal/hyprland/keybinds.go rename to core/internal/hyprland/keybinds.go diff --git a/backend/internal/hyprland/keybinds_test.go b/core/internal/hyprland/keybinds_test.go similarity index 100% rename from backend/internal/hyprland/keybinds_test.go rename to core/internal/hyprland/keybinds_test.go diff --git a/backend/internal/keybinds/discovery.go b/core/internal/keybinds/discovery.go similarity index 100% rename from backend/internal/keybinds/discovery.go rename to core/internal/keybinds/discovery.go diff --git a/backend/internal/keybinds/discovery_test.go b/core/internal/keybinds/discovery_test.go similarity index 100% rename from backend/internal/keybinds/discovery_test.go rename to core/internal/keybinds/discovery_test.go diff --git a/backend/internal/keybinds/providers/hyprland.go b/core/internal/keybinds/providers/hyprland.go similarity index 95% rename from backend/internal/keybinds/providers/hyprland.go rename to core/internal/keybinds/providers/hyprland.go index 0cb68a5f..bb9b05f6 100644 --- a/backend/internal/keybinds/providers/hyprland.go +++ b/core/internal/keybinds/providers/hyprland.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/hyprland" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/keybinds" + "github.com/AvengeMedia/DankMaterialShell/core/internal/hyprland" + "github.com/AvengeMedia/DankMaterialShell/core/internal/keybinds" ) type HyprlandProvider struct { diff --git a/backend/internal/keybinds/providers/hyprland_test.go b/core/internal/keybinds/providers/hyprland_test.go similarity index 100% rename from backend/internal/keybinds/providers/hyprland_test.go rename to core/internal/keybinds/providers/hyprland_test.go diff --git a/backend/internal/keybinds/providers/jsonfile.go b/core/internal/keybinds/providers/jsonfile.go similarity index 97% rename from backend/internal/keybinds/providers/jsonfile.go rename to core/internal/keybinds/providers/jsonfile.go index d204ef92..af7218ba 100644 --- a/backend/internal/keybinds/providers/jsonfile.go +++ b/core/internal/keybinds/providers/jsonfile.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/keybinds" + "github.com/AvengeMedia/DankMaterialShell/core/internal/keybinds" ) type JSONFileProvider struct { diff --git a/backend/internal/keybinds/providers/jsonfile_test.go b/core/internal/keybinds/providers/jsonfile_test.go similarity index 100% rename from backend/internal/keybinds/providers/jsonfile_test.go rename to core/internal/keybinds/providers/jsonfile_test.go diff --git a/backend/internal/keybinds/providers/mangowc.go b/core/internal/keybinds/providers/mangowc.go similarity index 95% rename from backend/internal/keybinds/providers/mangowc.go rename to core/internal/keybinds/providers/mangowc.go index 804f8215..1f3a3f43 100644 --- a/backend/internal/keybinds/providers/mangowc.go +++ b/core/internal/keybinds/providers/mangowc.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/keybinds" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/mangowc" + "github.com/AvengeMedia/DankMaterialShell/core/internal/keybinds" + "github.com/AvengeMedia/DankMaterialShell/core/internal/mangowc" ) type MangoWCProvider struct { diff --git a/backend/internal/keybinds/providers/mangowc_test.go b/core/internal/keybinds/providers/mangowc_test.go similarity index 99% rename from backend/internal/keybinds/providers/mangowc_test.go rename to core/internal/keybinds/providers/mangowc_test.go index 2910add2..2ce1371b 100644 --- a/backend/internal/keybinds/providers/mangowc_test.go +++ b/core/internal/keybinds/providers/mangowc_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/mangowc" + "github.com/AvengeMedia/DankMaterialShell/core/internal/mangowc" ) func TestMangoWCProviderName(t *testing.T) { diff --git a/backend/internal/keybinds/providers/sway.go b/core/internal/keybinds/providers/sway.go similarity index 95% rename from backend/internal/keybinds/providers/sway.go rename to core/internal/keybinds/providers/sway.go index 748cfe47..7ca06539 100644 --- a/backend/internal/keybinds/providers/sway.go +++ b/core/internal/keybinds/providers/sway.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/keybinds" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/sway" + "github.com/AvengeMedia/DankMaterialShell/core/internal/keybinds" + "github.com/AvengeMedia/DankMaterialShell/core/internal/sway" ) type SwayProvider struct { diff --git a/backend/internal/keybinds/providers/sway_test.go b/core/internal/keybinds/providers/sway_test.go similarity index 99% rename from backend/internal/keybinds/providers/sway_test.go rename to core/internal/keybinds/providers/sway_test.go index 946042b9..440cdc0b 100644 --- a/backend/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/backend/internal/sway" + "github.com/AvengeMedia/DankMaterialShell/core/internal/sway" ) func TestSwayProviderName(t *testing.T) { diff --git a/backend/internal/keybinds/registry.go b/core/internal/keybinds/registry.go similarity index 100% rename from backend/internal/keybinds/registry.go rename to core/internal/keybinds/registry.go diff --git a/backend/internal/keybinds/registry_test.go b/core/internal/keybinds/registry_test.go similarity index 100% rename from backend/internal/keybinds/registry_test.go rename to core/internal/keybinds/registry_test.go diff --git a/backend/internal/keybinds/types.go b/core/internal/keybinds/types.go similarity index 100% rename from backend/internal/keybinds/types.go rename to core/internal/keybinds/types.go diff --git a/backend/internal/log/log.go b/core/internal/log/log.go similarity index 100% rename from backend/internal/log/log.go rename to core/internal/log/log.go diff --git a/backend/internal/logger/filelogger.go b/core/internal/logger/filelogger.go similarity index 100% rename from backend/internal/logger/filelogger.go rename to core/internal/logger/filelogger.go diff --git a/backend/internal/mangowc/keybinds.go b/core/internal/mangowc/keybinds.go similarity index 100% rename from backend/internal/mangowc/keybinds.go rename to core/internal/mangowc/keybinds.go diff --git a/backend/internal/mangowc/keybinds_test.go b/core/internal/mangowc/keybinds_test.go similarity index 100% rename from backend/internal/mangowc/keybinds_test.go rename to core/internal/mangowc/keybinds_test.go diff --git a/backend/internal/mocks/brightness/mock_DBusConn.go b/core/internal/mocks/brightness/mock_DBusConn.go similarity index 100% rename from backend/internal/mocks/brightness/mock_DBusConn.go rename to core/internal/mocks/brightness/mock_DBusConn.go diff --git a/backend/internal/mocks/cups/mock_CUPSClientInterface.go b/core/internal/mocks/cups/mock_CUPSClientInterface.go similarity index 99% rename from backend/internal/mocks/cups/mock_CUPSClientInterface.go rename to core/internal/mocks/cups/mock_CUPSClientInterface.go index 15b33250..3e198496 100644 --- a/backend/internal/mocks/cups/mock_CUPSClientInterface.go +++ b/core/internal/mocks/cups/mock_CUPSClientInterface.go @@ -5,7 +5,7 @@ package mocks_cups import ( io "io" - ipp "github.com/AvengeMedia/DankMaterialShell/backend/pkg/ipp" + ipp "github.com/AvengeMedia/DankMaterialShell/core/pkg/ipp" mock "github.com/stretchr/testify/mock" ) diff --git a/backend/internal/mocks/github.com/Wifx/gonetworkmanager/v2/mock_AccessPoint.go b/core/internal/mocks/github.com/Wifx/gonetworkmanager/v2/mock_AccessPoint.go similarity index 100% rename from backend/internal/mocks/github.com/Wifx/gonetworkmanager/v2/mock_AccessPoint.go rename to core/internal/mocks/github.com/Wifx/gonetworkmanager/v2/mock_AccessPoint.go diff --git a/backend/internal/mocks/github.com/Wifx/gonetworkmanager/v2/mock_ActiveConnection.go b/core/internal/mocks/github.com/Wifx/gonetworkmanager/v2/mock_ActiveConnection.go similarity index 100% rename from backend/internal/mocks/github.com/Wifx/gonetworkmanager/v2/mock_ActiveConnection.go rename to core/internal/mocks/github.com/Wifx/gonetworkmanager/v2/mock_ActiveConnection.go diff --git a/backend/internal/mocks/github.com/Wifx/gonetworkmanager/v2/mock_Connection.go b/core/internal/mocks/github.com/Wifx/gonetworkmanager/v2/mock_Connection.go similarity index 100% rename from backend/internal/mocks/github.com/Wifx/gonetworkmanager/v2/mock_Connection.go rename to core/internal/mocks/github.com/Wifx/gonetworkmanager/v2/mock_Connection.go diff --git a/backend/internal/mocks/github.com/Wifx/gonetworkmanager/v2/mock_Device.go b/core/internal/mocks/github.com/Wifx/gonetworkmanager/v2/mock_Device.go similarity index 100% rename from backend/internal/mocks/github.com/Wifx/gonetworkmanager/v2/mock_Device.go rename to core/internal/mocks/github.com/Wifx/gonetworkmanager/v2/mock_Device.go diff --git a/backend/internal/mocks/github.com/Wifx/gonetworkmanager/v2/mock_DeviceWireless.go b/core/internal/mocks/github.com/Wifx/gonetworkmanager/v2/mock_DeviceWireless.go similarity index 100% rename from backend/internal/mocks/github.com/Wifx/gonetworkmanager/v2/mock_DeviceWireless.go rename to core/internal/mocks/github.com/Wifx/gonetworkmanager/v2/mock_DeviceWireless.go diff --git a/backend/internal/mocks/github.com/Wifx/gonetworkmanager/v2/mock_IP4Config.go b/core/internal/mocks/github.com/Wifx/gonetworkmanager/v2/mock_IP4Config.go similarity index 100% rename from backend/internal/mocks/github.com/Wifx/gonetworkmanager/v2/mock_IP4Config.go rename to core/internal/mocks/github.com/Wifx/gonetworkmanager/v2/mock_IP4Config.go diff --git a/backend/internal/mocks/github.com/Wifx/gonetworkmanager/v2/mock_NetworkManager.go b/core/internal/mocks/github.com/Wifx/gonetworkmanager/v2/mock_NetworkManager.go similarity index 100% rename from backend/internal/mocks/github.com/Wifx/gonetworkmanager/v2/mock_NetworkManager.go rename to core/internal/mocks/github.com/Wifx/gonetworkmanager/v2/mock_NetworkManager.go diff --git a/backend/internal/mocks/github.com/Wifx/gonetworkmanager/v2/mock_Settings.go b/core/internal/mocks/github.com/Wifx/gonetworkmanager/v2/mock_Settings.go similarity index 100% rename from backend/internal/mocks/github.com/Wifx/gonetworkmanager/v2/mock_Settings.go rename to core/internal/mocks/github.com/Wifx/gonetworkmanager/v2/mock_Settings.go diff --git a/backend/internal/mocks/github.com/godbus/dbus/v5/mock_BusObject.go b/core/internal/mocks/github.com/godbus/dbus/v5/mock_BusObject.go similarity index 100% rename from backend/internal/mocks/github.com/godbus/dbus/v5/mock_BusObject.go rename to core/internal/mocks/github.com/godbus/dbus/v5/mock_BusObject.go diff --git a/backend/internal/mocks/internal/plugins/mock_GitClient.go b/core/internal/mocks/internal/plugins/mock_GitClient.go similarity index 100% rename from backend/internal/mocks/internal/plugins/mock_GitClient.go rename to core/internal/mocks/internal/plugins/mock_GitClient.go diff --git a/backend/internal/mocks/net/mock_Conn.go b/core/internal/mocks/net/mock_Conn.go similarity index 100% rename from backend/internal/mocks/net/mock_Conn.go rename to core/internal/mocks/net/mock_Conn.go diff --git a/backend/internal/mocks/network/mock_Backend.go b/core/internal/mocks/network/mock_Backend.go similarity index 99% rename from backend/internal/mocks/network/mock_Backend.go rename to core/internal/mocks/network/mock_Backend.go index fcb1a428..19314f7c 100644 --- a/backend/internal/mocks/network/mock_Backend.go +++ b/core/internal/mocks/network/mock_Backend.go @@ -3,7 +3,7 @@ package mocks_network import ( - network "github.com/AvengeMedia/DankMaterialShell/backend/internal/server/network" + network "github.com/AvengeMedia/DankMaterialShell/core/internal/server/network" mock "github.com/stretchr/testify/mock" ) diff --git a/backend/internal/plugins/manager.go b/core/internal/plugins/manager.go similarity index 100% rename from backend/internal/plugins/manager.go rename to core/internal/plugins/manager.go diff --git a/backend/internal/plugins/manager_test.go b/core/internal/plugins/manager_test.go similarity index 100% rename from backend/internal/plugins/manager_test.go rename to core/internal/plugins/manager_test.go diff --git a/backend/internal/plugins/registry.go b/core/internal/plugins/registry.go similarity index 100% rename from backend/internal/plugins/registry.go rename to core/internal/plugins/registry.go diff --git a/backend/internal/plugins/registry_test.go b/core/internal/plugins/registry_test.go similarity index 100% rename from backend/internal/plugins/registry_test.go rename to core/internal/plugins/registry_test.go diff --git a/backend/internal/plugins/search.go b/core/internal/plugins/search.go similarity index 100% rename from backend/internal/plugins/search.go rename to core/internal/plugins/search.go diff --git a/backend/internal/proto/dwl_ipc/dwl_ipc.go b/core/internal/proto/dwl_ipc/dwl_ipc.go similarity index 100% rename from backend/internal/proto/dwl_ipc/dwl_ipc.go rename to core/internal/proto/dwl_ipc/dwl_ipc.go diff --git a/backend/internal/proto/ext_workspace/workspace.go b/core/internal/proto/ext_workspace/workspace.go similarity index 100% rename from backend/internal/proto/ext_workspace/workspace.go rename to core/internal/proto/ext_workspace/workspace.go diff --git a/backend/internal/proto/wlr_gamma_control/gamma_control.go b/core/internal/proto/wlr_gamma_control/gamma_control.go similarity index 100% rename from backend/internal/proto/wlr_gamma_control/gamma_control.go rename to core/internal/proto/wlr_gamma_control/gamma_control.go diff --git a/backend/internal/proto/wlr_output_management/output_management.go b/core/internal/proto/wlr_output_management/output_management.go similarity index 100% rename from backend/internal/proto/wlr_output_management/output_management.go rename to core/internal/proto/wlr_output_management/output_management.go diff --git a/backend/internal/proto/xml/dwl-ipc-unstable-v2.xml b/core/internal/proto/xml/dwl-ipc-unstable-v2.xml similarity index 100% rename from backend/internal/proto/xml/dwl-ipc-unstable-v2.xml rename to core/internal/proto/xml/dwl-ipc-unstable-v2.xml diff --git a/backend/internal/proto/xml/ext-workspace-v1.xml b/core/internal/proto/xml/ext-workspace-v1.xml similarity index 100% rename from backend/internal/proto/xml/ext-workspace-v1.xml rename to core/internal/proto/xml/ext-workspace-v1.xml diff --git a/backend/internal/proto/xml/wlr-gamma-control-unstable-v1.xml b/core/internal/proto/xml/wlr-gamma-control-unstable-v1.xml similarity index 100% rename from backend/internal/proto/xml/wlr-gamma-control-unstable-v1.xml rename to core/internal/proto/xml/wlr-gamma-control-unstable-v1.xml diff --git a/backend/internal/proto/xml/wlr-output-management-unstable-v1.xml b/core/internal/proto/xml/wlr-output-management-unstable-v1.xml similarity index 100% rename from backend/internal/proto/xml/wlr-output-management-unstable-v1.xml rename to core/internal/proto/xml/wlr-output-management-unstable-v1.xml diff --git a/backend/internal/server/bluez/agent.go b/core/internal/server/bluez/agent.go similarity index 98% rename from backend/internal/server/bluez/agent.go rename to core/internal/server/bluez/agent.go index 9c0bc50f..542d9fa9 100644 --- a/backend/internal/server/bluez/agent.go +++ b/core/internal/server/bluez/agent.go @@ -7,8 +7,8 @@ import ( "strconv" "time" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/errdefs" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/log" + "github.com/AvengeMedia/DankMaterialShell/core/internal/errdefs" + "github.com/AvengeMedia/DankMaterialShell/core/internal/log" "github.com/godbus/dbus/v5" ) diff --git a/backend/internal/server/bluez/broker.go b/core/internal/server/bluez/broker.go similarity index 100% rename from backend/internal/server/bluez/broker.go rename to core/internal/server/bluez/broker.go diff --git a/backend/internal/server/bluez/broker_test.go b/core/internal/server/bluez/broker_test.go similarity index 100% rename from backend/internal/server/bluez/broker_test.go rename to core/internal/server/bluez/broker_test.go diff --git a/backend/internal/server/bluez/handlers.go b/core/internal/server/bluez/handlers.go similarity index 98% rename from backend/internal/server/bluez/handlers.go rename to core/internal/server/bluez/handlers.go index 1ac8cb27..4ed53eb0 100644 --- a/backend/internal/server/bluez/handlers.go +++ b/core/internal/server/bluez/handlers.go @@ -5,7 +5,7 @@ import ( "fmt" "net" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/server/models" + "github.com/AvengeMedia/DankMaterialShell/core/internal/server/models" ) type Request struct { diff --git a/backend/internal/server/bluez/handlers_test.go b/core/internal/server/bluez/handlers_test.go similarity index 100% rename from backend/internal/server/bluez/handlers_test.go rename to core/internal/server/bluez/handlers_test.go diff --git a/backend/internal/server/bluez/manager.go b/core/internal/server/bluez/manager.go similarity index 99% rename from backend/internal/server/bluez/manager.go rename to core/internal/server/bluez/manager.go index c4b17500..05dd6101 100644 --- a/backend/internal/server/bluez/manager.go +++ b/core/internal/server/bluez/manager.go @@ -6,7 +6,7 @@ import ( "sync" "time" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/log" + "github.com/AvengeMedia/DankMaterialShell/core/internal/log" "github.com/godbus/dbus/v5" ) diff --git a/backend/internal/server/bluez/subscription_broker.go b/core/internal/server/bluez/subscription_broker.go similarity index 96% rename from backend/internal/server/bluez/subscription_broker.go rename to core/internal/server/bluez/subscription_broker.go index 104d9876..a4c3edd4 100644 --- a/backend/internal/server/bluez/subscription_broker.go +++ b/core/internal/server/bluez/subscription_broker.go @@ -5,7 +5,7 @@ import ( "fmt" "sync" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/errdefs" + "github.com/AvengeMedia/DankMaterialShell/core/internal/errdefs" ) type SubscriptionBroker struct { diff --git a/backend/internal/server/bluez/types.go b/core/internal/server/bluez/types.go similarity index 100% rename from backend/internal/server/bluez/types.go rename to core/internal/server/bluez/types.go diff --git a/backend/internal/server/bluez/types_test.go b/core/internal/server/bluez/types_test.go similarity index 100% rename from backend/internal/server/bluez/types_test.go rename to core/internal/server/bluez/types_test.go diff --git a/backend/internal/server/brightness/ddc.go b/core/internal/server/brightness/ddc.go similarity index 99% rename from backend/internal/server/brightness/ddc.go rename to core/internal/server/brightness/ddc.go index 9c0d2352..ab19a970 100644 --- a/backend/internal/server/brightness/ddc.go +++ b/core/internal/server/brightness/ddc.go @@ -9,7 +9,7 @@ import ( "syscall" "time" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/log" + "github.com/AvengeMedia/DankMaterialShell/core/internal/log" "golang.org/x/sys/unix" ) diff --git a/backend/internal/server/brightness/ddc_filter.go b/core/internal/server/brightness/ddc_filter.go similarity index 98% rename from backend/internal/server/brightness/ddc_filter.go rename to core/internal/server/brightness/ddc_filter.go index 8d369a2a..12fc535f 100644 --- a/backend/internal/server/brightness/ddc_filter.go +++ b/core/internal/server/brightness/ddc_filter.go @@ -7,7 +7,7 @@ import ( "strconv" "strings" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/log" + "github.com/AvengeMedia/DankMaterialShell/core/internal/log" ) // isIgnorableI2CBus checks if an I2C bus should be skipped during DDC probing. diff --git a/backend/internal/server/brightness/ddc_filter_test.go b/core/internal/server/brightness/ddc_filter_test.go similarity index 100% rename from backend/internal/server/brightness/ddc_filter_test.go rename to core/internal/server/brightness/ddc_filter_test.go diff --git a/backend/internal/server/brightness/ddc_test.go b/core/internal/server/brightness/ddc_test.go similarity index 100% rename from backend/internal/server/brightness/ddc_test.go rename to core/internal/server/brightness/ddc_test.go diff --git a/backend/internal/server/brightness/handlers.go b/core/internal/server/brightness/handlers.go similarity index 98% rename from backend/internal/server/brightness/handlers.go rename to core/internal/server/brightness/handlers.go index 2eba0d27..004e7ff8 100644 --- a/backend/internal/server/brightness/handlers.go +++ b/core/internal/server/brightness/handlers.go @@ -4,7 +4,7 @@ import ( "encoding/json" "net" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/server/models" + "github.com/AvengeMedia/DankMaterialShell/core/internal/server/models" ) func HandleRequest(conn net.Conn, req Request, m *Manager) { diff --git a/backend/internal/server/brightness/logind.go b/core/internal/server/brightness/logind.go similarity index 95% rename from backend/internal/server/brightness/logind.go rename to core/internal/server/brightness/logind.go index 15d2249d..1903b6de 100644 --- a/backend/internal/server/brightness/logind.go +++ b/core/internal/server/brightness/logind.go @@ -3,7 +3,7 @@ package brightness import ( "fmt" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/log" + "github.com/AvengeMedia/DankMaterialShell/core/internal/log" "github.com/godbus/dbus/v5" ) diff --git a/backend/internal/server/brightness/logind_test.go b/core/internal/server/brightness/logind_test.go similarity index 92% rename from backend/internal/server/brightness/logind_test.go rename to core/internal/server/brightness/logind_test.go index ffc1f065..3d4c2eeb 100644 --- a/backend/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/backend/internal/mocks/brightness" - mock_dbus "github.com/AvengeMedia/DankMaterialShell/backend/internal/mocks/github.com/godbus/dbus/v5" + mocks_brightness "github.com/AvengeMedia/DankMaterialShell/core/internal/mocks/brightness" + mock_dbus "github.com/AvengeMedia/DankMaterialShell/core/internal/mocks/github.com/godbus/dbus/v5" "github.com/godbus/dbus/v5" "github.com/stretchr/testify/mock" ) diff --git a/backend/internal/server/brightness/manager.go b/core/internal/server/brightness/manager.go similarity index 99% rename from backend/internal/server/brightness/manager.go rename to core/internal/server/brightness/manager.go index 6360bd2d..077ddeff 100644 --- a/backend/internal/server/brightness/manager.go +++ b/core/internal/server/brightness/manager.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/log" + "github.com/AvengeMedia/DankMaterialShell/core/internal/log" ) func NewManager() (*Manager, error) { diff --git a/backend/internal/server/brightness/manager_test.go b/core/internal/server/brightness/manager_test.go similarity index 100% rename from backend/internal/server/brightness/manager_test.go rename to core/internal/server/brightness/manager_test.go diff --git a/backend/internal/server/brightness/sysfs.go b/core/internal/server/brightness/sysfs.go similarity index 98% rename from backend/internal/server/brightness/sysfs.go rename to core/internal/server/brightness/sysfs.go index fb6a0162..ed7dedd6 100644 --- a/backend/internal/server/brightness/sysfs.go +++ b/core/internal/server/brightness/sysfs.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/log" + "github.com/AvengeMedia/DankMaterialShell/core/internal/log" ) func NewSysfsBackend() (*SysfsBackend, error) { diff --git a/backend/internal/server/brightness/sysfs_logind_test.go b/core/internal/server/brightness/sysfs_logind_test.go similarity index 97% rename from backend/internal/server/brightness/sysfs_logind_test.go rename to core/internal/server/brightness/sysfs_logind_test.go index 999a3010..b988fc2d 100644 --- a/backend/internal/server/brightness/sysfs_logind_test.go +++ b/core/internal/server/brightness/sysfs_logind_test.go @@ -5,8 +5,8 @@ import ( "path/filepath" "testing" - mocks_brightness "github.com/AvengeMedia/DankMaterialShell/backend/internal/mocks/brightness" - mock_dbus "github.com/AvengeMedia/DankMaterialShell/backend/internal/mocks/github.com/godbus/dbus/v5" + mocks_brightness "github.com/AvengeMedia/DankMaterialShell/core/internal/mocks/brightness" + mock_dbus "github.com/AvengeMedia/DankMaterialShell/core/internal/mocks/github.com/godbus/dbus/v5" "github.com/godbus/dbus/v5" "github.com/stretchr/testify/mock" ) diff --git a/backend/internal/server/brightness/sysfs_test.go b/core/internal/server/brightness/sysfs_test.go similarity index 100% rename from backend/internal/server/brightness/sysfs_test.go rename to core/internal/server/brightness/sysfs_test.go diff --git a/backend/internal/server/brightness/types.go b/core/internal/server/brightness/types.go similarity index 100% rename from backend/internal/server/brightness/types.go rename to core/internal/server/brightness/types.go diff --git a/backend/internal/server/cups/actions.go b/core/internal/server/cups/actions.go similarity index 97% rename from backend/internal/server/cups/actions.go rename to core/internal/server/cups/actions.go index bb81bbae..6c204051 100644 --- a/backend/internal/server/cups/actions.go +++ b/core/internal/server/cups/actions.go @@ -4,7 +4,7 @@ import ( "strings" "time" - "github.com/AvengeMedia/DankMaterialShell/backend/pkg/ipp" + "github.com/AvengeMedia/DankMaterialShell/core/pkg/ipp" ) func (m *Manager) GetPrinters() ([]Printer, error) { diff --git a/backend/internal/server/cups/actions_test.go b/core/internal/server/cups/actions_test.go similarity index 97% rename from backend/internal/server/cups/actions_test.go rename to core/internal/server/cups/actions_test.go index 4962e603..133ee9c2 100644 --- a/backend/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/backend/internal/mocks/cups" - "github.com/AvengeMedia/DankMaterialShell/backend/pkg/ipp" + mocks_cups "github.com/AvengeMedia/DankMaterialShell/core/internal/mocks/cups" + "github.com/AvengeMedia/DankMaterialShell/core/pkg/ipp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/backend/internal/server/cups/handlers.go b/core/internal/server/cups/handlers.go similarity index 98% rename from backend/internal/server/cups/handlers.go rename to core/internal/server/cups/handlers.go index 6a08345c..347e22a7 100644 --- a/backend/internal/server/cups/handlers.go +++ b/core/internal/server/cups/handlers.go @@ -5,7 +5,7 @@ import ( "fmt" "net" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/server/models" + "github.com/AvengeMedia/DankMaterialShell/core/internal/server/models" ) type Request struct { diff --git a/backend/internal/server/cups/handlers_test.go b/core/internal/server/cups/handlers_test.go similarity index 96% rename from backend/internal/server/cups/handlers_test.go rename to core/internal/server/cups/handlers_test.go index e6f67863..d2f57848 100644 --- a/backend/internal/server/cups/handlers_test.go +++ b/core/internal/server/cups/handlers_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - mocks_cups "github.com/AvengeMedia/DankMaterialShell/backend/internal/mocks/cups" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/server/models" - "github.com/AvengeMedia/DankMaterialShell/backend/pkg/ipp" + 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/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/backend/internal/server/cups/manager.go b/core/internal/server/cups/manager.go similarity index 98% rename from backend/internal/server/cups/manager.go rename to core/internal/server/cups/manager.go index 2df6d51a..b4431b05 100644 --- a/backend/internal/server/cups/manager.go +++ b/core/internal/server/cups/manager.go @@ -7,8 +7,8 @@ import ( "sync" "time" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/log" - "github.com/AvengeMedia/DankMaterialShell/backend/pkg/ipp" + "github.com/AvengeMedia/DankMaterialShell/core/internal/log" + "github.com/AvengeMedia/DankMaterialShell/core/pkg/ipp" ) func NewManager() (*Manager, error) { diff --git a/backend/internal/server/cups/manager_test.go b/core/internal/server/cups/manager_test.go similarity index 97% rename from backend/internal/server/cups/manager_test.go rename to core/internal/server/cups/manager_test.go index 31aa0a1f..79de56a9 100644 --- a/backend/internal/server/cups/manager_test.go +++ b/core/internal/server/cups/manager_test.go @@ -3,8 +3,8 @@ package cups import ( "testing" - mocks_cups "github.com/AvengeMedia/DankMaterialShell/backend/internal/mocks/cups" - "github.com/AvengeMedia/DankMaterialShell/backend/pkg/ipp" + mocks_cups "github.com/AvengeMedia/DankMaterialShell/core/internal/mocks/cups" + "github.com/AvengeMedia/DankMaterialShell/core/pkg/ipp" "github.com/stretchr/testify/assert" ) diff --git a/backend/internal/server/cups/subscription.go b/core/internal/server/cups/subscription.go similarity index 97% rename from backend/internal/server/cups/subscription.go rename to core/internal/server/cups/subscription.go index 7f267d71..845270f0 100644 --- a/backend/internal/server/cups/subscription.go +++ b/core/internal/server/cups/subscription.go @@ -5,8 +5,8 @@ import ( "sync" "time" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/log" - "github.com/AvengeMedia/DankMaterialShell/backend/pkg/ipp" + "github.com/AvengeMedia/DankMaterialShell/core/internal/log" + "github.com/AvengeMedia/DankMaterialShell/core/pkg/ipp" ) type SubscriptionManager struct { diff --git a/backend/internal/server/cups/subscription_dbus.go b/core/internal/server/cups/subscription_dbus.go similarity index 98% rename from backend/internal/server/cups/subscription_dbus.go rename to core/internal/server/cups/subscription_dbus.go index dccb9247..8717df3b 100644 --- a/backend/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/backend/internal/log" - "github.com/AvengeMedia/DankMaterialShell/backend/pkg/ipp" + "github.com/AvengeMedia/DankMaterialShell/core/internal/log" + "github.com/AvengeMedia/DankMaterialShell/core/pkg/ipp" "github.com/godbus/dbus/v5" ) diff --git a/backend/internal/server/cups/types.go b/core/internal/server/cups/types.go similarity index 97% rename from backend/internal/server/cups/types.go rename to core/internal/server/cups/types.go index ae5deb71..0e912860 100644 --- a/backend/internal/server/cups/types.go +++ b/core/internal/server/cups/types.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "github.com/AvengeMedia/DankMaterialShell/backend/pkg/ipp" + "github.com/AvengeMedia/DankMaterialShell/core/pkg/ipp" ) type CUPSState struct { diff --git a/backend/internal/server/dwl/handlers.go b/core/internal/server/dwl/handlers.go similarity index 98% rename from backend/internal/server/dwl/handlers.go rename to core/internal/server/dwl/handlers.go index bdb51d35..8940cb42 100644 --- a/backend/internal/server/dwl/handlers.go +++ b/core/internal/server/dwl/handlers.go @@ -5,7 +5,7 @@ import ( "fmt" "net" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/server/models" + "github.com/AvengeMedia/DankMaterialShell/core/internal/server/models" ) type Request struct { diff --git a/backend/internal/server/dwl/manager.go b/core/internal/server/dwl/manager.go similarity index 98% rename from backend/internal/server/dwl/manager.go rename to core/internal/server/dwl/manager.go index ed5d6b4f..050754ae 100644 --- a/backend/internal/server/dwl/manager.go +++ b/core/internal/server/dwl/manager.go @@ -6,8 +6,8 @@ import ( wlclient "github.com/yaslama/go-wayland/wayland/client" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/log" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/proto/dwl_ipc" + "github.com/AvengeMedia/DankMaterialShell/core/internal/log" + "github.com/AvengeMedia/DankMaterialShell/core/internal/proto/dwl_ipc" ) func NewManager(display *wlclient.Display) (*Manager, error) { diff --git a/backend/internal/server/dwl/types.go b/core/internal/server/dwl/types.go similarity index 100% rename from backend/internal/server/dwl/types.go rename to core/internal/server/dwl/types.go diff --git a/backend/internal/server/extworkspace/handlers.go b/core/internal/server/extworkspace/handlers.go similarity index 98% rename from backend/internal/server/extworkspace/handlers.go rename to core/internal/server/extworkspace/handlers.go index 7654af8a..e1fa0095 100644 --- a/backend/internal/server/extworkspace/handlers.go +++ b/core/internal/server/extworkspace/handlers.go @@ -5,7 +5,7 @@ import ( "fmt" "net" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/server/models" + "github.com/AvengeMedia/DankMaterialShell/core/internal/server/models" ) type Request struct { diff --git a/backend/internal/server/extworkspace/manager.go b/core/internal/server/extworkspace/manager.go similarity index 98% rename from backend/internal/server/extworkspace/manager.go rename to core/internal/server/extworkspace/manager.go index f2535e64..54b36593 100644 --- a/backend/internal/server/extworkspace/manager.go +++ b/core/internal/server/extworkspace/manager.go @@ -4,8 +4,8 @@ import ( "fmt" "time" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/log" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/proto/ext_workspace" + "github.com/AvengeMedia/DankMaterialShell/core/internal/log" + "github.com/AvengeMedia/DankMaterialShell/core/internal/proto/ext_workspace" wlclient "github.com/yaslama/go-wayland/wayland/client" ) diff --git a/backend/internal/server/extworkspace/types.go b/core/internal/server/extworkspace/types.go similarity index 97% rename from backend/internal/server/extworkspace/types.go rename to core/internal/server/extworkspace/types.go index 68aa534f..cc4fdca0 100644 --- a/backend/internal/server/extworkspace/types.go +++ b/core/internal/server/extworkspace/types.go @@ -3,7 +3,7 @@ package extworkspace import ( "sync" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/proto/ext_workspace" + "github.com/AvengeMedia/DankMaterialShell/core/internal/proto/ext_workspace" wlclient "github.com/yaslama/go-wayland/wayland/client" ) diff --git a/backend/internal/server/freedesktop/actions.go b/core/internal/server/freedesktop/actions.go similarity index 100% rename from backend/internal/server/freedesktop/actions.go rename to core/internal/server/freedesktop/actions.go diff --git a/backend/internal/server/freedesktop/actions_test.go b/core/internal/server/freedesktop/actions_test.go similarity index 100% rename from backend/internal/server/freedesktop/actions_test.go rename to core/internal/server/freedesktop/actions_test.go diff --git a/backend/internal/server/freedesktop/constants.go b/core/internal/server/freedesktop/constants.go similarity index 100% rename from backend/internal/server/freedesktop/constants.go rename to core/internal/server/freedesktop/constants.go diff --git a/backend/internal/server/freedesktop/handlers.go b/core/internal/server/freedesktop/handlers.go similarity index 98% rename from backend/internal/server/freedesktop/handlers.go rename to core/internal/server/freedesktop/handlers.go index 13dfb42e..4d251c2f 100644 --- a/backend/internal/server/freedesktop/handlers.go +++ b/core/internal/server/freedesktop/handlers.go @@ -4,7 +4,7 @@ import ( "fmt" "net" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/server/models" + "github.com/AvengeMedia/DankMaterialShell/core/internal/server/models" ) type Request struct { diff --git a/backend/internal/server/freedesktop/handlers_test.go b/core/internal/server/freedesktop/handlers_test.go similarity index 98% rename from backend/internal/server/freedesktop/handlers_test.go rename to core/internal/server/freedesktop/handlers_test.go index 4102d196..ce18ab15 100644 --- a/backend/internal/server/freedesktop/handlers_test.go +++ b/core/internal/server/freedesktop/handlers_test.go @@ -7,8 +7,8 @@ import ( "sync" "testing" - mockdbus "github.com/AvengeMedia/DankMaterialShell/backend/internal/mocks/github.com/godbus/dbus/v5" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/server/models" + mockdbus "github.com/AvengeMedia/DankMaterialShell/core/internal/mocks/github.com/godbus/dbus/v5" + "github.com/AvengeMedia/DankMaterialShell/core/internal/server/models" "github.com/godbus/dbus/v5" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/backend/internal/server/freedesktop/manager.go b/core/internal/server/freedesktop/manager.go similarity index 100% rename from backend/internal/server/freedesktop/manager.go rename to core/internal/server/freedesktop/manager.go diff --git a/backend/internal/server/freedesktop/manager_test.go b/core/internal/server/freedesktop/manager_test.go similarity index 100% rename from backend/internal/server/freedesktop/manager_test.go rename to core/internal/server/freedesktop/manager_test.go diff --git a/backend/internal/server/freedesktop/types.go b/core/internal/server/freedesktop/types.go similarity index 100% rename from backend/internal/server/freedesktop/types.go rename to core/internal/server/freedesktop/types.go diff --git a/backend/internal/server/freedesktop/types_test.go b/core/internal/server/freedesktop/types_test.go similarity index 100% rename from backend/internal/server/freedesktop/types_test.go rename to core/internal/server/freedesktop/types_test.go diff --git a/backend/internal/server/loginctl/actions.go b/core/internal/server/loginctl/actions.go similarity index 100% rename from backend/internal/server/loginctl/actions.go rename to core/internal/server/loginctl/actions.go diff --git a/backend/internal/server/loginctl/constants.go b/core/internal/server/loginctl/constants.go similarity index 100% rename from backend/internal/server/loginctl/constants.go rename to core/internal/server/loginctl/constants.go diff --git a/backend/internal/server/loginctl/handlers.go b/core/internal/server/loginctl/handlers.go similarity index 98% rename from backend/internal/server/loginctl/handlers.go rename to core/internal/server/loginctl/handlers.go index 3e58b663..c232258e 100644 --- a/backend/internal/server/loginctl/handlers.go +++ b/core/internal/server/loginctl/handlers.go @@ -5,7 +5,7 @@ import ( "fmt" "net" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/server/models" + "github.com/AvengeMedia/DankMaterialShell/core/internal/server/models" ) type Request struct { diff --git a/backend/internal/server/loginctl/handlers_test.go b/core/internal/server/loginctl/handlers_test.go similarity index 98% rename from backend/internal/server/loginctl/handlers_test.go rename to core/internal/server/loginctl/handlers_test.go index 49a81ef5..4784727c 100644 --- a/backend/internal/server/loginctl/handlers_test.go +++ b/core/internal/server/loginctl/handlers_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - mockdbus "github.com/AvengeMedia/DankMaterialShell/backend/internal/mocks/github.com/godbus/dbus/v5" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/server/models" + mockdbus "github.com/AvengeMedia/DankMaterialShell/core/internal/mocks/github.com/godbus/dbus/v5" + "github.com/AvengeMedia/DankMaterialShell/core/internal/server/models" "github.com/godbus/dbus/v5" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/backend/internal/server/loginctl/manager.go b/core/internal/server/loginctl/manager.go similarity index 100% rename from backend/internal/server/loginctl/manager.go rename to core/internal/server/loginctl/manager.go diff --git a/backend/internal/server/loginctl/manager_test.go b/core/internal/server/loginctl/manager_test.go similarity index 100% rename from backend/internal/server/loginctl/manager_test.go rename to core/internal/server/loginctl/manager_test.go diff --git a/backend/internal/server/loginctl/monitor.go b/core/internal/server/loginctl/monitor.go similarity index 100% rename from backend/internal/server/loginctl/monitor.go rename to core/internal/server/loginctl/monitor.go diff --git a/backend/internal/server/loginctl/monitor_test.go b/core/internal/server/loginctl/monitor_test.go similarity index 100% rename from backend/internal/server/loginctl/monitor_test.go rename to core/internal/server/loginctl/monitor_test.go diff --git a/backend/internal/server/loginctl/types.go b/core/internal/server/loginctl/types.go similarity index 100% rename from backend/internal/server/loginctl/types.go rename to core/internal/server/loginctl/types.go diff --git a/backend/internal/server/loginctl/types_test.go b/core/internal/server/loginctl/types_test.go similarity index 100% rename from backend/internal/server/loginctl/types_test.go rename to core/internal/server/loginctl/types_test.go diff --git a/backend/internal/server/models/types.go b/core/internal/server/models/types.go similarity index 91% rename from backend/internal/server/models/types.go rename to core/internal/server/models/types.go index ebeaa1f7..fc5f7e4b 100644 --- a/backend/internal/server/models/types.go +++ b/core/internal/server/models/types.go @@ -4,7 +4,7 @@ import ( "encoding/json" "net" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/log" + "github.com/AvengeMedia/DankMaterialShell/core/internal/log" ) type Request struct { diff --git a/backend/internal/server/network/API.md b/core/internal/server/network/API.md similarity index 100% rename from backend/internal/server/network/API.md rename to core/internal/server/network/API.md diff --git a/backend/internal/server/network/agent_iwd.go b/core/internal/server/network/agent_iwd.go similarity index 99% rename from backend/internal/server/network/agent_iwd.go rename to core/internal/server/network/agent_iwd.go index 0cd6684c..5d49f04f 100644 --- a/backend/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/backend/internal/errdefs" + "github.com/AvengeMedia/DankMaterialShell/core/internal/errdefs" "github.com/godbus/dbus/v5" ) diff --git a/backend/internal/server/network/agent_networkmanager.go b/core/internal/server/network/agent_networkmanager.go similarity index 99% rename from backend/internal/server/network/agent_networkmanager.go rename to core/internal/server/network/agent_networkmanager.go index 91e2fd38..e02317d9 100644 --- a/backend/internal/server/network/agent_networkmanager.go +++ b/core/internal/server/network/agent_networkmanager.go @@ -6,8 +6,8 @@ import ( "fmt" "time" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/errdefs" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/log" + "github.com/AvengeMedia/DankMaterialShell/core/internal/errdefs" + "github.com/AvengeMedia/DankMaterialShell/core/internal/log" "github.com/godbus/dbus/v5" ) diff --git a/backend/internal/server/network/backend.go b/core/internal/server/network/backend.go similarity index 100% rename from backend/internal/server/network/backend.go rename to core/internal/server/network/backend.go diff --git a/backend/internal/server/network/backend_hybrid_iwd_networkd.go b/core/internal/server/network/backend_hybrid_iwd_networkd.go similarity index 100% rename from backend/internal/server/network/backend_hybrid_iwd_networkd.go rename to core/internal/server/network/backend_hybrid_iwd_networkd.go diff --git a/backend/internal/server/network/backend_hybrid_test.go b/core/internal/server/network/backend_hybrid_test.go similarity index 100% rename from backend/internal/server/network/backend_hybrid_test.go rename to core/internal/server/network/backend_hybrid_test.go diff --git a/backend/internal/server/network/backend_iwd.go b/core/internal/server/network/backend_iwd.go similarity index 100% rename from backend/internal/server/network/backend_iwd.go rename to core/internal/server/network/backend_iwd.go diff --git a/backend/internal/server/network/backend_iwd_signals.go b/core/internal/server/network/backend_iwd_signals.go similarity index 100% rename from backend/internal/server/network/backend_iwd_signals.go rename to core/internal/server/network/backend_iwd_signals.go diff --git a/backend/internal/server/network/backend_iwd_test.go b/core/internal/server/network/backend_iwd_test.go similarity index 100% rename from backend/internal/server/network/backend_iwd_test.go rename to core/internal/server/network/backend_iwd_test.go diff --git a/backend/internal/server/network/backend_iwd_unimplemented.go b/core/internal/server/network/backend_iwd_unimplemented.go similarity index 100% rename from backend/internal/server/network/backend_iwd_unimplemented.go rename to core/internal/server/network/backend_iwd_unimplemented.go diff --git a/backend/internal/server/network/backend_iwd_wifi.go b/core/internal/server/network/backend_iwd_wifi.go similarity index 99% rename from backend/internal/server/network/backend_iwd_wifi.go rename to core/internal/server/network/backend_iwd_wifi.go index e2758b63..b3bea13b 100644 --- a/backend/internal/server/network/backend_iwd_wifi.go +++ b/core/internal/server/network/backend_iwd_wifi.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/errdefs" + "github.com/AvengeMedia/DankMaterialShell/core/internal/errdefs" "github.com/godbus/dbus/v5" ) diff --git a/backend/internal/server/network/backend_networkd.go b/core/internal/server/network/backend_networkd.go similarity index 99% rename from backend/internal/server/network/backend_networkd.go rename to core/internal/server/network/backend_networkd.go index a4918966..2f30e044 100644 --- a/backend/internal/server/network/backend_networkd.go +++ b/core/internal/server/network/backend_networkd.go @@ -6,7 +6,7 @@ import ( "strings" "sync" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/log" + "github.com/AvengeMedia/DankMaterialShell/core/internal/log" "github.com/godbus/dbus/v5" ) diff --git a/backend/internal/server/network/backend_networkd_ethernet.go b/core/internal/server/network/backend_networkd_ethernet.go similarity index 100% rename from backend/internal/server/network/backend_networkd_ethernet.go rename to core/internal/server/network/backend_networkd_ethernet.go diff --git a/backend/internal/server/network/backend_networkd_signals.go b/core/internal/server/network/backend_networkd_signals.go similarity index 95% rename from backend/internal/server/network/backend_networkd_signals.go rename to core/internal/server/network/backend_networkd_signals.go index 3ed3df9f..dc642ed6 100644 --- a/backend/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/backend/internal/log" + "github.com/AvengeMedia/DankMaterialShell/core/internal/log" "github.com/godbus/dbus/v5" ) diff --git a/backend/internal/server/network/backend_networkd_test.go b/core/internal/server/network/backend_networkd_test.go similarity index 100% rename from backend/internal/server/network/backend_networkd_test.go rename to core/internal/server/network/backend_networkd_test.go diff --git a/backend/internal/server/network/backend_networkd_unimplemented.go b/core/internal/server/network/backend_networkd_unimplemented.go similarity index 100% rename from backend/internal/server/network/backend_networkd_unimplemented.go rename to core/internal/server/network/backend_networkd_unimplemented.go diff --git a/backend/internal/server/network/backend_networkmanager.go b/core/internal/server/network/backend_networkmanager.go similarity index 99% rename from backend/internal/server/network/backend_networkmanager.go rename to core/internal/server/network/backend_networkmanager.go index 7c9d50c7..c0cef9a1 100644 --- a/backend/internal/server/network/backend_networkmanager.go +++ b/core/internal/server/network/backend_networkmanager.go @@ -4,7 +4,7 @@ import ( "fmt" "sync" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/log" + "github.com/AvengeMedia/DankMaterialShell/core/internal/log" "github.com/Wifx/gonetworkmanager/v2" "github.com/godbus/dbus/v5" ) diff --git a/backend/internal/server/network/backend_networkmanager_ethernet.go b/core/internal/server/network/backend_networkmanager_ethernet.go similarity index 99% rename from backend/internal/server/network/backend_networkmanager_ethernet.go rename to core/internal/server/network/backend_networkmanager_ethernet.go index 33d3f46a..4803e9a9 100644 --- a/backend/internal/server/network/backend_networkmanager_ethernet.go +++ b/core/internal/server/network/backend_networkmanager_ethernet.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/log" + "github.com/AvengeMedia/DankMaterialShell/core/internal/log" "github.com/Wifx/gonetworkmanager/v2" ) diff --git a/backend/internal/server/network/backend_networkmanager_ethernet_test.go b/core/internal/server/network/backend_networkmanager_ethernet_test.go similarity index 100% rename from backend/internal/server/network/backend_networkmanager_ethernet_test.go rename to core/internal/server/network/backend_networkmanager_ethernet_test.go diff --git a/backend/internal/server/network/backend_networkmanager_signals.go b/core/internal/server/network/backend_networkmanager_signals.go similarity index 100% rename from backend/internal/server/network/backend_networkmanager_signals.go rename to core/internal/server/network/backend_networkmanager_signals.go diff --git a/backend/internal/server/network/backend_networkmanager_signals_test.go b/core/internal/server/network/backend_networkmanager_signals_test.go similarity index 100% rename from backend/internal/server/network/backend_networkmanager_signals_test.go rename to core/internal/server/network/backend_networkmanager_signals_test.go diff --git a/backend/internal/server/network/backend_networkmanager_state.go b/core/internal/server/network/backend_networkmanager_state.go similarity index 98% rename from backend/internal/server/network/backend_networkmanager_state.go rename to core/internal/server/network/backend_networkmanager_state.go index ae22a1cf..ac5e5688 100644 --- a/backend/internal/server/network/backend_networkmanager_state.go +++ b/core/internal/server/network/backend_networkmanager_state.go @@ -3,8 +3,8 @@ package network import ( "time" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/errdefs" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/log" + "github.com/AvengeMedia/DankMaterialShell/core/internal/errdefs" + "github.com/AvengeMedia/DankMaterialShell/core/internal/log" "github.com/Wifx/gonetworkmanager/v2" ) diff --git a/backend/internal/server/network/backend_networkmanager_state_test.go b/core/internal/server/network/backend_networkmanager_state_test.go similarity index 94% rename from backend/internal/server/network/backend_networkmanager_state_test.go rename to core/internal/server/network/backend_networkmanager_state_test.go index e4996660..86aa48fd 100644 --- a/backend/internal/server/network/backend_networkmanager_state_test.go +++ b/core/internal/server/network/backend_networkmanager_state_test.go @@ -3,8 +3,8 @@ package network import ( "testing" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/errdefs" - mock_gonetworkmanager "github.com/AvengeMedia/DankMaterialShell/backend/internal/mocks/github.com/Wifx/gonetworkmanager/v2" + "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/stretchr/testify/assert" ) diff --git a/backend/internal/server/network/backend_networkmanager_test.go b/core/internal/server/network/backend_networkmanager_test.go similarity index 100% rename from backend/internal/server/network/backend_networkmanager_test.go rename to core/internal/server/network/backend_networkmanager_test.go diff --git a/backend/internal/server/network/backend_networkmanager_vpn.go b/core/internal/server/network/backend_networkmanager_vpn.go similarity index 99% rename from backend/internal/server/network/backend_networkmanager_vpn.go rename to core/internal/server/network/backend_networkmanager_vpn.go index 58fab05a..a4250787 100644 --- a/backend/internal/server/network/backend_networkmanager_vpn.go +++ b/core/internal/server/network/backend_networkmanager_vpn.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/log" + "github.com/AvengeMedia/DankMaterialShell/core/internal/log" "github.com/Wifx/gonetworkmanager/v2" ) diff --git a/backend/internal/server/network/backend_networkmanager_vpn_test.go b/core/internal/server/network/backend_networkmanager_vpn_test.go similarity index 98% rename from backend/internal/server/network/backend_networkmanager_vpn_test.go rename to core/internal/server/network/backend_networkmanager_vpn_test.go index 89a7f200..eebd4334 100644 --- a/backend/internal/server/network/backend_networkmanager_vpn_test.go +++ b/core/internal/server/network/backend_networkmanager_vpn_test.go @@ -3,7 +3,7 @@ package network import ( "testing" - mock_gonetworkmanager "github.com/AvengeMedia/DankMaterialShell/backend/internal/mocks/github.com/Wifx/gonetworkmanager/v2" + mock_gonetworkmanager "github.com/AvengeMedia/DankMaterialShell/core/internal/mocks/github.com/Wifx/gonetworkmanager/v2" "github.com/Wifx/gonetworkmanager/v2" "github.com/stretchr/testify/assert" ) diff --git a/backend/internal/server/network/backend_networkmanager_wifi.go b/core/internal/server/network/backend_networkmanager_wifi.go similarity index 99% rename from backend/internal/server/network/backend_networkmanager_wifi.go rename to core/internal/server/network/backend_networkmanager_wifi.go index d1d54243..6f8aa633 100644 --- a/backend/internal/server/network/backend_networkmanager_wifi.go +++ b/core/internal/server/network/backend_networkmanager_wifi.go @@ -5,7 +5,7 @@ import ( "fmt" "sort" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/log" + "github.com/AvengeMedia/DankMaterialShell/core/internal/log" "github.com/Wifx/gonetworkmanager/v2" ) diff --git a/backend/internal/server/network/backend_networkmanager_wifi_test.go b/core/internal/server/network/backend_networkmanager_wifi_test.go similarity index 98% rename from backend/internal/server/network/backend_networkmanager_wifi_test.go rename to core/internal/server/network/backend_networkmanager_wifi_test.go index b4e973fe..1fb7e6a2 100644 --- a/backend/internal/server/network/backend_networkmanager_wifi_test.go +++ b/core/internal/server/network/backend_networkmanager_wifi_test.go @@ -3,7 +3,7 @@ package network import ( "testing" - mock_gonetworkmanager "github.com/AvengeMedia/DankMaterialShell/backend/internal/mocks/github.com/Wifx/gonetworkmanager/v2" + mock_gonetworkmanager "github.com/AvengeMedia/DankMaterialShell/core/internal/mocks/github.com/Wifx/gonetworkmanager/v2" "github.com/stretchr/testify/assert" ) diff --git a/backend/internal/server/network/broker.go b/core/internal/server/network/broker.go similarity index 100% rename from backend/internal/server/network/broker.go rename to core/internal/server/network/broker.go diff --git a/backend/internal/server/network/connection_test.go b/core/internal/server/network/connection_test.go similarity index 95% rename from backend/internal/server/network/connection_test.go rename to core/internal/server/network/connection_test.go index cefaacc3..7b37731c 100644 --- a/backend/internal/server/network/connection_test.go +++ b/core/internal/server/network/connection_test.go @@ -4,8 +4,8 @@ import ( "errors" "testing" - mocks_network "github.com/AvengeMedia/DankMaterialShell/backend/internal/mocks/network" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/server/network" + mocks_network "github.com/AvengeMedia/DankMaterialShell/core/internal/mocks/network" + "github.com/AvengeMedia/DankMaterialShell/core/internal/server/network" "github.com/stretchr/testify/assert" ) diff --git a/backend/internal/server/network/detect.go b/core/internal/server/network/detect.go similarity index 100% rename from backend/internal/server/network/detect.go rename to core/internal/server/network/detect.go diff --git a/backend/internal/server/network/detect_test.go b/core/internal/server/network/detect_test.go similarity index 100% rename from backend/internal/server/network/detect_test.go rename to core/internal/server/network/detect_test.go diff --git a/backend/internal/server/network/handlers.go b/core/internal/server/network/handlers.go similarity index 99% rename from backend/internal/server/network/handlers.go rename to core/internal/server/network/handlers.go index 7bceedb2..98946fa4 100644 --- a/backend/internal/server/network/handlers.go +++ b/core/internal/server/network/handlers.go @@ -5,8 +5,8 @@ import ( "fmt" "net" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/log" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/server/models" + "github.com/AvengeMedia/DankMaterialShell/core/internal/log" + "github.com/AvengeMedia/DankMaterialShell/core/internal/server/models" ) type Request struct { diff --git a/backend/internal/server/network/handlers_test.go b/core/internal/server/network/handlers_test.go similarity index 98% rename from backend/internal/server/network/handlers_test.go rename to core/internal/server/network/handlers_test.go index 64ea4c17..4b055f71 100644 --- a/backend/internal/server/network/handlers_test.go +++ b/core/internal/server/network/handlers_test.go @@ -6,7 +6,7 @@ import ( "net" "testing" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/server/models" + "github.com/AvengeMedia/DankMaterialShell/core/internal/server/models" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/backend/internal/server/network/helpers.go b/core/internal/server/network/helpers.go similarity index 100% rename from backend/internal/server/network/helpers.go rename to core/internal/server/network/helpers.go diff --git a/backend/internal/server/network/manager.go b/core/internal/server/network/manager.go similarity index 99% rename from backend/internal/server/network/manager.go rename to core/internal/server/network/manager.go index 0c8b129a..27a6d3b6 100644 --- a/backend/internal/server/network/manager.go +++ b/core/internal/server/network/manager.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/log" + "github.com/AvengeMedia/DankMaterialShell/core/internal/log" ) func NewManager() (*Manager, error) { diff --git a/backend/internal/server/network/manager_test.go b/core/internal/server/network/manager_test.go similarity index 100% rename from backend/internal/server/network/manager_test.go rename to core/internal/server/network/manager_test.go diff --git a/backend/internal/server/network/monitor.go b/core/internal/server/network/monitor.go similarity index 100% rename from backend/internal/server/network/monitor.go rename to core/internal/server/network/monitor.go diff --git a/backend/internal/server/network/priority.go b/core/internal/server/network/priority.go similarity index 100% rename from backend/internal/server/network/priority.go rename to core/internal/server/network/priority.go diff --git a/backend/internal/server/network/priority_test.go b/core/internal/server/network/priority_test.go similarity index 100% rename from backend/internal/server/network/priority_test.go rename to core/internal/server/network/priority_test.go diff --git a/backend/internal/server/network/subscription_broker.go b/core/internal/server/network/subscription_broker.go similarity index 96% rename from backend/internal/server/network/subscription_broker.go rename to core/internal/server/network/subscription_broker.go index e1dad18b..23accbd9 100644 --- a/backend/internal/server/network/subscription_broker.go +++ b/core/internal/server/network/subscription_broker.go @@ -5,8 +5,8 @@ import ( "fmt" "sync" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/errdefs" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/log" + "github.com/AvengeMedia/DankMaterialShell/core/internal/errdefs" + "github.com/AvengeMedia/DankMaterialShell/core/internal/log" ) type SubscriptionBroker struct { diff --git a/backend/internal/server/network/testing.go b/core/internal/server/network/testing.go similarity index 100% rename from backend/internal/server/network/testing.go rename to core/internal/server/network/testing.go diff --git a/backend/internal/server/network/types.go b/core/internal/server/network/types.go similarity index 100% rename from backend/internal/server/network/types.go rename to core/internal/server/network/types.go diff --git a/backend/internal/server/network/types_test.go b/core/internal/server/network/types_test.go similarity index 100% rename from backend/internal/server/network/types_test.go rename to core/internal/server/network/types_test.go diff --git a/backend/internal/server/network/wifi_test.go b/core/internal/server/network/wifi_test.go similarity index 100% rename from backend/internal/server/network/wifi_test.go rename to core/internal/server/network/wifi_test.go diff --git a/backend/internal/server/network/wired_test.go b/core/internal/server/network/wired_test.go similarity index 100% rename from backend/internal/server/network/wired_test.go rename to core/internal/server/network/wired_test.go diff --git a/backend/internal/server/plugins/handlers.go b/core/internal/server/plugins/handlers.go similarity index 87% rename from backend/internal/server/plugins/handlers.go rename to core/internal/server/plugins/handlers.go index 7a9cc605..33f65648 100644 --- a/backend/internal/server/plugins/handlers.go +++ b/core/internal/server/plugins/handlers.go @@ -4,7 +4,7 @@ import ( "fmt" "net" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/server/models" + "github.com/AvengeMedia/DankMaterialShell/core/internal/server/models" ) func HandleRequest(conn net.Conn, req models.Request) { diff --git a/backend/internal/server/plugins/handlers_test.go b/core/internal/server/plugins/handlers_test.go similarity index 96% rename from backend/internal/server/plugins/handlers_test.go rename to core/internal/server/plugins/handlers_test.go index 08bf3dcd..da43eea2 100644 --- a/backend/internal/server/plugins/handlers_test.go +++ b/core/internal/server/plugins/handlers_test.go @@ -4,8 +4,8 @@ import ( "encoding/json" "testing" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/mocks/net" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/server/models" + "github.com/AvengeMedia/DankMaterialShell/core/internal/mocks/net" + "github.com/AvengeMedia/DankMaterialShell/core/internal/server/models" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/backend/internal/server/plugins/install.go b/core/internal/server/plugins/install.go similarity index 90% rename from backend/internal/server/plugins/install.go rename to core/internal/server/plugins/install.go index 4c91a709..ece74440 100644 --- a/backend/internal/server/plugins/install.go +++ b/core/internal/server/plugins/install.go @@ -4,8 +4,8 @@ import ( "fmt" "net" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/plugins" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/server/models" + "github.com/AvengeMedia/DankMaterialShell/core/internal/plugins" + "github.com/AvengeMedia/DankMaterialShell/core/internal/server/models" ) func HandleInstall(conn net.Conn, req models.Request) { diff --git a/backend/internal/server/plugins/list.go b/core/internal/server/plugins/list.go similarity index 88% rename from backend/internal/server/plugins/list.go rename to core/internal/server/plugins/list.go index 63cc8414..1876e9b9 100644 --- a/backend/internal/server/plugins/list.go +++ b/core/internal/server/plugins/list.go @@ -5,8 +5,8 @@ import ( "net" "strings" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/plugins" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/server/models" + "github.com/AvengeMedia/DankMaterialShell/core/internal/plugins" + "github.com/AvengeMedia/DankMaterialShell/core/internal/server/models" ) func HandleList(conn net.Conn, req models.Request) { diff --git a/backend/internal/server/plugins/list_installed.go b/core/internal/server/plugins/list_installed.go similarity index 92% rename from backend/internal/server/plugins/list_installed.go rename to core/internal/server/plugins/list_installed.go index 4d7de8cc..29b8cda9 100644 --- a/backend/internal/server/plugins/list_installed.go +++ b/core/internal/server/plugins/list_installed.go @@ -5,8 +5,8 @@ import ( "net" "strings" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/plugins" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/server/models" + "github.com/AvengeMedia/DankMaterialShell/core/internal/plugins" + "github.com/AvengeMedia/DankMaterialShell/core/internal/server/models" ) func HandleListInstalled(conn net.Conn, req models.Request) { diff --git a/backend/internal/server/plugins/search.go b/core/internal/server/plugins/search.go similarity index 92% rename from backend/internal/server/plugins/search.go rename to core/internal/server/plugins/search.go index 2f103e5f..72a6b1eb 100644 --- a/backend/internal/server/plugins/search.go +++ b/core/internal/server/plugins/search.go @@ -5,8 +5,8 @@ import ( "net" "strings" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/plugins" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/server/models" + "github.com/AvengeMedia/DankMaterialShell/core/internal/plugins" + "github.com/AvengeMedia/DankMaterialShell/core/internal/server/models" ) func HandleSearch(conn net.Conn, req models.Request) { diff --git a/backend/internal/server/plugins/types.go b/core/internal/server/plugins/types.go similarity index 100% rename from backend/internal/server/plugins/types.go rename to core/internal/server/plugins/types.go diff --git a/backend/internal/server/plugins/uninstall.go b/core/internal/server/plugins/uninstall.go similarity index 91% rename from backend/internal/server/plugins/uninstall.go rename to core/internal/server/plugins/uninstall.go index a122b706..5ef6de53 100644 --- a/backend/internal/server/plugins/uninstall.go +++ b/core/internal/server/plugins/uninstall.go @@ -4,8 +4,8 @@ import ( "fmt" "net" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/plugins" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/server/models" + "github.com/AvengeMedia/DankMaterialShell/core/internal/plugins" + "github.com/AvengeMedia/DankMaterialShell/core/internal/server/models" ) func HandleUninstall(conn net.Conn, req models.Request) { diff --git a/backend/internal/server/plugins/update.go b/core/internal/server/plugins/update.go similarity index 91% rename from backend/internal/server/plugins/update.go rename to core/internal/server/plugins/update.go index 09a77d5d..ab7b9a03 100644 --- a/backend/internal/server/plugins/update.go +++ b/core/internal/server/plugins/update.go @@ -4,8 +4,8 @@ import ( "fmt" "net" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/plugins" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/server/models" + "github.com/AvengeMedia/DankMaterialShell/core/internal/plugins" + "github.com/AvengeMedia/DankMaterialShell/core/internal/server/models" ) func HandleUpdate(conn net.Conn, req models.Request) { diff --git a/backend/internal/server/plugins/utils.go b/core/internal/server/plugins/utils.go similarity index 100% rename from backend/internal/server/plugins/utils.go rename to core/internal/server/plugins/utils.go diff --git a/backend/internal/server/router.go b/core/internal/server/router.go similarity index 80% rename from backend/internal/server/router.go rename to core/internal/server/router.go index a9b47896..996deeb0 100644 --- a/backend/internal/server/router.go +++ b/core/internal/server/router.go @@ -5,18 +5,18 @@ import ( "net" "strings" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/server/bluez" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/server/brightness" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/server/cups" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/server/dwl" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/server/extworkspace" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/server/freedesktop" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/server/loginctl" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/server/models" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/server/network" - serverPlugins "github.com/AvengeMedia/DankMaterialShell/backend/internal/server/plugins" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/server/wayland" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/server/wlroutput" + "github.com/AvengeMedia/DankMaterialShell/core/internal/server/bluez" + "github.com/AvengeMedia/DankMaterialShell/core/internal/server/brightness" + "github.com/AvengeMedia/DankMaterialShell/core/internal/server/cups" + "github.com/AvengeMedia/DankMaterialShell/core/internal/server/dwl" + "github.com/AvengeMedia/DankMaterialShell/core/internal/server/extworkspace" + "github.com/AvengeMedia/DankMaterialShell/core/internal/server/freedesktop" + "github.com/AvengeMedia/DankMaterialShell/core/internal/server/loginctl" + "github.com/AvengeMedia/DankMaterialShell/core/internal/server/models" + "github.com/AvengeMedia/DankMaterialShell/core/internal/server/network" + serverPlugins "github.com/AvengeMedia/DankMaterialShell/core/internal/server/plugins" + "github.com/AvengeMedia/DankMaterialShell/core/internal/server/wayland" + "github.com/AvengeMedia/DankMaterialShell/core/internal/server/wlroutput" ) func RouteRequest(conn net.Conn, req models.Request) { diff --git a/backend/internal/server/server.go b/core/internal/server/server.go similarity index 97% rename from backend/internal/server/server.go rename to core/internal/server/server.go index 0cdfdd49..5f699a5e 100644 --- a/backend/internal/server/server.go +++ b/core/internal/server/server.go @@ -13,19 +13,19 @@ import ( "syscall" "time" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/log" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/server/bluez" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/server/brightness" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/server/cups" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/server/dwl" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/server/extworkspace" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/server/freedesktop" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/server/loginctl" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/server/models" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/server/network" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/server/wayland" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/server/wlcontext" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/server/wlroutput" + "github.com/AvengeMedia/DankMaterialShell/core/internal/log" + "github.com/AvengeMedia/DankMaterialShell/core/internal/server/bluez" + "github.com/AvengeMedia/DankMaterialShell/core/internal/server/brightness" + "github.com/AvengeMedia/DankMaterialShell/core/internal/server/cups" + "github.com/AvengeMedia/DankMaterialShell/core/internal/server/dwl" + "github.com/AvengeMedia/DankMaterialShell/core/internal/server/extworkspace" + "github.com/AvengeMedia/DankMaterialShell/core/internal/server/freedesktop" + "github.com/AvengeMedia/DankMaterialShell/core/internal/server/loginctl" + "github.com/AvengeMedia/DankMaterialShell/core/internal/server/models" + "github.com/AvengeMedia/DankMaterialShell/core/internal/server/network" + "github.com/AvengeMedia/DankMaterialShell/core/internal/server/wayland" + "github.com/AvengeMedia/DankMaterialShell/core/internal/server/wlcontext" + "github.com/AvengeMedia/DankMaterialShell/core/internal/server/wlroutput" ) const APIVersion = 17 diff --git a/backend/internal/server/server_test.go b/core/internal/server/server_test.go similarity index 96% rename from backend/internal/server/server_test.go rename to core/internal/server/server_test.go index 43c0af09..b438475d 100644 --- a/backend/internal/server/server_test.go +++ b/core/internal/server/server_test.go @@ -8,8 +8,8 @@ import ( "path/filepath" "testing" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/server/models" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/server/network" + "github.com/AvengeMedia/DankMaterialShell/core/internal/server/models" + "github.com/AvengeMedia/DankMaterialShell/core/internal/server/network" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/backend/internal/server/wayland/gamma.go b/core/internal/server/wayland/gamma.go similarity index 96% rename from backend/internal/server/wayland/gamma.go rename to core/internal/server/wayland/gamma.go index c4e9a846..1033bdb0 100644 --- a/backend/internal/server/wayland/gamma.go +++ b/core/internal/server/wayland/gamma.go @@ -3,7 +3,7 @@ package wayland import ( "math" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/utils" + "github.com/AvengeMedia/DankMaterialShell/core/internal/utils" ) type GammaRamp struct { diff --git a/backend/internal/server/wayland/gamma_test.go b/core/internal/server/wayland/gamma_test.go similarity index 97% rename from backend/internal/server/wayland/gamma_test.go rename to core/internal/server/wayland/gamma_test.go index 14add9e1..154feec1 100644 --- a/backend/internal/server/wayland/gamma_test.go +++ b/core/internal/server/wayland/gamma_test.go @@ -3,7 +3,7 @@ package wayland import ( "testing" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/utils" + "github.com/AvengeMedia/DankMaterialShell/core/internal/utils" ) func TestGenerateGammaRamp(t *testing.T) { diff --git a/backend/internal/server/wayland/geolocation.go b/core/internal/server/wayland/geolocation.go similarity index 94% rename from backend/internal/server/wayland/geolocation.go rename to core/internal/server/wayland/geolocation.go index b7f10707..ba99b5f5 100644 --- a/backend/internal/server/wayland/geolocation.go +++ b/core/internal/server/wayland/geolocation.go @@ -7,7 +7,7 @@ import ( "net/http" "time" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/log" + "github.com/AvengeMedia/DankMaterialShell/core/internal/log" ) type ipAPIResponse struct { diff --git a/backend/internal/server/wayland/handlers.go b/core/internal/server/wayland/handlers.go similarity index 98% rename from backend/internal/server/wayland/handlers.go rename to core/internal/server/wayland/handlers.go index 4db0ea0a..edfdb1c3 100644 --- a/backend/internal/server/wayland/handlers.go +++ b/core/internal/server/wayland/handlers.go @@ -6,7 +6,7 @@ import ( "net" "time" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/server/models" + "github.com/AvengeMedia/DankMaterialShell/core/internal/server/models" ) type Request struct { diff --git a/backend/internal/server/wayland/manager.go b/core/internal/server/wayland/manager.go similarity index 99% rename from backend/internal/server/wayland/manager.go rename to core/internal/server/wayland/manager.go index 0e0d1777..7f20b03d 100644 --- a/backend/internal/server/wayland/manager.go +++ b/core/internal/server/wayland/manager.go @@ -12,9 +12,9 @@ import ( wlclient "github.com/yaslama/go-wayland/wayland/client" "golang.org/x/sys/unix" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/errdefs" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/log" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/proto/wlr_gamma_control" + "github.com/AvengeMedia/DankMaterialShell/core/internal/errdefs" + "github.com/AvengeMedia/DankMaterialShell/core/internal/log" + "github.com/AvengeMedia/DankMaterialShell/core/internal/proto/wlr_gamma_control" ) func NewManager(display *wlclient.Display, config Config) (*Manager, error) { diff --git a/backend/internal/server/wayland/suncalc.go b/core/internal/server/wayland/suncalc.go similarity index 100% rename from backend/internal/server/wayland/suncalc.go rename to core/internal/server/wayland/suncalc.go diff --git a/backend/internal/server/wayland/suncalc_test.go b/core/internal/server/wayland/suncalc_test.go similarity index 100% rename from backend/internal/server/wayland/suncalc_test.go rename to core/internal/server/wayland/suncalc_test.go diff --git a/backend/internal/server/wayland/types.go b/core/internal/server/wayland/types.go similarity index 98% rename from backend/internal/server/wayland/types.go rename to core/internal/server/wayland/types.go index 0690d2d3..34897e26 100644 --- a/backend/internal/server/wayland/types.go +++ b/core/internal/server/wayland/types.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/errdefs" + "github.com/AvengeMedia/DankMaterialShell/core/internal/errdefs" "github.com/godbus/dbus/v5" wlclient "github.com/yaslama/go-wayland/wayland/client" ) diff --git a/backend/internal/server/wayland/types_test.go b/core/internal/server/wayland/types_test.go similarity index 100% rename from backend/internal/server/wayland/types_test.go rename to core/internal/server/wayland/types_test.go diff --git a/backend/internal/server/wlcontext/context.go b/core/internal/server/wlcontext/context.go similarity index 89% rename from backend/internal/server/wlcontext/context.go rename to core/internal/server/wlcontext/context.go index 007c0f2f..ada207d6 100644 --- a/backend/internal/server/wlcontext/context.go +++ b/core/internal/server/wlcontext/context.go @@ -4,8 +4,8 @@ import ( "fmt" "sync" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/errdefs" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/log" + "github.com/AvengeMedia/DankMaterialShell/core/internal/errdefs" + "github.com/AvengeMedia/DankMaterialShell/core/internal/log" wlclient "github.com/yaslama/go-wayland/wayland/client" ) diff --git a/backend/internal/server/wlroutput/handlers.go b/core/internal/server/wlroutput/handlers.go similarity index 96% rename from backend/internal/server/wlroutput/handlers.go rename to core/internal/server/wlroutput/handlers.go index 58192aa5..16891077 100644 --- a/backend/internal/server/wlroutput/handlers.go +++ b/core/internal/server/wlroutput/handlers.go @@ -6,9 +6,9 @@ import ( "net" "time" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/log" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/proto/wlr_output_management" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/server/models" + "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" ) type Request struct { diff --git a/backend/internal/server/wlroutput/manager.go b/core/internal/server/wlroutput/manager.go similarity index 98% rename from backend/internal/server/wlroutput/manager.go rename to core/internal/server/wlroutput/manager.go index 28c124e8..e7113949 100644 --- a/backend/internal/server/wlroutput/manager.go +++ b/core/internal/server/wlroutput/manager.go @@ -4,8 +4,8 @@ import ( "fmt" "time" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/log" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/proto/wlr_output_management" + "github.com/AvengeMedia/DankMaterialShell/core/internal/log" + "github.com/AvengeMedia/DankMaterialShell/core/internal/proto/wlr_output_management" wlclient "github.com/yaslama/go-wayland/wayland/client" ) diff --git a/backend/internal/server/wlroutput/types.go b/core/internal/server/wlroutput/types.go similarity index 97% rename from backend/internal/server/wlroutput/types.go rename to core/internal/server/wlroutput/types.go index ba5d3f1e..2d2f85d6 100644 --- a/backend/internal/server/wlroutput/types.go +++ b/core/internal/server/wlroutput/types.go @@ -3,7 +3,7 @@ package wlroutput import ( "sync" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/proto/wlr_output_management" + "github.com/AvengeMedia/DankMaterialShell/core/internal/proto/wlr_output_management" wlclient "github.com/yaslama/go-wayland/wayland/client" ) diff --git a/backend/internal/sway/keybinds.go b/core/internal/sway/keybinds.go similarity index 100% rename from backend/internal/sway/keybinds.go rename to core/internal/sway/keybinds.go diff --git a/backend/internal/sway/keybinds_test.go b/core/internal/sway/keybinds_test.go similarity index 100% rename from backend/internal/sway/keybinds_test.go rename to core/internal/sway/keybinds_test.go diff --git a/backend/internal/tui/app.go b/core/internal/tui/app.go similarity index 97% rename from backend/internal/tui/app.go rename to core/internal/tui/app.go index 7a8d5640..c7d102aa 100644 --- a/backend/internal/tui/app.go +++ b/core/internal/tui/app.go @@ -1,8 +1,8 @@ package tui import ( - "github.com/AvengeMedia/DankMaterialShell/backend/internal/deps" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/distros" + "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" + "github.com/AvengeMedia/DankMaterialShell/core/internal/distros" "github.com/charmbracelet/bubbles/spinner" "github.com/charmbracelet/bubbles/textinput" tea "github.com/charmbracelet/bubbletea" diff --git a/backend/internal/tui/banner.go b/core/internal/tui/banner.go similarity index 100% rename from backend/internal/tui/banner.go rename to core/internal/tui/banner.go diff --git a/backend/internal/tui/messages.go b/core/internal/tui/messages.go similarity index 79% rename from backend/internal/tui/messages.go rename to core/internal/tui/messages.go index 6de94e54..7c030988 100644 --- a/backend/internal/tui/messages.go +++ b/core/internal/tui/messages.go @@ -1,8 +1,8 @@ package tui import ( - "github.com/AvengeMedia/DankMaterialShell/backend/internal/deps" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/distros" + "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" + "github.com/AvengeMedia/DankMaterialShell/core/internal/distros" ) type logMsg struct { diff --git a/backend/internal/tui/states.go b/core/internal/tui/states.go similarity index 100% rename from backend/internal/tui/states.go rename to core/internal/tui/states.go diff --git a/backend/internal/tui/styles.go b/core/internal/tui/styles.go similarity index 100% rename from backend/internal/tui/styles.go rename to core/internal/tui/styles.go diff --git a/backend/internal/tui/views_config.go b/core/internal/tui/views_config.go similarity index 98% rename from backend/internal/tui/views_config.go rename to core/internal/tui/views_config.go index f916f696..3bff4448 100644 --- a/backend/internal/tui/views_config.go +++ b/core/internal/tui/views_config.go @@ -7,8 +7,8 @@ import ( "path/filepath" "strings" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/config" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/deps" + "github.com/AvengeMedia/DankMaterialShell/core/internal/config" + "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" tea "github.com/charmbracelet/bubbletea" ) diff --git a/backend/internal/tui/views_dependencies.go b/core/internal/tui/views_dependencies.go similarity index 98% rename from backend/internal/tui/views_dependencies.go rename to core/internal/tui/views_dependencies.go index 6ccd6439..f1b112e0 100644 --- a/backend/internal/tui/views_dependencies.go +++ b/core/internal/tui/views_dependencies.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/deps" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/distros" + "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" + "github.com/AvengeMedia/DankMaterialShell/core/internal/distros" tea "github.com/charmbracelet/bubbletea" ) diff --git a/backend/internal/tui/views_gentoo_gcc.go b/core/internal/tui/views_gentoo_gcc.go similarity index 100% rename from backend/internal/tui/views_gentoo_gcc.go rename to core/internal/tui/views_gentoo_gcc.go diff --git a/backend/internal/tui/views_gentoo_use_flags.go b/core/internal/tui/views_gentoo_use_flags.go similarity index 97% rename from backend/internal/tui/views_gentoo_use_flags.go rename to core/internal/tui/views_gentoo_use_flags.go index 13c5528e..eb259ef9 100644 --- a/backend/internal/tui/views_gentoo_use_flags.go +++ b/core/internal/tui/views_gentoo_use_flags.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/distros" + "github.com/AvengeMedia/DankMaterialShell/core/internal/distros" tea "github.com/charmbracelet/bubbletea" ) diff --git a/backend/internal/tui/views_install.go b/core/internal/tui/views_install.go similarity index 100% rename from backend/internal/tui/views_install.go rename to core/internal/tui/views_install.go diff --git a/backend/internal/tui/views_nixos_wm.go b/core/internal/tui/views_nixos_wm.go similarity index 100% rename from backend/internal/tui/views_nixos_wm.go rename to core/internal/tui/views_nixos_wm.go diff --git a/backend/internal/tui/views_password.go b/core/internal/tui/views_password.go similarity index 100% rename from backend/internal/tui/views_password.go rename to core/internal/tui/views_password.go diff --git a/backend/internal/tui/views_selection.go b/core/internal/tui/views_selection.go similarity index 97% rename from backend/internal/tui/views_selection.go rename to core/internal/tui/views_selection.go index cedaf537..2a4a36ec 100644 --- a/backend/internal/tui/views_selection.go +++ b/core/internal/tui/views_selection.go @@ -6,8 +6,8 @@ import ( "os/exec" "strings" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/deps" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/distros" + "github.com/AvengeMedia/DankMaterialShell/core/internal/deps" + "github.com/AvengeMedia/DankMaterialShell/core/internal/distros" tea "github.com/charmbracelet/bubbletea" ) diff --git a/backend/internal/tui/views_welcome.go b/core/internal/tui/views_welcome.go similarity index 98% rename from backend/internal/tui/views_welcome.go rename to core/internal/tui/views_welcome.go index 64ff4295..64d4c15c 100644 --- a/backend/internal/tui/views_welcome.go +++ b/core/internal/tui/views_welcome.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/AvengeMedia/DankMaterialShell/backend/internal/distros" + "github.com/AvengeMedia/DankMaterialShell/core/internal/distros" tea "github.com/charmbracelet/bubbletea" "github.com/charmbracelet/lipgloss" ) diff --git a/backend/internal/utils/math.go b/core/internal/utils/math.go similarity index 100% rename from backend/internal/utils/math.go rename to core/internal/utils/math.go diff --git a/backend/internal/version/version.go b/core/internal/version/version.go similarity index 100% rename from backend/internal/version/version.go rename to core/internal/version/version.go diff --git a/backend/internal/version/version_test.go b/core/internal/version/version_test.go similarity index 100% rename from backend/internal/version/version_test.go rename to core/internal/version/version_test.go diff --git a/backend/pkg/ipp/CREDITS.MD b/core/pkg/ipp/CREDITS.MD similarity index 100% rename from backend/pkg/ipp/CREDITS.MD rename to core/pkg/ipp/CREDITS.MD diff --git a/backend/pkg/ipp/LICENSE b/core/pkg/ipp/LICENSE similarity index 100% rename from backend/pkg/ipp/LICENSE rename to core/pkg/ipp/LICENSE diff --git a/backend/pkg/ipp/adapter-http.go b/core/pkg/ipp/adapter-http.go similarity index 100% rename from backend/pkg/ipp/adapter-http.go rename to core/pkg/ipp/adapter-http.go diff --git a/backend/pkg/ipp/adapter.go b/core/pkg/ipp/adapter.go similarity index 100% rename from backend/pkg/ipp/adapter.go rename to core/pkg/ipp/adapter.go diff --git a/backend/pkg/ipp/attribute.go b/core/pkg/ipp/attribute.go similarity index 100% rename from backend/pkg/ipp/attribute.go rename to core/pkg/ipp/attribute.go diff --git a/backend/pkg/ipp/constants.go b/core/pkg/ipp/constants.go similarity index 100% rename from backend/pkg/ipp/constants.go rename to core/pkg/ipp/constants.go diff --git a/backend/pkg/ipp/cups-client.go b/core/pkg/ipp/cups-client.go similarity index 100% rename from backend/pkg/ipp/cups-client.go rename to core/pkg/ipp/cups-client.go diff --git a/backend/pkg/ipp/error.go b/core/pkg/ipp/error.go similarity index 100% rename from backend/pkg/ipp/error.go rename to core/pkg/ipp/error.go diff --git a/backend/pkg/ipp/ipp-client.go b/core/pkg/ipp/ipp-client.go similarity index 100% rename from backend/pkg/ipp/ipp-client.go rename to core/pkg/ipp/ipp-client.go diff --git a/backend/pkg/ipp/request.go b/core/pkg/ipp/request.go similarity index 100% rename from backend/pkg/ipp/request.go rename to core/pkg/ipp/request.go diff --git a/backend/pkg/ipp/response.go b/core/pkg/ipp/response.go similarity index 100% rename from backend/pkg/ipp/response.go rename to core/pkg/ipp/response.go diff --git a/backend/pkg/ipp/utils.go b/core/pkg/ipp/utils.go similarity index 100% rename from backend/pkg/ipp/utils.go rename to core/pkg/ipp/utils.go diff --git a/distro/fedora/dms.spec b/distro/fedora/dms.spec index 8aa474b5..2f3eab98 100644 --- a/distro/fedora/dms.spec +++ b/distro/fedora/dms.spec @@ -97,8 +97,8 @@ gunzip -c %{_builddir}/dgop.gz > %{_builddir}/dgop chmod +x %{_builddir}/dgop %build -# Build DMS CLI from source (backend/ subdirectory in monorepo) -cd backend +# Build DMS CLI from source (core/ subdirectory in monorepo) +cd core make dist %install @@ -116,15 +116,15 @@ case "%{_arch}" in ;; esac -install -Dm755 backend/bin/${DMS_BINARY} %{buildroot}%{_bindir}/dms +install -Dm755 core/bin/${DMS_BINARY} %{buildroot}%{_bindir}/dms # Shell completions install -d %{buildroot}%{_datadir}/bash-completion/completions install -d %{buildroot}%{_datadir}/zsh/site-functions install -d %{buildroot}%{_datadir}/fish/vendor_completions.d -backend/bin/${DMS_BINARY} completion bash > %{buildroot}%{_datadir}/bash-completion/completions/dms || : -backend/bin/${DMS_BINARY} completion zsh > %{buildroot}%{_datadir}/zsh/site-functions/_dms || : -backend/bin/${DMS_BINARY} completion fish > %{buildroot}%{_datadir}/fish/vendor_completions.d/dms.fish || : +core/bin/${DMS_BINARY} completion bash > %{buildroot}%{_datadir}/bash-completion/completions/dms || : +core/bin/${DMS_BINARY} completion zsh > %{buildroot}%{_datadir}/zsh/site-functions/_dms || : +core/bin/${DMS_BINARY} completion fish > %{buildroot}%{_datadir}/fish/vendor_completions.d/dms.fish || : # Install dgop binary install -Dm755 %{_builddir}/dgop %{buildroot}%{_bindir}/dgop