zmiany....

This commit is contained in:
2020-11-05 00:01:59 +01:00
parent 282e697ad8
commit 800dc876e8
11 changed files with 242 additions and 92 deletions

View File

@ -13,6 +13,7 @@ window:
y: 12 y: 12
dynamic_padding: true dynamic_padding: true
dynamic_title: true
decorations: none decorations: none
class: class:
instance: Alacritty instance: Alacritty
@ -38,9 +39,6 @@ selection:
semantic_escape_chars: ",│`|:\"' ()[]{}<>\t" semantic_escape_chars: ",│`|:\"' ()[]{}<>\t"
ave_to_clipboard: true ave_to_clipboard: true
# Allow terminal applications to change Alacritty's window title.
dynamic_title: true
cursor: cursor:
style: Beam style: Beam
@ -58,24 +56,6 @@ mouse:
program: xdg-open program: xdg-open
args: [] args: []
colors:
primary:
background: '0x000000'
foreground: '0xeaeaea'
background: "#0f0e09"
foreground: "#dbcdac"
cursor:
cursor: "#dbcdac"
normal:
black: "#0f0e09"
red: "#6B5835"
green: "#324443"
yellow: "#746A46"
blue: "#8C552E"
magenta: "#89784D"
cyan: "#9F8D5E"
white: "#dbcdac"
mouse_bindings: mouse_bindings:
- { mouse: Middle, mods: Shift, action: PasteSelection } - { mouse: Middle, mods: Shift, action: PasteSelection }
- { mouse: Right, mods: Shift, action: Paste } - { mouse: Right, mods: Shift, action: Paste }
@ -172,3 +152,31 @@ key_bindings:
#- { key: W, mods: Command, action: Quit } #- { key: W, mods: Command, action: Quit }
#- { key: N, mods: Command, action: SpawnNewInstance } #- { key: N, mods: Command, action: SpawnNewInstance }
#- { key: F, mods: Command|Control, action: ToggleFullscreen } #- { key: F, mods: Command|Control, action: ToggleFullscreen }
# BEGIN ACE
colors:
primary:
background: '0x0C130C'
foreground: '0xdedbcb'
cursor:
text: '0x0C130C'
cursor: '0xdedbcb'
normal:
black: '0x0C130C'
red: '0x606855'
green: '0x946634'
yellow: '0x718778'
blue: '0xB29863'
magenta: '0x7A9083'
cyan: '0xA3AA95'
white: '0xdedbcb'
bright:
black: '0x9b998e'
red: '0x606855'
green: '0x946634'
yellow: '0x718778'
blue: '0xB29863'
magenta: '0x7A9083'
cyan: '0xA3AA95'
white: '0xdedbcb'
# END ACE

View File

@ -10,7 +10,7 @@
padding = 8 padding = 8
horizontal_padding = 8 horizontal_padding = 8
frame_width = 1 frame_width = 1
frame_color = "#8C552E" frame_color = "#B29863"
# Define a color for the separator. # Define a color for the separator.
# possible values are: # possible values are:
@ -75,21 +75,21 @@
[urgency_low] [urgency_low]
# IMPORTANT: colors have to be defined in quotation marks. # IMPORTANT: colors have to be defined in quotation marks.
# Otherwise the "#" and following would be interpreted as a comment. # Otherwise the "#" and following would be interpreted as a comment.
background = "#0f0e09" background = "#0C130C"
foreground = "#8C552E" foreground = "#B29863"
timeout = 5 timeout = 5
# Icon for notifications with low urgency, uncomment to enable # Icon for notifications with low urgency, uncomment to enable
#icon = /path/to/icon #icon = /path/to/icon
[urgency_normal] [urgency_normal]
background = "#0f0e09" background = "#0C130C"
foreground = "#8C552E" foreground = "#B29863"
timeout = 5 timeout = 5
[urgency_critical] [urgency_critical]
background = "#0f0e09" background = "#0C130C"
foreground = "#8C552E" foreground = "#B29863"
frame_color = "#8C552E" frame_color = "#B29863"
timeout = 0 timeout = 0
# Every section that isn't one of the above is interpreted as a rules to # Every section that isn't one of the above is interpreted as a rules to

