format everything

This commit is contained in:
Adam 2024-01-09 20:38:24 -05:00
parent ebb48694cf
commit fa63fd37ce
26 changed files with 784 additions and 1116 deletions

View file

@ -0,0 +1,6 @@
column_width = 160
line_endings = "Unix"
indent_type = "Spaces"
indent_width = 2
quote_style = "AutoPreferSingle"
call_parentheses = "None"

View file

@ -3,54 +3,34 @@
globalkeys = Gears.table.join( globalkeys = Gears.table.join(
globalkeys, globalkeys,
Awful.key( Awful.key({ Modkey, 'Shift' }, 'e', awesome.quit, {
{ Modkey, "Shift" }, "e", awesome.quit, description = 'quit awesome',
{ group = 'awesome',
description = "quit awesome", }),
group = "awesome"
}
),
Awful.key( Awful.key({ Modkey, 'Shift' }, 'p', function()
{ Modkey, "Shift" }, "p", Awful.spawn.easy_async_with_shell('doorsbg', function()
function()
Awful.spawn.easy_async_with_shell("doorsbg",
function()
awesome.restart() awesome.restart()
end) end)
end, end, {
{ description = 'set new random wallpaper/color scheme',
description = "set new random wallpaper/color scheme", group = 'awesome',
group = "awesome" }),
}
),
Awful.key( Awful.key({ Modkey }, 'BackSpace', awesome.restart, {
{ Modkey, }, "BackSpace", description = 'reload awesome',
awesome.restart, group = 'awesome',
{ }),
description = "reload awesome",
group = "awesome"
}
),
Awful.key( Awful.key({ Modkey }, 'F1', Hotkeys_popup.show_help, {
{ Modkey, }, "F1", description = 'show help',
Hotkeys_popup.show_help, group = 'awesome',
{ }),
description = "show help",
group = "awesome"
}
),
Awful.key( Awful.key({}, 'Print', function()
{}, "Print", os.execute 'maimpick'
function() end, {
os.execute("maimpick") description = 'run screenshot script',
end, group = 'awesome',
{ })
description = "run screenshot script",
group = "awesome"
}
)
) )

View file

@ -6,218 +6,146 @@ inc = 50
clientkeys = Gears.table.join( clientkeys = Gears.table.join(
clientkeys, clientkeys,
Awful.key( Awful.key({ Modkey }, 'f', function(c)
{ Modkey, }, "f",
function(c)
c.fullscreen = not c.fullscreen c.fullscreen = not c.fullscreen
c:raise() c:raise()
end, end, {
{ description = 'toggle fullscreen',
description = "toggle fullscreen", group = 'client',
group = "client" }),
}
),
Awful.key( Awful.key({ Modkey, 'Mod1' }, 'h', function(c)
{ Modkey, "Mod1" }, "h",
function(c)
c:relative_move(-inc, 0, 0, 0) c:relative_move(-inc, 0, 0, 0)
end, end, {
{ description = 'move floating left',
description = "move floating left", group = 'client',
group = "client" }),
}
),
Awful.key( Awful.key({ Modkey, 'Mod1', 'Shift' }, 'h', function(c)
{ Modkey, "Mod1", "Shift" }, "h",
function(c)
c:relative_move(-inc, 0, inc, 0) c:relative_move(-inc, 0, inc, 0)
end, end, {
{ description = 'resize floating horizontal +',
description = "resize floating horizontal +", group = 'client',
group = "client" }),
}
),
Awful.key( Awful.key({ Modkey }, 'j', function()
{ Modkey, }, "j",
function()
Awful.client.focus.byidx(1) Awful.client.focus.byidx(1)
end, end, {
{ description = 'focus next by index',
description = "focus next by index", group = 'client',
group = "client" }),
}
),
Awful.key( Awful.key({ Modkey, 'Mod1' }, 'j', function(c)
{ Modkey, "Mod1" }, "j",
function(c)
c:relative_move(0, inc, 0, 0) c:relative_move(0, inc, 0, 0)
end, end, {
{ description = 'move floating down',
description = "move floating down", group = 'client',
group = "client" }),
}
),
Awful.key( Awful.key({ Modkey, 'Shift' }, 'j', function()
{ Modkey, "Shift" }, "j",
function()
Awful.client.swap.byidx(1) Awful.client.swap.byidx(1)
end, end, {
{ description = 'swap next by index',
description = "swap next by index", group = 'client',
group = "client" }),
}
),
Awful.key( Awful.key({ Modkey, 'Mod1', 'Shift' }, 'j', function(c)
{ Modkey, "Mod1", "Shift" }, "j",
function(c)
c:relative_move(0, inc, 0, -inc) c:relative_move(0, inc, 0, -inc)
end, end, {
{ description = 'resize floating vertical -',
description = "resize floating vertical -", group = 'client',
group = "client" }),
}
),
Awful.key( Awful.key({ Modkey }, 'k', function()
{ Modkey, }, "k",
function()
Awful.client.focus.byidx(-1) Awful.client.focus.byidx(-1)
end, end, {
{ description = 'focus previous by index',
description = "focus previous by index", group = 'client',
group = "client" }),
}
),
Awful.key( Awful.key({ Modkey, 'Mod1' }, 'k', function(c)
{ Modkey, "Mod1" }, "k",
function(c)
c:relative_move(0, -inc, 0, 0) c:relative_move(0, -inc, 0, 0)
end, end, {
{ description = 'move floating up',
description = "move floating up", group = 'client',
group = "client" }),
}
),
Awful.key( Awful.key({ Modkey, 'Shift' }, 'k', function()
{ Modkey, "Shift" }, "k",
function()
Awful.client.swap.byidx(-1) Awful.client.swap.byidx(-1)
end, end, {
{ description = 'swap previous by index',
description = "swap previous by index", group = 'client',
group = "client" }),
}
),
Awful.key( Awful.key({ Modkey, 'Mod1', 'Shift' }, 'k', function(c)
{ Modkey, "Mod1", "Shift" }, "k",
function(c)
c:relative_move(0, -inc, 0, inc) c:relative_move(0, -inc, 0, inc)
end, end, {
{ description = 'resize floating vertical +',
description = "resize floating vertical +", group = 'client',
group = "client" }),
}
),
Awful.key( Awful.key({ Modkey, 'Mod1' }, 'l', function(c)
{ Modkey, "Mod1" }, "l",
function(c)
c:relative_move(inc, 0, 0, 0) c:relative_move(inc, 0, 0, 0)
end, end, {
{ description = 'move floating right',
description = "move floating right", group = 'client',
group = "client" }),
}
),
Awful.key( Awful.key({ Modkey, 'Mod1', 'Shift' }, 'l', function(c)
{ Modkey, "Mod1", "Shift" }, "l",
function(c)
c:relative_move(inc, 0, -inc, 0) c:relative_move(inc, 0, -inc, 0)
end, end, {
{ description = 'resize floating horizontal -',
description = "resize floating horizontal -", group = 'client',
group = "client" }),
}
),
Awful.key( Awful.key({ Modkey, 'Shift' }, 'n', function(c)
{ Modkey, "Shift" }, "n",
function(c)
c.maximized = not c.maximized c.maximized = not c.maximized
c:raise() c:raise()
end, end, {
{ description = '(un)maximize',
description = "(un)maximize", group = 'client',
group = "client" }),
}
),
Awful.key( Awful.key({ Modkey }, 'o', function(c)
{ Modkey, }, "o", c:move_to_screen()
function(c) c:move_to_screen() end, end, {
{ description = 'move focused to next screen',
description = "move focused to next screen", group = 'client',
group = "client" }),
}
),
Awful.key( Awful.key({ Modkey }, 'q', function(c)
{ Modkey, }, "q", c:kill()
function(c) c:kill() end, end, {
{ description = 'close',
description = "close", group = 'client',
group = "client" }),
}
),
Awful.key( Awful.key({ Modkey }, 't', function(c)
{ Modkey, }, "t", c.ontop = not c.ontop
function(c) c.ontop = not c.ontop end, end, {
{ description = 'toggle keep on top',
description = "toggle keep on top", group = 'client',
group = "client" }),
}
),
Awful.key( Awful.key({ Modkey, 'Shift' }, 'Return', function(c)
{ Modkey, "Shift" }, "Return",
function(c)
c:swap(Awful.client.getmaster()) c:swap(Awful.client.getmaster())
end, end, {
{ description = 'move focused to master',
description = "move focused to master", group = 'client',
group = "client" }),
}
),
Awful.key( Awful.key({ Modkey }, 'space', Awful.client.floating.toggle, {
{ Modkey, }, "space", description = 'toggle floating',
Awful.client.floating.toggle, group = 'client',
{ }),
description = "toggle floating",
group = "client"
}
),
Awful.key( Awful.key({ Modkey }, 'Tab', function()
{ Modkey, }, "Tab",
function()
Awful.client.focus.history.previous() Awful.client.focus.history.previous()
if client.focus then client.focus:raise() end if client.focus then
end, client.focus:raise()
{ end
description = "focus previous", end, {
group = "client" description = 'focus previous',
} group = 'client',
) })
) )

