Merge branch 'master' of https://github.com/mastermindzh/dotfiles

config/.gitconfig

@@ -12,3 +12,5 @@
 [core]
 	autocrlf = input
 	editor = nano
+[pull]
+	rebase = false

config/gtk-3.0/settings.ini

@@ -1,7 +1,7 @@
 gtk-application-prefer-dark-theme=0
 gtk-theme-name=Arc
 gtk-icon-theme-name=Numix
-gtk-font-name=System San Francisco Display 12
+gtk-font-name=Liberation Sans 12
 gtk-cursor-theme-name=Breeze
 gtk-cursor-theme-size=0
 gtk-toolbar-style=GTK_TOOLBAR_BOTH
@@ -13,4 +13,4 @@ gtk-enable-input-feedback-sounds=1
 gtk-xft-antialias=1
 gtk-xft-hinting=1
 gtk-xft-hintstyle=hintfull
-gtk-xft-rgba=rgb
+gtk-xft-rgba=rgb

config/picom.conf

@@ -0,0 +1,6 @@
+#################################
+#   Transparency / Opacity      #
+#################################
+
+# Opacity of inactive windows. (0.1 - 1.0)
+inactive-opacity = 1.0;

config/rofi

@@ -9,4 +9,4 @@ rofi.font: monospace 10
 
 rofi.terminal:             xfce4-terminal
 rofi.ssh-client:           ssh
-rofi.ssh-command:          {terminal} -e "{ssh-client} {host}"
+rofi.ssh-command:          {terminal} -e "{ssh-client} {host}"