thomasave
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into laptop

This commit is contained in:
Thomas Avé 2023-10-22 18:18:55 +02:00
parent 94e72671e4 7cd8108298
commit 6ce7697d82
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
awesome/rc.lua
View File

@ -2,8 +2,6 @@
local gears = require("gears") local gears = require("gears")
local awful = require("awful") local awful = require("awful")
local beautiful = require("beautiful") local beautiful = require("beautiful")
-- Local imports -- Local imports
local grid = require("components.layout.grid") local grid = require("components.layout.grid")
@ -18,6 +16,18 @@ require("utils.signals")
-- Autofocus a new client when previously focused one is closed -- Autofocus a new client when previously focused one is closed
require("awful.autofocus") require("awful.autofocus")
-- Define layouts
awful.layout.append_default_layouts({
awful.layout.suit.fair.horizontal,
awful.layout.suit.tile,
awful.layout.suit.floating,
grid.horizontal,
awful.layout.suit.tile.left,
awful.layout.suit.tile.bottom,
awful.layout.suit.tile.top,
grid,
})
-- List of apps to run on start-up -- List of apps to run on start-up
local run_on_start_up = { local run_on_start_up = {
@ -30,18 +40,6 @@ local run_on_start_up = {
-- os.getenv("XDG_CONFIG_HOME") .. "/awesome/scripts/setup_display.sh" -- os.getenv("XDG_CONFIG_HOME") .. "/awesome/scripts/setup_display.sh"
} }
-- Define layouts
awful.layout.layouts = {
awful.layout.suit.fair.horizontal,
awful.layout.suit.tile,
awful.layout.suit.floating,
grid.horizontal,
awful.layout.suit.tile.left,
awful.layout.suit.tile.bottom,
awful.layout.suit.tile.top,
grid,
}
-- Run all the apps listed in run_on_start_up -- Run all the apps listed in run_on_start_up
for _, app in ipairs(run_on_start_up) do for _, app in ipairs(run_on_start_up) do
local findme = app local findme = app
@ -50,7 +48,7 @@ for _, app in ipairs(run_on_start_up) do
findme = app:sub(0, firstspace - 1) findme = app:sub(0, firstspace - 1)
end end
-- Run commands only if it's not already running. -- Run commands only if it's not already running.
awful.spawn.with_shell(string.format("echo 'pgrep -u $USER -x %s > /dev/null || (%s)' | bash -", findme, app), false) awful.spawn.with_shell(string.format("echo 'pgrep -f -u $USER -x %s > /dev/null || (%s)' | bash -", findme, app), false)
end end
-- Start timers -- Start timers
@ -59,7 +57,7 @@ gears.timer {
call_now = true, call_now = true,
autostart = true, autostart = true,
callback = function() callback = function()
awful.spawn.with_shell({"xmodmap", "/home/user/.Xmodmap"}) -- If not repeated it sometimes just stops working awful.spawn({"xmodmap", "/home/user/.Xmodmap"}) -- If not repeated it sometimes just stops working
end end
} }

2
install.sh
View File

@ -44,7 +44,7 @@ if $NVIM; then
$SUDO apt update $SUDO apt update
$SUDO apt install -y software-properties-common $SUDO apt install -y software-properties-common
$SUDO add-apt-repository ppa:neovim-ppa/unstable -y $SUDO add-apt-repository ppa:neovim-ppa/unstable -y
$SUDO curl -sL https://deb.nodesource.com/setup_20.x | $SUDO bash - $SUDO curl -sL https://deb.nodesource.com/setup_21.x | $SUDO bash -
$SUDO apt update $SUDO apt update
$SUDO apt install -y $dependencies python3-venv nodejs golang $SUDO apt install -y $dependencies python3-venv nodejs golang
fi fi