Update

2021-06-27 19:28:33 +02:00
parent 800dc876e8
commit f19d3fdaec
11 changed files with 137 additions and 86 deletions
--- a/.config/alacritty/alacritty.yml
+++ b/.config/alacritty/alacritty.yml
@@ -155,28 +155,28 @@ key_bindings:
 # BEGIN ACE
 colors:
  primary:
-    background: '0x0C130C'
-    foreground: '0xdedbcb'
+    background: '0x0D0F11'
+    foreground: '0xabc8c1'
  cursor:
-    text:       '0x0C130C'
-    cursor:     '0xdedbcb'
+    text:       '0x0D0F11'
+    cursor:     '0xabc8c1'
  normal:
-    black:      '0x0C130C'
-    red:        '0x606855'
-    green:      '0x946634'
-    yellow:     '0x718778'
-    blue:       '0xB29863'
-    magenta:    '0x7A9083'
-    cyan:       '0xA3AA95'
-    white:      '0xdedbcb'
+    black:      '0x0D0F11'
+    red:        '0x995F29'
+    green:      '0xBC5127'
+    yellow:     '0x61906A'
+    blue:       '0xF39D2F'
+    magenta:    '0xC4A24A'
+    cyan:       '0xF8D562'
+    white:      '0xabc8c1'
  bright:
-    black:      '0x9b998e'
-    red:        '0x606855'
-    green:      '0x946634'
-    yellow:     '0x718778'
-    blue:       '0xB29863'
-    magenta:    '0x7A9083'
-    cyan:       '0xA3AA95'
-    white:      '0xdedbcb'
+    black:      '0x778c87'
+    red:        '0x995F29'
+    green:      '0xBC5127'
+    yellow:     '0x61906A'
+    blue:       '0xF39D2F'
+    magenta:    '0xC4A24A'
+    cyan:       '0xF8D562'
+    white:      '0xabc8c1'

 # END ACE
--- a/.config/dunst/dunstrc
+++ b/.config/dunst/dunstrc
@@ -10,7 +10,7 @@
    padding = 8
    horizontal_padding = 8
    frame_width = 1
-    frame_color = "#B29863"
+    frame_color = "#363846"

    # Define a color for the separator.
    # possible values are:
@@ -75,21 +75,21 @@
 [urgency_low]
    # IMPORTANT: colors have to be defined in quotation marks.
    # Otherwise the "#" and following would be interpreted as a comment.
-    background = "#0C130C"
-    foreground = "#B29863"
+    background = "#0D0C0B"
+    foreground = "#363846"
    timeout = 5
    # Icon for notifications with low urgency, uncomment to enable
    #icon = /path/to/icon

 [urgency_normal]
-    background = "#0C130C"
-    foreground = "#B29863"
+    background = "#0D0C0B"
+    foreground = "#363846"
    timeout = 5

 [urgency_critical]
-    background = "#0C130C"
-    foreground = "#B29863"
-    frame_color = "#B29863"
+    background = "#0D0C0B"
+    foreground = "#363846"
+    frame_color = "#363846"
    timeout = 0

 # Every section that isn't one of the above is interpreted as a rules to
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -170,7 +170,7 @@ gaps inner 10

 workspace 1 output eDP1
 workspace 2 output eDP1
-workspace 3 output HDMI1
+workspace 3 output DP1-1

 # workspace settings
 workspace_auto_back_and_forth yes
@@ -182,6 +182,7 @@ for_window [class="^.*"] title_format "%title [%class]"
 for_window [class="^.*"] border pixel 0
 for_window [class="Telegram"] move scratchpad, border pixel 1
 for_window [class="Mattermost"] move scratchpad, border pixel 1
+for_window [class="discord"] move scratchpad, border pixel 1
 for_window [window_role="floating"] floating enable
 for_window [class="QSyncthingTray"] floating enable
 for_window [class="Thunderbird" window_type="normal"] move scratchpad, floating enable, resize set 1600 1050, border pixel 2
