diff --git a/.bash_aliases b/.bash_aliases index 933dead..7997a44 100644 --- a/.bash_aliases +++ b/.bash_aliases @@ -3,7 +3,7 @@ alias mountwww="sudo mount -t nfs manjarodesktop:/home/mg/www /mnt/www" alias mountns="sudo mount -t nfs manjarodesktop:/mnt/TerraBeef/NetShare /mnt/manjaroshare" alias sshcloud="ssh -p 1919 emge@95.217.8.112" alias config="/usr/bin/git --git-dir=$HOME/.cfg/ --work-tree=$HOME" -alias syncheavy="rsync -azP --no-perms --no-owner --no-group --no-times --delete /home/emge/Development/11ty-projects/heavy-rocks/_site/ emge@95.217.8.112:/var/www/heavy.rocks/" +alias syncheavy="rsync -azP -e 'ssh -p 1919' --no-perms --no-owner --no-group --no-times --delete /home/emge/Development/11ty-projects/heavy-rocks/_site/ emge@95.217.216.54:/var/www/heavy.rocks/" alias s!="sudo systemctl" alias portcheck="sudo lsof -i -P -n | grep LISTEN" alias pubip="dig +short myip.opendns.com @resolver1.opendns.com" diff --git a/.config/dunst/dunstrc b/.config/dunst/dunstrc index 9d849b9..524aa2c 100644 --- a/.config/dunst/dunstrc +++ b/.config/dunst/dunstrc @@ -27,13 +27,13 @@ width = 500 # The maximum height of a single notification, excluding the frame. - height = 300 + height = (0, 300) # Position the notification in the top right corner origin = top-right # Offset from the origin - offset = 25x25 + offset = (25, 25) # Scale factor. It is auto-detected if value is 0. scale = 0 @@ -61,7 +61,7 @@ progress_bar_max_width = 300 # Corner radius for the progress bar. 0 disables rounded corners. - progress_bar_corner_radius = 15 + progress_bar_corner_radius = 5 # Define which corners to round when drawing the progress bar. If progress_bar_corner_radius # is set to 0 this option will be ignored. @@ -214,7 +214,7 @@ enable_recursive_icon_lookup = true # Set icon theme (only used for recursive icon lookup) - icon_theme = "Papirus, Adwaita" + icon_theme = "Papirus-Dark, Adwaita" # You can also set multiple icon themes, with the leftmost one being used first. # icon_theme = "Adwaita, breeze" @@ -224,13 +224,13 @@ # Scale small icons up to this size, set to 0 to disable. Helpful # for e.g. small files or high-dpi screens. In case of conflict, # max_icon_size takes precedence over this. - min_icon_size = 16 + min_icon_size = 64 # Scale larger icons down to this size, set to 0 to disable max_icon_size = 128 # Paths to default icons (only necessary when not using recursive icon lookup) - icon_path = /usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/ + #icon_path = /usr/share/icons/Papirus/16x16/status/:/usr/share/icons/Papirus/16x16/devices/ ### History ### @@ -356,6 +356,12 @@ # Icon for notifications with critical urgency, uncomment to enable #default_icon = /path/to/icon +# [Volume] +# history_ignore = true +# +# [Brightness] +# history_ignore = true + # Every section that isn't one of the above is interpreted as a rules to # override settings for certain messages. # diff --git a/.config/nvim/lua/config/options.lua b/.config/nvim/lua/config/options.lua index 262e9cb..cacca34 100644 --- a/.config/nvim/lua/config/options.lua +++ b/.config/nvim/lua/config/options.lua @@ -1,6 +1,8 @@ vim.g.loaded_netrw = 1 -- disable netrw for nvim-tree vim.g.loaded_netrwPlugin = 1 -- recommended for nvim-tree +vim.opt.clipboard = "unnamedplus" -- set clipboard register vim.opt.number = true -- turn line numbers on +vim.opt.relativenumber = true -- turn relative line numbers on vim.opt.ignorecase = true -- ignore case when searching vim.opt.hlsearch = true -- highlight search results vim.opt.tabstop = 2 -- set number of spaces for a tab diff --git a/.config/sway/config b/.config/sway/config index 8ef280d..b21f419 100644 --- a/.config/sway/config +++ b/.config/sway/config @@ -43,7 +43,7 @@ bindsym $mod+Shift+m exec dunstctl close-all # output * bg ~/Wallpapers/orangeMountains.png fill # output * bg #c0caf5 solid_color # output * bg ~/Wallpapers/wp9285156.jpg fill -output * bg ~/Source/tokyonight-wallpapers/tron_original.png fill +output * bg ~/Source/tokyonight-wallpapers/void_upscayl_realesrgan-x4plus_x2.png fill # # Example configuration: # @@ -66,14 +66,15 @@ output eDP-1 resolution 1920x1080 position 0,0 # your displays after another 300 seconds, and turn your screens back on when # resumed. It will also lock your screen before your computer goes to sleep. -set $lock 'swaylock -e -F -i /home/emge/Source/tokyonight-wallpapers/fly_original.png' +# set $lock 'swaylock -e -F -i /home/emge/Source/tokyonight-wallpapers/void_upscayl_realesrgan-x4plus_x2.png --indicator-radius 175 --indicator-y-position 525 --inside-color 000000AA' +set $lock 'swaylock' exec swayidle -w \ timeout 300 $lock \ timeout 310 'swaymsg "output * power off"' resume 'swaymsg "output * power on"' \ before-sleep $lock set $lockman 'exec bash ~/.config/sway/lockman.sh' -bindsym $mod+l exec $lockman +bindsym $mod+x exec $lockman ### Input configuration # @@ -129,15 +130,15 @@ input "10248:257:FTCS1000:00_2808:0101_Touchpad" { # Moving around: # # Move your focus around - # bindsym $mod+$left focus left - # bindsym $mod+$down focus down - # bindsym $mod+$up focus up - # bindsym $mod+$right focus right + bindsym $mod+$left focus left + bindsym $mod+$down focus down + bindsym $mod+$up focus up + bindsym $mod+$right focus right # Or use $mod+[up|down|left|right] - bindsym $mod+Left focus left - bindsym $mod+Down focus down - bindsym $mod+Up focus up - bindsym $mod+Right focus right + # bindsym $mod+Left focus left + # bindsym $mod+Down focus down + # bindsym $mod+Up focus up + # bindsym $mod+Right focus right # Move the focused window with the same, but add Shift bindsym $mod+Shift+$left move left @@ -149,7 +150,7 @@ input "10248:257:FTCS1000:00_2808:0101_Touchpad" { bindsym $mod+Shift+Down move down bindsym $mod+Shift+Up move up bindsym $mod+Shift+Right move right -#r +# # Workspaces: # # Switch to workspace @@ -241,12 +242,16 @@ bindsym $mod+r mode "resize" # # Custom keybinds for latop controls # -bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5% -bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -5% -bindsym XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle +bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5% && /home/emge/Scripts/volume-notif.sh +bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -5% && /home/emge/Scripts/volume-notif.sh +bindsym XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle && /home/emge/Scripts/volume-notif.sh bindsym XF86AudioMicMute exec pactl set-source-mute @DEFUALT_SOURCE@ toggle -bindsym XF86MonBrightnessDown exec brightnessctl set 5%- -bindsym XF86MonBrightnessUp exec brightnessctl set 5%+ +bindsym XF86MonBrightnessDown exec brightnessctl set 5%- && /home/emge/Scripts/brightness_notif.sh +bindsym XF86MonBrightnessUp exec brightnessctl set 5%+ && /home/emge/Scripts/brightness_notif.sh +bindsym Print exec /home/emge/Scripts/screenshot.sh +bindsym $mod+Shift+s exec /home/emge/Scripts/screenshot-select.sh +bindsym $mod+Shift+u exec /home/emge/Scripts/quick-note.sh +bindsym $mod+Shift+p exec hyprpicker -a # # Status Bar: @@ -286,22 +291,22 @@ client.unfocused "#2d3f76" "#2d3f76" "#ff757f" client.focused_inactive "#2d3f76" "#2d3f76" "#ff757f" ### Swayfx options -corner_radius 15 - -blur on -blur_xray off -blur_passes 2 -blur_radius 5 - -shadows off -shadows_on_csd off -shadow_blur_radius 20 -shadow_color #0000007F - -# inactive window fade amount 0.0 = no dimming, 1.0 = fully dimmed -default_dim_inactive 0.0 -dim_inactive_colors.unfocused #000000FF -dim_inactive_colors.urgent #900000FF - -# move minimized windows to scratchpad -scratchpad_minimize disable +# corner_radius 5 +# +# blur on +# blur_xray off +# blur_passes 2 +# blur_radius 5 +# +# shadows off +# shadows_on_csd off +# shadow_blur_radius 20 +# shadow_color #0000007F +# +# # inactive window fade amount 0.0 = no dimming, 1.0 = fully dimmed +# default_dim_inactive 0.0 +# dim_inactive_colors.unfocused #000000FF +# dim_inactive_colors.urgent #900000FF +# +# # move minimized windows to scratchpad +# scratchpad_minimize disable diff --git a/.config/sway/lockman.sh b/.config/sway/lockman.sh index bebfd2b..582dc34 100644 --- a/.config/sway/lockman.sh +++ b/.config/sway/lockman.sh @@ -2,5 +2,6 @@ swayidle \ timeout 10 'swaymsg "output * power off"' \ resume 'swaymsg "output * power on"' & -swaylock -e -F -i ~/Source/tokyonight-wallpapers/fly_original.png +#swaylock -e -F -i /home/emge/Source/tokyonight-wallpapers/void_upscayl_realesrgan-x4plus_x2.png --indicator-radius 175 --indicator-y-position 525 --inside-color 000000AA +swaylock kill %% diff --git a/.config/swaylock/config b/.config/swaylock/config new file mode 100644 index 0000000..cbff9c5 --- /dev/null +++ b/.config/swaylock/config @@ -0,0 +1,12 @@ +ignore-empty-password + +show-failed-attempts + +image=/home/emge/Source/tokyonight-wallpapers/void_upscayl_realesrgan-x4plus_x2.png + +indicator-radius=175 +indicator-y-position=525 +inside-color=1b1d2bAA +ring-color=2d3f76ff +key-hl-color=82aaffff +bs-hl-color=ff757fff diff --git a/.config/waybar/config b/.config/waybar/config index e88ded7..eef5a29 100644 --- a/.config/waybar/config +++ b/.config/waybar/config @@ -30,7 +30,7 @@ "clock": { "interval": 60, - "format": "{:%a %b %e %I:%M}", + "format": "{:%a, %b %e / %I:%M /}", "tooltip-format": "{calendar}", "calendar": { "mode" : "year", @@ -144,6 +144,7 @@ "format-bluetooth": "󰂰 ", "format-muted": " ", "format-icons": { + "headphone": " ", "default": ["", ""] }, "justify": "center", @@ -165,11 +166,11 @@ "format": "{icon}", "return-type": "json", "format-icons": { - "has-updates": " ", + "pending-updates": " ", "updated": "" }, - "exec-if": "which waybar-module-pacman-updates", - "exec": "waybar-module-pacman-updates --interval-seconds 5 --network-interval-seconds 300" + "exec-if": "which waybar-updates", + "exec": "waybar-updates -n" }, "bluetooth": { diff --git a/.config/waybar/style.css b/.config/waybar/style.css index 9944841..324b0a4 100644 --- a/.config/waybar/style.css +++ b/.config/waybar/style.css @@ -145,6 +145,6 @@ tooltip { background-color: @foreground; } -#custom-updates.has-updates { +#custom-updates.pending-updates { color: @16; } diff --git a/Scripts/background-changer.sh b/Scripts/background-changer.sh new file mode 100755 index 0000000..3da6e79 --- /dev/null +++ b/Scripts/background-changer.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +wallpapers_path=/home/emge/Wallpapers/ + +# while true; do +# swaybg -i $(find $wallpapers_path -type f | shuf -n 1) -m fill +# sleep 29m +# done +# sleep 1m + +swaymsg output "*" bg $(find $wallpapers_path -type f | shuf -n 1) fill diff --git a/Scripts/brightness_notif.sh b/Scripts/brightness_notif.sh new file mode 100755 index 0000000..60a3f00 --- /dev/null +++ b/Scripts/brightness_notif.sh @@ -0,0 +1,14 @@ +#!/bin/bash +# dunst change brightness notification + +# set varialbe $brightness to current brightness level +brightness=$(cat /sys/class/backlight/acpi_video0/actual_brightness) + +# set variable $max to current max brightness level +max=$(cat /sys/class/backlight/acpi_video0/max_brightness) + +# calculate percentage +brightness_percent=$(((brightness * 100) / max)) + +# show brightness notification +dunstify -u low -i brightness -h string:x-dunst-stack-tag:Brightness -h int:value:"$brightness_percent" "Brightness: ${brightness_percent}%" diff --git a/Scripts/quick-note.sh b/Scripts/quick-note.sh new file mode 100755 index 0000000..56aa26e --- /dev/null +++ b/Scripts/quick-note.sh @@ -0,0 +1,12 @@ +#!/bin/bash +# open quicknote + +# set quick note directory +dir="/home/emge/Notes/QuickNotes/" + +# set current date +curDate=$(date +"%Y-%m-%d") + +file=$dir$curDate".md" + +foot nvim $file diff --git a/Scripts/screenshot-select.sh b/Scripts/screenshot-select.sh new file mode 100755 index 0000000..04dc35e --- /dev/null +++ b/Scripts/screenshot-select.sh @@ -0,0 +1,23 @@ +#!/bin/bash +# take screenshot of selection and save to +# default screenshots directory + +# set default screenshots directory +dir="/home/emge/Pictures/screenshots/" + +# set current date +curDate=$(date +"%Y-%m-%d") + +i="1" +file=$dir$curDate"_"$i".png" + +while [ -f $file ] ; +do + i=$((i + "1")) + file=$dir$curDate"_"$i".png" +done + +grim -g "$(slurp)" $file + +# show screenshot notification +dunstify -u low -i accessories-screenshot -h string:x-dunst-stack-tag:Screenshot "Screenshot saved:" $file diff --git a/Scripts/volume-notif.sh b/Scripts/volume-notif.sh new file mode 100755 index 0000000..04180ba --- /dev/null +++ b/Scripts/volume-notif.sh @@ -0,0 +1,19 @@ +#!/bin/bash +# dunst change volume notification + +# set varialbe $volume to current volume level +# --get-volume returns two equal values, the awk +# pipe pulls just the first one - both values +# should match unless balance was adjusted +volume=$(pulsemixer --get-volume | awk '{print $1}') + +# set variable $muted to current mute setting +muted=$(pulsemixer --get-mute) + +if [[ $muted == 1 || $volume == 0 ]]; then + # show muted notification + dunstify -u low -i audio-volume-muted -h string:x-dunst-stack-tag:Volume "Volume Muted" +else + # show volume notification + dunstify -u low -i audio-volume-high -h string:x-dunst-stack-tag:Volume -h int:value:"$volume" "Volume: ${volume}%" +fi