Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/features.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ always applied.
| Screen scale + text size | `text-size` | modifies the monitor scale (100%, the login screen's too), GDK_SCALE, the shell/terminal text size and the GNOME font sizes | system, user | on | no |
| Night light at sunset/sunrise | `nightlight-solar` | adds a timer that follows the real sunset/sunrise with hyprsunset | user | on | yes |
| Firefox follows the Omarchy theme | `omafox` | adds the Omafox add-on to Firefox's policies, its native messaging host and a theme-set hook; the add-on stays in the profile when reverted | system, user | on | yes |
| Caps Lock via keyd | `capslock` | adds keyd (tap Esc, hold Ctrl, Shift+Caps Lock = Caps Lock); modifies Compose (Menu key instead of Shift+Caps Lock) | system, user | on | yes |
| Caps Lock as Esc | `capslock` | modifies the keyboard options (Caps Lock = Esc, Shift+Caps Lock = Caps Lock, Compose on the Menu key instead of Shift+Caps Lock) | user | on | yes |

## Themes

Expand Down
2 changes: 1 addition & 1 deletion docs/multi-user.md
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ notified only when one actually fails (log:

| What | Why | Where |
|---|---|---|
| Packages, `/etc/locale.conf`, keyd, the printer queue, Plymouth, Limine | They belong to the machine | system phase |
| Packages, `/etc/locale.conf`, the printer queue, Plymouth, Limine | They belong to the machine | system phase |
| Homebrew | One prefix with one owner (`homebrew_owner`); others can run what it installed | `system/homebrew.yml` |
| The greeter's colors | Style › Unlock recolors the login screen for everyone, so only administrators see it in the menu | omarchy-multiuser |
| The browsers' theme color policy | Omarchy writes it to `/etc` on every theme change, and its sudoers rule is `%wheel`. The last administrator to change theme wins; for anyone else omarchy-multiuser's polkit rule refuses it without a prompt, so their theme changes leave it alone. | Omarchy, omarchy-multiuser |
Expand Down
6 changes: 3 additions & 3 deletions features.yml
Original file line number Diff line number Diff line change
Expand Up @@ -177,9 +177,9 @@ features:

- id: capslock
group: desktop
title: Caps Lock via keyd
effect: adds keyd (tap Esc, hold Ctrl, Shift+Caps Lock = Caps Lock); modifies Compose (Menu key instead of Shift+Caps Lock)
phases: [system, user]
title: Caps Lock as Esc
effect: modifies the keyboard options (Caps Lock = Esc, Shift+Caps Lock = Caps Lock, Compose on the Menu key instead of Shift+Caps Lock)
phases: [user]
default: true
revert: true

Expand Down
5 changes: 2 additions & 3 deletions group_vars/all/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -941,12 +941,11 @@ omarchy_gnome_font_sizes:
# point from the 12pt Omarchy leaves behind.
omarchy_system_ui_font_pt: 13

# Caps Lock via keyd (playbooks/{system,user}/capslock.yml). Key that takes over Compose
# from Caps Lock — must not be a hardware modifier (Ctrl/Alt/Win keep
# Caps Lock as Esc (playbooks/user/capslock.yml). Key that takes over Compose
# from Shift+Caps Lock — must not be a hardware modifier (Ctrl/Alt/Win keep
# acting as modifiers even after their symbol changes; "menu" doesn't have
# that problem and is the natural Compose key already).
capslock_compose_key: menu
keyd_config_dest: /etc/keyd/default.conf

# Night light synced to real sunrise/sunset (playbooks/{system,user}/desktop.yml).
# hyprsunset only supports fixed HH:MM profile times, so a daily timer
Expand Down
38 changes: 0 additions & 38 deletions playbooks/files/keyd-default.conf

This file was deleted.

95 changes: 0 additions & 95 deletions playbooks/system/capslock.yml

This file was deleted.

20 changes: 10 additions & 10 deletions playbooks/user/capslock.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
---
# Caps Lock, per user: Compose moves from Shift+Caps Lock (Omarchy 4.5's
# omarchy:shift_caps_compose) to capslock_compose_key in
# ~/.config/hypr/input.lua, so the machine-wide keyd remap
# (system/capslock.yml, which explains it) can produce a real Caps Lock.
# Every user needs this; turning the feature off removes the block (and,
# in the system phase, keyd). The layout-switch option Omarchy adds for
# non-Latin layouts (grp:alts_toggle) is kept.
# Caps Lock = Esc, Shift+Caps Lock = Caps Lock, with XKB's own
# caps:escape_shifted_capslock in ~/.config/hypr/input.lua — no daemon.
# Omarchy's kb_options (omarchy:shift_caps_compose) put Compose on
# Shift+Caps Lock, so the block replaces them and moves Compose to
# capslock_compose_key. The layout-switch option Omarchy adds for
# non-Latin layouts (grp:alts_toggle) is kept. Turning the feature off
# removes the block, giving Omarchy's options back.
#
# Usage: just apply capslock
- name: Caps Lock via keyd (tap=Esc / hold=Ctrl / Shift+CapsLock=CapsLock) (user)
- name: Caps Lock = Esc, Shift+Caps Lock = Caps Lock (user)
hosts: localhost
connection: local
gather_facts: false
Expand All @@ -18,14 +18,14 @@
feature_on: "{{ features['capslock'] | default(true) }}"

tasks:
- name: "{{ 'Move Compose off Caps Lock, onto ' ~ capslock_compose_key if feature_on | bool else 'Give Compose back to Omarchy (Shift+Caps Lock)' }}"
- name: "{{ 'Caps Lock as Esc, Compose on ' ~ capslock_compose_key if feature_on | bool else 'Give Caps Lock and Compose back to Omarchy' }}"
ansible.builtin.include_tasks: tasks/hypr-user-block.yml
vars:
hypr_file: input.lua
hypr_marker: "playbooks/user/capslock.yml — Compose on {{ capslock_compose_key }}"
hypr_state: "{{ 'present' if feature_on | bool else 'absent' }}"
hypr_block: |
local capslock_kb_options = "compose:{{ capslock_compose_key }}"
local capslock_kb_options = "caps:escape_shifted_capslock,compose:{{ capslock_compose_key }}"
local omarchy_kb_options = hl.get_config("input.kb_options")
if type(omarchy_kb_options) == "string" and omarchy_kb_options:find("grp:alts_toggle", 1, true) then
capslock_kb_options = capslock_kb_options .. ",grp:alts_toggle"
Expand Down
3 changes: 0 additions & 3 deletions system.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,6 @@
- name: Login screen scale
ansible.builtin.import_playbook: playbooks/system/desktop.yml

- name: Caps Lock via keyd
ansible.builtin.import_playbook: playbooks/system/capslock.yml

- name: openssh rebuilt with askpass touch notifications
ansible.builtin.import_playbook: playbooks/system/openssh-askpass.yml

Expand Down
2 changes: 1 addition & 1 deletion user.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
- name: Column resize keys, vertical workspace switching, scale and text size, night light at sunset
ansible.builtin.import_playbook: playbooks/user/desktop.yml

- name: Compose off Caps Lock (for keyd)
- name: Caps Lock = Esc, Shift+Caps Lock = Caps Lock
ansible.builtin.import_playbook: playbooks/user/capslock.yml

- name: "Themes: Omadwaita, Omaraptor, Osaka Jade, Piedmont Gold"
Expand Down
Loading