Change summary
dot_config/i3/config | 4 ++++
dot_config/nvim/init.vim | 8 --------
dot_config/polybar/config.ini.tmpl | 23 +++++++++++++++--------
private_dot_zshrc.tmpl | 2 ++
4 files changed, 21 insertions(+), 16 deletions(-)
Detailed changes
@@ -42,6 +42,10 @@ bindsym XF86AudioPlay exec playerctl play-pause
bindsym XF86AudioNext exec playerctl next
bindsym XF86AudioPrev exec playerctl previous
+# Brightness controls
+bindsym XF86MonBrightnessUp exec "xbacklight +5"
+bindsym XF86MonBrightnessDown exec "xbacklight -5"
+
# Screenshot with Flameshot
bindsym Print exec flameshot gui
@@ -7,20 +7,12 @@ if ! filereadable(expand('~/.config/nvim/autoload/plug.vim'))
endif
call plug#begin()
-Plug 'junegunn/fzf', { 'do': { -> fzf#install() } } " FZF integration
-Plug 'junegunn/fzf.vim' " FZF integration
Plug 'ap/vim-css-color' " highlight css colour codes with that color
Plug 'vim-airline/vim-airline' " status bar
Plug 'vim-airline/vim-airline-themes' " status bar themes
Plug 'tpope/vim-surround' " highlight open/close characters like [], {}, ()
-Plug 'cespare/vim-toml' " toml syntax highlighting
Plug 'edkolev/tmuxline.vim' " apply vim statusbar theme to tmux
-Plug 'christoomey/vim-tmux-navigator' " Tmux integration
-" Plug 'chriskempson/base16-vim' " base16 color schemes
-" Plug 'morhetz/gruvbox' " gruvbox theme
Plug 'rhysd/vim-grammarous' " LanguageTool integration
-Plug 'vim-syntastic/syntastic' " syntax checking for various languages
-Plug 'godlygeek/tabular' " required for aligning tables with next plugin
Plug 'wakatime/vim-wakatime' " Aggregate editor stats and metrics
Plug 'fatih/vim-go', { 'do': ':GoUpdateBinaries' }
Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
@@ -29,11 +29,10 @@ font-1 = "JetBrainsMono Nerd Font:style=Regular"
modules-left = i3
modules-center = xwindow
-{{- if eq .chezmoi.hostname "glade" }}
+{{- if ne .chezmoi.hostname "glade" }}
+modules-right = updates wlan pulseaudio cpu memory date time {{ if eq .chezmoi.hostname "sidhe" }}battery{{ end }}
+{{- else }}
modules-right = wlan pulseaudio cpu memory date battery
-{{- end}}
-{{- if eq .chezmoi.hostname "angmar" }}
-modules-right = updates wlan pulseaudio cpu memory date time
{{- end }}
cursor-click = pointer
@@ -61,7 +60,7 @@ font-0 = "Triplicate T4:pixelsize=11;1"
font-1 = "JetBrainsMono Nerd Font:style=Regular"
modules-left = {{- if eq .chezmoi.hostname "glade" }} updates {{- end }}
-modules-center = {{- if eq .chezmoi.hostname "angmar" }} mpd {{- end }}
+modules-center = {{- if ne .chezmoi.hostname "glade" }} mpd {{- end }}
modules-right =
tray-position = right
@@ -154,7 +153,7 @@ time = %H:%M
date-alt = " %Y-%m-%d"
label = %time%%date%
{{- end }}
-{{- if eq .chezmoi.hostname "angmar" }}
+{{- if ne .chezmoi.hostname "angmar" }}
date = " %Y-%m-%d"
label = %date%
@@ -164,12 +163,20 @@ interval = 5
time = %H:%M
label = %time%
{{- end }}
-
-{{- if eq .chezmoi.hostname "glade" }}
+{{ if ne .chezmoi.hostname "angmar" }}
[module/battery]
type = internal/battery
+{{- if eq .chezmoi.hostname "glade"}}
battery = BAT0
adapter = AC
+{{- end }}
+{{- if eq .chezmoi.hostname "sidhe"}}
+battery = BAT1
+adapter = ACAD
+{{- end }}
+
+format-full = <ramp-capacity> <label-full>
+label-full = %percentage%%
format-charging = <animation-charging> <label-charging>
label-charging = %percentage%%
@@ -27,6 +27,8 @@ ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets)
#typeset -A ZSH_HIGHLIGHT_STYLES
#ZSH_HIGHLIGHT_STYLES[comment]='fg=242'
+export ZIM_HOME="$HOME/.zim"
+
# ------------------
# Initialize modules
# ------------------