diff --git a/ansible/inventory/group_vars/desktop.yml b/ansible/inventory/group_vars/desktop.yml index a2a4d85..4767e45 100644 --- a/ansible/inventory/group_vars/desktop.yml +++ b/ansible/inventory/group_vars/desktop.yml @@ -154,32 +154,6 @@ desktop_i3_dotfiles: dest: .xinitrc mode: "0644" -desktop_sway_dotfiles: - - name: Sway config - src: .config/sway/ - dest: .config/sway/ - mode: preserve - - name: Sway wallpaper assets - src: .config/i3/wallpapers/ - dest: .config/sway/wallpapers/ - mode: preserve - - name: Sway session wrapper - src: .local/bin/start-sway-session - dest: .local/bin/start-sway-session - mode: "0755" - - name: Noctalia colors - src: .config/noctalia/colors.json - dest: .config/noctalia/colors.json - mode: "0644" - - name: Noctalia plugins - src: .config/noctalia/plugins.json - dest: .config/noctalia/plugins.json - mode: "0644" - - name: Noctalia colorschemes - src: .config/noctalia/colorschemes/ - dest: .config/noctalia/colorschemes/ - mode: preserve - noctalia_bar_monitors: - DP-1 diff --git a/ansible/inventory/group_vars/void.yml b/ansible/inventory/group_vars/void.yml index 96af9e8..cfd0491 100644 --- a/ansible/inventory/group_vars/void.yml +++ b/ansible/inventory/group_vars/void.yml @@ -135,6 +135,10 @@ desktop_void_dotfiles: src: .local/bin/update-turnstile-env dest: .local/bin/update-turnstile-env mode: "0755" + - name: Noctalia config + src: .config/noctalia/ + dest: .config/noctalia/ + mode: preserve desktop_common_packages: - brightnessctl @@ -173,14 +177,6 @@ desktop_i3_packages: - xorg-minimal - xss-lock -desktop_sway_packages: - - grim - - kanshi - - slurp - - swayfx - - wl-clipboard - - xdg-desktop-portal-wlr - profile_packages: - alacritty - bluez diff --git a/ansible/roles/packages_void/tasks/main.yml b/ansible/roles/packages_void/tasks/main.yml index 4f0f422..967ea4a 100644 --- a/ansible/roles/packages_void/tasks/main.yml +++ b/ansible/roles/packages_void/tasks/main.yml @@ -61,11 +61,6 @@ if 'i3' in (desktop_sessions_enabled | default([])) else [] ) - + ( - (desktop_sway_packages | default([])) - if 'sway' in (desktop_sessions_enabled | default([])) - else [] - ) + (host_packages | default([])) ) | unique diff --git a/ansible/roles/profile_desktop_common/tasks/main.yml b/ansible/roles/profile_desktop_common/tasks/main.yml index 1a84f18..ea98de4 100644 --- a/ansible/roles/profile_desktop_common/tasks/main.yml +++ b/ansible/roles/profile_desktop_common/tasks/main.yml @@ -247,7 +247,6 @@ mode: "0755" loop: - /etc/emptty/xsessions - - /etc/emptty/wayland-sessions when: "'void' in group_names" - name: Configure emptty diff --git a/ansible/roles/profile_desktop_common/templates/emptty-conf.j2 b/ansible/roles/profile_desktop_common/templates/emptty-conf.j2 index c54363e..c4f93df 100644 --- a/ansible/roles/profile_desktop_common/templates/emptty-conf.j2 +++ b/ansible/roles/profile_desktop_common/templates/emptty-conf.j2 @@ -10,7 +10,6 @@ DEFAULT_SESSION_ENV={{ desktop_default_session_env | default('') }} DBUS_LAUNCH=false XINITRC_LAUNCH=true XORG_SESSIONS_PATH=/etc/emptty/xsessions -WAYLAND_SESSIONS_PATH=/etc/emptty/wayland-sessions VERTICAL_SELECTION=true IDENTIFY_ENVS=true SELECT_LAST_USER=global diff --git a/ansible/roles/profile_desktop_host/tasks/main.yml b/ansible/roles/profile_desktop_host/tasks/main.yml index bf56aab..47cbd98 100644 --- a/ansible/roles/profile_desktop_host/tasks/main.yml +++ b/ansible/roles/profile_desktop_host/tasks/main.yml @@ -19,17 +19,3 @@ - "'i3' in (desktop_sessions_enabled | default([]))" - (host_i3_dotfiles | default([])) | length > 0 -- name: Copy host-specific Sway dotfiles - tags: [dotfiles, dotfiles:desktop, dotfiles:host, sway] - ansible.builtin.copy: - src: "{{ playbook_dir }}/../dotfiles/{{ hostname }}/{{ item.src }}" - dest: "{{ user_home }}/{{ item.dest }}" - owner: "{{ username }}" - group: "{{ user_group }}" - mode: "{{ item.mode }}" - loop: "{{ host_sway_dotfiles | default([]) }}" - loop_control: - label: "{{ item.dest }}" - when: - - "'sway' in (desktop_sessions_enabled | default([]))" - - (host_sway_dotfiles | default([])) | length > 0 diff --git a/ansible/roles/profile_desktop_sway/tasks/main.yml b/ansible/roles/profile_desktop_sway/tasks/main.yml deleted file mode 100644 index da33ed4..0000000 --- a/ansible/roles/profile_desktop_sway/tasks/main.yml +++ /dev/null @@ -1,85 +0,0 @@ ---- -- name: Ensure Sway config directories exist - tags: [dotfiles, dotfiles:desktop, sway] - ansible.builtin.file: - path: "{{ item }}" - state: directory - owner: "{{ username }}" - group: "{{ user_group }}" - mode: "0755" - loop: - - "{{ user_home }}/.config/sway" - - "{{ user_home }}/.config/kanshi" - when: "'sway' in (desktop_sessions_enabled | default([]))" - -- name: Ensure Noctalia config directories exist - tags: [dotfiles, dotfiles:desktop, sway, noctalia] - ansible.builtin.file: - path: "{{ item }}" - state: directory - owner: "{{ username }}" - group: "{{ user_group }}" - mode: "0755" - loop: - - "{{ user_home }}/.config/noctalia" - - "{{ user_home }}/.config/noctalia/plugins" - - "{{ user_home }}/.local/share/noctalia-plugins" - when: "'sway' in (desktop_sessions_enabled | default([]))" - -- name: Install Sway emptty session entry - tags: [packages, services, emptty, sway] - ansible.builtin.template: - src: Sway.desktop.j2 - dest: /etc/emptty/wayland-sessions/Sway.desktop - owner: root - group: root - mode: "0644" - when: "'sway' in (desktop_sessions_enabled | default([]))" - -- name: Copy Sway desktop dotfiles - tags: [dotfiles, dotfiles:desktop, sway] - ansible.builtin.copy: - src: "{{ playbook_dir }}/../dotfiles/desktop/{{ item.src }}" - dest: "{{ user_home }}/{{ item.dest }}" - owner: "{{ username }}" - group: "{{ user_group }}" - mode: "{{ item.mode }}" - loop: "{{ desktop_sway_dotfiles | default([]) }}" - loop_control: - label: "{{ item.dest }}" - when: "'sway' in (desktop_sessions_enabled | default([]))" - -- name: Render Sway shell config - tags: [dotfiles, dotfiles:desktop, sway] - ansible.builtin.template: - src: shell.conf.j2 - dest: "{{ user_home }}/.config/sway/shell.conf" - owner: "{{ username }}" - group: "{{ user_group }}" - mode: "0644" - when: "'sway' in (desktop_sessions_enabled | default([]))" - -- name: Render Noctalia settings template - tags: [dotfiles, dotfiles:desktop, sway, noctalia] - ansible.builtin.template: - src: noctalia-settings.json.j2 - dest: "{{ user_home }}/.config/noctalia/settings.json" - owner: "{{ username }}" - group: "{{ user_group }}" - mode: "0644" - when: "'sway' in (desktop_sessions_enabled | default([]))" - -- name: Manage Noctalia shell plugins - tags: [dotfiles, dotfiles:desktop, sway, noctalia] - ansible.builtin.include_tasks: noctalia.yml - when: "'sway' in (desktop_sessions_enabled | default([]))" - -- name: Copy shared Clipper settings - tags: [dotfiles, dotfiles:desktop, sway, noctalia] - ansible.builtin.copy: - src: "{{ playbook_dir }}/../dotfiles/desktop/.config/noctalia/plugins/clipper/settings.json" - dest: "{{ user_home }}/.config/noctalia/plugins/clipper/settings.json" - owner: "{{ username }}" - group: "{{ user_group }}" - mode: "0644" - when: "'sway' in (desktop_sessions_enabled | default([]))" diff --git a/ansible/roles/profile_desktop_sway/tasks/noctalia.yml b/ansible/roles/profile_desktop_sway/tasks/noctalia.yml deleted file mode 100644 index caaed9a..0000000 --- a/ansible/roles/profile_desktop_sway/tasks/noctalia.yml +++ /dev/null @@ -1,142 +0,0 @@ ---- -- name: Check whether official Clipper plugin directory exists - ansible.builtin.stat: - path: "{{ user_home }}/.local/share/noctalia-plugins/official/clipper" - follow: false - register: official_clipper_path_state - -- name: Repair official Clipper plugin permissions before git update - ansible.builtin.file: - path: "{{ user_home }}/.local/share/noctalia-plugins/official/clipper" - state: directory - recurse: true - owner: "{{ username }}" - group: "{{ user_group }}" - mode: "u=rwX,go=rX" - when: - - official_clipper_path_state.stat.exists - - official_clipper_path_state.stat.isdir - -- name: Remove untracked files from official Clipper subtree before git update - ansible.builtin.command: - cmd: git clean -fd -- clipper - chdir: "{{ user_home }}/.local/share/noctalia-plugins/official" - become_user: "{{ username }}" - environment: - HOME: "{{ user_home }}" - register: official_clipper_clean - changed_when: >- - (official_clipper_clean.stdout | default('') | trim) != '' or - (official_clipper_clean.stderr | default('') | trim) != '' - when: - - official_clipper_path_state.stat.exists - - official_clipper_path_state.stat.isdir - -- name: Bootstrap official Noctalia plugins checkout - ansible.builtin.git: - repo: https://github.com/noctalia-dev/noctalia-plugins.git - dest: "{{ user_home }}/.local/share/noctalia-plugins/official" - version: main - update: true - force: true - become_user: "{{ username }}" - environment: - HOME: "{{ user_home }}" - -- name: Check if Clipper is a real directory (needs migration to symlink) - ansible.builtin.stat: - path: "{{ user_home }}/.config/noctalia/plugins/clipper" - follow: false - register: clipper_path_state - -- name: Check whether Clipper pinned data exists - ansible.builtin.stat: - path: "{{ user_home }}/.config/noctalia/plugins/clipper/pinned.json" - register: clipper_pinned_state - when: - - clipper_path_state.stat.exists - - clipper_path_state.stat.isdir - - not (clipper_path_state.stat.islnk | default(false)) - -- name: Preserve Clipper pinned data before migration - ansible.builtin.copy: - src: "{{ user_home }}/.config/noctalia/plugins/clipper/pinned.json" - dest: "{{ user_home }}/.local/share/noctalia-plugins/official/clipper/pinned.json" - remote_src: true - owner: "{{ username }}" - group: "{{ user_group }}" - mode: "0644" - become_user: "{{ username }}" - environment: - HOME: "{{ user_home }}" - when: - - clipper_pinned_state is defined and clipper_pinned_state.stat is defined and clipper_pinned_state.stat.exists - -- name: Check whether Clipper notecards directory exists - ansible.builtin.stat: - path: "{{ user_home }}/.config/noctalia/plugins/clipper/notecards" - register: clipper_notecards_state - when: - - clipper_path_state.stat.exists - - clipper_path_state.stat.isdir - - not (clipper_path_state.stat.islnk | default(false)) - -- name: Preserve Clipper notecards before migration - ansible.builtin.copy: - src: "{{ user_home }}/.config/noctalia/plugins/clipper/notecards/" - dest: "{{ user_home }}/.local/share/noctalia-plugins/official/clipper/notecards/" - remote_src: true - owner: "{{ username }}" - group: "{{ user_group }}" - mode: preserve - become_user: "{{ username }}" - environment: - HOME: "{{ user_home }}" - when: - - clipper_notecards_state is defined and clipper_notecards_state.stat is defined and clipper_notecards_state.stat.exists and clipper_notecards_state.stat.isdir - -- name: Remove old Clipper directory (migration to symlink) - ansible.builtin.file: - path: "{{ user_home }}/.config/noctalia/plugins/clipper" - state: absent - when: - - clipper_path_state.stat.exists - - clipper_path_state.stat.isdir - - not (clipper_path_state.stat.islnk | default(false)) - -- name: Create Clipper symlink to official plugin - ansible.builtin.file: - src: "{{ user_home }}/.local/share/noctalia-plugins/official/clipper" - dest: "{{ user_home }}/.config/noctalia/plugins/clipper" - state: link - force: true - owner: "{{ username }}" - group: "{{ user_group }}" - -- name: Check if usb-drive-manager is a real directory (needs migration to symlink) - ansible.builtin.stat: - path: "{{ user_home }}/.config/noctalia/plugins/usb-drive-manager" - follow: false - register: usb_drive_manager_path_state - -- name: Remove old usb-drive-manager directory (migration to symlink) - ansible.builtin.file: - path: "{{ user_home }}/.config/noctalia/plugins/usb-drive-manager" - state: absent - when: - - usb_drive_manager_path_state.stat.exists - - usb_drive_manager_path_state.stat.isdir - - not (usb_drive_manager_path_state.stat.islnk | default(false)) - -- name: Link official Noctalia plugins - ansible.builtin.file: - src: "{{ user_home }}/.local/share/noctalia-plugins/official/{{ item }}" - dest: "{{ user_home }}/.config/noctalia/plugins/{{ item }}" - state: link - force: true - owner: "{{ username }}" - group: "{{ user_group }}" - loop: - - polkit-agent - - screenshot - - usb-drive-manager diff --git a/ansible/roles/profile_desktop_sway/templates/Sway.desktop.j2 b/ansible/roles/profile_desktop_sway/templates/Sway.desktop.j2 deleted file mode 100644 index 8298ccb..0000000 --- a/ansible/roles/profile_desktop_sway/templates/Sway.desktop.j2 +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=Sway -Comment=Sway Wayland compositor -Exec={{ user_home }}/.local/bin/start-sway-session -TryExec=sway -Type=Application -DesktopNames=sway;wlroots -Keywords=wayland;wm;windowmanager;window;manager;tiling;compositor; diff --git a/ansible/roles/profile_desktop_sway/templates/noctalia-settings.json.j2 b/ansible/roles/profile_desktop_sway/templates/noctalia-settings.json.j2 deleted file mode 100644 index b375623..0000000 --- a/ansible/roles/profile_desktop_sway/templates/noctalia-settings.json.j2 +++ /dev/null @@ -1,622 +0,0 @@ -{ - "appLauncher": { - "autoPasteClipboard": false, - "clipboardWatchImageCommand": "wl-paste --type image --watch cliphist store", - "clipboardWatchTextCommand": "wl-paste --type text --watch cliphist store", - "clipboardWrapText": true, - "customLaunchPrefix": "", - "customLaunchPrefixEnabled": false, - "density": "default", - "enableClipPreview": true, - "enableClipboardChips": true, - "enableClipboardHistory": false, - "enableClipboardSmartIcons": true, - "enableSessionSearch": true, - "enableSettingsSearch": true, - "enableWindowsSearch": true, - "iconMode": "tabler", - "ignoreMouseInput": false, - "overviewLayer": false, - "pinnedApps": [], - "position": "center", - "screenshotAnnotationTool": "", - "showCategories": true, - "showIconBackground": false, - "sortByMostUsed": true, - "terminalCommand": "alacritty -e", - "viewMode": "list" - }, - "audio": { - "mprisBlacklist": [], - "preferredPlayer": "", - "spectrumFrameRate": 30, - "spectrumMirrored": true, - "visualizerType": "linear", - "volumeFeedback": false, - "volumeFeedbackSoundFile": "", - "volumeOverdrive": false, - "volumeStep": 5 - }, - "bar": { - "autoHideDelay": 500, - "autoShowDelay": 150, - "backgroundOpacity": 0.93, - "barType": "simple", - "capsuleColorKey": "none", - "capsuleOpacity": 1, - "contentPadding": 2, - "density": "default", - "displayMode": "always_visible", - "enableExclusionZoneInset": true, - "fontScale": 1, - "frameRadius": 12, - "frameThickness": 8, - "hideOnOverview": false, - "marginHorizontal": 4, - "marginVertical": 4, - "middleClickAction": "none", - "middleClickCommand": "", - "middleClickFollowMouse": false, - "monitors": [ -{% for monitor in noctalia_bar_monitors | default(['DP-1']) %} - "{{ monitor }}"{% if not loop.last %},{% endif %} -{% endfor %} - ], - "mouseWheelAction": "none", - "mouseWheelWrap": true, - "outerCorners": true, - "position": "top", - "reverseScroll": false, - "rightClickAction": "controlCenter", - "rightClickCommand": "", - "rightClickFollowMouse": true, - "screenOverrides": [ -{% for override in noctalia_screen_overrides | default([]) %} - { - "enabled": {{ override.enabled | lower }}, - "name": "{{ override.name }}" - }{% if not loop.last %},{% endif %} -{% endfor %} - ], - "showCapsule": true, - "showOnWorkspaceSwitch": true, - "showOutline": false, - "useSeparateOpacity": false, - "widgetSpacing": 6, - "widgets": { - "center": [ - { - "clockColor": "none", - "customFont": "", - "formatHorizontal": "HH:mm ddd, MMM dd", - "formatVertical": "HH mm - dd MM", - "id": "Clock", - "tooltipFormat": "HH:mm ddd, MMM dd", - "useCustomFont": false - }, - { - "compactMode": false, - "hideMode": "hidden", - "hideWhenIdle": false, - "id": "MediaMini", - "maxWidth": 145, - "panelShowAlbumArt": true, - "scrollingMode": "hover", - "showAlbumArt": true, - "showArtistFirst": true, - "showProgressRing": true, - "showVisualizer": false, - "textColor": "none", - "useFixedWidth": false, - "visualizerType": "linear" - } - ], - "left": [ - { - "characterCount": 2, - "colorizeIcons": false, - "emptyColor": "secondary", - "enableScrollWheel": true, - "focusedColor": "primary", - "followFocusedScreen": false, - "fontWeight": "bold", - "groupedBorderOpacity": 1, - "hideUnoccupied": false, - "iconScale": 0.8, - "id": "Workspace", - "labelMode": "index", - "occupiedColor": "secondary", - "pillSize": 0.6, - "showApplications": false, - "showApplicationsHover": false, - "showBadge": true, - "showLabelsOnlyWhenOccupied": true, - "unfocusedIconsOpacity": 1 - } - ], - "right": [ - { - "blacklist": [], - "chevronColor": "none", - "colorizeIcons": false, - "drawerEnabled": true, - "hidePassive": false, - "id": "Tray", - "pinned": [] - }, - { - "compactMode": true, - "diskPath": "/", - "iconColor": "none", - "id": "SystemMonitor", - "showCpuCores": false, - "showCpuFreq": false, - "showCpuTemp": true, - "showCpuUsage": true, - "showDiskAvailable": false, - "showDiskUsage": false, - "showDiskUsageAsPercent": false, - "showGpuTemp": false, - "showLoadAverage": false, - "showMemoryAsPercent": false, - "showMemoryUsage": true, - "showNetworkStats": false, - "showSwapUsage": false, - "textColor": "none", - "useMonospaceFont": true, - "usePadding": false - }, - { - "defaultSettings": { - "autoMount": false, - "fileBrowser": "yazi", - "hideWhenEmpty": false, - "iconColor": "none", - "showBadge": false, - "showNotifications": true, - "terminalCommand": "kitty" - }, - "id": "plugin:usb-drive-manager" - }, - { - "defaultSettings": { - "autoPaste": false, - "autoPasteDelay": 300, - "autoPasteOnRightClick": false, - "cardColors": {}, - "customColors": {}, - "enableTodoIntegration": false, - "fullscreenMode": false, - "hidePanelBackground": false, - "notecardsEnabled": true, - "panelHeight": 0, - "panelWidth": 1450, - "pincardsEnabled": true, - "showCloseButton": true - }, - "id": "plugin:clipper" - }, - { - "displayMode": "onhover", - "iconColor": "none", - "id": "Volume", - "middleClickCommand": "pwvucontrol || pavucontrol", - "textColor": "none" - }, - { - "applyToAllMonitors": false, - "displayMode": "onhover", - "iconColor": "none", - "id": "Brightness", - "textColor": "none" - }, - { - "deviceNativePath": "__default__", - "displayMode": "graphic-clean", - "hideIfIdle": false, - "hideIfNotDetected": true, - "id": "Battery", - "showNoctaliaPerformance": false, - "showPowerProfiles": false - }, - { - "colorizeDistroLogo": false, - "colorizeSystemIcon": "secondary", - "colorizeSystemText": "none", - "customIconPath": "", - "enableColorization": true, - "icon": "settings", - "id": "ControlCenter", - "useDistroLogo": false - }, - { - "hideWhenZero": false, - "hideWhenZeroUnread": false, - "iconColor": "none", - "id": "NotificationHistory", - "showUnreadBadge": true, - "unreadBadgeColor": "tertiary" - } - ] - } - }, - "brightness": { - "backlightDeviceMappings": [], - "brightnessStep": 5, - "enableDdcSupport": false, - "enforceMinimum": true - }, - "calendar": { - "cards": [ - { - "enabled": true, - "id": "calendar-header-card" - }, - { - "enabled": true, - "id": "calendar-month-card" - }, - { - "enabled": true, - "id": "weather-card" - } - ] - }, - "colorSchemes": { - "darkMode": true, - "generationMethod": "tonal-spot", - "manualSunrise": "06:30", - "manualSunset": "18:30", - "monitorForColors": "", - "predefinedScheme": "Ayu", - "schedulingMode": "off", - "syncGsettings": true, - "useWallpaperColors": false - }, - "controlCenter": { - "cards": [ - { - "enabled": true, - "id": "profile-card" - }, - { - "enabled": true, - "id": "shortcuts-card" - }, - { - "enabled": true, - "id": "audio-card" - }, - { - "enabled": true, - "id": "brightness-card" - }, - { - "enabled": true, - "id": "weather-card" - }, - { - "enabled": true, - "id": "media-sysmon-card" - } - ], - "diskPath": "/", - "position": "close_to_bar_button", - "shortcuts": { - "left": [ - {"id": "Network"}, - {"id": "Bluetooth"}, - {"id": "WallpaperSelector"}, - {"id": "NoctaliaPerformance"} - ], - "right": [ - {"id": "Notifications"}, - {"id": "PowerProfile"}, - {"id": "KeepAwake"}, - {"id": "NightLight"} - ] - } - }, - "desktopWidgets": { - "enabled": false, - "gridSnap": false, - "gridSnapScale": false, - "monitorWidgets": [], - "overviewEnabled": true - }, - "dock": { - "animationSpeed": 1, - "backgroundOpacity": 1, - "colorizeIcons": false, - "deadOpacity": 0.6, - "displayMode": "auto_hide", - "dockType": "floating", - "enabled": false, - "floatingRatio": 1, - "groupApps": false, - "groupClickAction": "cycle", - "groupContextMenuMode": "extended", - "groupIndicatorStyle": "dots", - "inactiveIndicators": false, - "indicatorColor": "primary", - "indicatorOpacity": 0.6, - "indicatorThickness": 3, - "launcherIcon": "", - "launcherIconColor": "none", - "launcherPosition": "end", - "launcherUseDistroLogo": false, - "monitors": [], - "onlySameOutput": true, - "pinnedApps": [], - "pinnedStatic": false, - "position": "bottom", - "showDockIndicator": false, - "showLauncherIcon": false, - "sitOnFrame": false, - "size": 1 - }, - "general": { - "allowPanelsOnScreenWithoutBar": true, - "allowPasswordWithFprintd": false, - "animationDisabled": false, - "animationSpeed": 1, - "autoStartAuth": false, - "avatarImage": "{{ user_home }}/.face", - "boxRadiusRatio": 1, - "clockFormat": "hh\\nmm", - "clockStyle": "custom", - "compactLockScreen": false, - "dimmerOpacity": 0.2, - "enableBlurBehind": true, - "enableLockScreenCountdown": true, - "enableLockScreenMediaControls": false, - "enableShadows": true, - "forceBlackScreenCorners": false, - "iRadiusRatio": 1, - "keybinds": { - "keyDown": ["Down"], - "keyEnter": ["Return", "Enter"], - "keyEscape": ["Esc"], - "keyLeft": ["Left"], - "keyRemove": ["Del"], - "keyRight": ["Right"], - "keyUp": ["Up"] - }, - "language": "", - "lockOnSuspend": true, - "lockScreenAnimations": false, - "lockScreenBlur": 0, - "lockScreenCountdownDuration": 10000, - "lockScreenMonitors": [], - "lockScreenTint": 0, - "passwordChars": false, - "radiusRatio": 1, - "reverseScroll": false, - "scaleRatio": 1, - "screenRadiusRatio": 1, - "shadowDirection": "bottom_right", - "shadowOffsetX": 2, - "shadowOffsetY": 3, - "showChangelogOnStartup": true, - "showHibernateOnLockScreen": false, - "showScreenCorners": false, - "showSessionButtonsOnLockScreen": true, - "smoothScrollEnabled": true, - "telemetryEnabled": false - }, - "hooks": { - "colorGeneration": "", - "darkModeChange": "", - "enabled": false, - "performanceModeDisabled": "", - "performanceModeEnabled": "", - "screenLock": "", - "screenUnlock": "", - "session": "", - "startup": "", - "wallpaperChange": "" - }, - "idle": { - "customCommands": "[]", - "enabled": true, - "fadeDuration": 5, - "lockCommand": "", - "lockTimeout": 660, - "resumeLockCommand": "", - "resumeScreenOffCommand": "", - "resumeSuspendCommand": "", - "screenOffCommand": "", - "screenOffTimeout": 600, - "suspendCommand": "", - "suspendTimeout": 1800 - }, - "location": { - "analogClockInCalendar": false, - "autoLocate": false, - "firstDayOfWeek": -1, - "hideWeatherCityName": false, - "hideWeatherTimezone": false, - "name": "", - "showCalendarEvents": true, - "showCalendarWeather": true, - "showWeekNumberInCalendar": false, - "use12hourFormat": false, - "useFahrenheit": false, - "weatherEnabled": true, - "weatherShowEffects": true, - "weatherTaliaMascotAlways": false - }, - "network": { - "bluetoothAutoConnect": true, - "bluetoothDetailsViewMode": "grid", - "bluetoothHideUnnamedDevices": false, - "bluetoothRssiPollIntervalMs": 60000, - "bluetoothRssiPollingEnabled": false, - "disableDiscoverability": false, - "networkPanelView": "wifi", - "wifiDetailsViewMode": "grid" - }, - "nightLight": { - "autoSchedule": true, - "dayTemp": "6500", - "enabled": false, - "forced": false, - "manualSunrise": "06:30", - "manualSunset": "18:30", - "nightTemp": "4000" - }, - "noctaliaPerformance": { - "disableDesktopWidgets": true, - "disableWallpaper": true - }, - "notifications": { - "backgroundOpacity": 1, - "clearDismissed": true, - "criticalUrgencyDuration": 15, - "density": "default", - "enableBatteryToast": true, - "enableKeyboardLayoutToast": true, - "enableMarkdown": false, - "enableMediaToast": false, - "enabled": true, - "location": "top_right", - "lowUrgencyDuration": 3, - "monitors": [], - "normalUrgencyDuration": 8, - "overlayLayer": true, - "respectExpireTimeout": false, - "saveToHistory": { - "critical": true, - "low": true, - "normal": true - }, - "sounds": { - "criticalSoundFile": "", - "enabled": false, - "excludedApps": "discord,firefox,chrome,chromium,edge", - "lowSoundFile": "", - "normalSoundFile": "", - "separateSounds": false, - "volume": 0.5 - } - }, - "osd": { - "autoHideMs": 2000, - "backgroundOpacity": 1, - "enabled": true, - "enabledTypes": [0, 1, 2], - "location": "top_right", - "monitors": [], - "overlayLayer": true - }, - "plugins": { - "autoUpdate": false, - "notifyUpdates": true - }, - "sessionMenu": { - "countdownDuration": 10000, - "enableCountdown": true, - "largeButtonsLayout": "single-row", - "largeButtonsStyle": true, - "position": "center", - "powerOptions": [ - {"action": "lock", "command": "", "countdownEnabled": true, "enabled": true, "keybind": "1"}, - {"action": "suspend", "command": "", "countdownEnabled": true, "enabled": true, "keybind": "2"}, - {"action": "hibernate", "command": "", "countdownEnabled": true, "enabled": true, "keybind": "3"}, - {"action": "reboot", "command": "", "countdownEnabled": true, "enabled": true, "keybind": "4"}, - {"action": "logout", "command": "", "countdownEnabled": true, "enabled": true, "keybind": "5"}, - {"action": "shutdown", "command": "", "countdownEnabled": true, "enabled": true, "keybind": "6"}, - {"action": "rebootToUefi", "command": "", "countdownEnabled": true, "enabled": true, "keybind": "7"}, - {"action": "userspaceReboot", "command": "", "countdownEnabled": true, "enabled": false, "keybind": ""} - ], - "showHeader": true, - "showKeybinds": true - }, - "settingsVersion": 59, - "systemMonitor": { - "batteryCriticalThreshold": 5, - "batteryWarningThreshold": 20, - "cpuCriticalThreshold": 90, - "cpuWarningThreshold": 80, - "criticalColor": "", - "diskAvailCriticalThreshold": 10, - "diskAvailWarningThreshold": 20, - "diskCriticalThreshold": 90, - "diskWarningThreshold": 80, - "enableDgpuMonitoring": true, - "externalMonitor": "resources || missioncenter || jdsystemmonitor || corestats || system-monitoring-center || gnome-system-monitor || plasma-systemmonitor || mate-system-monitor || ukui-system-monitor || deepin-system-monitor || pantheon-system-monitor", - "gpuCriticalThreshold": 90, - "gpuWarningThreshold": 80, - "memCriticalThreshold": 90, - "memWarningThreshold": 80, - "swapCriticalThreshold": 90, - "swapWarningThreshold": 80, - "tempCriticalThreshold": 90, - "tempWarningThreshold": 80, - "useCustomColors": false, - "warningColor": "" - }, - "templates": { - "activeTemplates": [ - {"enabled": true, "id": "alacritty"}, - {"enabled": true, "id": "gtk"}, - {"enabled": true, "id": "emacs"}, - {"enabled": true, "id": "telegram"} - ], - "enableUserTheming": false - }, - "ui": { - "boxBorderEnabled": false, - "fontDefault": "Sans Serif", - "fontDefaultScale": 1, - "fontFixed": "monospace", - "fontFixedScale": 1, - "panelBackgroundOpacity": 0.93, - "panelsAttachedToBar": true, - "scrollbarAlwaysVisible": true, - "settingsPanelMode": "centered", - "settingsPanelSideBarCardStyle": false, - "tooltipsEnabled": true, - "translucentWidgets": false - }, - "wallpaper": { - "automationEnabled": false, - "directory": "{{ user_home }}/Pictures/Wallpapers", - "enableMultiMonitorDirectories": false, - "enabled": true, - "favorites": [], - "fillColor": "#000000", - "fillMode": "crop", - "hideWallpaperFilenames": false, - "linkLightAndDarkWallpapers": true, - "monitorDirectories": [], - "overviewBlur": 0.4, - "overviewEnabled": false, - "overviewTint": 0.6, - "panelPosition": "follow_bar", - "randomIntervalSec": 300, - "setWallpaperOnAllMonitors": true, - "showHiddenFiles": false, - "skipStartupTransition": false, - "solidColor": "#1a1a2e", - "sortOrder": "name", - "transitionDuration": 1500, - "transitionEdgeSmoothness": 0.05, - "transitionType": ["fade", "disc", "stripes", "wipe", "pixelate", "honeycomb"], - "useOriginalImages": false, - "useSolidColor": false, - "useWallhaven": false, - "viewMode": "single", - "wallhavenApiKey": "", - "wallhavenCategories": "111", - "wallhavenOrder": "desc", - "wallhavenPurity": "100", - "wallhavenQuery": "", - "wallhavenRatios": "", - "wallhavenResolutionHeight": "", - "wallhavenResolutionMode": "atleast", - "wallhavenResolutionWidth": "", - "wallhavenSorting": "relevance", - "wallpaperChangeMode": "random" - } -} diff --git a/ansible/roles/profile_desktop_sway/templates/shell.conf.j2 b/ansible/roles/profile_desktop_sway/templates/shell.conf.j2 deleted file mode 100644 index 6ee5daa..0000000 --- a/ansible/roles/profile_desktop_sway/templates/shell.conf.j2 +++ /dev/null @@ -1,29 +0,0 @@ -set $menu qs -c noctalia-shell ipc call launcher toggle -set $audio_panel qs -c noctalia-shell ipc call volume openPanel -set $locker qs -c noctalia-shell ipc call lockScreen lock -set $powermenu qs -c noctalia-shell ipc call sessionMenu toggle -set $screenshot_full qs -c noctalia-shell ipc call plugin:screenshot takeScreenshot output -set $screenshot_region qs -c noctalia-shell ipc call plugin:screenshot takeScreenshot region -set $screenshot_window qs -c noctalia-shell ipc call plugin:screenshot takeScreenshot window -set $audio_raise qs -c noctalia-shell ipc call volume increase -set $audio_lower qs -c noctalia-shell ipc call volume decrease -set $audio_mute qs -c noctalia-shell ipc call volume muteOutput -set $audio_mic_mute qs -c noctalia-shell ipc call volume muteInput -set $brightness_up qs -c noctalia-shell ipc call brightness increase -set $brightness_down qs -c noctalia-shell ipc call brightness decrease - -exec dbus-update-activation-environment --systemd WAYLAND_DISPLAY DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_DESKTOP XDG_SESSION_TYPE XCURSOR_THEME XCURSOR_SIZE -exec systemctl --user import-environment WAYLAND_DISPLAY DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_DESKTOP XDG_SESSION_TYPE XCURSOR_THEME XCURSOR_SIZE -exec ~/.local/bin/update-turnstile-env -exec dex --autostart --environment sway -exec gnome-keyring-daemon --start --components=secrets -exec ~/.local/bin/setup-gtk-theme -exec pipewire -exec pipewire-pulse -exec wireplumber -exec kanshi -exec udiskie --no-tray -exec wl-paste --watch cliphist store -exec qs -c noctalia-shell - -bindsym $mod+c exec qs -c noctalia-shell ipc call launcher clipboard diff --git a/ansible/site.yml b/ansible/site.yml index fe108a5..e829da1 100644 --- a/ansible/site.yml +++ b/ansible/site.yml @@ -25,7 +25,6 @@ - services_runit - profile_desktop_common - profile_desktop_i3 - - profile_desktop_sway - profile_desktop_host - hosts: arch diff --git a/dotfiles/desktop/.config/sway/config b/dotfiles/desktop/.config/sway/config deleted file mode 100644 index 3b653c3..0000000 --- a/dotfiles/desktop/.config/sway/config +++ /dev/null @@ -1,174 +0,0 @@ -set $mod Mod4 -set $terminal alacritty -set $fallback_terminal st - -# Host-specific overrides -include ~/.config/sway/host.conf -include ~/.config/sway/shell.conf - -font pango:Liberation Mono 10 - -# Input and output defaults -seat seat0 xcursor_theme Yaru 24 - -input type:keyboard { - xkb_layout us - xkb_variant intl -} - -focus_follows_mouse no -mouse_warping none -floating_modifier $mod normal - -# Borders -default_border pixel 2 -default_floating_border pixel 2 -hide_edge_borders none - -# Floating rules -for_window [app_id="Rofi"] floating enable -for_window [app_id="org.pulseaudio.pavucontrol"] floating enable -for_window [class="Pavucontrol"] floating enable -for_window [app_id="nm-connection-editor"] floating enable -for_window [class="Nm-connection-editor"] floating enable -for_window [app_id="blueman-manager"] floating enable -for_window [class="Blueman-manager"] floating enable - -set $left h -set $down j -set $up k -set $right l - -# App launchers and window actions -bindsym $mod+Return exec $terminal -bindsym $mod+Shift+Return exec $fallback_terminal -bindsym $mod+Shift+e exec emacsclient -c -n -bindsym $mod+d exec $menu -bindsym $mod+Shift+v exec $audio_panel -bindsym $mod+Shift+f exec thunar -bindsym $mod+Shift+x exec $locker -bindsym $mod+Shift+q kill - -# Screenshots -bindsym Print exec $screenshot_full -bindsym Shift+Print exec $screenshot_region -bindsym Alt+Print exec $screenshot_window - -# Focus -bindsym $mod+$left focus left -bindsym $mod+$down focus down -bindsym $mod+$up focus up -bindsym $mod+$right focus right -bindsym $mod+Left focus left -bindsym $mod+Down focus down -bindsym $mod+Up focus up -bindsym $mod+Right focus right - -# Move windows -bindsym $mod+Shift+$left move left -bindsym $mod+Shift+$down move down -bindsym $mod+Shift+$up move up -bindsym $mod+Shift+$right move right -bindsym $mod+Shift+Left move left -bindsym $mod+Shift+Down move down -bindsym $mod+Shift+Up move up -bindsym $mod+Shift+Right move right - -# Split and layouts -bindsym $mod+b split h -bindsym $mod+v split v - -bindsym $mod+f fullscreen toggle -bindsym $mod+s layout stacking -bindsym $mod+w layout tabbed -bindsym $mod+e layout toggle split - -bindsym $mod+Shift+space floating toggle -bindsym $mod+space focus mode_toggle -bindsym $mod+a focus parent - -# Scratchpad -bindsym $mod+Shift+minus move scratchpad -bindsym $mod+minus scratchpad show - -# Volume and brightness OSD -bindsym XF86AudioRaiseVolume exec $audio_raise -bindsym XF86AudioLowerVolume exec $audio_lower -bindsym XF86AudioMute exec $audio_mute -bindsym XF86AudioMicMute exec $audio_mic_mute - -bindsym XF86MonBrightnessUp exec $brightness_up -bindsym XF86MonBrightnessDown exec $brightness_down - -# Media keys -bindsym XF86AudioPlay exec playerctl play-pause -bindsym XF86AudioNext exec playerctl next -bindsym XF86AudioPrev exec playerctl previous - -# Workspaces -set $ws1 1 -set $ws2 2 -set $ws3 3 -set $ws4 4 -set $ws5 5 -set $ws6 6 -set $ws7 7 -set $ws8 8 -set $ws9 9 -set $ws10 10 - -bindsym $mod+1 workspace number $ws1 -bindsym $mod+2 workspace number $ws2 -bindsym $mod+3 workspace number $ws3 -bindsym $mod+4 workspace number $ws4 -bindsym $mod+5 workspace number $ws5 -bindsym $mod+6 workspace number $ws6 -bindsym $mod+7 workspace number $ws7 -bindsym $mod+8 workspace number $ws8 -bindsym $mod+9 workspace number $ws9 -bindsym $mod+0 workspace number $ws10 -bindsym $mod+comma workspace prev -bindsym $mod+period workspace next - -bindsym $mod+Shift+1 move container to workspace number $ws1 -bindsym $mod+Shift+2 move container to workspace number $ws2 -bindsym $mod+Shift+3 move container to workspace number $ws3 -bindsym $mod+Shift+4 move container to workspace number $ws4 -bindsym $mod+Shift+5 move container to workspace number $ws5 -bindsym $mod+Shift+6 move container to workspace number $ws6 -bindsym $mod+Shift+7 move container to workspace number $ws7 -bindsym $mod+Shift+8 move container to workspace number $ws8 -bindsym $mod+Shift+9 move container to workspace number $ws9 -bindsym $mod+Shift+0 move container to workspace number $ws10 - -# Reload and power menu -bindsym $mod+Shift+c reload -bindsym $mod+Shift+r reload -bindsym $mod+Shift+BackSpace exit -bindsym $mod+Shift+Escape exec $powermenu - -# Resize mode -mode "resize" { - bindsym $left resize shrink width 10 px or 10 ppt - bindsym $down resize grow height 10 px or 10 ppt - bindsym $up resize shrink height 10 px or 10 ppt - bindsym $right resize grow width 10 px or 10 ppt - - bindsym Left resize shrink width 10 px or 10 ppt - bindsym Down resize grow height 10 px or 10 ppt - bindsym Up resize shrink height 10 px or 10 ppt - bindsym Right resize grow width 10 px or 10 ppt - - bindsym Return mode "default" - bindsym Escape mode "default" - bindsym $mod+r mode "default" -} - -bindsym $mod+r mode "resize" - -client.focused #4a90d9 #4a90d9 #ffffff #4a90d9 #4a90d9 -client.focused_inactive #3a3a46 #2b2b36 #eeeeee #3a3a46 #3a3a46 -client.unfocused #2b2b36 #1f1f28 #bcbcbc #2b2b36 #2b2b36 -client.urgent #c7162b #c7162b #ffffff #c7162b #c7162b -client.placeholder #1f1f28 #1f1f28 #bcbcbc #1f1f28 #1f1f28 -client.background #1f1f28 diff --git a/dotfiles/desktop/.config/sway/host.conf b/dotfiles/desktop/.config/sway/host.conf deleted file mode 100644 index 2cf1f5b..0000000 --- a/dotfiles/desktop/.config/sway/host.conf +++ /dev/null @@ -1 +0,0 @@ -# Host-specific Sway overrides live here. diff --git a/dotfiles/desktop/.local/bin/start-sway-session b/dotfiles/desktop/.local/bin/start-sway-session deleted file mode 100644 index 025fe6a..0000000 --- a/dotfiles/desktop/.local/bin/start-sway-session +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -[ -r /etc/profile ] && . /etc/profile -[ -r "$HOME/.profile" ] && . "$HOME/.profile" -[ -r "$HOME/.config/sway/session-env" ] && . "$HOME/.config/sway/session-env" - -set -eu - -session_name=sway - -export XDG_CURRENT_DESKTOP="$session_name" -export XDG_SESSION_DESKTOP="$session_name" -export XDG_SESSION_TYPE=wayland -export SSH_AUTH_SOCK="$HOME/.local/state/ssh-agent/socket" - -if [ "${SWAY_UNSUPPORTED_GPU:-0}" = "1" ]; then - set -- sway --unsupported-gpu -else - set -- sway -fi - -exec dbus-run-session sh -eu -c ' - umask 077 - printf "%s\n" "$DBUS_SESSION_BUS_ADDRESS" > "$HOME/.dbus-session-bus-address" - gpgconf --launch gpg-agent - "$HOME/.local/bin/update-turnstile-env" - exec "$@" -' sh "$@" diff --git a/dotfiles/nymph/.config/sway/host.conf b/dotfiles/nymph/.config/sway/host.conf deleted file mode 100644 index c51d06a..0000000 --- a/dotfiles/nymph/.config/sway/host.conf +++ /dev/null @@ -1,16 +0,0 @@ -set $terminal ~/.local/bin/prime-run /usr/bin/alacritty - -gaps inner 10 -gaps outer 5 -corner_radius 10 - -workspace 1 output eDP-1 -workspace 2 output DP-1 -workspace 3 output DP-1 -workspace 4 output DP-1 -workspace 5 output DP-1 -workspace 6 output DP-1 -workspace 7 output DP-1 -workspace 8 output DP-1 -workspace 9 output DP-1 -workspace 10 output DP-1 diff --git a/dotfiles/nymph/.config/sway/session-env b/dotfiles/nymph/.config/sway/session-env deleted file mode 100644 index 89b6647..0000000 --- a/dotfiles/nymph/.config/sway/session-env +++ /dev/null @@ -1,4 +0,0 @@ -export LIBVA_DRIVER_NAME=iHD -export SWAY_UNSUPPORTED_GPU=1 -export WLR_DRM_DEVICES=/dev/dri/card0:/dev/dri/card1 -export WLR_NO_HARDWARE_CURSORS=1