diff --git a/awesome/components/notifications.lua b/awesome/components/notifications.lua index a4b7ecc..80a606a 100644 --- a/awesome/components/notifications.lua +++ b/awesome/components/notifications.lua @@ -1,15 +1,3 @@ --- ███╗ ██╗ ██████╗ ████████╗██╗███████╗██╗ ██████╗ █████╗ ████████╗██╗ ██████╗ ███╗ ██╗███████╗ --- ████╗ ██║██╔═══██╗╚══██╔══╝██║██╔════╝██║██╔════╝██╔══██╗╚══██╔══╝██║██╔═══██╗████╗ ██║██╔════╝ --- ██╔██╗ ██║██║ ██║ ██║ ██║█████╗ ██║██║ ███████║ ██║ ██║██║ ██║██╔██╗ ██║███████╗ --- ██║╚██╗██║██║ ██║ ██║ ██║██╔══╝ ██║██║ ██╔══██║ ██║ ██║██║ ██║██║╚██╗██║╚════██║ --- ██║ ╚████║╚██████╔╝ ██║ ██║██║ ██║╚██████╗██║ ██║ ██║ ██║╚██████╔╝██║ ╚████║███████║ --- ╚═╝ ╚═══╝ ╚═════╝ ╚═╝ ╚═╝╚═╝ ╚═╝ ╚═════╝╚═╝ ╚═╝ ╚═╝ ╚═╝ ╚═════╝ ╚═╝ ╚═══╝╚══════╝ - --- =================================================================== --- Imports --- =================================================================== - - local naughty = require("naughty") local beautiful = require("beautiful") local gears = require("gears") diff --git a/awesome/components/pastel/wallpaper.lua b/awesome/components/pastel/wallpaper.lua deleted file mode 100644 index d7c142d..0000000 --- a/awesome/components/pastel/wallpaper.lua +++ /dev/null @@ -1,25 +0,0 @@ --- ██╗ ██╗ █████╗ ██╗ ██╗ ██████╗ █████╗ ██████╗ ███████╗██████╗ --- ██║ ██║██╔══██╗██║ ██║ ██╔══██╗██╔══██╗██╔══██╗██╔════╝██╔══██╗ --- ██║ █╗ ██║███████║██║ ██║ ██████╔╝███████║██████╔╝█████╗ ██████╔╝ --- ██║███╗██║██╔══██║██║ ██║ ██╔═══╝ ██╔══██║██╔═══╝ ██╔══╝ ██╔══██╗ --- ╚███╔███╔╝██║ ██║███████╗███████╗██║ ██║ ██║██║ ███████╗██║ ██║ --- ╚══╝╚══╝ ╚═╝ ╚═╝╚══════╝╚══════╝╚═╝ ╚═╝ ╚═╝╚═╝ ╚══════╝╚═╝ ╚═╝ - --- =================================================================== --- Imports --- =================================================================== - - -local awful = require("awful") -local gears = require("gears") - - --- =================================================================== --- Initialization --- =================================================================== - - -local wallpaper_dir = gears.filesystem.get_configuration_dir() .. "/wallpaper" -local wallpaper = wallpaper_dir .. "/wallpaper.png" - -awful.spawn.with_shell("feh --no-fehbg --bg-fill " .. wallpaper) diff --git a/awesome/components/screen.lua b/awesome/components/screen.lua new file mode 100644 index 0000000..a5fdc85 --- /dev/null +++ b/awesome/components/screen.lua @@ -0,0 +1,26 @@ +local awful = require("awful") +local lain = require("lain") +local grid = require("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 + do + awful.tag.add(tostring(i % 10), { + layout = grid, + screen = s, + selected = i == 1 + }) + 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/pastel/top-panel.lua b/awesome/components/top-panel.lua similarity index 99% rename from awesome/components/pastel/top-panel.lua rename to awesome/components/top-panel.lua index ff51088..c03430d 100644 --- a/awesome/components/pastel/top-panel.lua +++ b/awesome/components/top-panel.lua @@ -12,7 +12,7 @@ local tag_list = require("widgets.tag-list") local layout_box = require("widgets.layout-box") local battery_widget = require("widgets.battery-widget.battery") local volume_widget = require("widgets.volume-widget.volume") -local pl = require("powerline") +local pl = require("utils.powerline") -- import widgets local task_list = require("widgets.task-list") diff --git a/awesome/icons/exit-screen/pastel/lock.png b/awesome/icons/exit-screen/pastel/lock.png deleted file mode 100644 index 8c9ff02..0000000 Binary files a/awesome/icons/exit-screen/pastel/lock.png and /dev/null differ diff --git a/awesome/icons/exit-screen/pastel/logout.png b/awesome/icons/exit-screen/pastel/logout.png deleted file mode 100644 index 246a93c..0000000 Binary files a/awesome/icons/exit-screen/pastel/logout.png and /dev/null differ diff --git a/awesome/icons/exit-screen/pastel/power.png b/awesome/icons/exit-screen/pastel/power.png deleted file mode 100644 index af9985f..0000000 Binary files a/awesome/icons/exit-screen/pastel/power.png and /dev/null differ diff --git a/awesome/icons/exit-screen/pastel/restart.png b/awesome/icons/exit-screen/pastel/restart.png deleted file mode 100644 index af60f4f..0000000 Binary files a/awesome/icons/exit-screen/pastel/restart.png and /dev/null differ diff --git a/awesome/icons/exit-screen/pastel/sleep.png b/awesome/icons/exit-screen/pastel/sleep.png deleted file mode 100644 index 31ab398..0000000 Binary files a/awesome/icons/exit-screen/pastel/sleep.png and /dev/null differ diff --git a/awesome/icons/top-panel/updates.png b/awesome/icons/top-panel/updates.png deleted file mode 100644 index a515a51..0000000 --- a/awesome/icons/top-panel/updates.png +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/awesome/pastel.lua b/awesome/pastel.lua deleted file mode 100644 index d8df195..0000000 --- a/awesome/pastel.lua +++ /dev/null @@ -1,53 +0,0 @@ --- ██████╗ █████╗ ███████╗████████╗███████╗██╗ --- ██╔══██╗██╔══██╗██╔════╝╚══██╔══╝██╔════╝██║ --- ██████╔╝███████║███████╗ ██║ █████╗ ██║ --- ██╔═══╝ ██╔══██║╚════██║ ██║ ██╔══╝ ██║ --- ██║ ██║ ██║███████║ ██║ ███████╗███████╗ --- ╚═╝ ╚═╝ ╚═╝╚══════╝ ╚═╝ ╚══════╝╚══════╝ - --- =================================================================== --- Initialization --- =================================================================== - - -local awful = require("awful") -local lain = require("lain") -local grid = require("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}) - -local pastel = {} - - --- =================================================================== --- Pastel setup --- =================================================================== - - -pastel.initialize = function() - -- Import components - require("components.pastel.wallpaper") - - -- Import panels - local top_panel = require("components.pastel.top-panel") - - -- Set up each screen (add tags & panels) - awful.screen.connect_for_each_screen(function(s) - for i = 1, 10, 1 - do - awful.tag.add(tostring(i % 10), { - layout = grid, - screen = s, - selected = i == 1 - }) - end - s.quake = quake - - -- Only add the top panel on the primary screen - if s.index == 1 then - top_panel.create(s) - end - - end) -end - -return pastel diff --git a/awesome/rc.lua b/awesome/rc.lua index 2df039d..251bec1 100644 --- a/awesome/rc.lua +++ b/awesome/rc.lua @@ -10,7 +10,7 @@ local gears = require("gears") local awful = require("awful") local grid = require("layout.grid") -local mouse_utils = require("mouse_utils") +local mouse_utils = require("utils.mouse") -- =================================================================== @@ -31,7 +31,10 @@ local run_on_start_up = { "nm-applet", "xcape -e \"Super_L=Super_L|XF86Launch5\" -t 5000", "xmodmap /home/user/.Xmodmap", - os.getenv("XDG_CONFIG_HOME") .. "/awesome/scripts/setup_display.sh" + os.getenv("XDG_CONFIG_HOME") .. "/awesome/scripts/setup_display.sh", + "feh --no-fehbg --bg-fill " .. gears.filesystem.get_configuration_dir() .. "/wallpaper/wallpaper.png", + -- "/opt/power/powersave.sh", + -- os.getenv("XDG_CONFIG_HOME") .. "/awesome/scripts/setup_display.sh" } -- =================================================================== @@ -53,6 +56,7 @@ awful.layout.layouts = { -- Import notification appearance require("components.notifications") +require("components.screen") -- Run all the apps listed in run_on_start_up for _, app in ipairs(run_on_start_up) do @@ -69,10 +73,6 @@ end local beautiful = require("beautiful") beautiful.init(gears.filesystem.get_configuration_dir() .. "theme.lua") --- Initialize theme -local selected_theme = require("pastel") -selected_theme.initialize() - -- Import Keybinds local keys = require("keys") root.keys(keys.globalkeys) diff --git a/awesome/theme.lua b/awesome/theme.lua index 30f0ab1..1efea4e 100644 --- a/awesome/theme.lua +++ b/awesome/theme.lua @@ -1,29 +1,6 @@ --- ████████╗██╗ ██╗███████╗███╗ ███╗███████╗theme --- ╚══██╔══╝██║ ██║██╔════╝████╗ ████║██╔════╝ --- ██║ ███████║█████╗ ██╔████╔██║█████╗ --- ██║ ██╔══██║██╔══╝ ██║╚██╔╝██║██╔══╝ --- ██║ ██║ ██║███████╗██║ ╚═╝ ██║███████╗ --- ╚═╝ ╚═╝ ╚═╝╚══════╝╚═╝ ╚═╝╚══════╝ - --- =================================================================== --- Initialization --- =================================================================== - - -local xresources = require("beautiful.xresources") -local dpi = xresources.apply_dpi - --- define module table +local dpi = require("beautiful.xresources").apply_dpi local theme = {} - --- =================================================================== --- Theme Variables --- =================================================================== - - -theme.name = "pastel" - -- Font theme.font = "Ubuntu 12" theme.title_font = "Ubuntu 12" @@ -53,17 +30,6 @@ theme.border_normal = "#00000000" theme.border_focus = "#002F5F" theme.border_marked = theme.fg_urgent --- Tasklist -theme.tasklist_font = theme.font - -theme.tasklist_bg_normal = theme.bg_normal -theme.tasklist_bg_focus = theme.bg_focus -theme.tasklist_bg_urgent = theme.bg_urgent - -theme.tasklist_fg_focus = theme.fg_focus -theme.tasklist_fg_urgent = theme.fg_urgent -theme.tasklist_fg_normal = theme.fg_normal - -- Panel Sizing theme.top_panel_height = dpi(30) theme.top_panel_powerline = "#002F5F" @@ -78,9 +44,5 @@ theme.notification_max_width = dpi(350) theme.bg_systray = theme.top_panel_powerline theme.systray_icon_spacing = dpi(15) --- Titlebars -theme.titlebars_enabled = false -theme.icon_theme = "Papirus" - -- return theme return theme diff --git a/awesome/mouse_utils.lua b/awesome/utils/mouse.lua similarity index 100% rename from awesome/mouse_utils.lua rename to awesome/utils/mouse.lua diff --git a/awesome/powerline.lua b/awesome/utils/powerline.lua similarity index 100% rename from awesome/powerline.lua rename to awesome/utils/powerline.lua diff --git a/awesome/widgets/clickable-container.lua b/awesome/widgets/clickable-container.lua deleted file mode 100644 index d5576f6..0000000 --- a/awesome/widgets/clickable-container.lua +++ /dev/null @@ -1,76 +0,0 @@ --- ██████╗██╗ ██╗ ██████╗██╗ ██╗ █████╗ ██████╗ ██╗ ███████╗ --- ██╔════╝██║ ██║██╔════╝██║ ██╔╝██╔══██╗██╔══██╗██║ ██╔════╝ --- ██║ ██║ ██║██║ █████╔╝ ███████║██████╔╝██║ █████╗ --- ██║ ██║ ██║██║ ██╔═██╗ ██╔══██║██╔══██╗██║ ██╔══╝ --- ╚██████╗███████╗██║╚██████╗██║ ██╗██║ ██║██████╔╝███████╗███████╗ --- ╚═════╝╚══════╝╚═╝ ╚═════╝╚═╝ ╚═╝╚═╝ ╚═╝╚═════╝ ╚══════╝╚══════╝ - --- ██████╗ ██████╗ ███╗ ██╗████████╗ █████╗ ██╗███╗ ██╗███████╗██████╗ --- ██╔════╝██╔═══██╗████╗ ██║╚══██╔══╝██╔══██╗██║████╗ ██║██╔════╝██╔══██╗ --- ██║ ██║ ██║██╔██╗ ██║ ██║ ███████║██║██╔██╗ ██║█████╗ ██████╔╝ --- ██║ ██║ ██║██║╚██╗██║ ██║ ██╔══██║██║██║╚██╗██║██╔══╝ ██╔══██╗ --- ╚██████╗╚██████╔╝██║ ╚████║ ██║ ██║ ██║██║██║ ╚████║███████╗██║ ██║ --- ╚═════╝ ╚═════╝ ╚═╝ ╚═══╝ ╚═╝ ╚═╝ ╚═╝╚═╝╚═╝ ╚═══╝╚══════╝╚═╝ ╚═╝ - --- =================================================================== --- Initialization --- =================================================================== - - -local wibox = require('wibox') - - --- =================================================================== --- Widget Creation --- =================================================================== - - -local function build(widget) - local container = - wibox.widget { - widget, - widget = wibox.container.background - } - local old_cursor, old_wibox - - container:connect_signal( - 'mouse::enter', - function() - container.bg = '#ffffff11' - local w = _G.mouse.current_wibox - if w then - old_cursor, old_wibox = w.cursor, w - w.cursor = 'hand1' - end - end - ) - - container:connect_signal( - 'mouse::leave', - function() - container.bg = '#ffffff00' - if old_wibox then - old_wibox.cursor = old_cursor - old_wibox = nil - end - end - ) - - container:connect_signal( - 'button::press', - function() - container.bg = '#ffffff22' - end - ) - - container:connect_signal( - 'button::release', - function() - container.bg = '#ffffff11' - end - ) - - return container -end - -return build diff --git a/awesome/widgets/layout-box.lua b/awesome/widgets/layout-box.lua index cd19777..8372e58 100644 --- a/awesome/widgets/layout-box.lua +++ b/awesome/widgets/layout-box.lua @@ -1,15 +1,3 @@ --- ██╗ █████╗ ██╗ ██╗ ██████╗ ██╗ ██╗████████╗ ██████╗ ██████╗ ██╗ ██╗ --- ██║ ██╔══██╗╚██╗ ██╔╝██╔═══██╗██║ ██║╚══██╔══╝ ██╔══██╗██╔═══██╗╚██╗██╔╝ --- ██║ ███████║ ╚████╔╝ ██║ ██║██║ ██║ ██║ ██████╔╝██║ ██║ ╚███╔╝ --- ██║ ██╔══██║ ╚██╔╝ ██║ ██║██║ ██║ ██║ ██╔══██╗██║ ██║ ██╔██╗ --- ███████╗██║ ██║ ██║ ╚██████╔╝╚██████╔╝ ██║ ██████╔╝╚██████╔╝██╔╝ ██╗ --- ╚══════╝╚═╝ ╚═╝ ╚═╝ ╚═════╝ ╚═════╝ ╚═╝ ╚═════╝ ╚═════╝ ╚═╝ ╚═╝ - --- =================================================================== --- Initialization --- =================================================================== - - local awful = require('awful') diff --git a/awesome/widgets/task-list.lua b/awesome/widgets/task-list.lua index 7937996..3302ce2 100644 --- a/awesome/widgets/task-list.lua +++ b/awesome/widgets/task-list.lua @@ -13,7 +13,7 @@ local awful = require('awful') local wibox = require('wibox') local gears = require('gears') -local pl = require("powerline") +local pl = require("utils.powerline") local theme = require("theme") local dpi = require('beautiful').xresources.apply_dpi diff --git a/nvim/lua/mappings.lua b/nvim/lua/mappings.lua index 783af70..e953a79 100644 --- a/nvim/lua/mappings.lua +++ b/nvim/lua/mappings.lua @@ -3,8 +3,8 @@ vim.api.nvim_set_keymap("n", "j", "gj", {}) vim.api.nvim_set_keymap("n", "k", "gk", {}) vim.api.nvim_set_keymap("n", "", "", {}) vim.api.nvim_set_keymap("v", "", "\"+y", { noremap = true }) -vim.api.nvim_set_keymap("n", "", "\"+p", { noremap = true }) -vim.api.nvim_set_keymap("v", "", "\"+p", { noremap = true }) +-- vim.api.nvim_set_keymap("n", "", "\"+p", { noremap = true }) +-- vim.api.nvim_set_keymap("v", "", "\"+p", { noremap = true }) vim.api.nvim_set_keymap("n", "", "", { noremap = true }) vim.api.nvim_set_keymap("n", "", "", { noremap = true }) vim.api.nvim_set_keymap("n", "", "", { noremap = true })