Merge branch 'master' into arch-laptop

config/.bashrc

@@ -125,7 +125,7 @@ fi
 # You may want to put all your additions into a separate file like
 # ~/.bash_aliases, instead of adding them here directly.
 # See /usr/share/doc/bash-doc/examples in the bash-doc package.
-export EDITOR='kak'
+export EDITOR='nvim'
 
 if [ -f ~/.bash_aliases ]; then
     . ~/.bash_aliases
@@ -171,4 +171,4 @@ alias ssh='TERM="xterm-256color" ssh'
 
 export DISABLE_TELEMETRY=YES
 
-[ -f "/home/mikec/.ghcup/env" ] && . "/home/mikec/.ghcup/env" # ghcup-env
+[ -f "/home/mikec/.ghcup/env" ] && . "/home/mikec/.ghcup/env" # ghcup-env

config/.config/awesome/rc.lua

@@ -0,0 +1,617 @@
+-- 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")
+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.
+beautiful.init("/home/mikec/" .. ".config/awesome/theme.lua")
+
+function border_adjust(c)
+    if #c.screen.clients == 1 then
+        c.border_width = 0
+    elseif #c.screen.clients > 1 then
+        c.border_width = beautiful.border_width
+        c.border_color = beautiful.border_focus
+    end
+end
+
+-- No gaps if only one window on screen
+-- function gap_adjust(c)
+--     if #c.screen.clients == 1 then
+--         beautiful.useless_gap = 0
+--     elseif #c.screen.clients > 1 then
+--         beautiful.useless_gap = 3
+--     end
+-- end
+
+client.connect_signal("focus", border_adjust)
+-- client.connect_signal("focus", gap_adjust)
+-- This is used later as the default terminal and editor to run.
+terminal = "st"
+editor = os.getenv("EDITOR") or "nvim"
+editor_cmd = terminal .. " -e " .. editor
+
+-- 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.tile,
+    awful.layout.suit.floating,
+    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,
+}
+-- }}}
+
+-- {{{ 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("%a %b %d %I:%M:%S ", 1)
+
+-- 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,
+        widget_template = {
+            {
+                {
+                    {
+                        {
+                            id     = 'text_role',
+                            widget = wibox.widget.textbox,
+                        },
+                        layout = wibox.layout.fixed.horizontal,
+                    },
+                    widget = wibox.container.place,
+                },
+                forced_width = 18,
+                widget = wibox.container.margin
+            },
+
+            id     = 'background_role',
+            widget = wibox.container.background,
+
+        },
+    }
+
+    -- Create a tasklist widget
+    s.mytasklist = awful.widget.tasklist {
+        screen  = s,
+        filter  = awful.widget.tasklist.filter.currenttags,
+        buttons = tasklist_buttons,
+    }
+
+    -- Create the wibox
+    s.mywibox = awful.wibar({ position = "top", screen = s, height = 18})
+    num = 0
+    s.mytextbox = wibox.widget({widget=wibox.widget.textbox, text='testbox' .. num})
+    gears.timer {
+        timeout = 1,
+        call_now = true,
+        autostart = true,
+        callback = function()
+            num = num + 1
+            s.mytextbox.text = "testbox" .. num
+        end
+    }
+    -- Add widgets to the wibox
+    s.mywibox:setup {
+        layout = wibox.layout.align.horizontal,
+        { -- Left widgets
+            layout = wibox.layout.fixed.horizontal,
+            -- mylauncher,
+            s.mytaglist,
+            s.mylayoutbox,
+            s.mypromptbox,
+        },
+        s.mytasklist, -- Middle widget
+        { -- Right widgets
+            layout = wibox.layout.fixed.horizontal,
+            mykeyboardlayout,
+            wibox.widget.systray(),
+            mytextclock,
+            s.mytextbox,
+        },
+    }
+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)
+))
+-- }}}
+
+-- {{{ Key bindings
+globalkeys = gears.table.join(
+    awful.key({ modkey,           }, "b",      function() for s in screen do s.mywibox.visible = not s.mywibox.visible end end,
+              {description="toggle bar", group="awesome"}),
+    awful.key({ modkey,           }, "s",      hotkeys_popup.show_help,
+              {description="show help", group="awesome"}),
+    awful.key({ modkey,           }, "Left",   awful.tag.viewprev,
+              {description = "view previous", group = "tag"}),
+    awful.key({ modkey,           }, "Right",  awful.tag.viewnext,
+              {description = "view next", group = "tag"}),
+    awful.key({ modkey,           }, "Escape", awful.tag.history.restore,
+              {description = "go back", group = "tag"}),
+
+    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"}
+    ),
+    awful.key({ modkey,           }, "w", function () mymainmenu:show() end,
+              {description = "show main menu", group = "awesome"}),
+
+    -- Layout manipulation
+    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"}),
+    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"}),
+    awful.key({ modkey,           }, "u", awful.client.urgent.jumpto,
+              {description = "jump to urgent client", group = "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"}),
+
+    -- Standard program
+    awful.key({ modkey,           }, "Return", function () awful.spawn(terminal) end,
+              {description = "open a terminal", group = "launcher"}),
+    awful.key({ modkey, "Shift"   }, "r", awesome.restart,
+              {description = "reload awesome", group = "awesome"}),
+    awful.key({ modkey, "Shift"   }, "q", awesome.quit,
+              {description = "quit awesome", group = "awesome"}),
+
+    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"}),
+    awful.key({ modkey, "Shift"   }, "h",     function () awful.tag.incnmaster( 1, nil, true) end,
+              {description = "increase the 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"}),
+    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"}),
+    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"}),
+
+    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"}),
+
+    -- Prompt
+    awful.key({ modkey },            "r",     function () awful.screen.focused().mypromptbox:run() end,
+              {description = "run prompt", group = "launcher"}),
+
+    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"}),
+    -- Menubar
+    awful.key({ modkey }, "p", function() awful.spawn('dmenu_run') end,
+              {description = "show the menubar", group = "launcher"})
+)
+
+clientkeys = gears.table.join(
+    awful.key({ modkey,           }, "f",
+        function (c)
+            c.fullscreen = not c.fullscreen
+            c:raise()
+        end,
+        {description = "toggle fullscreen", group = "client"}),
+    awful.key({ modkey, "Shift"   }, "c",      function (c) c:kill()                         end,
+              {description = "close", group = "client"}),
+    awful.key({ modkey, "Control" }, "space",  awful.client.floating.toggle                     ,
+              {description = "toggle floating", group = "client"}),
+    awful.key({ modkey, "Control" }, "Return", function (c) c:swap(awful.client.getmaster()) end,
+              {description = "move to master", group = "client"}),
+    awful.key({ modkey,           }, "o",      function (c) c:move_to_screen()               end,
+              {description = "move to screen", group = "client"}),
+    awful.key({ modkey,           }, "t",      function (c) c.ontop = not c.ontop            end,
+              {description = "toggle keep on top", group = "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"}),
+    awful.key({ modkey,           }, "m",
+        function (c)
+            c.maximized = not c.maximized
+            c:raise()
+        end ,
+        {description = "(un)maximize", group = "client"}),
+    awful.key({ modkey, "Control" }, "m",
+        function (c)
+            c.maximized_vertical = not c.maximized_vertical
+            c:raise()
+        end ,
+        {description = "(un)maximize vertically", group = "client"}),
+    awful.key({ modkey, "Shift"   }, "m",
+        function (c)
+            c.maximized_horizontal = not c.maximized_horizontal
+            c:raise()
+        end ,
+        {description = "(un)maximize horizontally", group = "client"})
+)
+
+-- 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
+
+clientbuttons = gears.table.join(
+    awful.button({ }, 1, function (c)
+        c:emit_signal("request::activate", "mouse_click", {raise = true})
+    end),
+    awful.button({ modkey }, 1, function (c)
+        c:emit_signal("request::activate", "mouse_click", {raise = true})
+        awful.mouse.client.move(c)
+    end),
+    awful.button({ modkey }, 3, function (c)
+        c:emit_signal("request::activate", "mouse_click", {raise = true})
+        awful.mouse.client.resize(c)
+    end)
+)
+
+-- 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 = clientkeys,
+                     buttons = clientbuttons,
+                     screen = awful.screen.preferred,
+                     placement = awful.placement.no_overlap+awful.placement.no_offscreen
+     }
+    },
+
+    -- Floating clients.
+    { rule_any = {
+        instance = {
+          "DTA",  -- Firefox addon DownThemAll.
+          "copyq",  -- Includes session name in class.
+          "pinentry",
+        },
+        class = {
+          "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 = false }
+    },
+
+    -- Set Firefox to always map on the tag named "2" on screen 1.
+    -- { rule = { class = "Firefox" },
+    --   properties = { screen = 1, tag = "2" } },
+}
+-- }}}
+
+-- {{{ Signals
+-- Signal function to execute when a new client appears.
+client.connect_signal("manage", function (c)
+    -- Set the windows at the slave,
+    -- i.e. put it at the end of others instead of setting it master.
+    -- if not awesome.startup then awful.client.setslave(c) end
+
+    if awesome.startup
+      and not c.size_hints.user_position
+      and not c.size_hints.program_position then
+        -- Prevent clients from being unreachable after screen count changes.
+        awful.placement.no_offscreen(c)
+    end
+end)
+
+-- Add a titlebar if titlebars_enabled is set to true in the rules.
+client.connect_signal("request::titlebars", function(c)
+    -- buttons for the titlebar
+    local buttons = gears.table.join(
+        awful.button({ }, 1, function()
+            c:emit_signal("request::activate", "titlebar", {raise = true})
+            awful.mouse.client.move(c)
+        end),
+        awful.button({ }, 3, function()
+            c:emit_signal("request::activate", "titlebar", {raise = true})
+            awful.mouse.client.resize(c)
+        end)
+    )
+
+    awful.titlebar(c) : setup {
+        { -- Left
+            awful.titlebar.widget.iconwidget(c),
+            buttons = buttons,
+            layout  = wibox.layout.fixed.horizontal
+        },
+        { -- Middle
+            { -- Title
+                align  = "center",
+                widget = awful.titlebar.widget.titlewidget(c)
+            },
+            buttons = buttons,
+            layout  = wibox.layout.flex.horizontal
+        },
+        { -- Right
+            awful.titlebar.widget.floatingbutton (c),
+            awful.titlebar.widget.maximizedbutton(c),
+            awful.titlebar.widget.stickybutton   (c),
+            awful.titlebar.widget.ontopbutton    (c),
+            awful.titlebar.widget.closebutton    (c),
+            layout = wibox.layout.fixed.horizontal()
+        },
+        layout = wibox.layout.align.horizontal
+    }
+end)
+
+-- Enable sloppy focus, so that focus follows mouse.
+client.connect_signal("mouse::enter", function(c)
+    c:emit_signal("request::activate", "mouse_enter", {raise = false})
+end)
+
+client.connect_signal("focus", function(c) c.border_color = beautiful.border_focus end)
+client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_normal end)
+-- }}}

