Browse Source

Moved to i3blocks and cleaned up font definitions

tags/v0.6.0
Micah Halter 1 year ago
parent
commit
d040225552
24 changed files with 156 additions and 40 deletions
  1. +3
    -0
      CHANGELOG.md
  2. +2
    -3
      Makefile
  3. +1
    -1
      dunst/.config/dunst/dunstrc
  4. +1
    -8
      fonts/.config/fontconfig/fonts.conf
  5. +1
    -1
      gtk/.config/gtk-3.0/settings.ini
  6. +28
    -11
      i3/.config/i3/config
  7. +38
    -0
      i3blocks/.config/i3blocks/config
  8. +1
    -1
      mutt/.config/mutt/muttrc
  9. +2
    -2
      offlineimap/.config/systemd/user/offlineimap-oneshot.service.d/override.conf
  10. +0
    -1
      scripts/.config/Scripts/displayselect
  11. +0
    -3
      scripts/.config/Scripts/dunst/battery
  12. +0
    -3
      scripts/.config/Scripts/dunst/date
  13. +1
    -1
      scripts/.config/Scripts/i3-powersaver
  14. +19
    -0
      scripts/.config/Scripts/statusbar/battery
  15. +3
    -0
      scripts/.config/Scripts/statusbar/clock
  16. +3
    -0
      scripts/.config/Scripts/statusbar/date
  17. +7
    -0
      scripts/.config/Scripts/statusbar/ethernet
  18. +8
    -0
      scripts/.config/Scripts/statusbar/layout
  19. +11
    -0
      scripts/.config/Scripts/statusbar/mail
  20. +7
    -0
      scripts/.config/Scripts/statusbar/powersaver
  21. +12
    -0
      scripts/.config/Scripts/statusbar/volume
  22. +7
    -0
      scripts/.config/Scripts/statusbar/wifi
  23. +1
    -1
      termite/.config/termite/config
  24. +0
    -4
      urxvt/.Xresources

+ 3
- 0
CHANGELOG.md View File

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

### Added

- Added `i3blocks` configuration
- Added synctex support to neovim and zathura
- Added Markdown bibliography completion to `neovim`
- Added LaTeX autocompletion to `neovim`
@@ -21,6 +22,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

### Changed

- Removed `polybar` from installation, moved to `i3blocks`
- Moved all applications to using the monospace definition in the fonts configuration
- Changed some gpg settings
- Moved from colorscheme plugins to my own files
- Moved from `antigen` to `antibody` as `zsh` backend for hopefully more stable


+ 2
- 3
Makefile View File

@@ -66,6 +66,7 @@ arch: pacman
gparted \
gscan2pdf \
i3-gaps \
i3blocks \
imagemagick \
intel-ucode \
jdk8-openjdk \
@@ -171,13 +172,11 @@ aur: yay
ncpamixer \
nerd-fonts-inconsolata \
networkmanager-dmenu-git \
polybar \
python-ueberzug-git \
qt5-webengine-widevine \
ranger-git \
rtv \
sc-im \
siji-git \
skypeforlinux-stable-bin \
tmuxinator \
upass \
@@ -207,6 +206,7 @@ configs: update stow-pre
gnupg \
gtk \
i3 \
i3blocks \
khal \
khard \
mpv \
@@ -219,7 +219,6 @@ configs: update stow-pre
notmuch \
offlineimap \
pass \
polybar \
qutebrowser \
ranger \
readline \


+ 1
- 1
dunst/.config/dunst/dunstrc View File

@@ -85,7 +85,7 @@

### Text ###

font = xos4 Terminus 10
font = mono 10

# The spacing between lines. If the height is smaller than the
# font height, it will get raised to the font height.


+ 1
- 8
fonts/.config/fontconfig/fonts.conf View File

