Update dotfiles

This commit is contained in:
Marco Thomas
2020-09-02 13:13:08 +02:00
parent db23326055
commit 9973fd1bcf
9 changed files with 72 additions and 64 deletions

View File

@@ -8,7 +8,7 @@
+ Launcher: rofi
+ Bar: polybar
+ Notifications: dunst
+ Compositor: [picom](https://github.com/tryone144/compton/tree/feature/dual_kawase)
+ Compositor: [picom](https://github.com/ibhagwan/picom)
+ Set Wallpaper: feh
+ Info: [fet.sh](https://github.com/6gk/fet.sh)
+ Screenshots: Flameshot

View File

@@ -34,8 +34,8 @@ window:
# Blank space added around the window in pixels. This padding is scaled
# by DPI and the specified value is always added at both opposing sides.
padding:
x: 15
y: 15
x: 25
y: 25
# Spread additional padding evenly around the terminal content.
dynamic_padding: false

View File

@@ -57,12 +57,12 @@ bindsym $mod+n workspace next
bindsym $mod+p workspace prev
# Rofi and dmenu
bindsym $mod+space exec "~/.config/rofi/launchers-git/launcher.sh"
bindsym $mod+d exec "~/.config/rofi/launchers-git/launcher.sh"
set $nord0d '#2e3440'
set $frost2d '#eceff4'
set $greend '#A3BE8C'
bindsym $mod+d exec "dmenu_run -fn 'FiraCode Nerd Font Mono' -nb '#2e3440' -sb '#a3be8c' -nf '#eceff4' -sf '#2e3440'"
bindsym $mod+Shift+d exec "dmenu_run -fn 'FiraCode Nerd Font Mono' -nb '#2e3440' -sb '#a3be8c' -nf '#eceff4' -sf '#2e3440'"
# Screenhot
bindsym $mod+Shift+p exec "flameshot gui"

View File

@@ -7,6 +7,12 @@ opacity-rule = [
#inactive-dim = 0.15;
inactive-opacity = 0.9;
corner-radius = 15.0;
rounded-corners-exclude= [
"class_g = 'i3-frame'",
"class_g = 'dmenu'"
];
backend = "glx";
blur: {
method: "dual_kawase";

View File

@@ -1,4 +1,4 @@
; ft=dosini
; vim: ft=dosini
[colors]
transparent = #00000000
@@ -26,8 +26,6 @@ accent = ${colors.green}
foreground = ${colors.frost2}
background = ${colors.nord0}
tray = ${colors.nord0}
################################################################################
[bar/global]
monitor = ${env:MONITOR}
@@ -63,7 +61,7 @@ offset-y = 8px
modules-left = i3
modules-center = spotify
modules-right = update brightness volume date
modules-right = update backlight volume date
################################################################################
[bar/workspaces]
@@ -75,6 +73,8 @@ override-redirect = true
offset-x = 8px
offset-y = 8px
line-size = 3
modules-center = i3
################################################################################
@@ -92,28 +92,33 @@ modules-center = spotify
################################################################################
[bar/status]
inherit = bar/global
width = 22%
width = 20%
override-redirect = true
fixed-center = true
offset-x = 67%:-8px
offset-x = 72%:-8px
offset-y = 8px
modules-center = update backlight volume battery date
module-margin = 1
line-size = 3
modules-center = backlight volume battery date
################################################################################
[bar/tray]
inherit = bar/global
width = 10%
width = 7%
override-redirect = true
fixed-center = true
offset-x = 90%:-8px
offset-x = 93%:-8px
offset-y = 8px
tray-position = center
tray-padding = 2
modules-center = update
@@ -143,11 +148,10 @@ ws-icon-default = 
#label-focused = ""
label-focused = "%icon%"
label-focused-padding = 1
label-focused-underline = ${colors.red}
label-focused-underline = ${colors.green}
#label-unfocused = ""
label-unfocused = "%icon%"
label-unfocused-foreground = ${colors.nord3}
label-unfocused-padding = 1
label-urgent = "%icon%"
@@ -158,8 +162,6 @@ label-urgent-padding = 1
[module/date]
type = internal/date
format-padding = 1
interval = 1.0
#time =  %I:%M %p - %A, %d %B %Y
@@ -167,6 +169,7 @@ time =  %I:%M %p %d.%m.%Y
time-alt =  %I:%M %p
format = <label>
format-underline = ${colors.blue1}
label = %time%
@@ -177,7 +180,6 @@ label = %title%
format = <label>
label-maxlen = 80
label-empty = "Yoroshiku!"
format-padding = 1
###############################################################################
[module/cpu]
@@ -187,7 +189,6 @@ interval = 5
format = <label>
format-prefix = 
format-padding = 1
label = " %percentage%%"
@@ -210,13 +211,13 @@ battery = BAT0
apdapter = ADP1
format-charging = <animation-charging> <label-charging>
format-charging-padding = 1
format-charging-underline = ${colors.green}
format-discharging = <ramp-capacity> <label-discharging>
format-discharging-padding = 1
format-discharging-underline = ${colors.green}
format-full = <ramp-capacity> <label-full>
format-full-padding = 1
format-full-underline = ${colors.green}
label-charging = %percentage%%
label-discharging = %percentage%%
@@ -247,14 +248,13 @@ animation-charging-framerate = 750
[module/volume]
type = internal/pulseaudio
format-volume-padding = 1
format-volume = <ramp-volume> <label-volume>
format-volume-underline = ${colors.orange}
label-volume = %percentage%%
format-muted-prefix = " "
format-muted-padding = 1
label-muted = "Muted"
ramp-volume-0 = 
@@ -277,10 +277,8 @@ unknown-as-up = true
#format-connected = <ramp-signal> <label-connected>
format-connected =  <label-connected>
format-connected-padding = 1
format-disconnected = <label-disconnected>
format-disconnected-padding = 1
label-connected = %essid%
label-disconnected =  Disconnected
@@ -296,14 +294,13 @@ ramp-signal-4 = 
[module/backlight]
type = internal/backlight
format-padding = 1
# ls -1 /sys/class/backlight
card = amdgpu_bl0
format = <label>
format-prefix = ""
label = " %percentage%%"
format-underline = ${colors.yellow}
bar-width = 10
bar-indicator = |
@@ -329,8 +326,6 @@ interval = 2
[module/hostname]
type = custom/script
format-padding = 1
exec = ~/.config/polybar/scripts/hostname.sh
tail = true
interval = 60
@@ -339,7 +334,6 @@ interval = 60
[module/ip]
type = custom/script
format-padding = 1
format-prefix = "直 "
exec = ~/.config/polybar/scripts/ip.sh

View File

@@ -5,7 +5,7 @@ if type "xrandr"; then
for mon in $(xrandr --query | grep " connected" | cut -d" " -f1); do
if [ "$1" = "laptop" ]; then
MONITOR=$mon polybar --reload workspaces &
MONITOR=$mon polybar --reload music &
# MONITOR=$mon polybar --reload music &
MONITOR=$mon polybar --reload status &
MONITOR=$mon polybar --reload tray &
fi

View File

@@ -23,5 +23,5 @@ set -g status-fg white
set -g status-right '%Y.%m.%d %H:%M'
set-window-option -g window-status-current-style fg=black
set-window-option -g window-status-current-style fg=black,bg=cyan,bright
set-window-option -g window-status-current-style fg=black,bg=cyan
set-window-option -g window-status-activity-style fg=brightred

View File

@@ -38,13 +38,6 @@ let g:pear_tree_pairs = {
\ '<': {'closer': '>'}
\ }
" Helper for latex
Plugin 'lervag/vimtex'
let g:vimtex_view_general_viewer = 'zathura'
nmap <C-c> :VimtexCompile <CR>
nmap <C-t> :VimtexTocToggle <CR>
" fzf
if executable("fzf")
Plugin 'junegunn/fzf'
@@ -55,6 +48,13 @@ endif
" Colors
Plugin 'arcticicestudio/nord-vim'
Plugin 'vim-airline/vim-airline'
Plugin 'vim-airline/vim-airline-themes'
let g:airline_theme='nord'
let g:airline_powerline_fonts = 1
let g:bufferline_echo = 0
set guifont="FiraCode Nerd Font Mono"
call vundle#end()
filetype plugin indent on
@@ -71,6 +71,8 @@ filetype indent plugin on
" ============================== General
set number
set relativenumber
set cursorline
set ruler
set showmatch " highlights paranthesis
set mat=5

View File

@@ -1,27 +1,28 @@
## Prompt
# ▄▄ ▄▄ ▄▄▄▄▄▄ ▄▄▄▄▄▄ ▄▄▄▄▄▄▄ ▄▄ ▄▄▄▄▄▄▄ ▄▄▄▄▄▄▄ ▄▄▄▄▄▄▄ ▄▄ ▄▄ ▄▄▄▄▄▄ ▄▄▄▄▄▄▄
# █ █▄█ █ █ ▄ █ █ █ ██ █ █ █ █ █ █ █ ▄ █ █ █
# █ █ ▄ █ █ █ █ █ █▄▄██ ▄▄▄▄▄█ █▄▄▄▄ █ ▄▄▄▄▄█ █▄█ █ █ █ █ █ █
# █ █ █▄█ █ █▄▄█▄█ ▄▄█ █ █▄▄▄▄▄ ▄▄▄▄█ █ █▄▄▄▄▄█ █ █▄▄█▄█ ▄▄█
# █ █ █ ▄▄ █ █ █▄▄▄▄▄ █ █ ▄▄▄▄▄▄█▄▄▄▄▄ █ ▄ █ ▄▄ █ █
# █ ██▄██ █ ▄ █ █ █ █ █▄▄ ▄▄▄▄▄█ █ █ █▄▄▄▄▄ ▄▄▄▄▄█ █ █ █ █ █ █ █ █▄▄
# █▄█ █▄█▄█ █▄▄█▄▄▄█ █▄█▄▄▄▄▄▄▄█ █▄▄▄▄▄▄▄█ █▄▄▄▄▄▄▄█▄▄▄▄▄▄▄█▄▄█ █▄▄█▄▄▄█ █▄█▄▄▄▄▄▄▄█
#
# ============================== Prompt
autoload -Uz vcs_info
autoload -U colors && colors
precmd_vcs_info() { vcs_info }
precmd_functions+=( precmd_vcs_info )
setopt prompt_subst
export PROMPT="%{$fg[yellow]%}%m %{$fg_bold[blue]%}%~ %{$fg_bold[cyan]%}\$vcs_info_msg_0_ %{$reset_color%}"
zstyle ':vcs_info:git:*' formats '%b '
export PROMPT="%{$fg[yellow]%}%m %{$fg_bold[blue]%}%~%{$fg_bold[cyan]%}\$vcs_info_msg_0_ %{$reset_color%}"
zstyle ':vcs_info:git:*' formats '|%b '
export RPROMPT=""
## Exports
# ============================== Exports
export EDITOR="vim"
export LANG="en_US.UTF-8"
export PATH=$PATH:$HOME/.local/bin:$HOME/scripts
## Aliases
if [ -f ~/.zshrc_local ]; then
source ~/.zshrc_local
fi
alias fonts="/home/$USER/.local/share/fonts"
alias listfonts="fc-list :scalable=true:spacing=mono: family"
alias cachefonts="fc-cache -f -v"
# ============================== Aliases
alias fontslist="fc-list :scalable=true:spacing=mono: family"
alias fontscache="fc-cache -f -v"
alias r="ranger"
alias s="cd ~/scripts/"
@@ -35,7 +36,11 @@ alias rm='rm -i' # Ask before removal
alias cp='cp -i' # Ask before removal
alias mv='mv -i' # Ask before removal
## Completion
if [ -f ~/.zshrc_local ]; then
source ~/.zshrc_local
fi
# ============================== Completion
unsetopt menu_complete # do not autoselect the first completion entry
unsetopt flowcontrol
setopt auto_menu # show completion menu on successive tab press
@@ -53,7 +58,7 @@ zstyle ':completion:*' matcher-list '' 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*'
## Directory navigation
setopt autocd autopushd
## History command configuration
# ============================== History
setopt extended_history # record timestamp of command in HISTFILE
setopt hist_expire_dups_first # delete duplicates first when HISTFILE size exceeds HISTSIZE
setopt hist_ignore_dups # ignore duplicated commands history list
@@ -62,7 +67,7 @@ setopt hist_verify # show command with history expansion to user befo
setopt share_history # share command history data inside tmux
export HISTFILE="$HOME/.zsh_history"
## ssh-agent
# ============================== SSH-Agent
if [ -f ~/.ssh/agent.env ] ; then
. ~/.ssh/agent.env > /dev/null
if ! kill -0 $SSH_AGENT_PID > /dev/null 2>&1; then
@@ -76,7 +81,7 @@ else
ssh-add
fi
## vi-mode
# ============================== vi-Mode
bindkey -v
export KEYTIMEOUT=1
@@ -100,7 +105,7 @@ RPS2=$RPS1
# Enable backspace to delete in vi-mode
bindkey -v '^?' backward-delete-char
## fzf
# ============================== fzf
export FZF_DEFAULT_OPTS='--preview="head {}" --layout=reverse --bind=tab:down --bind=btab:up'
## fzf Bindings in zsh (C-r and C-t)
@@ -111,7 +116,8 @@ else
bindkey '^R' history-incremental-search-backward
fi
## Use C-z for 'fg'
# ============================== Fancy Hacks
# Always use C-z for bg and fg
fancy-ctrl-z () {
if [[ $#BUFFER -eq 0 ]]; then
BUFFER="fg"
@@ -124,10 +130,10 @@ fancy-ctrl-z () {
zle -N fancy-ctrl-z
bindkey '^Z' fancy-ctrl-z
## Nord dir colors
# Nord-themed directory colors
test -r "~/.dir_colors" && eval $(dircolors ~/.dir_colors)
## Syntax Highlighting
# Syntax Highlighting
if [ -f ~/.zsh-highlighting/zsh-syntax-highlighting.zsh ]; then
source $HOME/.zsh-highlighting/zsh-syntax-highlighting.zsh
fi