View file

@ -1,12 +1,12 @@
-- Group by appearance in help menu (Modkey + F1) -- Group by appearance in help menu (Modkey + F1)
require('binds.awesome') require 'binds.awesome'
require('binds.client') require 'binds.client'
require('binds.launcher') require 'binds.launcher'
require('binds.layout') require 'binds.layout'
require('binds.media') require 'binds.media'
require('binds.mouse') require 'binds.mouse'
require('binds.screen') require 'binds.screen'
require('binds.tag') require 'binds.tag'
-- Apply all above -- Apply all above
root.keys(globalkeys) root.keys(globalkeys)

View file

@ -3,128 +3,101 @@
globalkeys = Gears.table.join( globalkeys = Gears.table.join(
globalkeys, globalkeys,
Awful.key( Awful.key({ Modkey }, 'c', function()
{ Modkey, }, "c", Awful.spawn 'caprine'
function() Awful.spawn("caprine") end, end, {
{ description = 'open caprine',
description = "open caprine", group = 'launcher',
group = "launcher" }),
}
),
Awful.key( Awful.key({ Modkey, 'Shift' }, 'c', function()
{ Modkey, "Shift" }, "c", Awful.spawn 'telegram-desktop'
function() Awful.spawn("telegram-desktop") end, end, {
{ description = 'open telegram-desktop',
description = "open telegram-desktop", group = 'launcher',
group = "launcher" }),
}
),
Awful.key( Awful.key({ Modkey }, 'd', function()
{ Modkey, }, "d", Awful.spawn 'discord'
function() Awful.spawn("discord") end, end, {
{ description = 'open discord',
description = "open discord", group = 'launcher',
group = "launcher" }),
}
),
Awful.key( Awful.key({ Modkey }, 'e', function()
{ Modkey, }, "e", Awful.spawn(Email)
function() Awful.spawn(Email) end, end, {
{ description = 'open editor',
description = "open editor", group = 'launcher',
group = "launcher" }),
}
),
Awful.key( Awful.key({ Modkey, 'Shift' }, 'e', function()
{ Modkey, "Shift" }, "e", Awful.spawn 'thunderbird'
function() Awful.spawn("thunderbird") end, end, {
{ description = 'open thunderbird',
description = "open thunderbird", group = 'launcher',
group = "launcher" }),
}
),
Awful.key( Awful.key({ Modkey }, 'g', function()
{ Modkey, }, "g", Awful.spawn 'steam-native'
function() Awful.spawn("steam-native") end, end, {
{ description = 'open steam',
description = "open steam", group = 'launcher',
group = "launcher" }),
}
),
Awful.key( Awful.key({ Modkey, 'Shift' }, 'g', function()
{ Modkey, "Shift" }, "g", Awful.spawn 'lutris'
function() Awful.spawn("lutris") end, end, {
{ description = 'open lutris',
description = "open lutris", group = 'launcher',
group = "launcher" }),
}
),
Awful.key( Awful.key({ Modkey }, 'i', function()
{ Modkey, }, "i", Awful.spawn 'gimp'
function() Awful.spawn("gimp") end, end, {
{ description = 'open gimp',
description = "open gimp", group = 'launcher',
group = "launcher" }),
}
),
Awful.key( Awful.key({ Modkey }, 'm', function()
{ Modkey, }, "m", Awful.spawn(Music)
function() Awful.spawn(Music) end, end, {
{ description = 'open spotify',
description = "open spotify", group = 'launcher',
group = "launcher" }),
}
),
Awful.key( Awful.key({ Modkey }, 'r', function()
{ Modkey, }, "r", Awful.screen.focused().mypromptbox:run()
function() Awful.screen.focused().mypromptbox:run() end, end, {
{ description = 'run prompt',
description = "run prompt", group = 'launcher',
group = "launcher" }),
}
),
Awful.key({ Modkey, }, "v", Awful.key({ Modkey }, 'v', function()
function() Awful.spawn("virt-manager") end, Awful.spawn 'virt-manager'
{ end, {
description = "open virt-manager", description = 'open virt-manager',
group = "launcher" group = 'launcher',
} }),
),
Awful.key( Awful.key({ Modkey }, 'w', function()
{ Modkey, }, "w", Awful.spawn(Browser)
function() Awful.spawn(Browser) end, end, {
{ description = 'open browser',
description = "open browser", group = 'launcher',
group = "launcher" }),
}
),
Awful.key( Awful.key({ Modkey, 'Shift' }, 'w', function()
{ Modkey, "Shift" }, "w", Awful.spawn(Browser2)
function() Awful.spawn(Browser2) end, end, {
{ description = 'open browser2',
description = "open browser2", group = 'launcher',
group = "launcher" }),
}
),
Awful.key( Awful.key({ Modkey }, 'Return', function()
{ Modkey, }, "Return", Awful.spawn(Terminal)
function() Awful.spawn(Terminal) end, end, {
{ description = 'open a terminal',
description = "open a terminal", group = 'launcher',
group = "launcher" })
}
)
) )

