Merge pull request #343 from rbreaves/dev

- Consecutive tab open/close on Terms in Win, ConsoleZ & WinTerm refined

setup.py

@@ -104,12 +104,9 @@ if platform.system() == 'Windows':
 check_x11 = cmdline("(env | grep -i x11 || loginctl show-session \"$XDG_SESSION_ID\" -p Type) | awk -F= '{print $2}'").strip()
 
 if len(check_x11) == 0:
-	if os.name != 'nt' and os.name != 'posix':
-		print(os.name)
+	if os.name != 'nt':
 		print("You are not using x11, please logout and back in using x11/Xorg")
 		sys.exit()
-	elif os.name == 'posix':
-		print("You may be trying to run Kinto under WSL2 w/ Linux. We will continue...")
 	else:
 		print("\nYou are detected as running Windows.")
 		windows_setup()

windows/kinto.ahk

@@ -109,10 +109,6 @@ tray_suspend(){
         menu, tray, unCheck, Suspend Kinto
 ;         I_Icon = %A_ScriptDir%\assets\kinto-white-invert.ico    ; MacModifiers
 ;         I_Icon = %A_ScriptDir%\assets\kinto-white-invert.ico    ; WinModifiers/CB/IBM
-;         Menu, Tray, Tip, Mac - Kinto                            ; MacModifiers
-;         Menu, Tray, Tip, Windows - Kinto                        ; WinModifiers
-;         Menu, Tray, Tip, Chromebook - Kinto                     ; Chromebook
-;         Menu, Tray, Tip, IBM - Kinto                            ; IBM
         Menu, Tray, Icon, %I_Icon%,,1
         Run, %A_ScriptDir%\detectUSB.ahk
     }
@@ -166,7 +162,6 @@ GroupAdd, editors, ahk_exe Code.exe
 GroupAdd, browsers, ahk_exe chrome.exe
 GroupAdd, browsers, ahk_exe opera.exe
 GroupAdd, browsers, ahk_exe firefox.exe
-GroupAdd, browsers, ahk_exe msedge.exe
 
 ; Disable Key Remapping for Virtual Machines
 ; Disable for Remote desktop solutions too
@@ -336,17 +331,15 @@ GroupAdd, intellij, ahk_exe idea64.exe
     !Right::Send ^{Right}
     !+Right::Send ^+{Right}
 
-    #IfWinNotActive ahk_group terminals
-        ; emacs style
-        #n::Send {Down}
-        #p::Send {Up}
-        #f::Send {Right}
-        #b::Send {Left}
-        #a::Send {Home}
-        #e::Send {End}
-        #d::Send {Delete}
-        #k::Send +{End}{Backspace}
-    #If
+    ; emacs style
+    #n::Send {Down}
+    #p::Send {Up}
+    #f::Send {Right}
+    #b::Send {Left}
+    #a::Send {Home}
+    #e::Send {End}
+    #d::Send {Delete}
+    #k::Send +{End}{Backspace}
 
     ; Cmd+Space Alternative
     $^Space::Send ^{Esc}
@@ -443,23 +436,7 @@ GroupAdd, intellij, ahk_exe idea64.exe
 
     ; Close all browsers
     #IfWinActive ahk_group browsers
-        ^q::send {Alt Down}f{Alt Up}x   ; exit all windows
-        ; Dev Tools
-        #^i::send {Ctrl Down}{Shift Down}i{Shift Up}{Ctrl Up}
-        #^j::send {Ctrl Down}{Shift Down}j{Shift Up}{Ctrl Up}
-        ; Open preferences
-        #IfWinActive ahk_exe firefox.exe
-            ^,::send {Alt Down}{Shift Down}t{Shift Up}{Alt Up}o{Enter}
-        #If
-        #IfWinActive ahk_exe chrome.exe
-            ^,::send {Alt Down}e{Alt Up}s{Enter}
-        #If
-        #IfWinActive ahk_exe msedge.exe
-            ^,::send {Alt Down}e{Alt Up}s{Enter}
-        #If
-        #IfWinActive ahk_exe opera.exe
-            ^,::send {Ctrl Down}{F12}{Ctrl Up}
-        #If
+       ^q::send {Alt Down}f{Alt Up}x   ; exit all windows
     #If
 
     ; Sublime Text Remaps for VS Code
