From 86c3a2253e8761846e79bbf4164766a73bdfd732 Mon Sep 17 00:00:00 2001
From: Mehdi Sadeghi <mehdi@mehdix.org>
Date: Sat, 12 Mar 2022 13:47:10 +0100
Subject: Adjust KB layout. Add xdg desktop portal config.

- Swap right meta and control.
- Add xdg-portal-desktop-wlroot
- Set term to foot (foot-extra was a mistake)
- Remove Plan9 from generic path
---
 .config/isync/mbsyncrc |  2 +-
 .config/sway/config    | 14 +++++++++++++-
 .config/sway/xdpw      |  7 +++++++
 .ssh/config            |  1 +
 .vimrc                 |  3 ---
 5 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100755 .config/sway/xdpw

diff --git a/.config/isync/mbsyncrc b/.config/isync/mbsyncrc
index f138920..0bf1ccc 100644
--- a/.config/isync/mbsyncrc
+++ b/.config/isync/mbsyncrc
@@ -1,7 +1,7 @@
 IMAPAccount main
 Host mail.mehdix.org
 User mehdi@mehdix.org
-PassCmd "pass mail/mx"
+PassCmd "pass Email/mail.mehdix.org"
 SSLType IMAPS
 AuthMechs LOGIN
 
diff --git a/.config/sway/config b/.config/sway/config
index 92af8b1..060895e 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -53,6 +53,11 @@ input * {
 	xkb_options "lv3:caps_switch,grp:lctrl_lwin_toggle,shift:both_shiftlock"
 }
 
+input "9456:320:Metadot_-_Das_Keyboard_Das_Keyboard" {
+	xkb_layout "de(nodeadkeys),ir"
+	xkb_options "lv3:caps_switch,grp:lctrl_lwin_toggle,shift:both_shiftlock,ctrl:swap_rwin_rctl"
+}
+
 input type:touchpad {
 	tap disabled
 	natural_scroll enabled
@@ -208,11 +213,15 @@ bindsym XF86Search exec bemenu-run
 # Screen capture
 # Thanks to Gentoo wiki at https://wiki.gentoo.org/wiki/Sway
 #
+# Screen to clipboard
 set $ps1 Print
+# Selection to clipboard
 set $ps2 Control+Print
+# Screen to file
 set $ps3 Alt+Print
+# Selection to file
 set $ps4 Alt+Control+Print
- 
+
 bindsym $ps1 exec grim - | wl-copy
 bindsym $ps2 exec grim -g "$(slurp)" - | wl-copy
 bindsym $ps3 exec grim $(xdg-user-dir PICTURES)/Screenshots/ps_$(date +"%Y%m%d%H%M%S").png
@@ -243,5 +252,8 @@ bar {
 	status_command exec ~/.local/bin/any_position_wrapper.sh
 }
 
+# Prepare for xdg-desktop-portal-wlr
+exec ~/.config/sway/xdpw
+
 # Load machine specific configuration
 include ~/.config/sway/`hostname`
diff --git a/.config/sway/xdpw b/.config/sway/xdpw
new file mode 100755
index 0000000..81fc8ca
--- /dev/null
+++ b/.config/sway/xdpw
@@ -0,0 +1,7 @@
+#!/bin/sh
+# Import the WAYLAND_DISPLAY env var from sway into the systemd user session.
+dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway
+
+# Stop any services that are running, so that they receive the new env var when they restart.
+systemctl --user stop pipewire pipewire-media-session xdg-desktop-portal xdg-desktop-portal-wlr
+systemctl --user start pipewire-media-session
diff --git a/.ssh/config b/.ssh/config
index bc44290..f5155b2 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -1,6 +1,7 @@
 Include ~/.ssh/config.d/*
 
 AddKeysToAgent yes
+SetEnv TERM=vt100
 
 Host *
   ControlMaster auto
diff --git a/.vimrc b/.vimrc
index 5093c95..db92900 100644
--- a/.vimrc
+++ b/.vimrc
@@ -17,9 +17,6 @@ nnoremap <C-H> <C-W><C-H>
 set exrc
 set secure
 
-
-:source /home/rock/.vim/right_align.vim
-
 set arabicshape!
 let g:RightAlign_RightBorder = 80
 imap <silent> <C-b>    <Plug>RightAlign
-- 
cgit v1.2.3