Various tweaks: X11, awesome, neovim, zsh

This commit is contained in:
Adam Cooper 2023-10-26 19:10:05 -04:00
parent 53ec2790a2
commit aacc322e34
5 changed files with 28 additions and 18 deletions

4
X11/.xprofile Normal file
View file

@ -0,0 +1,4 @@
#!/bin/sh
[ -f ~/.config/zsh/.zshenv ] && . ~/.config/zsh/.zshenv

View file

@ -9,8 +9,8 @@ run() {
# Currently not working # Currently not working
# run "(pgrep alacritty && alacritty msg create-window --title bottom -e btm --battery || alacritty --title bottom -e btm --battery)" # 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" /usr/sbin/alacritty --title bottom --command btm --battery &
run "alackaday" /usr/sbin/alacritty --title awesome-startup &
run "cbatticon" run "cbatticon"
run "blueman-applet" run "blueman-applet"
@ -19,6 +19,6 @@ run "nextcloud --background"
run "pasystray" run "pasystray"
run "xscreensaver -no-splash" run "xscreensaver -no-splash"
run "sleep 4" run "sleep 4"
run "wmctrl -r bottom -t 1" run "wmctrl -r bottom -t 8"
run "keepassxc" run "keepassxc"

View file

@ -54,9 +54,9 @@ beautiful.init(gears.filesystem.get_configuration_dir() .. "mytheme.lua")
terminal = function() terminal = function()
local is_running = os.execute("pgrep alacritty") local is_running = os.execute("pgrep alacritty")
if is_running == nil then if is_running == nil then
return "alacritty" return "/usr/sbin/alacritty"
else else
return "alacritty msg create-window" return "/usr/sbin/alacritty msg create-window"
end end
end end
editor = os.getenv("EDITOR") or "nano" editor = os.getenv("EDITOR") or "nano"
@ -178,7 +178,7 @@ screen.connect_signal("property::geometry", set_wallpaper)
local mymem = lain.widget.mem { local mymem = lain.widget.mem {
settings = function() 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 end
} }
@ -190,9 +190,15 @@ local mycpu = lain.widget.cpu {
local myweather = lain.widget.weather({ local myweather = lain.widget.weather({
APPID = "f6497dd133dd22b541abc8bbe8360f3b", APPID = "f6497dd133dd22b541abc8bbe8360f3b",
city_id = 5110302, lat = 40.651,
lon = -73.949,
units = 'imperial', 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("<b>%s</b>: %s, %d ", day, desc, temp)
end,
settings = function() settings = function()
units = math.floor(weather_now["main"]["temp"]) units = math.floor(weather_now["main"]["temp"])
widget:set_markup(" " .. units .. " ") widget:set_markup(" " .. units .. " ")
@ -534,10 +540,10 @@ awful.rules.rules = {
-- Set Firefox to always map on the tag named "2" on screen 1. -- Set Firefox to always map on the tag named "2" on screen 1.
-- { rule = { class = "Firefox" }, -- { rule = { class = "Firefox" },
-- properties = { screen = 1, tag = "2" } }, -- properties = { screen = 1, tag = "2" } },
{ rule = { class = "KeePassXC" }, properties = { screen = 1, tag = "1" } }, { rule = { class = "KeePassXC" }, properties = { screen = 1, tag = "2" } },
{ rule = { class = "bottom" }, properties = { screen = 1, tag = "2" } }, { rule = { class = "bottom" }, properties = { screen = 1, tag = "9" } },
{ rule = { class = "qutebrowser" }, properties = { screen = 1, tag = "3" } }, { rule = { class = "qutebrowser" }, properties = { screen = 1, tag = "2" } },
{ rule = { class = "Alacritty" }, properties = { screen = 1, tag = "4" } }, { rule = { class = "Alacritty" }, properties = { screen = 1, tag = "1" } },
} }
-- }}} -- }}}

View file

@ -36,7 +36,7 @@ vim.g.netrw_winsize = 25
vim.g.netrw_liststyle = 3 -- tree style listing vim.g.netrw_liststyle = 3 -- tree style listing
-- Escape exits terminal mode -- Escape exits terminal mode
vim.api.nvim_set_keymap("t", "<Esc", "<c-\\><c-n>", { noremap = true }) vim.api.nvim_set_keymap("t", "<Esc>", "<c-\\><c-n>", { noremap = true })
-- Sane vim split naviagation (via Gaslight blog) -- Sane vim split naviagation (via Gaslight blog)
vim.api.nvim_set_keymap("n", "<c-j>", "<c-w>j", { noremap = true }) vim.api.nvim_set_keymap("n", "<c-j>", "<c-w>j", { noremap = true })
@ -56,10 +56,10 @@ vim.cmd([[
autocmd VimEnter * PlugInstall --sync | source $MYVIMRC autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
endif endif
function! Cond(cond, ...) function! Cond(cond, ...)
let opts = get(a:000, 0, {}) let opts = get(a:000, 0, {})
return a:cond ? extend(opts, { 'on': [], 'for: [] }) return a:cond ? extend(opts, { 'on': [], 'for': [] })
endfunction endfunction
call plug#begin('~/.config/nvim/plugged') call plug#begin('~/.config/nvim/plugged')
Plug 'williamboman/mason.nvim' Plug 'williamboman/mason.nvim'

View file

@ -132,7 +132,7 @@ source /usr/share/nvm/bash_completion
source /usr/share/nvm/install-nvm-exec source /usr/share/nvm/install-nvm-exec
# rbenv # rbenv
# eval "$(rbenv init -)" eval "$(~/.rbenv/bin/rbenv init - zsh)"
# broot # broot
source /home/adam/.config/broot/launcher/bash/br source /home/adam/.config/broot/launcher/bash/br