diff --git a/Xresources b/Xresources index a4bd940..06e83e3 100644 --- a/Xresources +++ b/Xresources @@ -50,7 +50,7 @@ URxvt.italicFont: xft:Iosevka Term:style=Italic:size=14 URxvt.boldItalicFont: xft:Iosevka Term:style=Bold Italic:size=14 URxvt.intensityStyles: true -URxvt.geometry: 90x24 +URxvt.geometry: 90x26 URxvt.cursorBlink: true URxvt.scrollBar: false URxvt.scrollBar_right: false diff --git a/bashrc b/bashrc index 49ce1be..54097fb 100644 --- a/bashrc +++ b/bashrc @@ -8,14 +8,21 @@ # If not running interactively, don't do anything [[ $- != *i* ]] && return +alias hx='helix' alias ls='ls --color=auto' +alias imgcat="wezterm imgcat --height 50%" +alias motd="rust-motd" -export EDITOR=vim +export EDITOR=helix eval "$(starship init bash)" eval "$(thefuck --alias)" source /usr/lib/goto/goto.sh +source /usr/lib/codecat/codecat.sh export PS1="$(starship prompt)" +if [[ $SHLVL -le 3 ]]; then + motd +fi diff --git a/discord.css b/discord/dark-acrylic.css similarity index 100% rename from discord.css rename to discord/dark-acrylic.css diff --git a/eww/bin/i3-ws b/eww/bin/i3-ws new file mode 100755 index 0000000..1c80bfa Binary files /dev/null and b/eww/bin/i3-ws differ diff --git a/eww/bin/i3-ws.py b/eww/bin/i3-ws.py new file mode 100755 index 0000000..b7895b8 --- /dev/null +++ b/eww/bin/i3-ws.py @@ -0,0 +1,24 @@ +#!/usr/bin/python +from i3ipc import Connection, Event + +i3 = Connection() + +base = '(box :class "workspace" :orientation "h" :spacing 8 :space-evenly false' + +def get_workspaces(_0, _1): + response = i3.get_workspaces() + output = base + for ws in response: + classes = "ws-btn" + scale = "" + if(ws.focused): + scale = '(scale :class "wsbar" :max 100 :min 100)' + if(ws.urgent): + classes += " urgent" + element = f'(box :orientation "v" :space-evenly false (button :vexpand true :class "{classes}" :onclick "i3-msg workspace {ws.num}" "{ws.num}"){scale})' + output += f' {element}' + print(f"{output})") + +get_workspaces(None, None) +i3.on(Event.WORKSPACE_FOCUS, get_workspaces) +i3.main() diff --git a/eww/calendar.yuck b/eww/calendar.yuck new file mode 100644 index 0000000..059531f --- /dev/null +++ b/eww/calendar.yuck @@ -0,0 +1,38 @@ +;; ______ __ __ +;; / ____/___ _/ /__ ____ ____/ /___ ______ +;; / / / __ `/ / _ \/ __ \/ __ / __ `/ ___/ +;; / /___/ /_/ / / __/ / / / /_/ / /_/ / / +;; \____/\__,_/_/\___/_/ /_/\__,_/\__,_/_/ +;; +(defpoll calendar_day + :interval "2m" + "date '+%d'" +) +(defpoll calendar_year + :interval "2m" + "date '+%Y'" +) + +(defwidget cal [] + (box + :class "cal-bg" + :orientation "v" + (calendar + :class "calendar" + :day calendar_day + :year calendar_year + ) + ) +) + +(defwindow calendar + :geometry (geometry + :x "-8px" + :y "40px" + :anchor "top right" + :width "270px" + :height "60px" + ) + :windowtype "normal" + (cal) +) diff --git a/eww/clock.yuck b/eww/clock.yuck deleted file mode 100644 index ee715dd..0000000 --- a/eww/clock.yuck +++ /dev/null @@ -1,90 +0,0 @@ -;; ________ __ -;; / ____/ /___ _____/ /__ -;; / / / / __ \/ ___/ //_/ -;;/ /___/ / /_/ / /__/ ,< -;;\____/_/\____/\___/_/|_| -;; - -;; Variables -(defpoll - HOUR - :interval "1m" - "date +\"%I\"" -) -(defpoll - MINUTE - :interval "1s" - "date +\"%M\"" -) -(defpoll - MERIDIEM - :interval "1m" - "date +\"%p\"" -) -(defpoll - DAY - :interval "2m" - "date +\"%a\"" -) - -;; Widgets -(defwidget - clock [] - (box - :class "genwin" - :orientation "h" - :space-evenly false - :vexpand false - :hexpand false - :cursor "default" - (label - :class "time_hour" - :valign "start" - :wrap true - :limit-width 25 - :text "${HOUR}" - ) - (label - :class "time_min" - :valign "end" - :wrap true - :limit-width 25 - :text "${MINUTE}" - ) - (box - :orientation "v" - :spacing 25 - :space-evenly false - :vexpand false - :hexpand false - (label - :class "time_meridiem" - :halign "end" - :wrap true - :limit-width 25 - :text "${MERIDIEM}" - ) - (label - :class "time_day" - :halign "end" - :wrap true - :limit-width 25 - :text "${DAY}" - ) - ) - ) -) - -;; Windows -(defwindow - clock - :stacking "fg" - :focusable false - :geometry (geometry - :x 515 - :y 150 - :width 350 - :height 155 - ) - (clock) -) diff --git a/eww/cluster.yuck b/eww/cluster.yuck deleted file mode 100644 index a0377ef..0000000 --- a/eww/cluster.yuck +++ /dev/null @@ -1,119 +0,0 @@ -;; ________ __ -;; / ____/ /_ _______/ /____ _____ -;; / / / / / / / ___/ __/ _ \/ ___/ -;;/ /___/ / /_/ (__ ) /_/ __/ / -;;\____/_/\__,_/____/\__/\___/_/ -;; The collection of action buttons -;; on the right side of the screen. - -;; Widgets -(defwidget - logout [] - (box - :class "genwin" - :vexpand false - :hexpand false - (button - :class "icon" - :onclick "i3-msg exit" - :cursor "pointer" - :tooltip "logout" - "﫼" - ) - ) -) -(defwidget - power [] - (box - :class "genwin" - :vexpand false - :hexpand false - (button - :class "icon" - :onclick "poweroff" - :cursor "pointer" - :tooltip "shutdown" - "⏼" - ) - ) -) -(defwidget - reboot [] - (box - :class "genwin" - :vexpand false - :hexpand false - (button - :class "icon" - :onclick "reboot" - :cursor "pointer" - :tooltip "shutdown" - "" - ) - ) -) -(defwidget - terminal [] - (box - :class "genwin" - :vexpand false - :hexpand false - (button - :class "icon" - :onclick "i3-msg scratchpad show & /home/val/.config/eww/launch_eww" - :cursor "pointer" - :tooltip "terminal" - "" - ) - ) -) - -;; Windows -(defwindow - logout - :stacking "fg" - :focusable false - :geometry (geometry - :x 1445 - :y 150 - :width 155 - :height 155 - ) - (logout) -) -(defwindow - power - :stacking "fg" - :focusable false - :geometry (geometry - :x 1615 - :y 150 - :width 155 - :height 155 - ) - (power) -) -(defwindow - reboot - :stacking "fg" - :focusable false - :geometry (geometry - :x 1445 - :y 320 - :width 155 - :height 155 - ) - (reboot) -) -(defwindow - terminal - :stacking "fg" - :focusable false - :geometry (geometry - :x 1615 - :y 320 - :width 155 - :height 155 - ) - (terminal) -) diff --git a/eww/eww.scss b/eww/eww.scss index d218c2e..3846045 100644 --- a/eww/eww.scss +++ b/eww/eww.scss @@ -1,130 +1,117 @@ /* Global */ * { all: unset; - font-family: sans-serif; - font-family: Helvetica Neue; + font-family: "Helvetica Neue", sans-serif; opacity: 1; } +.bar { + background-color: rgba(0, 0, 0, 0.53); + padding-left: 8px; + padding-right: 8px; +} + +.module { + margin: 0px 4px; +} + +.workspace { + margin-left: 12px; + margin-top: 8px; +} + +.ws-btn { + padding: 0px 3px; + margin-bottom: 2px; +} +.focused { + border-bottom: 2px solid white; + margin-bottom: 0px; +} +.urgent { + border-bottom: 2px solid #ffaa00; + margin-bottom: 0px; + color: #ffaa00; +} + +.ws scale trough highlight { + background-color: white; +} + .icon { - font-family: monospace; - font-family: FiraCode Nerd Font; + font-family: "FiraCode Nerd Font", monospace; font-weight: normal; - font-size: 90px; + font-size: 24px; +} +.big { + font-size: 28px; +} +.small { + font-size: 20px; +} +.icon-sm, .icon-sm label { + font-family: "FiraCode Nerd Font", monospace; + font-weight: normal; + font-size: 16px; } .bg { - //background-image: url("~/.background/Mojave-Night.jpg"); - background-color: #000;//#161d2f; - opacity: 0; + background-color: rgba(0, 0, 0, 0.5); + border: 1px solid #5e6668; } -.x { - font-size: 48px; - color: #fff; +.sidebar-sub { + margin-top: 8px; + padding-bottom: 8px; + border-bottom: 2px solid white; +} +.sidebar-sub:last-child { + border-bottom: none; } -.genwin { - border-radius: 16px; - background-color: #161d2f; - border: 5px solid #fff; -} - -/* Profile Settings */ .face { - background-size: 200px; - min-height: 200px; - min-width: 200px; - margin: 65px 0px 0px 0px; + background-size: 96px; + min-height: 96px; + min-width: 96px; + margin-top: 4px; + margin-left: 80px; + margin-right: 80px; border-radius: 100%; - border: 5px solid #fff; + border: 4px solid #fff; background-image: url("file:////home/val/.face.icon"); + opacity: 1; } -//.face:hover { -// border-radius: 25%; -//} - .login { - font-family: monospace; - font-family: FiraCode Nerd Font; + font-family: "FiraCode Nerd Font", monospace; font-weight: bold; - font-size: 30px; - color: #fff; - background-color: #3d4558; + font-size: 28px; border-radius: 5px; - padding-left: 0.5em; - padding-right: 0.5em; + color: #fff; +/* background-color: #3d4558;*/ + background-color: #303030; + padding: 1px 0.5em; + border: 1px solid white; } -/* System Settings */ -.cpu_bar, .ram_bar, scale trough { - all: unset; - background-color: #3d4558; - border-radius: 16px; - min-height: 28px; - min-width: 240px; -} - -.cpu_bar label, .ram_bar label, .disk_bar label { +.time-top { font-family: monospace; -} -.cpu_bar .icon, .ram_bar .icon, .disk_bar .icon { - font-size: 40px; -} - -.cpu_bar, .ram_bar, .disk_bar, scale trough highlight { - all: unset; - border-radius: 16px; -} - -.cpu_bar scale trough highlight { - background-color: #A04A19;//#5A2123; -} - -.ram_bar scale trough highlight { - background-color: #A04A19; -} - -/* Clock Settings */ -.time_hour, .time_min { - color: #ffffff; - font-size: 70px; + font-size: 32px; font-weight: bold; } - -.time_hour { - margin: 20px 0px 0px 25px; +.time-bottom { + font-family: monospace; + font-size: 20px; + font-variant: small-caps; } -.time_min { - margin: 0px 0px 10px 0px; +.sys-info label { + font-family: "FiraCode Nerd Font", monospace; +} +.sys-info:first-child { + border-right: 2px solid white; } -.time_meridiem { - color: #ffffff; - font-size: 40px; - font-weight: bold; - margin: 20px 0px 0px 0px; -} - -.time_day { - color: #ffffff; - font-size: 30px; - font-weight: normal; - margin: 0px 0px 0px 25px; -} - -/* Spotify Settings */ -.album_art { - background-size: 240px; - min-height: 240px; - min-height: 240px; - margin: 20px; - border-radius: 14px; -} - -.wmbar { - background-color: rgba(0, 0, 0, 0.53); - border-radius: 16px; +.cal-bg { + background-color: rgba(24, 24, 24, 0.2); } diff --git a/eww/eww.yuck b/eww/eww.yuck index 17660a6..d675a20 100644 --- a/eww/eww.yuck +++ b/eww/eww.yuck @@ -1,60 +1,184 @@ -;; ______Valerie's Super ______ Amazing _____ -;; / ____/ ___ __ / ____/___ ____ / __(_)___ _ -;; / __/ | | /| / / | /| / / / / / __ \/ __ \/ /_/ / __ `/ -;; / /___ | |/ |/ /| |/ |/ / / /___/ /_/ / / / / __/ / /_/ / -;;/_____/ |__/|__/ |__/|__/ \____/\____/_/ /_/_/ /_/\__, / -;; /____/ +;; ______ Valerie' Amazing ____ +;; / ____/ ___ __ / __ )____ ______ +;; / __/ | | /| / / | /| / / / __ / __ `/ ___/ +;; / /___ | |/ |/ /| |/ |/ / / /_/ / /_/ / / +;;/_____/ |__/|__/ |__/|__/ /_____/\__,_/_/ +;; -;; Includes -(include "./clock.yuck") -(include "./cluster.yuck") -(include "./profile.yuck") -(include "./system.yuck") -(include "./wm.yuck") +(include "./sidebar.yuck") +(include "./calendar.yuck") -;; Widgets -(defwidget - bg [] +;; Variables +(defvar sidebar_rev false) +(defvar WM_MODE "default") + +(defpoll + DATETIME + :interval "2s" + "date +\"%a %b %d %I:%M %p\"" +) +(defpoll REDSHIFT + :interval "2m" + "/home/val/.config/eww/scripts/redshift.sh" +) +(defpoll KEYBOARD + :interval "20ms" + "/home/val/.config/eww/scripts/kb.sh" +) +(defpoll LAN + :interval "2s" + "/home/val/.config/eww/scripts/lan.sh" +) +(defpoll PLAYING + :interval "50ms" + "playerctl status" +) + +(deflisten i3-workspace "/home/val/.config/eww/bin/i3-ws") + +;; Left Section +(defwidget distro [] (box - :class "bg" - :cursor "default" - :onclick "~/.config/eww/launch_eww" + :orientation "h" + :space-evenly false + :halign "start" + (button + :class "icon" + :onclick "exec ~/.script/sysmenu.py system &" + "" + ) ) ) -(defwidget - x [] - (button - :class "x" - :cursor "pointer" - :onclick "~/.config/eww/launch_eww" - :tooltip "close" - :text "" +(defwidget workspace [] + (box + :space-evenly false + (revealer + :reveal { WM_MODE != "default" } + :transition "slideleft" + (label + :text WM_MODE + :style "margin-left: 8px;" + ) + ) + (literal :content i3-workspace) + ) +) + +(defwidget left [] + (box + :orientation "h" + :space-evenly false + :halign "start" + :class "left_modules" + (distro) + (workspace) + ) +) + +;; Right Section +(defwidget keyboard [] + (box + :class "module" + :space-evenly false + :orientation "h" + :spacing "3" + (revealer + :reveal {KEYBOARD != ""} + :transition "slideleft" + :duration "350ms" + (button + :class "icon" + KEYBOARD + ) + ) + ) +) +(defwidget redshift [] + (box + :class "module" + :space-evenly false + :orientation "h" + :spacing "3" + (button + :class "icon" + :onclick "exec ~/.script/sysmenu.py redshift &" + REDSHIFT + ) + ) +) +(defwidget wifi [] + (box + :class "module" + :space-evenly false + :orientation "h" + :spacing "3" + (button + :class "icon" + :onclick "exec ~/.script/sysmenu.py lan &" + LAN + ) + ) +) +(defwidget sidebar_toggle [] + (box + :class "module" + :space-evenly false + :orientation "h" + :spacing "3" + (button + :class "icon-sm" + :onclick "/home/val/.config/eww/scripts/toggle_sidebar.sh" + {sidebar_rev ? "" : "﬿"} + ) + ) +) +(defwidget datetime [] + (box + :class "module" + :space-evenly false + :orientation "h" + :spacing 5 + (button + :onclick "/home/val/.config/eww/scripts/toggle_calendar.sh" + DATETIME + ) + ) +) + +(defwidget right [] + (box + :orientation "h" + :space-evenly false + :spacing 5 + :halign "end" + :class "right_modules" + (keyboard) + (redshift) + (wifi) + (sidebar_toggle) + (datetime) + ) +) + +(defwidget bar [] + (box + :class "bar" + :orientation "h" + (left) + (right) ) ) ;; Windows -(defwindow - background - :stacking "fg" - :focusable true - :wm-ignore true +(defwindow bar :geometry (geometry - :x 0 - :y 0 - ;; 24 - :width "1920px" - :height "1080px" - ;; 1056px + :x "0px" + :y "0px" + :width "100%" + :height "24px" + :anchor "top center" ) - (bg) -) -(defwindow - x :stacking "fg" - :focusable false - :geometry (geometry - :x 12 - :y 12 - ) - (x) + :windowtype "dock" + (bar) ) diff --git a/eww/launch_bar b/eww/launch_bar new file mode 100755 index 0000000..738bf20 --- /dev/null +++ b/eww/launch_bar @@ -0,0 +1,4 @@ +#!/usr/bin/bash + +eww open bar + diff --git a/eww/launch_eww b/eww/launch_eww deleted file mode 100755 index 8b052b5..0000000 --- a/eww/launch_eww +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/bash - -if eww state | grep -q "USERNAME: val" -then - eww close-all -else - eww open-many background profile system clock logout power reboot terminal -fi diff --git a/eww/profile.yuck b/eww/profile.yuck deleted file mode 100644 index b8009e0..0000000 --- a/eww/profile.yuck +++ /dev/null @@ -1,59 +0,0 @@ -;; ____ _____ __ -;; / __ \_________ / __(_) /__ -;; / /_/ / ___/ __ \/ /_/ / / _ \ -;; / ____/ / / /_/ / __/ / / __/ -;;/_/ /_/ \____/_/ /_/_/\___/ -;; - -;; Variables - -(defpoll - HOSTNAME - :interval "24h" - "hostname" -) -(defpoll - USERNAME - :interval "24h" - "whoami" -) - -;; Widget - -(defwidget - user [] - (box - :class "genwin" - :orientation "v" - :spacing 35 - :space-evenly false - :vexpand false - :hexpand false - (box - :class "face" - :halign "center" - ) - (label - :class "login" - :halign "center" - :wrap true - :limit-width 15 - :text "${USERNAME}@${HOSTNAME}" - ) - ) -) - -;; Window - -(defwindow - profile - :stacking "fg" - :focusable false - :geometry (geometry - :x 150 - :y 150 - :width 350 - :height 440 - ) - (user) -) diff --git a/eww/scripts/kb.sh b/eww/scripts/kb.sh new file mode 100755 index 0000000..6b3b734 --- /dev/null +++ b/eww/scripts/kb.sh @@ -0,0 +1,18 @@ +#!/usr/bin/bash +NAME="ErgoDox EZ Shine Keyboard" + +if ! xinput | grep "$NAME" > /dev/null; then + echo "" + exit +fi + +ID=$(xinput | grep "$NAME" | cut -d "=" -f2 | cut -d " " -f1) + +CAPS="$(xinput --get-feedbacks $ID | grep led_mask | awk '{ print $3 }')" + +if [[ "$CAPS" == "1" ]]; then + #echo "⇪" + echo "" +else + echo "" +fi diff --git a/eww/scripts/lan.sh b/eww/scripts/lan.sh new file mode 100755 index 0000000..8076eb6 --- /dev/null +++ b/eww/scripts/lan.sh @@ -0,0 +1,14 @@ +#!/usr/bin/bash +ETH="$(cat /sys/class/net/enp0s31f6/operstate)" +WAN="$(cat /sys/class/net/wlan0/operstate)" +if [[ "$ETH" == "up" ]]; then + #echo "" + echo "" + exit +elif [[ "$WAN" == "up" ]]; then + echo "" +else + #echo "" + #echo "睊" + echo "" +fi diff --git a/polybar_scripts/redshift.sh b/eww/scripts/redshift.sh similarity index 95% rename from polybar_scripts/redshift.sh rename to eww/scripts/redshift.sh index c69ec37..bd9ee6b 100755 --- a/polybar_scripts/redshift.sh +++ b/eww/scripts/redshift.sh @@ -3,6 +3,7 @@ if [ "$(pgrep -x redshift)" ]; then period=$(redshift -p 2> /dev/null | grep Period | awk '{print $2}') if [[ $period == 'Night' ]]; then + #echo "" #echo "" echo "" #echo "鈴" diff --git a/eww/scripts/spotify_art b/eww/scripts/spotify_art new file mode 100755 index 0000000..9642410 --- /dev/null +++ b/eww/scripts/spotify_art @@ -0,0 +1,6 @@ +#!/usr/bin/bash + +TRACK=$(playerctl --player=spotify metadata | grep trackid | awk '{print $3}') +RESOURCE=$(curl -sX GET "https://open.spotify.com/oembed?url=$TRACK" | jq '.thumbnail_url' | awk '{print substr($1, 2, length($1)-2)}') +curl -sX GET "$RESOURCE" --output "/home/val/.config/eww/scripts/tmp/art" +return $RESOURCE diff --git a/eww/scripts/spotify_icon b/eww/scripts/spotify_icon new file mode 100755 index 0000000..fdca2a7 --- /dev/null +++ b/eww/scripts/spotify_icon @@ -0,0 +1,4 @@ +#!/usr/bin/bash + +/home/val/.config/eww/scripts/spotify_art& +echo "" diff --git a/eww/scripts/spotify_meta b/eww/scripts/spotify_meta new file mode 100755 index 0000000..5f38e34 --- /dev/null +++ b/eww/scripts/spotify_meta @@ -0,0 +1,3 @@ +#!/usr/bin/bash + +playerctl --player=spotify metadata | grep $1 | awk '{print $3}' diff --git a/eww/scripts/toggle_calendar.sh b/eww/scripts/toggle_calendar.sh new file mode 100755 index 0000000..35c43ed --- /dev/null +++ b/eww/scripts/toggle_calendar.sh @@ -0,0 +1,7 @@ +#!/usr/bin/bash + +if eww windows | grep -q "*calendar"; then + eww close calendar +else + eww open calendar +fi diff --git a/eww/scripts/toggle_sidebar.sh b/eww/scripts/toggle_sidebar.sh new file mode 100755 index 0000000..4f2853d --- /dev/null +++ b/eww/scripts/toggle_sidebar.sh @@ -0,0 +1,10 @@ +#!/usr/bin/bash + +REV=$(eww get sidebar_rev) +if [[ $REV == 'false' ]]; then + eww open sidebar + eww update sidebar_rev=true +else + eww close sidebar + eww update sidebar_rev=false +fi diff --git a/eww/sidebar.yuck b/eww/sidebar.yuck new file mode 100644 index 0000000..c7b5049 --- /dev/null +++ b/eww/sidebar.yuck @@ -0,0 +1,181 @@ +;; _____ _ __ __ +;; / ___/(_)___/ /__ / /_ ____ ______ +;; \__ \/ / __ / _ \/ __ \/ __ `/ ___/ +;; ___/ / / /_/ / __/ /_/ / /_/ / / +;; /____/_/\__,_/\___/_.___/\__,_/_/ +;; +(defpoll HOSTNAME :interval "24h" "hostname") +(defpoll USERNAME :interval "24h" "whoami") + +(defpoll TIME_TOP + :interval "2s" + "date +\"%I:%M %p\"" +) +(defpoll TIME_BOTTOM + :interval "2s" + "date +\"%B %d\"" +) + +(defpoll CPU_USAGE + :interval "1s" + "~/.config/eww/scripts/cpu" +) +(defpoll RAM_USAGE + :interval "1s" + "~/.config/eww/scripts/ram" +) +(defpoll SSD_USAGE + :interval "30s" + "~/.config/eww/scripts/ssd" +) + +(defwidget profile [] + (box + :class "sidebar-sub" + :orientation "v" + :space-evenly false + :spacing 8 + :hexpand false + :vexpand false + (box + :class "face" + :valign "start" + ) + (label + :class "login" + :halign "center" + :valign "start" + :limit-width 15 + :text "${USERNAME}@${HOSTNAME}" + ) + ) +) + +(defwidget clock [] + (box + :class "sidebar-sub" + :orientation "v" + :space-evenly false + :spacing 8 + (label + :class "time-top" + :text "${TIME_TOP}" + ) + (label + :class "time-bottom" + :text "${TIME_BOTTOM}" + ) + ) +) + +(defwidget system [] + (box + :class "sidebar-sub" + :orientation "h" + :space-evenly true + :spacing 8 + :hexpand false + :vexpand false + (box + :class "sys-info" + :orientation "v" + :space-evenly true + :hexpand false + (label :text "CPU") + (label :text "RAM") + (label :text "SSD") + ) + (box + :class "sys-info" + :orientation "v" + :space-evenly true + :hexpand false + (label :text "${CPU_USAGE}%") + (label :text "${RAM_USAGE}") + (label :text "${SSD_USAGE}") + ) + ) +) + +(defwidget status [] + (box + :class "sidebar-sub status" + :orientation "h" + :space-evenly true + (label + :class "icon" + :text {KEYBOARD == "" ? "" : KEYBOARD} + ) + (label + :class "icon" + :text "${REDSHIFT}" + ) + (label + :class "icon" + :text "${LAN}" + ) + ) +) + +(defwidget actions [] + (box + :class "sidebar-sub actions" + :orientation "v" + :space-evenly true + (box + :orientation "h" + :space-evenly true + (button + :class "icon" + :onclick "poweroff" + :tooltip "shutdown" + "⏼" + ) + (button + :class "icon" + :onclick "reboot" + :tooltip "reboot" + "" + ) + (button + :class "icon" + :onclick "slock" + :tooltip "lock" + "" + ) + (button + :class "icon big" + :onclick "i3-msg exit" + :tooltip "logout" + "﫻" + ) + ) + ) +) + +(defwidget sidebar [] + (box + :class "bg" + :orientation "v" + :space-evenly false + :spacing 8 + :hexpand false + :vexpand false + (profile) + (clock) + (system) + (status) + ) +) + +(defwindow sidebar + :geometry (geometry + :x "1648" + :y "42px" + :width "256px" + ) + :stacking "fg" + :windowtype "normal" + :wm-ignore true + (sidebar) +) diff --git a/eww/system.yuck b/eww/system.yuck deleted file mode 100644 index 9224847..0000000 --- a/eww/system.yuck +++ /dev/null @@ -1,102 +0,0 @@ -;; _____ __ -;; / ___/__ _______/ /____ ____ ___ -;; \__ \/ / / / ___/ __/ _ \/ __ `__ \ -;; ___/ / /_/ (__ ) /_/ __/ / / / / / -;;/____/\__, /____/\__/\___/_/ /_/ /_/ -;; /____/ - -;; Variables - -(defpoll - CPU_USAGE - :interval "1s" - "~/.config/eww/scripts/cpu" -) -(defpoll - RAM_USAGE - :interval "1s" - "~/.config/eww/scripts/ram" -) -(defpoll - SSD_USAGE - :interval "1m" - "~/.config/eww/scripts/ssd" -) - -;; Widgets - -(defwidget - system [] - (box - :class "genwin" - :vexpand false - :hexpand false - :cursor "default" - (box - :orientation "v" - :spacing 35 - :halign "center" - :valign "center" - :space-evenly false - :vexpand false - :hexpand false - (box - :class "cpu_bar" - :orientation "h" - :spacing 20 - :space-evenly true - :vexpand false - :hexpand false - (label - :text "CPU" - ;;:text "" - ) - (label :text "|") - (label :text "${CPU_USAGE}%") - ) - (box - :class "ram_bar" - :orientation "h" - :spacing 20 - :space-evenly true - :vexpand false - :hexpand false - (label - :text "RAM" - ;;:text "" - ) - (label :text "|") - (label :text "${RAM_USAGE}") - ) - (box - :class "disk_bar" - :orientation "h" - :spacing 20 - :space-evenly true - :vexpand false - :hexpand false - (label - :text "SSD" - ;;:text "" - ) - (label :text "|") - (label :text "${SSD_USAGE}") - ) - ) - ) -) - -;; Windows - -(defwindow - system - :stacking "fg" - :focusable false - :geometry (geometry - :x 150 - :y 605 - :width 350 - :height 325 - ) - (system) -) diff --git a/eww/wm.yuck b/eww/wm.yuck deleted file mode 100644 index 5694484..0000000 --- a/eww/wm.yuck +++ /dev/null @@ -1,101 +0,0 @@ -;; _ ____ ___ -;;| | / / |/ / -;;| | /| / / /|_/ / -;;| |/ |/ / / / / -;;|__/|__/_/ /_/ -;; - -;; Widgets -(defwidget - wmbar [] - (box - :class "wmbar" - :orientation "h" - :halign "start" - :space-evenly true - :hexpand false - :vexpand false - :spacing 5 - (label - :class "icon" - :text "" - ) - (button - :class "icon" - :cursor "pointer" - :onclick "i3-msg workspace 1" - "1" - ) - (button - :class "icon" - :cursor "pointer" - :onclick "i3-msg workspace 2" - "2" - ) - (button - :class "icon" - :cursor "pointer" - :onclick "i3-msg workspace 3" - "3" - ) - (button - :class "icon" - :cursor "pointer" - :onclick "i3-msg workspace 4" - "4" - ) - (button - :class "icon" - :cursor "pointer" - :onclick "i3-msg workspace 5" - "5" - ) - (button - :class "icon" - :cursor "pointer" - :onclick "i3-msg workspace 6" - "6" - ) - (button - :class "icon" - :cursor "pointer" - :onclick "i3-msg workspace 7" - "7" - ) - (button - :class "icon" - :cursor "pointer" - :onclick "i3-msg workspace 8" - "8" - ) - (button - :class "icon" - :cursor "pointer" - :onclick "i3-msg workspace 9" - "9" - ) - (button - :class "icon" - :cursor "pointer" - :onclick "i3-msg workspace 10" - "10" - ) - (button - :class "icon" - :cursor "pointer" - :onclick "i3-msg workspace back_and_forth" - :tooltip "back-and-forth" - "" - ) - ) -) - -;; Windows -(defwindow - wmbar - :geometry (geometry - :x 8 - :y 8 - ) - (wmbar) -) diff --git a/helix/config.toml b/helix/config.toml new file mode 100644 index 0000000..94b154c --- /dev/null +++ b/helix/config.toml @@ -0,0 +1,11 @@ +theme = "val-onedark" + +[editor] +auto-pairs = false + +[editor.file-picker] +hidden = false + +[editor.lsp] +display-messages = true + diff --git a/helix/languages.toml b/helix/languages.toml new file mode 100644 index 0000000..9de8486 --- /dev/null +++ b/helix/languages.toml @@ -0,0 +1,56 @@ + +[[language]] +name = "rust" +indent = { tab-width = 4, unit = "\t" } + +[language.auto-pairs] +# no auto pairs >:( + +[[language]] +name = "bash" +indent = { tab-width = 4, unit = "\t" } +shebangs = ["sh", "bash", "/usr/bin/bash", "/usr/bin/sh"] + +[[language]] +name = "c" +indent = { tab-width = 4, unit = "\t" } + +[[language]] +name = "c-sharp" +indent = { tab-width = 4, unit = "\t" } +language-server = { commmand = "omnisharp", args = [ "--languageserver", "--stdio" ] } + +[[language]] +name = "css" +indent = { tab-width = 4, unit = "\t" } + +[[language]] +name = "html" +indent = { tab-width = 4, unit = "\t" } + +[[language]] +name = "javascript" +indent = { tab-width = 4, unit = "\t" } + +[[language]] +name = "json" +indent = { tab-width = 4, unit = "\t" } + +[[language]] +name = "markdown" +indent = { tab-width = 4, unit = "\t" } + +[[language]] +name = "php" +indent = { tab-width = 4, unit = "\t" } +shebangs = ['php', '/usr/bin/php'] + +[[language]] +name = "python" +indent = { tab-width = 4, unit = "\t" } +shebangs = ['python', '/usr/bin/python'] + +[[language]] +name = "toml" +indent = { tab-width = 4, unit = "\t" } + diff --git a/helix/themes/val-onedark.toml b/helix/themes/val-onedark.toml new file mode 100644 index 0000000..38ae500 --- /dev/null +++ b/helix/themes/val-onedark.toml @@ -0,0 +1,87 @@ +# Author : Gokul Soumya + +"attribute" = { fg = "yellow" } +"comment" = { fg = "light-gray", modifiers = ["italic"] } +"constant" = { fg = "cyan" } +"constant.numeric" = { fg = "gold" } +"constant.builtin" = { fg = "gold" } +"constant.character.escape" = { fg = "gold" } +"constructor" = { fg = "blue" } +"function" = { fg = "blue" } +"function.builtin" = { fg = "blue" } +"function.macro" = { fg = "purple" } +"keyword" = { fg = "red" } +"keyword.control" = { fg = "purple" } +"keyword.control.import" = { fg = "red" } +"keyword.directive" = { fg = "purple" } +"label" = { fg = "purple" } +"namespace" = { fg = "blue" } +"operator" = { fg = "purple" } +"keyword.operator" = { fg = "purple" } +"property" = { fg = "red" } +"special" = { fg = "blue" } +"string" = { fg = "green" } +"type" = { fg = "yellow" } +# "variable" = { fg = "blue" } +"variable.builtin" = { fg = "blue" } +"variable.parameter" = { fg = "red" } +"variable.other.member" = { fg = "red" } + +"markup.heading" = { fg = "red" } +"markup.raw.inline" = { fg = "green" } +"markup.bold" = { fg = "gold", modifiers = ["bold"] } +"markup.italic" = { fg = "purple", modifiers = ["italic"] } +"markup.list" = { fg = "red" } +"markup.quote" = { fg = "yellow" } +"markup.link.url" = { fg = "cyan", modifiers = ["underlined"]} +"markup.link.text" = { fg = "purple" } + +"diff.plus" = "green" +"diff.delta" = "gold" +"diff.minus" = "red" + +diagnostic = { modifiers = ["underlined"] } +"info" = { fg = "blue", modifiers = ["bold"] } +"hint" = { fg = "green", modifiers = ["bold"] } +"warning" = { fg = "yellow", modifiers = ["bold"] } +"error" = { fg = "red", modifiers = ["bold"] } + +# "ui.background" = { bg = "black" } +"ui.virtual" = { fg = "light-gray" } + +"ui.cursor" = { fg = "white", modifiers = ["reversed"] } +"ui.cursor.primary" = { fg = "white", modifiers = ["reversed"] } +"ui.cursor.match" = { fg = "blue", modifiers = ["underlined"]} + +"ui.selection" = { bg = "light-gray" } +"ui.selection.primary" = { bg = "gray" } + +"ui.linenr" = { fg = "linenr" } +"ui.linenr.selected" = { fg = "white" } + +"ui.statusline" = { fg = "white", bg = "light-black" } +"ui.statusline.inactive" = { fg = "light-gray", bg = "light-black" } + +"ui.text" = { fg = "white" } +"ui.text.focus" = { fg = "white", bg = "light-black", modifiers = ["bold"] } + +"ui.help" = { bg = "gray" } +"ui.popup" = { bg = "gray" } +"ui.window" = { bg = "gray" } +"ui.menu.selected" = { fg = "black", bg = "blue" } + +[palette] + +yellow = "#E5C07B" +blue = "#61AFEF" +red = "#E06C75" +purple = "#C678DD" +green = "#98C379" +gold = "#D19A66" +cyan = "#56B6C2" +white = "#ABB2BF" +black = "#282C34" +light-black = "#2C323C" +gray = "#3E4452" +light-gray = "#5C6370" +linenr = "#4B5263" diff --git a/hyper.js b/hyper.js deleted file mode 100644 index 64d1a18..0000000 --- a/hyper.js +++ /dev/null @@ -1,161 +0,0 @@ -// Future versions of Hyper may add additional config options, -// which will not automatically be merged into this file. -// See https://hyper.is#cfg for all currently supported options. - -module.exports = { - config: { - // choose either `'stable'` for receiving highly polished, - // or `'canary'` for less polished but more frequent updates - updateChannel: 'stable', - - // default font size in pixels for all tabs - fontSize: 12, - - // font family with optional fallbacks - fontFamily: 'Fira Code, FiraCode Nerd Font, monospace', - - // default font weight: 'normal' or 'bold' - fontWeight: 'normal', - - // font weight for bold characters: 'normal' or 'bold' - fontWeightBold: 'bold', - - // line height as a relative unit - lineHeight: 1, - - // letter spacing as a relative unit - letterSpacing: 0.8, - - // terminal cursor background color and opacity (hex, rgb, hsl, hsv, hwb or cmyk) - cursorColor: 'rgba(255,255,255,0.8625)', - - // terminal text color under BLOCK cursor - cursorAccentColor: '#000', - - // `'BEAM'` for |, `'UNDERLINE'` for _, `'BLOCK'` for █ - cursorShape: 'BLOCK', - - // set to `true` (without backticks and without quotes) for blinking cursor - cursorBlink: true, - - // color of the text - foregroundColor: '#fff', - - // terminal background color - // opacity is only supported on macOS - backgroundColor: '#000', - - // terminal selection color - selectionColor: 'rgba(248,28,229,0.3)', - - // border color (window, tabs) - borderColor: '#333', - - // custom CSS to embed in the main window - css: '', - - // custom CSS to embed in the terminal window - termCSS: '', - - // if you're using a Linux setup which show native menus, set to false - // default: `true` on Linux, `true` on Windows, ignored on macOS - showHamburgerMenu: true, - - // set to `false` (without backticks and without quotes) if you want to hide the minimize, maximize and close buttons - // additionally, set to `'left'` if you want them on the left, like in Ubuntu - // default: `true` (without backticks and without quotes) on Windows and Linux, ignored on macOS - showWindowControls: false, - - // custom padding (CSS format, i.e.: `top right bottom left`) - padding: '6px 14px', - // default: 12px 14px - - // the full list. if you're going to provide the full color palette, - // including the 6 x 6 color cubes and the grayscale map, just provide - // an array here instead of a color map object - colors: { - black: '#000000', - red: '#C91B00', - green: '#00C200', - yellow: '#C7C329', - blue: '#0225C7', - magenta: '#C930C7', - cyan: '#00C5C7', - white: '#C7C7C7', - lightBlack: '#676767', - lightRed: '#FF6D67', - lightGreen: '#5FF967', - lightYellow: '#FFFA72', - lightBlue: '#6871FF', - lightMagenta: '#FF76FF', - lightCyan: '#68FDFE', - lightWhite: '#FFFFFF', - }, - - // the shell to run when spawning a new session (i.e. /usr/local/bin/fish) - // if left empty, your system's login shell will be used by default - // - // Windows - // - Make sure to use a full path if the binary name doesn't work - // - Remove `--login` in shellArgs - // - // Bash on Windows - // - Example: `C:\\Windows\\System32\\bash.exe` - // - // PowerShell on Windows - // - Example: `C:\\WINDOWS\\System32\\WindowsPowerShell\\v1.0\\powershell.exe` - shell: '', - - // for setting shell arguments (i.e. for using interactive shellArgs: `['-i']`) - // by default `['--login']` will be used - shellArgs: ['--login'], - - // for environment variables - env: {}, - - // set to `false` for no bell - bell: false, - - // if `true` (without backticks and without quotes), selected text will automatically be copied to the clipboard - copyOnSelect: false, - - // if `true` (without backticks and without quotes), hyper will be set as the default protocol client for SSH - defaultSSHApp: true, - - // if `true` (without backticks and without quotes), on right click selected text will be copied or pasted if no - // selection is present (`true` by default on Windows and disables the context menu feature) - quickEdit: false, - - // choose either `'vertical'`, if you want the column mode when Option key is hold during selection (Default) - // or `'force'`, if you want to force selection regardless of whether the terminal is in mouse events mode - // (inside tmux or vim with mouse mode enabled for example). - macOptionSelectionMode: 'vertical', - - // URL to custom bell - // bellSoundURL: 'http://example.com/bell.mp3', - - // Whether to use the WebGL renderer. Set it to false to use canvas-based - // rendering (slower, but supports transparent backgrounds) - webGLRenderer: false, - - // for advanced config flags please refer to https://hyper.is/#cfg - }, - - // a list of plugins to fetch and install from npm - // format: [@org/]project[#version] - // examples: - // `hyperpower` - // `@company/project` - // `project#1.0.1` - plugins: [ 'hyper-font-ligatures' ], - - // in development, you can create a directory under - // `~/.hyper_plugins/local/` and include it here - // to load it and avoid it being `npm install`ed - localPlugins: [], - - keymaps: { - // Example - // 'window:devtools': 'cmd+alt+o', - }, -}; diff --git a/i3_config b/i3_config index f86ee00..df97d8f 100644 --- a/i3_config +++ b/i3_config @@ -21,16 +21,35 @@ set $ws9 "9" set $ws10 "10" # Appearance +#default_border pixel 2 for_window [class="^.*"] border pixel 2 gaps inner 15 font pango:DejaVu Sans Mono 2 for_window [class=".*"] title_format "" -client.focused #323232 #7575ff #ffffff #161d2f #5e6668 -client.focused_inactive #323232 #4545ff #ffffff #161d2f #323232 -client.unfocused #323232 #161d2f #ffffff #161d2f #323232 -client.urgent #323232 #ff7b19 #ffffff #900000 #d4d4d4 +# ______ __ +# / ____/___ / /___ __________ +# / / / __ \/ / __ \/ ___/ ___/ +#/ /___/ /_/ / / /_/ / / (__ ) +#\____/\____/_/\____/_/ /____/ +# +# class title backgr. text indic. border +# BASIC +#client.focused #323232 #7575ff #ffffff #161d2f #5e6668 +#client.focused_inactive#323232 #4545ff #ffffff #161d2f #323232 +#client.unfocused #323232 #161d2f #ffffff #161d2f #323232 +#client.urgent #323232 #ff7b19 #ffffff #900000 #d4d4d4 +# NORDIC +#client.focused #323232 #81A1C1 #FFFFFF #2E3440 #E5E9F0 +#client.focused_inactive#323232 #5E81AC #FFFFFF #2E3440 #D8DEE9 +#client.unfocused #323232 #2E3449 #FFFFFF #2E3440 #D8DEE9 +#client.urgent #323232 #D08770 #FFFFFF #BF616A #D8DEE9 +# HYBRID +client.focused #323232 #81A1C1 #FFFFFF #161D2F #6E7678 +client.focused_inactive #323232 #5E81AC #FFFFFF #161D2F #323232 +client.unfocused #323232 #2E3449 #FFFFFF #161D2F #323232 +client.urgent #323232 #D08770 #FFFFFF #161D2F #424242 # __ __ __ _ __ # / //_/__ __ __/ /_ (_)___ ____/ /____ @@ -44,7 +63,7 @@ bindsym $mod+Shift+r restart bindsym $mod+Shift+c reload # WM Interacts -bindsym $mod+Return exec hyper +bindsym $mod+Return exec wezterm bindsym $mod+Shift+q kill bindsym $mod+space exec rofi -show run @@ -80,6 +99,7 @@ bindsym $mod+BackSpace workspace back_and_forth bindsym $mod+grave scratchpad show bindsym $mod+Shift+grave floating enable, move scratchpad +bindsym $mod+Tab+grave floating enable, move scratchpad bindsym $mod+1 workspace number $ws1 bindsym $mod+2 workspace number $ws2 @@ -105,10 +125,25 @@ bindsym $mod+Shift+0 move container to workspace number $ws10 # Resize Mode mode "resize" { - bindsym Left resize shrink width 5 px or 5 ppt - bindsym Down resize grow height 5 px or 5 ppt - bindsym Up resize shrink height 5 px or 5 ppt - bindsym Right resize grow width 5 px or 5 ppt + bindsym Left resize shrink width 4 px or 2 ppt + bindsym Down resize grow height 4 px or 2 ppt + bindsym Up resize shrink height 4 px or 2 ppt + bindsym Right resize grow width 4 px or 2 ppt + + bindsym Ctrl+Left resize shrink width 2 px or 1 ppt + bindsym Ctrl+Down resize grow height 2 px or 1 ppt + bindsym Ctrl+Up resize shrink height 2 px or 1 ppt + bindsym Ctrl+Right resize grow width 2 px or 1 ppt + + bindsym Shift+Left resize shrink width 8 px or 4 ppt + bindsym Shift+Down resize grow height 8 px or 4 ppt + bindsym Shift+Up resize shrink height 8 px or 4 ppt + bindsym Shift+Right resize grow width 8 px or 4 ppt + + bindsym Ctrl+Shift+Left resize shrink width 16 px or 8 ppt + bindsym Ctrl+Shift+Down resize grow height 16 px or 8 ppt + bindsym Ctrl+Shift+Up resize shrink height 16 px or 8 ppt + bindsym Ctrl+Shift+Right resize grow width 16 px or 8 ppt bindsym Return mode "default" bindsym Escape mode "default" @@ -121,11 +156,15 @@ bindsym $mod+r mode "resize" bindsym $mod+Escape exec dunstctl close bindsym Shift+$mod+Escape exec dunstctl close-all -bindsym Menu exec /home/val/.config/eww/launch_eww +bindsym Menu exec /home/val/.config/eww/menu_script -bindsym XF86AudioPlay exec playerctl play-pause -bindsym XF86AudioNext exec playerctl next -bindsym XF86AudioPrev exec playerctl previous +bindsym XF86AudioPlay exec playerctl --player=spotify play-pause +bindsym XF86AudioNext exec playerctl --player=spotify next +bindsym XF86AudioPrev exec playerctl --player=spotify previous + +bindsym Shift+XF86AudioPlay exec playerctl play-pause +bindsym Shift+XF86AudioNext exec playerctl next +bindsym Shift+XF86AudioPrev exec playerctl previous bindsym $mod+Shift+s exec scrot ~/Images/scrot/%b%d_%H-%M-%S.png @@ -137,15 +176,18 @@ bindsym $mod+Shift+s exec scrot ~/Images/scrot/%b%d_%H-%M-%S.png # /_/ exec_always feh --bg-scale ~/.background exec_always xrdb ~/.Xresources -exec ~/.bin/picom-ibhagwan/picom + +exec picom exec redshift & exec dunst -exec polybar top -exec unclutter +# exec polybar top exec eww daemon +exec eww open bar +exec unclutter +exec --no-startup-id fcitx5 -d exec ~/.script/nosleep.sh -exec ~/.script/trackball_speed.sh 0.2 1 +exec_always ~/.script/hid/trackball_speed.sh 0.1 1 # _ ___ __ ____ #| | / (_)___ ____/ /___ _ __ / __ \_________ ____ _____ @@ -154,10 +196,19 @@ exec ~/.script/trackball_speed.sh 0.2 1 #|__/|__/_/_/ /_/\__,_/\____/|__/|__/ /_/ /_/ \____/ .___/____/ # /_/ +for_window [class="Aseprite"] border pixel 0 +for_window [title="Blanket" class="python3"] floating enable +for_window [class="Blueman-manager"] floating enable for_window [class="eww"] floating enable for_window [class="eww-background"] border pixel 0 +for_window [class="Gnome-calendar"] floating enable +#for_window [class="i3-frame"] border pixel 1 for_window [class="Org.gnome.Nautilus"] floating enable for_window [class="Pick-colour-picker"] floating enable for_window [class="rofi"] border pixel 0 for_window [class="Tk" title="sysmenu"] floating enable +for_window [class="Steam" title="Friends List"] floating enable +for_window [class="org.wezfurlong.wezterm"] border pixel 2 +no_focus [window_role="pop-up"] +focus_on_window_activation none diff --git a/nvim/init.vim b/nvim/init.vim deleted file mode 100644 index c1a9cba..0000000 --- a/nvim/init.vim +++ /dev/null @@ -1,43 +0,0 @@ -" _ -" ____ _ __(_)___ ___ -" / __ \ | / / / __ `__ \ -" / / / / |/ / / / / / / / -" /_/ /_/|___/_/_/ /_/ /_/ -" -syntax enable -filetype plugin indent on -colorscheme pablo - -set autoindent -set noexpandtab -set tabstop=4 -set shiftwidth=4 - -set mouse=a - -" __ __ __ _ __ -" / //_/__ __ __/ /_ (_)___ ____/ /____ -" / ,< / _ \/ / / / __ \/ / __ \/ __ / ___/ -" / /| / __/ /_/ / /_/ / / / / / /_/ (__ ) -" /_/ |_\___/\__, /_.___/_/_/ /_/\__,_/____/ -" /____/ - -" Ctrl+Tab: Toggle tab markers -map :set list! lcs=tab:\¦\ -" Ctrl+`: Open NERDTree -map :NERDTree - -" ____ __ __ -" / _/___ _____/ /_ ______/ /__ -" / // __ \/ ___/ / / / / __ / _ \ -" _/ // / / / /__/ / /_/ / /_/ / __/ -" /___/_/ /_/\___/_/\__,_/\__,_/\___/ -" - -execute 'source' '~/.config/nvim/plugins.vim' - -" I don't know who the dumbfuck who thinks they -" know how I should be indenting better than me -" is, but they can kiss my ass. -set noexpandtab - diff --git a/nvim/plugins.vim b/nvim/plugins.vim deleted file mode 100644 index 4d39b72..0000000 --- a/nvim/plugins.vim +++ /dev/null @@ -1,28 +0,0 @@ -" ____ __ _ -" / __ \/ /_ ______ _(_)___ _____ -" / /_/ / / / / / __ `/ / __ \/ ___/ -" / ____/ / /_/ / /_/ / / / / (__ ) -" /_/ /_/\__,_/\__, /_/_/ /_/____/ -" /____/ - -call plug#begin('~/.config/nvim/plugged') - -Plug 'neovim/nvim-lspconfig' -Plug 'neovim/nvim.net' - -Plug 'hrsh7th/nvim-cmp' -Plug 'hrsh7th/cmp-nvim-lsp' - -Plug 'itchyny/lightline.vim' - -Plug 'neoclide/coc.nvim', { 'branch': 'release' } - -Plug 'omnisharp/omnisharp-vim' - -Plug 'preservim/nerdtree' -Plug 'python-mode/python-mode', {'for': 'python', 'branch': 'develop'} - -Plug 'rust-lang/rust.vim' - -call plug#end() - diff --git a/picom.conf b/picom.conf index 2c2204e..f5f8f08 100644 --- a/picom.conf +++ b/picom.conf @@ -18,13 +18,6 @@ opacity-of-dropdown_menu = 1; inactive-opacity = 1; active-opacity = 1; frame-opacity = 1; - -# ____ __ -# / __ )/ /_ _______ -# / __ / / / / / ___/ -# / /_/ / / /_/ / / -#/_____/_/\__,_/_/ -# blur-background = true; blur-background-frame = true; blur-method = "dual_kawase"; @@ -37,6 +30,7 @@ blur-strength = 3; blur-background-exclude = [ "window_type = 'desktop'", "class_i = 'discover-overlay'", + "name *= 'rect-overlay'" ]; opacity-rule = [ @@ -44,17 +38,18 @@ opacity-rule = [ "70:name = 'sysmenu'", "85:class_g = 'Hyper'", "90:class_g = 'Typora'", - "95:class_g = 'discord'", + #"95:class_g = 'discord'", "90:class_g = 'code-oss'", "95:class_g = 'dolphin'", "85:class_g = 'Spotify'", "85:class_g = 'Insomnia'", - "60:class_g = 'Blueman-manager'", + "90:class_g = 'Blueman-manager'", "85:class_g = 'filelight'", "90:class_g = 'Atom'", "90:class_g = 'jetbrains-rider'", "50:class_g = 'i3-frame'", - "65:class_g = 'URxvt'", + "75:class_g = 'URxvt'", +# "85:class_g = 'org.wezfurlong.wezterm'", # "75:name = 'Picture-in-Picture' && !focused", ]; @@ -75,18 +70,24 @@ fade-out-step = 0.02; # / _, _/ /_/ / /_/ / / / / /_/ / / /___/ /_/ / / / / / / __/ / (__ ) #/_/ |_|\____/\__,_/_/ /_/\__,_/ \____/\____/_/ /_/ /_/\___/_/ /____/ # -corner-radius = 8.0; +# corner-radius = 8.0; +corner-radius = 12.0; rounded-corners-exclude = [ + "class_g = 'Aseprite'", "class_g = 'Polybar'", "class_g = 'eww-background'", -# "class_g = 'i3-frame'", + "class_g = 'i3-frame'", "class_i = 'discover-overlay'", + "class_i = 'onboard'", + "window_type = 'dock'" # "class_g = 'rofi'", ]; round-borders = 1; round-borders-rule = [ "2:window_type = 'normal'", - "1:class_g = 'i3-frame'", + "2:window_type = 'menu'", + "2:window_type = 'dialog'", + "1:class_g = 'i3-frame'" ]; # ____ __ @@ -100,5 +101,5 @@ vsync = true; experimental-backends = true; xrender-sync-fence = true; unredir-if-possible = false; -glx-no-stencil = false; +glx-no-stencil = true; glx-no-rebind-pixmap = true; diff --git a/polybar_config b/polybar_config deleted file mode 100644 index 39e74f0..0000000 --- a/polybar_config +++ /dev/null @@ -1,138 +0,0 @@ - -[bar/top] -monitor = "DP-3" -background = #88000000 -foreground = #FFFFFF -font-0 = Helvetica Neue:style=Regular:pixelsize=11;2 -font-1 = FiraCode Nerd Font:style=Regular;pixelsize=11;2 -font-2 = Fira Code:style=Regular;pixelsize=07;2 -height = 24 -line-size = 2 -modules-left = icon i3 -#modules-center = title -modules-right = redshift network eww datetime -padding = 2 -module-margin = 2 - -[bar/openbox] -monitor = "DP-3" - -[bar/crt-main] -monitor = "DP-4" -background = #88000000 -foreground = #FFFFFF -font-0 = Helvetica Neue:style=Regular:pixelsize=11;2 -font-1 = font\-mfizz:style=mfizz;pixelsize=11;2 -height = 24 -line-size = 2 -modules-left = icon i3 -modules-right = datetime -padding = 2 -module-margin = 2 - -[bar/crt] -monitor = "DP-4" -background = #88000000 -foreground = #FFFFFF -font-0 = Helvetica Neue:style=Regular:pixelsize=11;2 -height = 24 -line-size = 2 -modules-left = i3 -modules-right = datetime -padding = 2 -module-margin = 2 - -[module/icon] -label-active-font = 1 -type = custom/text -content = "" -#content = "" -click-left = exec ~/.script/syscontext.py & - -[module/i3] -type = internal/i3 -label-focused-underline = #FFFFFF -label-urgent-underline = #FFAA00 -label-visible-underline = #888888 -label-urgent-foreground = #FFAA00 -strip-wsnumber = true -label-mode-padding = 1 -label-focused = %index% -label-visible = %index% -label-unfocused = %index% -label-urgent = %index% -label-focused-padding = 1 -label-visible-padding = 1 -label-unfocused-padding = 1 -label-urgent-padding = 1 -enable-scroll = false -reverse-scroll = false -pin-workspaces = true - -[module/battery] -label-active-font = 1 -type = internal/battery -battery = BAT0 -adapter = ADP1 -format-charging = -format-discharging = -ramp-capacity-0 = "" -ramp-capacity-1 = "" -ramp-capacity-2 = "" -ramp-capacity-3 = "" -ramp-capacity-4 = "" -label-charging = "%percentage%% " -label-discharging = "%percentage%% " - -[module/network] -label-active-font = 1 -type = internal/network -interface = wlan0 -interval = 10.0 -format-disconnected = " " -format-connected = " " - -[module/bluetooth] -label-active-font = 2 -type = custom/text -content = "" -click-left = exec blueman-manager - -[module/redshift] -type = custom/script -exec = ~/.config/polybar/script/redshift.sh -label = "%output% " -format =