Merge pull request #7 from edbizarro/fantasy

Fantasy
edbizarro · Apr 23, 2018 · a144976 · a144976
2 parents 6341aca + 393519e
commit a144976
Show file tree

Hide file tree

Showing 10 changed files with 160 additions and 111 deletions.
diff --git a/README.md b/README.md
@@ -3,14 +3,13 @@ dotfiles
 
 A collection of my personal dotfiles. Here's a little preview of what it can look like:
 
-#### Current desktop
-![calm your mind](https://raw.githubusercontent.com/edbizarro/dotfiles/master/images/hpU8llo%20-%20Imgur.jpg)
+### Current desktop
 
-#### Another colorscheme, generated with [pywal](https://github.com/dylanaraps/pywal)
-![neofetch](https://i.imgur.com/jDNX1R2.jpg?1)
+![fantasy](https://i.imgur.com/6uj1Jvu.jpg?1)
 
-#### ncmpcpp + cava + lyvi + bum
-![ncmpcpp + cava + lyvi + bum](https://i.imgur.com/DfYOiQj.jpg?1)
+### ncmpcpp + cava + lyvi
+
+![ncmpcpp + cava + lyvi](https://i.imgur.com/NMQfpGx.jpg?1)
 
 ### Requirements
 
@@ -48,7 +47,7 @@ A collection of my personal dotfiles. Here's a little preview of what it can loo
    * [proggyfonts](https://proggyfonts.net/download/) (Monospaced Bitmap Fonts)
    * [scientifica](https://github.com/NerdyPepper/scientifica)
    * [bitmap fonts](https://github.com/Tecate/bitmap-fonts) (A collection of monospaced bitmap fonts)
- 
+
 
 Installation
 ------------
@@ -108,10 +107,5 @@ to rename it:
 
 ## More images
 
-![screenshot](https://i.imgur.com/py8z9vu.jpg?1)
-
-![ncmpcpp + cava + lyvi](https://i.imgur.com/qnFUcZf.jpg?1)
-
-![ncmpcpp + cava + lyvi](https://i.imgur.com/bkBdLBy.jpg?1)
-
-![ncmpcpp + cava + lyvi](https://i.imgur.com/m0vQhJY.jpg?1)
+![fantasy](https://i.imgur.com/x4PsBli.jpg?1)
+![rofi](https://i.imgur.com/iyTeGbx.jpg?1)
diff --git a/compton/.config/compton.conf b/compton/.config/compton.conf
@@ -4,6 +4,24 @@ shadow = true;
 no-dnd-shadow = true;
 no-dock-shadow = false;
 clear-shadow = true;
+<<<<<<< HEAD
+shadow-radius = 5;
+shadow-offset-x = -7;
+shadow-offset-y = -7;
+# shadow-opacity = 0.7;
+# shadow-red = 0.0;
+# shadow-green = 0.0;
+# shadow-blue = 0.0;
+shadow-exclude = [
+    "name = 'Notification'",
+    "class_g = 'Conky'",
+    "class_g ?= 'Notify-osd'",
+    "class_g = 'Cairo-clock'",
+    "_GTK_FRAME_EXTENTS@:c",
+    "name = 'Screenshot'",
+    "class_g = 'Escrotum'"
+];
+=======
 shadow-radius = 7;
 shadow-offset-x = -7;
 shadow-offset-y = -7;
@@ -24,10 +42,12 @@ shadow-exclude = [
 	"_GTK_FRAME_EXTENTS@:c"
 ];
 
+>>>>>>> master
 # shadow-exclude = "n:e:Notification";
 # shadow-exclude-reg = "x10+0+0";
 # xinerama-shadow-crop = true;
 
+
 # Opacity
 #menu-opacity = 0.9;
 #inactive-opacity = 0.8;
@@ -38,6 +58,20 @@ shadow-exclude = [
 # inactive-dim = 0.2;
 # inactive-dim-fixed = true;
 #blur-background = true;
+<<<<<<< HEAD
+#blur-kern = "7x7box";
+# blur-kern = "5,5,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1";
+blur-background-exclude = [
+	"name = 'panel_overlay'",
+	"window_type = 'window'",
+	"window_type = 'dock'",
+	"window_type = 'desktop'",
+#	"window_type = 'bar'",
+	"_GTK_FRAME_EXTENTS@:c"
+];
+
+opacity-rule = [ "95:class_g = 'URxvt'" ];
+=======
 #blur-background-frame = true;
 #blur-kern = "3x3box"
 # blur-kern = "5,5,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1"
@@ -50,6 +84,7 @@ shadow-exclude = [
 #opacity-rule = [ 
 #        "95:class_g= 'Polybar'"
 #        ];
+>>>>>>> master
 
 # Fading
 fading = true;

diff --git a/i3/.config/polybar/bars/bottom.conf b/i3/.config/polybar/bars/bottom.conf
@@ -0,0 +1,18 @@
+[bar/bottom]
+locale = pt_BR.utf8
+margin-top = 5
+padding-right = 2
+padding-left = 2
+width = 100%
+height = 32
+
+font-0 = "TamzenForPowerline:pixelsize=14;2"
+font-1 = "Iosevka Nerd Font:antialias=false:size=12;2"
+dpi = 96
+
+bottom = true
+background = ${colors.background}
+foreground = ${colors.foreground}
+modules-right = mpd
+modules-left = hostname
+modules-center = date
diff --git a/i3/.config/polybar/bars/top-left.conf b/i3/.config/polybar/bars/top-left.conf
@@ -0,0 +1,28 @@
+
+[bar/top-left]
+locale = pt_BR.utf8
+width = 203
+height = 30
+border-size = 0
+border-top-size = 20
+border-left-size = 20
+border-right-size = 0
+border-bottom-size = 0
+radius-top = 6.0
+radius-bottom = 6.0
+line-size = 2
+spacing = 1
+offset-x = 0
+offset-y = 0
+padding-left = 0
+padding-right = 2
+
+font-0 = "TamzenForPowerline:pixelsize=14;2"
+font-1 = "Iosevka Nerd Font:antialias=false:size=10;2"
+dpi = 96
+
+background = ${colors.background}
+foreground = ${colors.foreground}
+module-margin-left = 2
+module-margin-right = 0
+modules-left = i3
diff --git a/i3/.config/polybar/bars/top-right.conf b/i3/.config/polybar/bars/top-right.conf
@@ -0,0 +1,29 @@
+
+[bar/top-right]
+locale = pt_BR.utf8
+width = 44%
+height = 30
+border-size = 0
+border-top-size = 0
+border-left-size = 300
+border-right-size = 20
+border-bottom-size = 0
+radius-top = 6.0
+radius-bottom = 6.0
+line-size = 2
+spacing = 1
+offset-x = 56%
+offset-y = 20
+padding-left = 0
+padding-right = 2
+
+font-0 = "TamzenForPowerline:pixelsize=14;2"
+font-1 = "Iosevka Nerd Font:antialias=false:size=10;2"
+dpi = 96
+
+background = ${colors.background}
+foreground = ${colors.foreground}
+module-margin-left = 2
+module-margin-right = 0
+modules-right = volume wlan ip battery powermenu
+override-redirect = true
diff --git a/i3/.config/polybar/config b/i3/.config/polybar/config
@@ -1,78 +1,7 @@
-[settings]
-compositing-background = over
-compositing-foreground = over
-compositing-overline = over
-compositing-underline = over
-compositing-border = over
-screenchange-reload = true
-
-[colors]
-background = #000d0d0d
-background-alt = #300fdfdfd
-foreground = ${xrdb:foreground}
-foreground-alt = ${xrdb:foreground}
-primary = ${xrdb:color5}
-secondary = ${xrdb:color12}
-alert = ${xrdb:color1}
-border = ${xrdb:color2}
-
-[global/wm]
-margin-top = 0
-margin-bottom = 0
-fixed-center = true
-override-redirect = true
-
-
-[bar/top]
-locale = pt_BR.utf8
-width = 100%
-height = 30
-border-size = 0
-border-top-size = 0
-border-left-size = 0
-border-right-size = 0
-border-bottom-size = 0
-radius = 0
-line-size = 2
-spacing = 1
-offset-x = 0
-offset-y = 0
-padding-left = 0
-padding-right = 2
-
-font-0 = "TamzenForPowerline:pixelsize=14;3"
-font-1 = "Iosevka Nerd Font:antialias=false:size=10;3"
-font-2 = "Iosevka Nerd Font:antialias=false:size=14;3"
-dpi = 96
-
-background = ${colors.background}
-foreground = ${colors.foreground}
-module-margin-left = 2
-module-margin-right = 0
-modules-left = i3
-modules-center = date weather
-modules-right = volume wlan ip battery powermenu
-
-
-[bar/bottom]
-locale = pt_BR.utf8
-margin-top = 5
-padding-right = 2
-padding-left = 2
-width = 100%
-height = 32
-
-font-0 = "TamzenForPowerline:pixelsize=14;3"
-font-1 = "Iosevka Nerd Font:antialias=false:size=10;3"
-font-2 = "Iosevka Nerd Font:antialias=false:size=14;3"
-dpi = 96
-
-bottom = true
-background = ${colors.background}
-foreground = ${colors.foreground}
-modules-right = mpd
-modules-left = hostname
-modules-center =
+include-file = /home/edbizarro/.config/polybar/global.conf
+include-file = /home/edbizarro/.config/polybar/bars/top-left.conf
+include-file = /home/edbizarro/.config/polybar/bars/top-right.conf
+include-file = /home/edbizarro/.config/polybar/bars/bottom.conf
 
 [module/crypto]
 type = custom/script
@@ -101,39 +30,31 @@ wrapping-scroll = false
 strip-wsnumbers = true
 pin-workspaces = true
 
-label-focused = %icon%
-label-focused-background = ${colors.background}
-label-focused-foreground = ${colors.foreground}
-label-focused-padding = 3
+label-focused = 
+label-focused-background = ${colors.foreground}
+label-focused-foreground = ${colors.background}
+label-focused-padding = 2
 label-focused-underline = ${colors.foreground-alt}
 
 label-unfocused = %icon%
 label-unfocused-background = ${colors.background}
 label-unfocused-foreground = ${colors.background-alt}
-label-unfocused-padding = 3
+label-unfocused-padding = 2
 label-unfocused-underline = ${colors.background}
 
 label-urgent = %icon%
 label-urgent-background = ${colors.background}
 label-urgent-foreground = ${colors.foreground-alt}
-label-urgent-padding = 3
+label-urgent-padding = 2
 label-urgent-underline = ${colors.background}
 
 label-visible = %icon%
 label-visible-background = ${colors.background}
 label-visible-foreground = ${colors.foreground}
-label-visible-padding = 3
+label-visible-padding = 2
 label-visible-underline = ${colors.background}
 
-ws-icon-0 = 1;
-ws-icon-1 = 2;
-ws-icon-2 = 3;
-ws-icon-3 = 4;
-ws-icon-4 = 5;
-ws-icon-5 = 6;
-ws-icon-6 = 7;
-ws-icon-7 = 8;
-ws-icon-default =
+ws-icon-default = 
 
 [module/mpd]
 type = internal/mpd
@@ -205,7 +126,7 @@ date-alt = "%d/%m/%y"
 time = "%H:%M"
 time-alt = %H:%M
 
-label = %date% %time%
+label = "  %date% %time%"
 
 [module/volume]
 type = internal/volume

diff --git a/i3/.config/polybar/global.conf b/i3/.config/polybar/global.conf
@@ -0,0 +1,23 @@
+[settings]
+compositing-background = over
+compositing-foreground = over
+compositing-overline = over
+compositing-underline = over
+compositing-border = over
+screenchange-reload = true
+
+[colors]
+background = ${xrdb:color7}
+background-alt = ${xrdb:color6}
+foreground = ${xrdb:color0}
+foreground-alt = ${xrdb:color0}
+primary = ${xrdb:color5}
+secondary = ${xrdb:color12}
+alert = ${xrdb:color1}
+border = ${xrdb:color2}
+
+[global/wm]
+margin-top = 0
+margin-bottom = 0
+fixed-center = true
+override-redirect = true
diff --git a/i3/.i3/config b/i3/.i3/config
@@ -21,7 +21,6 @@ new_window none
 floating_modifier $mod
 
 # start a terminal
-# bindsym $mod+Return exec urxvtc -c "/usr/bin/zsh" -i -t -e sh
 bindsym $mod+Shift+Return exec --no-startup-id urxvt -e /usr/bin/zsh
 
 # kill focused window
@@ -134,14 +133,14 @@ bindsym $mod+Shift+a exec --no-startup-id wal -i ~/Imagens/Wallpapers -q
 
 exec_always --no-startup-id betterlockscreen -u ~/Imagens/Wallpapers/vaporware
 exec_always --no-startup-id $HOME/.i3/startup/mons.sh
-exec --no-startup-id rmmod pcspkr
 exec_always --no-startup-id $HOME/.i3/startup/compton.sh
 exec --no-startup-id dunst -config $HOME/.config/dunst/dunstrc
 exec_always --no-startup-id $HOME/.i3/startup/mopidy.sh
 exec_always --no-startup-id xrdb ~/.Xresources
 exec_always --no-startup-id $HOME/.i3/startup/polybar.sh
 exec --no-startup-id xset -dpms
 exec --no-startup-id xset s off
+exec --no-startup-id rmmod pcspkr
 
 # Ncmpcpp
 bindsym $mod+Shift+n exec --no-startup-id urxvt -name 'ncmpcpp' -e ncmpcpp

diff --git a/i3/.i3/startup/compton.sh b/i3/.i3/startup/compton.sh
@@ -7,4 +7,4 @@ killall -q compton
 while pgrep -x compton >/dev/null; do sleep 1; done
 
 # Launch compton
-compton --config  ~/.config/compton.conf -cCFb &
+compton --config  ~/.config/compton.conf -b &
diff --git a/i3/.i3/startup/polybar.sh b/i3/.i3/startup/polybar.sh
@@ -7,5 +7,7 @@ killall -q polybar
 while pgrep -x polybar >/dev/null; do sleep 1; done
 
 # Launch polybar
-polybar bottom&
-polybar top&
+polybar bottom -r&
+polybar top-left -r&
+polybar top-center -r&
+polybar top-right -r&