Really never ends.
This commit is contained in:
@@ -47,21 +47,21 @@ function M.setup()
|
|||||||
-- Per-screen monitor widgets (created here so multi-monitor stays valid)
|
-- Per-screen monitor widgets (created here so multi-monitor stays valid)
|
||||||
local title = widgets.make_title()
|
local title = widgets.make_title()
|
||||||
local vol = widgets.make_vol()
|
local vol = widgets.make_vol()
|
||||||
local brightness = widgets.make_brightness()
|
|
||||||
local cpu = widgets.make_cpu()
|
local cpu = widgets.make_cpu()
|
||||||
|
local brightness = widgets.make_brightness()
|
||||||
local clock = wibox.widget.textclock("%Y-%m-%d %H:%M")
|
local clock = wibox.widget.textclock("%Y-%m-%d %H:%M")
|
||||||
|
|
||||||
local right = wibox.layout.fixed.horizontal()
|
local right = wibox.layout.fixed.horizontal()
|
||||||
local function push(w) right:add(widgets.padded(w, 4, 4)) end
|
local function push(w) right:add(widgets.padded(w, 4, 4)) end
|
||||||
push(wibox.widget.systray()); right:add(widgets.sep())
|
push(wibox.widget.systray()); right:add(widgets.sep())
|
||||||
push(brightness);
|
|
||||||
push(vol); right:add(widgets.sep())
|
push(vol); right:add(widgets.sep())
|
||||||
push(cpu); right:add(widgets.sep())
|
push(cpu); right:add(widgets.sep())
|
||||||
push(clock); right:add(widgets.sep())
|
push(clock);
|
||||||
|
push(brightness);
|
||||||
push(s.mylayoutbox)
|
push(s.mylayoutbox)
|
||||||
|
|
||||||
s.mywibox = awful.wibar {
|
s.mywibox = awful.wibar {
|
||||||
position = "top", screen = s, height = 45, bg = colors.background, fg = colors.foreground,
|
position = "top", screen = s, height = 45, bg = colors.background, fg = colors.white,
|
||||||
shape = function(cr, w, h) gears.shape.rounded_rect(cr, w, h, 0) end,
|
shape = function(cr, w, h) gears.shape.rounded_rect(cr, w, h, 0) end,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
return {
|
return {
|
||||||
background = "#111111",
|
background = "#111111",
|
||||||
background_alt = "#1a1a1a",
|
background_alt = "#1a1a1a",
|
||||||
foreground = "#d3dae3",
|
foreground = "#dcd7ba", -- kanagawa foreground
|
||||||
accent = "#6e6e6e",
|
accent = "#6a9589", -- black (bright) - muted gray, same role as old #6e6e6e
|
||||||
accent_alt = "#6ba0e8",
|
accent_alt = "#7fb4ca", -- blue (normal) - crystalBlue
|
||||||
red = "#e35b5b",
|
red = "#e82424", -- red (bright) - samuraiRed, vivid
|
||||||
green = "#98c379",
|
green = "#98bb6c", -- green (bright) - springGreen
|
||||||
yellow = "#e5c07b",
|
yellow = "#e6c384", -- yellow (bright) - carpYellow
|
||||||
disabled = "#707880",
|
disabled = "#6a9589", -- cyan (normal) - muted, low-contrast
|
||||||
white = "#ffffff",
|
white = "#ffffff", -- white (normal) - dimmer than foreground
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,11 +27,13 @@ M.globalkeys = gears.table.join(
|
|||||||
-- Launching / layout
|
-- Launching / layout
|
||||||
awful.key({ modkey }, "Return", function() awful.spawn(terminal) end, { description = "open a terminal", group = "launcher" }),
|
awful.key({ modkey }, "Return", function() awful.spawn(terminal) end, { description = "open a terminal", group = "launcher" }),
|
||||||
awful.key({ modkey }, "e", function() awful.spawn("thunar") end, { description = "Filemanager", group = "system" }),
|
awful.key({ modkey }, "e", function() awful.spawn("thunar") end, { description = "Filemanager", group = "system" }),
|
||||||
awful.key({ modkey }, "w", function() awful.spawn("chromium") end, { description = "Browser", group = "internet" }),
|
awful.key({ modkey }, "w", function() awful.layout.inc(1) end, { description = "next layout", group = "layout" }),
|
||||||
awful.key({ modkey }, "t", function() awful.layout.inc(1) end, { description = "next layout", group = "layout" }),
|
|
||||||
awful.key({ modkey }, "p", function() awful.spawn("xfce4-screenshooter") end, { description = "screenshot", group = "system" }),
|
|
||||||
|
|
||||||
-- Alt tab only in max mode
|
|
||||||
|
-- screenshooter
|
||||||
|
awful.key({ modkey, "Control" }, "p", function() awful.spawn("xfce4-screenshooter") end, { description = "screenshot", group = "system" }),
|
||||||
|
|
||||||
|
-- Alt tab current workspace windows
|
||||||
awful.key({ "Mod1" }, "Tab", function() awful.client.focus.byidx(1) end),
|
awful.key({ "Mod1" }, "Tab", function() awful.client.focus.byidx(1) end),
|
||||||
|
|
||||||
-- Media keys
|
-- Media keys
|
||||||
@@ -71,7 +73,7 @@ M.clientkeys = gears.table.join(
|
|||||||
awful.key({ modkey }, "q", function(c) c:kill() end, { description = "kill window", group = "client" }),
|
awful.key({ modkey }, "q", function(c) c:kill() end, { description = "kill window", group = "client" }),
|
||||||
awful.key({ modkey }, "f", function(c) c.fullscreen = not c.fullscreen; c:raise() end, { description = "toggle fullscreen", group = "client" }),
|
awful.key({ modkey }, "f", function(c) c.fullscreen = not c.fullscreen; c:raise() end, { description = "toggle fullscreen", group = "client" }),
|
||||||
awful.key({ modkey }, "m", function(c) c:swap(awful.client.getmaster()) end, { description = "make master", group = "client" }),
|
awful.key({ modkey }, "m", function(c) c:swap(awful.client.getmaster()) end, { description = "make master", group = "client" }),
|
||||||
awful.key({ modkey, "Shift" }, "space", awful.client.floating.toggle, { description = "toggle floating", group = "client" })
|
awful.key({ modkey, "Control" }, "space", awful.client.floating.toggle, { description = "toggle floating", group = "client" })
|
||||||
)
|
)
|
||||||
|
|
||||||
M.clientbuttons = gears.table.join(
|
M.clientbuttons = gears.table.join(
|
||||||
|
|||||||
@@ -8,7 +8,8 @@ client.connect_signal("manage", function(c)
|
|||||||
end
|
end
|
||||||
-- New windows open into the stack (to the right); first window becomes master.
|
-- New windows open into the stack (to the right); first window becomes master.
|
||||||
if not awesome.startup then awful.client.setslave(c) end
|
if not awesome.startup then awful.client.setslave(c) end
|
||||||
c.shape = function(cr, width, height) gears.shape.rounded_rect(cr, width, height, 13) end -- 13 = corner radius
|
-- 0 or ie 13 = corner radius
|
||||||
|
c.shape = function(cr, width, height) gears.shape.rounded_rect(cr, width, height, 0) end
|
||||||
end)
|
end)
|
||||||
|
|
||||||
client.connect_signal("property::floating", function(c)
|
client.connect_signal("property::floating", function(c)
|
||||||
|
|||||||
@@ -14,9 +14,9 @@ beautiful.border_focus = colors.accent
|
|||||||
|
|
||||||
beautiful.taglist_bg_focus = colors.accent
|
beautiful.taglist_bg_focus = colors.accent
|
||||||
beautiful.taglist_fg_focus = colors.background
|
beautiful.taglist_fg_focus = colors.background
|
||||||
beautiful.taglist_fg_occupied = colors.white
|
beautiful.taglist_fg_occupied = colors.accent
|
||||||
beautiful.taglist_bg_occupied = colors.background
|
beautiful.taglist_bg_occupied = colors.background
|
||||||
beautiful.taglist_fg_empty = colors.disabled
|
beautiful.taglist_fg_empty = colors.white
|
||||||
beautiful.taglist_bg_empty = colors.background
|
beautiful.taglist_bg_empty = colors.background
|
||||||
beautiful.taglist_bg_urgent = colors.red
|
beautiful.taglist_bg_urgent = colors.red
|
||||||
beautiful.taglist_fg_urgent = colors.background
|
beautiful.taglist_fg_urgent = colors.background
|
||||||
@@ -32,16 +32,16 @@ naughty.config.defaults.margin = 12
|
|||||||
naughty.config.defaults.spacing = 8
|
naughty.config.defaults.spacing = 8
|
||||||
naughty.config.defaults.icon_size = 48
|
naughty.config.defaults.icon_size = 48
|
||||||
naughty.config.defaults.border_width = 3
|
naughty.config.defaults.border_width = 3
|
||||||
naughty.config.defaults.font = "JetBrainsMono Nerd Font 11"
|
naughty.config.defaults.font = "JetBrainsMono Nerd Font 12"
|
||||||
naughty.config.defaults.shape = function(cr, w, h) gears.shape.rounded_rect(cr, w, h, 13) end
|
naughty.config.defaults.shape = function(cr, w, h) gears.shape.rounded_rect(cr, w, h, 13) end
|
||||||
|
|
||||||
naughty.config.presets.normal = {
|
naughty.config.presets.normal = {
|
||||||
bg = colors.background, fg = colors.foreground, border_color = colors.background_alt,
|
bg = colors.background, fg = colors.foreground, border_color = colors.background_alt,
|
||||||
border_width = 3, font = "JetBrainsMono Nerd Font 11", timeout = 5,
|
border_width = 3, font = "JetBrainsMono Nerd Font 12", timeout = 5,
|
||||||
}
|
}
|
||||||
naughty.config.presets.low = naughty.config.presets.normal
|
naughty.config.presets.low = naughty.config.presets.normal
|
||||||
naughty.config.presets.critical = {
|
naughty.config.presets.critical = {
|
||||||
bg = colors.background, fg = colors.red, border_color = colors.red,
|
bg = colors.background, fg = colors.red, border_color = colors.red,
|
||||||
border_width = 3, font = "JetBrainsMono Nerd Font 11", timeout = 0, -- stays until dismissed
|
border_width = 3, font = "JetBrainsMono Nerd Font 12", timeout = 0, -- stays until dismissed
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ local M = {}
|
|||||||
|
|
||||||
-- "ICON value" with ICON tinted accent, like polybar's *-prefix-foreground.
|
-- "ICON value" with ICON tinted accent, like polybar's *-prefix-foreground.
|
||||||
function M.label(icon, val)
|
function M.label(icon, val)
|
||||||
return string.format("<span foreground='%s'>%s</span> %s", colors.accent, icon, val or "")
|
return string.format("<span foreground='%s'>%s</span> %s", colors.white, icon, val or "")
|
||||||
end
|
end
|
||||||
|
|
||||||
-- A slim separator in the disabled color, like polybar's separator.
|
-- A slim separator in the disabled color, like polybar's separator.
|
||||||
@@ -39,7 +39,7 @@ end
|
|||||||
function M.make_cpu()
|
function M.make_cpu()
|
||||||
return awful.widget.watch(
|
return awful.widget.watch(
|
||||||
{ "bash", "-c", [[LANG=C top -bn2 -d0.3 | grep -m2 '^%Cpu' | tail -1 | awk '{printf "%.0f", 100 - $8}']] },
|
{ "bash", "-c", [[LANG=C top -bn2 -d0.3 | grep -m2 '^%Cpu' | tail -1 | awk '{printf "%.0f", 100 - $8}']] },
|
||||||
3, function(w, out) w.markup = M.label("CPU", out:gsub("%s+$", "") .. "%") end)
|
3, function(w, out) w.markup = M.label("<span font_size='large'> </span>", out:gsub("%s+$", "") .. "%") end)
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Volume: click to mute, scroll to adjust, right-click for the mixer.
|
-- Volume: click to mute, scroll to adjust, right-click for the mixer.
|
||||||
@@ -61,12 +61,12 @@ function M.make_vol()
|
|||||||
awful.spawn.easy_async_with_shell(vol_cmd, function(out)
|
awful.spawn.easy_async_with_shell(vol_cmd, function(out)
|
||||||
local muted, pct = out:match("(%a+)%s+(%d+)%%")
|
local muted, pct = out:match("(%a+)%s+(%d+)%%")
|
||||||
if muted == nil and pct == nil then
|
if muted == nil and pct == nil then
|
||||||
w.markup = string.format("<span foreground='%s'>VOL n/a</span>", colors.disabled)
|
w.markup = string.format("<span foreground='%s'><span font_size='large'></span> n/a</span>", colors.disabled)
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
muted = muted == "yes"
|
muted = muted == "yes"
|
||||||
pct = pct or "0"
|
pct = pct or "0"
|
||||||
w.markup = muted and string.format("<span foreground='%s'>MUTE</span>", colors.disabled) or M.label("VOL", pct .. "%")
|
w.markup = muted and string.format("<span foreground='%s'>MUTE</span>", colors.yellow) or M.label("<span font_size='large'></span>", pct .. "%")
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -91,11 +91,11 @@ function M.make_brightness()
|
|||||||
local is_day = true
|
local is_day = true
|
||||||
|
|
||||||
local function render()
|
local function render()
|
||||||
local icon = is_day and " " or " "
|
local icon = is_day and " " or " "
|
||||||
|
|
||||||
w.markup = string.format(
|
w.markup = string.format(
|
||||||
"<span font_family='JetBrainsMono Nerd Font' foreground='%s' font_size='x-large'>%s</span>",
|
"<span font_family='JetBrainsMono Nerd Font' foreground='%s' font_size='large'>%s</span>",
|
||||||
colors.accent, icon
|
colors.white, icon
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ terminal = "alacritty"
|
|||||||
editor = os.getenv("EDITOR") or "nano"
|
editor = os.getenv("EDITOR") or "nano"
|
||||||
|
|
||||||
-- Layouts: suit.tile = master column LEFT, stack column RIGHT.
|
-- Layouts: suit.tile = master column LEFT, stack column RIGHT.
|
||||||
awful.layout.layouts = { awful.layout.suit.tile, awful.layout.suit.max, awful.layout.suit.floating }
|
awful.layout.layouts = { awful.layout.suit.tile, awful.layout.suit.max }
|
||||||
|
|
||||||
-- Kill xfce4-notifyd on startup (with a short delay + retry, in case it
|
-- Kill xfce4-notifyd on startup (with a short delay + retry, in case it
|
||||||
-- hasn't started yet at this point in the session)
|
-- hasn't started yet at this point in the session)
|
||||||
|
|||||||
@@ -7,7 +7,8 @@ fade-out-step = 0.04;
|
|||||||
#################################
|
#################################
|
||||||
# Corners #
|
# Corners #
|
||||||
#################################
|
#################################
|
||||||
corner-radius = 12;
|
# corner-radius = 0;
|
||||||
|
|
||||||
#################################
|
#################################
|
||||||
# FAST SNAPPY ANIMATIONS #
|
# FAST SNAPPY ANIMATIONS #
|
||||||
#################################
|
#################################
|
||||||
@@ -218,7 +219,7 @@ animations = (
|
|||||||
#################################
|
#################################
|
||||||
# General Settings #
|
# General Settings #
|
||||||
#################################
|
#################################
|
||||||
backend = "xrender";
|
backend = "glx";
|
||||||
dithered-present = false;
|
dithered-present = false;
|
||||||
vsync = true;
|
vsync = true;
|
||||||
detect-rounded-corners = true;
|
detect-rounded-corners = true;
|
||||||
|
|||||||
+7
-30
@@ -2,43 +2,35 @@
|
|||||||
/* -- Palette, matches colors{} in awesome rc.lua -- */
|
/* -- Palette, matches colors{} in awesome rc.lua -- */
|
||||||
bg0: #111111; /* colors.background */
|
bg0: #111111; /* colors.background */
|
||||||
bg1: #1a1a1a; /* colors.background_alt */
|
bg1: #1a1a1a; /* colors.background_alt */
|
||||||
fg0: #d3dae3; /* colors.foreground */
|
fg0: #dcd7ba; /* colors.foreground */
|
||||||
fg-selected: #ffffff; /* colors.white */
|
fg-selected: #ffffff; /* colors.white */
|
||||||
accent: #616161; /* colors.accent */
|
accent: #6a9589; /* colors.accent */
|
||||||
accent-alt: #6ba0e8; /* colors.accent_alt */
|
accent-alt: #727169; /* colors.accent_alt */
|
||||||
red: #e35b5b; /* colors.red */
|
red: #e82424; /* colors.red */
|
||||||
disabled: #707880; /* colors.disabled */
|
disabled: #6a9589; /* colors.disabled */
|
||||||
|
|
||||||
font: "JetBrainsMono Nerd Font 14";
|
font: "JetBrainsMono Nerd Font 14";
|
||||||
|
|
||||||
background-color: transparent;
|
background-color: transparent;
|
||||||
text-color: @fg0;
|
text-color: @fg0;
|
||||||
}
|
}
|
||||||
|
|
||||||
window {
|
window {
|
||||||
transparency: "real";
|
transparency: "real";
|
||||||
|
|
||||||
/* Anchor top-center, right below the wibar. */
|
/* Anchor top-center, right below the wibar. */
|
||||||
location: north;
|
location: north;
|
||||||
anchor: north;
|
anchor: north;
|
||||||
y-offset: 48px;
|
y-offset: 48px;
|
||||||
|
|
||||||
width: 32em;
|
width: 32em;
|
||||||
height: 26em; /* fixed — box size no longer changes with result count */
|
height: 26em; /* fixed — box size no longer changes with result count */
|
||||||
|
|
||||||
background-color: @bg0;
|
background-color: @bg0;
|
||||||
border: 3px;
|
border: 3px;
|
||||||
border-color: @accent;
|
border-color: @accent;
|
||||||
border-radius: 13px; /* matches gears.shape.rounded_rect radius in rc.lua */
|
border-radius: -1px; /* matches gears.shape.rounded_rect radius in rc.lua */
|
||||||
padding: 14px;
|
padding: 14px;
|
||||||
}
|
}
|
||||||
|
|
||||||
mainbox {
|
mainbox {
|
||||||
children: [ inputbar, message, listview, mode-switcher ];
|
children: [ inputbar, message, listview, mode-switcher ];
|
||||||
spacing: 10px;
|
spacing: 10px;
|
||||||
background-color: transparent;
|
background-color: transparent;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* -- Search field -- */
|
/* -- Search field -- */
|
||||||
inputbar {
|
inputbar {
|
||||||
children: [ prompt, entry ];
|
children: [ prompt, entry ];
|
||||||
@@ -47,23 +39,19 @@ inputbar {
|
|||||||
border-radius: 10px;
|
border-radius: 10px;
|
||||||
padding: 10px 14px;
|
padding: 10px 14px;
|
||||||
}
|
}
|
||||||
|
|
||||||
prompt {
|
prompt {
|
||||||
text-color: @accent-alt;
|
text-color: @accent-alt;
|
||||||
}
|
}
|
||||||
|
|
||||||
entry {
|
entry {
|
||||||
placeholder: "Search";
|
placeholder: "Search";
|
||||||
placeholder-color: @disabled;
|
placeholder-color: @disabled;
|
||||||
text-color: @fg0;
|
text-color: @fg0;
|
||||||
cursor: text;
|
cursor: text;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* -- List/grid toggle icons, top-right (matches screenshot) -- */
|
/* -- List/grid toggle icons, top-right (matches screenshot) -- */
|
||||||
mode-switcher {
|
mode-switcher {
|
||||||
enabled: false; /* flip to true if you use rofi's built-in mode tabs */
|
enabled: false; /* flip to true if you use rofi's built-in mode tabs */
|
||||||
}
|
}
|
||||||
|
|
||||||
/* -- Results -- */
|
/* -- Results -- */
|
||||||
listview {
|
listview {
|
||||||
lines: 8;
|
lines: 8;
|
||||||
@@ -74,7 +62,6 @@ listview {
|
|||||||
fixed-height: true; /* box height stays locked, doesn't shrink/grow with result count */
|
fixed-height: true; /* box height stays locked, doesn't shrink/grow with result count */
|
||||||
dynamic: false; /* don't resize dynamically as you type either */
|
dynamic: false; /* don't resize dynamically as you type either */
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Rofi tracks row state as a combination of position (normal/alternate,
|
* Rofi tracks row state as a combination of position (normal/alternate,
|
||||||
* i.e. even/odd rows for banding) and status (normal/urgent/active/selected).
|
* i.e. even/odd rows for banding) and status (normal/urgent/active/selected).
|
||||||
@@ -87,59 +74,49 @@ element {
|
|||||||
border-radius: 10px;
|
border-radius: 10px;
|
||||||
orientation: horizontal;
|
orientation: horizontal;
|
||||||
}
|
}
|
||||||
|
|
||||||
element normal.normal,
|
element normal.normal,
|
||||||
element alternate.normal {
|
element alternate.normal {
|
||||||
background-color: @bg1;
|
background-color: @bg1;
|
||||||
text-color: @fg0;
|
text-color: @fg0;
|
||||||
}
|
}
|
||||||
|
|
||||||
element normal.urgent,
|
element normal.urgent,
|
||||||
element alternate.urgent {
|
element alternate.urgent {
|
||||||
background-color: @bg1;
|
background-color: @bg1;
|
||||||
text-color: @red;
|
text-color: @red;
|
||||||
}
|
}
|
||||||
|
|
||||||
element normal.active,
|
element normal.active,
|
||||||
element alternate.active {
|
element alternate.active {
|
||||||
background-color: @bg1;
|
background-color: @bg1;
|
||||||
text-color: @accent-alt;
|
text-color: @accent-alt;
|
||||||
}
|
}
|
||||||
|
|
||||||
element selected.normal {
|
element selected.normal {
|
||||||
background-color: @accent;
|
background-color: @accent-alt;
|
||||||
text-color: @fg-selected;
|
text-color: @fg-selected;
|
||||||
}
|
}
|
||||||
|
|
||||||
element selected.urgent {
|
element selected.urgent {
|
||||||
background-color: @red;
|
background-color: @red;
|
||||||
text-color: @fg-selected;
|
text-color: @fg-selected;
|
||||||
}
|
}
|
||||||
|
|
||||||
element selected.active {
|
element selected.active {
|
||||||
background-color: @accent-alt;
|
background-color: @accent-alt;
|
||||||
text-color: @bg0;
|
text-color: @bg0;
|
||||||
}
|
}
|
||||||
|
|
||||||
element-icon {
|
element-icon {
|
||||||
size: 24px;
|
size: 24px;
|
||||||
padding: 0 12px 0 0;
|
padding: 0 12px 0 0;
|
||||||
vertical-align: 0.5;
|
vertical-align: 0.5;
|
||||||
background-color: transparent;
|
background-color: transparent;
|
||||||
}
|
}
|
||||||
|
|
||||||
element-text {
|
element-text {
|
||||||
vertical-align: 0.5;
|
vertical-align: 0.5;
|
||||||
text-color: inherit;
|
text-color: inherit;
|
||||||
background-color: transparent;
|
background-color: transparent;
|
||||||
}
|
}
|
||||||
|
|
||||||
message {
|
message {
|
||||||
background-color: @bg1;
|
background-color: @bg1;
|
||||||
border-radius: 10px;
|
border-radius: 10px;
|
||||||
padding: 8px 12px;
|
padding: 8px 12px;
|
||||||
}
|
}
|
||||||
|
|
||||||
textbox {
|
textbox {
|
||||||
text-color: @fg0;
|
text-color: @fg0;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user