View file

@ -3,39 +3,31 @@
globalkeys = Gears.table.join( globalkeys = Gears.table.join(
globalkeys, globalkeys,
Awful.key( Awful.key({ Modkey, 'Shift' }, 'h', function()
{ Modkey, "Shift" }, "h", Awful.tag.incmwfact(-0.05)
function() Awful.tag.incmwfact(-0.05) end, end, {
{ description = 'resize split -',
description = "resize split -", group = 'layout',
group = "layout" }),
}
),
Awful.key( Awful.key({ Modkey, 'Shift' }, 'l', function()
{ Modkey, "Shift" }, "l", Awful.tag.incmwfact(0.05)
function() Awful.tag.incmwfact(0.05) end, end, {
{ description = 'resize split +',
description = "resize split +", group = 'layout',
group = "layout" }),
}
),
Awful.key( Awful.key({ Modkey }, '[', function()
{ Modkey, }, "[", Awful.layout.inc(1)
function() Awful.layout.inc(1) end, end, {
{ description = 'select next',
description = "select next", group = 'layout',
group = "layout" }),
}
),
Awful.key( Awful.key({ Modkey }, ']', function()
{ Modkey, }, "]", Awful.layout.inc(-1)
function() Awful.layout.inc(-1) end, end, {
{ description = 'select previous',
description = "select previous", group = 'layout',
group = "layout" })
}
)
) )

View file

@ -4,91 +4,59 @@ globalkeys = Gears.table.join(
globalkeys, globalkeys,
-- Media -- Media
Awful.key( Awful.key({}, 'XF86AudioLowerVolume', function()
{}, "XF86AudioLowerVolume", os.execute 'pamixer -d 3'
function() end, {
os.execute("pamixer -d 3") description = 'lower volume',
end, group = 'media',
{ }),
description = "lower volume",
group = "media"
}
),
Awful.key( Awful.key({}, 'XF86AudioMicMute', function()
{}, "XF86AudioMicMute", os.execute 'pactl set-source-mute @DEFAULT_SOURCE@ toggle'
function() end, {
os.execute("pactl set-source-mute @DEFAULT_SOURCE@ toggle") description = 'mute mic',
end, group = 'media',
{ }),
description = "mute mic",
group = "media"
}
),
Awful.key( Awful.key({}, 'XF86AudioMute', function()
{}, "XF86AudioMute", os.execute 'pamixer -t'
function() end, {
os.execute("pamixer -t") description = 'mute audio',
end, group = 'media',
{ }),
description = "mute audio",
group = "media"
}
),
Awful.key( Awful.key({}, 'XF86AudioNext', function()
{}, "XF86AudioNext", os.execute 'playerctl next'
function() end, {
os.execute("playerctl next") description = 'next',
end, group = 'media',
{ }),
description = "next",
group = "media"
}
),
Awful.key( Awful.key({}, 'XF86AudioPlay', function()
{}, "XF86AudioPlay", os.execute 'playerctl play-pause'
function() end, {
os.execute("playerctl play-pause") description = 'play/pause',
end, group = 'media',
{ }),
description = "play/pause",
group = "media"
}
),
Awful.key( Awful.key({}, 'XF86AudioPrev', function()
{}, "XF86AudioPrev", os.execute 'playerctl previous'
function() end, {
os.execute("playerctl previous") description = 'previous',
end, group = 'media',
{ }),
description = "previous",
group = "media"
}
),
Awful.key( Awful.key({}, 'XF86AudioRaiseVolume', function()
{}, "XF86AudioRaiseVolume", os.execute 'pamixer -i 3'
function() end, {
os.execute("pamixer -i 3") description = 'raise volume',
end, group = 'media',
{ }),
description = "raise volume",
group = "media"
}
),
Awful.key( Awful.key({}, 'XF86AudioStop', function()
{}, "XF86AudioStop", os.execute 'playerctl stop'
function() end, {
os.execute("playerctl stop") description = 'stop',
end, group = 'media',
{ })
description = "stop",
group = "media"
}
)
) )

View file

@ -1,51 +1,17 @@
-- Binds related to the mouse -- Binds related to the mouse
-- root.buttons(
-- Gears.table.join(
-- Awful.button(
-- {}, 4,
-- Awful.tag.viewnext
-- ),
-- Awful.button(
-- {}, 5,
-- Awful.tag.viewprev
-- )
-- )
-- )
clientbuttons = Gears.table.join( clientbuttons = Gears.table.join(
Awful.button( Awful.button({}, 1, function(c)
{}, 1, c:emit_signal('request::activate', 'mouse_click', { raise = true })
function(c) end),
c:emit_signal(
"request::activate",
"mouse_click",
{ raise = true }
)
end
),
Awful.button( Awful.button({ Modkey }, 1, function(c)
{ Modkey }, 1, c:emit_signal('request::activate', 'mouse_click', { raise = true })
function(c)
c:emit_signal(
"request::activate",
"mouse_click",
{ raise = true }
)
Awful.mouse.client.move(c) Awful.mouse.client.move(c)
end end),
),
Awful.button( Awful.button({ Modkey }, 3, function(c)
{ Modkey }, 3, c:emit_signal('request::activate', 'mouse_click', { raise = true })
function(c)
c:emit_signal(
"request::activate",
"mouse_click",
{ raise = true }
)
Awful.mouse.client.resize(c) Awful.mouse.client.resize(c)
end end)
)
) )

View file

@ -3,21 +3,17 @@
globalkeys = Gears.table.join( globalkeys = Gears.table.join(
globalkeys, globalkeys,
Awful.key( Awful.key({ Modkey }, 'h', function()
{ Modkey, }, "h", Awful.screen.focus_relative(-1)
function() Awful.screen.focus_relative(-1) end, end, {
{ description = 'focus previous screen',
description = "focus previous screen", group = 'screen',
group = "screen" }),
}
),
Awful.key( Awful.key({ Modkey }, 'l', function()
{ Modkey, }, "l", Awful.screen.focus_relative(1)
function() Awful.screen.focus_relative(1) end, end, {
{ description = 'focus next screen',
description = "focus next screen", group = 'screen',
group = "screen" })
}
)
) )

