mirror of
https://github.com/fscotto/infra.git
synced 2026-05-30 15:39:58 +00:00
Remove Hyprland support from desktop profile
This commit is contained in:
@@ -38,7 +38,7 @@ Ansible-driven personal infrastructure repo for Void desktops, Linux workstation
|
|||||||
- WSL dev: `ansible-playbook ansible/site.yml --limit deadalus-wsl --check --diff`
|
- WSL dev: `ansible-playbook ansible/site.yml --limit deadalus-wsl --check --diff`
|
||||||
- Server: `ansible-playbook ansible/site.yml --limit prometheus --check --diff`
|
- Server: `ansible-playbook ansible/site.yml --limit prometheus --check --diff`
|
||||||
- Focused checks:
|
- Focused checks:
|
||||||
- Waybar JSON: `python3 -m json.tool dotfiles/desktop/.config/waybar/config-sway.jsonc >/dev/null` and `python3 -m json.tool dotfiles/desktop/.config/waybar/config-hyprland.jsonc >/dev/null`
|
- Waybar JSON: `python3 -m json.tool dotfiles/desktop/.config/waybar/config-sway.jsonc >/dev/null`
|
||||||
- Mail bootstrap: `sh -n scripts/bootstrap_mail.sh` and `shellcheck scripts/bootstrap_mail.sh`
|
- Mail bootstrap: `sh -n scripts/bootstrap_mail.sh` and `shellcheck scripts/bootstrap_mail.sh`
|
||||||
- Windows bootstrap parse: `pwsh -NoProfile -Command "[void][System.Management.Automation.Language.Parser]::ParseFile('scripts/bootstrap_windows_workstation.ps1', [ref]$null, [ref]$null)"`
|
- Windows bootstrap parse: `pwsh -NoProfile -Command "[void][System.Management.Automation.Language.Parser]::ParseFile('scripts/bootstrap_windows_workstation.ps1', [ref]$null, [ref]$null)"`
|
||||||
|
|
||||||
@@ -58,7 +58,6 @@ Ansible-driven personal infrastructure repo for Void desktops, Linux workstation
|
|||||||
- Critical session entrypoints:
|
- Critical session entrypoints:
|
||||||
- `dotfiles/desktop/.xinitrc`
|
- `dotfiles/desktop/.xinitrc`
|
||||||
- `dotfiles/desktop/.local/bin/start-sway-session`
|
- `dotfiles/desktop/.local/bin/start-sway-session`
|
||||||
- `dotfiles/desktop/.local/bin/start-hyprland-session`
|
|
||||||
- Do not auto-restart `emptty` during playbook runs on active desktop hosts; restart it manually from another TTY/SSH session if needed.
|
- Do not auto-restart `emptty` during playbook runs on active desktop hosts; restart it manually from another TTY/SSH session if needed.
|
||||||
|
|
||||||
## Workstation / Windows Notes
|
## Workstation / Windows Notes
|
||||||
|
|||||||
13
README.md
13
README.md
@@ -70,7 +70,7 @@ Sistema operativo:
|
|||||||
Sessioni desktop:
|
Sessioni desktop:
|
||||||
|
|
||||||
- `ikaros`: i3
|
- `ikaros`: i3
|
||||||
- `nymph`: i3 + Sway + Hyprland con scelta sessione a login
|
- `nymph`: i3 + Sway con scelta sessione a login
|
||||||
|
|
||||||
Macchine:
|
Macchine:
|
||||||
|
|
||||||
@@ -82,7 +82,7 @@ Queste macchine condividono la stessa configurazione base desktop e vengono mant
|
|||||||
Lo stato attuale del profilo desktop include, tra le altre cose:
|
Lo stato attuale del profilo desktop include, tra le altre cose:
|
||||||
|
|
||||||
- dotfiles comuni e desktop
|
- dotfiles comuni e desktop
|
||||||
- sessione i3 su tutti i desktop Void e sessioni Sway/Hyprland opzionali su `nymph`
|
- sessione i3 su tutti i desktop Void e sessione Sway opzionale su `nymph`
|
||||||
- `emptty` con scelta sessione a login su `nymph` e default host-specific sugli altri desktop
|
- `emptty` con scelta sessione a login su `nymph` e default host-specific sugli altri desktop
|
||||||
- pacchetti Void Linux e servizi runit
|
- pacchetti Void Linux e servizi runit
|
||||||
- `turnstile` per i servizi utente, inclusi `emacs`, `ssh-agent` e `ollama`
|
- `turnstile` per i servizi utente, inclusi `emacs`, `ssh-agent` e `ollama`
|
||||||
@@ -90,7 +90,7 @@ Lo stato attuale del profilo desktop include, tra le altre cose:
|
|||||||
- `ollama` installato da tarball upstream e gestito come servizio utente `turnstile`
|
- `ollama` installato da tarball upstream e gestito come servizio utente `turnstile`
|
||||||
- Flatpak con remoto Flathub
|
- Flatpak con remoto Flathub
|
||||||
- GNOME Keyring e bootstrap della posta via script dedicato
|
- GNOME Keyring e bootstrap della posta via script dedicato
|
||||||
- `Waybar` separata per compositor (`config-sway.jsonc` e `config-hyprland.jsonc`) con `style.css` condiviso
|
- `Waybar` per Sway con `style.css` condiviso
|
||||||
- `kanshi` su `nymph` per il profilo monitor Wayland, con workspace Sway deterministici: in dual monitor `1` resta su `eDP-1` e `2-10` vanno su `DP-1`, mentre in laptop-only tutti tornano su `eDP-1`
|
- `kanshi` su `nymph` per il profilo monitor Wayland, con workspace Sway deterministici: in dual monitor `1` resta su `eDP-1` e `2-10` vanno su `DP-1`, mentre in laptop-only tutti tornano su `eDP-1`
|
||||||
|
|
||||||
---
|
---
|
||||||
@@ -260,7 +260,6 @@ I principali ruoli attualmente presenti sono:
|
|||||||
| profile_desktop_common | bootstrap desktop Void condiviso |
|
| profile_desktop_common | bootstrap desktop Void condiviso |
|
||||||
| profile_desktop_i3 | sessione desktop i3 |
|
| profile_desktop_i3 | sessione desktop i3 |
|
||||||
| profile_desktop_sway | sessione desktop Sway |
|
| profile_desktop_sway | sessione desktop Sway |
|
||||||
| profile_desktop_hyprland | sessione desktop Hyprland |
|
|
||||||
| profile_desktop_host | override desktop specifici per host |
|
| profile_desktop_host | override desktop specifici per host |
|
||||||
| profile_workstation_dev_common | configurazione dev workstation condivisa |
|
| profile_workstation_dev_common | configurazione dev workstation condivisa |
|
||||||
| profile_workstation_gnome | configurazione host workstation GNOME |
|
| profile_workstation_gnome | configurazione host workstation GNOME |
|
||||||
@@ -278,7 +277,7 @@ Il playbook `ansible/site.yml` e attualmente composto da sette blocchi:
|
|||||||
|
|
||||||
```text
|
```text
|
||||||
all:!workstation_host_windows -> dotfiles_common
|
all:!workstation_host_windows -> dotfiles_common
|
||||||
void -> packages_void + services_runit + profile_desktop_common + profile_desktop_i3 + profile_desktop_sway + profile_desktop_hyprland + profile_desktop_host
|
void -> packages_void + services_runit + profile_desktop_common + profile_desktop_i3 + profile_desktop_sway + profile_desktop_host
|
||||||
workstation_dev_ubuntu -> packages_ubuntu + services_systemd + profile_workstation_dev_common
|
workstation_dev_ubuntu -> packages_ubuntu + services_systemd + profile_workstation_dev_common
|
||||||
workstation_dev_fedora -> packages_fedora + services_systemd + profile_workstation_dev_common
|
workstation_dev_fedora -> packages_fedora + services_systemd + profile_workstation_dev_common
|
||||||
workstation_host_linux -> profile_workstation_gnome
|
workstation_host_linux -> profile_workstation_gnome
|
||||||
@@ -361,7 +360,7 @@ ansible-playbook ansible/site.yml
|
|||||||
Allo stato attuale questo comando:
|
Allo stato attuale questo comando:
|
||||||
|
|
||||||
- distribuisce i dotfiles comuni a tutti gli host
|
- distribuisce i dotfiles comuni a tutti gli host
|
||||||
- per gli host Void applica bootstrap desktop condiviso, sessioni i3/Sway/Hyprland e override specifici per host
|
- per gli host Void applica bootstrap desktop condiviso, sessioni i3/Sway e override specifici per host
|
||||||
- per `workstation_dev_ubuntu` applica pacchetti Ubuntu, servizi systemd e profilo dev comune
|
- per `workstation_dev_ubuntu` applica pacchetti Ubuntu, servizi systemd e profilo dev comune
|
||||||
- per `workstation_dev_fedora` applica pacchetti Fedora, servizi systemd e profilo dev comune
|
- per `workstation_dev_fedora` applica pacchetti Fedora, servizi systemd e profilo dev comune
|
||||||
- per `workstation_host_linux` applica il layer host Linux GNOME
|
- per `workstation_host_linux` applica il layer host Linux GNOME
|
||||||
@@ -423,7 +422,6 @@ Allo stato attuale `ansible/site.yml` espone questi tag:
|
|||||||
| `dotfiles:workstation` | dotfiles dedicati alle workstation | workstation Linux, WSL |
|
| `dotfiles:workstation` | dotfiles dedicati alle workstation | workstation Linux, WSL |
|
||||||
| `emptty` | gestione display manager `emptty` | desktop Void |
|
| `emptty` | gestione display manager `emptty` | desktop Void |
|
||||||
| `gnome` | configurazione host GNOME | workstation host Linux, parte desktop |
|
| `gnome` | configurazione host GNOME | workstation host Linux, parte desktop |
|
||||||
| `hyprland` | sessione/configurazione Hyprland | desktop Void |
|
|
||||||
| `i3` | sessione/configurazione i3 | desktop Void |
|
| `i3` | sessione/configurazione i3 | desktop Void |
|
||||||
| `nvidia` | componenti NVIDIA desktop | desktop Void |
|
| `nvidia` | componenti NVIDIA desktop | desktop Void |
|
||||||
| `packages` | installazione e aggiornamento pacchetti | tutti i profili |
|
| `packages` | installazione e aggiornamento pacchetti | tutti i profili |
|
||||||
@@ -444,7 +442,6 @@ Se tocchi `Waybar`, valida anche i config JSONC con:
|
|||||||
|
|
||||||
```bash
|
```bash
|
||||||
python3 -m json.tool dotfiles/desktop/.config/waybar/config-sway.jsonc >/dev/null
|
python3 -m json.tool dotfiles/desktop/.config/waybar/config-sway.jsonc >/dev/null
|
||||||
python3 -m json.tool dotfiles/desktop/.config/waybar/config-hyprland.jsonc >/dev/null
|
|
||||||
```
|
```
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|||||||
@@ -45,21 +45,6 @@ desktop_i3_packages:
|
|||||||
- xorg-minimal
|
- xorg-minimal
|
||||||
- xss-lock
|
- xss-lock
|
||||||
|
|
||||||
desktop_hyprland_packages:
|
|
||||||
- grim
|
|
||||||
- hypridle
|
|
||||||
- hyprland
|
|
||||||
- xorg-server-xwayland
|
|
||||||
- hyprland-qtutils
|
|
||||||
- hyprlock
|
|
||||||
- hyprpaper
|
|
||||||
- qt5-wayland
|
|
||||||
- qt6-wayland
|
|
||||||
- slurp
|
|
||||||
- Waybar
|
|
||||||
- wl-clipboard
|
|
||||||
- xdg-desktop-portal-hyprland
|
|
||||||
|
|
||||||
desktop_sway_packages:
|
desktop_sway_packages:
|
||||||
- grim
|
- grim
|
||||||
- kanshi
|
- kanshi
|
||||||
@@ -253,24 +238,6 @@ desktop_i3_dotfiles:
|
|||||||
dest: .xinitrc
|
dest: .xinitrc
|
||||||
mode: "0644"
|
mode: "0644"
|
||||||
|
|
||||||
desktop_hyprland_dotfiles:
|
|
||||||
- name: Hyprland config
|
|
||||||
src: .config/hypr/
|
|
||||||
dest: .config/hypr/
|
|
||||||
mode: preserve
|
|
||||||
- name: Waybar config
|
|
||||||
src: .config/waybar/
|
|
||||||
dest: .config/waybar/
|
|
||||||
mode: preserve
|
|
||||||
- name: Hyprland session wrapper
|
|
||||||
src: .local/bin/start-hyprland-session
|
|
||||||
dest: .local/bin/start-hyprland-session
|
|
||||||
mode: "0755"
|
|
||||||
- name: Wayland screenshot script
|
|
||||||
src: .local/bin/screenshot-wayland
|
|
||||||
dest: .local/bin/screenshot-wayland
|
|
||||||
mode: "0755"
|
|
||||||
|
|
||||||
desktop_sway_dotfiles:
|
desktop_sway_dotfiles:
|
||||||
- name: Sway config
|
- name: Sway config
|
||||||
src: .config/sway/
|
src: .config/sway/
|
||||||
|
|||||||
@@ -4,15 +4,10 @@ hostname: nymph
|
|||||||
desktop_sessions_enabled:
|
desktop_sessions_enabled:
|
||||||
- i3
|
- i3
|
||||||
- sway
|
- sway
|
||||||
- hyprland
|
|
||||||
|
|
||||||
desktop_prompt_for_session: true
|
desktop_prompt_for_session: true
|
||||||
desktop_emptty_session_error_logging: rotate
|
desktop_emptty_session_error_logging: rotate
|
||||||
|
|
||||||
host_xbps_repositories:
|
|
||||||
- name: hyprland-void
|
|
||||||
url: "https://raw.githubusercontent.com/Makrennel/hyprland-void/repository-x86_64-glibc"
|
|
||||||
|
|
||||||
host_packages:
|
host_packages:
|
||||||
- nvidia
|
- nvidia
|
||||||
- mesa-dri
|
- mesa-dri
|
||||||
@@ -30,11 +25,6 @@ host_i3_dotfiles:
|
|||||||
dest: .config/autorandr/
|
dest: .config/autorandr/
|
||||||
mode: preserve
|
mode: preserve
|
||||||
|
|
||||||
host_hyprland_dotfiles:
|
|
||||||
- src: .config/hypr/host.conf
|
|
||||||
dest: .config/hypr/host.conf
|
|
||||||
mode: "0644"
|
|
||||||
|
|
||||||
host_sway_dotfiles:
|
host_sway_dotfiles:
|
||||||
- src: .config/sway/host.conf
|
- src: .config/sway/host.conf
|
||||||
dest: .config/sway/host.conf
|
dest: .config/sway/host.conf
|
||||||
|
|||||||
@@ -120,11 +120,6 @@
|
|||||||
if 'i3' in (desktop_sessions_enabled | default([]))
|
if 'i3' in (desktop_sessions_enabled | default([]))
|
||||||
else []
|
else []
|
||||||
)
|
)
|
||||||
+ (
|
|
||||||
(desktop_hyprland_packages | default([]))
|
|
||||||
if 'hyprland' in (desktop_sessions_enabled | default([]))
|
|
||||||
else []
|
|
||||||
)
|
|
||||||
+ (host_packages | default([]))
|
+ (host_packages | default([]))
|
||||||
)
|
)
|
||||||
| difference(
|
| difference(
|
||||||
|
|||||||
@@ -61,11 +61,6 @@
|
|||||||
if 'i3' in (desktop_sessions_enabled | default([]))
|
if 'i3' in (desktop_sessions_enabled | default([]))
|
||||||
else []
|
else []
|
||||||
)
|
)
|
||||||
+ (
|
|
||||||
(desktop_hyprland_packages | default([]))
|
|
||||||
if 'hyprland' in (desktop_sessions_enabled | default([]))
|
|
||||||
else []
|
|
||||||
)
|
|
||||||
+ (
|
+ (
|
||||||
(desktop_sway_packages | default([]))
|
(desktop_sway_packages | default([]))
|
||||||
if 'sway' in (desktop_sessions_enabled | default([]))
|
if 'sway' in (desktop_sessions_enabled | default([]))
|
||||||
|
|||||||
@@ -19,21 +19,6 @@
|
|||||||
- "'i3' in (desktop_sessions_enabled | default([]))"
|
- "'i3' in (desktop_sessions_enabled | default([]))"
|
||||||
- (host_i3_dotfiles | default([])) | length > 0
|
- (host_i3_dotfiles | default([])) | length > 0
|
||||||
|
|
||||||
- name: Copy host-specific Hyprland dotfiles
|
|
||||||
tags: [dotfiles, dotfiles:desktop, dotfiles:host, hyprland]
|
|
||||||
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_hyprland_dotfiles | default([]) }}"
|
|
||||||
loop_control:
|
|
||||||
label: "{{ item.dest }}"
|
|
||||||
when:
|
|
||||||
- "'hyprland' in (desktop_sessions_enabled | default([]))"
|
|
||||||
- (host_hyprland_dotfiles | default([])) | length > 0
|
|
||||||
|
|
||||||
- name: Copy host-specific Sway dotfiles
|
- name: Copy host-specific Sway dotfiles
|
||||||
tags: [dotfiles, dotfiles:desktop, dotfiles:host, sway]
|
tags: [dotfiles, dotfiles:desktop, dotfiles:host, sway]
|
||||||
ansible.builtin.copy:
|
ansible.builtin.copy:
|
||||||
|
|||||||
@@ -1,36 +0,0 @@
|
|||||||
---
|
|
||||||
- name: Ensure Hyprland config directories exist
|
|
||||||
tags: [dotfiles, dotfiles:desktop, hyprland]
|
|
||||||
ansible.builtin.file:
|
|
||||||
path: "{{ item }}"
|
|
||||||
state: directory
|
|
||||||
owner: "{{ username }}"
|
|
||||||
group: "{{ user_group }}"
|
|
||||||
mode: "0755"
|
|
||||||
loop:
|
|
||||||
- "{{ user_home }}/.config/hypr"
|
|
||||||
- "{{ user_home }}/.config/waybar"
|
|
||||||
when: "'hyprland' in (desktop_sessions_enabled | default([]))"
|
|
||||||
|
|
||||||
- name: Install Hyprland emptty session entry
|
|
||||||
tags: [packages, services, emptty, hyprland]
|
|
||||||
ansible.builtin.template:
|
|
||||||
src: Hyprland.desktop.j2
|
|
||||||
dest: /etc/emptty/wayland-sessions/Hyprland.desktop
|
|
||||||
owner: root
|
|
||||||
group: root
|
|
||||||
mode: "0644"
|
|
||||||
when: "'hyprland' in (desktop_sessions_enabled | default([]))"
|
|
||||||
|
|
||||||
- name: Copy Hyprland desktop dotfiles
|
|
||||||
tags: [dotfiles, dotfiles:desktop, hyprland]
|
|
||||||
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_hyprland_dotfiles | default([]) }}"
|
|
||||||
loop_control:
|
|
||||||
label: "{{ item.dest }}"
|
|
||||||
when: "'hyprland' in (desktop_sessions_enabled | default([]))"
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
[Desktop Entry]
|
|
||||||
Name=Hyprland
|
|
||||||
Comment=Hyprland Wayland compositor
|
|
||||||
Exec={{ user_home }}/.local/bin/start-hyprland-session
|
|
||||||
TryExec=Hyprland
|
|
||||||
Type=Application
|
|
||||||
DesktopNames=Hyprland
|
|
||||||
Keywords=wayland;wm;windowmanager;window;manager;tiling;compositor;
|
|
||||||
@@ -26,7 +26,6 @@
|
|||||||
- profile_desktop_common
|
- profile_desktop_common
|
||||||
- profile_desktop_i3
|
- profile_desktop_i3
|
||||||
- profile_desktop_sway
|
- profile_desktop_sway
|
||||||
- profile_desktop_hyprland
|
|
||||||
- profile_desktop_host
|
- profile_desktop_host
|
||||||
|
|
||||||
- hosts: workstation_dev_ubuntu
|
- hosts: workstation_dev_ubuntu
|
||||||
|
|||||||
@@ -1,16 +0,0 @@
|
|||||||
general {
|
|
||||||
lock_cmd = pidof hyprlock || hyprlock
|
|
||||||
before_sleep_cmd = pidof hyprlock || hyprlock
|
|
||||||
after_sleep_cmd = hyprctl dispatch dpms on
|
|
||||||
}
|
|
||||||
|
|
||||||
listener {
|
|
||||||
timeout = 600
|
|
||||||
on-timeout = pidof hyprlock || hyprlock
|
|
||||||
}
|
|
||||||
|
|
||||||
listener {
|
|
||||||
timeout = 900
|
|
||||||
on-timeout = hyprctl dispatch dpms off
|
|
||||||
on-resume = hyprctl dispatch dpms on
|
|
||||||
}
|
|
||||||
@@ -1,175 +0,0 @@
|
|||||||
$mod = SUPER
|
|
||||||
$terminal = alacritty
|
|
||||||
$fallback_terminal = st
|
|
||||||
$menu = rofi -show drun -theme ~/.config/rofi/config.rasi
|
|
||||||
$powermenu = ~/.local/bin/powermenu
|
|
||||||
$locker = ~/.local/bin/lock-session
|
|
||||||
$screenshot = ~/.local/bin/screenshot-wayland
|
|
||||||
|
|
||||||
exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
|
|
||||||
exec-once = ~/.local/bin/update-turnstile-env
|
|
||||||
exec-once = dex --autostart --environment Hyprland
|
|
||||||
exec-once = gnome-keyring-daemon --start --components=secrets
|
|
||||||
exec-once = ~/.local/bin/setup-gtk-theme
|
|
||||||
exec-once = hyprpaper
|
|
||||||
exec-once = waybar -c ~/.config/waybar/config-hyprland.jsonc -s ~/.config/waybar/style.css
|
|
||||||
exec-once = hypridle
|
|
||||||
exec-once = dunst
|
|
||||||
exec-once = pipewire
|
|
||||||
exec-once = pipewire-pulse
|
|
||||||
exec-once = wireplumber
|
|
||||||
exec-once = /usr/libexec/xfce-polkit
|
|
||||||
exec-once = nm-applet
|
|
||||||
exec-once = blueman-applet
|
|
||||||
exec-once = udiskie
|
|
||||||
|
|
||||||
env = XCURSOR_THEME,Yaru
|
|
||||||
env = XCURSOR_SIZE,24
|
|
||||||
env = GTK_THEME,Yaru-blue-dark
|
|
||||||
|
|
||||||
source = ~/.config/hypr/host.conf
|
|
||||||
|
|
||||||
monitor = ,preferred,auto,1
|
|
||||||
|
|
||||||
input {
|
|
||||||
kb_layout = us
|
|
||||||
kb_variant = intl
|
|
||||||
follow_mouse = 1
|
|
||||||
sensitivity = 0
|
|
||||||
|
|
||||||
touchpad {
|
|
||||||
natural_scroll = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
general {
|
|
||||||
layout = dwindle
|
|
||||||
gaps_in = 0
|
|
||||||
gaps_out = 0
|
|
||||||
border_size = 2
|
|
||||||
col.active_border = rgb(4a90d9)
|
|
||||||
col.inactive_border = rgb(3a3a46)
|
|
||||||
allow_tearing = false
|
|
||||||
}
|
|
||||||
|
|
||||||
dwindle {
|
|
||||||
preserve_split = yes
|
|
||||||
}
|
|
||||||
|
|
||||||
decoration {
|
|
||||||
rounding = 0
|
|
||||||
|
|
||||||
blur {
|
|
||||||
enabled = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
animations {
|
|
||||||
enabled = no
|
|
||||||
}
|
|
||||||
|
|
||||||
misc {
|
|
||||||
disable_hyprland_logo = true
|
|
||||||
disable_splash_rendering = true
|
|
||||||
}
|
|
||||||
|
|
||||||
windowrulev2 = float,class:^(Rofi)$
|
|
||||||
windowrulev2 = float,class:^(org.pulseaudio.pavucontrol)$
|
|
||||||
windowrulev2 = float,class:^(nm-connection-editor)$
|
|
||||||
windowrulev2 = float,class:^(blueman-manager)$
|
|
||||||
|
|
||||||
bind = $mod, Return, exec, $terminal
|
|
||||||
bind = $mod SHIFT, Return, exec, $fallback_terminal
|
|
||||||
bind = $mod SHIFT, E, exec, emacsclient -c -n
|
|
||||||
bind = $mod, D, exec, $menu
|
|
||||||
bind = $mod SHIFT, V, exec, pavucontrol
|
|
||||||
bind = $mod SHIFT, F, exec, thunar
|
|
||||||
bind = $mod SHIFT, X, exec, $locker
|
|
||||||
bind = $mod SHIFT, Q, killactive
|
|
||||||
bind = $mod, F, fullscreen, 1
|
|
||||||
bind = $mod, SPACE, togglefloating
|
|
||||||
bind = $mod SHIFT, SPACE, togglefloating
|
|
||||||
bind = $mod, V, togglesplit
|
|
||||||
bind = $mod, B, togglesplit
|
|
||||||
bind = $mod, minus, togglespecialworkspace, scratchpad
|
|
||||||
bind = $mod SHIFT, minus, movetoworkspace, special:scratchpad
|
|
||||||
|
|
||||||
bind = $mod, H, movefocus, l
|
|
||||||
bind = $mod, J, movefocus, d
|
|
||||||
bind = $mod, K, movefocus, u
|
|
||||||
bind = $mod, L, movefocus, r
|
|
||||||
bind = $mod, left, movefocus, l
|
|
||||||
bind = $mod, down, movefocus, d
|
|
||||||
bind = $mod, up, movefocus, u
|
|
||||||
bind = $mod, right, movefocus, r
|
|
||||||
|
|
||||||
bind = $mod SHIFT, H, movewindow, l
|
|
||||||
bind = $mod SHIFT, J, movewindow, d
|
|
||||||
bind = $mod SHIFT, K, movewindow, u
|
|
||||||
bind = $mod SHIFT, L, movewindow, r
|
|
||||||
bind = $mod SHIFT, left, movewindow, l
|
|
||||||
bind = $mod SHIFT, down, movewindow, d
|
|
||||||
bind = $mod SHIFT, up, movewindow, u
|
|
||||||
bind = $mod SHIFT, right, movewindow, r
|
|
||||||
|
|
||||||
bind = $mod, 1, workspace, 1
|
|
||||||
bind = $mod, 2, workspace, 2
|
|
||||||
bind = $mod, 3, workspace, 3
|
|
||||||
bind = $mod, 4, workspace, 4
|
|
||||||
bind = $mod, 5, workspace, 5
|
|
||||||
bind = $mod, 6, workspace, 6
|
|
||||||
bind = $mod, 7, workspace, 7
|
|
||||||
bind = $mod, 8, workspace, 8
|
|
||||||
bind = $mod, 9, workspace, 9
|
|
||||||
bind = $mod, 0, workspace, 10
|
|
||||||
bind = $mod, comma, workspace, -1
|
|
||||||
bind = $mod, period, workspace, +1
|
|
||||||
|
|
||||||
bind = $mod SHIFT, 1, movetoworkspace, 1
|
|
||||||
bind = $mod SHIFT, 2, movetoworkspace, 2
|
|
||||||
bind = $mod SHIFT, 3, movetoworkspace, 3
|
|
||||||
bind = $mod SHIFT, 4, movetoworkspace, 4
|
|
||||||
bind = $mod SHIFT, 5, movetoworkspace, 5
|
|
||||||
bind = $mod SHIFT, 6, movetoworkspace, 6
|
|
||||||
bind = $mod SHIFT, 7, movetoworkspace, 7
|
|
||||||
bind = $mod SHIFT, 8, movetoworkspace, 8
|
|
||||||
bind = $mod SHIFT, 9, movetoworkspace, 9
|
|
||||||
bind = $mod SHIFT, 0, movetoworkspace, 10
|
|
||||||
|
|
||||||
bind = $mod SHIFT, C, exec, hyprctl reload
|
|
||||||
bind = $mod SHIFT, R, exec, hyprctl reload
|
|
||||||
bind = $mod SHIFT, BackSpace, exit
|
|
||||||
bind = $mod SHIFT, Escape, exec, $powermenu
|
|
||||||
|
|
||||||
bind = , Print, exec, $screenshot full
|
|
||||||
bind = SHIFT, Print, exec, $screenshot region
|
|
||||||
bind = ALT, Print, exec, $screenshot output
|
|
||||||
|
|
||||||
bind = , XF86AudioRaiseVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ +5%
|
|
||||||
bind = , XF86AudioLowerVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ -5%
|
|
||||||
bind = , XF86AudioMute, exec, pactl set-sink-mute @DEFAULT_SINK@ toggle
|
|
||||||
bind = , XF86AudioMicMute, exec, pactl set-source-mute @DEFAULT_SOURCE@ toggle
|
|
||||||
bind = , XF86MonBrightnessUp, exec, brightnessctl set +10%
|
|
||||||
bind = , XF86MonBrightnessDown, exec, brightnessctl set 10%-
|
|
||||||
bind = , XF86AudioPlay, exec, playerctl play-pause
|
|
||||||
bind = , XF86AudioNext, exec, playerctl next
|
|
||||||
bind = , XF86AudioPrev, exec, playerctl previous
|
|
||||||
|
|
||||||
bind = $mod, R, submap, resize
|
|
||||||
|
|
||||||
submap = resize
|
|
||||||
bind = , H, resizeactive, -40 0
|
|
||||||
bind = , J, resizeactive, 0 40
|
|
||||||
bind = , K, resizeactive, 0 -40
|
|
||||||
bind = , L, resizeactive, 40 0
|
|
||||||
bind = , left, resizeactive, -40 0
|
|
||||||
bind = , down, resizeactive, 0 40
|
|
||||||
bind = , up, resizeactive, 0 -40
|
|
||||||
bind = , right, resizeactive, 40 0
|
|
||||||
bind = , escape, submap, reset
|
|
||||||
bind = , Return, submap, reset
|
|
||||||
bind = $mod, R, submap, reset
|
|
||||||
submap = reset
|
|
||||||
|
|
||||||
bindm = $mod, mouse:272, movewindow
|
|
||||||
bindm = $mod, mouse:273, resizewindow
|
|
||||||
@@ -1,46 +0,0 @@
|
|||||||
general {
|
|
||||||
hide_cursor = true
|
|
||||||
grace = 2
|
|
||||||
no_fade_in = false
|
|
||||||
}
|
|
||||||
|
|
||||||
background {
|
|
||||||
monitor =
|
|
||||||
color = rgba(1f1f28ff)
|
|
||||||
}
|
|
||||||
|
|
||||||
label {
|
|
||||||
monitor =
|
|
||||||
text = cmd[update:1000] echo "$(date +'%H:%M')"
|
|
||||||
color = rgba(d0d0d0ff)
|
|
||||||
font_size = 42
|
|
||||||
position = 0, 80
|
|
||||||
halign = center
|
|
||||||
valign = center
|
|
||||||
}
|
|
||||||
|
|
||||||
label {
|
|
||||||
monitor =
|
|
||||||
text = cmd[update:60000] echo "$(date +'%Y-%m-%d')"
|
|
||||||
color = rgba(9a9a9aff)
|
|
||||||
font_size = 18
|
|
||||||
position = 0, 35
|
|
||||||
halign = center
|
|
||||||
valign = center
|
|
||||||
}
|
|
||||||
|
|
||||||
input-field {
|
|
||||||
monitor =
|
|
||||||
size = 280, 56
|
|
||||||
outline_thickness = 2
|
|
||||||
dots_size = 0.2
|
|
||||||
dots_spacing = 0.2
|
|
||||||
outer_color = rgba(4a90d9ff)
|
|
||||||
inner_color = rgba(1f1f28ff)
|
|
||||||
font_color = rgba(d0d0d0ff)
|
|
||||||
fade_on_empty = false
|
|
||||||
placeholder_text = Password...
|
|
||||||
position = 0, -20
|
|
||||||
halign = center
|
|
||||||
valign = center
|
|
||||||
}
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
preload = ~/.config/i3/wallpapers/dont_like_wallpapers.jpg
|
|
||||||
wallpaper = ,~/.config/i3/wallpapers/dont_like_wallpapers.jpg
|
|
||||||
splash = false
|
|
||||||
ipc = on
|
|
||||||
@@ -2,4 +2,3 @@
|
|||||||
|
|
||||||
- i3 primary
|
- i3 primary
|
||||||
- XFCE components selectively
|
- XFCE components selectively
|
||||||
- Hyprland experimental
|
|
||||||
|
|||||||
@@ -1,106 +0,0 @@
|
|||||||
{
|
|
||||||
"layer": "top",
|
|
||||||
"position": "bottom",
|
|
||||||
"height": 28,
|
|
||||||
"spacing": 4,
|
|
||||||
|
|
||||||
"modules-left": [
|
|
||||||
"hyprland/workspaces"
|
|
||||||
],
|
|
||||||
|
|
||||||
"modules-right": [
|
|
||||||
"pulseaudio",
|
|
||||||
"backlight",
|
|
||||||
"network",
|
|
||||||
"battery",
|
|
||||||
"temperature",
|
|
||||||
"memory",
|
|
||||||
"clock",
|
|
||||||
"tray",
|
|
||||||
"custom/powermenu"
|
|
||||||
],
|
|
||||||
|
|
||||||
"hyprland/workspaces": {
|
|
||||||
"disable-scroll": true,
|
|
||||||
"all-outputs": true,
|
|
||||||
"format": "{name}",
|
|
||||||
"on-click": "activate",
|
|
||||||
"sort-by-number": true
|
|
||||||
},
|
|
||||||
|
|
||||||
"pulseaudio": {
|
|
||||||
"scroll-step": 1,
|
|
||||||
"format": " {volume}%",
|
|
||||||
"format-bluetooth": " {volume}%",
|
|
||||||
"format-muted": "",
|
|
||||||
"on-click": "pavucontrol",
|
|
||||||
"tooltip": false
|
|
||||||
},
|
|
||||||
|
|
||||||
"backlight": {
|
|
||||||
"device": "intel_backlight",
|
|
||||||
"on-scroll-up": "brightnessctl set +5%",
|
|
||||||
"on-scroll-down": "brightnessctl set 5%-",
|
|
||||||
"format": " {percent}%"
|
|
||||||
},
|
|
||||||
|
|
||||||
"network": {
|
|
||||||
"interval": 1,
|
|
||||||
"tooltip": true,
|
|
||||||
"format-wifi": "",
|
|
||||||
"format-ethernet": "",
|
|
||||||
"format-linked": "",
|
|
||||||
"format-disconnected": "",
|
|
||||||
"tooltip-format": "{ifname}",
|
|
||||||
"tooltip-format-wifi": "{essid} ({signalStrength}%)",
|
|
||||||
"tooltip-format-ethernet": "{ifname}",
|
|
||||||
"tooltip-format-disconnected": "Disconnected",
|
|
||||||
"on-click": "nm-connection-editor"
|
|
||||||
},
|
|
||||||
|
|
||||||
"battery": {
|
|
||||||
"interval": 10,
|
|
||||||
"states": {
|
|
||||||
"warning": 20,
|
|
||||||
"critical": 10
|
|
||||||
},
|
|
||||||
"format": "{icon} {capacity}%",
|
|
||||||
"format-charging": " {capacity}%",
|
|
||||||
"format-plugged": " {capacity}%",
|
|
||||||
"format-alt": "{time}"
|
|
||||||
,"format-icons": ["", "", "", "", "", "", "", "", "", ""]
|
|
||||||
},
|
|
||||||
|
|
||||||
"temperature": {
|
|
||||||
"critical-threshold": 80,
|
|
||||||
"format": " {temperatureC}C",
|
|
||||||
"tooltip": false
|
|
||||||
},
|
|
||||||
|
|
||||||
"memory": {
|
|
||||||
"interval": 5,
|
|
||||||
"format": " {percentage}%",
|
|
||||||
"states": {
|
|
||||||
"warning": 85
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
"clock": {
|
|
||||||
"interval": 60,
|
|
||||||
"timezone": "Europe/Rome",
|
|
||||||
"format": " {:%Y-%m-%d %H:%M}",
|
|
||||||
"format-alt": "{:%A %d/%m/%Y}",
|
|
||||||
"tooltip-format": "{:%A %d %B %Y\n%H:%M:%S %Z}"
|
|
||||||
},
|
|
||||||
|
|
||||||
"custom/powermenu": {
|
|
||||||
"format": "⏻",
|
|
||||||
"on-click": "~/.local/bin/powermenu",
|
|
||||||
"tooltip": false
|
|
||||||
},
|
|
||||||
|
|
||||||
"tray": {
|
|
||||||
"icon-size": 15,
|
|
||||||
"spacing": 4
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -22,18 +22,11 @@ case "${XDG_CURRENT_DESKTOP:-}" in
|
|||||||
--indicator \
|
--indicator \
|
||||||
--clock
|
--clock
|
||||||
;;
|
;;
|
||||||
*Hyprland*|*hyprland*)
|
|
||||||
exec hyprlock
|
|
||||||
;;
|
|
||||||
*i3*|*I3*)
|
*i3*|*I3*)
|
||||||
exec "$HOME/.config/i3/scripts/lockscreen"
|
exec "$HOME/.config/i3/scripts/lockscreen"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
if command -v hyprlock >/dev/null 2>&1; then
|
|
||||||
exec hyprlock
|
|
||||||
fi
|
|
||||||
|
|
||||||
if command -v swaylock >/dev/null 2>&1; then
|
if command -v swaylock >/dev/null 2>&1; then
|
||||||
exec swaylock -f
|
exec swaylock -f
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -20,9 +20,6 @@ case "$choice" in
|
|||||||
*sway*|*Sway*)
|
*sway*|*Sway*)
|
||||||
swaymsg exit
|
swaymsg exit
|
||||||
;;
|
;;
|
||||||
*Hyprland*|*hyprland*)
|
|
||||||
hyprctl dispatch exit
|
|
||||||
;;
|
|
||||||
*i3*|*I3*)
|
*i3*|*I3*)
|
||||||
i3-msg exit
|
i3-msg exit
|
||||||
;;
|
;;
|
||||||
|
|||||||
@@ -1,23 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
[ $# -gt 0 ] || set -- Hyprland
|
|
||||||
|
|
||||||
[ -r /etc/profile ] && . /etc/profile
|
|
||||||
[ -r "$HOME/.profile" ] && . "$HOME/.profile"
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
session_name=${1##*/}
|
|
||||||
|
|
||||||
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"
|
|
||||||
|
|
||||||
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 "$@"
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
env = AQ_DRM_DEVICES,/dev/dri/card0:/dev/dri/card1
|
|
||||||
env = __GLX_VENDOR_LIBRARY_NAME,nvidia
|
|
||||||
env = GBM_BACKEND,nvidia-drm
|
|
||||||
env = LIBVA_DRIVER_NAME,iHD
|
|
||||||
env = WLR_NO_HARDWARE_CURSORS,1
|
|
||||||
Reference in New Issue
Block a user