@@ -640,85 +617,35 @@ GroupAdd, intellij, ahk_exe idea64.exe
         ; #l::return
         ; Clear Terminal and Scroll Buffer
         ^k::Send clear && printf '\e[3J'{Enter}
-        ; Remap Physical Ctrl back to Ctrl
-        #0::Send {LCtrl down}0{Ctrl up}  ; Default
-        #1::Send {LCtrl down}1{Ctrl up}  ; Default
-        #2::Send {LCtrl down}2{Ctrl up}  ; Default
-        #3::Send {LCtrl down}3{Ctrl up}  ; Default
-        #4::Send {LCtrl down}4{Ctrl up}  ; Default
-        #5::Send {LCtrl down}5{Ctrl up}  ; Default
-        #6::Send {LCtrl down}6{Ctrl up}  ; Default
-        #7::Send {LCtrl down}7{Ctrl up}  ; Default
-        #8::Send {LCtrl down}8{Ctrl up}  ; Default
-        #9::Send {LCtrl down}9{Ctrl up}  ; Default
-        #-::Send {LCtrl down}-{Ctrl up}  ; Default
-        #=::Send {LCtrl down}={Ctrl up}  ; Default
-        #`::Send {LCtrl down}`{Ctrl up}  ; Default
-        #a::Send {LCtrl down}a{Ctrl up}  ; Default
-        #b::Send {LCtrl down}b{Ctrl up}  ; Default
-        #c::Send {LCtrl down}c{Ctrl up}  ; Default
-        #d::Send {LCtrl down}d{Ctrl up}  ; Default
-        #e::Send {LCtrl down}e{Ctrl up}  ; Default
-        #f::Send {LCtrl down}f{Ctrl up}  ; Default
-        #g::Send {LCtrl down}g{Ctrl up}  ; Default
-        #h::Send {LCtrl down}h{Ctrl up}  ; Default
-        #i::Send {LCtrl down}i{Ctrl up}  ; Default
-        #j::Send {LCtrl down}j{Ctrl up}  ; Default
-        #k::Send {LCtrl down}k{Ctrl up}  ; Default
-        #l::Send {LCtrl down}l{Ctrl up}  ; Default
-        #m::Send {LCtrl down}m{Ctrl up}  ; Default
-        #n::Send {LCtrl down}n{Ctrl up}  ; Default
-        #o::Send {LCtrl down}o{Ctrl up}  ; Default
-        #p::Send {LCtrl down}p{Ctrl up}  ; Default
-        #q::Send {LCtrl down}q{Ctrl up}  ; Default
-        #r::Send {LCtrl down}r{Ctrl up}  ; Default
-        #s::Send {LCtrl down}s{Ctrl up}  ; Default
-        #t::Send {LCtrl down}t{Ctrl up}  ; Default
-        #u::Send {LCtrl down}u{Ctrl up}  ; Default
-        #v::Send {LCtrl down}v{Ctrl up}  ; Default
-        #w::Send {LCtrl down}w{Ctrl up}  ; Default
-        #x::Send {LCtrl down}x{Ctrl up}  ; Default
-        #y::Send {LCtrl down}y{Ctrl up}  ; Default
-        #z::Send {LCtrl down}z{Ctrl up}  ; Default
-        ; !0::Send {LCtrl down}0{Ctrl up}  ; CB/IBM
-        ; !1::Send {LCtrl down}1{Ctrl up}  ; CB/IBM
-        ; !2::Send {LCtrl down}2{Ctrl up}  ; CB/IBM
-        ; !3::Send {LCtrl down}3{Ctrl up}  ; CB/IBM
-        ; !4::Send {LCtrl down}4{Ctrl up}  ; CB/IBM
-        ; !5::Send {LCtrl down}5{Ctrl up}  ; CB/IBM
-        ; !6::Send {LCtrl down}6{Ctrl up}  ; CB/IBM
-        ; !7::Send {LCtrl down}7{Ctrl up}  ; CB/IBM
-        ; !8::Send {LCtrl down}8{Ctrl up}  ; CB/IBM
-        ; !9::Send {LCtrl down}9{Ctrl up}  ; CB/IBM
-        ; !-::Send {LCtrl down}-{Ctrl up}  ; CB/IBM
-        ; !=::Send {LCtrl down}={Ctrl up}  ; CB/IBM
-        ; !`::Send {LCtrl down}`{Ctrl up}  ; CB/IBM
-        ; !a::Send {LCtrl down}a{Ctrl up}  ; CB/IBM
-        ; !b::Send {LCtrl down}b{Ctrl up}  ; CB/IBM
-        ; !c::Send {LCtrl down}c{Ctrl up}  ; CB/IBM
-        ; !d::Send {LCtrl down}d{Ctrl up}  ; CB/IBM
-        ; !e::Send {LCtrl down}e{Ctrl up}  ; CB/IBM
-        ; !f::Send {LCtrl down}f{Ctrl up}  ; CB/IBM
-        ; !g::Send {LCtrl down}g{Ctrl up}  ; CB/IBM
-        ; !h::Send {LCtrl down}h{Ctrl up}  ; CB/IBM
-        ; !i::Send {LCtrl down}i{Ctrl up}  ; CB/IBM
-        ; !j::Send {LCtrl down}j{Ctrl up}  ; CB/IBM
-        ; !k::Send {LCtrl down}k{Ctrl up}  ; CB/IBM
-        ; !l::Send {LCtrl down}l{Ctrl up}  ; CB/IBM
-        ; !m::Send {LCtrl down}m{Ctrl up}  ; CB/IBM
-        ; !n::Send {LCtrl down}n{Ctrl up}  ; CB/IBM
-        ; !o::Send {LCtrl down}o{Ctrl up}  ; CB/IBM
-        ; !p::Send {LCtrl down}p{Ctrl up}  ; CB/IBM
-        ; !q::Send {LCtrl down}q{Ctrl up}  ; CB/IBM
-        ; !r::Send {LCtrl down}r{Ctrl up}  ; CB/IBM
-        ; !s::Send {LCtrl down}s{Ctrl up}  ; CB/IBM
-        ; !t::Send {LCtrl down}t{Ctrl up}  ; CB/IBM
-        ; !u::Send {LCtrl down}u{Ctrl up}  ; CB/IBM
-        ; !v::Send {LCtrl down}v{Ctrl up}  ; CB/IBM
-        ; !w::Send {LCtrl down}w{Ctrl up}  ; CB/IBM
-        ; !x::Send {LCtrl down}x{Ctrl up}  ; CB/IBM
-        ; !y::Send {LCtrl down}y{Ctrl up}  ; CB/IBM
-        ; !z::Send {LCtrl down}z{Ctrl up}  ; CB/IBM
+        ; Nano editor shortcuts
+        #g::Send {LCtrl down}g{LCtrl Up} ; Default
+        #k::Send {LCtrl down}k{LCtrl Up} ; Default
+        #x::Send {LCtrl down}x{LCtrl Up} ; Default
+        #o::Send {LCtrl down}o{LCtrl Up} ; Default
+        #r::Send {LCtrl down}r{LCtrl Up} ; Default
+        #w::Send {LCtrl down}w{LCtrl Up} ; Default
+        #\::Send {LCtrl down}\{LCtrl Up} ; Default
+        #u::Send {LCtrl down}u{LCtrl Up} ; Default
+        #j::Send {LCtrl down}j{LCtrl Up} ; Default
+        #t::Send {LCtrl down}t{LCtrl Up} ; Default
+        #_::Send {LCtrl down}_{LCtrl Up} ; Default
+        #z::Send {LCtrl down}z{LCtrl Up} ; Default
+        #y::Send {LCtrl down}y{LCtrl Up} ; Default
+        #v::Send {LCtrl down}v{LCtrl Up} ; Default
+        !g::Send {LCtrl down}g{LCtrl Up} ; CB/IBM
+        !k::Send {LCtrl down}k{LCtrl Up} ; CB/IBM
+        !x::Send {LCtrl down}x{LCtrl Up} ; CB/IBM
+        !o::Send {LCtrl down}o{LCtrl Up} ; CB/IBM
+        !r::Send {LCtrl down}r{LCtrl Up} ; CB/IBM
+        !w::Send {LCtrl down}w{LCtrl Up} ; CB/IBM
+        !\::Send {LCtrl down}\{LCtrl Up} ; CB/IBM
+        !u::Send {LCtrl down}u{LCtrl Up} ; CB/IBM
+        !j::Send {LCtrl down}j{LCtrl Up} ; CB/IBM
+        !t::Send {LCtrl down}t{LCtrl Up} ; CB/IBM
+        !_::Send {LCtrl down}_{LCtrl Up} ; CB/IBM
+        !z::Send {LCtrl down}z{LCtrl Up} ; CB/IBM
+        !y::Send {LCtrl down}y{LCtrl Up} ; CB/IBM
+        !v::Send {LCtrl down}v{LCtrl Up} ; CB/IBM
     #If
 #If
 

