diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml index b30e5b5..476185a 100644 --- a/.config/alacritty/alacritty.yml +++ b/.config/alacritty/alacritty.yml @@ -185,40 +185,40 @@ font: # If `true`, bold text is drawn using the bright color variants. #draw_bold_text_with_bright_colors: true -# Base16 Nord - alacritty color config -# arcticicestudio +# Base16 Gruvbox dark, medium - alacritty color config +# Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox) colors: # Default colors primary: - background: '0x2e3440' - foreground: '0xe5e9f0' + background: '0x282828' + foreground: '0xd5c4a1' # Colors the cursor will use if `custom_cursor_colors` is true cursor: - text: '0x2e3440' - cursor: '0xe5e9f0' + text: '0x282828' + cursor: '0xd5c4a1' # Normal colors normal: - black: '0x2e3440' - red: '0xbf616a' - green: '0xa3be8c' - yellow: '0xebcb8b' - blue: '0x81a1c1' - magenta: '0xb48ead' - cyan: '0x88c0d0' - white: '0xe5e9f0' + black: '0x282828' + red: '0xfb4934' + green: '0xb8bb26' + yellow: '0xfabd2f' + blue: '0x83a598' + magenta: '0xd3869b' + cyan: '0x8ec07c' + white: '0xd5c4a1' # Bright colors bright: - black: '0x4c566a' - red: '0xd08770' - green: '0x3b4252' - yellow: '0x434c5e' - blue: '0xd8dee9' - magenta: '0xeceff4' - cyan: '0x5e81ac' - white: '0x8fbcbb' + black: '0x665c54' + red: '0xfe8019' + green: '0x3c3836' + yellow: '0x504945' + blue: '0xbdae93' + magenta: '0xebdbb2' + cyan: '0xd65d0e' + white: '0xfbf1c7' draw_bold_text_with_bright_colors: false diff --git a/.config/lf/pv.sh b/.config/lf/pv.sh index 2b8cfff..122415d 100755 --- a/.config/lf/pv.sh +++ b/.config/lf/pv.sh @@ -1,37 +1,22 @@ #!/bin/sh -#if [ "$(echo "$TERM" | grep "kitty" )" ]; then -# IMG_CMD="kitty +kitten icat" -#IMG_CMD="jp2a" -# case "$1" in -# *.tar*) tar tf "$1";; -# *.zip) unzip -l "$1";; -# *.rar) unrar l "$1";; -# *.7z) 7z l "$1";; -# *.jpg | *.JPG | *.jpeg) $IMG_CMD "$1";; -# *.png | *.svg | *.gif) $IMG_CMD "$1";; -# *.mp4 | *.mkv | *.webm | *.avi | *.mpg | *.mpeg | *.ogv | *.flv | *.wmv | *.WMV) ffmpegthumbnailer -i "$1" -c jpeg -o - | $IMG_CMD -;; -# #*.jpg | *.JPG | *.jpeg) jp2a "$1" -b --width=$(($(tput cols)/2 - 10));; -# #*.png | *.svg | *.gif) convert "$1" jpg:- | jp2a - -b --width=$(($(tput cols)/2 - 10));; -# #*.mp4 | *.mkv | *.webm | *.avi | *.mpg | *.mpeg | *.ogv | *.flv | *.wmv | *.WMV) ffmpegthumbnailer -i "$1" -c jpeg -o - | jp2a - -b --width=$(($(tput cols)/2 - 10));; -# *.pdf) pdftotext "$1" -;; -# *) highlight -O ansi "$1" || cat "$1";; -# esac -#else - case "$1" in - *.tar*) tar tf "$1";; - *.zip) unzip -l "$1";; - *.rar) unrar l "$1";; - *.7z) 7z l "$1";; - *.jpg | *.JPG | *.jpeg) viu -t "$1" -w $(($(tput cols)/2 - 10));; - *.png | *.svg | *.gif) viu -t "$1" -w $(($(tput cols)/2 - 10)) ;; - *.mp4 | *.mkv | *.webm | *.avi | *.mpg | *.mpeg | *.ogv | *.flv | *.wmv | *.WMV) ffmpegthumbnailer -i "$1" -c jpeg -o - | viu -t -;; - #*.jpg | *.JPG | *.jpeg) jp2a "$1" -b --width=$(($(tput cols)/2 - 10));; - #*.png | *.svg | *.gif) convert "$1" jpg:- | jp2a - -b --width=$(($(tput cols)/2 - 10));; - #*.mp4 | *.mkv | *.webm | *.avi | *.mpg | *.mpeg | *.ogv | *.flv | *.wmv | *.WMV) ffmpegthumbnailer -i "$1" -c jpeg -o - | jp2a - -b --width=$(($(tput cols)/2 - 10));; - *.pdf) pdftotext "$1" -;; - *) bat -f "$1";; #*) highlight -O ansi "$1" || cat "$1";; - esac +W="$(($(tput cols)/2 - 10))" +#H="$(tput lines)" -#fi +fn="$1" +w="$2" +h="$3" +x="$4" +y="$5" +case "$fn" in + *.tar*) tar tf "$1";; + *.zip) unzip -l "$1";; + *.rar) unrar l "$1";; + *.7z) 7z l "$1";; + *.jpg | *.JPG | *.jpeg) chafa "$fn" --size="$w"x"$h" ;;#viu -t "$1" -w "$2" ;; + *.png | *.svg | *.gif) chafa "$fn" --size="$w"x"$h" ;; + *.mp4 | *.mkv | *.webm | *.avi | *.mpg | *.mpeg | *.ogv | *.flv | *.wmv | *.WMV) ffmpegthumbnailer -i "$fn" -c jpeg -o - | chafa - --size="$w"x"$h";; + *.pdf) pdftotext "$1" -;; + *) bat -f "$1";; #*) highlight -O ansi "$1" || cat "$1";; +esac diff --git a/.config/river/init b/.config/river/init index 3c8edfa..ecac16c 100755 --- a/.config/river/init +++ b/.config/river/init @@ -15,7 +15,7 @@ mod="Mod1" riverctl map normal $mod+Shift Return spawn alacritty # Mod+P open bemenu -riverctl map normal $mod P spawn "bemenu-run -H 24" +riverctl map normal $mod P spawn "rofi -show run" # Mod+Q to close the focused view riverctl map normal $mod+Shift C close diff --git a/.config/rofi/config.rasi b/.config/rofi/config.rasi index 91dcd45..d0ab824 100644 --- a/.config/rofi/config.rasi +++ b/.config/rofi/config.rasi @@ -146,4 +146,4 @@ configuration { } } -@theme "base16-nord" +@theme "base16-gruvbox-dark-medium" diff --git a/.config/sway/config b/.config/sway/config index 32df909..e83fcfb 100644 --- a/.config/sway/config +++ b/.config/sway/config @@ -229,10 +229,10 @@ bindsym ctrl+alt+delete exec waylogout #include ~/.config/sway/colors/base16-atlas -#include ~/.local/src/base16-sway/themes/base16-gruvbox-dark-medium.config +include ~/.local/src/base16-sway/themes/base16-gruvbox-dark-medium.config #include ~/.local/src/base16-sway/themes/base16-atlas.config #include ~/.local/src/base16-sway/themes/base16-gruvbox-dark-hard.config -include ~/.local/src/base16-sway/themes/base16-nord.config +#include ~/.local/src/base16-sway/themes/base16-nord.config # diff --git a/.config/waybar/config b/.config/waybar/config index ce0af35..fa8774e 100644 --- a/.config/waybar/config +++ b/.config/waybar/config @@ -1,144 +1,57 @@ +//stole this from: https://git.sr.ht/~oscarcp/ghostfiles/tree/master/item/waybar/config + { - // "layer": "top", // Waybar at top layer - // "position": "bottom", // Waybar position (top|bottom|left|right) - "height": 24, // Waybar height (to be removed for auto height) - // "width": 1280, // Waybar width - // Choose the order of the modules - "modules-left": ["river/tags", "sway/mode", "custom/media"], - "modules-center": ["sway/window"], - "modules-right": ["mpd", "idle_inhibitor", "pulseaudio", "network", "cpu", "memory", "temperature", "backlight", "keyboard-state", "sway/language", "battery", "battery#bat2", "clock", "tray"], - // Modules configuration - // "sway/workspaces": { - // "disable-scroll": true, - // "all-outputs": true, - // "format": "{name}: {icon}", - // "format-icons": { - // "1": "", - // "2": "", - // "3": "", - // "4": "", - // "5": "", - // "urgent": "", - // "focused": "", - // "default": "" - // } - // }, + "layer": "top", + "position": "top", + //"modules-left": ["custom/media"], + "modules-left": ["wlr/workspaces", "sway/mode", "custom/media"], + "modules-right": ["custom/keyboard", "network", "battery", "pulseaudio", "clock", "custom/quit"], - "custom/dwlbar": { - "format": "{}", - "return-type": "json", - "max-length": 200, - "exec": "$HOME/.config/waybar/dwlbar 'HDMI-A-1'", - "escape": true - } - - "keyboard-state": { - "numlock": true, - "capslock": true, - "format": "{name} {icon}", - "format-icons": { - "locked": "", - "unlocked": "" - } - }, - "sway/mode": { - "format": "{}" - }, - "mpd": { - "format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ⸨{songPosition}|{queueLength}⸩ {volume}% ", - "format-disconnected": "Disconnected ", - "format-stopped": "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ", - "unknown-tag": "N/A", - "interval": 2, - "consume-icons": { - "on": " " - }, - "random-icons": { - "off": " ", - "on": " " - }, - "repeat-icons": { - "on": " " - }, - "single-icons": { - "on": "1 " - }, - "state-icons": { - "paused": "", - "playing": "" - }, - "tooltip-format": "MPD (connected)", - "tooltip-format-disconnected": "MPD (disconnected)" - }, - "idle_inhibitor": { - "format": "{icon}", - "format-icons": { - "activated": "", - "deactivated": "" - } - }, - "tray": { - // "icon-size": 21, - "spacing": 10 - }, + "wlr/workspaces": { + "format": "{icon}", + "on-click": "activate", + "format-icons": { + "1": "1", + "2": "2", + "3": "3", + "4": "4", + "5": "5", + "urgent": "", + "active": "", + "default": "" + } +}, "clock": { - // "timezone": "America/New_York", - "tooltip-format": "{:%Y %B}\n{calendar}", - "format-alt": "{:%Y-%m-%d}" - }, - "cpu": { - "format": "{usage}% ", + "format": "{:%H:%M}", + "format-alt": "{:%a %b %d}", "tooltip": false }, - "memory": { - "format": "{}% " - }, - "temperature": { - // "thermal-zone": 2, - // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input", - "critical-threshold": 80, - // "format-critical": "{temperatureC}°C {icon}", - "format": "{temperatureC}°C {icon}", - "format-icons": ["", "", ""] - }, - "backlight": { - // "device": "acpi_video1", - "format": "{percent}% {icon}", - "format-icons": ["", ""] - }, "battery": { "states": { - // "good": 95, + "good": 95, "warning": 30, "critical": 15 }, - "format": "{capacity}% {icon}", - "format-charging": "{capacity}% ", - "format-plugged": "{capacity}% ", - "format-alt": "{time} {icon}", - // "format-good": "", // An empty format will hide the module - // "format-full": "", + "bat":"BAT1", + "format": "{icon} {capacity}%", + "format-charging": " {capacity}%", + "format-plugged": " {capacity}%", + "format-discharging": " {capacity}%", + "format-alt": "{icon} {time}", "format-icons": ["", "", "", "", ""] }, - "battery#bat2": { - "bat": "BAT2" - }, "network": { - // "interface": "wlp2*", // (Optional) To force the use of this interface - "format-wifi": "{essid} ({signalStrength}%) ", - "format-ethernet": "{ifname}: {ipaddr}/{cidr} ", - "format-linked": "{ifname} (No IP) ", - "format-disconnected": "Disconnected ⚠", - "format-alt": "{ifname}: {ipaddr}/{cidr}" + "format": "{ifname}", + "format-wifi": " {essid}", + "format-ethernet": " {ifname}", + "format-disconnected": "", + "tooltip-format-wifi": "{signalStrength}%", + "max-length": 20 }, "pulseaudio": { - // "scroll-step": 1, // %, can be a float - "format": "{volume}% {icon} {format_source}", - "format-bluetooth": "{volume}% {icon} {format_source}", - "format-bluetooth-muted": " {icon} {format_source}", - "format-muted": " {format_source}", - "format-source": "{volume}% ", - "format-source-muted": "", + "format": "{icon} {volume}%", + "format-bluetooth": "{icon} {volume}%", + "format-muted": "", "format-icons": { "headphone": "", "hands-free": "", @@ -146,21 +59,13 @@ "phone": "", "portable": "", "car": "", - "default": ["", "", ""] + "default": ["", ""] }, + "scroll-step": 1, "on-click": "pavucontrol" }, - "custom/media": { - "format": "{icon} {}", - "return-type": "json", - "max-length": 40, - "format-icons": { - "spotify": "", - "default": "🎜" - }, - "escape": true, - "exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder - // "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name + "custom/quit": { + "format": "", + "on-click": "waylogout" } } - diff --git a/.config/waybar/style.css b/.config/waybar/style.css index c0d4d9b..db82516 100644 --- a/.config/waybar/style.css +++ b/.config/waybar/style.css @@ -1,255 +1,73 @@ +/*stole this from + * https://git.sr.ht/~oscarcp/ghostfiles/tree/master/item/waybar/style.css + */ + * { - border: none; - border-radius: 0; - /* `otf-font-awesome` is required to be installed for icons */ - font-family: Roboto, Helvetica, Arial, sans-serif; - font-size: 13px; - min-height: 0; + font-size: 12px; + font-family: "mono"; } window#waybar { - background-color: rgba(43, 48, 59, 0.5); - border-bottom: 3px solid rgba(100, 114, 125, 0.5); - color: #ffffff; - transition-property: background-color; - transition-duration: .5s; -} - -window#waybar.hidden { - opacity: 0.2; -} - -/* -window#waybar.empty { - background-color: transparent; -} -window#waybar.solo { - background-color: #FFFFFF; -} -*/ - -window#waybar.termite { - background-color: #3F3F3F; -} - -window#waybar.chromium { - background-color: #000000; - border: none; -} - -#workspaces button { - padding: 0 5px; - background-color: transparent; - color: #ffffff; - /* Use box-shadow instead of border so the text isn't offset */ - box-shadow: inset 0 -3px transparent; -} - -/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */ -#workspaces button:hover { - background: rgba(0, 0, 0, 0.2); - box-shadow: inset 0 -3px #ffffff; -} - -#workspaces button.focused { - background-color: #64727D; - box-shadow: inset 0 -3px #ffffff; -} - -#workspaces button.urgent { - background-color: #eb4d4b; -} - -#mode { - background-color: #64727D; - border-bottom: 3px solid #ffffff; -} - -#clock, -#battery, -#cpu, -#memory, -#disk, -#temperature, -#backlight, -#network, -#pulseaudio, -#custom-media, -#tray, -#mode, -#idle_inhibitor, -#mpd { - padding: 0 10px; - margin: 0 4px; - color: #ffffff; -} - -#window, -#workspaces { - margin: 0 4px; -} - -/* If workspaces is the leftmost module, omit left margin */ -.modules-left > widget:first-child > #workspaces { - margin-left: 0; -} - -/* If workspaces is the rightmost module, omit right margin */ -.modules-right > widget:last-child > #workspaces { - margin-right: 0; -} - -#clock { - background-color: #64727D; + background: rgba(0,0,0,0); } #battery { - background-color: #ffffff; - color: #000000; + margin: 3px 0px 3px 0px; + background: #1d1f21; + padding: 5px; + color: #c5c8c6; } -#battery.charging, #battery.plugged { - color: #ffffff; - background-color: #26A65B; +#custom-quit { + margin: 3px 3px 3px 0px; + padding: 5px 7px 5px 5px; + border-top-right-radius: 10px; + border-bottom-right-radius: 10px; + border-right: 2px solid #1d1f21; + border-top: 2px solid #1d1f21; + border-bottom: 2px solid #1d1f21; + background: #F00; + color: #FFF; } -@keyframes blink { - to { - background-color: #ffffff; - color: #000000; - } +#clock { + margin: 3px 0px 3px 3px; + padding: 5px; + color: #FFF; + background: #1d1f21; + border-top-left-radius: 10px; + border-bottom-left-radius: 10px; + color: #c5c8c6; } -#battery.critical:not(.charging) { - background-color: #f53c3c; - color: #ffffff; - animation-name: blink; - animation-duration: 0.5s; - animation-timing-function: linear; - animation-iteration-count: infinite; - animation-direction: alternate; -} - -label:focus { - background-color: #000000; -} - -#cpu { - background-color: #2ecc71; - color: #000000; -} - -#memory { - background-color: #9b59b6; -} - -#disk { - background-color: #964B00; -} - -#backlight { - background-color: #90b1b1; -} - -#network { - background-color: #2980b9; -} - -#network.disconnected { - background-color: #f53c3c; -} - -#pulseaudio { - background-color: #f1c40f; - color: #000000; -} - -#pulseaudio.muted { - background-color: #90b1b1; - color: #2a5c45; +#custom-keyboard { + background: #1d1f21; + color: #c5c8c6; + padding: 5px 5px 5px 7px; + margin: 3px 0px 3px 3px; + border-top-left-radius: 10px; + border-bottom-left-radius: 10px; } #custom-media { - background-color: #66cc99; - color: #2a5c45; - min-width: 100px; + margin: 3px; + padding: 5px 7px 5px 7px; + border-radius: 10px; + background: #1d1f21; + color: #c5c8c6; +} +#pulseaudio { + margin: 3px 3px 3px 0px; + padding: 5px 7px 5px 5px; + background: #1d1f21; + border-top-right-radius: 10px; + border-bottom-right-radius: 10px; + color: #c5c8c6; } -#custom-media.custom-spotify { - background-color: #66cc99; -} - -#custom-media.custom-vlc { - background-color: #ffa000; -} - -#temperature { - background-color: #f0932b; -} - -#temperature.critical { - background-color: #eb4d4b; -} - -#tray { - background-color: #2980b9; -} - -#tray > .passive { - -gtk-icon-effect: dim; -} - -#tray > .needs-attention { - -gtk-icon-effect: highlight; - background-color: #eb4d4b; -} - -#idle_inhibitor { - background-color: #2d3436; -} - -#idle_inhibitor.activated { - background-color: #ecf0f1; - color: #2d3436; -} - -#mpd { - background-color: #66cc99; - color: #2a5c45; -} - -#mpd.disconnected { - background-color: #f53c3c; -} - -#mpd.stopped { - background-color: #90b1b1; -} - -#mpd.paused { - background-color: #51a37a; -} - -#language { - background: #00b093; - color: #740864; - padding: 0 5px; - margin: 0 5px; - min-width: 16px; -} - -#keyboard-state { - background: #97e1ad; - color: #000000; - padding: 0 0px; - margin: 0 5px; - min-width: 16px; -} - -#keyboard-state > label { - padding: 0 5px; -} - -#keyboard-state > label.locked { - background: rgba(0, 0, 0, 0.2); +#network { + background: #1d1f21; + color: #c5c8c6; + margin: 3px 0px 3px 0px; + padding: 5px; } diff --git a/.local/installers/arch/pkgs/base.list b/.local/installers/arch/pkgs/base.list index 8ae478f..0089c5a 100644 --- a/.local/installers/arch/pkgs/base.list +++ b/.local/installers/arch/pkgs/base.list @@ -53,7 +53,7 @@ pulsemixer pamixer papirus-icon-theme python-pdftotext -viu +chafa bat imv ncmpcpp diff --git a/.local/scripts/set-wp.sh b/.local/scripts/set-wp.sh index 8b44f14..59b22cb 100755 --- a/.local/scripts/set-wp.sh +++ b/.local/scripts/set-wp.sh @@ -4,11 +4,8 @@ setwp() { #wal -n -s -t -e -i "$1" rm ~/.config/wall - #rm ~/.fehbg cp "$1" "$HOME/.config/wall" - #convert "$1" -set colorspace Gray -separate -average ~/.config/wall - #xwallpaper --zoom "$HOME/.config/wall" - #feh --bg-scale $HOME/.config/wall + swaymsg "output * bg ~/.config/wall fill" } @@ -24,11 +21,11 @@ setwp() { # #elif [ -f "$1" ]; then # #setwp "$PWD/$1" - setwp "$1" +# setwp "$1" #fi if [ -f "$1" ]; then -# #setwp "$PWD/$1" setwp "$1" fi + diff --git a/.profile b/.profile index 6acd310..cf4610c 100644 --- a/.profile +++ b/.profile @@ -13,6 +13,9 @@ export PF_INFO="ascii title os kernel uptime pkgs memory shell wm" export XCURSOR_THEME=Adwaita +#fix image previews in lf not working +export TERM="xterm-256color" + #other settings #export QT_QPA_PLATFORMTHEME="gtk2" # Have QT use gtk2 theme. must have qt5-styleplugins installed export QT_QPA_PLATFORMTHEME="qt5ct" #have QT use qt5ct theme @@ -80,4 +83,5 @@ mount /media/bismarck & if [ "$(tty)" = /dev/tty1 ]; then exec dbus-launch sway + #exec dbus-launch Hyprland fi diff --git a/media/img/wallpapers/2906429.jpg b/media/img/wallpapers/2906429.jpg new file mode 100644 index 0000000..7e2e644 Binary files /dev/null and b/media/img/wallpapers/2906429.jpg differ