From 3965532bcf6df3f251fddfbe88cd1c6f80d3a67e Mon Sep 17 00:00:00 2001 From: Clay Gomera Date: Thu, 27 Apr 2023 18:58:55 -0400 Subject: [PATCH] updated --- new-config/.config/fish/config.fish | 3 + new-config/.config/hypr/hyprland.conf | 1 + new-config/.config/lvim/config.lua | 4 +- new-config/.config/musikcube/hotkeys.json | 68 ++++++++ new-config/.config/newsboat/urls | 13 +- new-config/.config/qt5ct/qt5ct.conf | 2 +- new-config/.config/qt6ct/qt6ct.conf | 3 +- new-config/.config/rofi/scripts/rofi_power | 14 +- new-config/.config/rofi/scripts/rofi_scrot | 178 +++++++++------------ new-config/.config/waybar/config | 4 +- new-config/.config/waybar/style.css | 2 +- 11 files changed, 165 insertions(+), 127 deletions(-) create mode 100644 new-config/.config/musikcube/hotkeys.json diff --git a/new-config/.config/fish/config.fish b/new-config/.config/fish/config.fish index 0a1654d5d..979162e9a 100644 --- a/new-config/.config/fish/config.fish +++ b/new-config/.config/fish/config.fish @@ -134,6 +134,9 @@ alias newsboat='newsboat -u ~/.config/newsboat/urls' # bat as cat alias cat='bat' +# pfetch as neofetch +alias neofetch='pfetch' + # Changing "ls" to "exa" alias ls='exa -al --color=always --group-directories-first' # my preferred listing alias la='exa -a --color=always --group-directories-first' # all files and dirs diff --git a/new-config/.config/hypr/hyprland.conf b/new-config/.config/hypr/hyprland.conf index c52b7d3dc..f90a3ff3b 100644 --- a/new-config/.config/hypr/hyprland.conf +++ b/new-config/.config/hypr/hyprland.conf @@ -208,6 +208,7 @@ windowrule = workspace 8, ^(GeoGebra)$ ## Workspace 9 - Games windowrule = workspace 9, ^(org.libretro.RetroArch)$ +windowrule = workspace 9, ^(com.github.tkashkin.gamehub)$ windowrule = workspace 9, ^(DarkPlaces)$ windowrule = workspace 9, ^(pyrogenesis)$ windowrule = workspace 9, ^(wesnoth)$ diff --git a/new-config/.config/lvim/config.lua b/new-config/.config/lvim/config.lua index d2d3fbf9f..c4b70fd8d 100644 --- a/new-config/.config/lvim/config.lua +++ b/new-config/.config/lvim/config.lua @@ -7,9 +7,7 @@ vim.opt.shiftwidth = 2 vim.opt.tabstop = 2 vim.opt.relativenumber = true vim.cmd('autocmd FileType markdown setlocal nospell') -vim.g.vimtex_view_method = "zathura" -vim.maplocalleader = "," -vim.syntax = true +vim.opt.wrap = true -- wrap lines -- general vim.opt.spell = false diff --git a/new-config/.config/musikcube/hotkeys.json b/new-config/.config/musikcube/hotkeys.json new file mode 100644 index 000000000..914c527c6 --- /dev/null +++ b/new-config/.config/musikcube/hotkeys.json @@ -0,0 +1,68 @@ +{ + "browse_category_filter": "^F", + "browse_playlists_delete": "KEY_DC", + "browse_playlists_new": "M-n", + "browse_playlists_rename": "M-r", + "browse_playlists_save": "M-s", + "context_menu": "M-enter", + "hotkeys_backup": "M-b", + "hotkeys_reset_to_default": "M-r", + "key_down": "j", + "key_end": "KEY_END", + "key_home": "KEY_HOME", + "key_left": "h", + "key_page_down": "KEY_NPAGE", + "key_page_up": "KEY_PPAGE", + "key_right": "l", + "key_up": "k", + "lyrics_retry": "r", + "metadata_rescan": "^R", + "navigate_console": "`", + "navigate_hotkeys": "?", + "navigate_jump_to_playing": "x", + "navigate_library": "a", + "navigate_library_album_artists": "4", + "navigate_library_browse": "b", + "navigate_library_browse_albums": "2", + "navigate_library_browse_artists": "1", + "navigate_library_browse_directories": "d", + "navigate_library_browse_genres": "3", + "navigate_library_choose_category": "6", + "navigate_library_filter": "f", + "navigate_library_play_queue": "n", + "navigate_library_playlists": "5", + "navigate_library_tracks": "t", + "navigate_lyrics": "^L", + "navigate_settings": "s", + "play_queue_clear": "X", + "play_queue_delete": "KEY_DC", + "play_queue_hot_swap": "M-a", + "play_queue_move_down": "M-down", + "play_queue_move_up": "M-up", + "play_queue_playlist_delete": "M-x", + "play_queue_playlist_load": "M-l", + "play_queue_playlist_rename": "M-r", + "play_queue_playlist_save": "M-s", + "playback_next": "M-l", + "playback_previous": "M-j", + "playback_seek_back": "u", + "playback_seek_back_proportional": "y", + "playback_seek_forward": "o", + "playback_seek_forward_proportional": "p", + "playback_stop": "^X", + "playback_toggle_mute": "m", + "playback_toggle_pause": "^P", + "playback_toggle_repeat": ".", + "playback_toggle_shuffle": ",", + "playback_volume_down": "M-k", + "playback_volume_up": "M-i", + "search_input_toggle_match_type": "M-m", + "show_equalizer": "^E", + "toggle_visualizer": "v", + "track_list_change_sort_order": "M-s", + "track_list_next_group": "]", + "track_list_play_from_top": "M-P", + "track_list_previous_group": "[", + "track_list_rate_track": "r", + "view_refresh": "KEY_F(5)" +} \ No newline at end of file diff --git a/new-config/.config/newsboat/urls b/new-config/.config/newsboat/urls index e33cede47..0cbeb054e 100644 --- a/new-config/.config/newsboat/urls +++ b/new-config/.config/newsboat/urls @@ -40,9 +40,6 @@ https://www.eff.org/rss/updates.xml "~EFF - Updates" https://victorhckinthefreeworld.com/feed/ "~Victorhck in the free world" https://inv.vern.cc/feed/channel/UCHnyfMqiRRG1u-2MsSQLbXA "~YT - Veritasium" https://inv.vern.cc/feed/channel/UC7_gcs09iThXybpVgjHZ_7g "~YT - PBS Space Time" -https://inv.vern.cc/feed/channel/UCXuqSBlHAE6Xw-yeJA0Tunw "~YT - Linus Tech Tips" -https://inv.vern.cc/feed/channel/UCdBK94H6oZT2Q7l0-b0xmMg "~YT - ShortCircuit" -https://inv.vern.cc/feed/channel/UCW6J17hZ_Vgr6cQgd_kHt5A "~YT - MobileTechReview" https://inv.vern.cc/feed/channel/UCtMVHI3AJD4Qk4hcbZnI9ZQ "~YT - SomeOrdinaryGamers" https://inv.vern.cc/feed/channel/UCq6VFHwMzcMXbuKyG7SQYIg "~YT - penguinz0" https://inv.vern.cc/feed/channel/UCl2mFZoRqjw_ELax4Yisf6w "~YT - Louis Rossmann" @@ -50,10 +47,7 @@ https://inv.vern.cc/feed/channel/UChI0q9a-ZcbZh7dAu_-J-hg "~YT - Upper Echelon" https://inv.vern.cc/feed/channel/UCj8orMezFWVcoN-4S545Wtw "~YT - Max Derrat" https://inv.vern.cc/feed/channel/UCkmMACUKpQeIxN9D9ARli1Q "~YT - Shadiversity" https://inv.vern.cc/feed/channel/UCNYW2vfGrUE6R5mIJYzkRyQ "~YT - DrossRotzank" -https://inv.vern.cc/feed/channel/UCNnNCBgckxzqIh1Txw5cgSg "~YT - BaityBait" -https://inv.vern.cc/feed/channel/UCDZsyOkn-WTiTwgAvZSQ_cg "~YT - El Rincón De Giorgio" https://inv.vern.cc/feed/channel/UC36xmz34q02JYaZYKrMwXng "~YT - Nate Gentile" -https://inv.vern.cc/feed/channel/UCC9eo_cxdgW2_z2QLbowt_Q "~YT - DrogaDigital" https://inv.vern.cc/feed/channel/UCWDGyt5hy6UA6Br-hAar03A "~YT - El Robot de Colón" https://inv.vern.cc/feed/channel/UCaVPhFg-Ax873wvhbNitsrQ "~YT - El Robot de Platón" https://inv.vern.cc/feed/channel/UCg6gPGh8HU2U01vaFCAsvmQ "~YT - Chris Titus Tech" @@ -62,6 +56,8 @@ https://inv.vern.cc/feed/channel/UCxQKHvKbmSzGMvUrVtJYnUA "~YT - Learn Linux TV" https://inv.vern.cc/feed/channel/UC5UAwBUum7CPN5buc-_N1Fw "~YT - The Linux Experiment" https://inv.vern.cc/feed/channel/UCylGUf9BvQooEFjgdNudoQg "~YT - The Linux Cast" https://inv.vern.cc/feed/channel/UCoryWpk4QVYKFCJul9KBdyw "~YT - Switched to Linux" +https://inv.vern.cc/feed/channel/UCgkyQiY_Q5AlrygIXGWO2Zw "~YT - Tux Traveler" +https://inv.vern.cc/feed/channel/UCxkw-TfCK1t1VKxfHwPzD6w "~YT - Our Walk in Christ" https://inv.vern.cc/feed/channel/UCld68syR8Wi-GY_n4CaoJGA "~YT - Brodie Robertson" https://inv.vern.cc/feed/channel/UCjSEJkpGbcZhvo0lr-44X_w "~YT - TechHut" https://inv.vern.cc/feed/channel/UC2eYFnH61tmytImy1mTYvhA "~YT - Luke Smith" @@ -92,14 +88,9 @@ https://inv.vern.cc/feed/channel/UCs6KfncB4OV6Vug4o_bzijg "~YT - Techlore" https://inv.vern.cc/feed/channel/UCYVU6rModlGxvJbszCclGGw "~YT - Rob Braxman Tech" https://inv.vern.cc/feed/channel/UCSuHzQ3GrHSzoBbwrIq3LLA "~YT - Naomi Brockwell: NBTV" https://inv.vern.cc/feed/channel/UCvFGf8HZGZWFzpcDCqb3Lhw "~YT - All Things Secured" -https://inv.vern.cc/feed/channel/UCATWC1JSlhzmYeDbjnS8WwA "~YT - Senpai Gaming" https://inv.vern.cc/feed/channel/UCh66aXZ_hqiT7au6Nwb8p3Q "~YT - KTZ Systems" https://inv.vern.cc/feed/channel/UCRBHiacaQb5S70pljtJYB2g "~YT - EposVox" https://inv.vern.cc/feed/channel/UCd6vEDS3SOhWbXZrxbrf_bw "~YT - SAMTIME" -https://inv.vern.cc/feed/channel/UCgkyQiY_Q5AlrygIXGWO2Zw "~YT - Tux Traveler" -https://inv.vern.cc/feed/channel/UCxkw-TfCK1t1VKxfHwPzD6w "~YT - Our Walk in Christ" -https://inv.vern.cc/feed/channel/UCo5HJNjfdSoPWsdAHLsvSxQ "~YT - ShaunTrack" -https://inv.vern.cc/feed/channel/UCqDkaR-FEerytN_LpiQkumA "~YT - Alvinsch" https://inv.vern.cc/feed/channel/UCsaZ1OCRjtce97NITiTJjgg "~YT - Dannymalt" https://inv.vern.cc/feed/channel/UCZLVoT0l-qoaOD0lpbXW1Tw "~YT - TeamPBZ" https://inv.vern.cc/feed/channel/UCeHOkFGW-7uAZFvq3BXb8YA "~YT - :3ildcat" diff --git a/new-config/.config/qt5ct/qt5ct.conf b/new-config/.config/qt5ct/qt5ct.conf index c2c56296a..2ac731043 100644 --- a/new-config/.config/qt5ct/qt5ct.conf +++ b/new-config/.config/qt5ct/qt5ct.conf @@ -25,7 +25,7 @@ underline_shortcut=1 wheel_scroll_lines=3 [SettingsWindow] -geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\a\x7f\0\0\x4\x10\0\0\0\0\0\0\0\0\0\0\x3\xbd\0\0\x4\x3\0\0\0\0\x2\0\0\0\a\x80\0\0\0\0\0\0\0\0\0\0\a\x7f\0\0\x4\x10) +geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\x3\xae\0\0\x3\xfc\0\0\0\0\0\0\0\0\0\0\x3\xbd\0\0\x4\x3\0\0\0\0\x2\0\0\0\a\x80\0\0\0\0\0\0\0\0\0\0\x3\xae\0\0\x3\xfc) [Troubleshooting] force_raster_widgets=1 diff --git a/new-config/.config/qt6ct/qt6ct.conf b/new-config/.config/qt6ct/qt6ct.conf index 28a057661..959206ef4 100644 --- a/new-config/.config/qt6ct/qt6ct.conf +++ b/new-config/.config/qt6ct/qt6ct.conf @@ -1,6 +1,7 @@ [Appearance] color_scheme_path=/usr/share/qt6ct/colors/airy.conf custom_palette=false +icon_theme=Papirus-Dark standard_dialogs=gtk2 style=qt6gtk2 @@ -24,7 +25,7 @@ underline_shortcut=1 wheel_scroll_lines=3 [SettingsWindow] -geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\a\x7f\0\0\x4\x10\0\0\0\0\0\0\0\0\0\0\a\x7f\0\0\x4\x10\0\0\0\0\0\0\0\0\a\x80\0\0\0\0\0\0\0\0\0\0\a\x7f\0\0\x4\x10) +geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\x3\xae\0\0\x3\xfc\0\0\0\0\0\0\0\0\0\0\x3\xae\0\0\x3\xfc\0\0\0\0\0\0\0\0\a\x80\0\0\0\0\0\0\0\0\0\0\x3\xae\0\0\x3\xfc) [Troubleshooting] force_raster_widgets=1 diff --git a/new-config/.config/rofi/scripts/rofi_power b/new-config/.config/rofi/scripts/rofi_power index 5adaf77ec..835c36461 100755 --- a/new-config/.config/rofi/scripts/rofi_power +++ b/new-config/.config/rofi/scripts/rofi_power @@ -31,19 +31,19 @@ pwrs="$pwr1\n$pwr2\n$pwr3\n$pwr4" ## MAIN ACTION COMMAND ## action=$(echo -e "$options" | $menu "  Power Options ") case "$action" in - $option1*) + $option1) pkill Hyprland;; - $option2*) + $option2) systemctl reboot || loginctl reboot;; - $option3*) + $option3) systemctl poweroff || loginctl poweroff;; - $option4*) + $option4) swaylock -i "$currwall" & sleep 0.1 systemctl suspend;; - $option5*) + $option5) swaylock -i "$currwall";; - $option6*) + $option6) currentpwr=$(powerprofilesctl get) if [ "$currentpwr" = "performance" ]; then currentpwr=" Performance" @@ -63,6 +63,6 @@ case "$action" in $pwr4*) exit 0 esac;; - $option7*) + $option7) exit 0 esac diff --git a/new-config/.config/rofi/scripts/rofi_scrot b/new-config/.config/rofi/scripts/rofi_scrot index 868634098..f57c257be 100755 --- a/new-config/.config/rofi/scripts/rofi_scrot +++ b/new-config/.config/rofi/scripts/rofi_scrot @@ -1,8 +1,26 @@ #!/usr/bin/env bash -# Screenshot directory -screenshot_directory="$HOME/Pictures/Screenshots" -mkdir -p "$screenshot_directory" +# ***This script was made by Clay Gomera (Drake)*** +# - Description: A simple screenshot menu rofi script +# - Dependencies: rofi, grim, slurp, wf-recorder +# + +# screenshot directory +scrdir="$HOME/Pictures/Screenshots" +mkdir -p "$scrdir" +cd "$scrdir" || exit 1 +filename=$(date "+%d-%m-%Y_%H:%M:%S") + +# options array +option1=" Capture the screen" +option2=" Capture region" +option3="󰕧 Record the screen" +option4="󰕩 Record region" +option5="󰕧 Record the screen and audio" +option6="Exit" +options="$option1\n$option2\n$option3\n$option4\n$option5\n$option6" + +# countdown function countdown() { notify-send "Screenshot" "Executing in 3 seconds" -t 1000 sleep 1 @@ -12,104 +30,64 @@ countdown() { sleep 2 } -crtf() { - notify-send "Screenshot" "Select a region to capture" - dt=$(date '+%d-%m-%Y %H:%M:%S') - grim -g "$(slurp)" "$screenshot_directory/$dt.jpg" - notify-send "Screenshot" "Region saved to $screenshot_directory" -} - -cstf() { - countdown - dt=$(date '+%d-%m-%Y %H:%M:%S') - grim "$screenshot_directory/$dt.jpg" - notify-send "Screenshot" "Screenshot saved to $screenshot_directory" -} - -rvrtf() { - notify-send "Screenshot" "Select a region to record" - dt=$(date '+%d-%m-%Y %H:%M:%S') - wf-recorder --codec=h264_vaapi -d /dev/dri/renderD128 -g "$(slurp)" rec "$screenshot_directory/$dt.mp4" - notify-send "Screenshot" "Recording saved to $screenshot_directory" -} - -rvstf() { - countdown - dt=$(date '+%d-%m-%Y %H:%M:%S') - wf-recorder --codec=h264_vaapi -d /dev/dri/renderD128 -f "$screenshot_directory/$dt.mp4" - notify-send "Screenshot" "Recording saved to $screenshot_directory" -} - -get_options() { - echo " Capture Region" - echo " Capture Screen" - echo "󰕩 Record Region" - echo "󰕧 Record Screen" -} - -check_deps() { - if ! hash "$1" 2>/dev/null; then - echo "Error: This script requires $1" - exit 1 - fi -} - -main() { - # check dependencies - check_deps slurp - check_deps grim - check_deps rofi - check_deps wf-recorder - - if [[ $1 == '--help' ]] || [[ $1 = '-h' ]] +# show the help output with --help or -h arguments +if [[ $1 == '--help' ]] || [[ $1 = '-h' ]] then - echo ### rofi-screenshot - echo USAGE: rofi-screenshot [OPTION] - echo \(no option\) - echo " show the screenshot menu" - echo -s, --stop - echo " stop recording" - echo -h, --help - echo " this screen" - exit 1 - fi + echo ### rofi-screenshot + echo USAGE: rofi-screenshot [OPTION] + echo \(no option\) + echo " show the screenshot menu" + echo -s, --stop + echo " stop recording" + echo -h, --help + echo " this screen" + exit 1 +fi - if [[ $1 = '--stop' ]] || [[ $1 = '-s' ]] - then - killall -s SIGINT wf-recorder - exit 1 - fi +# stop recording with -s or --stop arguments +if [[ $1 = '--stop' ]] || [[ $1 = '-s' ]] + then + killall -s SIGINT wf-recorder + exit 1 +fi - # Get choice from rofi - choice=$( (get_options) | rofi -dmenu -p " 󰄀 Screenshot " ) - - # If user has not picked anything, exit - if [[ -z "${choice// }" ]]; then +# run the selected command +choice=$(echo -e "$options" | rofi -dmenu -p " 󰄀 Screenshot " ) +case $choice in + $option1) + countdown + grim "$filename.jpg" + notify-send "Screenshot" "Screenshot saved to $scrdir" + ;; + $option2) + notify-send "Screenshot" "Select a region to capture" + grim -g "$(slurp)" "$filename.jpg" + notify-send "Screenshot" "Region saved to $scrdir" + ;; + $option3) + countdown + wf-recorder --codec=h264_vaapi -d /dev/dri/renderD128 -f "$filename.mp4" + notify-send "Screenshot" "Recording saved to $scrdir" + ;; + $option4) + notify-send "Screenshot" "Select a region to record" + wf-recorder --codec=h264_vaapi -d /dev/dri/renderD128 -g "$(slurp)" -f "$filename.mp4" + notify-send "Screenshot" "Recording saved to $scrdir" + ;; + $option5) + devices=$(pactl list sources | grep "Name" | awk '{print $2}') + chosendevice=$(echo -e "$devices" | rofi -dmenu -p " Select audio input ") + if [ "$chosendevice" ]; then + device="$chosendevice" + countdown + wf-recorder --audio="$device" --codec=h264_vaapi -d /dev/dri/renderD128 -f "$filename.mp4" + else + notify-send "Please select an audio input device" exit 1 - fi - - # run the selected command - case $choice in - ' Capture Region') - crtf - ;; - ' Capture Screen') - cstf - ;; - '󰕩 Record Region') - rvrtf - ;; - '󰕧 Record Screen') - rvstf - ;; - esac - - # done - set -e -} - -main "$1" & - -exit 0 - -! /bin/bash + fi + notify-send "Screenshot" "Recording saved to $scrdir" + ;; + $option6) + exit 0 + ;; +esac diff --git a/new-config/.config/waybar/config b/new-config/.config/waybar/config index 1efbfa682..4f015affa 100644 --- a/new-config/.config/waybar/config +++ b/new-config/.config/waybar/config @@ -1,6 +1,6 @@ { "position": "top", - "height": 22, + "height": 41, "spacing": 3, "layer": "top", @@ -36,8 +36,6 @@ "format": "{} \udb80\udf0c", "format-en": "US", "format-es": "ES", - "keyboard-name": "at-translated-set-2-keyboard", - "on-click": "hyprctl switchxkblayout at-translated-set-2-keyboard next" }, "idle_inhibitor": { diff --git a/new-config/.config/waybar/style.css b/new-config/.config/waybar/style.css index a3323462c..a00ce1189 100644 --- a/new-config/.config/waybar/style.css +++ b/new-config/.config/waybar/style.css @@ -6,7 +6,7 @@ } window#waybar { - background-color: #1a1b26; + background-color: rgba(26, 27, 38, 1); color: #a9b1d6; transition-property: background-color; transition-duration: .5s;