@@ -200,8 +201,10 @@ bindsym Print exec "~/bin/screenshot.sh"

 bindsym $mod+minus [class="Telegram"] scratchpad show
 bindsym $mod+p [class="Mattermost"] scratchpad show
+bindsym $mod+Shift+d [class="discord"] scratchpad show
 bindsym $mod+Shift+s [class="Joplin"] scratchpad show
 bindsym $mod+Shift+z [class="zoom"] scratchpad show
+bindsym $mod+Shift+x [class="Signal"] scratchpad show
 bindsym $mod+Shift+m [class="Thunderbird"] scratchpad show

 bindsym $mod+Delete exec rofi -modi system:$HOME/.config/rofi/scripts/powermenu.sh -show system -theme themes/system-menu
@@ -230,7 +233,7 @@ bindsym XF86MonBrightnessDown exec xrandr --output eDP1 --brightness 1.4 # decre

 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 i3-msg 'workspace 1; exec $TERMINAL; workspace 2; exec chromium;'
 #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
--- a/.config/i3/i3-workspacer.py
+++ b/.config/i3/i3-workspacer.py
@@ -51,7 +51,7 @@ def make_workspace_name(workspace_number, workspace_name):


 def get_workspace_block(workspace_number):
-    return int(math.floor((workspace_number-1)/10))*10
+    return int(math.floor((workspace_number - 1) / 10)) * 10


 def shift_workspace_number(workspace_number, direction, number, exact):
--- a/.config/polybar/config
+++ b/.config/polybar/config
@@ -97,14 +97,14 @@ module-margin-right = 2
 font-0 = RobotoMono Nerd Font:antialias=true:pixelsize=10;1
 font-1 = RobotoMono Nerd Font:antialias=true:size=4;2
 font-2 = RobotoMono Nerd Font:antialias=false:size=14;2
-font-3 - RobotoMono Nerd Font:antialias=true:size=18;0
+#font-3 - RobotoMono Nerd Font:antialias=true:size=18;0

 ; modules-left = s4 battery s3 s4 wlan s3  s4 weather s5 
 ; modules-center = s4 filesystem s5
 ; modules-right =  s4 powermenu s1 pulseaudio s3

 modules-left = battery wlan s_temp s_hum s_press s_pm25 s_pm10
-modules-center = mpd 
+modules-center =  
 modules-right =  

 tray-position = right
@@ -159,7 +159,7 @@ label-unmounted-foreground = ${colors.foreground-alt}
 [module/i3]
 type = internal/i3
 format = <label-state> <label-mode>
-format-font
+#format-font
 index-sort = true
 wrapping-scroll = false

@@ -208,32 +208,6 @@ label-urgent-background = ${colors.primary}
 label-urgent-foreground = ${colors.foreground}
 label-urgent-padding = ${self.label-mode-padding}

-[module/mpd]
-type = internal/mpd
-format-online = <label-song>  <icon-prev> <icon-stop> <icon-play> <icon-next>
-
-
-label-online-background = ${colors.foreground}
-
-toggle-on-foreground = ${colors.foreground}
-toggle-off-foreground = ${colors.foreground}
-
-format-online-background = ${colors.primary}
-format-offline-background = ${colors.primary}
-
-;format-online-foreground = ${colors.foreground}
-;format-offline-foreground = ${colors.foreground}
-
-icon-play = 
-icon-pause = 
-icon-stop = 
-icon-prev = 玲
-icon-next = 怜
-
-
-label-song-maxlen = 60
-label-song-ellipsis = true
-
 [module/xbacklight]
 type = internal/xbacklight

@@ -285,7 +259,7 @@ label = %percentage-sum%
 type = custom/script
 interval = 3
 format-prefix="%{T1}%{T-} "
