diff --git a/nvim/.config/nvim/lua/lsp.lua b/nvim/.config/nvim/lua/lsp.lua index a2bb111..1512dbd 100644 --- a/nvim/.config/nvim/lua/lsp.lua +++ b/nvim/.config/nvim/lua/lsp.lua @@ -1,10 +1,7 @@ vim.lsp.enable { - "bashls", "gopls", "lua_ls", "clangd", - "jdtls", - "rust-analyzer", } vim.diagnostic.config { virtual_text = true, underline = true, signs = false } diff --git a/oxwm/.config/oxwm/config.lua b/oxwm/.config/oxwm/config.lua index f596c6e..8fe78ce 100644 --- a/oxwm/.config/oxwm/config.lua +++ b/oxwm/.config/oxwm/config.lua @@ -5,69 +5,72 @@ local modkey = "Mod4" local terminal = "st" local colors = { - fg = "#bbbbbb", - red = "#f7768e", - bg = "#1a1b26", - cyan = "#0db9d7", - green = "#9ece6a", - lavender = "#a9b1d6", - light_blue = "#7aa2f7", - grey = "#bbbbbb", - blue = "#6dade3", - purple = "#ad8ee6", + fg = "#bbbbbb", + red = "#f7768e", + bg = "#1a1b26", + cyan = "#0db9d7", + green = "#9ece6a", + lavender = "#a9b1d6", + light_blue = "#7aa2f7", + grey = "#bbbbbb", + blue = "#6dade3", + purple = "#ad8ee6", } local tags = { "1", "2", "3", "4", "5", "6", "7", "8", "9" } local bar_font = "BigBlueTermPlus Nerd Font:style=Regular" +local is_desktop +if os.execute("command -v nmcli >/dev/null 2>&1") == 0 then is_desktop = nil else is_desktop = "yes" end + local blocks = { - oxwm.bar.block.ram({ - format = "Ram: {used}/{total} GB", - interval = 5, - color = colors.light_blue, - underline = true, - }), - oxwm.bar.block.static({ - text = "│", - interval = 999999999, - color = colors.lavender, - underline = false, - }), - oxwm.bar.block.shell({ - format = "{}", - command = "nmcli -t -f STATE general", - color = colors.red, - underline = false, - interval = 5, - click = { - command = "st -e nmtui", - floating = true, - } - }), - oxwm.bar.block.static({ - text = "│", - interval = 999999999, - color = colors.lavender, - underline = false, - }), - oxwm.bar.block.datetime({ - format = "{}", - date_format = "%a, %b %d - %-I:%M:%S %P", - interval = 1, - color = colors.cyan, - underline = true, - }), - oxwm.bar.block.battery({ - format = "Bat: {}%", - charging = "⚡ Bat: {}%", - discharging = "- Bat: {}%", - full = "✓ Bat: {}%", - interval = 30, - color = colors.green, - underline = true, - click = { command = "st -e btop", floating = true }, - }), + oxwm.bar.block.ram({ + format = "Ram: {used}/{total} GB", + interval = 5, + color = colors.light_blue, + underline = true, + }), + oxwm.bar.block.static({ + text = "│", + interval = 999999999, + color = colors.lavender, + underline = false, + }), + is_desktop or oxwm.bar.block.shell({ + format = "{}", + command = "nmcli -t -f STATE general", + color = colors.red, + underline = false, + interval = 5, + click = { + command = "st -e nmtui", + floating = true, + } + }), + is_desktop or oxwm.bar.block.static({ + text = "│", + interval = 999999999, + color = colors.lavender, + underline = false, + }), + oxwm.bar.block.datetime({ + format = "{}", + date_format = "%a, %b %d - %-I:%M:%S %P", + interval = 1, + color = colors.cyan, + underline = true, + }), + oxwm.bar.block.battery({ + format = "Bat: {}%", + charging = "⚡ Bat: {}%", + discharging = "- Bat: {}%", + full = "✓ Bat: {}%", + interval = 30, + color = colors.green, + underline = true, + click = { command = "st -e btop", floating = true }, + }), }; oxwm.set_terminal(terminal) @@ -130,14 +133,14 @@ oxwm.key.bind({ modkey }, "K", oxwm.client.focus_stack(-1)) oxwm.key.bind({ modkey, "Shift" }, "J", oxwm.client.move_stack(1)) oxwm.key.bind({ modkey, "Shift" }, "K", oxwm.client.move_stack(-1)) -oxwm.key.bind({ }, "XF86AudioMute", oxwm.spawn({ "wpctl set-mute @DEFAULT_SINK@ toggle" })) -oxwm.key.bind({ }, "XF86AudioRaiseVolume", oxwm.spawn({ "wpctl set-volume @DEFAULT_SINK@ 3%+" })) -oxwm.key.bind({ }, "XF86AudioLowerVolume", oxwm.spawn({ "wpctl set-volume @DEFAULT_SINK@ 3%-" })) +oxwm.key.bind({}, "XF86AudioMute", oxwm.spawn({ "wpctl set-mute @DEFAULT_SINK@ toggle" })) +oxwm.key.bind({}, "XF86AudioRaiseVolume", oxwm.spawn({ "wpctl set-volume @DEFAULT_SINK@ 3%+" })) +oxwm.key.bind({}, "XF86AudioLowerVolume", oxwm.spawn({ "wpctl set-volume @DEFAULT_SINK@ 3%-" })) oxwm.key.bind({ modkey }, "XF86AudioRaiseVolume", oxwm.spawn({ "wpctl set-volume @DEFAULT_SINK@ 10%+" })) oxwm.key.bind({ modkey }, "XF86AudioLowerVolume", oxwm.spawn({ "wpctl set-volume @DEFAULT_SINK@ 10%-" })) -oxwm.key.bind({ }, "XF86MonBrightnessUp", oxwm.spawn({ "brightnessctl set +10%" })) -oxwm.key.bind({ }, "XF86MonBrightnessDown", oxwm.spawn({ "brightnessctl set 10%-" })) +oxwm.key.bind({}, "XF86MonBrightnessUp", oxwm.spawn({ "brightnessctl set +10%" })) +oxwm.key.bind({}, "XF86MonBrightnessDown", oxwm.spawn({ "brightnessctl set 10%-" })) oxwm.key.bind({ modkey }, "XF86MonBrightnessUp", oxwm.spawn({ "brightnessctl set 100%" })) oxwm.key.bind({ modkey }, "XF86MonBrightnessDown", oxwm.spawn({ "brightnessctl set 0%" })) diff --git a/zsh/.zshrc b/zsh/.zshrc index 0a50edc..4fecbc2 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -2,6 +2,7 @@ export TERM=xterm-256color export XDG_DOWNLOAD_DIR="$HOME/downloads" export XDG_PROJECTS_DIR="$HOME/programming" + export XDG_DESKTOP_DIR="$HOME" export XDG_DOCUMENTS_DIR="$HOME/media" export XDG_MUSIC_DIR="$HOME/media"