summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore7
-rwxr-xr-xX11/xinitrc1
-rwxr-xr-xautostart.sh5
m---------awesome/awesome-wm-widgets0
-rw-r--r--awesome/rc.lua4
-rw-r--r--awesome/themes/default/theme.lua1
6 files changed, 11 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore
index 2e5fe6f..b2f60e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,8 +39,6 @@ retroarch/
rclone/
raveloxmidi/
qutebrowser/jmatrix-rules
-gtk-2.0/
-gtk-3.0/
qtile/__pycache__/
!qt6ct/qt6ct.conf
qt6ct/*
@@ -64,6 +62,7 @@ pavucontrol.ini
openrazer/
okularrc
okularpartrc
+odysee-nativefier*/
nvim/plugged/
nwg-outputs/
nssdb/
@@ -128,8 +127,8 @@ icedtea-web/
ibus/
htop/htoprc
guitarix/
-gtk-3.0/bookmarks
-gtk-2.0/gtkfilechooser.ini
+gtk-2.0/
+gtk-3.0/
gomuks/
goa-1.0/
gnome-session/
diff --git a/X11/xinitrc b/X11/xinitrc
index 73e2b83..2713b88 100755
--- a/X11/xinitrc
+++ b/X11/xinitrc
@@ -1,5 +1,6 @@
xrdb ~/.Xresources
sh -c ~/.xprofile &
#runsvdir ~/.runit/runsvdir &
+[ -x ~/.screenlayout/layout_1.sh ] && ~/.screenlayout/layout_1.sh
WM="$(~/.local/bin/scripts/crcparse 'WM')"
exec dbus-launch --exit-with-session $WM
diff --git a/autostart.sh b/autostart.sh
index 38d03be..344a9e4 100755
--- a/autostart.sh
+++ b/autostart.sh
@@ -24,8 +24,11 @@ if [ -n "${WAYLAND_DISPLAY}${DISPLAY}" ]; then
runifnot swayidle
launch_waybar.sh "$(crcparse WC)"
killandrun swaybg -i ~/background.jpg
+ if [ -n "$DISPLAY" ]; then
+ xrdb ~/.Xresources
+ fi
else
- runifnot picom
+ #runifnot picom
runifnot xss-lock slockd
runifnot sxhkd
if "$(type xmonad >/dev/null 2>&1)"; then
diff --git a/awesome/awesome-wm-widgets b/awesome/awesome-wm-widgets
-Subproject 9a987adf05ae0d241d22fbb0ee142fbefa76a13
+Subproject de62d9b99980c864ff7d32c6e62cfa29cea67fe
diff --git a/awesome/rc.lua b/awesome/rc.lua
index 28e3465..3e5d868 100644
--- a/awesome/rc.lua
+++ b/awesome/rc.lua
@@ -284,7 +284,7 @@ awful.screen.connect_for_each_screen(function(s)
snd="default"
end
- net = crcparse("net")
+ net = crcparse("inet")
batt = crcparse("batt")
@@ -328,7 +328,7 @@ awful.screen.connect_for_each_screen(function(s)
layout = wibox.layout.fixed.horizontal,
mpd_widget,
net_speed {
- font = font,
+ font = beautiful.font2,
interface = net
},
ram_widget({
diff --git a/awesome/themes/default/theme.lua b/awesome/themes/default/theme.lua
index ead216c..5e2f196 100644
--- a/awesome/themes/default/theme.lua
+++ b/awesome/themes/default/theme.lua
@@ -12,6 +12,7 @@ local themes_path = gfs.get_themes_dir()
local theme = {}
theme.font = "mononoki Nerd Font Mono 18"
+theme.font2 = "mononoki Nerd Font Mono 12"
theme.bg_normal = "#000000"
theme.bg_focus = "#39c1ed"