diff --git a/bspwm/cryfsunlock.sh b/bspwm/cryfsunlock.sh deleted file mode 100755 index 1de223d..0000000 --- a/bspwm/cryfsunlock.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -CRYFS_DIR="/home/greg/.cryfs/" -CRYFS_MOUNT_DIR="/home/greg/cryfs/" - -# Retrieve volume name with zenity -VOLUME=$(zenity --entry --title="Unlock Cryfs" --text="Volume:") - -# Retrieve password with zenity -PASSWORD=$(zenity --password --title="Unlock Cryfs" --text="Volume password:") - -# Unlock the volume -cryfs "$CRYFS_DIR$VOLUME" $CRYFS_MOUNT_DIR$VOLUME <<< $PASSWORD - -# If the unlock was successful, show a success message -if [ $? -eq 0 ]; then - notify-send "Unlock Cryfs" "Volume $VOLUME unlocked successfully" - exit 0 -else - notify-send "Unlock Cryfs" "Failed to unlock volume $VOLUME" - exit 1 -fi diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index c177a27..bd24664 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -16,9 +16,10 @@ $terminal = kitty $fastTerminal = kitty --single-instance $fileManager = thunar -$menu = $HOME/.config/rofi-wayland/launchers/type-6/launcher.sh +$menu = $HOME/.config/rofi-wayland/launchers/type-6/launcher.sh & swaync-client -cp $browser = env GTK_THEME=Adwaita:light zen-browser $privateBrowser = env GTK_THEME=Adwaita:light zen-browser --private-window +$notificationCenter = pkill rofi & swaync-client -t -sw || notify-send --hint int:transient:1 "Error SwayNC is down" ################# ### AUTOSTART ### @@ -286,8 +287,18 @@ input { # https://wiki.hyprland.org/Configuring/Variables/#gestures gestures { - gesture = 3, horizontal, scale: 2, workspace - workspace_swipe_forever = true + # Workspaces + gesture = 3, horizontal, scale: 2, workspace + workspace_swipe_forever = true + + gesture = 4, vertical, dispatcher, exec, pkill rofi || $menu + + # Notification center + gesture = 4, horizontal, dispatcher, exec, $notificationCenter + + # Volume control + gesture = 3, up, dispatcher, exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 10%+ + gesture = 3, down, dispatcher, exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 10%- } # Example per-device config @@ -318,8 +329,8 @@ bind = $mainMod, E, exec, $fileManager bind = $mainMod, Q, exec, $browser bind = $mainMod SHIFT, Q, exec, $privateBrowser bind = $mainMod, Backslash, exec, $fastTerminal -bind = $mainMod, Space, exec, $menu -bind = $mainMod, N, exec, swaync-client -t -sw || notify-send --hint int:transient:1 "Error SwayNC is down" +bind = $mainMod, Space, exec, pkill rofi || $menu +bind = $mainMod, N, exec, $notificationCenter # Open floating terminal bind = $mainMod SHIFT, Return, exec, [float; size 800 600; move center] $fastTerminal --class kitty-float @@ -554,9 +565,9 @@ windowrule = bordercolor rgba(ffff00ff) rgba(ffff0055),tag:voicechatuz bindrn = CTRL, Space, sendshortcut, , F6, class:^(zen)$ # OBS -bindrn = $mainMod CTRL, bracketleft, pass, class:^(com.obsproject.Studio)$ -bindrn = $mainMod CTRL, bracketright, pass, class:^(com.obsproject.Studio)$ -bindrn = $mainMod CTRL, apostrophe, pass, class:^(com.obsproject.Studio)$ +bindr = $mainMod CTRL, bracketleft, pass, class:^(com.obsproject.Studio)$ +bindr = $mainMod CTRL, bracketright, pass, class:^(com.obsproject.Studio)$ +bindr = $mainMod CTRL, apostrophe, pass, class:^(com.obsproject.Studio)$ bind = , XF86PowerOff, exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 35% & ristretto -f ~/Templates/Images/theorist.jpg & play ~/Templates/Sounds/scream.mp3 @@ -609,6 +620,8 @@ windowrule = tag +privacy,title:^(diary)$ windowrule = tag +privacy,class:thunar,title:.*(Downloads|Telegram Desktop).* windowrule = tag +privacy,class:^(Mullvad VPN)$ windowrule = tag +privacy,class:^(Tor Browser)$ +windowrule = tag +privacy,class:^(zen)$,title:.*Private Browsing.* +windowrule = tag +privacy,class:^(Logseq)$ windowrule = tag +privacy,class:^(com.obsproject.Studio)$ # These aren't added in my version yet # layerrule = noscreenshare, swaync-control-center diff --git a/hypr/scripts/toggle_waybar.sh b/hypr/scripts/toggle_waybar.sh index c5359ae..5c09913 100755 --- a/hypr/scripts/toggle_waybar.sh +++ b/hypr/scripts/toggle_waybar.sh @@ -5,5 +5,5 @@ PROGRAM="waybar" if pgrep -x "$PROGRAM" > /dev/null; then pkill -x $PROGRAM else - $PROGRAM & + GTK_THEME="Simply_Circles_Dark" $PROGRAM & fi diff --git a/kitty/colors.old b/kitty/colors.old deleted file mode 100644 index c5ea118..0000000 --- a/kitty/colors.old +++ /dev/null @@ -1,23 +0,0 @@ -# Color theme: Base4Tone Classic P -# Auto-generated by Gogh (https://Gogh-Co.github.io/Gogh/) - -color0 #1c1d21 -color1 #BF562F -color2 #1398aa -color3 #3ccadd -color4 #929ff7 -color5 #a57af0 -color6 #23b4c7 -color7 #ffe8ee -color8 #57585d -color9 #c06935 -color10 #5ad2e2 -color11 #a4e6ef -color12 #d0d5fb -color13 #b792f6 -color14 #c6cdfb -color15 #f6f6f9 -#background #09141B -background #0e1b28 -foreground #9092a2 -cursor #6a878a diff --git a/kitty/sakura.conf.old b/kitty/sakura.conf.old deleted file mode 100644 index 831f3d4..0000000 --- a/kitty/sakura.conf.old +++ /dev/null @@ -1,24 +0,0 @@ -# Color theme Base2Tone Suburb -# Auto-generated by Gogh (https//Gogh-Co.github.io/Gogh/) - - - -color0 #444551 -color1 #9E2238 -color2 #BB6F80 -color3 #DA97B0 -color4 #b12761 -color5 #D58399 -color6 #D6D8DA -color7 #D6D8DA -color8 #62636F -color9 #BC4056 -color10 #eB9FB0 -color11 #F8B5CE -color12 #d14781 -color13 #F3A1B7 -color14 #F4F6F8 -color15 #F4F6F8 -background #1e1f29 -foreground #878b96 -cursor #d14781 diff --git a/kitty/suburb.conf.old b/kitty/suburb.conf.old deleted file mode 100644 index f81721b..0000000 --- a/kitty/suburb.conf.old +++ /dev/null @@ -1,22 +0,0 @@ -# Color theme: Base2Tone Suburb -# Auto-generated by Gogh (https://Gogh-Co.github.io/Gogh/) - -color0 #1e202f -color1 #7586f5 -color2 #fb6fa9 -color3 #ffb3d2 -color4 #8696fd -color5 #fb6fa9 -color6 #a0acfe -color7 #878ba6 -color8 #2f3452 -color9 #fe81b5 -color10 #292c3d -color11 #242844 -color12 #5b6080 -color13 #d2d8fe -color14 #f764a1 -color15 #ebedff -background #1e202f -foreground #878ba6 -cursor #d14781 diff --git a/libinput-gestures.conf b/libinput-gestures.conf deleted file mode 100644 index 8260a93..0000000 --- a/libinput-gestures.conf +++ /dev/null @@ -1,203 +0,0 @@ -# Configuration file for libinput-gestures. -# Mark Blakeney, Sep 2015 -# -# The default configuration file exists at /etc/libinput-gestures.conf -# but a user can create a personal custom configuration file at -# ~/.config/libinput-gestures.conf. -# -# Lines starting with '#' and blank lines are ignored. Currently -# "gesture" and "device" configuration keywords are supported as -# described below. The keyword can optionally be appended with a ":" (to -# maintain compatibility with original format configuration files). -# -# Each gesture line has 3 [or 4] arguments separated by whitespace: -# -# action motion [finger_count] command -# -# where action and motion is either: -# swipe up -# swipe down -# swipe left -# swipe right -# swipe left_up -# swipe left_down -# swipe right_up -# swipe right_down -# pinch in -# pinch out -# pinch clockwise -# pinch anticlockwise -# hold on (hold gesture available since libinput 1.19) -# hold on+1.5 (another hold gesture, invoked after delay) -# -# command is the remainder of the line and is any valid shell command + -# arguments. NOTE that the command is run directly and is not parsed by -# your shell. If you want shell parsing and substitutions etc then use a -# script as described in the CONFIGURATION section of the main README. -# -# finger_count is a single numeric digit and is optional (and is -# typically 3 or 4). If specified then the command is executed when -# exactly that number of fingers is used in the gesture. If not -# specified then the command is executed when that gesture is executed -# with any number of fingers. Gesture lines specified with finger_count -# have priority over the same gesture specified without any -# finger_count. -# -# Typically command will be _internal, or xdotool. See "man xdotool" for -# the many things you can action with that tool. Note that unfortunately -# xdotool does not work with native Wayland clients. - -############################################################################### -# SWIPE GESTURES: -############################################################################### - -# Note the default is an "internal" command that uses wmctrl to switch -# workspaces and, unlike xdotool, works on both Xorg and Wayland (via -# XWayland). It also can be configured for vertical and horizontal -# switching over tabular workspaces, as per the example below. You can -# also add "-w" to the internal command to allow wrapping workspaces. -# Ensure you install wmctrl if you use _internal. - -# Move to next workspace (works for GNOME/KDE/etc on Wayland and Xorg) -# gesture swipe up _internal ws_up - -# NOTE ABOUT FINGER COUNT: -# The above command will configure this command for all fingers (i.e. 3 -# for 4) but to configure it for 3 fingers only, change it to: -# gesture swipe up 3 _internal ws_up -# Then you can configure something else for 4 fingers or leave 4 fingers -# unconfigured. You can configure an explicit finger count like this for -# all example commands in this configuration file. -# -# gesture swipe up xdotool key super+Page_Down -gesture swipe up 4 wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 10%+ -gesture swipe down 4 wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 10%- - -# Move to prev workspace (works for GNOME/KDE/etc on Wayland and Xorg) -# gesture swipe down _internal ws_down -# gesture swipe down xdotool key super+Page_Up - -# Browser go forward (works only for Xorg, and Xwayland clients) -# gesture swipe left xdotool key alt+Right - -# Browser go back (works only for Xorg, and Xwayland clients) -# gesture swipe right xdotool key alt+Left - -# Open new browser tag ("hold on" available since libinput 1.19) -# gesture hold on 4 xdotool key control+t - -# NOTE: If you don't use "natural" scrolling direction for your touchpad -# then you may want to swap the above default left/right and up/down -# configurations. - -# Optional extended swipe gestures, e.g. for browser tab navigation: -# -# Jump to next open browser tab -# gesture swipe right_up xdotool key control+Tab -# -# Jump to previous open browser tab -# gesture swipe left_up xdotool key control+shift+Tab -# -# Close current browser tab -# gesture swipe left_down xdotool key control+w -# -# Reopen and jump to last closed browser tab -# gesture swipe right_down xdotool key control+shift+t - -# Example of 8 static workspaces, e.g. using KDE virtual-desktops, -# arranged in 2 rows of 4 columns across using swipe up/down/left/right -# to navigate in fixed planes. You can also add the "-w/--wrap" option -# to allow wrapping in any direction. You must configure your virtual -# desktops with the same column dimension. -# gesture swipe up _internal --cols 4 ws_up -# gesture swipe down _internal --cols 4 ws_down -# gesture swipe left _internal --cols 4 ws_left -# gesture swipe right _internal --cols 4 ws_right -# -# Example of 16 static workspaces, e.g. using KDE virtual-desktops, -# arranged in 4 rows of 4 columns across using swipe up/down/left/right -# to navigate in fixed planes, and also using swipe -# left_up/left_down/right_up/right_down to navigate diagonally. You can -# also add the "-w/--wrap" option to allow wrapping in any direction -# and/or diagonally. You must configure your virtual desktops with the -# same column dimension. -# gesture swipe up _internal --cols 4 ws_up -# gesture swipe down _internal --cols 4 ws_down -# gesture swipe left _internal --cols 4 ws_left -# gesture swipe right _internal --cols 4 ws_right -# gesture swipe left_up _internal --cols 4 ws_left_up -# gesture swipe left_down _internal --cols 4 ws_left_down -# gesture swipe right_up _internal --cols 4 ws_right_up -# gesture swipe right_down _internal --cols 4 ws_right_down - -# Example virtual desktop switching for Ubuntu Unity/Compiz. The -# _internal command does not work for Compiz but you can explicitly -# configure the swipe commands to work for a Compiz virtual 2 -# dimensional desktop as follows: -# gesture swipe up xdotool key ctrl+alt+Up -# gesture swipe down xdotool key ctrl+alt+Down -# gesture swipe left xdotool key ctrl+alt+Left -# gesture swipe right xdotool key ctrl+alt+Right - -# Example to change audio volume (this works on both Wayland and Xorg): -# Note each swipe only steps volume once. -# swipe up 4 amixer set Master "8%+" -# swipe down 4 amixer set Master "8%-" - -############################################################################### -# PINCH GESTURES: -############################################################################### - -# GNOME SHELL open/close overview (works for GNOME on Xorg only) -# gesture pinch in xdotool key super+s -# gesture pinch out xdotool key super+s - -# KDE Plasma open/close overview -# gesture pinch in xdotool key ctrl+F9 -# gesture pinch out xdotool key ctrl+F9 - -# GNOME SHELL open/close overview (works for GNOME on Wayland and Xorg) -# Note since GNOME 3.24 on Wayland this is implemented natively so no -# real point configuring for Wayland. -# gesture pinch in dbus-send --session --type=method_call --dest=org.gnome.Shell /org/gnome/Shell org.gnome.Shell.Eval string:'Main.overview.toggle();' -# gesture pinch out dbus-send --session --type=method_call --dest=org.gnome.Shell /org/gnome/Shell org.gnome.Shell.Eval string:'Main.overview.toggle();' - -# Optional extended pinch gestures: -# gesture pinch clockwise -# gesture pinch anticlockwise - -############################################################################### -# This application normally determines your touchpad device -# automatically. Some users may have multiple touchpads but by default -# we use only the first one found. However, you can choose to specify -# the explicit device name to use. Run "libinput list-devices" to work -# out the name of your device (from the "Device:" field). Then add a -# device line specifying that name, e.g: -# -# device DLL0665:01 06CB:76AD Touchpad -# -# If the device name starts with a '/' then it is instead considered as -# the explicit device path although since device paths can change -# through reboots this is best to be a symlink. E.g. instead of specifying -# /dev/input/event12, you should use the corresponding full path link -# under /dev/input/by-path/ or /dev/input/by-id/. -# -# You can choose to use ALL touchpad devices by setting the device name -# to "all". E.g. Do this if you have multiple touchpads which you want -# to use in parallel. This reduces performance slightly so only set this -# if you have to. -# -# device all - -############################################################################### -# You can set a minimum travel distance threshold before swipe gestures -# are actioned using the swipe_threshold configuration command. -# Specify this value in dots. The default is 0. -# E.g. set it to 100 dots with "swipe_threshold 100". -# swipe_threshold 0 - -############################################################################### -# You can set a timeout on gestures from start to end. The default is -# the value commented below. It can be any value in float secs >= 0. -# 0 = no timeout. E.g. set it to 2 secs with "timeout 2". -# timeout 1.5 diff --git a/rofi-wayland/launchers/type-6/images/372954c93248c512ad30157ff1fb0d3a.jpg b/rofi-wayland/launchers/type-6/images/372954c93248c512ad30157ff1fb0d3a.jpg deleted file mode 100644 index 3554d0e..0000000 Binary files a/rofi-wayland/launchers/type-6/images/372954c93248c512ad30157ff1fb0d3a.jpg and /dev/null differ diff --git a/rofi-wayland/launchers/type-6/images/4-27.png b/rofi-wayland/launchers/type-6/images/4-27.png deleted file mode 100644 index 2c7071d..0000000 Binary files a/rofi-wayland/launchers/type-6/images/4-27.png and /dev/null differ diff --git a/rofi-wayland/launchers/type-6/images/oijoij.jpg b/rofi-wayland/launchers/type-6/images/oijoij.jpg deleted file mode 100644 index abed024..0000000 Binary files a/rofi-wayland/launchers/type-6/images/oijoij.jpg and /dev/null differ diff --git a/rofi-wayland/launchers/type-6/images/oijoijoweifjo.jpg b/rofi-wayland/launchers/type-6/images/oijoijoweifjo.jpg deleted file mode 100644 index b1c1c05..0000000 Binary files a/rofi-wayland/launchers/type-6/images/oijoijoweifjo.jpg and /dev/null differ diff --git a/waybar/config.jsonc b/waybar/config.jsonc index 79f3135..a66eae4 100644 --- a/waybar/config.jsonc +++ b/waybar/config.jsonc @@ -138,13 +138,19 @@ "format": "{:%H:%M:%S}", "format-alt": "{:%Y-%m-%d}", "calendar": { - "format": { - // "months": "{}", + "mode": "year", + "mode-mon-col": 3, + "weeks-pos": "right", + "format": { + "months": "{}", "days": "{}", "weeks": "W{}", "weekdays": "{}", - "today": "{}" - } + "today": "{}" + } + }, + "actions": { + "on-click-right": "mode" } }, "cpu": {