Add X11 back for now, will probably switch again later

71 files changed, 1511 insertions, 519 deletions

diff --git a/.gitmodules b/.gitmodules
index f477143..89c69a1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,3 +7,9 @@
 [submodule "qutebrowser/jmatrix"]
 	path = qutebrowser/jmatrix
 	url = https://gitlab.com/jgkamat/jmatrix.git
+[submodule "awesome/awesome-wm-widgets"]
+	path = awesome/awesome-wm-widgets
+	url = https://github.com/streetturtle/awesome-wm-widgets
+[submodule "awesome/bling"]
+	path = awesome/bling
+	url = https://github.com/BlingCorp/bling.git
diff --git a/X11/Xresources b/X11/Xresources
index e5b0aea..d5c4550 100644
--- a/X11/Xresources
+++ b/X11/Xresources
@@ -30,12 +30,12 @@ st.termname:     st-256color
 st.shell: /usr/bin/tmux
 
 ! The following options options can be reloaded via USR1 signal.
-st.font:              mononoki Nerd Font Mono:pixelsize=9:antialias=true:autohint=true;
-st.font2:             Symbola:pixelsize=12:antialias=true:autohint=true;
+!st.font:              mononoki Nerd Font Mono:pixelsize=12:antialias=true:autohint=true;
+!st.font2:             Symbola:pixelsize=12:antialias=true:autohint=true;
 st.borderpx:          3
 ! st alpha
-! st.alpha:            0.8
-! st.alphaUnfocused:   0.8
+st.alpha:            0.8
+st.alphaUnfocused:   0.8
 ! Available cursor values: 2 4 6 7 = █ _ | ☃ ( 1 3 5 are blinking versions)
 st.cursorshape:       6
 ! thickness of underline and bar cursors
@@ -111,7 +111,7 @@ URxvt.keysym.C-Minus: resize-font:smaller
 URxvt.keysym.C-Plus: resize-font:bigger
 
 ! "Enabled modi" Set from: Default
-rofi.modi:                           window,run,ssh,drun
+rofi.modi:                           window,run,ssh,drun.5
 ! "Window width" Set from: Default
 rofi.width:                          1366
 ! "Number of lines" Set from: Default
