From 6f6ca6f79d8a1aa40ac44074e6e021ac766fed35 Mon Sep 17 00:00:00 2001 From: Tobias Reisinger Date: Mon, 11 Dec 2023 00:36:03 +0100 Subject: [PATCH] Update configs due to newer programs (hypr, eza@aliasrc) Add new features to ansible-vault-manager Add search engines to qutebrowser Add location to waybar weather --- ...le-vault-pass.sh => ansible-vault-manager} | 19 ++++++++++- .config/aliasrc | 2 +- .config/env.d/20-ansible | 2 +- .config/hypr/binds.conf | 1 + .config/hypr/dracula.conf | 30 +++++++++++++----- .config/qutebrowser/common.py | 2 ++ .config/waybar/config | 3 -- .config/waybar/custom/weather | 6 ++-- .local/share/yadm/archive | Bin 1880 -> 1884 bytes 9 files changed, 49 insertions(+), 16 deletions(-) rename .bin/{ansible-vault-pass.sh => ansible-vault-manager} (59%) diff --git a/.bin/ansible-vault-pass.sh b/.bin/ansible-vault-manager similarity index 59% rename from .bin/ansible-vault-pass.sh rename to .bin/ansible-vault-manager index 995d833..cc619ba 100755 --- a/.bin/ansible-vault-pass.sh +++ b/.bin/ansible-vault-manager @@ -25,5 +25,22 @@ if ! pass "ansible/$project" >/dev/null 2>&1; then exit 1 fi -pass "ansible/$project" +pass_content=$(pass "ansible/$project") +pass_path=$project_dir/$(echo "$pass_content" | grep "path:" | cut -d' ' -f2-) +case "$1" in + edit) + pass edit "ansible/$project" + exit 0 + ;; + deploy) + pass show "ansible/$project.file" > "$pass_path" + exit 0 + ;; + save) + pass insert -m "ansible/$project.file" < "$pass_path" + exit 0 + ;; +esac + +echo "$pass_content" | head -n 1 diff --git a/.config/aliasrc b/.config/aliasrc index 470d3b9..b3c2e47 100644 --- a/.config/aliasrc +++ b/.config/aliasrc @@ -73,7 +73,7 @@ alias xdebug='XDEBUG_CONFIG="remote_host=127.0.0.1 remote_port=9003"' test -x "$(command -v bat)" && alias cat='bat -pp' -test -x "$(command -v eza)" && alias ls='eza -lhF --git --icons --color=always --color-scale --time-style=long-iso --group-directories-first' +test -x "$(command -v eza)" && alias ls='eza -lhF --git --icons --color=always --color-scale --color-scale-mode=fixed --time-style=long-iso --group-directories-first' test -x "$(command -v moar)" && alias less='moar' diff --git a/.config/env.d/20-ansible b/.config/env.d/20-ansible index db56a03..e13f370 100755 --- a/.config/env.d/20-ansible +++ b/.config/env.d/20-ansible @@ -1,4 +1,4 @@ #!/usr/bin/env sh -export ANSIBLE_VAULT_PASSWORD_FILE="$HOME/.bin/ansible-vault-pass.sh" +export ANSIBLE_VAULT_PASSWORD_FILE="$HOME/.bin/ansible-vault-manager" export ANSIBLE_PYTHON_INTERPRETER='auto_silent' diff --git a/.config/hypr/binds.conf b/.config/hypr/binds.conf index 3eb6f06..0139335 100644 --- a/.config/hypr/binds.conf +++ b/.config/hypr/binds.conf @@ -9,6 +9,7 @@ bind = $main_mod, F, fullscreen, bind = $main_mod, D, exec, j4-dmenu-desktop --dmenu="$DMENU" bind = $main_mod, Pause, exec, menu-shutdown +bind = $main_mod, T, exec, ts-control bind = $main_mod, Print, exec, screenshot bind = $main_mod CTRL, Print, exec, screenshot --no-upload diff --git a/.config/hypr/dracula.conf b/.config/hypr/dracula.conf index 34cc907..077d580 100644 --- a/.config/hypr/dracula.conf +++ b/.config/hypr/dracula.conf @@ -1,18 +1,32 @@ # dracula/hyprland general { - col.active_border = rgb(bd93f9) + col.active_border = rgb(44475a) rgb(bd93f9) 90deg col.inactive_border = rgba(44475aaa) - col.group_border = rgba(282a36dd) - col.group_border_active = rgb(bd93f9) + # non-gradient alternative + #col.active_border = rgb(bd93f9) + #col.inactive_border = rgba(44475aaa) + #col.group_border = rgba(282a36dd) + #col.group_border_active = rgb(bd93f9) + # darker alternative + #col.active_border = rgb(44475a) # or rgb(6272a4) + #col.inactive_border = rgb(282a36) + #col.group_border = rgb(282a36) + #col.group_border_active = rgb(44475a) # or rgb(6272a4) } decoration { col.shadow = rgba(1E202966) # suggested shadow setting - drop_shadow = yes - shadow_range = 60 - shadow_offset = 1 2 - shadow_render_power = 3 - shadow_scale = 0.97 + #drop_shadow = yes + #shadow_range = 60 + #shadow_offset = 1 2 + #shadow_render_power = 3 + #shadow_scale = 0.97 +} +group { + groupbar { + col.active = rgb(bd93f9) rgb(44475a) 90deg + col.inactive = rgba(282a36dd) + } } #windowrulev2 = bordercolor rgb(ff5555),xwayland:1 # check if window is xwayland diff --git a/.config/qutebrowser/common.py b/.config/qutebrowser/common.py index aba2edb..6447b96 100644 --- a/.config/qutebrowser/common.py +++ b/.config/qutebrowser/common.py @@ -30,6 +30,8 @@ def init(c): c.url.searchengines = { 'DEFAULT': 'https://duckduckgo.com/?q={}', + 'ddg': 'https://duckduckgo.com/?q={}', + 'kagi': 'https://kagi.com/search?q={}' } c.url.start_pages = ['rss.serguzim.me', 'open.spotify.com'] diff --git a/.config/waybar/config b/.config/waybar/config index 77088b0..d96ef05 100644 --- a/.config/waybar/config +++ b/.config/waybar/config @@ -23,9 +23,6 @@ "on-click": "activate", "all-outputs": true, "sort-by-number": true, - "persistent_workspaces": { - "*": 10 - } }, "hyprland/window": { "max-length": 128 diff --git a/.config/waybar/custom/weather b/.config/waybar/custom/weather index e27f165..7ca71e7 100755 --- a/.config/waybar/custom/weather +++ b/.config/waybar/custom/weather @@ -2,6 +2,7 @@ #!nix-shell -i python -p python3 python3Packages.requests import json +import os import requests from datetime import datetime @@ -58,8 +59,9 @@ WEATHER_CODES = { data = {} - -weather = requests.get("https://wttr.in/?format=j1").json() +place = os.environ.get('WTTR_PLACE', 'Berlin') +url = "https://wttr.in/" + place + "?format=j1" +weather = requests.get(url).json() def format_time(time): diff --git a/.local/share/yadm/archive b/.local/share/yadm/archive index 206966368f2a6e59374eff79d94b63c5eef25f94..7a20cec6c8f0c90c02d6dfa0e2e4359e0a1e8a21 100644 GIT binary patch literal 1884 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