diff options
| -rwxr-xr-x | bin/common/ytclipo | 4 | ||||
| -rwxr-xr-x | bin/extra/1xsearch | 20 | ||||
| -rwxr-xr-x | bin/guiscripts/keyadd | 8 | ||||
| -rwxr-xr-x | bin/menuscripts/mhelp | 20 | ||||
| -rw-r--r-- | config/X/dunst/dunstrc | 13 | ||||
| -rw-r--r-- | config/essentials/nvim/lua/user/remap.lua | 2 | ||||
| -rw-r--r-- | config/home/.zshenv | 7 | ||||
| -rw-r--r-- | config/hyprland/waybar/config.jsonc | 8 |
8 files changed, 33 insertions, 49 deletions
diff --git a/bin/common/ytclipo b/bin/common/ytclipo index 263f1b3..7e7b9cc 100755 --- a/bin/common/ytclipo +++ b/bin/common/ytclipo @@ -19,8 +19,8 @@ notify-send "ytclipo" "<b>downloading</b> $inp" yt-dlp "$inp" \ --restrict-filenames \ -f "b" \ - -S "res:720" \ + -S "res:1080" \ -P "$HOME/vids/youtube/" \ - -o "%(title)s.%(ext)s" + -o "%(channel)s - %(title)s.%(ext)s" notify-send "ytclipo" "<b>ytclipo</b><br>finished downloading." echo "$inp" >> /tmp/ytclipo_history diff --git a/bin/extra/1xsearch b/bin/extra/1xsearch deleted file mode 100755 index a248d38..0000000 --- a/bin/extra/1xsearch +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -# dependencies -which pup > /dev/null || - exit 1 - -test -z "${query:=$1}" && - query="$(cat /dev/stdin)" - -url="https://1337x.to" -query="$(echo "$query" | tr ' ' '+' )" -result="$(curl -s "$url/search/$query/1/" | - pup -p 'a attr{href}' | - grep "^/torrent" | - head -n 1)" -# result contains / as first char -curl -s "$url$result" | - pup -p 'a attr{href}' | - grep "^magnet:" | - head -n 1 diff --git a/bin/guiscripts/keyadd b/bin/guiscripts/keyadd index 96d6d03..1df8896 100755 --- a/bin/guiscripts/keyadd +++ b/bin/guiscripts/keyadd @@ -43,16 +43,16 @@ die "HOST: $HOST" if [ "$1" = "-d" ] then ssh-add -d - < "$SSHFOLDER"/$key.pub && - notify-send "$0" "deleted <b>$key</b>" || - notify-send "$0" "could not delete." + notify-send "keyadd" "deleted <b>$key</b>" || + notify-send "keyadd" "could not delete." elif ! ssh-add -l | grep -q "$(ssh-keygen -lf "$SSHFOLDER"/$key)" then die "adding: $key" export PASSWORD="keys/$HOST/ssh/$key" export SSH_ASKPASS="$0" ssh-add - < "$SSHFOLDER"/$key && - notify-send "$0" "added <b>$key</b>" + notify-send "keyadd" "added <b>$key</b>" else die "key already added." - notify-send "$0" "key already added." + notify-send "keyadd" "key already added." fi diff --git a/bin/menuscripts/mhelp b/bin/menuscripts/mhelp index e03222b..5963a88 100755 --- a/bin/menuscripts/mhelp +++ b/bin/menuscripts/mhelp @@ -1,5 +1,4 @@ #!/usr/bin/env sh -OPTIONS="/tmp/dmh_options.txt" if [ "$MENUCMD" = "tofi" ] then @@ -16,18 +15,15 @@ fi test -z "$program" && exit 1 -if $program --help > "$OPTIONS" -then - option="$(grep "^ *-[-a-zA-Z0-9]* " "$OPTIONS" | - tr -s ' ' | - sort | - uniq | - column -l 2 -t | - $menucmd | - awk '{print $1}')" -fi +option="$($program --help | + # Parse options + grep "^ *-[-a-zA-Z0-9]* " | + tr -s ' ' | + sort | uniq | + column -l 2 -t | + $menucmd | + awk '{print $1}')" test -z "$option" && exit 1 -rm -f "$OPTIONS" setsid $program $option diff --git a/config/X/dunst/dunstrc b/config/X/dunst/dunstrc index 71998b9..3ab0f3d 100644 --- a/config/X/dunst/dunstrc +++ b/config/X/dunst/dunstrc @@ -158,7 +158,7 @@ # %n progress value if set without any extra characters # %% Literal % # Markup is allowed - format = "%b" + format = "[<u>%s</u>]\n%b" # Alignment of message text. # Possible values are "left", "center" and "right". @@ -310,13 +310,13 @@ # Otherwise the "#" and following would be interpreted as a comment. # Icon for notifications with low urgency, uncomment to enable #default_icon = /path/to/icon - background = "#d08770" - foreground = "#2E3541" + background = "#b48ead" + foreground = "#2e3440" frame_color = "#81a1c1" timeout = 6 [urgency_normal] - background = "#b48ead" + background = "#81a1c1" foreground = "#2e3440" frame_color = "#2e3440" timeout = 5 @@ -324,9 +324,10 @@ #default_icon = /path/to/icon [urgency_critical] - background = "#b48ead" - foreground = "#d8dee9" + background = "#d08770" + foreground = "#2e3440" frame_color = "#81a1c1" + format = "[<u>%s</u>]\n<b>%b</b>" timeout = 0 # Icon for notifications with critical urgency, uncomment to enable #default_icon = /path/to/icon diff --git a/config/essentials/nvim/lua/user/remap.lua b/config/essentials/nvim/lua/user/remap.lua index 7c6d87f..e59b81a 100644 --- a/config/essentials/nvim/lua/user/remap.lua +++ b/config/essentials/nvim/lua/user/remap.lua @@ -15,6 +15,8 @@ vim.keymap.set("i", "\\\\", "\\", { noremap = true }) vim.keymap.set("n", "gb", "<cmd>buffers<cr>:buffer<Space>", { noremap = true }) vim.keymap.set("n", "<Leader>q", "<cmd>q!<cr>", { noremap = true }) vim.keymap.set("n", "<Leader>Q", "<cmd>qa!<cr>", { noremap = true }) +-- close all except focused buffer +vim.keymap.set("n", "<leader>1", "<cmd>%bd|e#<cr>", { noremap = true }) -- Windows vim.keymap.set("n", "<A-h>", "<C-W>h", { noremap = true }) diff --git a/config/home/.zshenv b/config/home/.zshenv index d1cd73a..9a8206c 100644 --- a/config/home/.zshenv +++ b/config/home/.zshenv @@ -19,11 +19,16 @@ export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc export GNUPGHOME="$XDG_CONFIG_HOME"/gnupg export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc-2.0 export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME"/npm/npmrc -export NVM_DIR="$XDG_DATA_HOME/nvm" +export NVM_DIR="$XDG_DATA_HOME"/nvm export W3M_DIR="$XDG_STATE_HOME"/w3m export GOPATH="$XDG_DATA_HOME"/go export GOMODCACHE="$XDG_CACHE_HOME"/go/mod export TNS_ADMIN=/opt/oracle/instantclient_21_9/network/admin +export WGETRC="$XDG_CONFIG_HOME"/wgetrc +export NUGET_PACKAGES="$XDG_CACHE_HOME"/NuGetPackages +export PARALLEL_HOME="$XDG_CONFIG_HOME"/parallel +export MYSQL_HISTFILE="$XDG_DATA_HOME"/mysql_history +export RANDFILE="$XDG_CACHE_HOME"/rnd export XINITRC="$XDG_CONFIG_HOME/x11"/xinitrc export XAUTHORITY="$XDG_RUNTIME_DIR"/Xauthority diff --git a/config/hyprland/waybar/config.jsonc b/config/hyprland/waybar/config.jsonc index d2bad38..86938db 100644 --- a/config/hyprland/waybar/config.jsonc +++ b/config/hyprland/waybar/config.jsonc @@ -1,7 +1,7 @@ { "layer": "top", - "modules-left": ["battery", "clock", "hyprland/workspaces", "mpd"], - "modules-center": ["hyprland/window"], + "modules-left": ["battery", "hyprland/workspaces", "mpd"], + "modules-center": ["clock"], "modules-right": ["custom/wireguard", "network", "pulseaudio", "temperature", "cpu", "custom/memory", "tray"], "hyprland/workspaces": { "format": "{icon}", @@ -78,8 +78,8 @@ "restart-interval": 3, }, "clock": { - "format": "{:%H:%M}", - "format-alt": "{:(%R) %A %d %B}", + "format": "{:%R}", + "format-alt": "{:(%T) %A %d %B}", "interval": 1, }, "tray": { |