@@ -1,18 +1,11 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<alias>
<family>xos4 Terminus</family>
<prefer>
<family>xos4 Terminus</family>
<family>Inconsolata Nerd Font</family>
<family>Wuncon Siji</family>
</prefer>
</alias>
<alias>
<family>monospace</family>
<prefer>
<family>xos4 Terminus</family>
<family>Inconsolata Nerd Font</family>
</prefer>
</alias>
<alias>


+ 1
- 1
gtk/.config/gtk-3.0/settings.ini View File

@@ -1,7 +1,7 @@
[Settings]
gtk-theme-name=FlatColor
gtk-icon-theme-name=flattrcolor
gtk-font-name=xos4 Terminus 10
gtk-font-name=Monospace 10
gtk-cursor-theme-name=Adwaita
gtk-cursor-theme-size=0
gtk-toolbar-style=GTK_TOOLBAR_BOTH


+ 28
- 11
i3/.config/i3/config View File

@@ -4,7 +4,8 @@ floating_modifier $mod

# set variables
set $i3exit "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'"
set $layoutupdate exec --no-startup-id polybar-msg hook i3layout 1
set $layoutupdate exec --no-startup-id pkill -SIGRTMIN+10 i3blocks
set $volumeupdate exec --no-startup-id pkill -SIGRTMIN+11 i3blocks
set $smallwidth 900
set $smallheight 640
set $bigwidth 1500
@@ -16,7 +17,7 @@ set $defaultgaps 25
# LOOK & FEEL #
###############
# Set fonts
font pango:xos4 Terminus 14
font pango:mono

# set up gaps
for_window [class="^.*"] border pixel 5
@@ -26,7 +27,7 @@ gaps inner $defaultgaps
set_from_resource $bg-color i3wm.color7 #676E7D
set_from_resource $inactive-bg-color i3wm.color0 #2f343f
set_from_resource $text-color i3wm.color7 #f3f4f5
set_from_resource $inactive-text-color i3wm.color7 #676E7D
set_from_resource $inactive-text-color i3wm.color8 #676E7D
set_from_resource $urgent-bg-color i3wm.color1 #E53935

# window colors border background text indicator
@@ -44,10 +45,10 @@ hide_edge_borders both
##############

# wokspace names
set $workspace1 "1"
set $workspace2 "2"
set $workspace3 "3"
set $workspace4 "4"
set $workspace1 "1:"
set $workspace2 "2:"
set $workspace3 "3:"
set $workspace4 "4:"
set $workspace5 "5"
set $workspace6 "6"
set $workspace7 "7"
@@ -152,7 +153,7 @@ assign [class="Telegram"] $workspace3
for_window [title="^pdfpc - present"] border none floating enable

# status bar
exec_always --no-startup-id polybarlaunch
#exec_always --no-startup-id polybarlaunch

# start dual monitor
exec --no-startup-id displayctrl -r HDMI-2 HDMI-3
@@ -162,6 +163,22 @@ exec --no-startup-id $BROWSER
# terminal
exec --no-startup-id i3-msg 'workspace $workspace2; exec $TERMINAL; workspace $workspace1'

bar {
font pango:mono 12
status_command i3blocks
position top
mode dock
modifier None
colors {
background $inactive-bg-color
statusline $bg-color
focused_workspace $inactive-bg-color $inactive-bg-color $text-color
active_workspace $inactive-bg-color $inactive-bg-color $inactive-text-color
inactive_workspace $inactive-bg-color $inactive-bg-color $inactive-text-color
urgent_workspace $urgent-bg-color $urgent-bg-color $text-color
}
}


######################
# LETTER KEYBINDINGS #
@@ -476,9 +493,9 @@ bindsym $mod+Shift+Control+Next exec --no-startup-id dmenushutdown
# MEDIA KEYBINDINGS #
#####################