View File

@ -31,6 +31,7 @@ bindsym $mod+d exec --no-startup-id rofi-appsmenu
bindsym $mod+i exec --no-startup-id rofi -show window -theme /usr/share/rofi-menus-git/themes/appsmenu.rasi bindsym $mod+i exec --no-startup-id rofi -show window -theme /usr/share/rofi-menus-git/themes/appsmenu.rasi
bindsym $mod+a exec --no-startup-id ~/.config/rofi/scripts/traefik.sh bindsym $mod+a exec --no-startup-id ~/.config/rofi/scripts/traefik.sh
bindsym $mod+Shift+o exec --no-startup-id rofi-vpn bindsym $mod+Shift+o exec --no-startup-id rofi-vpn
bindsym $mod+o exec --no-startup-id ~/.config/rofi/scripts/sound.sh
bindsym $mod+c exec --no-startup-id rofi -show ssh -theme /usr/share/rofi-menus-git/themes/appsmenu.rasi bindsym $mod+c exec --no-startup-id rofi -show ssh -theme /usr/share/rofi-menus-git/themes/appsmenu.rasi
set $workspacer ~/.config/i3/i3-workspacer.py set $workspacer ~/.config/i3/i3-workspacer.py
@ -164,37 +165,13 @@ bindsym $mod+r mode "resize"
# _| |___) | | |__| |_| \__ \ || (_) | | | | | | ___) | | | | | |_ # _| |___) | | |__| |_| \__ \ || (_) | | | | | | ___) | | | | | |_
#(_)_|____/ \____\__,_|___/\__\___/|_| |_| |_| |____/|_| |_|_|\__| #(_)_|____/ \____\__,_|___/\__\___/|_| |_| |_| |____/|_| |_|_|\__|
# #
# startup
exec_always --no-startup-id $HOME/.config/polybar/launch.sh
exec --no-startup-id i3-msg 'workspace 1; exec $TERMINAL; workspace 2; exec firefox;'
exec --no-startup-id feh --bg-scale ~/Wallpapers/seneca.jpg
exec --no-startup-id ~/bin/autoconfgure_display.sh
exec --no-startup-id picom --config ~/.config/i3/picom.conf -b
#exec --no-startup-id xset dpms 500
exec --no-startup-id nm-applet --sm-disable
exec --no-startup-id pasystray
exec --no-startup-id joplin-desktop
exec --no-startup-id clipit
#exec --no-startup-id xautolock -time 10 -locker "betterlockscreen -l dim"
exec --no-startup-id ~/bin/dunstwal
exec --no-startup-id /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
exec telegram-desktop
#exec mattermost-desktop
exec --no-startup-id sleep 4; i3-msg '[class="Telegram"] move scratchpad'
exec --no-startup-id sleep 4; i3-msg '[class="Joplin"] move scratchpad'
exec --no-startup-id sleep 4; i3-msg '[class="Mattermost"] move scratchpad'
#exec --no-startup-id sleep 4; i3-msg '[instance="joplin"] resize set 1300 900'
exec_always --no-startup-id wal -R -n
# gaps # gaps
gaps inner 10 gaps inner 10
workspace 1 output eDP1
workspace 2 output eDP1
workspace 3 output HDMI1
# workspace settings # workspace settings
workspace_auto_back_and_forth yes workspace_auto_back_and_forth yes
show_marks yes show_marks yes
@ -210,7 +187,7 @@ for_window [class="QSyncthingTray"] floating enable
for_window [class="Thunderbird" window_type="normal"] move scratchpad, floating enable, resize set 1600 1050, border pixel 2 for_window [class="Thunderbird" window_type="normal"] move scratchpad, floating enable, resize set 1600 1050, border pixel 2
for_window [class="Nautilus"] floating enable for_window [class="Nautilus"] floating enable
for_window [class="Gnome-calculator"] floating enable for_window [class="Gnome-calculator"] floating enable
for_window [class="zoom"] move scratchpad for_window [class="zoom"] move scratchpad, floating enable
for_window [class="Signal"] move scratchpad for_window [class="Signal"] move scratchpad
#for_window [instance="joplin"] resize set 1300 900, move scratchpad, move position center #for_window [instance="joplin"] resize set 1300 900, move scratchpad, move position center
@ -223,8 +200,6 @@ bindsym Print exec "~/bin/screenshot.sh"
bindsym $mod+minus [class="Telegram"] scratchpad show bindsym $mod+minus [class="Telegram"] scratchpad show
bindsym $mod+p [class="Mattermost"] scratchpad show bindsym $mod+p [class="Mattermost"] scratchpad show
bindsym $mod+o [class="Signal"] scratchpad show
bindsym $mod+m [class="Cantata"] scratchpad show
bindsym $mod+Shift+s [class="Joplin"] scratchpad show bindsym $mod+Shift+s [class="Joplin"] scratchpad show
bindsym $mod+Shift+z [class="zoom"] scratchpad show bindsym $mod+Shift+z [class="zoom"] scratchpad show
bindsym $mod+Shift+m [class="Thunderbird"] scratchpad show bindsym $mod+Shift+m [class="Thunderbird"] scratchpad show
@ -251,3 +226,33 @@ bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOU
bindsym XF86MonBrightnessUp exec xrandr --output eDP1 --brightness 1.9 # increase screen brightness bindsym XF86MonBrightnessUp exec xrandr --output eDP1 --brightness 1.9 # increase screen brightness
bindsym XF86MonBrightnessDown exec xrandr --output eDP1 --brightness 1.4 # decrease screen brightness bindsym XF86MonBrightnessDown exec xrandr --output eDP1 --brightness 1.4 # decrease screen brightness
# startup
exec_always --no-startup-id $HOME/.config/polybar/launch.sh
exec --no-startup-id ~/bin/autoconfgure_display.sh
exec --no-startup-id i3-msg 'workspace 1; exec $TERMINAL; workspace 2; exec firefox;'
#exec --no-startup-id feh --bg-scale ~/Wallpapers/seneca.jpg
exec --no-startup-id picom --config ~/.config/i3/picom.conf -b
#exec --no-startup-id xset dpms 500
exec --no-startup-id nm-applet --sm-disable
exec --no-startup-id pasystray
exec --no-startup-id joplin-desktop
exec --no-startup-id clipit
#exec --no-startup-id xautolock -time 10 -locker "betterlockscreen -l dim"
exec --no-startup-id ~/bin/dunstwal
exec --no-startup-id /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
exec telegram-desktop
#exec mattermost-desktop
exec --no-startup-id sleep 4; i3-msg '[class="Telegram"] move scratchpad'
exec --no-startup-id sleep 6; i3-msg '[class="Joplin"] move scratchpad'
exec --no-startup-id sleep 12; i3-msg '[class="Mattermost"] move scratchpad'
exec --no-startup-id sleep 4; i3-msg '[instance="joplin"] resize set 1300 900'
exec_always --no-startup-id wal -R -n
exec --no-startup-id sleep 4
exec --no-startup-id sleep 4
exec --no-startup-id ~/bin/theme

