diff --git a/alacritty/alacritty.toml b/alacritty/alacritty.toml index 3cd13de..f2c4a3d 100644 --- a/alacritty/alacritty.toml +++ b/alacritty/alacritty.toml @@ -23,7 +23,7 @@ background = "#000010" foreground = "#F8F8F2" [font] -size = 15 +size = 13 [font.bold] family = "Iosevka Term Extended" diff --git a/awesome/components/screen.lua b/awesome/components/screen.lua index a196e60..76ffd9c 100644 --- a/awesome/components/screen.lua +++ b/awesome/components/screen.lua @@ -2,10 +2,6 @@ local awful = require("awful") local lain = require("lain") local grid = require("components.layout.grid") local quake = lain.util.quake({app="alacritty", followtag=true, argname = '--class %s', extra="--option=window.opacity=1.0 --option=\"colors.primary.background='#000d2b'\" -e tmux", height=0.3}) - --- Import panels -local top_panel = require("components.top-panel") - -- Set up each screen (add tags & panels) awful.screen.connect_for_each_screen(function(s) for i = 1, 10, 1 @@ -17,10 +13,4 @@ awful.screen.connect_for_each_screen(function(s) }) end s.quake = quake - - -- Only add the top panel on the primary screen - if s.index == 1 then - top_panel.create(s) - end - end) diff --git a/awesome/components/top-panel.lua b/awesome/components/top-panel.lua deleted file mode 100644 index c754fe2..0000000 --- a/awesome/components/top-panel.lua +++ /dev/null @@ -1,183 +0,0 @@ --- =================================================================== --- Initialization --- =================================================================== - - -local awful = require("awful") -local beautiful = require("beautiful") -local wibox = require("wibox") -local theme = require("theme") -local lain = require("lain") -local tag_list = require("components.widgets.tag-list") -local layout_box = require("components.widgets.layout-box") -local battery_widget = require("components.widgets.battery-widget.battery") -local volume_widget = require("components.widgets.volume-widget.volume") -local pl = require("utils.powerline") - --- import widgets -local task_list = require("components.widgets.task-list") - --- =================================================================== --- Custom Widgets --- =================================================================== - -local top_panel = {} - -local watch_widget, watch_timer = awful.widget.watch('bash -c "checkupdates | wc -l"', 360) - -local updates_indicator = wibox.widget{ - { - layout = wibox.layout.fixed.horizontal, - { - { - widget = watch_widget, - }, - top = 0, bottom = 2, left = 0, right = 0, - widget = wibox.container.margin - }, - { - { - image = "/usr/share/icons/Papirus/48x48/apps/org.kde.archUpdate.svg", - forced_width = 18, - widget = wibox.widget.imagebox, - }, - top = 5, bottom = 0, left = 5, right = 0, - widget = wibox.container.margin - } - }, - widget = wibox.container.background -} - -local frequency_widget = wibox.widget { - layout = wibox.layout.fixed.horizontal, - awful.widget.watch('bash -c "/usr/bin/cat /proc/cpuinfo | grep MHz | cut -b 12- | sort -r | head -n 1 | xargs printf \'%f / 1000\n\' | bc -l | awk \'{printf \\"%.2f\\n\\", $0}\'"', 1), - wibox.widget.textbox('GHz') -} - -local memory_widget = wibox.widget{ - layout = wibox.layout.fixed.horizontal, - lain.widget.mem({ - settings = function() - widget:set_markup(lain.util.markup.font(theme.font, mem_now.used .. " MB")) - end, - }), -} - -local cpu_widget = wibox.widget{ - layout = wibox.layout.fixed.horizontal, - lain.widget.cpu({ - settings = function() - widget:set_markup(lain.util.markup.font(theme.font, "CPU: " .. cpu_now.usage .. "%")) - end, - }) -} - -local clock = wibox.widget.textclock('%a %b %d, %H:%M:%S', 1) - -local tag_lists = {} -local current_tag_list = wibox.widget { - layout = wibox.layout.fixed.horizontal -} - -local layout_boxes = {} -local current_layout_box = wibox.widget { - layout = wibox.layout.fixed.horizontal -} - -local governor_selector, governor_timer = awful.widget.watch('bash -c "cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor"', 5) - --- =================================================================== --- Bar Creation --- =================================================================== - -top_panel.create = function(s) - local panel = awful.wibar({ - screen = s, - position = "top", - ontop = true, - height = beautiful.top_panel_height, - width = s.geometry.width, - bg = "#12151cbb" - }) - - for t in screen do - tag_lists[t] = tag_list.create(t) - layout_boxes[t] = layout_box.create(t) - end - - current_tag_list:add(tag_lists[s]) - current_layout_box:add(layout_boxes[s]) - - panel:setup { - expand = "none", - layout = wibox.layout.align.horizontal, - task_list.create(s), - current_tag_list, - { - layout = wibox.layout.fixed.horizontal, - pl(wibox.widget{}, theme.bg_normal .. "00", theme.top_panel_powerline), - pl(wibox.container.margin(wibox.widget.systray(), 0, 0, 5, 5), theme.top_panel_powerline, theme.bg_normal), - pl(volume_widget({widget_type='icon_and_text'}), theme.bg_normal, theme.top_panel_powerline), - pl(awful.widget.watch('bash -c "sensors | grep Tctl | cut -f 10 -d \' \' | cut -c 2-"', 5), theme.top_panel_powerline, theme.bg_normal), - pl(memory_widget, theme.bg_normal, theme.top_panel_powerline), - pl(cpu_widget, theme.top_panel_powerline, theme.bg_normal), - pl(frequency_widget, theme.bg_normal, theme.top_panel_powerline), - pl(updates_indicator, theme.top_panel_powerline, theme.bg_normal), - pl(current_layout_box, theme.bg_normal, theme.top_panel_powerline), - pl(clock, theme.top_panel_powerline, theme.top_panel_powerline), - } - } - - - -- =================================================================== - -- Functionality - -- =================================================================== - - -- hide panel when client is fullscreen - local function change_panel_visibility(client) - if client.screen == s then - panel.ontop = not client.fullscreen - end - end - - -- connect panel visibility function to relevant signals - client.connect_signal("property::fullscreen", change_panel_visibility) - client.connect_signal("focus", change_panel_visibility) - - client.connect_signal("focus", function (c, _) - current_tag_list:reset(current_tag_list) - current_tag_list:add(tag_lists[c.screen]) - current_layout_box:reset(current_layout_box) - current_layout_box:add(layout_boxes[c.screen]) - end) - - -- connect panel visibility function to relevant signals - updates_indicator:connect_signal("button::press", function(_, _, _, _) - local update_command = 'WINIT_X11_SCALE_FACTOR=1 alacritty -e bash -c "yay ; echo \'\nDone, press any key to exit...\' ; read"' - awful.spawn.easy_async_with_shell(update_command, function(_) - watch_timer:emit_signal("timeout") - end) - end) - - clock:connect_signal("button::press", function(_, _, _, _) - awful.spawn('gnome-calendar') - end) - - governor_selector:connect_signal("button::press", function(c, _, _, button) - awful.spawn.easy_async_with_shell('bash -c "cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor"', function(output) - output = output:gsub("%s+", "") - if output == 'powersave' then - awful.spawn.easy_async('sudo /opt/power/performance.sh', function(_) - governor_selector:emit_signal("timeout") - end) - else - awful.spawn.easy_async('sudo /opt/power/powersave.sh', function(_) - governor_timer:emit_signal("timeout") - end) - end - end) - end) - -end - -return top_panel diff --git a/awesome/keys.lua b/awesome/keys.lua index 121bdfe..1076bc7 100644 --- a/awesome/keys.lua +++ b/awesome/keys.lua @@ -5,7 +5,7 @@ local beautiful = require("beautiful") local volume_widget = require("components.widgets.volume-widget.volume") local dpi = beautiful.xresources.apply_dpi -local modkey = "Mod4" +local modkey = "Mod1" -- define module table local keys = {} @@ -211,14 +211,14 @@ keys.globalkeys = gears.table.join( -- launch rofi awful.key({modkey}, "XF86Launch5", function() - awful.spawn(os.getenv("XDG_CONFIG_HOME") .. "/scripts/toggle_rofi.sh") + awful.spawn.with_shell("pkill rofi || rofi -show drun") end, {description = "application launcher", group = "launcher"} ), -- launch rofi awful.key({modkey}, "d", function() - awful.spawn(os.getenv("XDG_CONFIG_HOME") .. "/scripts/toggle_rofi.sh") + awful.spawn.with_shell("pkill rofi || rofi -show drun") end, {description = "application launcher", group = "launcher"} ), diff --git a/awesome/rc.lua b/awesome/rc.lua index 4bf4d90..9ffdad2 100644 --- a/awesome/rc.lua +++ b/awesome/rc.lua @@ -34,7 +34,6 @@ local run_on_start_up = { "numlockx on", "nm-applet", "xcape -e \"Super_L=Super_L|XF86Launch5\" -t 5000", - gears.filesystem.get_configuration_dir() .. "/scripts/setup_display.sh", "feh --no-fehbg --bg-fill " .. gears.filesystem.get_configuration_dir() .. "/images/wallpaper.png", } diff --git a/awesome/theme.lua b/awesome/theme.lua index a74637b..f591131 100644 --- a/awesome/theme.lua +++ b/awesome/theme.lua @@ -2,8 +2,8 @@ local dpi = require("beautiful.xresources").apply_dpi local theme = {} -- Font -theme.font = "Ubuntu 12" -theme.title_font = "Ubuntu 12" +theme.font = "Ubuntu 11" +theme.title_font = "Ubuntu 11" -- Background theme.bg_normal = "#1f2430" @@ -19,21 +19,17 @@ theme.fg_urgent = "#ffffff" theme.fg_minimize = "#ffffff" -- Window Gap Distance -theme.useless_gap = dpi(2) +theme.useless_gap = dpi(1) -- Show Gaps if Only One Client is Visible theme.gap_single_client = false -- Window Borders -theme.border_width = dpi(3) +theme.border_width = dpi(1) theme.border_normal = "#00000000" theme.border_focus = "#002F5F" theme.border_marked = theme.fg_urgent --- Panel Sizing -theme.top_panel_height = dpi(30) -theme.top_panel_powerline = "#002F5F" - -- Taglist theme.taglist_bg_focus = theme.top_panel_powerline diff --git a/picom/picom.conf b/picom/picom.conf index 1fe6593..ca4ce51 100644 --- a/picom/picom.conf +++ b/picom/picom.conf @@ -3,410 +3,5 @@ ################################# -# Enabled client-side shadows on windows. Note desktop windows -# (windows with '_NET_WM_WINDOW_TYPE_DESKTOP') never get shadow, -# unless explicitly requested using the wintypes option. -# -# shadow = false -shadow = true; - -# The blur radius for shadows, in pixels. (defaults to 12) -# shadow-radius = 12 -shadow-radius = 10; - -# The opacity of shadows. (0.0 - 1.0, defaults to 0.75) -# shadow-opacity = .75 - -# The left offset for shadows, in pixels. (defaults to -15) -# shadow-offset-x = -15 -shadow-offset-x = -7; - -# The top offset for shadows, in pixels. (defaults to -15) -# shadow-offset-y = -15 -shadow-offset-y = -7; - -# Red color value of shadow (0.0 - 1.0, defaults to 0). -# shadow-red = 0 - -# Green color value of shadow (0.0 - 1.0, defaults to 0). -# shadow-green = 0 - -# Blue color value of shadow (0.0 - 1.0, defaults to 0). -# shadow-blue = 0 - -# Hex string color value of shadow (#000000 - #FFFFFF, defaults to #000000). This option will override options set shadow-(red/green/blue) -# shadow-color = "#000000" - -# Specify a list of conditions of windows that should have no shadow. -# -# examples: -# shadow-exclude = "n:e:Notification"; -# -# shadow-exclude = [] -shadow-exclude = [ - "name = 'Notification'", - "class_g = 'Conky'", - "class_g ?= 'Notify-osd'", - "class_g = 'Cairo-clock'", - "_GTK_FRAME_EXTENTS@:c", - "!focused" -]; - -# Specify a list of conditions of windows that should have no shadow painted over, such as a dock window. -# clip-shadow-above = [] - -# Specify a X geometry that describes the region in which shadow should not -# be painted in, such as a dock window region. Use -# shadow-exclude-reg = "x10+0+0" -# for example, if the 10 pixels on the bottom of the screen should not have shadows painted on. -# -# shadow-exclude-reg = "" - -# Crop shadow of a window fully on a particular Xinerama screen to the screen. -# xinerama-shadow-crop = false - - -################################# -# Fading # -################################# - - -# Fade windows in/out when opening/closing and when opacity changes, -# unless no-fading-openclose is used. -fading = false -# fading = false; - -# Opacity change between steps while fading in. (0.01 - 1.0, defaults to 0.028) -# fade-in-step = 0.028 -fade-in-step = 1; - -# Opacity change between steps while fading out. (0.01 - 1.0, defaults to 0.03) -# fade-out-step = 0.03 -fade-out-step = 1; - -# The time between steps in fade step, in milliseconds. (> 0, defaults to 10) -fade-delta = 0 - -# Specify a list of conditions of windows that should not be faded. -# fade-exclude = [] - -# Do not fade on window open/close. -no-fading-openclose = true - -# Do not fade destroyed ARGB windows with WM frame. Workaround of bugs in Openbox, Fluxbox, etc. -# no-fading-destroyed-argb = false - - -################################# -# Transparency / Opacity # -################################# - - -# Opacity of inactive windows. (0.1 - 1.0, defaults to 1.0) -# inactive-opacity = 0.99 - -# Opacity of window titlebars and borders. (0.1 - 1.0, disabled by default) -# frame-opacity = 1.0 - -# Let inactive opacity set by -i override the '_NET_WM_WINDOW_OPACITY' values of windows. -# inactive-opacity-override = true -# inactive-opacity-override = true; - -# Default opacity for active windows. (0.0 - 1.0, defaults to 1.0) -# active-opacity = 1.0 - -# Dim inactive windows. (0.0 - 1.0, defaults to 0.0) -# inactive-dim = 0.0 - -# Specify a list of conditions of windows that should never be considered focused. -# focus-exclude = [] -focus-exclude = [ "class_g = 'Cairo-clock'" ]; - -# Use fixed inactive dim value, instead of adjusting according to window opacity. -# inactive-dim-fixed = 1.0 - -# Specify a list of opacity rules, in the format `PERCENT:PATTERN`, -# like `50:name *= "Firefox"`. picom-trans is recommended over this. -# Note we don't make any guarantee about possible conflicts with other -# programs that set '_NET_WM_WINDOW_OPACITY' on frame or client windows. -# example: -# opacity-rule = [ "80:class_g = 'URxvt'" ]; -# -opacity-rule = ["0:_NET_WM_STATE@[0]:32a = '_NET_WM_STATE_HIDDEN'",] - - -################################# -# Corners # -################################# - -# Sets the radius of rounded window corners. When > 0, the compositor will -# round the corners of windows. Does not interact well with -# `transparent-clipping`. -corner-radius = 0 - -# Exclude conditions for rounded corners. -rounded-corners-exclude = [ - "window_type = 'dock'", - "window_type = 'desktop'" -]; - - -################################# -# Background-Blurring # -################################# - - -# Parameters for background blurring, see the *BLUR* section for more information. -# blur-method = -# blur-size = 12 -# -# blur-deviation = false -# -# blur-strength = 5 - -# Blur background of semi-transparent / ARGB windows. -# Bad in performance, with driver-dependent behavior. -# The name of the switch may change without prior notifications. -# -# blur-background = false - -# Blur background of windows when the window frame is not opaque. -# Implies: -# blur-background -# Bad in performance, with driver-dependent behavior. The name may change. -# -# blur-background-frame = false - - -# Use fixed blur strength rather than adjusting according to window opacity. -# blur-background-fixed = false - - -# Specify the blur convolution kernel, with the following format: -# example: -# blur-kern = "5,5,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1"; -# -# blur-kern = "" -blur-kern = "3x3box"; - - -# Exclude conditions for background blur. -# blur-background-exclude = [] -blur-background-exclude = [ - "window_type = 'dock'", - "window_type = 'desktop'", - "_GTK_FRAME_EXTENTS@:c" -]; - -################################# -# General Settings # -################################# - -# Daemonize process. Fork to background after initialization. Causes issues with certain (badly-written) drivers. -# daemon = false - -# Specify the backend to use: `xrender`, `glx`, or `xr_glx_hybrid`. -# `xrender` is the default one. -# -backend = "glx" -# backend = "xrender"; - -# Enable/disable VSync. -# vsync = false -vsync = true; - -# Enable remote control via D-Bus. See the *D-BUS API* section below for more details. -# dbus = false - -# Try to detect WM windows (a non-override-redirect window with no -# child that has 'WM_STATE') and mark them as active. -# -# mark-wmwin-focused = false -mark-wmwin-focused = true; - -# Mark override-redirect windows that doesn't have a child window with 'WM_STATE' focused. -# mark-ovredir-focused = false -mark-ovredir-focused = true; - -# Try to detect windows with rounded corners and don't consider them -# shaped windows. The accuracy is not very high, unfortunately. -# -# detect-rounded-corners = false -detect-rounded-corners = true; - -# Detect '_NET_WM_WINDOW_OPACITY' on client windows, useful for window managers -# not passing '_NET_WM_WINDOW_OPACITY' of client windows to frame windows. -# -# detect-client-opacity = false -detect-client-opacity = true; - -# Use EWMH '_NET_ACTIVE_WINDOW' to determine currently focused window, -# rather than listening to 'FocusIn'/'FocusOut' event. Might have more accuracy, -# provided that the WM supports it. -# -# use-ewmh-active-win = false - -# Unredirect all windows if a full-screen opaque window is detected, -# to maximize performance for full-screen windows. Known to cause flickering -# when redirecting/unredirecting windows. -# -# unredir-if-possible = false - -# Delay before unredirecting the window, in milliseconds. Defaults to 0. -# unredir-if-possible-delay = 0 - -# Conditions of windows that shouldn't be considered full-screen for unredirecting screen. -# unredir-if-possible-exclude = [] - -# Use 'WM_TRANSIENT_FOR' to group windows, and consider windows -# in the same group focused at the same time. -# -# detect-transient = false -detect-transient = true; - -# Use 'WM_CLIENT_LEADER' to group windows, and consider windows in the same -# group focused at the same time. This usually means windows from the same application -# will be considered focused or unfocused at the same time. -# 'WM_TRANSIENT_FOR' has higher priority if detect-transient is enabled, too. -# -# detect-client-leader = false - -# Resize damaged region by a specific number of pixels. -# A positive value enlarges it while a negative one shrinks it. -# If the value is positive, those additional pixels will not be actually painted -# to screen, only used in blur calculation, and such. (Due to technical limitations, -# with use-damage, those pixels will still be incorrectly painted to screen.) -# Primarily used to fix the line corruption issues of blur, -# in which case you should use the blur radius value here -# (e.g. with a 3x3 kernel, you should use `--resize-damage 1`, -# with a 5x5 one you use `--resize-damage 2`, and so on). -# May or may not work with *--glx-no-stencil*. Shrinking doesn't function correctly. -# -# resize-damage = 1 - -# Specify a list of conditions of windows that should be painted with inverted color. -# Resource-hogging, and is not well tested. -# -# invert-color-include = [] - -# GLX backend: Avoid using stencil buffer, useful if you don't have a stencil buffer. -# Might cause incorrect opacity when rendering transparent content (but never -# practically happened) and may not work with blur-background. -# My tests show a 15% performance boost. Recommended. -# -glx-no-stencil = true; - -# GLX backend: Avoid rebinding pixmap on window damage. -# Probably could improve performance on rapid window content changes, -# but is known to break things on some drivers (LLVMpipe, xf86-video-intel, etc.). -# Recommended if it works. -# -# glx-no-rebind-pixmap = false - -# Disable the use of damage information. -# This cause the whole screen to be redrawn everytime, instead of the part of the screen -# has actually changed. Potentially degrades the performance, but might fix some artifacts. -# The opposing option is use-damage -# -# no-use-damage = false -use-damage = true; - -# Use X Sync fence to sync clients' draw calls, to make sure all draw -# calls are finished before picom starts drawing. Needed on nvidia-drivers -# with GLX backend for some users. -# -# xrender-sync-fence = false - -# GLX backend: Use specified GLSL fragment shader for rendering window contents. -# See `compton-default-fshader-win.glsl` and `compton-fake-transparency-fshader-win.glsl` -# in the source tree for examples. -# -# glx-fshader-win = "" - -# Force all windows to be painted with blending. Useful if you -# have a glx-fshader-win that could turn opaque pixels transparent. -# -# force-win-blend = false - -# Do not use EWMH to detect fullscreen windows. -# Reverts to checking if a window is fullscreen based only on its size and coordinates. -# -# no-ewmh-fullscreen = false - -# Dimming bright windows so their brightness doesn't exceed this set value. -# Brightness of a window is estimated by averaging all pixels in the window, -# so this could comes with a performance hit. -# Setting this to 1.0 disables this behaviour. Requires --use-damage to be disabled. (default: 1.0) -# -# max-brightness = 1.0 - -# Make transparent windows clip other windows like non-transparent windows do, -# instead of blending on top of them. -# -# transparent-clipping = false - -# Set the log level. Possible values are: -# "trace", "debug", "info", "warn", "error" -# in increasing level of importance. Case doesn't matter. -# If using the "TRACE" log level, it's better to log into a file -# using *--log-file*, since it can generate a huge stream of logs. -# -# log-level = "debug" -log-level = "warn"; - -# Set the log file. -# If *--log-file* is never specified, logs will be written to stderr. -# Otherwise, logs will to written to the given file, though some of the early -# logs might still be written to the stderr. -# When setting this option from the config file, it is recommended to use an absolute path. -# -# log-file = "/path/to/your/log/file" - -# Show all X errors (for debugging) -# show-all-xerrors = false - -# Write process ID to a file. -# write-pid-path = "/path/to/your/log/file" - -# Window type settings -# -# 'WINDOW_TYPE' is one of the 15 window types defined in EWMH standard: -# "unknown", "desktop", "dock", "toolbar", "menu", "utility", -# "splash", "dialog", "normal", "dropdown_menu", "popup_menu", -# "tooltip", "notification", "combo", and "dnd". -# -# Following per window-type options are available: :: -# -# fade, shadow::: -# Controls window-type-specific shadow and fade settings. -# -# opacity::: -# Controls default opacity of the window type. -# -# focus::: -# Controls whether the window of this type is to be always considered focused. -# (By default, all window types except "normal" and "dialog" has this on.) -# -# full-shadow::: -# Controls whether shadow is drawn under the parts of the window that you -# normally won't be able to see. Useful when the window has parts of it -# transparent, and you want shadows in those areas. -# -# clip-shadow-above::: -# Controls wether shadows that would have been drawn above the window should -# be clipped. Useful for dock windows that should have no shadow painted on top. -# -# redir-ignore::: -# Controls whether this type of windows should cause screen to become -# redirected again after been unredirected. If you have unredir-if-possible -# set, and doesn't want certain window to cause unnecessary screen redirection, -# you can set this to `true`. -# -wintypes: -{ - tooltip = { fade = true; shadow = true; opacity = 0.75; focus = true; full-shadow = false; }; - dock = { shadow = false; clip-shadow-above = true; } - dnd = { shadow = false; } - popup_menu = { opacity = 0.8; } - dropdown_menu = { opacity = 0.8; } -}; +shadow = false; +backend = "xrender"; diff --git a/zsh/.zshenv b/zsh/.zshenv deleted file mode 100644 index e8e716f..0000000 --- a/zsh/.zshenv +++ /dev/null @@ -1,3 +0,0 @@ -if [ -d "$HOME/.cargo/env" ]; then - . "$HOME/.cargo/env" -fi diff --git a/zsh/.zshrc b/zsh/.zshrc index 61253d5..fa58049 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -206,7 +206,7 @@ export ARCHFLAGS="-arch x86_64" export SSH_KEY_PATH="~/.ssh/rsa_id" export PYTHONDONTWRITEBYTECODE=1 export TERM="screen-256color" -export PATH=$HOME/.local/bin:$PATH +export PATH=$HOME/.local/bin:$HOME/.cargo/bin:$PATH export GOPATH=/tmp/go if command -v micromamba &> /dev/null; then