From aa19aab9152d06fe4ea6bf2ecd5b350eab0dcde4 Mon Sep 17 00:00:00 2001
From: Julian Orth <ju.orth@gmail.com>
Date: Mon, 2 May 2022 14:17:19 +0200
Subject: [PATCH] config: remove personal settings from default-config

---
 default-config/src/lib.rs | 68 ++++-----------------------------------
 1 file changed, 7 insertions(+), 61 deletions(-)

diff --git a/default-config/src/lib.rs b/default-config/src/lib.rs
index ba5d14a5..a566f6ea 100644
--- a/default-config/src/lib.rs
+++ b/default-config/src/lib.rs
@@ -2,24 +2,19 @@ use {
     chrono::{format::StrftimeItems, Local, Timelike},
     jay_config::{
         config,
-        drm::{get_connector, on_connector_connected, on_graphics_initialized, on_new_connector},
-        embedded::grab_input_device,
+        drm::on_graphics_initialized,
         get_timer, get_workspace,
-        input::{
-            capability::{CAP_KEYBOARD, CAP_POINTER},
-            create_seat, input_devices, on_new_input_device, InputDevice, Seat,
-        },
+        input::{create_seat, input_devices, on_new_input_device, InputDevice, Seat},
         keyboard::{
             mods::{Modifiers, ALT, CTRL, SHIFT},
             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_m, SYM_o, SYM_p, SYM_q, SYM_t, SYM_u, SYM_v, SYM_y, SYM_F1, SYM_F10, SYM_F11,
-                SYM_F12, SYM_F13, SYM_F14, SYM_F15, SYM_F16, SYM_F17, SYM_F18, SYM_F19, SYM_F2,
-                SYM_F20, SYM_F21, SYM_F22, SYM_F23, SYM_F24, SYM_F25, SYM_F3, SYM_F4, SYM_F5,
-                SYM_F6, SYM_F7, SYM_F8, SYM_F9,
+                SYM_Super_L, SYM_c, SYM_d, SYM_f, SYM_h, SYM_j, SYM_k, SYM_l, SYM_m, SYM_p, SYM_q,
+                SYM_t, SYM_u, SYM_v, SYM_F1, SYM_F10, SYM_F11, SYM_F12, SYM_F13, SYM_F14, SYM_F15,
+                SYM_F16, SYM_F17, SYM_F18, SYM_F19, SYM_F2, SYM_F20, SYM_F21, SYM_F22, SYM_F23,
+                SYM_F24, SYM_F25, SYM_F3, SYM_F4, SYM_F5, SYM_F6, SYM_F7, SYM_F8, SYM_F9,
             },
         },
-        quit, set_env,
+        quit,
         status::set_status,
         switch_to_vt,
         Axis::{Horizontal, Vertical},
@@ -80,64 +75,17 @@ fn configure_seat(s: Seat) {
         s.bind(MOD | sym, move || s.show_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() {
     let seat = create_seat("default");
     configure_seat(seat);
     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);
     };
     input_devices().into_iter().for_each(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 update_status = move || {
@@ -157,8 +105,6 @@ pub fn configure() {
         timer.on_tick(update_status);
     }
 
-    set_env("GTK_THEME", "Adwaita:dark");
-
     on_graphics_initialized(|| {
         Command::new("mako").spawn();
     });