diff --git a/X11/.xprofile b/X11/.xprofile
new file mode 100644
index 0000000..e7c17c0
--- /dev/null
+++ b/X11/.xprofile
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+[ -f ~/.config/zsh/.zshenv ] && . ~/.config/zsh/.zshenv
+
diff --git a/awesome/autorun.sh b/awesome/autorun.sh
index 42b390f..80d368b 100755
--- a/awesome/autorun.sh
+++ b/awesome/autorun.sh
@@ -9,8 +9,8 @@ run() {
# Currently not working
# run "(pgrep alacritty && alacritty msg create-window --title bottom -e btm --battery || alacritty --title bottom -e btm --battery)"
-# run "alacritty --title bottom --command btm --battery"
-run "alackaday"
+/usr/sbin/alacritty --title bottom --command btm --battery &
+/usr/sbin/alacritty --title awesome-startup &
run "cbatticon"
run "blueman-applet"
@@ -19,6 +19,6 @@ run "nextcloud --background"
run "pasystray"
run "xscreensaver -no-splash"
run "sleep 4"
-run "wmctrl -r bottom -t 1"
+run "wmctrl -r bottom -t 8"
run "keepassxc"
diff --git a/awesome/rc.lua b/awesome/rc.lua
index 8bbfdb9..aecf665 100644
--- a/awesome/rc.lua
+++ b/awesome/rc.lua
@@ -54,9 +54,9 @@ beautiful.init(gears.filesystem.get_configuration_dir() .. "mytheme.lua")
terminal = function()
local is_running = os.execute("pgrep alacritty")
if is_running == nil then
- return "alacritty"
+ return "/usr/sbin/alacritty"
else
- return "alacritty msg create-window"
+ return "/usr/sbin/alacritty msg create-window"
end
end
editor = os.getenv("EDITOR") or "nano"
@@ -178,7 +178,7 @@ screen.connect_signal("property::geometry", set_wallpaper)
local mymem = lain.widget.mem {
settings = function()
- widget:set_markup(" mem " .. mem_now.perc)
+ widget:set_markup(" mem " .. mem_now.perc .. " swp " .. math.floor((mem_now.swapused / mem_now.swap) * 100))
end
}
@@ -190,9 +190,15 @@ local mycpu = lain.widget.cpu {
local myweather = lain.widget.weather({
APPID = "f6497dd133dd22b541abc8bbe8360f3b",
- city_id = 5110302,
+ lat = 40.651,
+ lon = -73.949,
units = 'imperial',
- timeout = 20, -- remove this
+ notification_text_fun = function (wn)
+ local day = os.date("%a %d", wn["dt"])
+ local temp = math.floor(wn["main"]["temp"])
+ local desc = wn["weather"][1]["description"]
+ return string.format("%s: %s, %d ", day, desc, temp)
+ end,
settings = function()
units = math.floor(weather_now["main"]["temp"])
widget:set_markup(" " .. units .. " ")
@@ -534,10 +540,10 @@ awful.rules.rules = {
-- Set Firefox to always map on the tag named "2" on screen 1.
-- { rule = { class = "Firefox" },
-- properties = { screen = 1, tag = "2" } },
- { rule = { class = "KeePassXC" }, properties = { screen = 1, tag = "1" } },
- { rule = { class = "bottom" }, properties = { screen = 1, tag = "2" } },
- { rule = { class = "qutebrowser" }, properties = { screen = 1, tag = "3" } },
- { rule = { class = "Alacritty" }, properties = { screen = 1, tag = "4" } },
+ { rule = { class = "KeePassXC" }, properties = { screen = 1, tag = "2" } },
+ { rule = { class = "bottom" }, properties = { screen = 1, tag = "9" } },
+ { rule = { class = "qutebrowser" }, properties = { screen = 1, tag = "2" } },
+ { rule = { class = "Alacritty" }, properties = { screen = 1, tag = "1" } },
}
-- }}}
diff --git a/neovim/init.lua b/neovim/init.lua
index 9e10b46..b7572cb 100644
--- a/neovim/init.lua
+++ b/neovim/init.lua
@@ -36,7 +36,7 @@ vim.g.netrw_winsize = 25
vim.g.netrw_liststyle = 3 -- tree style listing
-- Escape exits terminal mode
-vim.api.nvim_set_keymap("t", "", { noremap = true })
+vim.api.nvim_set_keymap("t", "", "", { noremap = true })
-- Sane vim split naviagation (via Gaslight blog)
vim.api.nvim_set_keymap("n", "", "j", { noremap = true })
@@ -56,10 +56,10 @@ vim.cmd([[
autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
endif
- function! Cond(cond, ...)
- let opts = get(a:000, 0, {})
- return a:cond ? extend(opts, { 'on': [], 'for: [] })
- endfunction
+ function! Cond(cond, ...)
+ let opts = get(a:000, 0, {})
+ return a:cond ? extend(opts, { 'on': [], 'for': [] })
+ endfunction
call plug#begin('~/.config/nvim/plugged')
Plug 'williamboman/mason.nvim'
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 2d09055..de7fa0a 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -132,7 +132,7 @@ source /usr/share/nvm/bash_completion
source /usr/share/nvm/install-nvm-exec
# rbenv
-# eval "$(rbenv init -)"
+eval "$(~/.rbenv/bin/rbenv init - zsh)"
# broot
source /home/adam/.config/broot/launcher/bash/br