View file

@ -7,72 +7,53 @@ for i = 1, 9 do
globalkeys, globalkeys,
-- View tag only. -- View tag only.
Awful.key( Awful.key({ Modkey }, '#' .. i + 9, function()
{ Modkey }, "#" .. i + 9,
function()
local screen = Awful.screen.focused() local screen = Awful.screen.focused()
local tag = screen.tags[i] local tag = screen.tags[i]
if tag then if tag then
tag:view_only() tag:view_only()
end end
end, end, {
description = 'view tag #' .. i,
{ group = 'tag',
description = "view tag #" .. i, }),
group = "tag"
}
),
-- Toggle tag display. -- Toggle tag display.
Awful.key( Awful.key({ Modkey, 'Control' }, '#' .. i + 9, function()
{ Modkey, "Control" }, "#" .. i + 9,
function()
local screen = Awful.screen.focused() local screen = Awful.screen.focused()
local tag = screen.tags[i] local tag = screen.tags[i]
if tag then if tag then
Awful.tag.viewtoggle(tag) Awful.tag.viewtoggle(tag)
end end
end, end, {
description = 'toggle tag #' .. i,
{ group = 'tag',
description = "toggle tag #" .. i, }),
group = "tag"
}
),
-- Move client to tag. -- Move client to tag.
Awful.key( Awful.key({ Modkey, 'Shift' }, '#' .. i + 9, function()
{ Modkey, "Shift" }, "#" .. i + 9,
function()
if client.focus then if client.focus then
local tag = client.focus.screen.tags[i] local tag = client.focus.screen.tags[i]
if tag then if tag then
client.focus:move_to_tag(tag) client.focus:move_to_tag(tag)
end end
end end
end, end, {
{ description = 'move focused client to tag #' .. i,
description = "move focused client to tag #" .. i, group = 'tag',
group = "tag" }),
}
),
-- Toggle tag on focused client. -- Toggle tag on focused client.
Awful.key( Awful.key({ Modkey, 'Control', 'Shift' }, '#' .. i + 9, function()
{ Modkey, "Control", "Shift" }, "#" .. i + 9,
function()
if client.focus then if client.focus then
local tag = client.focus.screen.tags[i] local tag = client.focus.screen.tags[i]
if tag then if tag then
client.focus:toggle_tag(tag) client.focus:toggle_tag(tag)
end end
end end
end, end, {
description = 'toggle focused client on tag #' .. i,
{ group = 'tag',
description = "toggle focused client on tag #" .. i, })
group = "tag"
}
)
) )
end end

View file

@ -1,21 +1,17 @@
-- Handle startup errors -- Handle startup errors
if awesome.startup_errors then if awesome.startup_errors then
Naughty.notify( Naughty.notify {
{
preset = naughty.config.presets.critical, preset = naughty.config.presets.critical,
title = "Oops, there were errors during startup!", title = 'Oops, there were errors during startup!',
text = awesome.startup_errors text = awesome.startup_errors,
} }
)
end end
-- Handle runtime errors after startup -- Handle runtime errors after startup
do do
local in_error = false local in_error = false
awesome.connect_signal( awesome.connect_signal('debug::error', function(err)
"debug::error",
function(err)
-- Make sure we don't go into an endless error loop -- Make sure we don't go into an endless error loop
if in_error then if in_error then
return return
@ -23,25 +19,22 @@ do
in_error = true in_error = true
Naughty.notify( Naughty.notify {
{
preset = naughty.config.presets.critical, preset = naughty.config.presets.critical,
title = "Oops, an error happened!", title = 'Oops, an error happened!',
text = tostring(err) text = tostring(err),
} }
)
in_error = false in_error = false
end end)
)
end end
require("awful.autofocus") require 'awful.autofocus'
require("awful.hotkeys_popup.keys") require 'awful.hotkeys_popup.keys'
Awful = require("awful") Awful = require 'awful'
Beautiful = require("beautiful") Beautiful = require 'beautiful'
Gears = require("gears") Gears = require 'gears'
Hotkeys_popup = require("awful.hotkeys_popup") Hotkeys_popup = require 'awful.hotkeys_popup'
Menubar = require("menubar") Menubar = require 'menubar'
Naughty = require("naughty") Naughty = require 'naughty'
Wibox = require("wibox") Wibox = require 'wibox'

View file

@ -1,17 +1,17 @@
require('core') require 'core'
-- Set up key remaps -- Set up key remaps
os.execute('setxkbmap -option "caps:escape,altwin:menu_win,altwin:meta_win"') os.execute 'setxkbmap -option "caps:escape,altwin:menu_win,altwin:meta_win"'
-- Some defaults -- Some defaults
Browser = "firefox-developer-edition" Browser = 'firefox-developer-edition'
Browser2 = "chromium" Browser2 = 'chromium'
Editor = "nvim" Editor = 'nvim'
Email = "thunderbird" Email = 'thunderbird'
Modkey = "Mod4" Modkey = 'Mod4'
Music = "spotify-launcher" Music = 'spotify-launcher'
Terminal = "alacritty" Terminal = 'alacritty'
Beautiful.init(".config/awesome/theme.lua") Beautiful.init '.config/awesome/theme.lua'
-- Define layouts -- Define layouts
Awful.layout.layouts = { Awful.layout.layouts = {
@ -25,16 +25,13 @@ Awful.layout.layouts = {
Menubar.utils.terminal = Terminal Menubar.utils.terminal = Terminal
-- Split up the rest for readability -- Split up the rest for readability
require('binds') -- keyboard/mouse require 'binds' -- keyboard/mouse
require('rules') -- client specific rules require 'rules' -- client specific rules
require('signals') -- client signals require 'signals' -- client signals
require('wibar') -- bar/screen/wallpaper stuff require 'wibar' -- bar/screen/wallpaper stuff
-- Collect garbage to prevent memory leaks from widgets -- Collect garbage to prevent memory leaks from widgets
Gears.timer.start_new( Gears.timer.start_new(10, function()
10, collectgarbage('step', 20000)
function()
collectgarbage("step", 20000)
return true return true
end end)
)

View file

@ -10,48 +10,48 @@ Awful.rules.rules = {
keys = clientkeys, keys = clientkeys,
buttons = clientbuttons, buttons = clientbuttons,
screen = Awful.screen.preferred, screen = Awful.screen.preferred,
placement = Awful.placement.no_overlap + Awful.placement.no_offscreen placement = Awful.placement.no_overlap + Awful.placement.no_offscreen,
} },
}, },
-- Floating clients. -- Floating clients.
{ {
rule_any = { rule_any = {
instance = { instance = {
"DTA", -- Firefox addon DownThemAll. 'DTA', -- Firefox addon DownThemAll.
"copyq", -- Includes session name in class. 'copyq', -- Includes session name in class.
"pinentry", 'pinentry',
}, },
class = { class = {
"Arandr", 'Arandr',
"Blueman-manager", 'Blueman-manager',
"Gpick", 'Gpick',
"Kruler", 'Kruler',
"MessageWin", -- kalarm. 'MessageWin', -- kalarm.
"Sxiv", 'Sxiv',
"Tor Browser", -- Needs a fixed window size to avoid fingerprinting by screen size. 'Tor Browser', -- Needs a fixed window size to avoid fingerprinting by screen size.
"Wpa_gui", 'Wpa_gui',
"veromix", 'veromix',
"xtightvncviewer" }, 'xtightvncviewer',
},
-- Note that the name property shown in xprop might be set slightly after creation of the client -- 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. -- and the name shown there might not match defined rules here.
name = { name = {
"Event Tester", -- xev. 'Event Tester', -- xev.
}, },
role = { role = {
"AlarmWindow", -- Thunderbird's calendar. 'AlarmWindow', -- Thunderbird's calendar.
"ConfigManager", -- Thunderbird's about:config. 'ConfigManager', -- Thunderbird's about:config.
"pop-up", -- e.g. Google Chrome's (detached) Developer Tools. 'pop-up', -- e.g. Google Chrome's (detached) Developer Tools.
}
}, },
properties = { floating = true } },
properties = { floating = true },
}, },
-- Add titlebars to normal clients and dialogs -- Add titlebars to normal clients and dialogs
{ {
rule_any = { type = { "normal", "dialog" } rule_any = { type = { 'normal', 'dialog' } },
}, properties = { titlebars_enabled = false },
properties = { titlebars_enabled = false }
}, },
} }