View File

@ -103,7 +103,7 @@ font-3 - RobotoMono Nerd Font:antialias=true:size=18;0
; modules-center = s4 filesystem s5 ; modules-center = s4 filesystem s5
; modules-right = s4 powermenu s1 pulseaudio s3 ; modules-right = s4 powermenu s1 pulseaudio s3
modules-left = battery wlan weather modules-left = battery wlan s_temp s_hum s_press s_pm25 s_pm10
modules-center = mpd modules-center = mpd
modules-right = modules-right =
@ -571,11 +571,36 @@ exec = ~/.config/polybar/syngeos-sensor/sensor.sh
format-background = ${colors.primary} format-background = ${colors.primary}
format-prefix-foreground = ${colors.background} format-prefix-foreground = ${colors.background}
[module/pm25] [module/s_temp]
type = custom/script type = custom/script
interval = 3 interval = 3
format-background = ${colors.primary} format-background = ${colors.primary}
exec = /home/paramah/bin/czujnik.sh |grep pm2_5 |awk '{print $2 $3}' |tr -d \" exec = ~/.config/polybar/syngeos-sensor/sensor.sh temperature
[module/s_hum]
type = custom/script
interval = 3
format-background = ${colors.primary}
exec = ~/.config/polybar/syngeos-sensor/sensor.sh humidity
[module/s_press]
type = custom/script
interval = 3
format-background = ${colors.primary}
exec = ~/.config/polybar/syngeos-sensor/sensor.sh air_pressure
[module/s_pm25]
type = custom/script
interval = 3
format-background = ${colors.primary}
exec = ~/.config/polybar/syngeos-sensor/level.sh pm2_5
[module/s_pm10]
type = custom/script
interval = 3
format-background = ${colors.primary}
exec = ~/.config/polybar/syngeos-sensor/level.sh pm10

