From 578f37fda0149d1765080fa9e8f8d5ca63e70d98 Mon Sep 17 00:00:00 2001 From: CramMK Date: Sat, 29 Feb 2020 15:41:33 +0100 Subject: [PATCH] Add polybar and change picom Disable picom for now --- README.md | 4 +- config.yaml | 7 ++ config.yaml.0 | 132 -------------------------------------- dotdrop | 2 +- dotfiles/i3/i3 | 46 +++++++------ dotfiles/picom/picom | 27 +++++--- dotfiles/polybar/config | 131 +++++++++++++++++++++++++++++++++++++ dotfiles/polybar/start.sh | 4 ++ 8 files changed, 189 insertions(+), 164 deletions(-) delete mode 100644 config.yaml.0 create mode 100644 dotfiles/polybar/config create mode 100755 dotfiles/polybar/start.sh diff --git a/README.md b/README.md index 0660300..c06143c 100644 --- a/README.md +++ b/README.md @@ -7,12 +7,12 @@ My personal configurations, managed with the 'dotdrop' submodule. | :--- | :--- | | Distribution | Fedora 31 | | Shell | zsh + oh-my-zsh | -| WM | i3 | +| WM | i3 (work), i3-gaps (home) | | Terminal | xterm | | Font | Inconsolata | | VIM-Theme | OneDark | | VIM-Bar | lightline | -| Bar | i3Bar | +| Bar | polybar | | Transparency | picom | | Wallpaper | teh | diff --git a/config.yaml b/config.yaml index f98c7c6..4df0a31 100644 --- a/config.yaml +++ b/config.yaml @@ -54,6 +54,9 @@ dotfiles: d_wallpaper: src: wallpaper dst: ~/.wallpaper + d_polybar: + src: polybar + dst: ~/.config/polybar profiles: laptop: @@ -66,6 +69,7 @@ profiles: - picom - tmux - wallpaper + - polybar work: include: - zsh @@ -111,3 +115,6 @@ profiles: wallpaper: dotfiles: - d_wallpaper + polybar: + dotfiles: + - d_polybar diff --git a/config.yaml.0 b/config.yaml.0 deleted file mode 100644 index 55b6a89..0000000 --- a/config.yaml.0 +++ /dev/null @@ -1,132 +0,0 @@ -actions: - pre: - vundle-install: test -e ~/.vim/bundle/Vundle.vim || (mkdir -p ~/.vim/bundle; git - clone https://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/Vundle.vim ) - vundle-refresh: vim +VundleClean! +VundleInstall +VundleInstall! +qall - font-cache: fc-cache -f -v - xresources-reload: xrdb ~/.Xresources -config: - backup: true - create: true - dotpath: dotfiles -dotfiles: - f_bashrc: - src: bashrc - dst: ~/.bashrc - f_vimrc: - src: vimrc - dst: ~/.vimrc - actions: - - vundle-install - - vundle-refresh - f_xresources: - src: Xresources - dst: ~/.Xresources - actions: - - xresources-reload - f_i3_config: - src: i3_config - dst: ~/.config/i3/config - f_i3status_config: - src: i3status_config - dst: ~/.config/i3status/config - f_xinitrc: - src: xinitrc - dst: ~/.xinitrc - f_zshrc: - src: zshrc - dst: ~/.zshrc - d_oh-my-zsh: - src: oh-my-zsh - dst: ~/.oh-my-zsh - f_zsh_themes: - src: zsh.themes - dst: ~/.oh-my-zsh/themes - d_fonts: - src: fonts - dst: ~/.local/share/fonts - actions: - - font-cache - d_xresources_d: - src: Xresources.d - dst: ~/.Xresources.d - f_picom: - src: picom.conf - dst: ~/.config/picom.conf - f_tmux: - src: tmux.conf - dst: ~/.tmux.conf - d_wallpaper: - src: wallpaper - dst: ~/.wallpaper - f_muttrc: - src: muttrc - dst: ~/.muttrc - d_mutt_themes: - src: mutt.themes - dst: ~/.mutt/mutt.themes -profiles: - laptop: - include: - - zsh - - vim - - x11 - - i3 - - font - - picom - - tmux - - wallpaper - - mutt - work: - include: - - zsh - - vim - - x11 - - i3 - - font - - picom - - tmux - - wallpaper - - mutt - dev: - include: - - zsh - - vim - - # Packages to be used above - bash: - dotfiles: - - f_bashrc - zsh: - dotfiles: - - f_zshrc - - d_oh-my-zsh - - f_zsh_themes - vim: - dotfiles: - - f_vimrc - x11: - dotfiles: - - f_xresources - - f_xinitrc - - d_xresources_d - i3: - dotfiles: - - f_i3_config - - f_i3status_config - font: - dotfiles: - - d_fonts - picom: - dotfiles: - - f_picom - tmux: - dotfiles: - - f_tmux - wallpaper: - dotfiles: - - d_wallpaper - mutt: - dotfiles: - - f_muttrc - - d_mutt_themes diff --git a/dotdrop b/dotdrop index fb07132..c026eda 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit fb071321e94e3f5befc0d63ccb6fe73de1aebb5e +Subproject commit c026edaf3220e1782a775e4332b355cf8403b928 diff --git a/dotfiles/i3/i3 b/dotfiles/i3/i3 index 74d5d78..fb7cec6 100644 --- a/dotfiles/i3/i3 +++ b/dotfiles/i3/i3 @@ -41,7 +41,7 @@ bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOU floating_modifier $mod # start a terminal -bindsym $mod+Return exec xterm -e zsh +bindsym $mod+Return exec xterm # for_window [class="XTerm"] floating enable move right 450px,move down 350px # kill focused window @@ -175,24 +175,6 @@ mode "resize" { bindsym $mod+r mode "resize" -# Start i3bar to display a workspace bar (plus the system information i3status -# finds out, if available) -bar { - colors { - background #2f343f - statusline #2f343f - #separator #4b5262 - separator #2f343f - - # class border backgr. text - focused_workspace #2f343f #00b111 #d8dee8 - active_workspace #2f343f #2f343f #d8dee8 - inactive_workspace #2f343f #2f343f #d8dee8 - urgent_workspacei #2f343f #ebcb8b #bf616a - } - status_command i3status -} - # Border for_window [class="^.*"] border pixel 0 # class border backgr. text indicator child_border @@ -222,6 +204,25 @@ bindsym XF86MonBrightnessDown exec xbacklight -dec 20 # decrease screen brightne # PC specific configurations: {%@@ if profile == "work" @@%} +# Start i3bar to display a workspace bar (plus the system information i3status +# finds out, if available) +bar { + position top + colors { + background #2f343f + statusline #2f343f + #separator #4b5262 + separator #2f343f + + # class border backgr. text + focused_workspace #2f343f #00b111 #d8dee8 + active_workspace #2f343f #2f343f #d8dee8 + inactive_workspace #2f343f #2f343f #d8dee8 + urgent_workspacei #2f343f #ebcb8b #bf616a + } + status_command i3status +} + # Locking bindsym $mod+Shift+b exec "xlock -mode matrix -startCmd /share/bin/isweg -endCmd /share/bin/isda -bg '#6843bf' -info ''" @@ -252,4 +253,11 @@ bindsym $mod+Shift+b exec "xlock -mode matrix -info ''" exec --no-startup-id "chromium-browser" for_window [class="Chromium"] move container to workspace 9 + +# i3-gaps +smart_gaps on +gaps inner 17 + +exec_always --no-startup-id ~/.config/polybar/start.sh & + {%@@ endif @@%} diff --git a/dotfiles/picom/picom b/dotfiles/picom/picom index 81625e7..89a727d 100644 --- a/dotfiles/picom/picom +++ b/dotfiles/picom/picom @@ -1,17 +1,24 @@ +# Shadow + +# Opacity opacity-rule = [ - "95:class_g = 'XTerm' && !focused", + "100:class_g = 'XTerm' && !focused", "100:class_g = 'XTerm' && focused", ]; - -wintypes: { - dock = { opacity = 1.0; } -} - -active-opacity = 1.0; inactive-opacity = 1.0; +active-opacity = 1.0; -blur-background = false; -blur-background-fixed = false; - +# Dim inactive-dim = 0.0; inactive-dim-fixed = true; + +# Blur +blur-background = true; +blur-kern = "5x5gaussian"; +blur-method = "gaussian"; +blur-strength = 50; +backend = "glx"; +blur-background-fixed = false; + +# Other +vsync = true; diff --git a/dotfiles/polybar/config b/dotfiles/polybar/config new file mode 100644 index 0000000..1d8d9cc --- /dev/null +++ b/dotfiles/polybar/config @@ -0,0 +1,131 @@ +[bar/mybar] +; monitor = DP1 + +font-0 = "Inconsolata:pixelsize=12;0" + +bottom = false +fixed-center = true +width = 100% +height = 35 + +background = #882B303B +foreground = #000 + +green = #00d3a8 + +#padding-left = 0.5 +padding-right = 2 + +module-margin = 1 + +modules-left = i3tabs title +modules-center = date +modules-right = network volume battery +separator = + +dim-value = 0.5 + +wm-name = i3 +wm-restack = i3 + +dpi-x = 96 +dpi-y = 96 + +enable-ipc = false + +[module/i3tabs] +type = internal/i3 +pin-workspaces = true +index-sort = true +enable-click = true +enable-scroll = false +wrapping-scroll = false + +label-unfocused = %index% +label-unfocused-padding = 2 +label-unfocused-foreground = #ffffff + +label-focused = %index% +label-focused-foreground = #00d3a8 +label-focused-background = #8865737E +label-focused-underline = #fba922 +label-focused-padding = 2 + +label-urgent = %index% +label-urgent-background = #00d3a8 +label-urgent-foreground = #8865737E +label-urgent-underline = #fba922 +label-urgent-padding = 2 + +label-mode-padding = 2 +label-mode-foreground = #00d3ab +label-mode-background = #65737E + +[module/date] +type = internal/date + +interval = 1.0 + +date = %Y-%m-%d% + +time = %H:%M + +date-alt = %A, %d %B %Y +time-alt = %H:%M:%S + +label = %date% %time% +label-font = 0 +label-foreground = #fff + +[module/title] +type = internal/xwindow +label = %title% +format =