diff --git a/user/.bashrc b/user/.bashrc index 598fa67e7..8a0643d39 100644 --- a/user/.bashrc +++ b/user/.bashrc @@ -138,14 +138,12 @@ alias \ # pacman alias \ - pac-up="sudo pacman -Syyu" \ - pac-get="sudo pacman -S" \ - pac-rmv="sudo pacman -Rcns" \ - pac-rmv-sec="sudo pacman -Runs" \ - pac-qry="sudo pacman -Ss" \ - pac-cln="sudo pacman -Scc" \ - par-get="paru -S" \ - par-cln="paru -Scc" + xb-up="sudo xbps-install -Su && xcheckrestart" \ + xb-get="sudo xbps-install -S" \ + xb-rmv="sudo xbps-remove -R" \ + xb-rmv-sec="sudo xbps-remove" \ + xb-qry="sudo xbps-query -R" \ + xb-cln="sudo xbps-remove -Oo" \ # colorize grep output (good for log files) alias \ @@ -190,9 +188,9 @@ alias \ # power management alias \ - po="systemctl poweroff" \ - sp="systemctl suspend" \ - rb="systemctl reboot" + po="loginctl poweroff" \ + sp="loginctl suspend" \ + rb="loginctl reboot" # file management alias \ diff --git a/user/.config/awesome/core/apps.lua b/user/.config/awesome/core/apps.lua index 604b924b9..81025f5ea 100644 --- a/user/.config/awesome/core/apps.lua +++ b/user/.config/awesome/core/apps.lua @@ -6,6 +6,6 @@ music = "alacritty -t cmus --class cmus,cmus -e cmus", chat = "alacritty -t gomuks --class gomuks,gomuks -e gomuks", game = "retroarch", file = "alacritty -t vifm --class vifm,vifm -e ./.config/vifm/scripts/vifmrun", -browser = "brave", +browser = "chromium", } return apps diff --git a/user/.config/awesome/core/autostart.lua b/user/.config/awesome/core/autostart.lua index 0c8c6e4d0..d81aa55bc 100644 --- a/user/.config/awesome/core/autostart.lua +++ b/user/.config/awesome/core/autostart.lua @@ -1,4 +1,7 @@ local awful = require("awful") -awful.util.spawn_with_shell("$HOME/.fehbg &") +awful.util.spawn_with_shell("/usr/bin/emacs --daemon &") awful.util.spawn_with_shell("lxpolkit &") +awful.util.spawn_with_shell("$HOME/.fehbg &") awful.util.spawn_with_shell("unclutter --hide-on-touch &") +awful.util.spawn_with_shell("picom --experimental-backends --config ~/.config/picom/picom.conf &") +awful.util.spawn_with_shell("dunst --config ~/.config/dunst/dunstrc &") diff --git a/user/.config/awesome/core/bar/bar.lua b/user/.config/awesome/core/bar/bar.lua index 88db22c48..f0fc61324 100644 --- a/user/.config/awesome/core/bar/bar.lua +++ b/user/.config/awesome/core/bar/bar.lua @@ -11,15 +11,15 @@ mytextclock = wibox.widget.textclock() screen.connect_signal("request::desktop_decoration", function(s) -- Tag names for each screen - awful.tag({ "E", - "F", - "W", - "C", - "M", - "V", - "X", - "D", - "G" + awful.tag({ "", + "", + "", + "", + "", + "", + "", + "", + "" }, s, awful.layout.layouts[1]) -- Layoutbox widget @@ -34,10 +34,11 @@ screen.connect_signal("request::desktop_decoration", function(s) } -- Custom widgets -s.volume = awful.widget.watch(".config/awesome/core/bar/widgets/volume", 0.1) -s.battery = awful.widget.watch(".config/awesome/core/bar/widgets/battery", 0.1) -s.brightness = awful.widget.watch(".config/awesome/core/bar/widgets/brightness", 0.1) -s.layout = awful.widget.watch(".config/awesome/core/bar/widgets/layout", 0.1) +s.volume = awful.widget.watch(".config/awesome/core/bar/widgets/volume", 1) +s.battery = awful.widget.watch(".config/awesome/core/bar/widgets/battery", 10) +s.wifi = awful.widget.watch(".config/awesome/core/bar/widgets/wifi", 10) +s.brightness = awful.widget.watch(".config/awesome/core/bar/widgets/brightness", 1) +s.layout = awful.widget.watch(".config/awesome/core/bar/widgets/layout", 1) -- Taglist widget s.mytaglist = awful.widget.taglist { @@ -80,15 +81,18 @@ s.layout = awful.widget.watch(".config/awesome/core/bar/widgets/layout", 0.1) wibox.container.background(wibox.widget.textbox(" "), theme.bar_bg_one), wibox.container.background(s.layout, theme.bar_bg_one), wibox.container.background(wibox.widget.textbox(" "), theme.bar_bg_one), - wibox.container.background(wibox.widget.textbox(" "), theme.bar_bg_two), - wibox.container.background(s.battery, theme.bar_bg_two), - wibox.container.background(wibox.widget.textbox(" "), theme.bar_bg_two), wibox.container.background(wibox.widget.textbox(" "), theme.bar_bg_tre), wibox.container.background(s.volume, theme.bar_bg_tre), wibox.container.background(wibox.widget.textbox(" "), theme.bar_bg_tre), wibox.container.background(wibox.widget.textbox(" "), theme.bar_bg_for), wibox.container.background(s.brightness, theme.bar_bg_for), wibox.container.background(wibox.widget.textbox(" "), theme.bar_bg_for), + wibox.container.background(wibox.widget.textbox(" "), theme.bar_bg_two), + wibox.container.background(s.battery, theme.bar_bg_two), + wibox.container.background(wibox.widget.textbox(" "), theme.bar_bg_two), + wibox.container.background(wibox.widget.textbox(" "), theme.bar_bg_fiv), + wibox.container.background(s.wifi, theme.bar_bg_fiv), + wibox.container.background(wibox.widget.textbox(" "), theme.bar_bg_fiv), }, }, { diff --git a/user/.config/awesome/core/bar/widgets/battery b/user/.config/awesome/core/bar/widgets/battery index 7f22d4bdf..72391a851 100755 --- a/user/.config/awesome/core/bar/widgets/battery +++ b/user/.config/awesome/core/bar/widgets/battery @@ -2,27 +2,27 @@ # Loop through all attached batteries and format the info currntpwr=$(powerprofilesctl get) if [ "${currntpwr}" = "performance" ]; then - pwr="-  performance" + pwr="-  Performance" elif [ "${currntpwr}" = "balanced" ]; then - pwr="-  balanced" + pwr="-  Balanced" elif [ "${currntpwr}" = "power-saver" ]; then - pwr="-  power-saver" + pwr="-  Power Saver" fi for battery in /sys/class/power_supply/BAT?*; do # If non-first battery, print a space separator. [ -n "${capacity+x}" ] && printf " " # Sets up the status and capacity case "$(cat "$battery/status" 2>&1)" in - "Full") status=" " ;; - "Discharging") status=" " ;; - "Charging") status="" ;; - "Not charging") status="" ;; - "Unknown") status="ﴔ " ;; + "Full") status="" ;; + "Discharging") status="" ;; + "Charging") status="" ;; + "Not charging") status="" ;; + "Unknown") status="" ;; *) exit 1 ;; esac capacity="$(cat "$battery/capacity" 2>&1)" # Will make a warn variable if discharging and low - [ "$status" = "" ] && [ "$capacity" -le 25 ] && warn=" " + [ "$status" = "" ] && [ "$capacity" -le 25 ] && warn="" # Prints the info - printf "%s%s%d%%%s" "$status" "$warn " "$capacity " " $pwr"; unset warn + printf "%s%s%d%%%s" "$status" "$warn " "$capacity" " $pwr"; unset warn done && printf "\\n" diff --git a/user/.config/awesome/core/bar/widgets/layout b/user/.config/awesome/core/bar/widgets/layout index 93c0ae675..3aaec1663 100755 --- a/user/.config/awesome/core/bar/widgets/layout +++ b/user/.config/awesome/core/bar/widgets/layout @@ -1,3 +1,3 @@ #!/bin/bash layout=$(setxkbmap -query | grep -oP 'layout:\s*\K\w+'); -echo " $layout"; +echo " $layout" | tr '[:lower:]' '[:upper:]'; diff --git a/user/.config/awesome/core/bar/widgets/volume b/user/.config/awesome/core/bar/widgets/volume index 78ddb6290..c28690a1d 100755 --- a/user/.config/awesome/core/bar/widgets/volume +++ b/user/.config/awesome/core/bar/widgets/volume @@ -9,6 +9,6 @@ elif [ "$vol" -gt "30" ]; then elif [ "$vol" -gt "0" ]; then icon="" else - echo " " && exit + echo "" && exit fi echo "$icon $vol%" diff --git a/user/.config/awesome/core/bar/widgets/wifi b/user/.config/awesome/core/bar/widgets/wifi new file mode 100755 index 000000000..eb913636c --- /dev/null +++ b/user/.config/awesome/core/bar/widgets/wifi @@ -0,0 +1,15 @@ +#!/bin/bash + +constate=$(nmcli dev | grep wifi | sed 's/ \{2,\}/|/g' | cut -d '|' -f3 | head -1) +currentwfi=$(nmcli dev | grep wifi | sed 's/ \{2,\}/|/g' | cut -d '|' -f4 | head -1) + +if [ "$constate" = "disconnected" ]; then + state="睊" + echo "$state" +elif [ "$constate" = "connected" ]; then + state="直" + echo "$state" - "$currentwfi" +else + state="直?" + echo "$state" +fi diff --git a/user/.config/awesome/core/bindings.lua b/user/.config/awesome/core/bindings.lua index a1d7d9286..5419f4e21 100644 --- a/user/.config/awesome/core/bindings.lua +++ b/user/.config/awesome/core/bindings.lua @@ -294,18 +294,18 @@ awful.keyboard.append_global_keybindings({ awful.keygrabber.run( function(_, key, event) if event == "release" then return end - if key == "e" then awful.util.spawn(apps.editor) - elseif key == "f" then awful.util.spawn(apps.file) - elseif key == "w" then awful.util.spawn(apps.browser) - elseif key == "c" then awful.util.spawn(apps.chat) - elseif key == "m" then awful.util.spawn(apps.music) - elseif key == "g" then awful.util.spawn(apps.game) + if key == "1" then awful.util.spawn(apps.editor) + elseif key == "2" then awful.util.spawn(apps.file) + elseif key == "3" then awful.util.spawn(apps.browser) + elseif key == "4" then awful.util.spawn(apps.chat) + elseif key == "5" then awful.util.spawn(apps.music) + elseif key == "9" then awful.util.spawn(apps.game) end awful.keygrabber.stop(grabber) end ) end, - {description = "followed by KEY (Look at the tag names)", group = "apps"} + {description = "followed by KEY", group = "apps"} ), -- Keyboard layouts (Super + x followed by KEY) awful.key({ modkey }, "x", function() diff --git a/user/.config/awesome/core/rules.lua b/user/.config/awesome/core/rules.lua index d2c3f0574..9ae642cc2 100644 --- a/user/.config/awesome/core/rules.lua +++ b/user/.config/awesome/core/rules.lua @@ -55,27 +55,29 @@ ruled.client.connect_signal("request::rules", function() "Virt-manager" } }, - properties = { tag = "E" }, + properties = { tag = "" }, } -- F TAG ruled.client.append_rule { rule = { class = "vifm" }, - properties = { tag = "F" }, + properties = { tag = "" }, } -- W TAG ruled.client.append_rule { rule_any = { class = { "Brave-browser", "librewolf", + "Firefox", + "Chromium", "qutebrowser" } }, - properties = { tag = "W" } + properties = { tag = "" } } -- C TAG ruled.client.append_rule { rule = { class = "gomuks" }, - properties = { tag = "C" } + properties = { tag = "" } } -- M TAG ruled.client.append_rule { @@ -87,7 +89,7 @@ ruled.client.connect_signal("request::rules", function() "Carla2-Control" } }, - properties = { tag = "M" } + properties = { tag = "" } } -- V TAG ruled.client.append_rule { @@ -101,7 +103,7 @@ ruled.client.connect_signal("request::rules", function() "mpv" } }, - properties = { tag = "V" } + properties = { tag = "" } } -- X TAG ruled.client.append_rule { @@ -116,7 +118,7 @@ ruled.client.connect_signal("request::rules", function() "Bitwarden" } }, - properties = { tag = "X" } + properties = { tag = "" } } -- D TAG ruled.client.append_rule { @@ -125,12 +127,12 @@ ruled.client.connect_signal("request::rules", function() "Joplin" } }, - properties = { tag = "D" } + properties = { tag = "" } } -- G TAG ruled.client.append_rule { rule = { class = "retroarch" }, - properties = { tag = "G" } + properties = { tag = "" } } --}}} -- } diff --git a/user/.config/awesome/theme/gruvbox/theme.lua b/user/.config/awesome/theme/gruvbox/theme.lua index b7aa6ebe9..1e9c23c59 100644 --- a/user/.config/awesome/theme/gruvbox/theme.lua +++ b/user/.config/awesome/theme/gruvbox/theme.lua @@ -12,7 +12,7 @@ local theme = {} -- }}} -- {{{ theme font -theme.font = "mononoki Nerd Font 9" +theme.font = "mononoki Nerd Font 12" --- }}} -- {{{ bar colors @@ -20,7 +20,8 @@ theme.bar_bg_one = "#427b58" theme.bar_bg_two = "#076678" theme.bar_bg_tre = "#b57614" theme.bar_bg_for = "#9d0006" -theme.bar_clock = "#504945" +theme.bar_bg_fiv = "#8f3f71" +theme.bar_clock = "#3c3836" --- }}} @@ -30,7 +31,7 @@ theme.fg_focus = "#dfc4a1" theme.fg_urgent = "#fbf1c7" theme.bg_normal = "#1d2021" theme.bg_focus = "#3c3836" -theme.bg_urgent = "#cc241d" +theme.bg_urgent = "#a89984" -- }}} -- {{{ Borders @@ -42,16 +43,16 @@ theme.border_marked = "#9d0006" -- }}} -- {{{ Taglist -theme.taglist_font = "mononoki Nerd Font 9" +theme.taglist_font = "mononoki Nerd Font 14" theme.taglist_fg_focus = "#fb4934" theme.taglist_fg_occupied = "#8ec07c" -theme.taglist_fg_urgent = "#458588" +theme.taglist_fg_urgent = "#504945" theme.taglist_fg_empty = "#a89984" theme.taglist_spacing = 5 -- }}} -- {{{ Notifications -theme.notification_font = "mononoki Nerd Font 9" +theme.notification_font = "mononoki Nerd Font 12" theme.notification_bg = "#282828" theme.notification_fg = "#fbf1c7" theme.notification_shape = gears.shape.rounded_rect @@ -64,8 +65,8 @@ theme.hotkeys_modifiers_fg = "#458588" theme.hotkeys_label_bg = "#fabd2f" theme.hotkeys_label_fg = "#1d2021" theme.hotkeys_group_margin = dpi(20) -theme.hotkeys_description_font = "mononoki Nerd Font 9" -theme.hotkeys_font = "mononoki Nerd Font 9" +theme.hotkeys_description_font = "mononoki Nerd Font 12" +theme.hotkeys_font = "mononoki Nerd Font 12" -- }}} -- {{{ Mouse finder diff --git a/user/.config/gtk-3.0/settings.ini b/user/.config/gtk-3.0/settings.ini index 88febe4e1..ef3e45735 100644 --- a/user/.config/gtk-3.0/settings.ini +++ b/user/.config/gtk-3.0/settings.ini @@ -1,8 +1,8 @@ [Settings] gtk-theme-name=gruvbox-dark-gtk gtk-icon-theme-name=gruvbox-dark-icons-gtk -gtk-font-name=Sans 10 -gtk-cursor-theme-name=volantes_cursors +gtk-font-name=mononoki Nerd Font 10 +gtk-cursor-theme-name=Simp1e-Gruvbox-Dark gtk-cursor-theme-size=0 gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR diff --git a/user/.config/neofetch/config.conf b/user/.config/neofetch/config.conf index 6048c9630..2856ac44f 100644 --- a/user/.config/neofetch/config.conf +++ b/user/.config/neofetch/config.conf @@ -7,7 +7,7 @@ print_info() { prin " " - info "$(color 1) OS " distro + info "$(color 1) OS " distro info "$(color 2) VER" kernel info "$(color 3) UP " uptime info "$(color 4) PKG" packages @@ -701,7 +701,7 @@ image_source="auto" # Slackware, SunOS, LinuxLite, OpenSUSE, Raspbian, # postmarketOS, and Void have a smaller logo variant. # Use '{distro name}_small' to use the small variants. -ascii_distro="arch_small" +ascii_distro="void_small" # Ascii Colors # Default: 'distro' diff --git a/user/.config/rofi/scripts/rofi_power b/user/.config/rofi/scripts/rofi_power index 2ae9139f5..4be284bc7 100755 --- a/user/.config/rofi/scripts/rofi_power +++ b/user/.config/rofi/scripts/rofi_power @@ -29,11 +29,11 @@ pwrs="$pwr1\n$pwr2\n$pwr3\n$pwr4" action=$(echo -e "$options" | rofi -dmenu -b -l 7 -i -p " ") case "$action" in $option1*) - whoami | xargs -I % sh -c 'pkill -KILL -u %';; + pkill X;; $option2*) - systemctl reboot || loginctl reboot;; + loginctl reboot;; $option3*) - systemctl poweroff || loginctl poweroff;; + loginctl poweroff;; $option4*) betterlockscreen --suspend;; $option5*) diff --git a/user/.config/rofi/scripts/rofi_wifi b/user/.config/rofi/scripts/rofi_wifi index f5dd9e718..a2f248b49 100755 --- a/user/.config/rofi/scripts/rofi_wifi +++ b/user/.config/rofi/scripts/rofi_wifi @@ -6,7 +6,7 @@ ## ROFI VARIABLES ## ROFI1="rofi -dmenu -l 10 -b -i -p" -ROFI2="rofi -dmenu -b -p" +ROFI2="rofi -dmenu -l 1 -b -p" ROFI3="rofi -dmenu -l 5 -b -i -p" ## MAIN OPTIONS ## diff --git a/user/.gtkrc-2.0 b/user/.gtkrc-2.0 index 8c3b4914c..1404c67f4 100644 --- a/user/.gtkrc-2.0 +++ b/user/.gtkrc-2.0 @@ -1,7 +1,7 @@ gtk-theme-name="gruvbox-dark-gtk" gtk-icon-theme-name="gruvbox-dark-icons-gtk" -gtk-font-name="Sans 10" -gtk-cursor-theme-name="volantes_cursors" +gtk-font-name="mononoki Nerd Font 10" +gtk-cursor-theme-name="Simp1e-Gruvbox-Dark" gtk-cursor-theme-size=0 gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR diff --git a/user/.icons/default/index.theme b/user/.icons/default/index.theme index 701315fa8..639d6cc3f 100644 --- a/user/.icons/default/index.theme +++ b/user/.icons/default/index.theme @@ -1,4 +1,4 @@ [Icon Theme] Name=Default Comment=Default Cursor Theme -Inherits=volantes_cursors +Inherits=Simp1e-Gruvbox-Dark diff --git a/user/.xinitrc b/user/.xinitrc index 0996c6b05..d56c7c8a8 100755 --- a/user/.xinitrc +++ b/user/.xinitrc @@ -30,18 +30,18 @@ if [ -f "$usermodmap" ]; then fi ### ENVIRONMENT VARIABLES -export GST_VAAPI_ALL_DRIVERS=1 +#export GST_VAAPI_ALL_DRIVERS=1 export MOZ_USE_XINPUT2=1 -export EDITOR="emacsclient -t -a ''" # $EDITOR use Emacs in terminal -export VISUAL="emacsclient -c -a emacs" # $VISUAL use Emacs in GUI mode +export EDITOR="nvim" # $EDITOR use neovim in terminal +export VISUAL="alacritty -e nvim" # $VISUAL use neovim in terminal export READER="zathura" # Zathura as the pdf viewer export TERMINAL="alacritty" # Alacritty as the default terminal emulator -export BROWSER="librewolf" # Librewolf as the default web browser -export WM="dwm" # DWM as the default Window Manager +export BROWSER="qutebrowser" # Qutebrowser as the default web browser +export WM="awesome" # Awesomewm as the default Window Manager export XDG_DATA_HOME="${XDG_DATA_HOME:="$HOME/.local/share"}" export XDG_CACHE_HOME="${XDG_CACHE_HOME:="$HOME/.cache"}" export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:="$HOME/.config"}" -export QT_QPA_PLATFORMTHEME=qt5ct # Qt theeming stuff +export QT_QPA_PLATFORMTHEME=qt5ct # Qt theeming stuff # start window manager / desktop environment -exec dwm +exec awesome