bindsym XF86AudioLowerVolume exec --no-startup-id amixer -D pulse sset Master 5%-
bindsym XF86AudioRaiseVolume exec --no-startup-id amixer -D pulse sset Master 5%+
bindsym XF86AudioMute exec --no-startup-id amixer -D pulse sset Master toggle
bindsym XF86AudioLowerVolume exec --no-startup-id amixer -D pulse sset Master 5%-; $volumeupdate
bindsym XF86AudioRaiseVolume exec --no-startup-id amixer -D pulse sset Master 5%+; $volumeupdate
bindsym XF86AudioMute exec --no-startup-id amixer -D pulse sset Master toggle; $volumeupdate
bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute $(pacmd list-sources|awk '/\* index:/{ print $3 }') toggle

bindsym XF86AudioPause exec --no-startup-id echo "cycle pause" > $HOME/.config/mpv/control


+ 38
- 0
i3blocks/.config/i3blocks/config View File

@@ -0,0 +1,38 @@
command=~/.config/Scripts/statusbar/$BLOCK_NAME
separator=false
separator_block_width=15
markup=pango

[mail]
label=
interval=once
signal=13

[volume]
interval=1
signal=11

[wifi]
interval=1

[ethernet]
interval=1

[powersaver]
interval=once
signal=12

[battery]
interval=1

[date]
label=
interval=1

[clock]
label=
interval=1

[layout]
interval=once
signal=10

+ 1
- 1
mutt/.config/mutt/muttrc View File

@@ -38,7 +38,7 @@ color body brightred default [\-\.+_a-zA-Z0-9]+@[\-\.a-zA-Z0-9]+
color body brightblue default (https?|ftp)://[\-\.,/%~_:?&=\#a-zA-Z0-9]+
color indicator blue default

macro index q "<shell-escape>polybar-msg hook mail 1<enter><quit>" "exit and refresh polybar"
macro index q "<shell-escape>pkill -SIGRTMIN+13 i3blocks<enter><quit>" "exit and refresh polybar"
bind editor <space> noop
bind index G last-entry
bind index gg first-entry


+ 2
- 2
offlineimap/.config/systemd/user/offlineimap-oneshot.service.d/override.conf View File

@@ -1,4 +1,4 @@
[Service]
Environment=DISPLAY=:0
ExecStartPre=polybar-msg hook mail 2
ExecStopPost=/bin/sh -c 'if [ "$$EXIT_STATUS" = 0 ]; then polybar-msg hook mail 1; else polybar-msg hook mail 3; fi'
ExecStartPre=/bin/sh -c 'echo "" > /tmp/mailsync && pkill -SIGRTMIN+13 i3blocks'
ExecStopPost=/bin/sh -c 'if [ "$$EXIT_STATUS" = 0 ]; then rm /tmp/mailsync; else echo "" > /tmp/mailsync; fi; pkill -SIGRTMIN+13 i3blocks'

+ 0
- 1
scripts/.config/Scripts/displayselect View File

@@ -71,7 +71,6 @@ case "$chosen" in
*) xrandr --output "$chosen" --auto --scale 1.0x1.0 $(echo "$allposs" | grep -v "$chosen" | awk '{print "--output", $1, "--off"}' | tr '\n' ' ') ;;
esac

$HOME/.config/polybar/launch.sh
$HOME/.config/Scripts/setbackground
$HOME/.config/Scripts/remaps
systemctl --user restart dunst

+ 0
- 3
scripts/.config/Scripts/dunst/battery View File

@@ -1,3 +0,0 @@
#!/bin/bash

dunstify -r 52999 "Battery: $(cat /sys/class/power_supply/BAT0/capacity)%"

+ 0
- 3
scripts/.config/Scripts/dunst/date View File

@@ -1,3 +0,0 @@
#!/bin/bash

dunstify -r 120496 "$(date '+%b %d, %Y; %H:%M')"

+ 1
- 1
scripts/.config/Scripts/i3-powersaver View File

@@ -6,4 +6,4 @@ else
xset +dpms; xset s on
fi

polybar-msg hook powersaver 1
pkill -SIGRTMIN+12 i3blocks

+ 19
- 0
scripts/.config/Scripts/statusbar/battery View File

@@ -0,0 +1,19 @@
#!/bin/bash

