From 2d049187428a81ab4a6e53af2e41ff970545ac03 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Wed, 17 Feb 2021 20:42:02 +0300
Subject: [PATCH] compositors: avoid alt_shift for emacs

---
 home/.config/doom/config.el     | 12 ++++++++++--
 home/.config/doom/exwm.el       | 10 +++++-----
 home/.config/doom/packages.el   |  2 +-
 home/.config/hikari/hikari.conf |  2 +-
 home/.config/sway/config        |  2 +-
 home/.config/wayfire.ini        |  2 +-
 home/.local/bin/startwl         |  2 +-
 7 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/home/.config/doom/config.el b/home/.config/doom/config.el
index 5ccbad4..08d92ad 100644
--- a/home/.config/doom/config.el
+++ b/home/.config/doom/config.el
@@ -5,8 +5,8 @@
       user-mail-address "folliekazetani@protonmail.com")
 
 ;; Font settings
-(setq doom-font (font-spec :family "Iosevka Nerd Font" :size 15)
-      doom-variable-pitch-font (font-spec :family "sans" :size 15)
+(setq doom-font (font-spec :family "Iosevka Nerd Font" :size 16)
+      doom-variable-pitch-font (font-spec :family "sans" :size 16)
       doom-big-font (font-spec :family "Iosevka Nerd Font" :size 24)
       doom-unicode-font (font-spec :family "Symbola" :size 14))
 (custom-set-faces!
@@ -124,6 +124,14 @@
 (setq browse-url-browser-function 'browse-url-generic
       browse-url-generic-program "qutebrowser")
 
+;; Edit buffer as sudo
+;;(defun follie/sudo-edit (&optional arg)
+;;  "Edit file as super-user with optional ARG."
+;;  (interactive "P")
+;;  (if (or arg (not buffer-file-name))
+;;      (find-file (concat "/sudo::" (read-file-name "File (as root): ")))
+;;    (find-alternate-file (concat "/sudo::" buffer-file-name))))
+
 ;; Here are some additional functions/macros that could help you configure Doom:
 ;;
 ;; - `load!' for loading external *.el files relative to this one
diff --git a/home/.config/doom/exwm.el b/home/.config/doom/exwm.el
index d5d3307..a851b0d 100644
--- a/home/.config/doom/exwm.el
+++ b/home/.config/doom/exwm.el
@@ -59,7 +59,7 @@
               (exwm-workspace-rename-buffer exwm-class-name)))
 
   ;; Force tiling by default
-  (setq exwm-manage-force-tiling t)
+  (setq exwm-manage-force-tiling nil)
   ;; Window rules
   (add-hook 'exwm-manage-finish-hook #'follie/configure-window-by-class)
 
@@ -146,10 +146,10 @@
   :config
   (exwm-input-set-key (kbd "s-e") #'exwm-edit--compose))
 
-;; xbps in Emacs
-(use-package! system-packages
-  :config
-  (setq system-packages-use-sudo t))
+;; xbps but with Emacs
+;;(use-package! system-packages
+;;  :config
+;;  (setq system-packages-use-sudo t))
 
 ;; EMMS
 ;;(use-package! emms
diff --git a/home/.config/doom/packages.el b/home/.config/doom/packages.el
index c566924..cc25103 100644
--- a/home/.config/doom/packages.el
+++ b/home/.config/doom/packages.el
@@ -52,7 +52,7 @@
 ;; Emacs is an OS
 (package! exwm)
 (package! exwm-edit)
-(package! system-packages)
+;;(package! system-packages)
 (package! desktop-environment)
 ;;(package! emms)
 ;;(package! emms-mode-line-cycle)
diff --git a/home/.config/hikari/hikari.conf b/home/.config/hikari/hikari.conf
index 7333ec6..94e1d85 100644
--- a/home/.config/hikari/hikari.conf
+++ b/home/.config/hikari/hikari.conf
@@ -57,7 +57,7 @@ inputs {
     "*" = {
       xkb = {
         layout = "us,jp"
-        options = "grp:alt_shift_toggle"
+        options = "grp:alt_space_toggle"
       }
       repeat-rate = 25
       repeat-delay = 600
diff --git a/home/.config/sway/config b/home/.config/sway/config
index 4f553cf..379c6d6 100644
--- a/home/.config/sway/config
+++ b/home/.config/sway/config
@@ -67,7 +67,7 @@ input type:touchpad {
 
 input type:keyboard {
     xkb_layout us,jp
-    xkb_options grp:alt_shift_toggle
+    xkb_options grp:alt_space_toggle
 }
 
 input * xkb_numlock enable
diff --git a/home/.config/wayfire.ini b/home/.config/wayfire.ini
index 9b286c5..2d170a3 100644
--- a/home/.config/wayfire.ini
+++ b/home/.config/wayfire.ini
@@ -2,7 +2,7 @@
 
 [input]
 xkb_layout = us,jp
-xkb_options = grp:alt_shift_toggle
+xkb_options = grp:alt_space_toggle
 kb_numlock_default_state = true
 cursor_theme = Breeze_Snow
 cursor_size = 24
diff --git a/home/.local/bin/startwl b/home/.local/bin/startwl
index fd99546..3e797f7 100755
--- a/home/.local/bin/startwl
+++ b/home/.local/bin/startwl
@@ -28,7 +28,7 @@ export PATH=$HOME/.local/bin/Wayland:$PATH
 if [ "$1" = "river" ]
 then
 	export XKB_DEFAULT_LAYOUT="us,jp"
-	export XKB_DEFAULT_OPTIONS="grp:alt_shift_toggle"
+	export XKB_DEFAULT_OPTIONS="grp:alt_space_toggle"
 fi
 
 export XDG_CURRENT_DESKTOP=$1