Restructure

awesome/components/notifications.lua

@@ -1,15 +1,3 @@
---      ███╗   ██╗ ██████╗ ████████╗██╗███████╗██╗ ██████╗ █████╗ ████████╗██╗ ██████╗ ███╗   ██╗███████╗
---      ████╗  ██║██╔═══██╗╚══██╔══╝██║██╔════╝██║██╔════╝██╔══██╗╚══██╔══╝██║██╔═══██╗████╗  ██║██╔════╝
---      ██╔██╗ ██║██║   ██║   ██║   ██║█████╗  ██║██║     ███████║   ██║   ██║██║   ██║██╔██╗ ██║███████╗
---      ██║╚██╗██║██║   ██║   ██║   ██║██╔══╝  ██║██║     ██╔══██║   ██║   ██║██║   ██║██║╚██╗██║╚════██║
---      ██║ ╚████║╚██████╔╝   ██║   ██║██║     ██║╚██████╗██║  ██║   ██║   ██║╚██████╔╝██║ ╚████║███████║
---      ╚═╝  ╚═══╝ ╚═════╝    ╚═╝   ╚═╝╚═╝     ╚═╝ ╚═════╝╚═╝  ╚═╝   ╚═╝   ╚═╝ ╚═════╝ ╚═╝  ╚═══╝╚══════╝
-
--- ===================================================================
--- Imports
--- ===================================================================
-
-
 local naughty = require("naughty")
 local beautiful = require("beautiful")
 local gears = require("gears")

awesome/components/pastel/wallpaper.lua

@@ -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)

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)

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")

awesome/icons/top-panel/updates.png

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><!--! Font Awesome Pro 6.1.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc. --><path d="M256 32V51.2C329 66.03 384 130.6 384 208V226.8C384 273.9 401.3 319.2 432.5 354.4L439.9 362.7C448.3 372.2 450.4 385.6 445.2 397.1C440 408.6 428.6 416 416 416H32C19.4 416 7.971 408.6 2.809 397.1C-2.353 385.6-.2883 372.2 8.084 362.7L15.5 354.4C46.74 319.2 64 273.9 64 226.8V208C64 130.6 118.1 66.03 192 51.2V32C192 14.33 206.3 0 224 0C241.7 0 256 14.33 256 32H256zM224 512C207 512 190.7 505.3 178.7 493.3C166.7 481.3 160 464.1 160 448H288C288 464.1 281.3 481.3 269.3 493.3C257.3 505.3 240.1 512 224 512z"/></svg>

awesome/pastel.lua

@@ -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

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)

awesome/theme.lua

@@ -1,29 +1,6 @@
---      ████████╗██╗  ██╗███████╗███╗   ███╗███████╗theme
+local dpi = require("beautiful.xresources").apply_dpi
---      ╚══██╔══╝██║  ██║██╔════╝████╗ ████║██╔════╝
---         ██║   ███████║█████╗  ██╔████╔██║█████╗
---         ██║   ██╔══██║██╔══╝  ██║╚██╔╝██║██╔══╝
---         ██║   ██║  ██║███████╗██║ ╚═╝ ██║███████╗
---         ╚═╝   ╚═╝  ╚═╝╚══════╝╚═╝     ╚═╝╚══════╝
-
--- ===================================================================
--- Initialization
--- ===================================================================
-
-
-local xresources = require("beautiful.xresources")
-local dpi = xresources.apply_dpi
-
--- define module table
 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

awesome/widgets/clickable-container.lua

@@ -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

awesome/widgets/layout-box.lua

@@ -1,15 +1,3 @@
---      ██╗      █████╗ ██╗   ██╗ ██████╗ ██╗   ██╗████████╗    ██████╗  ██████╗ ██╗  ██╗
---      ██║     ██╔══██╗╚██╗ ██╔╝██╔═══██╗██║   ██║╚══██╔══╝    ██╔══██╗██╔═══██╗╚██╗██╔╝
---      ██║     ███████║ ╚████╔╝ ██║   ██║██║   ██║   ██║       ██████╔╝██║   ██║ ╚███╔╝
---      ██║     ██╔══██║  ╚██╔╝  ██║   ██║██║   ██║   ██║       ██╔══██╗██║   ██║ ██╔██╗
---      ███████╗██║  ██║   ██║   ╚██████╔╝╚██████╔╝   ██║       ██████╔╝╚██████╔╝██╔╝ ██╗
---      ╚══════╝╚═╝  ╚═╝   ╚═╝    ╚═════╝  ╚═════╝    ╚═╝       ╚═════╝  ╚═════╝ ╚═╝  ╚═╝
-
--- ===================================================================
--- Initialization
--- ===================================================================
-
-
 local awful = require('awful')
 
 

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

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", "<S-k>", "<Nop>", {})
 vim.api.nvim_set_keymap("v", "<S-y>", "\"+y", { noremap = true })
-vim.api.nvim_set_keymap("n", "<S-p>", "\"+p", { noremap = true })
+-- vim.api.nvim_set_keymap("n", "<S-p>", "\"+p", { noremap = true })
-vim.api.nvim_set_keymap("v", "<S-p>", "\"+p", { noremap = true })
+-- vim.api.nvim_set_keymap("v", "<S-p>", "\"+p", { noremap = true })
 vim.api.nvim_set_keymap("n", "<C-U>", "<C-O>", { noremap = true })
 vim.api.nvim_set_keymap("n", "<C-E>", "<C-U>", { noremap = true })
 vim.api.nvim_set_keymap("n", "<C-I>", "<C-I>", { noremap = true })