xkeysnail-config/kinto.py

@@ -12,18 +12,10 @@ terminals = [term.casefold() for term in terminals]
 termStr = "|".join(str(x) for x in terminals)
 
 # Use for browser specific hotkeys
-browsers = ["Chromium","Chromium-browser","Google-chrome","microsoft-edge-dev","microsoft-edge","Epiphany","Firefox","Discord"]
+browsers = ["Chromium","Chromium-browser","Google-chrome","Epiphany","Firefox","Discord"]
 browsers = [browser.casefold() for browser in browsers]
 browserStr = "|".join(str(x) for x in browsers)
 
-chromes = ["Chromium","Chromium-browser","Google-chrome","microsoft-edge-dev","microsoft-edge"]
-chromes = [chrome.casefold() for chrome in chromes]
-chromeStr = "|".join(str(x) for x in chromes)
-
-# edges = ["microsoft-edge-dev","microsoft-edge"]
-# edges = [edge.casefold() for edge in edges]
-# edgeStr = "|".join(str(x) for x in edges)
-
 mscodes = ["code","vscodium"]
 codeStr = "|".join(str(x) for x in mscodes)
 
@@ -206,20 +198,9 @@ define_keymap(re.compile("org.gnome.nautilus", re.IGNORECASE),{
 
 # Keybindings for Browsers
 define_keymap(re.compile(browserStr, re.IGNORECASE),{
-    K("RC-Q"): K("RC-Q"),               # Close all browsers Instances
-    K("Super-RC-I"): K("RC-Shift-I"),   # Dev tools
-    K("Super-RC-J"): K("RC-Shift-J"),   # Dev tools
+    K("RC-Q"): K("RC-Q"),          # Close all browsers Instances
 })
 
-# Open preferences in browsers
-define_keymap(re.compile("Firefox", re.IGNORECASE),{
-    K("C-comma"): [K("M-t"), K("o"),K("Enter")],
-})
-define_keymap(re.compile(chromeStr, re.IGNORECASE),{
-    K("C-comma"): [K("M-e"), K("s"),K("Enter")],
-})
-# Opera C-F12
-
 define_keymap(None,{
     K("RC-Space"): K("Alt-F1"),                   # Default SL - Launch Application Menu (gnome/kde)
     K("RC-F3"):K("Super-d"),                      # Default SL - Show Desktop (gnome/kde,eos)

xkeysnail_service.sh

@@ -196,9 +196,6 @@ if [[ $1 == "5" || $1 == "uninstall" || $1 == "Uninstall" ]]; then
 	if [ -f /usr/local/bin/logoff.sh ];then
 		sudo rm /usr/local/bin/logoff.sh
 	fi
-	if [[ $distro == "elementaryos" ]]; then
-		gsettings set io.elementary.terminal.settings natural-copy-paste true
-	fi
 	sudo systemctl daemon-reload
 	# sudo systemctl --state=not-found --all | grep xkeysnail
 	exit 0
@@ -237,10 +234,6 @@ if [[ $distro == 'popos' ]]; then
 	fi
 fi
 
-if [[ $distro == "elementaryos" ]]; then
-	gsettings set io.elementary.terminal.settings natural-copy-paste false
-fi
-
 if ! [ -x "$(command -v xhost)" ] || ! [ -x "$(command -v gcc)" ]; then
 	if [ "$distro" == "manjarolinux" ]; then
 		sudo ./system-config/unipkg.sh "xorg-xhost gcc"