-format <label>
+#format <label>
 format-background = ${colors.primary}
 exec = python /home/paramah/.config/polybar/polybar-spotify/spotify_status.py -f '{song} by {artist}'

@@ -501,7 +475,7 @@ label-padding =1
 label-warn-padding = 1
 format-warn = <ramp> <label-warn>
 format-warn-background= ${colors.primary}
-hwmon-path = /sys/devices/platform/thinkpad_hwmon/hwmon/hwmon5/temp1_input
+hwmon-path = /sys/devices/platform/thinkpad_hwmon/hwmon/hwmon4/temp1_input
 label = %temperature-c%
 label-warn = %temperature-c%
 label-warn-foreground = ${colors.background}
--- a/.git-commit-template.txt
+++ b/.git-commit-template.txt
@@ -1,23 +1 @@
-# <type>: (If applied, this commit will...) <subject> (Max 50 char)
-# |<----  Using a Maximum Of 50 Characters  ---->|

-# Explain why this change is being made
-# |<----   Try To Limit Each Line to a Maximum Of 72 Characters   ---->|
-
-# Provide links or keys to any relevant tickets, articles or other resources
-# Example: Github issue #23
-
-# --- COMMIT END ---
-# Typy commitów 
-#    feat     (nowa funkcja)
-#    fix      (poprawka)
-#    refactor (refactoring kodu)
-#    style    (formatting stylu kodu, bez zmian funkcjonalnych)
-#    docs     (zmiany w dokumentacji)
-#    test     (testowy commit, bez wpływu na produkcję)
-#
-#
-#
-# Integracja z TAIGA
-# ------------------------------------------------------------------
-# TG-{REF}    (REF to id US/ISSUE/etc w Taiga)
--- a/.gitconfig
+++ b/.gitconfig
@@ -38,8 +38,10 @@

    ; rebase not-yet-pushed commits
    rebaselocal = "!REMOTE=$( git rev-parse --abbrev-ref HEAD@{u} ) ; if [ -n "$REMOTE" ]; then git rebase -i $REMOTE ; else echo "ERROR: Unable to determine remote branch" ; fi"
+
 [diff]
 	tool = vimdiff
+
 [difftool]
 	prompt = false
 [core]
@@ -73,6 +75,39 @@
 	new = green bold
    whitespace = red reverse

+[includeIf "gitdir:~/Projects/jazzy.pro/"]
+    path = ~/Projects/jazzy.pro/.gitconfig
+
+[includeIf "gitdir:~/Projects/CyfroweNiebo/"]
+    path = ~/Projects/CyfroweNiebo/.gitconfig
+
+[includeIf "gitdir:~/Projects/streamsage.io/"]
+    path = ~/Projects/streamsage.io/.gitconfig
+
+[includeIf "gitdir:~/Projects/GONG/"]
+    path = ~/Projects/GONG/.gitconfig
+

 [credential "https://git.jazzy.pro"]
    username = aleksander.cynarski
+[init]
+	defaultBranch = master
+[pull]
+    rebase = false
+
+[pager]
+    diff = delta
+    log = delta
+    reflog = delta
+    show = delta
+
+[delta]
+    plus-style = "syntax #012800"
+    minus-style = "syntax #340001"
+    # syntax-theme = Monokai Extended
+    navigate = true
+    side-by-side = true
+
+[interactive]
+    diffFilter = delta --color-only
+
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@ bin/__pycache__/
 .config/rofi/scripts/__pycache__/
 .phpintel/
 .envrc
+.hajduk.yml
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -25,6 +25,8 @@ bind > command-prompt "move-window -t '%%'"
 bind f command-prompt "resize-pane -Z"
 bind n command-prompt "resize-pane"

+bind-key a set-window-option synchronize-panes\; display-message "synchronize-panes is now #{?pane_synchronized,on,off}"
+
 unbind %
 bind | split-window -h
 unbind '"'