config/.config/awesome/theme.lua

@@ -0,0 +1,132 @@
+---------------------------
+-- Default awesome theme --
+---------------------------
+
+local theme_assets = require("beautiful.theme_assets")
+local xresources = require("beautiful.xresources")
+local dpi = xresources.apply_dpi
+
+local gfs = require("gears.filesystem")
+local themes_path = gfs.get_themes_dir()
+
+local theme = {}
+local xtheme = xresources.get_current_theme()
+theme.font          = "Olympe Mono Hacked 10"
+
+theme.bg_normal     = xtheme.color0
+theme.bg_focus      = xtheme.color4
+theme.bg_urgent     = xtheme.color13
+theme.bg_minimize   = xtheme.color1
+theme.bg_systray    = theme.bg_normal
+
+theme.fg_normal     = xtheme.color4
+theme.fg_focus      = xtheme.color0
+theme.fg_urgent     = xtheme.color15
+theme.fg_minimize   = xtheme.color1
+
+theme.useless_gap   = dpi(0)
+theme.border_width  = dpi(1)
+theme.border_normal = xtheme.color0
+theme.border_focus  = xtheme.color8
+theme.border_marked = xtheme.color15
+theme.gap_single_client = false
+-- 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, xtheme.color0
+)
+theme.taglist_squares_unsel = theme_assets.taglist_squares_unsel(
+    taglist_square_size, theme.fg_normal
+)
+
+-- Variables set for theming notifications:
+-- notification_font
+-- notification_[bg|fg]
+-- notification_[width|height|margin]
+-- notification_[border_color|border_width|shape|opacity]
+
+-- Variables set for theming the menu:
+-- menu_[bg|fg]_[normal|focus]
+-- menu_[border_color|border_width]
+theme.menu_submenu_icon = themes_path.."default/submenu.png"
+theme.menu_height = dpi(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.."default/titlebar/close_normal.png"
+theme.titlebar_close_button_focus  = themes_path.."default/titlebar/close_focus.png"
+
+theme.titlebar_minimize_button_normal = themes_path.."default/titlebar/minimize_normal.png"
+theme.titlebar_minimize_button_focus  = themes_path.."default/titlebar/minimize_focus.png"
+
+theme.titlebar_ontop_button_normal_inactive = themes_path.."default/titlebar/ontop_normal_inactive.png"
+theme.titlebar_ontop_button_focus_inactive  = themes_path.."default/titlebar/ontop_focus_inactive.png"
+theme.titlebar_ontop_button_normal_active = themes_path.."default/titlebar/ontop_normal_active.png"
+theme.titlebar_ontop_button_focus_active  = themes_path.."default/titlebar/ontop_focus_active.png"
+
+theme.titlebar_sticky_button_normal_inactive = themes_path.."default/titlebar/sticky_normal_inactive.png"
+theme.titlebar_sticky_button_focus_inactive  = themes_path.."default/titlebar/sticky_focus_inactive.png"
+theme.titlebar_sticky_button_normal_active = themes_path.."default/titlebar/sticky_normal_active.png"
+theme.titlebar_sticky_button_focus_active  = themes_path.."default/titlebar/sticky_focus_active.png"
+
+theme.titlebar_floating_button_normal_inactive = themes_path.."default/titlebar/floating_normal_inactive.png"
+theme.titlebar_floating_button_focus_inactive  = themes_path.."default/titlebar/floating_focus_inactive.png"
+theme.titlebar_floating_button_normal_active = themes_path.."default/titlebar/floating_normal_active.png"
+theme.titlebar_floating_button_focus_active  = themes_path.."default/titlebar/floating_focus_active.png"
+
+theme.titlebar_maximized_button_normal_inactive = themes_path.."default/titlebar/maximized_normal_inactive.png"
+theme.titlebar_maximized_button_focus_inactive  = themes_path.."default/titlebar/maximized_focus_inactive.png"
+theme.titlebar_maximized_button_normal_active = themes_path.."default/titlebar/maximized_normal_active.png"
+theme.titlebar_maximized_button_focus_active  = themes_path.."default/titlebar/maximized_focus_active.png"
+
+-- theme.wallpaper = themes_path.."default/background.png"
+theme.wallpaper = os.getenv("HOME") .. "Pictures/wallpapers/wallpaper"
+
+-- You can use your own layout icons like this:
+theme.layout_fairh = themes_path.."default/layouts/fairhw.png"
+theme.layout_fairv = themes_path.."default/layouts/fairvw.png"
+theme.layout_floating  = themes_path.."default/layouts/floatingw.png"
+theme.layout_magnifier = themes_path.."default/layouts/magnifierw.png"
+theme.layout_max = themes_path.."default/layouts/maxw.png"
+theme.layout_fullscreen = themes_path.."default/layouts/fullscreenw.png"
+theme.layout_tilebottom = themes_path.."default/layouts/tilebottomw.png"
+theme.layout_tileleft   = themes_path.."default/layouts/tileleftw.png"
+theme.layout_tile = themes_path.."default/layouts/tilew.png"
+theme.layout_tiletop = themes_path.."default/layouts/tiletopw.png"
+theme.layout_spiral  = themes_path.."default/layouts/spiralw.png"
+theme.layout_dwindle = themes_path.."default/layouts/dwindlew.png"
+theme.layout_cornernw = themes_path.."default/layouts/cornernww.png"
+theme.layout_cornerne = themes_path.."default/layouts/cornernew.png"
+theme.layout_cornersw = themes_path.."default/layouts/cornersww.png"
+theme.layout_cornerse = themes_path.."default/layouts/cornersew.png"
+
+-- Generate Awesome icon:
+theme.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
+
+return theme
+
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

config/.config/bspwm/bspwmrc

@@ -0,0 +1,52 @@
+#! /bin/sh
+
+## Autostart Programs
+sxhkd &
+xsetroot -cursor_name left_ptr
+# polybar example &
+#~/.scripts/panel.sh
+if [ $(pgrep polybar) ]; then
+	killall -q polybar && sleep .5 && polybar mainbar &
+else
+	sleep .5 && polybar mainbar &
+fi
+#MONITOR=DP-5 polybar example &
+~/.fehbg
+picom --corner-radius 15 &
+#lxsession &
+#blueman-applet &
+#nm-applet &
+
+## Configure Monitors/Workspaces
+bspc monitor DisplayPort-1 -d 1 2 3 4 5 6 7 8 9
+
+## Theming
+bspc config border_width        2
+bspc config window_gap          10
+bspc config top_padding         20
+bspc config left_padding        0
+bspc config right_padding       0
+bspc config bottom_padding      0
+bspc config split_ratio         0.52
+bspc config borderless_monocle  true
+bspc config gapless_monocle     false
+# bspc config ignore_ewmh_fullscreen all
+bspc config single_monocle      true
+
+# Colors
+bspc config normal_border_color     "$(xrdb -query | grep background | cut -f2)"
+bspc config focused_border_color    "$(xrdb -query | grep foreground | cut -f2)"
+
+bspc rule -a Gimp desktop='^8' state=floating follow=on
+bspc rule -a Chromium desktop='^2'
+bspc rule -a mplayer2 state=floating
+bspc rule -a Kupfer.py focus=on
+bspc rule -a Screenkey manage=off
+bspc rule -a Emacs state=tiled
+
+# Polybar Hidden When Fullscreen for Vlc, Youtube, Mpv ...
+# xdo below -t $(xdo id -n root) $(xdo id -a polybar-mainbar_DisplayPort-1)
+#xdo below -t $(xdo id -n root) $(xdo id -a polybar-main)
+
+## Make Focus Follow Cursor
+bspc config focus_follows_pointer true

config/.config/kak-tree-sitter/config.toml

@@ -805,7 +805,25 @@ path = "runtime/queries/llvm"
 # TODO
 
 # lua
-# TODO
+# [language.lua.grammar.source.git]
+# url = "https://github.com/tree-sitter-grammars/tree-sitter-lua"
+# pin = "88e446476a1e97a8724dff7a23e2d709855077f2"
+
+# [language.lua.grammar]
+# path = "src"
+# compile = "cc"
+# compile_args = ["-c", "-fpic", "../scanner.c", "../parser.c", "-I", ".."]
+# compile_flags = ["-O3"]
+# link = "cc"
+# link_args = ["-shared", "-fpic", "scanner.o", "parser.o", "-o", "lua.so"]
+# link_flags = ["-O3"]
+
+# [language.lua.queries.source.git]
+# url = "https://github.com/helix-editor/helix"
+# pin = "e76020ddb93eeb051de606c24f92189c3fc55547"
+
+# [language.lua.gueries]
+# path = "runtime/queries/lua"
 
 # make
 [language.make.grammar.source.git]

config/.config/kak/kakrc

@@ -34,10 +34,10 @@ plug "tinted-theming/base16-kakoune"
 
 ## Treesitter ##
 
-eval %sh{ kak-tree-sitter -dks --with-highlighting --with-text-objects --init $kak_session }
+#eval %sh{ kak-tree-sitter -dksv --with-highlighting --with-text-objects --init $kak_session }
 #eval %sh{ kak-tree-sitter -dks --with-text-objects --session $kak_session }
 #eval %sh{ kak-tree-sitter -dks  --with-highlighting --session $kak_session }
-
+eval %sh{ kak-tree-sitter -dks --init $kak_session }
 evaluate-commands %sh{
     echo "colorscheme base16-$BASE16_THEME"
 }

config/.config/nvim/after/plugin/colors.lua

@@ -1,5 +1,6 @@
-function colors(color)
-	color = color or 'vscode'
+function colors(color, theme)
+	color = os.getenv("BASE16_THEME")
+    alt_color = 'rose-pine' or color
     -- Available values:   `'hard'`, `'medium'`, `'soft'`
     vim.g.gruvbox_material_background = 'medium'
     -- Available values:   `'material'`, `'mix'`, `'original'`
@@ -8,7 +9,15 @@ function colors(color)
     vim.g.everforest_background = 'hard'
     vim.g.gruvbox_material_better_performance = 1
     vim.g.everforest_better_performance = 1
-	vim.cmd.colorscheme(color)
+    if color == 'gruvbox-dark-hard' then
+        color = 'gruvbox-material'
+        vim.g.gruvbox_material_background = 'hard'
+    end
+    if theme then
+        vim.cmd.colorscheme(alt_color)
+    elseif not pcall(vim.cmd.colorscheme, color) then
+        vim.cmd.colorscheme(alt_color)
+    end
 end
 
 colors()

config/.config/nvim/lua/config/packer.lua

@@ -75,6 +75,8 @@ return require('packer').startup(function(use)
 
     use "lewpoly/sherbet.nvim"
 
+    use 'xiyaowong/transparent.nvim'
+
 	use {
 		'nvim-treesitter/nvim-treesitter',
 		run = ':TSUpdate',

config/.config/nvim/lua/config/set.lua

@@ -1,6 +1,9 @@
 vim.opt.nu = true
 vim.opt.relativenumber = true
 
+vim.opt.wrap = true
+vim.opt.linebreak = true
+
 vim.opt.tabstop = 4
 vim.opt.softtabstop = 4
 vim.opt.shiftwidth = 4
@@ -10,9 +13,6 @@ vim.opt.showmode = false
 
 vim.opt.smartindent = true
 
-vim.opt.wrap = false
-
-
 vim.opt.swapfile = false
 vim.opt.backup = false
 vim.opt.undodir = os.getenv("HOME") .. "/.vim/undodir"

config/.config/polybar/config.ini

@@ -0,0 +1,175 @@
+;==========================================================
+;
+;
+;   ██████╗  ██████╗ ██╗  ██╗   ██╗██████╗  █████╗ ██████╗
+;   ██╔══██╗██╔═══██╗██║  ╚██╗ ██╔╝██╔══██╗██╔══██╗██╔══██╗
+;   ██████╔╝██║   ██║██║   ╚████╔╝ ██████╔╝███████║██████╔╝
+;   ██╔═══╝ ██║   ██║██║    ╚██╔╝  ██╔══██╗██╔══██║██╔══██╗
+;   ██║     ╚██████╔╝███████╗██║   ██████╔╝██║  ██║██║  ██║
+;   ╚═╝      ╚═════╝ ╚══════╝╚═╝   ╚═════╝ ╚═╝  ╚═╝╚═╝  ╚═╝
+;
+;
+;   To learn more about how to configure Polybar
+;   go to https://github.com/polybar/polybar
+;
+;   The README contains a lot of information
+;
+;==========================================================
+
+[settings]
+screenchange-reload = true
+;compositing-background = xor
+;compositing-background = screen
+;compositing-foreground = source
+;compositing-border = over
+;pseudo-transparency = false
+
+[global/wm]
+margin-top = 0
+margin-bottom = 0
+
+; vim:ft=dosini
+
+[bar/mainbar]
+scroll-up = #bspwm.prev
+scroll-down = #bspwm.next
+enable-structs = true
+# monitor = "DisplayPort-1"
+background = ${xrdb:background}
+foreground = ${xrdb:foreground}
+override-redirect = true
+wm-restack = bspwm
+font-0 = Olympe Mono Hacked:style=Regular:pixelsize=13;2
+font-1 = Cascadia Code:style=Regular:pixelsize=13:2
+font-2 = NotoColorEmoji:pixelsize=16
+font-3 = Font Awesome 5 Brands:style=Regular:size=13;2
+font-4 = Font Awesome 5 Free Solid:style=Regular:size=9;2
+height = 20
+line-size = 2
+modules-left = bspwm
+modules-right = music pulseaudio battery network redshift datetime
+padding = 3
+module-margin = 1.5
+
+#[module/apple]
+#type = custom/text
+#content =  
+
+[module/bspwm]
+type = internal/bspwm
+
+label-focused = %name%
+label-focused-underline= ${xrdb:foreground}
+label-focused-padding = 1
+label-focused-font = 0
+
+label-occupied = %name%
+label-occupied-padding = 1
+label-occupied-font = 0
+
+label-urgent = %name%!
+label-urgent-padding = 1
+label-urgent-font = 0
+
+label-empty = %name%
+label-empty-padding = 1
+label-empty-font = 0
+;extra icons to choose from
+;http://fontawesome.io/cheatsheet/
+;       v     
+
+ws-icon-0 = Web; 
+ws-icon-1 = Term;
+ws-icon-2 = School;
+ws-icon-3 = Game;
+ws-icon-4 = Music;
+ws-icon-5 = Chat;
+ws-icon-6 = Sys;
+ws-icon-7 = Dev;
+ws-icon-8 = Extra;
+;ws-icon-9 = 10;
+ws-icon-default = " "
+
+#; Separator in between workspaces
+#; label-separator = |
+#
+
+;[module/music]
+;type = custom/script
+;exec = /home/mikec/.scripts/get_song.sh
+;interval = 0.5
+;click-left = playerctl play-pause
+;click-right = playerctl stop
+;scroll-down = playerctl next
+;scroll-up = playerctl previous
+
+[module/battery]
+type = internal/battery
+battery = BAT0
+adapter = ADP0
+format-charging = <ramp-capacity>
+format-discharging = <ramp-capacity>
+ramp-capacity-0 = ""
+ramp-capacity-1 = ""
+ramp-capacity-2 = ""
+ramp-capacity-3 = ""
+ramp-capacity-4 = ""
+
+[module/pulseaudio]
+type = internal/pulseaudio
+
+; Sink to be used, if it exists (find using `pacmd list-sinks`, name field)
+; If not, uses default sink
+
+; Use PA_VOLUME_UI_MAX (~153%) if true, or PA_VOLUME_NORM (100%) if false
+; Default: true
+use-ui-max = false
+
+; Interval for volume increase/decrease (in percent points)
+; Default: 5
+interval = 5
+; Available tags:
+;   <label-volume> (default)
+;   <ramp-volume>
+;   <bar-volume>
+format-volume = <label-volume>
+; Available tags:
+;   <label-muted> (default)
+;   <ramp-volume>
+;   <bar-volume>
+;format-muted = <label-muted>
+
+; Available tokens:
+;   %percentage% (default)
+;   %decibels%
+label-volume =  %percentage%%  
+
+; Available tokens:
+;   %percentage% (default)
+;   %decibels%
+label-muted = muted
+
+; Only applies if <ramp-volume> is used
+ramp-volume-0 = 
+ramp-volume-1 = 
+ramp-volume-2 = 
+
+; Right and Middle click
+click-right = kitty -e pulsemixer
+; click-middle = 
+
+[module/network]
+type = internal/network
+interface = enp4s0
+label-disconnected = " Not connected" 
+label-connected = ""
+
+[module/redshift]
+type = custom/text
+content = ""
+click-left = redshift -O 4300
+click-right = redshift -x
+
+[module/datetime]
+type = internal/date
+date = %a %b %d  %I:%M %p

config/.config/qutebrowser/autoconfig.yml

@@ -20,7 +20,7 @@ settings:
     https://outlook.live.com?mailtouri=%25s: true
     https://outlook.office.com?mailtouri=%25s: true
   fonts.default_family:
-    global: Cascadia Code
+    global: Olympe Mono Hacked
   fonts.default_size:
     global: 12pt
   url.default_page:

config/.config/sxhkd/sxhkdrc

@@ -0,0 +1,172 @@
+#
+# wm independent hotkeys
+#
+
+# make sxhkd reload its configuration files:
+super + Escape
+	pkill -USR1 -x sxhkd
+
+#
+# bspwm hotkeys
+# 
+
+# send the newest marked node to the newest preselected node
+super + y
+	bspc node newest.marked.local -n newest.!automatic.local
+
+#
+# state/flags
+#
+
+# set the node flags
+super + ctrl + {m,x,y,z}
+	bspc node -g {marked,locked,sticky,private}
+
+## My Custom Keybindings ##
+
+# Launch Programs
+
+# Browser
+super + ctrl + b
+    brave
+# dmenu Launcher
+super + p
+    dmenu_run
+# Terminal
+super + Return
+    st
+super + d
+    st
+# Cmus
+super + ctrl + c
+    st -e cmus
+# Ranger
+super + ctrl + r
+    st -e ranger
+# NeoVim
+super + ctrl + v
+    st -e nvim
+# Emacs
+super + ctrl + e
+    emacs
+# Screenshot
+super + ctrl + s
+    scrot
+
+# Media Controls
+
+# Mute Audio
+XF86AudioMute
+    pulseaudio-ctl mute
+# Lower Volume
+XF86AudioLowerVolume
+    pulseaudio-ctl down 1
+# Raise Volume
+XF86AudioRaiseVolume
+    pulseaudio-ctl up 1
+# Play/Pause
+XF86AudioPlay
+    playerctl play-pause
+# Stop
+XF86AudioStop
+    playerctl stop
+# Next Song
+XF86AudioNext
+    playerctl next
+# Previous Song
+XF86AudioPrev
+    playerctl previous
+
+## BSPWM Controls ##
+ 
+# Quit/Restart BSPWM
+super + shift + {q,r}
+	bspc {quit,wm -r}
+# Move A Floating Window
+super + {Left,Down,Up,Right}
+	bspc node -v {-20 0,0 20,0 -20,20 0}
+# Set Window State
+super + {t,shift + t,s,f}
+	bspc node -t {tiled,pseudo_tiled,floating,fullscreen}
+# Close and Kill Window
+super + x
+	bspc node -{c,k}
+
+# Resize/Rearrange Windows
+
+# Move Left and Bottom Sides of a Window for Resizing
+super + alt + {h,j,k,l}
+	bspc node -z {left -20 0,bottom 0 20,bottom 0 -20,left 20 0}
+# Move Top and Right Sides of a Window for Resizing
+super + alt + shift + {h,j,k,l}
+	bspc node -z {right -20 0,top 0 20,top 0 -20,right 20 0}
+# Swap the Current Node and the Biggest Node
+super + space
+	bspc node -s biggest
+# Switch Between Tiled and Fullscreen Layout
+super + m
+	bspc desktop -l next
+# Focus/Move the Node in the Given Direction
+super + {_,shift + }{h,j,k,l}
+	bspc node -{f,s} {west,south,north,east}
+# Cycle Between Windows in Fullscreen Layout (Also Works in Tiled)
+super + {_,shift + }c
+	bspc node -f {next,prev}.local
+
+# Virtual Desktop Controls
+
+# Change Desktop/Send Window to Desktop
+super + {_,shift + }{1-9}
+	bspc {desktop -f,node -d} focused:'^{1-9}'
+# Move to Next/Previous Virtual Desktop
+super + bracket{left,right}
+	bspc desktop -f {prev,next}.local
+
+# Manual Tiling Controls
+
+# Preselect the Direction
+super + ctrl + {h,j,k,l}
+	bspc node -p {west,south,north,east}
+# Preselect the Ratio
+super + ctrl + {1-9}
+	bspc node -o 0.{1-9}
+# Cancel the Preselection for the Focused Node
+super + ctrl + space
+	bspc node -p cancel
+# Cancel the Preselection for the Focused Desktop
+super + ctrl + shift + space
+	bspc query -N -d | xargs -I id -n 1 bspc node id -p cancel
+
+# Focus of Nodes
+
+# Focus the Node For the Given Path Jump
+super + {p,b,comma,period}
+	bspc node -f @{parent,brother,first,second}
+# Focus the Last Node/Desktop
+# super + {grave,Tab}
+#	bspc {node,desktop} -f last
+# Focus the Older or Newer Node in the Focus History
+super + {o,i}
+	bspc wm -h off; \
+	bspc node {older,newer} -f; \
+	bspc wm -h on
+# Switch Focus of Monitors
+super + ctrl + alt {h,l}
+    bspc monitor --focus {prev,next}
+super + shift {comma,period}
+	bspc monitor --focus {prev,next}
+# Send Window to other monitor
+super + ctrl + shift {h,l}
+    bspc node -m {prev,next} --follow 
+super + ctrl {comma,period}
+	bspc node -m {prev,next} --follow
+
+# gaps
+super + equal
+    gap=$(bspc query --tree --monitor | jq '.windowGap'); new_gap=$(( $gap + 5 )); bspc config window_gap ${new_gap}
+
+super + minus
+    gap=$(bspc query --tree --monitor | jq '.windowGap'); new_gap=$(( $gap - 5 )); bspc config window_gap ${new_gap}
+
+super + plus
+    bspc config window_gap 0

config/.config/tinted-theming/tinty/config.toml

@@ -27,7 +27,8 @@ theme-file-extension = ".config.py"
 path = "https://github.com/HaoZeke/base16-zathura"
 name = "tinted-zathura"
 themes-dir = "build_schemes/colors"
-hook = "cat ~/.config/zathura/config > ~/.config/zathura/zathurarc && cat %f >> ~/.config/zathura/zathurarc"
+# hook = "cat ~/.config/zathura/config > ~/.config/zathura/zathurarc && cat %f >> ~/.config/zathura/zathurarc"
+hook = "cp -f %f ~/.config/zathura/colors"
 
 [[items]]
 path = "https://github.com/tinted-theming/base16-xresources"

config/.config/zathura/zathurarc

@@ -1,36 +1,4 @@
-set font "Cascadia Code 12"
-# Base16 Gruvbox dark, hard
-# Author: Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox)
-
-set default-bg                  "#1d2021"
-set default-fg                  "#3c3836"
-
-set statusbar-fg                "#bdae93"
-set statusbar-bg                "#504945"
-
-set inputbar-bg                 "#1d2021"
-set inputbar-fg                 "#fbf1c7"
-
-set notification-bg             "#1d2021"
-set notification-fg             "#fbf1c7"
-
-set notification-error-bg       "#1d2021"
-set notification-error-fg       "#fb4934"
-
-set notification-warning-bg     "#1d2021"
-set notification-warning-fg     "#fb4934"
-
-set highlight-color             "#fabd2f"
-set highlight-active-color      "#83a598"
-
-set completion-bg               "#3c3836"
-set completion-fg               "#83a598"
-
-set completion-highlight-fg     "#fbf1c7"
-set completion-highlight-bg     "#83a598"
-
-set recolor-lightcolor          "#1d2021"
-set recolor-darkcolor           "#ebdbb2"
-
-set recolor                     "false"
-set recolor-keephue             "false"
+include colors
+set font "Olympe Mono Hacked 12"
+set database "sqlite"
+set recolor true

config/.doom.d/config.el

@@ -19,7 +19,7 @@
 ;;
 ;; They all accept either a font-spec, font string ("Input Mono-12"), or xlfd
 ;; font string. You generally only need these two:
-(setq doom-font (font-spec :family "Cascadia Code" :size 28 )
+(setq doom-font (font-spec :family "Olympe Mono Hacked" :size 28 )
       doom-variable-pitch-font (font-spec :family "Cantarell" :size 28 :weight 'bold))
 
 ;; There are two ways to load a theme. Both assume the theme is installed and

config/.gitconfig

@@ -7,7 +7,7 @@
 	process = git-lfs filter-process
 	required = true
 [core]
-	editor = kak
+	editor = nvim
 [init]
 	defaultBranch = master
 [sendemail]

config/.scripts/startup.sh

@@ -1,7 +1,7 @@
 #! /bin/sh
-while true; do
-    xsetroot -name "$(/home/mikec/.scripts/bar.sh)"
-    sleep 1
-done &
+# while true; do
+#     xsetroot -name "$(/home/mikec/.scripts/bar.sh)"
+#     sleep 1
+# done &
 xss-lock -- slock &
 ##emacs --daemon &

config/.xinitrc

@@ -1,3 +1,5 @@
 xrdb -merge ~/.Xresources
 /home/mikec/.scripts/startup.sh
-exec dwm
+# exec awesome
+# exec dwm
+exec bspwm