Useless border begone, changed font
This commit is contained in:
parent
d48a90f73b
commit
0a4a69cc30
213
config.lua
213
config.lua
@ -1,3 +1,214 @@
|
||||
local config = require("default_config")
|
||||
-- Default configuration file
|
||||
-- This file will be overridden on update.
|
||||
-- Copy to `~/.config/awesome/config.lua` to avoid losing your changes.
|
||||
local awful = require("awful")
|
||||
local naughty = require("naughty")
|
||||
|
||||
|
||||
local config = {}
|
||||
|
||||
|
||||
--
|
||||
-- Awesome WM
|
||||
--
|
||||
config.awesome = {
|
||||
-- Enable window autofocus on mouse hover
|
||||
autofocus = true,
|
||||
|
||||
-- Enable hotkeys help widget for VIM and other apps
|
||||
-- when client with a matching name is opened:
|
||||
hotkeys_popup = true,
|
||||
|
||||
-- Application launcher
|
||||
application_launcher_check = "rofi -version",
|
||||
application_launcher = "rofi -show drun -modi drun -show-icons -config " .. awful.util.getdir("config") .. "/assets/rofi/themes/paper-float.rasi",
|
||||
application_launcher_cmd = "rofi -show run -config " .. awful.util.getdir("config") .. "/assets/rofi/themes/paper-float.rasi",
|
||||
|
||||
-- Screen locker
|
||||
lock_command = "i3lock --blur=5 -f -k --time-color=ffffffff --date-color=ffffffff --indicator --ring-color=aaaaaaaa",
|
||||
-- lock_command = "xscreensaver-command -lock",
|
||||
|
||||
-- Terminal
|
||||
terminal = "terminator",
|
||||
|
||||
-- Window tiling
|
||||
tiling = {
|
||||
-- Available window layouts - order matters
|
||||
layouts = {
|
||||
awful.layout.suit.floating,
|
||||
awful.layout.suit.tile,
|
||||
awful.layout.suit.tile.left,
|
||||
awful.layout.suit.tile.bottom,
|
||||
awful.layout.suit.tile.top,
|
||||
-- awful.layout.suit.fair,
|
||||
-- awful.layout.suit.fair.horizontal,
|
||||
-- awful.layout.suit.spiral,
|
||||
-- awful.layout.suit.spiral.dwindle,
|
||||
-- awful.layout.suit.max,
|
||||
-- awful.layout.suit.max.fullscreen,
|
||||
-- awful.layout.suit.magnifier,
|
||||
-- awful.layout.suit.corner.nw,
|
||||
-- awful.layout.suit.corner.ne,
|
||||
-- awful.layout.suit.corner.sw,
|
||||
-- awful.layout.suit.corner.se,
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
-- Default text editor
|
||||
config.awesome.editor = os.getenv("EDITOR") or "nano"
|
||||
-- config.awesome.editor = "vi"
|
||||
-- config.awesome.editor = "code"
|
||||
|
||||
-- Default text editor command
|
||||
config.awesome.editor_cmd = config.awesome.terminal .. " -e " .. config.awesome.editor
|
||||
|
||||
|
||||
--
|
||||
-- Keys / Hotkeys / Shortcuts
|
||||
--
|
||||
-- To disable a shortcut, simply remove it (tip: comment it out with a leading "--")
|
||||
--
|
||||
config.keys = {
|
||||
-- Main modifier key for meta hotkeys like moving windows or locking the session
|
||||
-- Usually, Mod4 is the key with a logo between Control and Alt.
|
||||
modkey = "Mod4",
|
||||
}
|
||||
|
||||
-- Hotkeys globally available (through the entire OS, regardless of what's focused)
|
||||
config.keys.global_keys = {
|
||||
-- Application launcher
|
||||
launcher = { { config.keys.modkey }, "space", },
|
||||
launcher_cmd = { { "Ctrl", config.keys.modkey }, "space", },
|
||||
|
||||
-- Screen locker
|
||||
lock_screen = { { config.keys.modkey }, "l" },
|
||||
|
||||
|
||||
--
|
||||
-- Media and volume controls
|
||||
-- See media_control.lua
|
||||
--
|
||||
media_control = {
|
||||
-- Raise volume
|
||||
raiseVolume = { {}, "XF86AudioRaiseVolume" },
|
||||
|
||||
-- Lower volume
|
||||
lowerVolume = { {}, "XF86AudioLowerVolume" },
|
||||
|
||||
-- Toggle mute
|
||||
toggleMute = { {}, "XF86AudioMute" },
|
||||
|
||||
-- Toggle Play / Pause
|
||||
playPause = { {}, "XF86AudioPlay" },
|
||||
|
||||
-- Next track
|
||||
nextTrack = { {}, "XF86AudioNext" },
|
||||
|
||||
-- Previous track
|
||||
previousTrack = { {}, "XF86AudioPrev" },
|
||||
|
||||
-- Brightness up
|
||||
brightnessUp = { {}, "XF86MonBrightnessUp" },
|
||||
|
||||
-- Brightness down
|
||||
brightnessDown = { {}, "XF86MonBrightnessDown" },
|
||||
},
|
||||
|
||||
-- Keyboard layout
|
||||
keyboard_layout = {
|
||||
-- Switch between layouts
|
||||
switch = { { "Mod1" }, "Shift_L" },
|
||||
|
||||
-- Switch between layouts (alternative)
|
||||
switch_alt = { { "Shift" }, "Alt_L" },
|
||||
}
|
||||
}
|
||||
|
||||
-- Custom global hotkeys
|
||||
config.keys.custom_keys = {
|
||||
-- Example:
|
||||
-- {
|
||||
-- hotkey = {
|
||||
-- { config.keys.modkey, },
|
||||
-- "t"
|
||||
-- },
|
||||
-- action = function()
|
||||
-- awful.spawn('terminator')
|
||||
-- end,
|
||||
-- identity = { description = "open terminator", group = "utilities" }
|
||||
-- }
|
||||
};
|
||||
|
||||
|
||||
--
|
||||
-- Audio
|
||||
--
|
||||
config.audio = {
|
||||
card = '-D pulse',
|
||||
device = 'Master',
|
||||
};
|
||||
|
||||
|
||||
--
|
||||
-- Widgets
|
||||
--
|
||||
config.widgets = {
|
||||
-- Keyboard layout widget
|
||||
keyboard_layout = {
|
||||
enabled = true,
|
||||
layouts = { "fr", "us" },
|
||||
layout_switch_command = "setxkbmap",
|
||||
},
|
||||
|
||||
-- Enable/disable the system resources monitoring widget
|
||||
system_resources = {
|
||||
bars = {
|
||||
enabled = true,
|
||||
screens = { 1, 2 },
|
||||
refresh_interval = 1.5, -- In seconds
|
||||
},
|
||||
battery = {
|
||||
enabled = true,
|
||||
screens = { 1, 2 },
|
||||
refresh_interval = 30, -- In seconds
|
||||
precision = 0, -- How many decimals
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
--
|
||||
-- Auto start custom applications
|
||||
--
|
||||
config.autostart = {
|
||||
-- Network manager widget
|
||||
{
|
||||
"nm-applet --help", -- Verification command that will be checked before spawning the next command
|
||||
"nm-applet", -- The app
|
||||
},
|
||||
|
||||
-- Screenshot utility
|
||||
"flameshot",
|
||||
}
|
||||
|
||||
|
||||
-- Theme
|
||||
-- Change to gears.filesystem.get_themes_dir() .. "default/theme.lua" to use default awesome theme
|
||||
config.theme = awful.util.getdir("config") .. "/theme.lua"
|
||||
|
||||
-- Screenshot utility
|
||||
config.screenshot_utility_command = "flameshot gui"
|
||||
|
||||
-- Run menu
|
||||
config.windowSwitcher = "rofi -show window -config " .. awful.util.getdir("config") .. "/assets/rofi/themes/paper-float.rasi"
|
||||
|
||||
-- Media control
|
||||
config.volume_osd_timeout = 2
|
||||
|
||||
|
||||
-- Awesome tweaks
|
||||
naughty.config.defaults.timeout = 15
|
||||
|
||||
|
||||
return config
|
||||
|
||||
202
theme.lua
202
theme.lua
@ -1,3 +1,203 @@
|
||||
local theme = require("default_theme")
|
||||
---------------------------
|
||||
-- Default awesome theme --
|
||||
---------------------------
|
||||
|
||||
local awful = require("awful")
|
||||
local naughty = require("naughty")
|
||||
local gears = require("gears")
|
||||
|
||||
local theme_assets = require("beautiful.theme_assets")
|
||||
local xresources = require("beautiful.xresources")
|
||||
local dpi = xresources.apply_dpi
|
||||
|
||||
local gfs = require("gears.filesystem")
|
||||
local themes_path = gfs.get_themes_dir()
|
||||
local simple_awesome_path = awful.util.getdir("config")
|
||||
|
||||
local theme = {}
|
||||
|
||||
theme.font = "Noto Sans 12"
|
||||
|
||||
theme.bg_normal = "#222222"
|
||||
theme.bg_focus = "#282828"
|
||||
theme.bg_urgent = "#bf221c"
|
||||
theme.bg_minimize = "#111111"
|
||||
theme.bg_systray = theme.bg_normal
|
||||
|
||||
theme.fg_normal = "#aaaaaa"
|
||||
theme.fg_focus = "#ffffff"
|
||||
theme.fg_urgent = "#ffffff"
|
||||
theme.fg_minimize = "#ffffff"
|
||||
|
||||
theme.useless_gap = dpi(0)
|
||||
theme.border_width = dpi(0)
|
||||
theme.border_normal = "#555555"
|
||||
theme.border_focus = "#555555"
|
||||
theme.border_marked = "#91231c"
|
||||
|
||||
-- Tasklist
|
||||
theme.tasklist_bg_focus = theme.bg_minimize
|
||||
theme.tasklist_bg_minimize = theme.bg_normal
|
||||
|
||||
-- Notifications
|
||||
naughty.config.padding = dpi(8)
|
||||
naughty.config.defaults.position = "top_right"
|
||||
naughty.config.defaults.margin = dpi(16)
|
||||
naughty.config.defaults.border_width = dpi(0)
|
||||
naughty.config.presets.critical.bg = "#e82922"
|
||||
theme.notification_shape = function(cr, width, height)
|
||||
return gears.shape.rounded_rect(cr, width, height, 5)
|
||||
end
|
||||
theme.notification_margin = dpi(16)
|
||||
theme.notification_width = dpi(512)
|
||||
theme.notification_border_color = theme.border_focus
|
||||
theme.notification_border_width = dpi(0)
|
||||
theme.notification_bg = theme.bg_focus
|
||||
theme.notification_fg = theme.fg_focus
|
||||
|
||||
-- Hotkeys (awesome help menu)
|
||||
theme.hotkeys_border_color = theme.border_normal
|
||||
|
||||
-- System resources widget
|
||||
theme.system_resources_widget_bar_bg = theme.bg_focus
|
||||
theme.system_resources_widget_bar_color = "#ffffff"
|
||||
theme.system_resources_widget_border_color = theme.fg_normal
|
||||
theme.system_resources_widget_border_width = 1
|
||||
theme.system_resources_widget_bar_width = dpi(8)
|
||||
theme.system_resources_widget_bar_margin = dpi(2)
|
||||
theme.system_resources_widget_bar_shape = function(cr, width, height)
|
||||
return gears.shape.rounded_rect (cr, width, height, 2)
|
||||
end
|
||||
theme.system_resources_widget_battery_margin = theme.system_resources_widget_bar_width
|
||||
|
||||
-- There are other variable sets
|
||||
-- overriding the default one when
|
||||
-- defined, the sets are:
|
||||
-- taglist_[bg|fg]_[focus|urgent|occupied|empty|volatile]
|
||||
-- tasklist_[bg|fg]_[focus|urgent]
|
||||
-- titlebar_[bg|fg]_[normal|focus]
|
||||
-- tooltip_[font|opacity|fg_color|bg_color|border_width|border_color]
|
||||
-- mouse_finder_[color|timeout|animate_timeout|radius|factor]
|
||||
-- prompt_[fg|bg|fg_cursor|bg_cursor|font]
|
||||
-- hotkeys_[bg|fg|border_width|border_color|shape|opacity|modifiers_fg|label_bg|label_fg|group_margin|font|description_font]
|
||||
-- Example:
|
||||
--theme.taglist_bg_focus = "#ff0000"
|
||||
|
||||
-- Generate taglist squares:
|
||||
local taglist_square_size = dpi(8)
|
||||
theme.taglist_squares_sel = theme_assets.taglist_squares_sel(
|
||||
taglist_square_size, theme.fg_normal
|
||||
)
|
||||
theme.taglist_squares_unsel = theme_assets.taglist_squares_unsel(
|
||||
taglist_square_size, theme.fg_normal
|
||||
)
|
||||
|
||||
-- Variables set for theming notifications:
|
||||
-- notification_font
|
||||
-- notification_[bg|fg]
|
||||
-- notification_[width|height|margin]
|
||||
-- notification_[border_color|border_width|shape|opacity]
|
||||
|
||||
-- Variables set for theming the menu:
|
||||
-- menu_[bg|fg]_[normal|focus]
|
||||
-- menu_[border_color|border_width]
|
||||
theme.menu_submenu_icon = themes_path.."default/submenu.png"
|
||||
theme.menu_height = dpi(32)
|
||||
theme.menu_width = dpi(256)
|
||||
|
||||
-- You can add as many variables as
|
||||
-- you wish and access them by using
|
||||
-- beautiful.variable in your rc.lua
|
||||
--theme.bg_widget = "#cc0000"
|
||||
|
||||
-- Define the image to load
|
||||
theme.titlebar_close_button_normal = simple_awesome_path .. "/assets/icons/x.svg"
|
||||
theme.titlebar_close_button_focus = theme.titlebar_close_button_normal
|
||||
theme.titlebar_close_button_hover_bg_color = '#800'
|
||||
|
||||
theme.titlebar_maximized_button_normal_inactive = simple_awesome_path .. "/assets/icons/maximize.svg"
|
||||
theme.titlebar_maximized_button_focus_inactive = theme.titlebar_maximized_button_normal_inactive
|
||||
theme.titlebar_maximized_button_normal_active = simple_awesome_path .. "/assets/icons/unmaximize.svg"
|
||||
theme.titlebar_maximized_button_focus_active = theme.titlebar_maximized_button_normal_active
|
||||
theme.titlebar_maximized_button_hover_bg_color = '#555'
|
||||
|
||||
theme.titlebar_minimize_button_normal = simple_awesome_path .. "/assets/icons/minus.svg"
|
||||
theme.titlebar_minimize_button_focus = theme.titlebar_minimize_button_normal
|
||||
theme.titlebar_minimize_button_hover_bg_color = '#555'
|
||||
|
||||
theme.titlebar_ontop_button_normal_inactive = themes_path.."default/titlebar/ontop_normal_inactive.png"
|
||||
theme.titlebar_ontop_button_focus_inactive = theme.titlebar_ontop_button_normal_inactive
|
||||
theme.titlebar_ontop_button_normal_active = themes_path.."default/titlebar/ontop_normal_active.png"
|
||||
theme.titlebar_ontop_button_focus_active = theme.titlebar_ontop_button_normal_active
|
||||
theme.titlebar_ontop_button_hover_bg_color = '#555'
|
||||
|
||||
theme.titlebar_floating_button_normal_inactive = themes_path.."default/titlebar/floating_normal_inactive.png"
|
||||
theme.titlebar_floating_button_focus_inactive = theme.titlebar_floating_button_normal_inactive
|
||||
theme.titlebar_floating_button_normal_active = themes_path.."default/titlebar/floating_normal_active.png"
|
||||
theme.titlebar_floating_button_focus_active = theme.titlebar_floating_button_normal_active
|
||||
theme.titlebar_floating_button_hover_bg_color = '#555'
|
||||
|
||||
|
||||
theme.wallpaper = simple_awesome_path.."/assets/art/default_wallpaper.png"
|
||||
|
||||
-- You can use your own layout icons like this:
|
||||
theme.layout_fairh = themes_path.."default/layouts/fairhw.png"
|
||||
theme.layout_fairv = themes_path.."default/layouts/fairvw.png"
|
||||
theme.layout_floating = themes_path.."default/layouts/floatingw.png"
|
||||
theme.layout_magnifier = themes_path.."default/layouts/magnifierw.png"
|
||||
theme.layout_max = themes_path.."default/layouts/maxw.png"
|
||||
theme.layout_fullscreen = themes_path.."default/layouts/fullscreenw.png"
|
||||
theme.layout_tilebottom = themes_path.."default/layouts/tilebottomw.png"
|
||||
theme.layout_tileleft = themes_path.."default/layouts/tileleftw.png"
|
||||
theme.layout_tile = themes_path.."default/layouts/tilew.png"
|
||||
theme.layout_tiletop = themes_path.."default/layouts/tiletopw.png"
|
||||
theme.layout_spiral = themes_path.."default/layouts/spiralw.png"
|
||||
theme.layout_dwindle = themes_path.."default/layouts/dwindlew.png"
|
||||
theme.layout_cornernw = themes_path.."default/layouts/cornernww.png"
|
||||
theme.layout_cornerne = themes_path.."default/layouts/cornernew.png"
|
||||
theme.layout_cornersw = themes_path.."default/layouts/cornersww.png"
|
||||
theme.layout_cornerse = themes_path.."default/layouts/cornersew.png"
|
||||
|
||||
-- Generate Awesome icon:
|
||||
theme.start_menu_icon = simple_awesome_path .. "/assets/icons/material-tux-dark-keen.svg"
|
||||
theme.awesome_icon = theme_assets.awesome_icon(
|
||||
theme.menu_height, theme.bg_focus, theme.fg_focus
|
||||
)
|
||||
|
||||
-- Define the icon theme for application icons. If not set then the icons
|
||||
-- from /usr/share/icons and /usr/share/icons/hicolor will be used.
|
||||
theme.icon_theme = nil
|
||||
|
||||
-- Volume OSD
|
||||
theme.volume_osd_width = dpi(48)
|
||||
theme.volume_osd_bar_height = dpi(196)
|
||||
theme.volume_osd_padding = dpi(8)
|
||||
theme.volume_osd_shape = function(cr, width, height)
|
||||
return gears.shape.rounded_rect(cr, width, height, 5)
|
||||
end
|
||||
theme.volume_osd_position = function(screen_width, screen_height, osd_width, osd_height)
|
||||
return {
|
||||
dpi(8),
|
||||
theme.menu_height + dpi(8)
|
||||
}
|
||||
end
|
||||
|
||||
theme.volume_osd_bg = theme.bg_normal
|
||||
theme.volume_osd_border_color = theme.border_normal
|
||||
theme.volume_osd_border_width = dpi(0)
|
||||
theme.volume_osd_progress_bg = theme.bg_minimize
|
||||
theme.volume_osd_progress_color = "#ffffff"
|
||||
theme.volume_osd_progress_color_muted = "#555555"
|
||||
theme.volume_osd_progress_border_color = theme.volume_osd_border_color
|
||||
theme.volume_osd_progress_border_width = dpi(0)
|
||||
theme.volume_osd_image_color = "#ffffff"
|
||||
theme.volume_osd_icon_0 = simple_awesome_path .. "/assets/icons/volume-x.svg"
|
||||
theme.volume_osd_icon_1 = simple_awesome_path .. "/assets/icons/volume.svg"
|
||||
theme.volume_osd_icon_2 = simple_awesome_path .. "/assets/icons/volume-1.svg"
|
||||
theme.volume_osd_icon_3 = simple_awesome_path .. "/assets/icons/volume-2.svg"
|
||||
|
||||
|
||||
-- Power Menu
|
||||
theme.power_menu_icon_color = "#ffffff"
|
||||
|
||||
return theme
|
||||
|
||||
Loading…
Reference in New Issue
Block a user