capacity=$(cat /sys/class/power_supply/BAT0/capacity) || exit
status=$(cat /sys/class/power_supply/BAT0/status)
icon=""

if [ "$capacity" -ge 75 ]; then
icon=""
elif [ "$capacity" -ge 50 ]; then
icon=""
elif [ "$capacity" -ge 25 ]; then
icon=""
else
icon=""
fi

[ "$status" = "Charging" ] && icon=""

echo "$icon $capacity%"

+ 3
- 0
scripts/.config/Scripts/statusbar/clock View File

@@ -0,0 +1,3 @@
#!/bin/bash

date '+%H:%M:%S'

+ 3
- 0
scripts/.config/Scripts/statusbar/date View File

@@ -0,0 +1,3 @@
#!/bin/bash

date '+%b %d, %Y'

+ 7
- 0
scripts/.config/Scripts/statusbar/ethernet View File

@@ -0,0 +1,7 @@
#!/bin/bash

device=enp0s25
ip="$(ip -4 addr show $device|grep -oP '(?<=inet )\d*(\.\d*){3}')"
if [ "$ip" != "" ]; then
echo " $ip"
fi

+ 8
- 0
scripts/.config/Scripts/statusbar/layout View File

@@ -0,0 +1,8 @@
#!/bin/bash

layout=`i3-msg -t get_tree | jq -r 'recurse(.nodes[]) | select(.nodes[].focused == true) | .layout'`
if [[ "$layout" == "splitv" ]]; then
echo ""
else
echo ""
fi

+ 11
- 0
scripts/.config/Scripts/statusbar/mail View File

@@ -0,0 +1,11 @@
#!/bin/bash

if [[ -d $HOME/.Mail ]]; then
out=$(find $HOME/.Mail/Gatech/INBOX/new $HOME/.Mail/Gmail/INBOX/new -type f|wc -l)

if [ -f /tmp/mailsync ]; then
cat /tmp/mailsync
elif [ "$out" != "0" ]; then
echo $out
fi
fi

+ 7
- 0
scripts/.config/Scripts/statusbar/powersaver View File

@@ -0,0 +1,7 @@
#!/bin/bash

if xset -q | grep -q "DPMS is Enabled"; then
echo ""
else
echo "零"
fi

+ 12
- 0
scripts/.config/Scripts/statusbar/volume View File

@@ -0,0 +1,12 @@
#!/bin/bash

line="$(amixer sget Master | grep 'Right:')"

stat="$(echo $line | awk -F'[][]' '{ print $4 }')"
level="$(echo $line | awk -F'[][]' '{ print $2 }')"

if [[ "$stat" == "off" ]]; then
echo "婢 0%"
else
echo "墳 $level"
fi

+ 7
- 0
scripts/.config/Scripts/statusbar/wifi View File

@@ -0,0 +1,7 @@
#!/bin/bash

device=wlp3s0
ssid="$(iw dev $device info|grep -oP '(?<=ssid ).*')"
if [ "$ssid" != "" ]; then
echo "說 $ssid"
fi

+ 1
- 1
termite/.config/termite/config View File

@@ -1,4 +1,4 @@
[options]
allow_bold = false
font = xos4 Terminus 11
font = mono 11
scrollback_lines = 50000

+ 0
- 4
urxvt/.Xresources View File

@@ -27,12 +27,8 @@ URxvt.lineSpace: 0
! Fonts
URxvt.allow_bold: true
URxvt*font: xft:xos4 Terminus:pixelsize=14,\
xft:Symbola:antialias=true,\
-wuncon-siji-medium-r-normal--10-100-75-75-c-80-iso10646-1,\
xft:Inconsolata Nerd Font Mono:antialias=true
URxvt*boldFont: xft:xos4 Terminus:pixelsize=14,\
xft:Symbola:antialias=true,\
-wuncon-siji-medium-r-normal--10-100-75-75-c-80-iso10646-1,\
xft:Inconsolata Nerd Font Mono:antialias=true

! Fix font space


Loading…
Cancel
Save