View File

@ -0,0 +1,6 @@
#!/bin/sh
TYPE=$1
DATA=$(cat /tmp/czujnik-levels |jq -r .$TYPE |grep -v null)
echo $TYPE\($DATA%\)

View File

@ -1,5 +1,6 @@
#!/bin/sh #!/bin/sh
DATA=$(http https://api.syngeos.pl/api/public/data/device/1554 |jq '.sensors |.[] | { (.name): (.unit + " " + (.data[0].value|tostring)) }'|grep pm2_5 |awk '{print $2 $3}' |tr -d \") TYPE=$1
DATA=$(cat /tmp/czujnik |jq -r .$TYPE |grep -v null)
echo $DATA echo $DATA

9
.config/rofi/scripts/sound.sh Executable file
View File

@ -0,0 +1,9 @@
#!/usr/bin/bash
sink=$(ponymix -t sink list|awk '/^sink/ {s=$1" "$2;getline;gsub(/^ +/,"",$0);print s" "$0}'|rofi -theme /usr/share/rofi-menus-git/themes/nmvpnmenu.rasi -dmenu -p 'pulseaudio sink:' -location 6 -width 100|grep -Po '[0-9]+(?=:)') &&
ponymix set-default -d $sink &&
for input in $(ponymix list -t sink-input|grep -Po '[0-9]+(?=:)');do
echo "$input -> $sink"
ponymix -t sink-input -d $input move $sink
done

32
.config/rofi/scripts/test.sh Executable file
View File

@ -0,0 +1,32 @@
#!/usr/bin/env bash
if [ "$*" = "quit" ]
then
exit 0
fi
if [ "$@" ]
then
# Override the previously set prompt.
echo -en "\x00prompt\x1fChange prompt\n"
for a in {1..10}
do
echo "$a"
done
echo "quit"
else
echo -en "\x00prompt\x1ftesting\n"
echo -en "\0urgent\x1f0,2\n"
echo -en "\0active\x1f1\n"
echo -en "\0markup-rows\x1ftrue\n"
echo -en "\0message\x1fSpecial <b>bold</b>message\n"
echo -en "aap\0icon\x1ffolder\n"
echo "noot"
echo "mies"
echo -en "-------------\0nonselectable\x1ftrue\n"
echo "testing"
echo "<b>Bold</b>"
echo "quit"
fi

View File

@ -71,4 +71,8 @@
commit = yellow bold commit = yellow bold
old = red bold old = red bold
new = green bold new = green bold
whitespace = red reverse whitespace = red reverse
[credential "https://git.jazzy.pro"]
username = aleksander.cynarski

76
.zshrc
View File

@ -13,6 +13,9 @@
#Load my environment exports #Load my environment exports
[ -f ~/.exports ] && source ~/.exports [ -f ~/.exports ] && source ~/.exports
if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
fi
export PATH=$HOME/bin:/usr/local/bin:$PATH export PATH=$HOME/bin:/usr/local/bin:$PATH
export PATH="${PATH}:${HOME}/.local/bin/" export PATH="${PATH}:${HOME}/.local/bin/"
@ -38,26 +41,29 @@ export PATH="$HOME/.symfony/bin:$PATH"
# Path to your oh-my-zsh installation. # Path to your oh-my-zsh installation.
export ZSH=$HOME/.oh-my-zsh export ZSH=$HOME/.oh-my-zsh
ZSH_THEME="powerlevel9k/powerlevel9k" #source /usr/share/zsh-theme-powerlevel9k/powerlevel9k.zsh-theme
POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=(status background_jobs_joined virtualenv nodeenv terraform) #ZSH_THEME="powerlevel9k/powerlevel9k"
#POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=(status background_jobs_joined virtualenv nodeenv)
PROMPT=$'%{$fg[white]%}$(tf_prompt_info)%{$reset_color%} ' ZSH_THEME="powerlevel10k/powerlevel10k"
export CHROME_BIN=/usr/bin/chromium export CHROME_BIN=/usr/bin/chromium
source /usr/bin/virtualenvwrapper.sh source /usr/bin/virtualenvwrapper.sh
plugins=( plugins=(
zsh-autosuggestions zsh-autosuggestions
virtualenvwrapper virtualenvwrapper
taskwarrior taskwarrior
timewarrior
archlinux archlinux
systemd systemd
themes themes
git git
fzf fzf
git-flow-completion aws
go ssh-agent
#git-flow-completion
golang
terraform terraform
) )
@ -69,7 +75,10 @@ zplug 'ytet5uy4/fzf-widgets'
zplug 'zsh-users/zaw' zplug 'zsh-users/zaw'
zplug "pbar1/zsh-terraform" zplug "pbar1/zsh-terraform"
zplug 'voronkovich/project.plugin.zsh' zplug 'voronkovich/project.plugin.zsh'
zplug romkatv/powerlevel10k, as:theme, depth:1
# autocomplete on steroids
zstyle ':completion:*' fzf-search-display true
# Map widgets to key # Map widgets to key
bindkey '^ge' fzf-select-widget bindkey '^ge' fzf-select-widget
@ -200,27 +209,12 @@ mattermost-desktop () { # launch telegram and send it to scratchpad
theme () { theme () {
(wal -qi $WALLPAPER) (wal -qi $WALLPAPER)
(feh --bg-scale $WALLPAPER) (feh --bg-scale $WALLPAPER)
(~/bin/alawal.sh)
} }
alias tf=terraform alias tf=terraform
alias tfw="terraform workspace" alias tfw="terraform workspace"
tfv(){
terraform validate -var-file=vars/$(terraform workspace show).tfvars
}
tfp(){
terraform plan -var-file=vars/$(terraform workspace show).tfvars
}
tfa(){
terraform apply -var-file=vars/$(terraform workspace show).tfvars
}
tfc(){
terraform console -var-file=vars/$(terraform workspace show).tfvars
}
autoload -U +X bashcompinit && bashcompinit autoload -U +X bashcompinit && bashcompinit
complete -o nospace -C /usr/bin/vault vault complete -o nospace -C /usr/bin/vault vault
@ -238,3 +232,41 @@ source <(hcloud completion zsh)
#neofetch #neofetch
# #
eval "$(_JZ_COMPLETE=source_zsh jz)" eval "$(_JZ_COMPLETE=source_zsh jz)"
eval "$(_HAJDUK_COMPLETE=source_zsh hajduk)"
eval "$(direnv hook zsh)"
eval "$(register-python-argcomplete gitlab)"
alias tf=terraform
alias tfw="terraform workspace"
alias easy-rsa="docker run --rm -it -v /home/paramah/secrets/rsa:/pki -v /home/paramah/.aws:/root/.aws -e AWS_PROFILE=sandbox -e KMS_KEY_ID=test paramah/easyrsa"
alias genpass="< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c${1:-32};echo;"
tfv(){
terraform validate -var-file=vars/$(terraform workspace show).tfvars $1
}
tfp(){
terraform plan -var-file=vars/$(terraform workspace show).tfvars $1
}
tfa(){
terraform apply -var-file=vars/$(terraform workspace show).tfvars $1
}
tfc(){
terraform console -var-file=vars/$(terraform workspace show).tfvars $1
}
# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
#complete -o nospace -C /usr/bin/terraform terraform
source $HOME/.oh-my-zsh/custom/plugins/fzf-tab-completion/zsh/fzf-zsh-completion.sh
autoload -Uz bashcompinit && bashcompinit
complete -C aws_completer aws
eval "$(_MOLECULE_COMPLETE=source molecule)"
#. ~/.cache/wal/colors.sh

View File

@ -110,14 +110,14 @@ Plug 'stephpy/vim-php-cs-fixer'
" TypeScript " TypeScript
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
Plug 'leafgarland/typescript-vim' " Plug 'leafgarland/typescript-vim'
" Plug 'mhartington/nvim-typescript' " Plug 'mhartington/nvim-typescript'
Plug 'Quramy/tsuquyomi' " Plug 'Quramy/tsuquyomi'
" HasiCorp " HasiCorp
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
Plug 'fatih/vim-hclfmt' " Plug 'fatih/vim-hclfmt'
Plug 'hashivim/vim-terraform' Plug 'hashivim/vim-terraform'
Plug 'hashivim/vim-consul' Plug 'hashivim/vim-consul'
" Plug 'b4b4r07/vim-hcl' " Plug 'b4b4r07/vim-hcl'
@ -127,7 +127,7 @@ Plug 'juliosueiras/vim-terraform-completion'
" Salt-Stack (.:REACTIVATE:.) " Salt-Stack (.:REACTIVATE:.)
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
Plug 'saltstack/salt-vim' "Plug 'saltstack/salt-vim'
" GoLang " GoLang
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
@ -137,7 +137,7 @@ Plug 'fatih/vim-go'
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
" Plug 'chr4/nginx.vim' " Plug 'chr4/nginx.vim'
Plug 'robertbasic/vim-hugo-helper' "Plug 'robertbasic/vim-hugo-helper'
Plug 'ekalinin/Dockerfile.vim' Plug 'ekalinin/Dockerfile.vim'
@ -390,3 +390,31 @@ let g:vdebug_options = {
" let $NVIM_PYTHON_LOG_LEVEL="DEBUG" " let $NVIM_PYTHON_LOG_LEVEL="DEBUG"
" "
let g:hugohelper_spell_check_lang = 'pl_pl' let g:hugohelper_spell_check_lang = 'pl_pl'
let g:terraform_align=1
let g:terraform_fold_sections=1
let g:terraform_fmt_on_save=1
let g:syntastic_always_populate_loc_list = 1
let g:syntastic_auto_loc_list = 1
let g:syntastic_check_on_open = 1
let g:syntastic_check_on_wq = 0
" (Optional)Remove Info(Preview) window
set completeopt-=preview
" (Optional)Hide Info(Preview) window after completions
autocmd CursorMovedI * if pumvisible() == 0|pclose|endif
autocmd InsertLeave * if pumvisible() == 0|pclose|endif
" (Optional) Enable terraform plan to be include in filter
let g:syntastic_terraform_tffilter_plan = 1
" (Optional) Default: 0, enable(1)/disable(0) plugin's keymapping
let g:terraform_completion_keys = 1
" (Optional) Default: 1, enable(1)/disable(0) t