diff --git a/README.md b/README.md index 85bd840..e79949f 100755 --- a/README.md +++ b/README.md @@ -5,11 +5,7 @@ A collection of my personal dotfiles. Here's a little preview of what it can loo ### Current desktop -![fantasy](https://i.imgur.com/6uj1Jvu.jpg?1) - -### ncmpcpp + cava + lyvi - -![ncmpcpp + cava + lyvi](https://i.imgur.com/NMQfpGx.jpg?1) +![vaporwave / A E S T H E T I C](https://i.imgur.com/PSNlFjO.jpg?1) #### Previous themes @@ -107,9 +103,3 @@ manually change its name so GNU Stow can create the symlink. My recommendation i to rename it: mv ~/.gitconfig ~/.gitconfig.old - -## More images - -![fantasy](https://i.imgur.com/x4PsBli.jpg?1) -![rofi](https://i.imgur.com/iyTeGbx.jpg?1) -![betterlockscreen](https://i.imgur.com/TPRfiOu.jpg) diff --git a/dunst/.config/dunst/dunstrc b/dunst/.config/dunst/dunstrc index 89c7b6a..441eba3 100755 --- a/dunst/.config/dunst/dunstrc +++ b/dunst/.config/dunst/dunstrc @@ -4,7 +4,7 @@ # [global] - font = TamzenForPowerline 12 + font = Tamzen 12 # Allow a small subset of html markup: # bold diff --git a/i3/.config/polybar/bars/bottom.conf b/i3/.config/polybar/bars/bottom.conf index 2daa064..4682284 100644 --- a/i3/.config/polybar/bars/bottom.conf +++ b/i3/.config/polybar/bars/bottom.conf @@ -1,12 +1,15 @@ [bar/bottom] locale = pt_BR.utf8 margin-top = 5 -padding-right = 2 +padding-right = 5 padding-left = 2 width = 100% -height = 32 +height = 30 +border-bottom-size = 20 +border-left-size = 0 +border-right-size = 0 -font-0 = "TamzenForPowerline:pixelsize=14;2" +font-0 = "Tamzen:pixelsize=14;2" font-1 = "Iosevka Nerd Font:antialias=false:size=12;2" dpi = 96 @@ -14,5 +17,4 @@ bottom = true background = ${colors.background} foreground = ${colors.foreground} modules-right = mpd -modules-left = hostname -modules-center = date +modules-left = crypto diff --git a/i3/.config/polybar/bars/top-right.conf b/i3/.config/polybar/bars/top-right.conf deleted file mode 100644 index 0ebf5b6..0000000 --- a/i3/.config/polybar/bars/top-right.conf +++ /dev/null @@ -1,29 +0,0 @@ - -[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/bars/top-left.conf b/i3/.config/polybar/bars/top.conf similarity index 68% rename from i3/.config/polybar/bars/top-left.conf rename to i3/.config/polybar/bars/top.conf index 9463aa7..906e44c 100644 --- a/i3/.config/polybar/bars/top-left.conf +++ b/i3/.config/polybar/bars/top.conf @@ -1,15 +1,15 @@ -[bar/top-left] +[bar/top] locale = pt_BR.utf8 -width = 203 +width = 90% height = 30 border-size = 0 border-top-size = 20 -border-left-size = 20 +border-left-size = 200 border-right-size = 0 border-bottom-size = 0 -radius-top = 6.0 -radius-bottom = 6.0 +radius-top = 0 +radius-bottom = 0 line-size = 2 spacing = 1 offset-x = 0 @@ -17,7 +17,7 @@ offset-y = 0 padding-left = 0 padding-right = 2 -font-0 = "TamzenForPowerline:pixelsize=14;2" +font-0 = "Tamzen:pixelsize=14;2" font-1 = "Iosevka Nerd Font:antialias=false:size=10;2" dpi = 96 @@ -26,3 +26,5 @@ foreground = ${colors.foreground} module-margin-left = 2 module-margin-right = 0 modules-left = i3 +modules-center = date +modules-right = volume wlan ip battery powermenu diff --git a/i3/.config/polybar/config b/i3/.config/polybar/config index f0ffb31..b902174 100755 --- a/i3/.config/polybar/config +++ b/i3/.config/polybar/config @@ -1,6 +1,5 @@ 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/top.conf include-file = /home/edbizarro/.config/polybar/bars/bottom.conf [module/crypto] @@ -28,31 +27,27 @@ enable-click = true fuzzy-match = true wrapping-scroll = false strip-wsnumbers = true -pin-workspaces = true +pin-workspaces = false 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 = 2 -label-unfocused-underline = ${colors.background} label-urgent = %icon% label-urgent-background = ${colors.background} label-urgent-foreground = ${colors.foreground-alt} 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 = 2 -label-visible-underline = ${colors.background} ws-icon-default =  diff --git a/i3/.config/polybar/crypto-config b/i3/.config/polybar/crypto-config index 73e61a9..9548e63 100755 --- a/i3/.config/polybar/crypto-config +++ b/i3/.config/polybar/crypto-config @@ -2,12 +2,12 @@ base_currency = USD display = percentage -[ripple] -icon = XRP - [nano] icon = NANO +[ripple] +icon = XRP + [stellar] icon = XLM @@ -17,5 +17,5 @@ icon = TRX [vechain] icon = VEN -[cardano] -icon = ADA +[golem] +icon = GNT diff --git a/i3/.config/polybar/global.conf b/i3/.config/polybar/global.conf index 9f93cf0..06d81c9 100644 --- a/i3/.config/polybar/global.conf +++ b/i3/.config/polybar/global.conf @@ -7,9 +7,9 @@ compositing-border = over screenchange-reload = true [colors] -background = ${xrdb:color7} -background-alt = ${xrdb:color6} -foreground = ${xrdb:color0} +background = ${xrdb:color5} +background-alt = ${xrdb:color1} +foreground = #ffffff foreground-alt = ${xrdb:color0} primary = ${xrdb:color5} secondary = ${xrdb:color12} diff --git a/i3/.i3/config b/i3/.i3/config index 5a9f406..945e1f7 100755 --- a/i3/.i3/config +++ b/i3/.i3/config @@ -2,6 +2,25 @@ set $mod Mod1 # set $monitor HDMI1 # external screen, they are set here to make it easier to move to new setups + +# Set colors from Xresources +# Change 'color7' and 'color2' to whatever colors you want i3 to use +# from the generated scheme. +# NOTE: The '#f0f0f0' in the lines below is the color i3 will use if +# it fails to get colors from Xresources. +set_from_resource $fg i3wm.color5 #f0f0f0 +set_from_resource $bg i3wm.color6 #1DFAFF + +# class border backgr. text indicator child_border +client.focused $bg $bg $fg $bg $bg +client.focused_inactive $bg $bg $fg $bg $bg +client.unfocused $bg $bg $fg $bg $bg +client.urgent $bg $bg $fg $bg $bg +client.placeholder $bg $bg $fg $bg $bg + +client.background $bg + + ########## i3-gaps integration ########## for_window [class="^.*"] border pixel 0 @@ -14,7 +33,7 @@ for_window [class="(?i)gitk"] floating enable gaps inner 15 gaps outer 5 -smart_borders on +smart_borders no_gaps new_window none # use Mouse+$mod to drag floating windows to their wanted position @@ -131,16 +150,18 @@ bindsym $mod+Shift+a exec --no-startup-id wal -i ~/Imagens/Wallpapers -q # exec_always --no-startup-id xrandr --output eDP-1 --primary --preferred # exec_always --no-startup-id xrandr --output HDMI-1 --primary --preferred --left-of eDP-1 -exec_always --no-startup-id betterlockscreen -u ~/Imagens/Wallpapers/vaporware +exec_always --no-startup-id xrdb -merge ~/.Xresources +exec --no-startup-id betterlockscreen -u ~/Imagens/Wallpapers/vaporwave/car-02.jpg +exec_always --no-startup-id wal -i ~/Imagens/Wallpapers/vaporwave/car-02.jpg -a "98" exec_always --no-startup-id $HOME/.i3/startup/mons.sh 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 $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 +# exec --no-startup-id rmmod pcspkr # Ncmpcpp bindsym $mod+Shift+n exec --no-startup-id urxvt -name 'ncmpcpp' -e ncmpcpp @@ -160,6 +181,7 @@ bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume 0 +10% bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume 0 -10% #Assigns +assign [class="URxvt"] 1 assign [class="(?i)chrome"] 2 assign [class="(?i)atom"] 3 assign [class="(?i)pstorm"] 3 diff --git a/i3/.i3/startup/polybar.sh b/i3/.i3/startup/polybar.sh index 9255dfe..dc7adaf 100755 --- a/i3/.i3/startup/polybar.sh +++ b/i3/.i3/startup/polybar.sh @@ -8,6 +8,4 @@ while pgrep -x polybar >/dev/null; do sleep 1; done # Launch polybar polybar bottom -r& -polybar top-left -r& -polybar top-center -r& -polybar top-right -r& +polybar top -r& diff --git a/xresources/.Xresources b/xresources/.Xresources index f4d137e..5d7c000 100755 --- a/xresources/.Xresources +++ b/xresources/.Xresources @@ -10,9 +10,9 @@ rofi.line-margin: 20 rofi.fullscreen: true rofi.color-enabled: true rofi.color-window: argb:DA222222, argb:DA222222, argb:00222222 -rofi.color-normal: argb:00000000, #e8e8e8, argb:00000000, argb:00000000, #e29a49 -rofi.color-urgent: argb:00000000, #f43753, argb:00000000, argb:00000000, #e29a49 -rofi.color-active: argb:00000000, #49bbfb, argb:00000000, argb:00000000, #e29a49 +rofi.color-normal: argb:00000000, #e8e8e8, argb:00000000, argb:00000000, #E918D8 +rofi.color-urgent: argb:00000000, #E918D8, argb:00000000, argb:00000000, #e29a49 +rofi.color-active: argb:00000000, #E918D8, argb:00000000, argb:00000000, #e29a49 rofi.font: TamzenForPowerline 14 rofi.eh: 2 rofi.separator-style: solid @@ -64,8 +64,8 @@ URxvt.perl-ext-common: !! Fonts -URxvt.font: xft:TamzenForPowerline:size=14 -URxvt*boldFont: xft:TamzenForPowerline:size=14 +URxvt.font: xft:Tamzen:size=16 +URxvt*boldFont: xft:Tamzen:size=16 URxvt.allow_bold: false URxvt*boldMode: true ! Fix font space @@ -82,15 +82,6 @@ URxvt.cursorUnderline: false ! Pointer URxvt.pointerBlank: false -! +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -! title Nord XResources + -! project nord-xresources + -! version 0.1.0 + -! repository https://github.com/arcticicestudio/nord-xresources + -! author Arctic Ice Studio + -! email development@arcticicestudio.com + -! copyright Copyright (C) 2016 + -! +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ #define nord0 #2E3440 #define nord1 #3B4252 #define nord2 #434C5E @@ -109,15 +100,15 @@ URxvt.pointerBlank: false #define nord15 #B48EAD *.foreground: nord4 -*.background: nord0 -*.cursorColor: nord4 +*.background: #ff71ce +*.cursorColor: #01cdfe -*.color0: nord1 -*.color1: nord11 -*.color2: nord14 -*.color3: nord13 -*.color4: nord9 -*.color5: nord15 +*.color0: nord0 +*.color1: #ff71ce +*.color2: #01cdfe +*.color3: #05ffa1 +*.color4: #b967ff +*.color5: #fffb96 *.color6: nord8 *.color7: nord5 *.color8: nord3 diff --git a/zsh/configs/.zpreztorc b/zsh/configs/.zpreztorc index 3ea9a3f..f0c01fc 100755 --- a/zsh/configs/.zpreztorc +++ b/zsh/configs/.zpreztorc @@ -13,6 +13,7 @@ zstyle ':prezto:load' pmodule \ 'ssh' \ 'docker' \ 'pacman' \ + 'python' \ 'tmux' \ 'completion' \ 'syntax-highlighting' \ @@ -21,6 +22,7 @@ zstyle ':prezto:load' pmodule \ 'prompt' \ 'fasd' +zstyle ':prezto:module:python:virtualenv' auto-switch 'yes' zstyle ':prezto:module:prompt' theme 'pure' zstyle ':prezto:module:prompt' pwd-length 'short' zstyle ':prezto:module:ssh:load' identities 'id_rsa' diff --git a/zsh/configs/.zprofile b/zsh/configs/.zprofile index cbda023..1321ca8 100755 --- a/zsh/configs/.zprofile +++ b/zsh/configs/.zprofile @@ -5,7 +5,7 @@ fi typeset -gU cdpath fpath mailpath path path=( - /usr/local/{bin,sbin} + /usr/local/{bin,sbin} $path ) diff --git a/zsh/configs/.zshenv b/zsh/configs/.zshenv index 160497c..6d373ae 100755 --- a/zsh/configs/.zshenv +++ b/zsh/configs/.zshenv @@ -1,3 +1,3 @@ if [[ "$SHLVL" -eq 1 && ! -o LOGIN && -s "${ZDOTDIR:-$HOME}/.zprofile" ]]; then source "${ZDOTDIR:-$HOME}/.zprofile" -fi +fi \ No newline at end of file diff --git a/zsh/exports/01-pyenv.zsh b/zsh/exports/01-pyenv.zsh new file mode 100644 index 0000000..7d99938 --- /dev/null +++ b/zsh/exports/01-pyenv.zsh @@ -0,0 +1,2 @@ +export PYENV_ROOT=$HOME/.pyenv +export PATH=$PYENV_ROOT/bin:$PATH \ No newline at end of file diff --git a/zsh/exports/airflow.zsh b/zsh/exports/airflow.zsh new file mode 100644 index 0000000..2d2cd76 --- /dev/null +++ b/zsh/exports/airflow.zsh @@ -0,0 +1 @@ +export AIRFLOW_GPL_UNIDECODE=yes \ No newline at end of file diff --git a/zsh/exports/composer.zsh b/zsh/exports/composer.zsh index 0ddccb5..b3c159d 100644 --- a/zsh/exports/composer.zsh +++ b/zsh/exports/composer.zsh @@ -1 +1 @@ -export PATH=$PATH:$A_COMPOSER/vendor/bin +export PATH=$PATH:$A_COMPOSER/vendor/bin \ No newline at end of file diff --git a/zsh/exports/local.zsh b/zsh/exports/local.zsh new file mode 100644 index 0000000..11d60a2 --- /dev/null +++ b/zsh/exports/local.zsh @@ -0,0 +1 @@ +export PATH=$PATH:/home/edbizarro/.local/bin \ No newline at end of file diff --git a/zsh/exports/pipenv.zsh b/zsh/exports/pipenv.zsh new file mode 100644 index 0000000..4dc4d71 --- /dev/null +++ b/zsh/exports/pipenv.zsh @@ -0,0 +1 @@ +export PATH=$PATH:/home/edbizarro/.local/bin/pipenv \ No newline at end of file