From 8d85bd63dad3a821a481c4ceec76ae3e48a04a37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?=
 <geoffrey@frogeye.fr>
Date: Sat, 30 May 2020 12:07:23 +0200
Subject: [PATCH] Macarena

---
 config/git/.gitignore     |  1 +
 config/git/gitk           | 63 ---------------------------------------
 config/scripts/bsh        | 13 ++++----
 config/scripts/pushToTalk |  1 +
 4 files changed, 7 insertions(+), 71 deletions(-)
 create mode 100644 config/git/.gitignore
 delete mode 100644 config/git/gitk

diff --git a/config/git/.gitignore b/config/git/.gitignore
new file mode 100644
index 0000000..f5fff02
--- /dev/null
+++ b/config/git/.gitignore
@@ -0,0 +1 @@
+gitk
diff --git a/config/git/gitk b/config/git/gitk
deleted file mode 100644
index 47260ff..0000000
--- a/config/git/gitk
+++ /dev/null
@@ -1,63 +0,0 @@
-set mainfont {sans 9}
-set textfont {monospace 9}
-set uifont {sans 9 bold}
-set tabstop 8
-set findmergefiles 0
-set maxgraphpct 50
-set maxwidth 16
-set cmitmode patch
-set wrapcomment none
-set autoselect 1
-set autosellen 40
-set showneartags 1
-set maxrefs 20
-set visiblerefs {"master"}
-set hideremotes 0
-set showlocalchanges 1
-set datetimeformat {%Y-%m-%d %H:%M:%S}
-set limitdiffs 1
-set uicolor grey85
-set want_ttk 1
-set bgcolor white
-set fgcolor black
-set uifgcolor black
-set uifgdisabledcolor #999
-set colors {"#00ff00" red blue magenta darkgrey brown orange}
-set diffcolors {red "#00a000" blue}
-set mergecolors {red blue "#00ff00" purple brown "#009090" magenta "#808000" "#009000" "#ff0080" cyan "#b07070" "#70b0f0" "#70f0b0" "#f0b070" "#ff70b0"}
-set markbgcolor #e0e0ff
-set diffcontext 3
-set selectbgcolor gray85
-set foundbgcolor yellow
-set currentsearchhitbgcolor orange
-set extdifftool meld
-set perfile_attrs 0
-set headbgcolor #00ff00
-set headfgcolor black
-set headoutlinecolor black
-set remotebgcolor #ffddaa
-set tagbgcolor yellow
-set tagfgcolor black
-set tagoutlinecolor black
-set reflinecolor black
-set filesepbgcolor #aaaaaa
-set filesepfgcolor black
-set linehoverbgcolor #ffff80
-set linehoverfgcolor black
-set linehoveroutlinecolor black
-set mainheadcirclecolor yellow
-set workingfilescirclecolor red
-set indexcirclecolor #00ff00
-set circlecolors {white blue gray blue blue}
-set linkfgcolor blue
-set circleoutlinecolor black
-set web_browser xdg-open
-set geometry(main) 1280x956+1920+18
-set geometry(state) normal
-set geometry(topwidth) 1280
-set geometry(topheight) 225
-set geometry(pwsash0) "931 1"
-set geometry(pwsash1) "971 1"
-set geometry(botwidth) 951
-set geometry(botheight) 726
-set permviews {}
diff --git a/config/scripts/bsh b/config/scripts/bsh
index 2792e61..7d39b62 100755
--- a/config/scripts/bsh
+++ b/config/scripts/bsh
@@ -1,17 +1,13 @@
 #!/usr/bin/env bash
 
 # TODO Do not dupplicate trimmed.bash
-# TODO Remove comments
-# TODO Do not remove unless last one
 
 CACHE_DIR="${XDG_CACHE_DIR:-$HOME/.cache}/bsh"
 FOLDER_NAME="geoffrey"
 
 
 mkdir -p "$CACHE_DIR"
-# TODO Update when needed
-# if [ ! -f "${CACHE_DIR}/cmd" ]
-if true
+if [ ! -f "${CACHE_DIR}/cmd" ]
 then
     # Preparation
     WORK="${CACHE_DIR}/${FOLDER_NAME}"
@@ -20,9 +16,9 @@ then
     mkdir "$WORK"
 
     # Copying files
-    cp ~/.config/shell/trimmed.bash "${WORK}/.bashrc"
-    cp ~/.config/inputrc "${WORK}/.inputrc"
-    cp ~/.config/vim/vimconfig.vim "${WORK}/.vimrc"
+    grep -o '^[^#]*' ~/.config/shell/trimmed.bash > "${WORK}/.bashrc"
+    grep -o '^[^#]*' ~/.config/inputrc > "${WORK}/.inputrc"
+    grep -o '^[^"]*' ~/.config/vim/vimconfig.vim > "${WORK}/.vimrc"
     mkdir -p "${WORK}/terminfo/${TERM:0:1}"
     cp ~/".config/terminfo/${TERM:0:1}/${TERM}" "${WORK}/terminfo/${TERM:0:1}/${TERM}"
 
@@ -38,6 +34,7 @@ then
     echo "echo '$b64' | base64 -d | tar xzf - -C /tmp" > "${CACHE_DIR}/cmd"
     echo "bash --rcfile ${DEST}/.bashrc" >> "${CACHE_DIR}/cmd"
     echo "rm -rf ${DEST}" >> "${CACHE_DIR}/cmd"
+    # TODO Do not remove unless last one connected
 
     # Cleanup
     # rm -rf "$WORK"
diff --git a/config/scripts/pushToTalk b/config/scripts/pushToTalk
index 58190bb..bd2dff3 100755
--- a/config/scripts/pushToTalk
+++ b/config/scripts/pushToTalk
@@ -41,6 +41,7 @@ def record_callback(reply):
         if event.type in [X.KeyPress, X.KeyRelease]:
             keysym = local_dpy.keycode_to_keysym(event.detail, 0)
 
+            print(KEY)
             if keysym == KEY:
                 mute(event.type == X.KeyRelease)