diff --git a/X11/xinitrc b/X11/xinitrc
new file mode 100755
index 0000000..534bfc6
--- /dev/null
+++ b/X11/xinitrc
@@ -0,0 +1,5 @@
+#!/bin/sh
+[ -x ~/.screenlayout/layout.sh ] && ~/.screenlayout/layout.sh
+setxkbmap -option "caps:escape" &
+xrdb ~/.Xresources
+exec awesome
diff --git a/X11/xprofile b/X11/xprofile
new file mode 100755
index 0000000..1a24852
--- /dev/null
+++ b/X11/xprofile
@@ -0,0 +1 @@
+#!/bin/sh
diff --git a/autostart.sh b/autostart.sh
deleted file mode 100755
index 6ef26b6..0000000
--- a/autostart.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-runifnot () {
-  if type $1 >/dev/null; then
-    echo $1
-    if [ -z "$(pgrep -Uzachir -f $1)" ]; then
-      $@ &
-    fi
-  fi
-}
-killandrun () {
-  if type $1 >/dev/null; then
-    echo $1
-    if [ -n "$(pgrep -Uzachir -f $1)" ]; then
-      pkill -Uzachir $1
-    fi
-    $@ &
-  fi
-}
-
-if [ -n "${WAYLAND_DISPLAY}${DISPLAY}" ]; then
-  notify-sound.sh off &
-  runifnot swayidle
-  killandrun hyprpaper
-  runifnot waybar
-  gnome="org.gnome.desktop.interface"
-  gsettings set $gnome gtk-theme 'Plata-Noir-Compact'
-  gsettings set $gnome icon-theme 'Mint-Y-Dark-Blue'
-  gsettings set $gnome cursor-theme 'Adwaita'
-  xrdb ~/.Xresources
-  runifnot portmaster-start --data=/opt/safing/portmaster notifier
-  runifnot jamesdsp -t
-fi
-
-[ -x "$XDG_CONFIG_HOME/computerrc.sh" ] && "$XDG_CONFIG_HOME/computerrc.sh"
diff --git a/awesome/awesome-wm-widgets b/awesome/awesome-wm-widgets
new file mode 160000
+Subproject 4381a89ee06d91278f62bdd3762b3859b8775bf
diff --git a/awesome/bling b/awesome/bling
new file mode 160000
+Subproject 1f6bd0d5ef150a1801d20c69437ceff61d65fac
diff --git a/awesome/rc.lua b/awesome/rc.lua
new file mode 100644
index 0000000..650e61e
--- /dev/null
+++ b/awesome/rc.lua
@@ -0,0 +1,1110 @@
+-- If LuaRocks is installed, make sure that packages installed through it are
+-- found (e.g. lgi). If LuaRocks is not installed, do nothing.
+pcall(require, "luarocks.loader")
+
+-- Standard awesome library
+local gears = require("gears")
+local awful = require("awful")
+require("awful.autofocus")
+-- Widget and layout library
+local wibox = require("wibox")
+-- Theme handling library
+local beautiful = require("beautiful")
+-- Notification library
+local naughty = require("naughty")
+package.loaded["naughty.dbus"] = {}
+local menubar = require("menubar")
+local hotkeys_popup = require("awful.hotkeys_popup")
+-- Enable hotkeys help widget for VIM and other apps
+-- when client with a matching name is opened:
+require("awful.hotkeys_popup.keys")
+
+-- {{{ Error handling
+-- Check if awesome encountered an error during startup and fell back to
+-- another config (This code will only ever execute for the fallback config)
+if awesome.startup_errors then
+    naughty.notify({ preset = naughty.config.presets.critical, 
+                     title = "Oops, there were errors during startup!",
+                     text = awesome.startup_errors })
+end
+
+-- Handle runtime errors after startup
+do
+    local in_error = false
+    awesome.connect_signal("debug::error", function (err)
+        -- Make sure we don't go into an endless error loop
+        if in_error then return end
+        in_error = true
+
+        naughty.notify({ preset = naughty.config.presets.critical,
+                         title = "Oops, an error happened!",
+                         text = tostring(err) })
+        in_error = false
+    end)
+end
+-- }}}
+
+-- {{{ Variable definitions
+-- Themes define colours, icons, font and wallpapers.
+local theme = {}
+theme.name = "zachir"
+home_dir = os.getenv("HOME")
+if (os.getenv("XDG_CONFIG_HOME")) then
+    config_dir = os.getenv("XDG_CONFIG_HOME")
+else
+    config_dir = string.format("%s/.config", os.getenv("HOME"))
+end
+awesome_config_folder = config_dir .. "awesome"
+theme.dir = string.format("%s/awesome/themes/%s", config_dir, theme.name)
+beautiful.init(theme.dir .. "/theme.lua")
+beautiful.useless_gap = 5
+font = beautiful.font or "mononoki Nerd Font Mono 18"
+
+-- Library I'm using for swallowing, but it does much more
+
+local bling = require("bling")
+
+-- Widget definitions/initializations
+
+local battery_widget = require("awesome-wm-widgets.batteryarc-widget.batteryarc")
+local mpd_widget = require("awesome-wm-widgets.mpdarc-widget.mpdarc")
+local volume_widget = require("awesome-wm-widgets.volume-widget.volume")
+local ram_widget = require("awesome-wm-widgets.ram-widget.ram-widget")
+local cpu_widget = require("awesome-wm-widgets.cpu-widget.cpu-widget")
+local brightness_widget = require("awesome-wm-widgets.brightness-widget.brightness")
+local net_speed = require("awesome-wm-widgets.net-speed-widget.net-speed")
+
+-- Disable keybindings
+
+local inertmode = false
+
+-- Spawn windows at bottom of stack
+
+local spawnatbottom = false
+
+
+-- Default modkey.
+-- Usually, Mod4 is the key with a logo between Control and Alt.
+-- If you do not like this or do not have such a key,
+-- I suggest you to remap Mod4 to another key using xmodmap or other tools.
+-- However, you can use another modifier like Mod1, but it may interact with others.
+modkey = "Mod4"
+
+-- Table of layouts to cover with awful.layout.inc, order matters.
+awful.layout.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,
+}
+-- }}}
+
+-- Config function definitions {{{
+
+function crcparse(substr)
+    local file=assert(io.open(config_dir .. "/computerrc","r"))
+    local line = ""
+    repeat
+        line=file:read("*line")
+        if line and line:find(string.format("^%s=",substr)) then
+            return string.sub(line,#substr + 2,-1)
+        end
+    until not line
+end
+
+function terminal_sp_cmd (spc, cmd, geo)
+  if terminal == "st" then
+    cflag = "-c"
+    gflag = "-g"
+    xflag = "-e"
+  elseif terminal == "alacritty" then
+    cflag = "--class"
+    gflag = false
+    xflag = "-e"
+  elseif terminal == "kitty" then
+    cflag = "--class"
+    gflag = false
+    xflag = ""
+  end
+  if cflag and spc then
+    cl = " " .. cflag .. " " .. spc
+  else
+    cl = ""
+  end
+  if gflag and geo then
+    gl = " " .. gflag .. " " .. geo
+  else
+    gl = ""
+  end
+  if xflag and cmd then
+    xl = " " .. xflag .. " " .. cmd
+  else
+    xl = ""
+  end
+  return terminal .. cl .. gl .. xl
+end
+
+-- }}}
+
+-- {{{ crcparse Definitions
+
+-- terminal
+terminal="kitty"
+editor = os.getenv("EDITOR") or "nvim"
+editor_cmd = terminal .. " -e " .. editor
+
+-- is linux
+function is_linux ()
+  return crcparse("OS") == "Linux"
+end
+
+-- is openbsd
+function is_obsd ()
+  return crcparse("OS") == "OpenBSD"
+end
+
+-- }}}
+
+--{{{ bling scratchpad definitions
+--{{{ sphtop
+local sphtop = bling.module.scratchpad {
+  command = terminal_sp_cmd("sphtop", "htop", nil),
+  rule = { class = "sphtop" },
+  sticky = true,
+  autoclose = true,
+  floating = true,
+  geometry = { x = 575, y = 275, height = 530, width = 770 },
+  reapply = true,
+  dont_focus_before_close = false
+}
+--}}}
+--{{{ spterm
+local spterm = bling.module.scratchpad {
+  command = terminal_sp_cmd("spterm", nil, nil),
+  rule = { class = "spterm" },
+  sticky = true,
+  autoclose = true,
+  floating = true,
+  geometry = { x = 575, y = 275, height = 530, width = 770 },
+  reapply = true,
+  dont_focus_before_close = false
+}
+--}}}
+--{{{ sppmxr
+local sppmxr = bling.module.scratchpad {
+  command = terminal_sp_cmd("sppmxr", "pulsemixer", nil),
+  rule = { class = "sppmxr" },
+  sticky = true,
+  autoclose = true,
+  floating = true,
+  geometry = { x = 575, y = 275, height = 530, width = 770 },
+  reapply = true,
+  dont_focus_before_close = false
+}
+--}}}
+--{{{ spblue
+local spblue = bling.module.scratchpad {
+  command = terminal_sp_cmd("spblue", "bluetoothctl", nil),
+  rule = { class = "spblue" },
+  sticky = true,
+  autoclose = true,
+  floating = true,
+  geometry = { x = 575, y = 275, height = 530, width = 770 },
+  reapply = true,
+  dont_focus_before_close = false
+}
+--}}}
+--{{{ spncmp
+local spncmp = bling.module.scratchpad {
+  command = terminal_sp_cmd("spncmp", "ncmpcpp", nil),
+  rule = { class = "spncmp" },
+  sticky = true,
+  autoclose = true,
+  floating = true,
+  geometry = { x = 575, y = 275, height = 530, width = 770 },
+  reapply = true,
+  dont_focus_before_close = false
+}
+--}}}
+--{{{ spmutt
+local spmutt = bling.module.scratchpad {
+  command = terminal_sp_cmd("spmutt", "neomutt", nil),
+  rule = { class = "spmutt" },
+  sticky = true,
+  autoclose = true,
+  floating = true,
+  geometry = { x = 575, y = 275, height = 530, width = 770 },
+  reapply = true,
+  dont_focus_before_close = false
+}
+--}}}
+--{{{ spprof
+local spprof = bling.module.scratchpad {
+  command = terminal_sp_cmd("spprof", "profanity", nil),
+  rule = { class = "spprof" },
+  sticky = true,
+  autoclose = true,
+  floating = true,
+  geometry = { x = 575, y = 275, height = 530, width = 770 },
+  reapply = true,
+  dont_focus_before_close = false
+}
+--}}}
+--{{{ spirss
+local spirss = bling.module.scratchpad {
+  command = terminal_sp_cmd("spirss", "irssi", nil),
+  rule = { class = "spirss" },
+  sticky = true,
+  autoclose = true,
+  floating = true,
+  geometry = { x = 575, y = 275, height = 530, width = 770 },
+  reapply = true,
+  dont_focus_before_close = false
+}
+--}}}
+--{{{ sptodo
+local sptodo = bling.module.scratchpad {
+  command = terminal_sp_cmd("sptodo", "todo", nil),
+  rule = { class = "sptodo" },
+  sticky = true,
+  autoclose = true,
+  floating = true,
+  geometry = { x = 575, y = 275, height = 530, width = 770 },
+  reapply = true,
+  dont_focus_before_close = false
+}
+--}}}
+--{{{ sptrem
+local sptrem = bling.module.scratchpad {
+  command = terminal_sp_cmd("sptrem", "tremc", nil),
+  rule = { class = "sptrem" },
+  sticky = true,
+  autoclose = true,
+  floating = true,
+  geometry = { x = 575, y = 275, height = 530, width = 770 },
+  reapply = true,
+  dont_focus_before_close = false
+}
+--}}}
+--{{{ qpwgraph
+local qpwgraph = bling.module.scratchpad {
+  command = "qpwgraph",
+  rule = { class = "qpwgraph" },
+  sticky = true,
+  autoclose = true,
+  floating = true,
+  geometry = { x = 575, y = 275, height = 530, width = 770 },
+  reapply = true,
+  dont_focus_before_close = false
+}
+--}}}
+--}}}
+
+-- {{{ Menu
+-- Create a launcher widget and a main menu
+myawesomemenu = {
+   { "hotkeys", function() hotkeys_popup.show_help(nil, awful.screen.focused()) end },
+   { "manual", terminal .. " -e man awesome" },
+   { "edit config", editor_cmd .. " " .. awesome.conffile },
+   { "restart", awesome.restart },
+   { "quit", function() awesome.quit() end },
+}
+
+mymainmenu = awful.menu({ items = { { "awesome", myawesomemenu, beautiful.awesome_icon },
+                                    { "open terminal", terminal }
+                                  }
+                        })
+
+mylauncher = awful.widget.launcher({ image = beautiful.awesome_icon,
+                                     menu = mymainmenu })
+
+-- Menubar configuration
+menubar.utils.terminal = terminal -- Set the terminal for applications that require it
+-- }}}
+
+-- Keyboard map indicator and switcher
+mykeyboardlayout = awful.widget.keyboardlayout()
+
+-- {{{ Wibar
+-- Create a textclock widget
+mytextclock = wibox.widget.textclock()
+
+-- Create a wibox for each screen and add it
+local taglist_buttons = gears.table.join(
+                    awful.button({ }, 1, function(t) t:view_only() end),
+                    awful.button({ modkey }, 1, function(t)
+                                              if client.focus then
+                                                  client.focus:move_to_tag(t)
+                                              end
+                                          end),
+                    awful.button({ }, 3, awful.tag.viewtoggle),
+                    awful.button({ modkey }, 3, function(t)
+                                              if client.focus then
+                                                  client.focus:toggle_tag(t)
+                                              end
+                                          end),
+                    awful.button({ }, 4, function(t) awful.tag.viewnext(t.screen) end),
+                    awful.button({ }, 5, function(t) awful.tag.viewprev(t.screen) end)
+                )
+
+local tasklist_buttons = gears.table.join(
+                     awful.button({ }, 1, function (c)
+                                              if c == client.focus then
+                                                  c.minimized = true
+                                              else
+                                                  c:emit_signal(
+                                                      "request::activate",
+                                                      "tasklist",
+                                                      {raise = true}
+                                                  )
+                                              end
+                                          end),
+                     awful.button({ }, 3, function()
+                                              awful.menu.client_list({ theme = { width = 250 } })
+                                          end),
+                     awful.button({ }, 4, function ()
+                                              awful.client.focus.byidx(1)
+                                          end),
+                     awful.button({ }, 5, function ()
+                                              awful.client.focus.byidx(-1)
+                                          end))
+
+local function set_wallpaper(s)
+    -- Wallpaper
+    if beautiful.wallpaper then
+        local wallpaper = beautiful.wallpaper
+        -- If wallpaper is a function, call it with the screen
+        if type(wallpaper) == "function" then
+            wallpaper = wallpaper(s)
+        end
+        gears.wallpaper.maximized(wallpaper, s, true)
+    end
+end
+
+-- Re-set wallpaper when a screen's geometry changes (e.g. different resolution)
+screen.connect_signal("property::geometry", set_wallpaper)
+
+awful.screen.connect_for_each_screen(function(s)
+    -- -- Wallpaper
+    set_wallpaper(s)
+
+    -- Each screen has its own tag table.
+    awful.tag({ "1", "2", "3", "4", "5", "6", "7", "8", "9" }, s, awful.layout.layouts[1])
+
+    -- Create a promptbox for each screen
+    s.mypromptbox = awful.widget.prompt()
+    -- Create an imagebox widget which will contain an icon indicating which layout we're using.
+    -- We need one layoutbox per screen.
+    s.mylayoutbox = awful.widget.layoutbox(s)
+    s.mylayoutbox:buttons(gears.table.join(
+                           awful.button({ }, 1, function () awful.layout.inc( 1) end),
+                           awful.button({ }, 3, function () awful.layout.inc(-1) end),
+                           awful.button({ }, 4, function () awful.layout.inc( 1) end),
+                           awful.button({ }, 5, function () awful.layout.inc(-1) end)))
+    -- Create a taglist widget
+    s.mytaglist = awful.widget.taglist {
+        screen  = s,
+        filter  = awful.widget.taglist.filter.all,
+        buttons = taglist_buttons
+    }
+
+    -- Create a tasklist widget
+    s.mytasklist = awful.widget.tasklist {
+        screen  = s,
+        filter  = awful.widget.tasklist.filter.focused,
+        buttons = tasklist_buttons
+    }
+
+    -- Create the wibox
+    s.mywibox = awful.wibar({ position = "top", screen = s, height = 36})
+
+    if (crcparse("snd") == "pipewire") or (crcparse("snd") == "pulseaudio") or (crcparse("snd") == "pulse") then
+        snd="pulse"
+    else
+        snd="default"
+    end
+
+    net = crcparse("inet")
+
+    batt = crcparse("batt")
+
+    light = crcparse("bl")
+
+    if batt == "y" then
+        battery = battery_widget {
+            font = font,
+            arc_thickness = 2,
+            show_current_level = false,
+            size = 18,
+            timeout = 10,
+            main_color = beautiful.fg_color,
+            bg_color = "#ffffff11",
+            low_level_color = "#e53935",
+            medium_level_color = "#c0ca33",
+            warning_msg_title = "Houston, we have a problem",
+            warning_msg_text = "Battery is dying",
+            warning_msg_position = "bottom_right", -- "bottom_right" is default, or top_right, top_left, bottom_left, bottom_right, top_middle, bottom_middle
+            warning_msg_icon = "~/.config/awesome/awesome-wm-widgets/batteryarc-widget/spaceman.jpg",
+            enable_battery_warning = true,
+            show_notification_mode = "on_click", -- "on_hover" is default, or "on_click" or "off"
+            notification_position = "top_right" -- "top_left is default, or top_right, top_left, bottom_left, bottom_right, top_middle, bottom_middle
+        }
+    else
+        battery = nil
+    end
+
+    -- Add widgets to the wibox
+    ---[[ Uncomment for Linux
+    s.mywibox:setup {
+        layout = wibox.layout.align.horizontal,
+        { -- Left widgets
+            layout = wibox.layout.fixed.horizontal,
+            mylauncher,
+            s.mytaglist,
+            s.mypromptbox,
+        },
+        s.mytasklist, -- Middle widget
+        {
+            layout = wibox.layout.fixed.horizontal,
+            mpd_widget,
+            net_speed {
+                font = beautiful.font2,
+                interface = net
+            },
+            ram_widget({
+                color_used=beautiful.bg_focus,
+                color_free=beautiful.fg_normal,
+                color_buf=beautiful.bg_accent,
+                widget_height=32,
+                widget_width=32,
+                widget_show_buf=true,
+                timeout=1
+            }),
+            cpu_widget({
+                width=50,
+                step_width=2,
+                step_spacing=1,
+                color=beautiful.fg_normal,
+                enable_kill_button=false,
+                process_info_max_length=-1,
+                timeout=1
+            }),
+            brightness_widget {
+                type = "arc",
+                program = light,
+                step = 5,
+                base = 20,
+                path_to_icon = "/usr/share/icons/Paper/scalable/status/display-brightness-symbolic.svg", 
+                timeout = 1,
+                tooltip = false,
+                percentage = false
+            },
+            volume_widget {
+                path_to_icon = "/usr/share/icons/Paper/scalable/status/audio-volume-muted-symbolic.svg",
+                widget_type = "arc",
+                mute_color = "#ff111111",
+                device = snd,
+            },
+            battery,
+            mykeyboardlayout,
+            wibox.widget.systray(),
+            mytextclock,
+            s.mylayoutbox,
+        },
+    }
+    --]]
+    --[[ Uncomment for OpenBSD
+    -- Add widgets to the wibox
+    s.mywibox:setup {
+        layout = wibox.layout.align.horizontal,
+        { -- Left widgets
+            layout = wibox.layout.fixed.horizontal,
+            mylauncher,
+            s.mytaglist,
+            s.mypromptbox,
+        },
+        s.mytasklist, -- Middle widget
+        {
+            layout = wibox.layout.fixed.horizontal,
+            mpd_widget,
+            mykeyboardlayout,
+            wibox.widget.systray(),
+            mytextclock,
+            s.mylayoutbox,
+        },
+    }
+    --]]
+end)
+  
+-- }}}
+
+-- {{{ Mouse bindings
+root.buttons(gears.table.join(
+    --[[
+    awful.button({ }, 3, function () mymainmenu:toggle() end),
+    awful.button({ }, 4, awful.tag.viewnext),
+    awful.button({ }, 5, awful.tag.viewprev)
+    --]]
+))
+
+client.connect_signal("mouse::enter", function(c)
+    c:emit_signal("request::activate", "mouse_enter", {raise = false})
+end)
+-- }}}
+
+-- {{{ Key bindings
+
+
+globalkeys = gears.table.join(
+    ---[[ Toggles scratchpads 
+    awful.key({ modkey, "Control" }, "z",
+        function ()
+            sphtop:toggle()
+        end,
+        {description = "Toggle htop scratchpad"}),
+    awful.key({ modkey, "Control" }, "x",
+        function ()
+            spterm:toggle()
+        end,
+        {description = "Toggle term scratchpad"}),
+    awful.key({ modkey, "Control" }, "c",
+        function ()
+            sppmxr:toggle()
+        end,
+        {description = "Toggle pulsemixer scratchpad"}),
+    awful.key({ modkey, "Control" }, "v",
+        function ()
+            spblue:toggle()
+        end,
+        {description = "Toggle bluetoothctl scratchpad"}),
+    awful.key({ modkey, "Control" }, "b",
+        function ()
+            spncmp:toggle()
+        end,
+        {description = "Toggle ncmpcpp scratchpad"}),
+    awful.key({ modkey, "Control" }, "a",
+        function ()
+            spmutt:toggle()
+        end,
+        {description = "Toggle neomutt scratchpad"}),
+    awful.key({ modkey, "Control" }, "s",
+        function ()
+            spprof:toggle()
+        end,
+        {description = "Toggle profanity scratchpad"}),
+    awful.key({ modkey, "Control" }, "d",
+        function ()
+            spirss:toggle()
+        end,
+        {description = "Toggle irssi scratchpad"}),
+    awful.key({ modkey, "Control" }, "f",
+        function ()
+            sptodo:toggle()
+        end,
+        {description = "Toggle todo.txt scratchpad"}),
+    awful.key({ modkey, "Control" }, "g",
+        function ()
+            sptrem:toggle()
+        end,
+        {description = "Toggle tremc scratchpad"}),
+    awful.key({ modkey, "Control" }, "q",
+        function ()
+            qpwgraph:toggle()
+        end,
+        {description = "Toggle qpwgraph scratchpad"}),
+    --]]
+
+    ---[[ spawnatbottom Toggles where in the stack new windows spawn
+    -- (at the bottom or not)
+    awful.key({ modkey }, "a",
+        function ()
+            spawnatbottom = not spawnatbottom
+        end,
+        {description = "toggle attach at bottom", group = "layout"}),
+    --]]
+    
+    ---[[ inertkeys toggles keybindings on and off
+    awful.key({ modkey }, "b",
+        function ()
+            root.keys(inertkeys)
+        end,
+        {description = "turn inert mode on", group = "awesome"}),
+    --]]
+
+    --[[ Shows the awesome menu where the mouse is
+    awful.key({ modkey }, "w",
+        function ()
+            mymainmenu:show()
+        end,
+        {description = "show main menu", group = "awesome"}),
+    --]]
+
+    ---[[ Standard programs
+    -- Spawns the terminal defined by "terminal"
+    awful.key({ modkey }, "Return",
+        function ()
+            awful.spawn(terminal)
+        end,
+        {description = "open a terminal", group = "launcher"}),
+    --]]
+    
+    ---[[ Awesome stop/restart
+    awful.key({ modkey, "Shift" }, "e",
+        function ()
+            awesome.quit()
+        end,
+        {description = "quit awesome", group = "awesome"}),
+    awful.key({ modkey, "Shift" }, "r",
+        function ()
+            awesome.restart()
+        end,
+        {description = "reload awesome", group = "awesome"}),
+    --]]
+
+    ---[[ Changes master/slave ratio
+    awful.key({ modkey }, "l",
+        function ()
+            awful.tag.incmwfact( 0.05)
+        end,
+        {description = "increase master width factor", group = "layout"}),
+    awful.key({ modkey }, "h",
+        function ()
+            awful.tag.incmwfact(-0.05)
+        end,
+        {description = "decrease master width factor", group = "layout"}),
+    --]]
+
+    ---[[ Changes the number of masters
+    awful.key({ modkey, "Shift" }, "h",
+        function ()
+            awful.tag.incnmaster( 1, nil, true)
+        end,
+        {description = "increase te number of master clients", group = "layout"}),
+    awful.key({ modkey, "Shift" }, "l",
+        function ()
+            awful.tag.incnmaster(-1, nil, true)
+        end,
+        {description = "decrease the number of master clients", group = "layout"}),
+    --]]
+
+    ---[[ Changes the number of columns
+    awful.key({ modkey, "Control" }, "h",
+        function ()
+            awful.tag.incncol( 1, nil, true)   
+        end,
+        {description = "increase the number of columns", group = "layout"}),
+    awful.key({ modkey, "Control" }, "l",
+        function ()
+            awful.tag.incncol(-1, nil, true)   
+        end,
+        {description = "decrease the number of columns", group = "layout"})
+    --]]
+
+    --[[ Changes the layout used
+    awful.key({ modkey }, "space",
+        function ()
+            awful.layout.inc( 1)               
+        end,
+        {description = "select next", group = "layout"}),
+    awful.key({ modkey, "Shift" }, "space",
+        function ()
+            awful.layout.inc(-1)               
+        end,
+        {description = "select previous", group = "layout"}),
+    --]]
+
+    --[[ Runs arbitrary Lua code
+    awful.key({ modkey }, "x",
+        function ()
+            awful.prompt.run {
+                prompt       = "Run Lua code: ",
+                textbox      = awful.screen.focused().mypromptbox.widget,
+                exe_callback = awful.util.eval,
+                history_path = awful.util.get_cache_dir() .. "/history_eval"
+            }
+        end,
+        {description = "lua execute prompt", group = "awesome"})
+    --]]
+)
+
+---[[ Keybindings for messing with clients
+globalkeys = gears.table.join( globalkeys,
+    ---[[ Client manipulation
+    -- Moves focus up and down the stack
+    awful.key({ modkey }, "j",
+        function ()
+            awful.client.focus.byidx( 1)
+        end,
+        {description = "focus next by index", group = "client"}),
+    awful.key({ modkey }, "k",
+        function ()
+            awful.client.focus.byidx(-1)
+        end,
+        {description = "focus previous by index", group = "client"}),
+    -- Moves client up and down the stack
+    awful.key({ modkey, "Shift" }, "j",
+        function ()
+            awful.client.swap.byidx(  1)
+        end,
+       {description = "swap with next client by index", group = "client"}),
+    awful.key({ modkey, "Shift" }, "k",
+        function ()
+            awful.client.swap.byidx( -1)   
+        end,
+        {description = "swap with previous client by index", group = "client"}),
+    -- Moves focus between screens
+    awful.key({ modkey, "Control" }, "j",
+        function ()
+            awful.screen.focus_relative( 1)
+        end,
+        {description = "focus the next screen", group = "screen"}),
+    awful.key({ modkey, "Control" }, "k",
+        function ()
+            awful.screen.focus_relative(-1)
+        end,
+        {description = "focus the previous screen", group = "screen"}),
+    -- Focuses the previous client
+    awful.key({ modkey }, "Tab",
+        function ()
+            awful.client.focus.history.previous()
+            if client.focus then
+                client.focus:raise()
+            end
+        end,
+        {description = "go back", group = "client"}),
+    --]]
+
+    ---[[ Closes client
+    awful.key({ modkey, "Shift" }, "q",
+        function (c)
+            c:kill()
+        end,
+        {description = "close", group = "client"}),
+    --]]
+
+    ---[[ Toggles client state
+    -- Toggles fullscreen
+    awful.key({ modkey }, "f",
+        function (c)
+            c.fullscreen = not c.fullscreen
+            c:raise()
+        end,
+        {description = "toggle fullscreen", group = "client"}),
+
+    -- Toggles client floating
+    awful.key({ modkey, "Control" }, "space",
+        function (c)
+            c.floating = not c.floating
+        end,
+        {description = "toggle floating", group = "client"}),
+
+    -- Toggles keeping the client on top
+    awful.key({ modkey }, "t",
+        function (c)
+            c.ontop = not c.ontop
+        end,
+        {description = "toggle keep on top", group = "client"}),
+
+    -- Toggles maximizing the client
+    awful.key({ modkey }, "m",
+        function (c)
+            c.maximized = not c.maximized
+            c:raise()
+        end,
+        {description = "toggle maximize", group = "client"}),
+
+    -- Toggles vertically maximizing the client
+    awful.key({ modkey, "Control" }, "m",
+        function (c)
+            c.maximized_vertical = not c.maximized_vertical
+            c:raise()
+        end,
+        {description = "toggle maximize vertically", group = "client"}),
+
+    -- Toggles horizontally maximizing the client
+    awful.key({ modkey, "Shift" }, "m",
+        function (c)
+            c.maximized_horizontal = not c.maximized_horizontal
+            c:raise()
+        end,
+        {description = "toggle maximize horizontally", group = "client"}),
+    --]]
+
+    ---[[ Moves the client to the master position
+    -- Or, if client is the master, does nothing
+    awful.key({ modkey, "Shift" }, "Return",
+        function (c)
+            c:swap(awful.client.getmaster())
+        end,
+        {description = "move to master", group = "client"}),
+    --]]
+
+    ---[[ Moves the client to the next screen
+    awful.key({ modkey }, "o",
+        function (c)
+            c:move_to_screen()
+        end,
+        {description = "move to screen", group = "client"}),
+    --]]
+
+    ---[[ Minimization
+    -- Minimizes the client
+    awful.key({ modkey }, "n",
+        function (c)
+            -- The client currently has the input focus, so it cannot be
+            -- minimized, since minimized clients can't have the focus.
+            c.minimized = true
+        end ,
+        {description = "minimize", group = "client"}),
+
+    -- Unminimizes one client
+    awful.key({ modkey, "Control" }, "n",
+        function ()
+            local c = awful.client.restore()
+            -- Focus restored client
+            if c then
+                c:emit_signal("request::activate", "key.unminimize", {raise = true})
+            end
+        end,
+        {description = "restore minimized", group = "client"})
+    --]]
+)
+
+---[[ Tag keybindings
+-- Bind all key numbers to tags.
+-- Be careful: we use keycodes to make it work on any keyboard layout.
+-- This should map on the top row of your keyboard, usually 1 to 9.
+for i = 1, 9 do
+    globalkeys = gears.table.join(globalkeys,
+        ---[[ View tag only.
+        awful.key({ modkey }, "#" .. i + 9,
+            function ()
+                local screen = awful.screen.focused()
+                local tag = screen.tags[i]
+                if tag then
+                    tag:view_only()
+                end
+            end,
+            {description = "view tag #"..i, group = "tag"}),
+        --]]
+        ---[[ Toggle tag display.
+        awful.key({ modkey, "Control" }, "#" .. i + 9,
+            function ()
+                local screen = awful.screen.focused()
+                local tag = screen.tags[i]
+                if tag then
+                    awful.tag.viewtoggle(tag)
+                end
+            end,
+            {description = "toggle tag #" .. i, group = "tag"}),
+        --]]
+        ---[[ Move client to tag.
+        awful.key({ modkey, "Shift" }, "#" .. i + 9,
+            function ()
+                if client.focus then
+                    local tag = client.focus.screen.tags[i]
+                    if tag then
+                        client.focus:move_to_tag(tag)
+                    end
+                end
+            end,
+            {description = "move focused client to tag #"..i, group = "tag"}),
+        --]]
+        ---[[ Toggle tag on focused client.
+        awful.key({ modkey, "Control", "Shift" }, "#" .. i + 9,
+            function ()
+                if client.focus then
+                    local tag = client.focus.screen.tags[i]
+                    if tag then
+                        client.focus:toggle_tag(tag)
+                    end
+                end
+            end,
+            {description = "toggle focused client on tag #" .. i, group = "tag"})
+        --]]
+    )
+end
+--]]
+
+---[[ Mouse keybindings
+clientbuttons = gears.table.join(
+    ---[[ Focus client when clicked on
+    awful.button({ 0 }, 1,
+        function (c)
+            c:emit_signal("request::activate", "mouse_click", {raise = true})
+        end),
+    --]]
+    ---[[ Move client when left clicked with modkey
+    awful.button({ modkey }, 1,
+        function (c)
+            c:emit_signal("request::activate", "mouse_click", {raise = true})
+            awful.mouse.client.move(c)
+        end),
+    --]]
+    ---[[ Resize client when right clicked with modkey
+    awful.button({ modkey }, 3,
+        function (c)
+            c:emit_signal("request::activate", "mouse_click", {raise = true})
+            awful.mouse.client.resize(c)
+        end)
+    --]]
+)
+--]]
+
+---[[ Keybindings for the "inert" mode
+inertkeys = gears.table.join(
+    ---[[ Go back to normal bindings
+    awful.key({ modkey }, "b",
+        function ()
+            root.keys(globalkeys)
+        end,
+        {description = "turn inert mode off", group = "awesome"})
+    --]]
+)
+--]]
+
+-- Set keys
+root.keys(globalkeys)
+-- }}}
+
+-- {{{ Rules
+-- Rules to apply to new clients (through the "manage" signal).
+awful.rules.rules = {
+    -- All clients will match this rule.
+    { rule = { },
+        properties = { border_width = beautiful.border_width,
+                       border_color = beautiful.border_normal,
+                       focus = awful.client.focus.filter,
+                       raise = true,
+                       keys = nil,
+                       buttons = clientbuttons,
+                       screen = awful.screen.preferred,
+                       placement = awful.placement.no_overlap+awful.placement.no_offscreen
+        }
+    },
+
+    { rule_any = {
+            class = {
+                "QjackCtl",
+                "Tk",
+                "gcr-prompter"
+            }
+        },
+        properties = { floating = true },
+        callback = function(c)
+            awful.placement.centered(c,nil)
+        end
+    },
+
+    -- Floating clients.
+    { rule_any = {
+            instance = {
+                "DTA",  -- Firefox addon DownThemAll.
+                "copyq",  -- Includes session name in class.
+                "pinentry",
+            },
+            class = {
+                --"mpv",
+                "ProtonMail Bridge",
+                "TheFiniteDemo",
+                "Arandr",
+                "Blueman-manager",
+                "Gpick",
+                "Kruler",
+                "MessageWin",  -- kalarm.
+                -- "Sxiv",
+                "Tor Browser", -- Needs a fixed window size to avoid fingerprinting by screen size.
+                "Wpa_gui",
+                "veromix",
+                "xtightvncviewer"
+            },
+
+            -- Note that the name property shown in xprop might be set slightly after creation of the client
+            -- and the name shown there might not match defined rules here.
+            name = {
+                "Event Tester",  -- xev.
+            },
+            role = {
+                "AlarmWindow",  -- Thunderbird's calendar.
+                "ConfigManager",  -- Thunderbird's about:config.
+                "pop-up",       -- e.g. Google Chrome's (detached) Developer Tools.
+            }
+        }, properties = { floating = true }
+    },
+
+    -- Add titlebars to normal clients and dialogs
+    { rule_any = {
+            type = { "normal", "dialog" }
+        },
+        properties = { titlebars_enabled = true }
+    },
+
+    -- These windows will be force resized to fit
+    { rule_any =
+        {
+            class = {
+                "mpv",
+                "Lutris",
+                "polychromatic-controller"
+            },
+        }, properties = { size_hints_honor = false }
+    },
+}
+-- }}}
+
+--{{{ bling window swallowing
+bling.module.window_swallowing.start()
+--}}}
+
+-- {{{ Autostart
+--[[ Commands to run:
+  xrdb ~/.Xresources
+  setxkbmap -option 'caps:escape'
+  picom
+  sxhkd
+  xwallpaper --center ~/background.jpg
+  jamesdsp -t
+--]]
+-- Autostart commands that only run once
+awful.spawn.with_shell(
+  'if (xrdb -query | grep -q "^awesome\\.started:\\s*true$"); then exit; fi;' ..
+  'xrdb -merge <<< "awesome.started:true";' ..
+  -- list each of your autostart commands, followed by ; inside single quotes,
+  -- followed by ..
+  'xss-lock slockd'
+)
+-- Autostart commands that run every restart
+awful.spawn.with_shell(
+  -- list each of your autostart commands, followed by ; inside single quotes,
+  -- followed by ..
+  'setxkbmap -option "caps:escape";' ..
+  'picom &;' ..
+  'sxhkd &;' ..
+  'jamedsp -t &'
+)
+-- }}}
+
+-- spawn windows as slaves {{{
+client.connect_signal(
+    "manage",
+    function(c)
+        if not awesome.startup then
+            if spawnatbottom then
+                awful.client.setslave(c)
+            end
+        end
+    end
+)
+-- }}}
diff --git a/awesome/themes/zachir/README b/awesome/themes/zachir/README
new file mode 100644
index 0000000..1ddb349
--- /dev/null
+++ b/awesome/themes/zachir/README
@@ -0,0 +1,3 @@
+Background images:
+    Mikael Eriksson <mikael_eriksson@miffe.org>
+    Licensed under CC-BY-SA-3.0
diff --git a/awesome/themes/zachir/background.jpg b/awesome/themes/zachir/background.jpg
new file mode 120000
index 0000000..525f4e6
--- /dev/null
+++ b/awesome/themes/zachir/background.jpg
@@ -0,0 +1 @@
+/home/zachir/background.jpg
\ No newline at end of file
diff --git a/awesome/themes/zachir/background.png b/awesome/themes/zachir/background.png
new file mode 100644
index 0000000..8f52b6b
--- /dev/null
+++ b/awesome/themes/zachir/background.png
diff --git a/awesome/themes/zachir/background_white.png b/awesome/themes/zachir/background_white.png
new file mode 100644
index 0000000..bb0c5d0
--- /dev/null
+++ b/awesome/themes/zachir/background_white.png
diff --git a/awesome/themes/zachir/layouts/cornerne.png b/awesome/themes/zachir/layouts/cornerne.png
new file mode 100644
index 0000000..c85bd56
--- /dev/null
+++ b/awesome/themes/zachir/layouts/cornerne.png
diff --git a/awesome/themes/zachir/layouts/cornernew.png b/awesome/themes/zachir/layouts/cornernew.png
new file mode 100644
index 0000000..c3fd986
--- /dev/null
+++ b/awesome/themes/zachir/layouts/cornernew.png
diff --git a/awesome/themes/zachir/layouts/cornernw.png b/awesome/themes/zachir/layouts/cornernw.png
new file mode 100644
index 0000000..dfe78b3
--- /dev/null
+++ b/awesome/themes/zachir/layouts/cornernw.png
diff --git a/awesome/themes/zachir/layouts/cornernww.png b/awesome/themes/zachir/layouts/cornernww.png
new file mode 100644
index 0000000..f489010
--- /dev/null
+++ b/awesome/themes/zachir/layouts/cornernww.png
diff --git a/awesome/themes/zachir/layouts/cornerse.png b/awesome/themes/zachir/layouts/cornerse.png
new file mode 100644
index 0000000..023ae79
--- /dev/null
+++ b/awesome/themes/zachir/layouts/cornerse.png
diff --git a/awesome/themes/zachir/layouts/cornersew.png b/awesome/themes/zachir/layouts/cornersew.png
new file mode 100644
index 0000000..f7cfa1c
--- /dev/null
+++ b/awesome/themes/zachir/layouts/cornersew.png
diff --git a/awesome/themes/zachir/layouts/cornersw.png b/awesome/themes/zachir/layouts/cornersw.png
new file mode 100644
index 0000000..c1453c9
--- /dev/null
+++ b/awesome/themes/zachir/layouts/cornersw.png
diff --git a/awesome/themes/zachir/layouts/cornersww.png b/awesome/themes/zachir/layouts/cornersww.png
new file mode 100644
index 0000000..a65a043
--- /dev/null
+++ b/awesome/themes/zachir/layouts/cornersww.png
diff --git a/awesome/themes/zachir/layouts/dwindle.png b/awesome/themes/zachir/layouts/dwindle.png
new file mode 100644
index 0000000..9902d22
--- /dev/null
+++ b/awesome/themes/zachir/layouts/dwindle.png
diff --git a/awesome/themes/zachir/layouts/dwindlew.png b/awesome/themes/zachir/layouts/dwindlew.png
new file mode 100644
index 0000000..9199049
--- /dev/null
+++ b/awesome/themes/zachir/layouts/dwindlew.png
diff --git a/awesome/themes/zachir/layouts/fairh.png b/awesome/themes/zachir/layouts/fairh.png
new file mode 100644
index 0000000..d41deea
--- /dev/null
+++ b/awesome/themes/zachir/layouts/fairh.png
diff --git a/awesome/themes/zachir/layouts/fairhw.png b/awesome/themes/zachir/layouts/fairhw.png
new file mode 100644
index 0000000..bb50e3a
--- /dev/null
+++ b/awesome/themes/zachir/layouts/fairhw.png
diff --git a/awesome/themes/zachir/layouts/fairv.png b/awesome/themes/zachir/layouts/fairv.png
new file mode 100644
index 0000000..f5f0288
--- /dev/null
+++ b/awesome/themes/zachir/layouts/fairv.png
diff --git a/awesome/themes/zachir/layouts/fairvw.png b/awesome/themes/zachir/layouts/fairvw.png
new file mode 100644
index 0000000..4f4ed52
--- /dev/null
+++ b/awesome/themes/zachir/layouts/fairvw.png
diff --git a/awesome/themes/zachir/layouts/floating.png b/awesome/themes/zachir/layouts/floating.png
new file mode 100644
index 0000000..b8061a0
--- /dev/null
+++ b/awesome/themes/zachir/layouts/floating.png
diff --git a/awesome/themes/zachir/layouts/floatingw.png b/awesome/themes/zachir/layouts/floatingw.png
new file mode 100644
index 0000000..4815894
--- /dev/null
+++ b/awesome/themes/zachir/layouts/floatingw.png
diff --git a/awesome/themes/zachir/layouts/fullscreen.png b/awesome/themes/zachir/layouts/fullscreen.png
new file mode 100644
index 0000000..d02f6fc
--- /dev/null
+++ b/awesome/themes/zachir/layouts/fullscreen.png
diff --git a/awesome/themes/zachir/layouts/fullscreenw.png b/awesome/themes/zachir/layouts/fullscreenw.png
new file mode 100644
index 0000000..5c35bfa
--- /dev/null
+++ b/awesome/themes/zachir/layouts/fullscreenw.png
diff --git a/awesome/themes/zachir/layouts/magnifier.png b/awesome/themes/zachir/layouts/magnifier.png
new file mode 100644
index 0000000..2925414
--- /dev/null
+++ b/awesome/themes/zachir/layouts/magnifier.png
diff --git a/awesome/themes/zachir/layouts/magnifierw.png b/awesome/themes/zachir/layouts/magnifierw.png
new file mode 100644
index 0000000..6209556
--- /dev/null
+++ b/awesome/themes/zachir/layouts/magnifierw.png
diff --git a/awesome/themes/zachir/layouts/max.png b/awesome/themes/zachir/layouts/max.png
new file mode 100644
index 0000000..8d20844
--- /dev/null
+++ b/awesome/themes/zachir/layouts/max.png
diff --git a/awesome/themes/zachir/layouts/maxw.png b/awesome/themes/zachir/layouts/maxw.png
new file mode 100644
index 0000000..85f5ce3
--- /dev/null
+++ b/awesome/themes/zachir/layouts/maxw.png
diff --git a/awesome/themes/zachir/layouts/spiral.png b/awesome/themes/zachir/layouts/spiral.png
new file mode 100644
index 0000000..d9434be
--- /dev/null
+++ b/awesome/themes/zachir/layouts/spiral.png
diff --git a/awesome/themes/zachir/layouts/spiralw.png b/awesome/themes/zachir/layouts/spiralw.png
new file mode 100644
index 0000000..b78dd86
--- /dev/null
+++ b/awesome/themes/zachir/layouts/spiralw.png
diff --git a/awesome/themes/zachir/layouts/tile.png b/awesome/themes/zachir/layouts/tile.png
new file mode 100644
index 0000000..3ede21e
--- /dev/null
+++ b/awesome/themes/zachir/layouts/tile.png
diff --git a/awesome/themes/zachir/layouts/tilebottom.png b/awesome/themes/zachir/layouts/tilebottom.png
new file mode 100644
index 0000000..6f8c257
--- /dev/null
+++ b/awesome/themes/zachir/layouts/tilebottom.png
diff --git a/awesome/themes/zachir/layouts/tilebottomw.png b/awesome/themes/zachir/layouts/tilebottomw.png
new file mode 100644
index 0000000..a1de7b2
--- /dev/null
+++ b/awesome/themes/zachir/layouts/tilebottomw.png
diff --git a/awesome/themes/zachir/layouts/tileleft.png b/awesome/themes/zachir/layouts/tileleft.png
new file mode 100644
index 0000000..31d6870
--- /dev/null
+++ b/awesome/themes/zachir/layouts/tileleft.png
diff --git a/awesome/themes/zachir/layouts/tileleftw.png b/awesome/themes/zachir/layouts/tileleftw.png
new file mode 100644
index 0000000..cf14c25
--- /dev/null
+++ b/awesome/themes/zachir/layouts/tileleftw.png
diff --git a/awesome/themes/zachir/layouts/tiletop.png b/awesome/themes/zachir/layouts/tiletop.png
new file mode 100644
index 0000000..98cade2
--- /dev/null
+++ b/awesome/themes/zachir/layouts/tiletop.png
diff --git a/awesome/themes/zachir/layouts/tiletopw.png b/awesome/themes/zachir/layouts/tiletopw.png
new file mode 100644
index 0000000..d1d0872
--- /dev/null
+++ b/awesome/themes/zachir/layouts/tiletopw.png
diff --git a/awesome/themes/zachir/layouts/tilew.png b/awesome/themes/zachir/layouts/tilew.png
new file mode 100644
index 0000000..fde2ca4
--- /dev/null
+++ b/awesome/themes/zachir/layouts/tilew.png
diff --git a/awesome/themes/zachir/submenu.png b/awesome/themes/zachir/submenu.png
new file mode 100644
index 0000000..b2778e2
--- /dev/null
+++ b/awesome/themes/zachir/submenu.png
diff --git a/awesome/themes/zachir/taglist/squarefw.png b/awesome/themes/zachir/taglist/squarefw.png
new file mode 100644
index 0000000..2a86430
--- /dev/null
+++ b/awesome/themes/zachir/taglist/squarefw.png
diff --git a/awesome/themes/zachir/taglist/squarew.png b/awesome/themes/zachir/taglist/squarew.png
new file mode 100644
index 0000000..913f2ca
--- /dev/null
+++ b/awesome/themes/zachir/taglist/squarew.png
diff --git a/awesome/themes/zachir/theme.lua b/awesome/themes/zachir/theme.lua
new file mode 100644
index 0000000..bef4f5c
--- /dev/null
+++ b/awesome/themes/zachir/theme.lua
@@ -0,0 +1,240 @@
+---------------------------
+-- Default awesome theme --
+---------------------------
+
+local theme_assets = require("beautiful.theme_assets")
+local xresources = require("beautiful.xresources")
+local dpi = xresources.apply_dpi
+local xrdb = xresources.get_current_theme()
+
+local gfs = require("gears.filesystem")
+local themes_path = gfs.get_themes_dir()
+
+local theme = {}
+
+theme.font          = "mononoki Nerd Font Mono 18"
+theme.font2         = "mononoki Nerd Font Mono 12"
+
+theme.bg_normal     = xrdb.background
+theme.bg_focus      = xrdb.color2
+theme.bg_accent     = xrdb.color8
+theme.bg_urgent     = xrdb.color9
+theme.bg_minimize   = xrdb.color0
+theme.bg_systray    = theme.bg_focus
+
+theme.fg_normal     = xrdb.color7
+theme.fg_focus      = xrdb.background
+theme.fg_urgent     = xrdb.color15
+theme.fg_minimize   = xrdb.color15
+theme.useless_gap   = dpi(0)
+theme.border_width  = dpi(1)
+theme.border_normal = xrdb.color0
+theme.border_focus  = xrdb.color2
+theme.border_marked = xrdb.color8
+
+-- 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(4)
+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.."zachir/submenu.png"
+theme.menu_height = dpi(15)
+theme.menu_width  = dpi(100)
+
+-- 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 = themes_path.."zachir/titlebar/close_normal.png"
+theme.titlebar_close_button_focus  = themes_path.."zachir/titlebar/close_focus.png"
+
+theme.titlebar_minimize_button_normal = themes_path.."zachir/titlebar/minimize_normal.png"
+theme.titlebar_minimize_button_focus  = themes_path.."zachir/titlebar/minimize_focus.png"
+
+theme.titlebar_ontop_button_normal_inactive = themes_path.."zachir/titlebar/ontop_normal_inactive.png"
+theme.titlebar_ontop_button_focus_inactive  = themes_path.."zachir/titlebar/ontop_focus_inactive.png"
+theme.titlebar_ontop_button_normal_active = themes_path.."zachir/titlebar/ontop_normal_active.png"
+theme.titlebar_ontop_button_focus_active  = themes_path.."zachir/titlebar/ontop_focus_active.png"
+
+theme.titlebar_sticky_button_normal_inactive = themes_path.."zachir/titlebar/sticky_normal_inactive.png"
+theme.titlebar_sticky_button_focus_inactive  = themes_path.."zachir/titlebar/sticky_focus_inactive.png"
+theme.titlebar_sticky_button_normal_active = themes_path.."zachir/titlebar/sticky_normal_active.png"
+theme.titlebar_sticky_button_focus_active  = themes_path.."zachir/titlebar/sticky_focus_active.png"
+
+theme.titlebar_floating_button_normal_inactive = themes_path.."zachir/titlebar/floating_normal_inactive.png"
+theme.titlebar_floating_button_focus_inactive  = themes_path.."zachir/titlebar/floating_focus_inactive.png"
+theme.titlebar_floating_button_normal_active = themes_path.."zachir/titlebar/floating_normal_active.png"
+theme.titlebar_floating_button_focus_active  = themes_path.."zachir/titlebar/floating_focus_active.png"
+
+theme.titlebar_maximized_button_normal_inactive = themes_path.."zachir/titlebar/maximized_normal_inactive.png"
+theme.titlebar_maximized_button_focus_inactive  = themes_path.."zachir/titlebar/maximized_focus_inactive.png"
+theme.titlebar_maximized_button_normal_active = themes_path.."zachir/titlebar/maximized_normal_active.png"
+theme.titlebar_maximized_button_focus_active  = themes_path.."zachir/titlebar/maximized_focus_active.png"
+
+local home_dir = os.getenv("HOME")
+theme.wallpaper =  home_dir .. "/background.jpg"
+
+-- You can use your own layout icons like this:
+theme.layout_fairh = themes_path.."zachir/layouts/fairhw.png"
+theme.layout_fairv = themes_path.."zachir/layouts/fairvw.png"
+theme.layout_floating  = themes_path.."zachir/layouts/floatingw.png"
+theme.layout_magnifier = themes_path.."zachir/layouts/magnifierw.png"
+theme.layout_max = themes_path.."zachir/layouts/maxw.png"
+theme.layout_fullscreen = themes_path.."zachir/layouts/fullscreenw.png"
+theme.layout_tilebottom = themes_path.."zachir/layouts/tilebottomw.png"
+theme.layout_tileleft   = themes_path.."zachir/layouts/tileleftw.png"
+theme.layout_tile = themes_path.."zachir/layouts/tilew.png"
+theme.layout_tiletop = themes_path.."zachir/layouts/tiletopw.png"
+theme.layout_spiral  = themes_path.."zachir/layouts/spiralw.png"
+theme.layout_dwindle = themes_path.."zachir/layouts/dwindlew.png"
+theme.layout_cornernw = themes_path.."zachir/layouts/cornernww.png"
+theme.layout_cornerne = themes_path.."zachir/layouts/cornernew.png"
+theme.layout_cornersw = themes_path.."zachir/layouts/cornersww.png"
+theme.layout_cornerse = themes_path.."zachir/layouts/cornersew.png"
+
+-- Generate Awesome icon:
+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
+
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
+--[[ Bling theme variables template
+
+This file has all theme variables of the bling module.
+Every variable has a small comment on what it does.
+You might just want to copy that whole part into your theme.lua and start adjusting from there.
+
+--]]
+-- LuaFormatter off
+-- window swallowing
+theme.parent_filter_list   = { "ampbox.exe", "Brave-browser", "Carla2", "carla", "firefox", "Gimp", "LibreWolf", "Lutris", "MultiMC", "obs", "REAPER", "steam", "xviix64.exe", "yabridge" } -- class names list of parents that should not be swallowed
+theme.child_filter_list    = { "Brave-browser", "Dragon", "librepcb", "LibrePCB", "REAPER", "yabridge" }        -- class names list that should not swallow their parents
+theme.swallowing_filter = true                   -- whether the filters above should be active
+
+-- flash focus
+theme.flash_focus_start_opacity = 0.6 -- the starting opacity
+theme.flash_focus_step = 0.01 -- the step of animation
+
+-- playerctl signal
+theme.playerctl_backend = "playerctl_cli" -- backend to use
+theme.playerctl_ignore = {} -- list of players to be ignored
+theme.playerctl_player = {} -- list of players to be used in priority order
+theme.playerctl_update_on_activity = true -- whether to prioritize the most recently active players or not
+theme.playerctl_position_update_interval = 1 -- the update interval for fetching the position from playerctl
+
+-- tabbed
+theme.tabbed_spawn_in_tab = false -- whether a new client should spawn into the focused tabbing container
+
+-- tabbar general
+theme.tabbar_disable = false -- disable the tab bar entirely
+theme.tabbar_ontop = false
+theme.tabbar_radius = 0 -- border radius of the tabbar
+theme.tabbar_style = "default" -- style of the tabbar ("default", "boxes" or "modern")
+theme.tabbar_font = "mononoki Nerd Font Mono 24" -- font of the tabbar
+theme.tabbar_size = 40 -- size of the tabbar
+theme.tabbar_position = "top" -- position of the tabbar
+theme.tabbar_bg_normal = "#000000" -- background color of the focused client on the tabbar
+theme.tabbar_fg_normal = "#ffffff" -- foreground color of the focused client on the tabbar
+theme.tabbar_bg_focus = "#1A2026" -- background color of unfocused clients on the tabbar
+theme.tabbar_fg_focus = "#ff0000" -- foreground color of unfocused clients on the tabbar
+theme.tabbar_bg_focus_inactive = nil -- background color of the focused client on the tabbar when inactive
+theme.tabbar_fg_focus_inactive = nil -- foreground color of the focused client on the tabbar when inactive
+theme.tabbar_bg_normal_inactive = nil -- background color of unfocused clients on the tabbar when inactive
+theme.tabbar_fg_normal_inactive = nil -- foreground color of unfocused clients on the tabbar when inactive
+
+-- mstab
+theme.mstab_bar_disable = false -- disable the tabbar
+theme.mstab_bar_ontop = false -- whether you want to allow the bar to be ontop of clients
+theme.mstab_dont_resize_slaves = false -- whether the tabbed stack windows should be smaller than the
+-- currently focused stack window (set it to true if you use
+-- transparent terminals. False if you use shadows on solid ones
+theme.mstab_bar_padding = "default" -- how much padding there should be between clients and your tabbar
+-- by default it will adjust based on your useless gaps.
+-- If you want a custom value. Set it to the number of pixels (int)
+theme.mstab_border_radius = 0 -- border radius of the tabbar
+theme.mstab_bar_height = 40 -- height of the tabbar
+theme.mstab_tabbar_position = "top" -- position of the tabbar (mstab currently does not support left,right)
+theme.mstab_tabbar_style = "default" -- style of the tabbar ("default", "boxes" or "modern")
+-- defaults to the tabbar_style so only change if you want a
+-- different style for mstab and tabbed
+
+-- the following variables are currently only for the "modern" tabbar style
+theme.tabbar_color_close = "#f9929b" -- changes the color of the close button
+theme.tabbar_color_min = "#fbdf90" -- changes the color of the minimize button
+theme.tabbar_color_float = "#ccaced" -- changes the color of the float button
+
+-- tag preview widget
+theme.tag_preview_widget_border_radius = 0 -- Border radius of the widget (With AA)
+theme.tag_preview_client_border_radius = 0 -- Border radius of each client in the widget (With AA)
+theme.tag_preview_client_opacity = 0.5 -- Opacity of each client
+theme.tag_preview_client_bg = "#000000" -- The bg color of each client
+theme.tag_preview_client_border_color = "#ffffff" -- The border color of each client
+theme.tag_preview_client_border_width = 3 -- The border width of each client
+theme.tag_preview_widget_bg = "#000000" -- The bg color of the widget
+theme.tag_preview_widget_border_color = "#ffffff" -- The border color of the widget
+theme.tag_preview_widget_border_width = 3 -- The border width of the widget
+theme.tag_preview_widget_margin = 0 -- The margin of the widget
+
+-- task preview widget
+theme.task_preview_widget_border_radius = 0 -- Border radius of the widget (With AA)
+theme.task_preview_widget_bg = "#000000" -- The bg color of the widget
+theme.task_preview_widget_border_color = "#ffffff" -- The border color of the widget
+theme.task_preview_widget_border_width = 3 -- The border width of the widget
+theme.task_preview_widget_margin = 0 -- The margin of the widget
+
+-- window switcher
+theme.window_switcher_widget_bg = "#000000" -- The bg color of the widget
+theme.window_switcher_widget_border_width = 3 -- The border width of the widget
+theme.window_switcher_widget_border_radius = 0 -- The border radius of the widget
+theme.window_switcher_widget_border_color = "#ffffff" -- The border color of the widget
+theme.window_switcher_clients_spacing = 20 -- The space between each client item
+theme.window_switcher_client_icon_horizontal_spacing = 5 -- The space between client icon and text
+theme.window_switcher_client_width = 150 -- The width of one client widget
+theme.window_switcher_client_height = 250 -- The height of one client widget
+theme.window_switcher_client_margins = 10 -- The margin between the content and the border of the widget
+theme.window_switcher_thumbnail_margins = 10 -- The margin between one client thumbnail and the rest of the widget
+theme.thumbnail_scale = false -- If set to true, the thumbnails fit policy will be set to "fit" instead of "auto"
+theme.window_switcher_name_margins = 10 -- The margin of one clients title to the rest of the widget
+theme.window_switcher_name_valign = "center" -- How to vertically align one clients title
+theme.window_switcher_name_forced_width = 200 -- The width of one title
+theme.window_switcher_name_font = "Sans 11" -- The font of all titles
+theme.window_switcher_name_normal_color = "#ffffff" -- The color of one title if the client is unfocused
+theme.window_switcher_name_focus_color = "#ff0000" -- The color of one title if the client is focused
+theme.window_switcher_icon_valign = "center" -- How to vertically align the one icon
+theme.window_switcher_icon_width = 40 -- The width of one icon
+
+-- LuaFormatter on
+return theme
+
diff --git a/awesome/themes/zachir/titlebar/close_focus.png b/awesome/themes/zachir/titlebar/close_focus.png
new file mode 100644
index 0000000..01ef825
--- /dev/null
+++ b/awesome/themes/zachir/titlebar/close_focus.png
diff --git a/awesome/themes/zachir/titlebar/close_normal.png b/awesome/themes/zachir/titlebar/close_normal.png
new file mode 100644
index 0000000..5448ed8
--- /dev/null
+++ b/awesome/themes/zachir/titlebar/close_normal.png
diff --git a/awesome/themes/zachir/titlebar/floating_focus_active.png b/awesome/themes/zachir/titlebar/floating_focus_active.png
new file mode 100644
index 0000000..82dcc7c
--- /dev/null
+++ b/awesome/themes/zachir/titlebar/floating_focus_active.png
diff --git a/awesome/themes/zachir/titlebar/floating_focus_inactive.png b/awesome/themes/zachir/titlebar/floating_focus_inactive.png
new file mode 100644
index 0000000..c19ba80
--- /dev/null
+++ b/awesome/themes/zachir/titlebar/floating_focus_inactive.png
diff --git a/awesome/themes/zachir/titlebar/floating_normal_active.png b/awesome/themes/zachir/titlebar/floating_normal_active.png
new file mode 100644
index 0000000..62342d1
--- /dev/null
+++ b/awesome/themes/zachir/titlebar/floating_normal_active.png
diff --git a/awesome/themes/zachir/titlebar/floating_normal_inactive.png b/awesome/themes/zachir/titlebar/floating_normal_inactive.png
new file mode 100644
index 0000000..e2bbdfa
--- /dev/null
+++ b/awesome/themes/zachir/titlebar/floating_normal_inactive.png
diff --git a/awesome/themes/zachir/titlebar/maximized_focus_active.png b/awesome/themes/zachir/titlebar/maximized_focus_active.png
new file mode 100644
index 0000000..d7dffd7
--- /dev/null
+++ b/awesome/themes/zachir/titlebar/maximized_focus_active.png
diff --git a/awesome/themes/zachir/titlebar/maximized_focus_inactive.png b/awesome/themes/zachir/titlebar/maximized_focus_inactive.png
new file mode 100644
index 0000000..844389f
--- /dev/null
+++ b/awesome/themes/zachir/titlebar/maximized_focus_inactive.png
diff --git a/awesome/themes/zachir/titlebar/maximized_normal_active.png b/awesome/themes/zachir/titlebar/maximized_normal_active.png
new file mode 100644
index 0000000..a705f81
--- /dev/null
+++ b/awesome/themes/zachir/titlebar/maximized_normal_active.png
diff --git a/awesome/themes/zachir/titlebar/maximized_normal_inactive.png b/awesome/themes/zachir/titlebar/maximized_normal_inactive.png
new file mode 100644
index 0000000..4c1ab1f
--- /dev/null
+++ b/awesome/themes/zachir/titlebar/maximized_normal_inactive.png
diff --git a/awesome/themes/zachir/titlebar/minimize_focus.png b/awesome/themes/zachir/titlebar/minimize_focus.png
new file mode 100644
index 0000000..caaceb2
--- /dev/null
+++ b/awesome/themes/zachir/titlebar/minimize_focus.png
diff --git a/awesome/themes/zachir/titlebar/minimize_normal.png b/awesome/themes/zachir/titlebar/minimize_normal.png
new file mode 100644
index 0000000..36621d0
--- /dev/null
+++ b/awesome/themes/zachir/titlebar/minimize_normal.png
diff --git a/awesome/themes/zachir/titlebar/ontop_focus_active.png b/awesome/themes/zachir/titlebar/ontop_focus_active.png
new file mode 100644
index 0000000..312c00b
--- /dev/null
+++ b/awesome/themes/zachir/titlebar/ontop_focus_active.png
diff --git a/awesome/themes/zachir/titlebar/ontop_focus_inactive.png b/awesome/themes/zachir/titlebar/ontop_focus_inactive.png
new file mode 100644
index 0000000..a48e1c5
--- /dev/null
+++ b/awesome/themes/zachir/titlebar/ontop_focus_inactive.png
diff --git a/awesome/themes/zachir/titlebar/ontop_normal_active.png b/awesome/themes/zachir/titlebar/ontop_normal_active.png
new file mode 100644
index 0000000..117a203
--- /dev/null
+++ b/awesome/themes/zachir/titlebar/ontop_normal_active.png
diff --git a/awesome/themes/zachir/titlebar/ontop_normal_inactive.png b/awesome/themes/zachir/titlebar/ontop_normal_inactive.png
new file mode 100644
index 0000000..d3a10c8
--- /dev/null
+++ b/awesome/themes/zachir/titlebar/ontop_normal_inactive.png
diff --git a/awesome/themes/zachir/titlebar/sticky_focus_active.png b/awesome/themes/zachir/titlebar/sticky_focus_active.png
new file mode 100644
index 0000000..814499b
--- /dev/null
+++ b/awesome/themes/zachir/titlebar/sticky_focus_active.png
diff --git a/awesome/themes/zachir/titlebar/sticky_focus_inactive.png b/awesome/themes/zachir/titlebar/sticky_focus_inactive.png
new file mode 100644
index 0000000..21b000d
--- /dev/null
+++ b/awesome/themes/zachir/titlebar/sticky_focus_inactive.png
diff --git a/awesome/themes/zachir/titlebar/sticky_normal_active.png b/awesome/themes/zachir/titlebar/sticky_normal_active.png
new file mode 100644
index 0000000..bdb5595
--- /dev/null
+++ b/awesome/themes/zachir/titlebar/sticky_normal_active.png
diff --git a/awesome/themes/zachir/titlebar/sticky_normal_inactive.png b/awesome/themes/zachir/titlebar/sticky_normal_inactive.png
new file mode 100644
index 0000000..a96b9b1
--- /dev/null
+++ b/awesome/themes/zachir/titlebar/sticky_normal_inactive.png
diff --git a/sxhkd/sxhkdrc b/sxhkd/sxhkdrc
new file mode 100755
index 0000000..1c10dfe
--- /dev/null
+++ b/sxhkd/sxhkdrc
@@ -0,0 +1,140 @@
+#
+# wm independent hotkeys
+#
+
+# reload sxhkd config
+super + Escape
+        pkill -USR1 -x sxhkd
+
+#
+# dmenu interfaces
+#
+
+# program launcher
+super + d
+        dmenu_run -i -l 15 -h 36 -fn 'mononoki Nerd Font Mono' -nb '#000' -nf '#c5c8c6' -sb '#198844' -sf '#000'
+
+# desktop application launcher
+super + r
+        j4-dmenu-desktop --dmenu="dmenu -i -l 15 -h 36 -fn 'mononoki Nerd Font Mono' -nb '#000' -nf '#c5c8c6' -sb '#198844' -sf '#000'"
+
+# dmenu prompt for recording
+super + control + r
+        dmenurecord
+
+# run dmenu interface for pass
+super + alt + p
+        passmenu
+
+# run dmenu interface for ytfzf
+super + y
+        ytfzf-launcher -D 'dmenu -l 15'
+
+# run dmenu interface to spawn browsers
+super + alt + 1
+        bm
+
+# run dmenu interface for qutebrowser profile chooser
+super + alt + q
+        qbc
+	#qbpm choose
+
+# run dmenu interface for librewolf profile chooser
+super + alt + w
+        lwc
+
+# run dmenu interface for mpris
+super + alt + u
+        mprisctl
+
+# run dmenu interface for mount
+super + alt + comma
+        dmount
+
+# run dmenu interface for umount
+super + alt + period
+        dmenuumount
+
+#run dmenu prompt for unicode chars
+super + alt + u
+        dmenuunicode
+
+#
+# utilities
+#
+
+# get xprop
+super + grave
+        notifyprop
+
+# warp cursor to left or right monitor
+super + {Left,Right}
+        mwarp.py {left,right}
+
+# lock the screen
+super + q
+	loginctl lock-session self
+
+# spawn file manager
+super + alt + f
+        kitty lfrun
+
+# toggle touchpad
+super + alt + t
+        toggletouchpad
+
+# notify-send firewall rules
+super + alt + f
+        notify-iptables
+
+# mute volume
+super + alt + m
+        volsv -t
+
+# mute microphone
+super + alt + shift + m
+        volsv -m
+
+# load nsxiv for backgrounds
+super + alt + x
+        nsxiv ~/.local/src/wallpapers
+
+# xkill
+super + x
+	xkill
+
+# pause mpd
+alt + p
+        playerctl play-pause
+
+#
+# xf86 keys
+#
+
+# manipulate audio stream
+XF86Audio{Prev,Next,Play,Stop}
+	playerctl {previous,next,play-pause,stop}
+
+# turn the brightness up
+XF86MonBrightnessUp
+        bl -i 1
+
+# turn the brightness down
+XF86MonBrightnessDown
+        bl -d 1
+
+# raise the volume
+XF86AudioRaiseVolume
+	volsv -i
+
+# lower the volume
+XF86AudioLowerVolume
+	volsv -d
+
+# toggle mute
+XF86AudioMute
+	volsv -t
+
+# mute mic
+XF86AudioMicMute
+	volsv -m
diff --git a/waybar/config b/waybar/config
deleted file mode 100644
index b248946..0000000
--- a/waybar/config
+++ /dev/null
@@ -1,157 +0,0 @@
-{
-    "layer": "top",
-    "position": "top",
-    "height": 36,
-    //"output": "%%DISPLAY%%",
-    "spacing": 4,
-    //"margin-top": 5,
-    //"margin-bottom":5,
-
-    // Choose the order of the modules
-
-    "modules-left":[ "wlr/workspaces", "custom/launcher", "hyprland/window"],
-    "modules-center":[],
-    "modules-right":[ "mpd", "idle_inhibitor", "pulseaudio", "cpu", "memory", "temperature#cpu", "temperature#gpu", "backlight",  "network", "clock", "tray", "custom/power"],
-
-    // Modules configuration
-
-    "wlr/workspaces": {
-      "format": "{name}",
-      "active-only": false,
-      "all-outputs": true,
-      "on-scroll-up": "hyprctl dispatch workspace e+1",
-      "on-scroll-down": "hyprctl dispatch workspace e-1",
-      "on-click": "activate"
-    },
-    "hyprland/window": {
-      "separate-outputs": true,
-      "format": "{}"
-    },
-    "keyboard-state": {
-        "numlock": true,
-        "capslock": true,
-        "format": " {name} {icon}",
-        "format-icons": {
-            "locked": "",
-            "unlocked": ""
-        }
-    },
-    "mpd": {
-      "format": "{artist} - {title}",
-      "format-stopped": "",
-      "format-paused": "{artist} - {title}",
-      "format-disconnected": "",
-      "artist-len": 15,
-      "title-len": 15,
-      //"album-len": 15,
-      //"max-length": 200,
-      "on-click": "mpc toggle"
-    },
-    "idle_inhibitor": {
-        "format": "{icon}",
-        "format-icons": {
-            "activated": "",
-            "deactivated": ""
-        }
-    },
-    "tray": {
-        "icon-size": 20,
-        "spacing": 10
-    },
-    "clock": {
-        // "timezone": "America/New_York",
-        "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
-        "format-alt": "{:%Y-%m-%d}"
-    },
-    "cpu": {
-        "format": "{usage}% ",
-        "tooltip": false
-    },
-    "memory": {
-        "format": "{}% "
-    },
-    "temperature#cpu": {
-        // "thermal-zone": 2,
-        "hwmon-path": "/sys/class/hwmon/hwmon2/temp3_input",
-        "critical-threshold": 80,
-        // "format-critical": "{temperatureC}°C {icon}",
-        "format": "CPU {temperatureC}°C",
-        "format-icons": ["", "", ""]
-    },
-    "temperature#gpu": {
-        // "thermal-zone": 2,
-        "hwmon-path": "/sys/class/hwmon/hwmon1/temp2_input",
-        "critical-threshold": 110,
-        // "format-critical": "{temperatureC}°C {icon}",
-        "format": "GPU {temperatureC}°C",
-        "format-icons": ["", "", ""]
-    },
-    "backlight": {
-        // "device": "acpi_video1",
-        "format": "{percent}%"
-        //"format-icons": ["", ""]
-    },
-    "battery": {
-        "states": {
-            // "good": 95,
-            "warning": 30,
-            "critical": 15
-        },
-        "format": "{capacity}%",
-        "format-charging": "{capacity}% +",
-        "format-plugged": "{capacity}% =",
-        "format-alt": "{time}",
-        // "format-good": "", // An empty format will hide the module
-        // "format-full": "",
-        //"format-icons": ["", "", "", "", ""]
-    },
-    "battery#bat0": {
-        "bat": "BAT0"
-    },
-    "battery#bat1": {
-        "bat": "BAT1"
-    },
-    "network": {
-        // "interface": "wlp2*", // (Optional) To force the use of this interface
-        "format-wifi": "{essid} ({signalStrength}%) ",
-        "format-ethernet": "Connected  ",
-        "tooltip-format": "{ifname} via {gwaddr} ",
-        "format-linked": "{ifname} (No IP) ",
-        "format-disconnected": "Disconnected ⚠",
-        "format-alt": "{ifname}: {ipaddr}/{cidr}",
-        "on-click-right": "bash ~/.config/rofi/wifi_menu/rofi_wifi_menu"
-    },
-    "pulseaudio": {
-        // "scroll-step": 1, // %, can be a float
-        "format": "{volume}% {icon}",
-        "format-bluetooth": "{volume}% {icon}",
-        "format-bluetooth-muted": "{icon} {format_source}",
-        "format-muted": "{format_source}",
-        "format-source": "",
-        "format-source-muted": "",
-        "format-icons": {
-            "headphone": "",
-            "hands-free": "",
-            "headset": "",
-            "phone": "",
-            "portable": "",
-            "car": "",
-            "default": ["", "", ""]
-        },
-        "on-click": "pavucontrol"
-    },
-    "custom/launcher":{
-        "format": "",
-        "on-click": "exec $(tofi-drun)",
-        "on-click-right": "killall tofi"
-    },
-    "custom/power":{
-        "format": "  ",
-        "on-click": "nwg-bar",
-        "on-click-right": "killall nwg-bar"
-    },
-    "custom/snip":{
-        "format": " ",
-        "on-click": "grimshot --notify save area $HOME/Pictures/$(zenity --entry --text 'Set filename:' --entry-text '.png')"
-    }
-}
diff --git a/waybar/style.css b/waybar/style.css
deleted file mode 100644
index ee6e8e4..0000000
--- a/waybar/style.css
+++ /dev/null
@@ -1,323 +0,0 @@
-* {
-    border: 0px;
-    margin: 0px;
-    border-radius: 0px;
-    /* `otf-font-awesome` is required to be installed for icons */
-    font-family: mononoki Nerd Font Mono;
-    font-size: 18px;
-    min-height: 0px;
-    min-width: 0px;
-}
-
-window#waybar {
-    background-color: transparent;
-    color: #ffffff;
-    transition-property: background-color;
-    transition-duration: .5s;
-}
-
-window#waybar.hidden {
-    opacity: 0.2;
-}
-
-
-/*
-#workspaces button {
-    background: #1f1f1f;
-    color: #ffffff;
-    border-radius: 20px;
-}
-*/
-
-/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
-
-#workspaces button {
-    background: #333333;
-    color: white;
-    border-bottom: 3px solid #1b1d1c;
-}
-
-/*
-#workspaces button:hover {
-    background: #39c1ed;
-    color: black;
-    border-bottom: 3px solid #ffffff;
-
-}
-*/
-
-#workspaces button.active {
-    background: #39c1ed;
-    color: black;
-}
-
-/*
-#workspaces button.active:hover {
-    background: #39c1ed;
-    color: black;
-    border-bottom: 3px solid #ffffff;
-}
-*/
-
-#workspaces button.urgent {
-    background-color: #eb4d4b;
-}
-
-#mode {
-    background-color: #64727D;
-    border-bottom: 3px solid #ffffff;
-}
-
-#clock,
-#battery,
-#cpu,
-#memory,
-#disk,
-#temperature,
-#backlight,
-#network,
-#pulseaudio,
-#custom-media,
-#custom-launcher,
-#custom-power,
-#custom-layout,
-#custom-updater,
-#custom-snip,
-#custom-wallpaper,
-#tags,
-#taskbar,
-#tray,
-#mode,
-#idle_inhibitor,
-#mpd {
-    padding: 0px 9px;
-    margin: 0px;
-    color: #ffffff;
-}
-
-#window,
-#workspaces {
-    margin: 0px 4px;
-}
-
-/* If workspaces is the leftmost module, omit left margin */
-.modules-left > widget:first-child > #workspaces {
-    margin-left: 0px;
-}
-
-/* If workspaces is the rightmost module, omit right margin */
-.modules-right > widget:last-child > #workspaces {
-    margin-right: 0px;
-}
-
-#clock {
-    background-color: #1b1d1c;
-    color: #ffffff;
-}
-
-#battery {
-    background-color: #1b1d1c;
-    color: #ffffff;
-}
-
-#battery.charging, #battery.plugged {
-    color: #26A65B;
-    background-color: #1b1d1c;
-}
-
-@keyframes blink {
-    to {
-        background-color: #ffffff;
-        color: #000000;
-    }
-}
-
-#battery.critical:not(.charging) {
-    background-color: #f53c3c;
-    color: #ffffff;
-    animation-name: blink;
-    animation-duration: 0.5s;
-    animation-timing-function: linear;
-    animation-iteration-count: infinite;
-    animation-direction: alternate;
-}
-
-label:focus {
-    background-color: #000000;
-}
-
-#cpu {
-    background-color: #1b1d1c;
-    color: #ffffff;
-}
-
-#memory {
-    background-color: #39c1ed;
-    color: black;
-}
-
-#disk {
-    background-color: #1b1d1c;
-    color: #ffffff;
-}
-
-#backlight {
-    background-color: #39c1ed;
-    color: black;
-}
-
-#network {
-    background-color: #39c1ed;
-    color: black;
-}
-
-#network.disconnected {
-    background-color: #1b1d1c;
-    color: #ffffff;
-}
-
-#pulseaudio {
-    background-color: #39c1ed;
-    color: black;
-}
-
-#pulseaudio.muted {
-    background-color: black;
-    color: #39c1ed;
-}
-
-#custom-media {
-    background-color: #1b1d1c;
-    color: white;
-}
-
-#custom-media.custom-spotify {
-    background-color: #1b1d1c;
-    color: white;
-
-}
-
-#custom-media.custom-vlc {
-    background-color: #1b1d1c;
-    color: white;
-}
-
-#custom-power{
-    background-color: #1b1d1c;
-    font-size: 18px;
-    margin-right: 5px;
-
-}
-
-#custom-launcher{
-    background-color: #1b1d1c;
-    font-size: 20px;
-    margin-left: 5px;
-
-}
-
-#custom-layout{
-    background-color: #1b1d1c;
-    color: white;
-    font-size:20px;
-}
-
-#custom-updater {
-    background-color: #1b1d1c;
-    color: white;
-}
-
-#custom-snip {
-    background-color: #1b1d1c;
-    color: skyblue;
-    font-size: 20px;
-}
-
-#custom-wallpaper {
-    background-color: #1b1d1c;
-    color: pink;
-    font-size: 20px;
-}
-
-#tags{
-    background-color: #1b1d1c;
-    font-size: 20px;
-}
-
-#tags button.occupied {
-    color: skyblue;
-    background-color: #272727;
-}
-#tags button.focused {
-    color: black;
-    background-color: white;
-}
-#tags button.urgent{
-    color: red;
-    background-color:white;
-}
-
-
-#taskbar{
-    background-color: #1b1d1c;
-    border-radius: 0px 20px 20px 0px;
-}
-
-#temperature {
-    background-color: #1b1d1c;
-    color: #ffffff;
-}
-
-#temperature.critical {
-    background-color: #eb4d4b;
-}
-
-#tray {
-    background-color: #39c1ed;
-    color: black;
-}
-
-#tray > .passive {
-    -gtk-icon-effect: dim;
-    background-color: #39c1ed;
-    color: black;
-}
-
-#tray > .needs-attention {
-    -gtk-icon-effect: highlight;
-    background-color: #39c1ed;
-    color: black;
-}
-
-#idle_inhibitor {
-    background-color: #1b1d1c;
-    border-radius: 20px 0px 0px 20px;
-
-}
-
-#idle_inhibitor.activated {
-    background-color: #39c1ed;
-    color: black;
-    border-radius: 20px 0px 0px 20px;
-
-}
-
-#language {
-    background-color: #1b1d1c;
-    color: #ffffff;
-    min-width: 16px;
-}
-
-#keyboard-state {
-    background: #97e1ad;
-    color: #000000;
-    min-width: 16px;
-}
-
-#keyboard-state > label {
-    padding: 0px 5px;
-}
-
-#keyboard-state > label.locked {
-    background: rgba(0, 0, 0, 0.2);
-}