summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.config/rofi/config.rasi2
-rwxr-xr-x.root/etc/profile.d/proxy.sh6
2 files changed, 7 insertions, 1 deletions
diff --git a/.config/rofi/config.rasi b/.config/rofi/config.rasi
index fcceafe..6b4a3da 100644
--- a/.config/rofi/config.rasi
+++ b/.config/rofi/config.rasi
@@ -2,7 +2,7 @@ configuration {
show-icons: true;
terminal: "sakura";
- modi: "combi,drun,window,ssh";
+ modi: "combi,ssh,drun,window";
combi-modes: "window,drun";
combi-display-format: "{text}";
diff --git a/.root/etc/profile.d/proxy.sh b/.root/etc/profile.d/proxy.sh
index b6bbc45..997ea5d 100755
--- a/.root/etc/profile.d/proxy.sh
+++ b/.root/etc/profile.d/proxy.sh
@@ -17,6 +17,10 @@ function proxy-enable() {
gsettings set org.gnome.system.proxy.$i port 2080
done
+ # git
+ git config --global http.proxy 127.0.0.1:2080
+ git config --global https.proxy 127.0.0.1:2080
+
export PROXY_ON_JCG=true
echo "proxy enabled"
}
@@ -26,6 +30,8 @@ function proxy-disable() {
unset HTTP_PROXY FTP_PROXY HTTPS_PROXY http_proxy ftp_proxy https_proxy
export -n HTTP_PROXY FTP_PROXY HTTPS_PROXY http_proxy ftp_proxy https_proxy
gsettings reset org.gnome.system.proxy mode
+ git config --global --unset http.proxy
+ git config --global --unset https.proxy
unset PROXY_ON_JCG
echo "proxy disabled"