kossLAN/wry
1
0
Fork 0
forked from wry/wry
Code Pull requests Activity

config: remove personal settings from default-config

Browse source
This commit is contained in:
Julian Orth 2022-05-02 14:17:19 +02:00
parent ca13469f0c
commit aa19aab915
1 changed files with 7 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

68
default-config/src/lib.rs
View file

@ -2,24 +2,19 @@ use {
chrono::{format::StrftimeItems, Local, Timelike}, chrono::{format::StrftimeItems, Local, Timelike},
jay_config::{ jay_config::{
config, config,
drm::{get_connector, on_connector_connected, on_graphics_initialized, on_new_connector}, drm::on_graphics_initialized,
embedded::grab_input_device,
get_timer, get_workspace, get_timer, get_workspace,
input::{ input::{create_seat, input_devices, on_new_input_device, InputDevice, Seat},
capability::{CAP_KEYBOARD, CAP_POINTER},
create_seat, input_devices, on_new_input_device, InputDevice, Seat,
},
keyboard::{ keyboard::{
mods::{Modifiers, ALT, CTRL, SHIFT}, mods::{Modifiers, ALT, CTRL, SHIFT},
syms::{ syms::{
SYM_Super_L, SYM_a, SYM_b, SYM_c, SYM_d, SYM_e, SYM_f, SYM_h, SYM_j, SYM_k, SYM_l, SYM_Super_L, SYM_c, SYM_d, SYM_f, SYM_h, SYM_j, SYM_k, SYM_l, SYM_m, SYM_p, SYM_q,
SYM_m, SYM_o, SYM_p, SYM_q, SYM_t, SYM_u, SYM_v, SYM_y, SYM_F1, SYM_F10, SYM_F11, SYM_t, SYM_u, SYM_v, SYM_F1, SYM_F10, SYM_F11, SYM_F12, SYM_F13, SYM_F14, SYM_F15,
SYM_F12, SYM_F13, SYM_F14, SYM_F15, SYM_F16, SYM_F17, SYM_F18, SYM_F19, SYM_F2, SYM_F16, SYM_F17, SYM_F18, SYM_F19, SYM_F2, SYM_F20, SYM_F21, SYM_F22, SYM_F23,
SYM_F20, SYM_F21, SYM_F22, SYM_F23, SYM_F24, SYM_F25, SYM_F3, SYM_F4, SYM_F5, SYM_F24, SYM_F25, SYM_F3, SYM_F4, SYM_F5, SYM_F6, SYM_F7, SYM_F8, SYM_F9,
SYM_F6, SYM_F7, SYM_F8, SYM_F9,
}, },
}, },
quit, set_env, quit,
status::set_status, status::set_status,
switch_to_vt, switch_to_vt,
Axis::{Horizontal, Vertical}, Axis::{Horizontal, Vertical},
@ -80,64 +75,17 @@ fn configure_seat(s: Seat) {
s.bind(MOD | sym, move || s.show_workspace(ws)); s.bind(MOD | sym, move || s.show_workspace(ws));
s.bind(MOD | SHIFT | sym, move || s.set_workspace(ws)); s.bind(MOD | SHIFT | sym, move || s.set_workspace(ws));
} }
s.bind(MOD | SYM_a, || {
Command::new("spotify-remote").arg("a").spawn()
});
s.bind(MOD | SYM_o, || {
Command::new("spotify-remote").arg("o").spawn()
});
s.bind(MOD | SYM_e, || {
Command::new("spotify-remote").arg("e").spawn()
});
fn do_grab(s: Seat, grab: bool) {
for device in s.input_devices() {
if device.has_capability(CAP_KEYBOARD) {
log::info!(
"{}rabbing keyboard {:?}",
if grab { "G" } else { "Ung" },
device.0
);
grab_input_device(device, grab);
}
}
if grab {
s.unbind(SYM_y);
s.bind(MOD | SYM_b, move || do_grab(s, false));
} else {
s.unbind(MOD | SYM_b);
s.bind(SYM_y, move || do_grab(s, true));
}
}
do_grab(s, false);
} }
pub fn configure() { pub fn configure() {
let seat = create_seat("default"); let seat = create_seat("default");
configure_seat(seat); configure_seat(seat);
let handle_input_device = move |device: InputDevice| { let handle_input_device = move |device: InputDevice| {
if device.has_capability(CAP_POINTER) {
device.set_left_handed(true);
device.set_transform_matrix([[0.35, 0.0], [0.0, 0.35]]);
}
device.set_seat(seat); device.set_seat(seat);
}; };
input_devices().into_iter().for_each(handle_input_device); input_devices().into_iter().for_each(handle_input_device);
on_new_input_device(handle_input_device); on_new_input_device(handle_input_device);
let handle_connectors_changed = || {
let left = get_connector("HDMI-A-1");
let right = get_connector("DP-1");
if left.connected() && right.connected() {
left.set_position(0, 0);
right.set_position(left.width(), 0);
}
};
on_new_connector(move |_| handle_connectors_changed());
on_connector_connected(move |_| handle_connectors_changed());
handle_connectors_changed();
{ {
let time_format: Vec<_> = StrftimeItems::new("%Y-%m-%d %H:%M:%S").collect(); let time_format: Vec<_> = StrftimeItems::new("%Y-%m-%d %H:%M:%S").collect();
let update_status = move || { let update_status = move || {
@ -157,8 +105,6 @@ pub fn configure() {
timer.on_tick(update_status); timer.on_tick(update_status);
} }
set_env("GTK_THEME", "Adwaita:dark");
on_graphics_initialized(|| { on_graphics_initialized(|| {
Command::new("mako").spawn(); Command::new("mako").spawn();
}); });