View file

@ -1,60 +1,41 @@
client.connect_signal( client.connect_signal('manage', function(c)
"manage",
function(c)
-- Set the windows at the slave, -- Set the windows at the slave,
-- i.e. put it at the end of others instead of setting it master. -- 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 not awesome.startup then awful.client.setslave(c) end
if awesome.startup if awesome.startup and not c.size_hints.user_position and not c.size_hints.program_position then
and not c.size_hints.user_position
and not c.size_hints.program_position then
-- Prevent clients from being unreachable after screen count changes. -- Prevent clients from being unreachable after screen count changes.
Awful.placement.no_offscreen(c) Awful.placement.no_offscreen(c)
end end
end end)
)
-- Add a titlebar if titlebars_enabled is set to true in the rules. -- Add a titlebar if titlebars_enabled is set to true in the rules.
client.connect_signal( client.connect_signal('request::titlebars', function(c)
"request::titlebars",
function(c)
-- buttons for the titlebar -- buttons for the titlebar
local buttons = Gears.table.join( local buttons = Gears.table.join(
Awful.button( Awful.button({}, 1, function()
{}, 1, c:emit_signal('request::activate', 'titlebar', { raise = true })
function()
c:emit_signal(
"request::activate", "titlebar",
{ raise = true }
)
Awful.mouse.client.move(c) Awful.mouse.client.move(c)
end end),
), Awful.button({}, 3, function()
Awful.button( c:emit_signal('request::activate', 'titlebar', { raise = true })
{}, 3,
function()
c:emit_signal(
"request::activate", "titlebar",
{ raise = true }
)
Awful.mouse.client.resize(c) Awful.mouse.client.resize(c)
end end)
)
) )
Awful.titlebar(c):setup { Awful.titlebar(c):setup {
{ -- Left { -- Left
Awful.titlebar.widget.iconwidget(c), Awful.titlebar.widget.iconwidget(c),
buttons = buttons, buttons = buttons,
layout = Wibox.layout.fixed.horizontal layout = Wibox.layout.fixed.horizontal,
}, },
{ -- Middle { -- Middle
{ -- Title { -- Title
align = "center", align = 'center',
widget = Awful.titlebar.widget.titlewidget(c) widget = Awful.titlebar.widget.titlewidget(c),
}, },
buttons = buttons, buttons = buttons,
layout = Wibox.layout.flex.horizontal layout = Wibox.layout.flex.horizontal,
}, },
{ -- Right { -- Right
Awful.titlebar.widget.floatingbutton(c), Awful.titlebar.widget.floatingbutton(c),
@ -62,41 +43,21 @@ client.connect_signal(
Awful.titlebar.widget.stickybutton(c), Awful.titlebar.widget.stickybutton(c),
Awful.titlebar.widget.ontopbutton(c), Awful.titlebar.widget.ontopbutton(c),
Awful.titlebar.widget.closebutton(c), Awful.titlebar.widget.closebutton(c),
layout = Wibox.layout.fixed.horizontal() layout = Wibox.layout.fixed.horizontal(),
}, },
layout = Wibox.layout.align.horizontal layout = Wibox.layout.align.horizontal,
} }
end end)
)
-- Enable sloppy focus, so that focus follows mouse. client.connect_signal('focus', function(c)
-- 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 c.border_color = Beautiful.border_focus
end end)
)
client.connect_signal( client.connect_signal('unfocus', function(c)
"unfocus",
function(c)
c.border_color = Beautiful.border_normal c.border_color = Beautiful.border_normal
end end)
)
awesome.connect_signal( awesome.connect_signal('exit', function(reason_restart)
'exit',
function(reason_restart)
if not reason_restart then if not reason_restart then
return return
end end
@ -108,12 +69,9 @@ awesome.connect_signal(
end end
file:close() file:close()
end end)
)
awesome.connect_signal( awesome.connect_signal('startup', function()
'startup',
function()
local file = io.open('/tmp/awesomewm-last-selected-tags', 'r') local file = io.open('/tmp/awesomewm-last-selected-tags', 'r')
if not file then if not file then
return return
@ -132,5 +90,4 @@ awesome.connect_signal(
end end
file:close() file:close()
end end)
)

View file

@ -1,13 +1,13 @@
local xresources = require("beautiful.xresources") local xresources = require 'beautiful.xresources'
local dpi = xresources.apply_dpi local dpi = xresources.apply_dpi
local gfs = require("gears.filesystem") local gfs = require 'gears.filesystem'
local theme = {} local theme = {}
local theme_assets = require("beautiful.theme_assets") local theme_assets = require 'beautiful.theme_assets'
local themes_path = gfs.get_themes_dir() local themes_path = gfs.get_themes_dir()
local xrdb = xresources.get_current_theme() local xrdb = xresources.get_current_theme()
theme.font = "monospace 11" theme.font = 'monospace 11'
theme.wallpaper = '.cache/wal/bg' theme.wallpaper = '.cache/wal/bg'
theme.useless_gap = dpi(8) theme.useless_gap = dpi(8)
theme.border_width = dpi(1) theme.border_width = dpi(1)
@ -33,38 +33,30 @@ theme.fg_urgent = xrdb.foreground
-- Generate taglist squares: -- Generate taglist squares:
local taglist_square_size = dpi(4) local taglist_square_size = dpi(4)
theme.taglist_squares_sel = theme_assets.taglist_squares_sel( theme.taglist_squares_sel = theme_assets.taglist_squares_sel(taglist_square_size, theme.fg_normal)
taglist_square_size,
theme.fg_normal
)
theme.taglist_squares_unsel = theme_assets.taglist_squares_unsel( theme.taglist_squares_unsel = theme_assets.taglist_squares_unsel(taglist_square_size, theme.fg_normal)
taglist_square_size,
theme.fg_normal
)
-- You can use your own layout icons like this: -- You can use your own layout icons like this:
theme.layout_cornerne = themes_path .. "default/layouts/cornernew.png" theme.layout_cornerne = themes_path .. 'default/layouts/cornernew.png'
theme.layout_cornernw = themes_path .. "default/layouts/cornernww.png" theme.layout_cornernw = themes_path .. 'default/layouts/cornernww.png'
theme.layout_cornerse = themes_path .. "default/layouts/cornersew.png" theme.layout_cornerse = themes_path .. 'default/layouts/cornersew.png'
theme.layout_cornersw = themes_path .. "default/layouts/cornersww.png" theme.layout_cornersw = themes_path .. 'default/layouts/cornersww.png'
theme.layout_dwindle = themes_path .. "default/layouts/dwindlew.png" theme.layout_dwindle = themes_path .. 'default/layouts/dwindlew.png'
theme.layout_fairh = themes_path .. "default/layouts/fairhw.png" theme.layout_fairh = themes_path .. 'default/layouts/fairhw.png'
theme.layout_fairv = themes_path .. "default/layouts/fairvw.png" theme.layout_fairv = themes_path .. 'default/layouts/fairvw.png'
theme.layout_floating = themes_path .. "default/layouts/floatingw.png" theme.layout_floating = themes_path .. 'default/layouts/floatingw.png'
theme.layout_fullscreen = themes_path .. "default/layouts/fullscreenw.png" theme.layout_fullscreen = themes_path .. 'default/layouts/fullscreenw.png'
theme.layout_magnifier = themes_path .. "default/layouts/magnifierw.png" theme.layout_magnifier = themes_path .. 'default/layouts/magnifierw.png'
theme.layout_max = themes_path .. "default/layouts/maxw.png" theme.layout_max = themes_path .. 'default/layouts/maxw.png'
theme.layout_spiral = themes_path .. "default/layouts/spiralw.png" theme.layout_spiral = themes_path .. 'default/layouts/spiralw.png'
theme.layout_tile = themes_path .. "default/layouts/tilew.png" theme.layout_tile = themes_path .. 'default/layouts/tilew.png'
theme.layout_tilebottom = themes_path .. "default/layouts/tilebottomw.png" theme.layout_tilebottom = themes_path .. 'default/layouts/tilebottomw.png'
theme.layout_tileleft = themes_path .. "default/layouts/tileleftw.png" theme.layout_tileleft = themes_path .. 'default/layouts/tileleftw.png'
theme.layout_tiletop = themes_path .. "default/layouts/tiletopw.png" theme.layout_tiletop = themes_path .. 'default/layouts/tiletopw.png'
-- Define the icon theme for application icons. If not set then the icons -- 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. -- from /usr/share/icons and /usr/share/icons/hicolor will be used.
theme.icon_theme = nil theme.icon_theme = nil
return theme return theme
-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

View file

@ -1,13 +1,13 @@
require('wibar.widgets') require 'wibar.widgets'
require('wibar.taglist') require 'wibar.taglist'
require('wibar.tasklist') require 'wibar.tasklist'
local function set_wallpaper(s) local function set_wallpaper(s)
-- Wallpaper -- Wallpaper
if Beautiful.wallpaper then if Beautiful.wallpaper then
local wallpaper = Beautiful.wallpaper local wallpaper = Beautiful.wallpaper
-- If wallpaper is a function, call it with the screen -- If wallpaper is a function, call it with the screen
if type(wallpaper) == "function" then if type(wallpaper) == 'function' then
wallpaper = wallpaper(s) wallpaper = wallpaper(s)
end end
Gears.wallpaper.maximized(wallpaper, s, true) Gears.wallpaper.maximized(wallpaper, s, true)
@ -15,19 +15,11 @@ local function set_wallpaper(s)
end end
-- Re-set wallpaper when a screen's geometry changes (e.g. different resolution) -- Re-set wallpaper when a screen's geometry changes (e.g. different resolution)
screen.connect_signal( screen.connect_signal('property::geometry', set_wallpaper)
"property::geometry",
set_wallpaper
)
Awful.screen.connect_for_each_screen( Awful.screen.connect_for_each_screen(function(s)
function(s)
-- Each screen has its own tag table. -- Each screen has its own tag table.
Awful.tag( Awful.tag({ '1', '2', '3', '4', '5', '6', '7', '8', '9' }, s, Awful.layout.layouts[1])
{ "1", "2", "3", "4", "5", "6", "7", "8", "9" },
s,
Awful.layout.layouts[1]
)
-- Create a promptbox for each screen -- Create a promptbox for each screen
s.mypromptbox = Awful.widget.prompt() s.mypromptbox = Awful.widget.prompt()
@ -36,52 +28,39 @@ Awful.screen.connect_for_each_screen(
-- We need one layoutbox per screen. -- We need one layoutbox per screen.
s.mylayoutbox = Awful.widget.layoutbox(s) s.mylayoutbox = Awful.widget.layoutbox(s)
s.mylayoutbox:buttons( s.mylayoutbox:buttons(Gears.table.join(
Gears.table.join( Awful.button({}, 3, function()
Awful.button(
{}, 3,
function()
Awful.layout.inc(-1) Awful.layout.inc(-1)
end end),
),
Awful.button( Awful.button({}, 4, function()
{}, 4,
function()
Awful.layout.inc(1) Awful.layout.inc(1)
end end),
),
Awful.button( Awful.button({}, 5, function()
{}, 5,
function()
Awful.layout.inc(-1) Awful.layout.inc(-1)
end end)
) ))
)
)
-- Create a taglist widget -- Create a taglist widget
s.mytaglist = Awful.widget.taglist { s.mytaglist = Awful.widget.taglist {
screen = s, screen = s,
filter = Awful.widget.taglist.filter.all, filter = Awful.widget.taglist.filter.all,
buttons = Taglist_buttons buttons = Taglist_buttons,
} }
-- Create a tasklist widget -- Create a tasklist widget
s.mytasklist = Awful.widget.tasklist { s.mytasklist = Awful.widget.tasklist {
screen = s, screen = s,
filter = Awful.widget.tasklist.filter.currenttags, filter = Awful.widget.tasklist.filter.currenttags,
buttons = Tasklist_buttons buttons = Tasklist_buttons,
} }
-- Create the Wibox -- Create the Wibox
s.myWibox = Awful.wibar( s.myWibox = Awful.wibar {
{ position = 'top',
position = "top", screen = s,
screen = s
} }
)
-- Add widgets to the Wibox -- Add widgets to the Wibox
s.myWibox:setup { s.myWibox:setup {
@ -102,16 +81,13 @@ Awful.screen.connect_for_each_screen(
layout = Wibox.layout.fixed.horizontal, layout = Wibox.layout.fixed.horizontal,
Cpu_widget(), Cpu_widget(),
Ram_widget(), Ram_widget(),
Batteryarc_widget( Batteryarc_widget { enable_battery_warning = false },
{ enable_battery_warning = false }
),
Wibox.widget.systray(), Wibox.widget.systray(),
Mytextclock, Mytextclock,
s.mylayoutbox, s.mylayoutbox,
}, },
} }
end end)
)
--os.execute('nitrogen --set-zoom-fill $(awk {print} ~/.cache/wal/wal)') --os.execute('nitrogen --set-zoom-fill $(awk {print} ~/.cache/wal/wal)')
os.execute('wal -Rsq') os.execute 'wal -Rsq'

View file

@ -1,44 +1,27 @@
Taglist_buttons = Gears.table.join( Taglist_buttons = Gears.table.join(
Awful.button( Awful.button({}, 1, function(t)
{}, 1,
function(t)
t:view_only() t:view_only()
end end),
),
Awful.button( Awful.button({ Modkey }, 1, function(t)
{ Modkey }, 1,
function(t)
if client.focus then if client.focus then
client.focus:move_to_tag(t) client.focus:move_to_tag(t)
end end
end end),
),
Awful.button( Awful.button({}, 3, Awful.tag.viewtoggle),
{}, 3,
Awful.tag.viewtoggle
),
Awful.button( Awful.button({ Modkey }, 3, function(t)
{ Modkey }, 3,
function(t)
if client.focus then if client.focus then
client.focus:toggle_tag(t) client.focus:toggle_tag(t)
end end
end end),
),
Awful.button({}, 4, Awful.button({}, 4, function(t)
function(t)
Awful.tag.viewnext(t.screen) Awful.tag.viewnext(t.screen)
end end),
),
Awful.button( Awful.button({}, 5, function(t)
{}, 5,
function(t)
Awful.tag.viewprev(t.screen) Awful.tag.viewprev(t.screen)
end end)
)
) )

View file

@ -1,37 +1,19 @@
Tasklist_buttons = Gears.table.join( Tasklist_buttons = Gears.table.join(
Awful.button( Awful.button({}, 1, function(c)
{}, 1,
function(c)
if c == client.focus then if c == client.focus then
c.minimized = true c.minimized = true
else else
c:emit_signal( c:emit_signal('request::activate', 'tasklist', { raise = true })
"request::activate",
"tasklist",
{ raise = true }
)
end end
end end),
),
Awful.button( Awful.button({}, 3, function()
{}, 3, Awful.menu.client_list { theme = { width = 250 } }
function() end),
Awful.menu.client_list( Awful.button({}, 4, function()
{ theme = { width = 250 } }
)
end
),
Awful.button(
{}, 4,
function()
Awful.client.focus.byidx(1) Awful.client.focus.byidx(1)
end end),
), Awful.button({}, 5, function()
Awful.button(
{}, 5,
function()
Awful.client.focus.byidx(-1) Awful.client.focus.byidx(-1)
end end)
)
) )

View file

@ -1,28 +1,22 @@
Calendar_widget = require("awesome-wm-widgets.calendar-widget.calendar") Calendar_widget = require 'awesome-wm-widgets.calendar-widget.calendar'
Cpu_widget = require("awesome-wm-widgets.cpu-widget.cpu-widget") Cpu_widget = require 'awesome-wm-widgets.cpu-widget.cpu-widget'
Ram_widget = require("awesome-wm-widgets.ram-widget.ram-widget") Ram_widget = require 'awesome-wm-widgets.ram-widget.ram-widget'
Batteryarc_widget = require("awesome-wm-widgets.batteryarc-widget.batteryarc") Batteryarc_widget = require 'awesome-wm-widgets.batteryarc-widget.batteryarc'
Mytextclock = Wibox.widget { Mytextclock = Wibox.widget {
format = ' %a %b %d, %I:%M%P ', format = ' %a %b %d, %I:%M%P ',
widget = Wibox.widget.textclock widget = Wibox.widget.textclock,
} }
local cw = Calendar_widget( local cw = Calendar_widget {
{
placement = 'top_right', placement = 'top_right',
start_sunday = 'true', start_sunday = 'true',
previous_month_button = 4, previous_month_button = 4,
next_month_button = 5, next_month_button = 5,
} }
)
Mytextclock:connect_signal( Mytextclock:connect_signal('button::press', function(_, _, _, button)
"button::press",
function(_, _, _, button)
if button == 1 then if button == 1 then
cw.toggle() cw.toggle()
end end
end end)
)

View file

@ -9,8 +9,8 @@ fi
# Tint screen at night # Tint screen at night
redshift -l \ redshift -l \
$(curl -s "https://location.services.mozilla.com/v1/geolocate?key=geoclue" \ "$(curl -s "https://location.services.mozilla.com/v1/geolocate?key=geoclue" \
| sed 's/.*"lat": \(-\?[0-9.]*\).*"lng": \(-\?[0-9.]*\).*/\1:\2/') & | sed 's/.*"lat": \(-\?[0-9.]*\).*"lng": \(-\?[0-9.]*\).*/\1:\2/')" &
# Password prompt popup # Password prompt popup
/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 & /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 &

View file

@ -42,6 +42,7 @@ The meat and potatoes
AwesomeWM starter kit AwesomeWM starter kit
Base: Base:
- [acpi](https://wiki.archlinux.org/title/ACPI_modules) - For battery widget - [acpi](https://wiki.archlinux.org/title/ACPI_modules) - For battery widget
- [alacritty](https://github.com/alacritty/alacritty) - Terminal emulator - [alacritty](https://github.com/alacritty/alacritty) - Terminal emulator
- [arandr](https://christian.amsuess.com/tools/arandr) - To configure screens - [arandr](https://christian.amsuess.com/tools/arandr) - To configure screens
@ -78,15 +79,15 @@ Eye candy, bloat, stuff that won't install on ARM devices
- [thunderbird](https://www.thunderbird.net) - Email client - [thunderbird](https://www.thunderbird.net) - Email client
- [wal-telegram-git](https://github.com/guillaumeboehm/wal-telegram) - Generate telegram-desktop theme - [wal-telegram-git](https://github.com/guillaumeboehm/wal-telegram) - Generate telegram-desktop theme
## Install ## Install
The install script clones this repo, installs a few dependencies and copies my configs to `~/.config/`. It then links `~/.xinitrc` and `~/.zprofile` to the ones copied from the repo, all while creating a **SINGLE** backup for any files that already exist. **NOTE:** Only **ONE** backup per file is saved to prevent piling up backups. It's only meant to catch small oversights and is very verbose. In other words, if you run the installer twice **IT WILL OVERWRITE THE BACKUP!** The install script clones this repo, installs a few dependencies and copies my configs to `~/.config/`. It then links `~/.xinitrc` and `~/.zprofile` to the ones copied from the repo, all while creating a **SINGLE** backup for any files that already exist. **NOTE:** Only **ONE** backup per file is saved to prevent piling up backups. It's only meant to catch small oversights and is very verbose. In other words, if you run the installer twice **IT WILL OVERWRITE THE BACKUP!**
The install script is only for Arch right now but I plan to include any distro with this software in their repos. At least the popular ones The install script is only for Arch right now but I plan to include any distro with this software in their repos. At least the popular ones
1. Create a new user or backup your home directory if you're unsure about anything. If you have nothing to lose then go ahead and YOLO it. Just don't complain if something gets overwritten 1. Create a new user or backup your home directory if you're unsure about anything. If you have nothing to lose then go ahead and YOLO it. Just don't complain if something gets overwritten
1. ```sh <(curl -s https://doors.doordesk.net/setup)``` 1. `sh <(curl -s https://doors.doordesk.net/setup)`
1. Choose your adventure 1. Choose your adventure
1. Log out and log back in 1. Log out and log back in
@ -100,11 +101,14 @@ Just run `startx` or start awesome from your display manager if you have one
## Post Install ## Post Install
### Colors ### Colors
Some manual setup is required for theming if you want eye candy. My scripts should handle everything else Some manual setup is required for theming if you want eye candy. My scripts should handle everything else
- Install [pywalfox](https://addons.mozilla.org/en-US/firefox/addon/pywalfox/) for firefox, then open it and click the "Fetch Pywal colors" button. You shouldn't have to touch it ever again - Install [pywalfox](https://addons.mozilla.org/en-US/firefox/addon/pywalfox/) for firefox, then open it and click the "Fetch Pywal colors" button. You shouldn't have to touch it ever again
- Point telegram to [wal-telegram](https://github.com/guillaumeboehm/wal-telegram#set-the-color-palette)'s generated theme. It should handle itself from here - Point telegram to [wal-telegram](https://github.com/guillaumeboehm/wal-telegram#set-the-color-palette)'s generated theme. It should handle itself from here
## Future: ## Future:
- Polish nvim - Polish nvim
- nnn setup - nnn setup
- posix compliance - posix compliance

View file

@ -3,23 +3,23 @@
set -e set -e
# Copy configs and make a backup if it already exists # Copy configs and make a backup if it already exists
echo -e "\nInstalling Configs..." printf "\nInstalling Configs..."
for file in configs/* for file in configs/*
do do
echo -e "\n$file..." printf "\n%s..." "$file"
cp -rbv $file $HOME/.config/ cp -rbv "$file" "$HOME"/.config/
done done
# Copy scripts and make a backup if it already exists # Copy scripts and make a backup if it already exists
echo -e "\nInstalling Scripts..." printf "\nInstalling Scripts..."
if [ ! -d "$HOME/.local/bin" ]; then if [ ! -d "$HOME/.local/bin" ]; then
mkdir "$HOME/.local/bin" mkdir "$HOME/.local/bin"
fi fi
cp -rbv bin $HOME/.local cp -rbv bin "$HOME"/.local
# Link shell files and make a backup if it already exists # Link shell files and make a backup if it already exists
echo -e "\nLinking shell..." printf "\nLinking shell..."
cp -sbv $HOME/.config/shell/profile ~/.zprofile cp -sbv "$HOME"/.config/shell/profile ~/.zprofile
cp -sbv $HOME/.config/x11/xinitrc ~/.xinitrc cp -sbv "$HOME"/.config/x11/xinitrc ~/.xinitrc

View file

@ -1,4 +1,4 @@
#!/bin/bash #!/bin/sh
# Minimal setup for Fedora # Minimal setup for Fedora
@ -7,16 +7,16 @@ set -e
cd cd
sudo dnf -y install \ sudo dnf -y install \
sl \ sl \
btop \ btop \
neovim \ neovim \
byobu \ byobu \
zsh \ zsh \
nnn \ nnn \
mosh \ mosh \
clang \ clang \
# Packer # Packer
if ! test -d ~/.local/share/nvim/site/pack/packer/start/packer.nvim; then if ! test -d ~/.local/share/nvim/site/pack/packer/start/packer.nvim; then
git clone --depth 1 https://github.com/wbthomason/packer.nvim\ git clone --depth 1 https://github.com/wbthomason/packer.nvim\
~/.local/share/nvim/site/pack/packer/start/packer.nvim ~/.local/share/nvim/site/pack/packer/start/packer.nvim
@ -28,4 +28,4 @@ if ! test -d .config/zsh/ohmyzsh; then
fi fi
# Set shell # Set shell
sudo usermod -s /bin/zsh $USER sudo usermod -s /bin/zsh "$USER"

View file

@ -1,4 +1,4 @@
#!/bin/bash #!/bin/sh
# Minimal setup for Ubuntu # Minimal setup for Ubuntu
@ -37,4 +37,4 @@ if ! test -d .config/zsh/ohmyzsh; then
fi fi
# Set shell # Set shell
sudo chsh -s /bin/zsh $USER sudo chsh -s /bin/zsh "$USER"

View file

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/sh
rm -rf $HOME/.local/share/nvim rm -rf "$HOME"/.local/share/nvim
rm -rf $HOME/.config/nvim rm -rf "$HOME"/.config/nvim