@@ -96,3 +98,4 @@ if "[[ ${TERM} =~ 256color || ${TERM} == fbterm ]]" 'set -g default-terminal scr

 run '~/.tmux/plugins/tpm/tpm'

+set -ga terminal-overrides ",xterm-256color:Tc"
--- a/.zshrc
+++ b/.zshrc
@@ -28,8 +28,8 @@ export PATH="/home/paramah/.gem/ruby/2.3.0/bin:$PATH"
 export PATH="/home/paramah/.gem/ruby/2.5.0/bin:$PATH"
 export PATH="/home/paramah/.gem/ruby/2.7.0/bin:$PATH"
 export PATH="/home/paramah/.local/bin:$PATH"
-export PATH=$PATH:$HOME/.SpaceVim/bin
-export PATH=$PATH:$HOME/.captain/bin
+export PATH="/home/paramah/.cache/rebar3/bin":$PATH
+export PATH=/home/paramah/.captain/bin:$PATH

 #Home bin (last always!)
 export PATH="/home/paramah/go/bin:$PATH"
@@ -63,8 +63,10 @@ plugins=(
  aws
  ssh-agent
  #git-flow-completion
+  docker 
  golang
  terraform
+  aterminal
 )


@@ -233,6 +235,7 @@ source <(hcloud completion zsh)
 #
 eval "$(_JZ_COMPLETE=source_zsh jz)"
 eval "$(_HAJDUK_COMPLETE=source_zsh hajduk)"
+eval "$(_H_COMPLETE=source_zsh h)"
 eval "$(direnv hook zsh)"
 eval "$(register-python-argcomplete gitlab)"

@@ -258,6 +261,18 @@ tfc(){
  terraform console -var-file=vars/$(terraform workspace show).tfvars $1
 }

+
+gitc(){
+    git commit -a -S $1
+}
+
+ec2-list(){
+    aws ec2 describe-instances \
+        --filter "Name=instance-state-name,Values=running" \
+        --query "Reservations[*].Instances[*].[PublicIpAddress, Tags[?Key=='Name'].Value|[0], LaunchTime, InstanceId]" \
+        --output table
+}
+
 # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
 [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh

@@ -270,3 +285,43 @@ complete -C aws_completer aws

 eval "$(_MOLECULE_COMPLETE=source molecule)"
 #. ~/.cache/wal/colors.sh
+#
+#
+
+function prompt_docker_host() {
+    if [[ ! -z "${DOCKER_HOST}" ]]; then
+        proto="$(echo $DOCKER_HOST | grep :// | sed -e's,^\(.*://\).*,\1,g')"
+        url=$(echo $DOCKER_HOST | sed -e s,$proto,,g)
+        user="$(echo $url | grep @ | cut -d@ -f1)"
+        hostport=$(echo $url | sed -e s,$user@,,g | cut -d/ -f1)
+        host="$(echo $hostport | sed -e 's,:.*,,g')"
+
+        p10k segment -b blue -f black -t "${host}"
+    fi
+}
+
+function prompt_jzmode() {
+    if [ -f .jz-mode ]; then
+        p10k segment -b '#012845' -f white -t $(cat .jz-mode)
+    fi
+}
+
+POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS+=docker_host
+POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS+=jzmode
+
+decodeuuid() {
+    http https://www.uuidtools.com/api/decode/$1 |jq
+}
+
+rpg () {
+    rpg-cli "$@"
+    cd "$(rpg-cli pwd)"
+}
+
+mh() {
+    xrandr --output DP1-1 --auto --right-of eDP1
+    xrandr --output DP1-2 --auto --left-of eDP1
+    theme
+}
+export PAGER=bat
+#cat ~/.ideas
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -125,6 +125,8 @@ Plug 'vim-syntastic/syntastic'
 Plug 'juliosueiras/vim-terraform-completion'


+Plug 'stephpy/vim-yaml'
+
 " Salt-Stack (.:REACTIVATE:.)
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 "Plug 'saltstack/salt-vim'