summaryrefslogtreecommitdiff
path: root/awesome
diff options
context:
space:
mode:
authormediocregopher <mediocregopher@gmail.com>2023-08-13 21:34:14 +0200
committermediocregopher <mediocregopher@gmail.com>2023-08-13 21:35:17 +0200
commit1957081c122fe231eb6120192489dd979d214317 (patch)
treeb8cd0812ec3c0452d54cb789ba938e6f0c0e8278 /awesome
parentef8da74f1ae38d9eceb68846fe9ef402c8e30fcf (diff)
Update branch with all changes which could be brought in from private branches
For a while I was keeping a private branch where there were a lot of non-public things included, and that became the de-facto branch while this one lagged. This one is now up-to-date, all private stuff is dealt with via config files which are not committed.
Diffstat (limited to 'awesome')
-rw-r--r--awesome/awesome.desktop9
-rw-r--r--awesome/bat.lua43
-rwxr-xr-xawesome/bin/cricketbin2744274 -> 0 bytes
-rwxr-xr-xawesome/bin/scrot-gobin.sh4
-rwxr-xr-xawesome/bin/scrot.sh7
-rwxr-xr-xawesome/bin/sysstats.sh50
-rw-r--r--awesome/config/gtk-3.0/bookmarks3
-rw-r--r--awesome/config/gtk-3.0/settings.ini2
-rw-r--r--awesome/default.nix113
-rw-r--r--awesome/mediocregopher-sysstats.service13
-rw-r--r--awesome/rc.lua123
-rw-r--r--awesome/share/helper.png (renamed from awesome/helper.png)bin26778 -> 26778 bytes
-rw-r--r--awesome/share/pulseaudio.lua (renamed from awesome/pulseaudio.lua)0
-rw-r--r--awesome/share/theme.lua22
-rw-r--r--awesome/theme/README3
-rw-r--r--awesome/theme/background.pngbin224736 -> 0 bytes
-rw-r--r--awesome/theme/background_white.pngbin270916 -> 0 bytes
-rw-r--r--awesome/theme/layouts/dwindle.pngbin967 -> 0 bytes
-rw-r--r--awesome/theme/layouts/dwindlew.pngbin997 -> 0 bytes
-rw-r--r--awesome/theme/layouts/fairh.pngbin194 -> 0 bytes
-rw-r--r--awesome/theme/layouts/fairhw.pngbin194 -> 0 bytes
-rw-r--r--awesome/theme/layouts/fairv.pngbin201 -> 0 bytes
-rw-r--r--awesome/theme/layouts/fairvw.pngbin201 -> 0 bytes
-rw-r--r--awesome/theme/layouts/floating.pngbin395 -> 0 bytes
-rw-r--r--awesome/theme/layouts/floatingw.pngbin388 -> 0 bytes
-rw-r--r--awesome/theme/layouts/fullscreen.pngbin202 -> 0 bytes
-rw-r--r--awesome/theme/layouts/fullscreenw.pngbin202 -> 0 bytes
-rw-r--r--awesome/theme/layouts/magnifier.pngbin209 -> 0 bytes
-rw-r--r--awesome/theme/layouts/magnifierw.pngbin209 -> 0 bytes
-rw-r--r--awesome/theme/layouts/max.pngbin321 -> 0 bytes
-rw-r--r--awesome/theme/layouts/maxw.pngbin321 -> 0 bytes
-rw-r--r--awesome/theme/layouts/spiral.pngbin1506 -> 0 bytes
-rw-r--r--awesome/theme/layouts/spiralw.pngbin1527 -> 0 bytes
-rw-r--r--awesome/theme/layouts/tile.pngbin174 -> 0 bytes
-rw-r--r--awesome/theme/layouts/tilebottom.pngbin195 -> 0 bytes
-rw-r--r--awesome/theme/layouts/tilebottomw.pngbin216 -> 0 bytes
-rw-r--r--awesome/theme/layouts/tileleft.pngbin172 -> 0 bytes
-rw-r--r--awesome/theme/layouts/tileleftw.pngbin170 -> 0 bytes
-rw-r--r--awesome/theme/layouts/tiletop.pngbin195 -> 0 bytes
-rw-r--r--awesome/theme/layouts/tiletopw.pngbin215 -> 0 bytes
-rw-r--r--awesome/theme/layouts/tilew.pngbin168 -> 0 bytes
-rw-r--r--awesome/theme/submenu.pngbin440 -> 0 bytes
-rw-r--r--awesome/theme/taglist/squarefw.pngbin187 -> 0 bytes
-rw-r--r--awesome/theme/taglist/squarew.pngbin193 -> 0 bytes
-rw-r--r--awesome/theme/theme.lua105
-rw-r--r--awesome/theme/titlebar/close_focus.pngbin666 -> 0 bytes
-rw-r--r--awesome/theme/titlebar/close_normal.pngbin830 -> 0 bytes
-rw-r--r--awesome/theme/titlebar/floating_focus_active.pngbin598 -> 0 bytes
-rw-r--r--awesome/theme/titlebar/floating_focus_inactive.pngbin549 -> 0 bytes
-rw-r--r--awesome/theme/titlebar/floating_normal_active.pngbin814 -> 0 bytes
-rw-r--r--awesome/theme/titlebar/floating_normal_inactive.pngbin553 -> 0 bytes
-rw-r--r--awesome/theme/titlebar/maximized_focus_active.pngbin1013 -> 0 bytes
-rw-r--r--awesome/theme/titlebar/maximized_focus_inactive.pngbin754 -> 0 bytes
-rw-r--r--awesome/theme/titlebar/maximized_normal_active.pngbin1493 -> 0 bytes
-rw-r--r--awesome/theme/titlebar/maximized_normal_inactive.pngbin740 -> 0 bytes
-rw-r--r--awesome/theme/titlebar/ontop_focus_active.pngbin774 -> 0 bytes
-rw-r--r--awesome/theme/titlebar/ontop_focus_inactive.pngbin679 -> 0 bytes
-rw-r--r--awesome/theme/titlebar/ontop_normal_active.pngbin1233 -> 0 bytes
-rw-r--r--awesome/theme/titlebar/ontop_normal_inactive.pngbin682 -> 0 bytes
-rw-r--r--awesome/theme/titlebar/sticky_focus_active.pngbin833 -> 0 bytes
-rw-r--r--awesome/theme/titlebar/sticky_focus_inactive.pngbin624 -> 0 bytes
-rw-r--r--awesome/theme/titlebar/sticky_normal_active.pngbin1377 -> 0 bytes
-rw-r--r--awesome/theme/titlebar/sticky_normal_inactive.pngbin601 -> 0 bytes
63 files changed, 185 insertions, 312 deletions
diff --git a/awesome/awesome.desktop b/awesome/awesome.desktop
deleted file mode 100644
index 1945e7a..0000000
--- a/awesome/awesome.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-# For use in ubuntu, just copy into /usr/share/xsessions
-
-[Desktop Entry]
-Name=awesome
-Comment=Highly configurable framework window manager
-Exec=/home/mediocregopher/.nix-profile/bin/awesome
-Type=Application
-Icon=/usr/share/pixmaps/awesome.xpm
-Keywords=Window manager
diff --git a/awesome/bat.lua b/awesome/bat.lua
deleted file mode 100644
index a5348d6..0000000
--- a/awesome/bat.lua
+++ /dev/null
@@ -1,43 +0,0 @@
-local io = io
-local math = math
-local tonumber = tonumber
-local string = string
-local naughty = require("naughty")
-
-function batteryInfo()
- for i=0,1 do
- local dir = "/sys/class/power_supply/BAT" .. tostring(i) .. "/"
- local f_status = io.popen("cat " .. dir .. "status 2>/dev/null")
- local c_status = f_status:read()
- f_status:close()
-
- if c_status and c_status ~= "" then
- local prefix = "energy"
- local f_now = io.popen("cat " .. dir .. prefix .. "_now 2>/dev/null")
- local c_now_str = f_now:read()
- f_now:close()
-
- if not c_now_str or c_now_str == "" then
- prefix = "charge"
- local f_now = io.popen("cat " .. dir .. prefix .. "_now")
- c_now_str = f_now:read()
- f_now:close()
- end
-
- local f_full = io.popen("cat " .. dir .. prefix .. "_full")
- local c_full_str = f_full:read()
- f_full:close()
-
- local c_now = tonumber(c_now_str)
- local c_full = tonumber(c_full_str)
-
- local charging = (c_status == "Charging" or c_status == "Full")
-
- if c_now ~= nil and c_full ~= nil then
- local percent = math.floor((c_now/c_full) * 100)
- return percent, charging
- end
- end
- end
- return nil, charging
-end
diff --git a/awesome/bin/cricket b/awesome/bin/cricket
deleted file mode 100755
index b8d5699..0000000
--- a/awesome/bin/cricket
+++ /dev/null
Binary files differ
diff --git a/awesome/bin/scrot-gobin.sh b/awesome/bin/scrot-gobin.sh
deleted file mode 100755
index 33bfc9f..0000000
--- a/awesome/bin/scrot-gobin.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-scrot -o -s "/tmp/shot.png"
-eog /tmp/shot.png
diff --git a/awesome/bin/scrot.sh b/awesome/bin/scrot.sh
new file mode 100755
index 0000000..8a39ac9
--- /dev/null
+++ b/awesome/bin/scrot.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+mkdir -p ~/Screenshots
+f="$HOME/Screenshots/shot-$(date +%s).png"
+scrot -o -s "$f"
+feh "$f"
diff --git a/awesome/bin/sysstats.sh b/awesome/bin/sysstats.sh
deleted file mode 100755
index f42588e..0000000
--- a/awesome/bin/sysstats.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-
-cd $(dirname "$0")
-
-sep=" | "
-
-out=$(/home/mediocregopher/.config/awesome/bin/cricket \
- --limit 1 \
- --ping-hosts 8.8.8.8 \
- --net-interval "" \
- --disk-interval "" \
- --disk-io-interval "")
-
-function outNum {
- echo "$out" | grep "$1" | grep -oP "$2=\"[0-9]+\"" | grep -oP '[0-9]+'
-}
-
-echo -n "ping:$(outNum "ping result" "tookMSAvg")ms"
-
-echo -n "$sep"
-
-memBarSize=10
-memPer=$(outNum "mem stats" "memUsedPer")
-memUsed=$(expr $memPer / $memBarSize)
-memUnused=$(expr $memBarSize - $memUsed)
-echo -n "mem:"
-for i in $(seq $memUsed); do echo -n "█"; done
-for i in $(seq $memUnused); do echo -n "░"; done
-for i in $(seq $(expr $memBarSize - $memUsed - $memUnused)); do echo -n "░"; done
-
-echo -n "$sep"
-
-cpuBarSize=20
-cpuIdle=$(outNum "cpu stats" "cpuIdle")
-cpuSys=$(outNum "cpu stats" "cpuSystem")
-cpuUser=$(outNum "cpu stats" "cpuUser")
-cpuTot=$(expr $cpuIdle + $cpuSys + $cpuUser)
-function cpuL {
- python -c "print(int($1 / $cpuTot * $cpuBarSize))"
-}
-cpuLIdle=$(cpuL $cpuIdle)
-cpuLSys=$(cpuL $cpuSys)
-cpuLUser=$(cpuL $cpuUser)
-echo -n "cpu:"
-for i in $(seq $cpuLUser); do echo -n "█"; done
-for i in $(seq $cpuLSys); do echo -n "▓"; done
-for i in $(seq $cpuLIdle); do echo -n "░"; done
-for i in $(seq $(expr $cpuBarSize - $cpuLIdle - $cpuLSys - $cpuLUser)); do echo -n "░"; done
-
-echo ""
diff --git a/awesome/config/gtk-3.0/bookmarks b/awesome/config/gtk-3.0/bookmarks
new file mode 100644
index 0000000..63fc023
--- /dev/null
+++ b/awesome/config/gtk-3.0/bookmarks
@@ -0,0 +1,3 @@
+file:///tmp
+file:///home/mediocregopher/Screenshots
+file:///home/mediocregopher/Downloads
diff --git a/awesome/config/gtk-3.0/settings.ini b/awesome/config/gtk-3.0/settings.ini
new file mode 100644
index 0000000..0ca365e
--- /dev/null
+++ b/awesome/config/gtk-3.0/settings.ini
@@ -0,0 +1,2 @@
+[Settings]
+gtk-icon-theme-name = Tela
diff --git a/awesome/default.nix b/awesome/default.nix
index 03fe298..d5cff69 100644
--- a/awesome/default.nix
+++ b/awesome/default.nix
@@ -1,29 +1,122 @@
{
- pkgs ? (import ../pkgs.nix) {},
+ config,
+
}: rec {
- cfg = ./.;
+ pkgs = (import ../pkgs.nix).stable {};
+ pkgs2305 = (import ../pkgs.nix).stable2305 {};
+ pkgsEdge = (import ../pkgs.nix).edge {};
+
+ # nativeWrap is used for apps which are not installed via nix which don't play
+ # nicely with it.
+ nativeWrap = pkgs.writeScriptBin "native-wrap" ''
+ #!${pkgs.bash}/bin/bash
+
+ unset XDG_CONFIG_DIRS
+ unset XDG_DATA_DIRS
+ unset GDK_PIXBUF_MODULE_FILE
+
+ exec "$@"
+ '';
+
+ browser = pkgs.writeScriptBin "browser" ''
+ #!${pkgs.bash}/bin/bash
+ exec ${nativeWrap}/bin/native-wrap ${config.browser} "$@"
+ '';
+
+ env = pkgs.buildEnv {
+ name = "awesome-env";
+ paths = [
+
+ pkgs.awesome
+ pkgs.tela-icon-theme
+
+ nativeWrap
+ browser
+
+ pkgs.xorg.xrandr
+ pkgs.xsel
+ pkgs.pavucontrol
+ pkgs.xdg-utils
+ pkgs.arandr
+
+ pkgs.i3lock
+ pkgs.scrot
+ pkgs.feh
+ pkgs.brightnessctl
+
+ pkgs.cbatticon
+ pkgs.phwmon
+
+ pkgs.castor
+ pkgs2305.libreoffice
+ pkgs.gimp
+ pkgs.inkscape
+ pkgs.vlc
+ pkgs.sylpheed
+
+ pkgsEdge.lagrange
+ ];
+ };
+
wp = ../wallpapers;
dirsLua = pkgs.writeTextDir "dirs.lua" ''
home_dir = os.getenv("HOME").."/"
- conf_dir = "${cfg}/"
+ bin_dir = "${./bin}/"
+ share_dir = "${./share}/"
wp_dir = "${wp}/"
'';
awesome = pkgs.writeScriptBin "awesome" ''
#!${pkgs.bash}/bin/bash
- export BROWSER=/usr/bin/google-chrome
+ export BROWSER=${browser}/bin/browser
+
+ # Turn off powersaving (fuck the environment)
+ xset -dpms
+ xset s off
+
+ export PATH=${env}/bin:$PATH
+
+ export XDG_CONFIG_DIRS=${./config}
+
+ export XDG_DATA_DIRS=${env}/share
+ export XDG_DATA_DIRS=$XDG_DATA_DIRS:/home/mediocregopher/.nix-profile/share
+
+ ${config.awesome.startupExtra}
+
+ # HACK: This sleep is here because phwmon actually creates a separate tray
+ # icon for each thing it monitors, and if the process runs at the same time
+ # as another process which creates a tray icon they can get interleaved.
+ (sleep 5 && phwmon.py) &
- echo "[$(date)] New awesome session starting" > ~/.awesome.log
- exec ${pkgs.awesome}/bin/awesome \
- -c ${cfg}/rc.lua \
+ ############################################################################
+ # Init awesome
+
+ data_dir="$HOME/.local/share/awesome";
+ mkdir -p "$dataDir"
+
+ log_dir="$data_dir"/logs
+ mkdir -p $log_dir
+
+ # only keep last N awesome.log files
+ ls "$log_dir" | sort -n | head -n -5 | while read f; do rm "$log_dir"/"$f"; done
+
+ ############################################################################
+ # Exec
+
+ this_log=$log_dir/awesome.$(date '+%Y%m%d.%H%M%S').log
+
+ echo "New awesome session starting" > $this_log
+
+ exec awesome \
+ -c ${./rc.lua} \
--search ${dirsLua} \
- --search ${cfg} \
- 2>&1 2>>~/.awesome.log
+ --search ${./share} \
+ --search ${env}/share/awesome/themes \
+ 2>&1 2>>$this_log
'';
-
}
diff --git a/awesome/mediocregopher-sysstats.service b/awesome/mediocregopher-sysstats.service
deleted file mode 100644
index bac39ba..0000000
--- a/awesome/mediocregopher-sysstats.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=mediocregopher's sysstats
-Requires=network.target
-After=network.target
-
-[Service]
-Restart=always
-RestartSec=1s
-User=mediocregopher
-ExecStart=/bin/bash -c 'while [ 1 ]; do out=$(~/.config/awesome/bin/sysstats.sh); echo "$out" > /tmp/sysstats; sleep 1; done'
-
-[Install]
-WantedBy=multi-user.target
diff --git a/awesome/rc.lua b/awesome/rc.lua
index 5ec053e..9a73444 100644
--- a/awesome/rc.lua
+++ b/awesome/rc.lua
@@ -1,7 +1,6 @@
-- Standard awesome library
local gears = require("gears")
local awful = require("awful")
-awful.rules = require("awful.rules")
require("awful.autofocus")
-- Widget and layout library
local wibox = require("wibox")
@@ -19,17 +18,13 @@ local function info(msg)
end
require("dirs")
-require("bat")
require("pulseaudio")
muteAll() -- pre-emptively mute all mics, just in-case
--- for sanity
-local home_dir = os.getenv("HOME").."/"
-
-- {{{ Naughty config (the notification library)
naughty.config.defaults.position = "bottom_right"
naughty.config.defaults.width = 250
-naughty.config.defaults.icon=conf_dir .. "helper.png"
+naughty.config.defaults.icon=share_dir .. "helper.png"
naughty.config.defaults.icon_size = 75
-- }}}
@@ -67,15 +62,15 @@ local beautiful = require("beautiful")
function rand_wp()
local ls = io.popen("ls " .. wp_dir .. " | shuf -n1")
local wp = ls:read("*l")
- return wp_dir .. '/' .. wp
+ return wp_dir .. wp
end
function rand_wp_lock()
- awful.spawn(conf_dir.."bin/random_i3lock.sh "..wp_dir, false)
+ awful.spawn(bin_dir.."random_i3lock.sh "..wp_dir, false)
end
local wp = rand_wp()
-local imgavg = io.popen("cat " .. wp .. " | " .. conf_dir .. "/bin/imgavg")
+local imgavg = io.popen("cat " .. wp .. " | " .. bin_dir .. "imgavg")
local avgcolor = imgavg:read()
local comcolor = imgavg:read()
imgavg:close()
@@ -85,7 +80,7 @@ for s = 1, screen.count() do
end
-- }}}
-require("theme/theme")
+require("theme")
local theme = load_theme(avgcolor, comcolor)
beautiful.init(theme)
@@ -135,48 +130,6 @@ menubar.utils.terminal = terminal -- Set the terminal for applications that requ
-- {{{ Wibox
--- {{{ Battery widget
-local battimerintvl = 4
-batwidget = wibox.widget.textbox("")
-battimer = gears.timer({ timeout = battimerintvl })
-battimer:connect_signal("timeout",
- function()
- local batlevel, charging = batteryInfo()
- if batlevel == nil then batlevel = "unk"
- elseif (tonumber(batlevel) < 10) then
- naughty.notify({
- preset = naughty.config.presets.critical,
- title="ALERT",
- text="BATTERY LEVEL LOW",
- timeout=battimerintvl-1,
- })
- end
- if charging then
- batwidget:set_markup('bat:'..batlevel)
- else
- batwidget:set_markup('<b>bat:'..batlevel..'</b>')
- end
- end)
-battimer:start()
--- }}}
-
--- {{{ sysstats widget
-sysstatswidget = wibox.widget.textbox("")
-sysstatstimer = gears.timer({ timeout = 1 })
-sysstatstimer:connect_signal("timeout",
- function()
- local sysstats = "??? STATS ???"
- local f_sysstats = io.open("/tmp/sysstats")
- if f_sysstats then
- c_sysstats = f_sysstats:read()
- f_sysstats:close()
- if c_sysstats then sysstats = c_sysstats end
- end
- sysstatswidget:set_markup(sysstats)
- end)
-sysstatstimer:start()
--- }}}
-
-- {{{ notifier for when my mic isn't muted
local unmuteNot
mutechecktimer = gears.timer({ timeout = 0.5 })
@@ -280,10 +233,6 @@ for s = 1, screen.count() do
-- Widgets that are aligned to the right
local right_sep = " | "
local right_layout = wibox.layout.fixed.horizontal()
- --right_layout:add(wibox.widget.textbox(right_sep))
- right_layout:add(sysstatswidget)
- right_layout:add(wibox.widget.textbox(right_sep))
- right_layout:add(batwidget)
right_layout:add(wibox.widget.textbox(right_sep))
right_layout:add(wibox.widget.systray())
right_layout:add(wibox.widget.textbox(right_sep))
@@ -381,7 +330,7 @@ globalkeys = awful.util.table.join(
end),
--PrintScreen
- awful.key({}, "Print", false, function () awful.spawn(conf_dir.."bin/scrot-gobin.sh",false) end),
+ awful.key({}, "Print", false, function () awful.spawn(bin_dir.."scrot.sh",false) end),
awful.key({ "Control" }, "Print", function ()
local scr_dir = home_dir..'Screenshots'
awful.spawn("mkdir -p "..scr_dir, false)
@@ -407,11 +356,11 @@ globalkeys = awful.util.table.join(
end),
awful.key( { }, "XF86MonBrightnessUp", function()
- awful.spawn("/usr/bin/xbacklight -inc 5", false)
+ awful.spawn("brightnessctl s +5%", false)
end),
awful.key( { }, "XF86MonBrightnessDown", function()
- awful.spawn("/usr/bin/xbacklight -dec 5", false)
+ awful.spawn("brightnessctl s 5%-", false)
end),
-- Push to talk
@@ -419,10 +368,8 @@ globalkeys = awful.util.table.join(
awful.spawn("/usr/bin/pactl set-source-mute @DEFAULT_SOURCE@ 0")
end,
muteAll,
- { })
-)
+ { }),
-globalkeys = awful.util.table.join(globalkeys,
awful.key( { modkey }, "a", function()
info(tostring(os.time()))
end)
@@ -441,9 +388,25 @@ clientkeys = awful.util.table.join(
end),
awful.key({ modkey, }, "m",
function (c)
- c.maximized_horizontal = not c.maximized_horizontal
- c.maximized_vertical = not c.maximized_vertical
- end)
+ if c.maximized then
+ c.maximized = false
+ else
+ c.maximized_horizontal = not c.maximized_horizontal
+ c.maximized_vertical = not c.maximized_vertical
+ end
+ end),
+
+ awful.key({ modkey }, "d", function (c)
+ info(gears.debug.dump_return(c, "client"))
+ info(gears.debug.dump_return({
+ maximized = c.maximized,
+ maximized_horizontal = c.maximized_horizontal,
+ maximized_vertical = c.maximized_vertical,
+ motif_wm_hints = c.motif_wm_hints,
+ is_fixed = c.is_fixed(),
+ immobilized = c.immobilized
+ }, "client_stuff"))
+ end)
)
-- Bind all key numbers to tags.
@@ -501,16 +464,26 @@ awful.rules.rules = {
focus = awful.client.focus.filter,
raise = true,
keys = clientkeys,
- buttons = clientbuttons } },
- { rule = { class = "MPlayer" },
- properties = { floating = true } },
- { rule = { class = "pinentry" },
- properties = { floating = true } },
- { rule = { class = "gimp" },
- properties = { floating = true } }
- -- Set Firefox to always map on tags number 2 of screen 1.
- -- { rule = { class = "Firefox" },
- -- properties = { tag = tags[1][2] } },
+ buttons = clientbuttons,
+ screen = awful.screen.preferred,
+ placement = awful.placement.no_overlap+awful.placement.no_offscreen
+ }
+ },
+
+ { rule = { class = "firefox" },
+ properties = { screen = 1, tag = "1" } },
+
+ { rule = { class = "lagrange" },
+ properties = { screen = 1, tag = "1" } },
+
+ { rule = { class = "zoom" },
+ properties = { screen = 1, tag = "5" } },
+
+ { rule = { class = "Signal" },
+ properties = { screen = 1, tag = "9" } },
+
+ { rule = { class = "Sylpheed" },
+ properties = { screen = 1, tag = "9" } },
}
-- }}}
diff --git a/awesome/helper.png b/awesome/share/helper.png
index 4b43bf7..4b43bf7 100644
--- a/awesome/helper.png
+++ b/awesome/share/helper.png
Binary files differ
diff --git a/awesome/pulseaudio.lua b/awesome/share/pulseaudio.lua
index 765fd12..765fd12 100644
--- a/awesome/pulseaudio.lua
+++ b/awesome/share/pulseaudio.lua
diff --git a/awesome/share/theme.lua b/awesome/share/theme.lua
new file mode 100644
index 0000000..c5ad11e
--- /dev/null
+++ b/awesome/share/theme.lua
@@ -0,0 +1,22 @@
+function load_theme(avgcolor, comcolor)
+
+ local theme = require("default/theme")
+
+ if avgcolor then
+ theme.bg_normal = avgcolor
+ theme.bg_focus = theme.bg_normal
+ theme.bg_urgent = "#ff0000" -- TODO should be opposite of bg_normal
+ theme.bg_minimize = theme.bg_normal
+ theme.bg_systray = theme.bg_normal
+ end
+
+ if comcolor then
+ theme.fg_normal = comcolor
+ theme.fg_focus = comcolor
+ theme.fg_urgent = "#ffffff"
+ theme.fg_minimize = comcolor
+ end
+
+ return theme
+
+end
diff --git a/awesome/theme/README b/awesome/theme/README
deleted file mode 100644
index 1ddb349..0000000
--- a/awesome/theme/README
+++ /dev/null
@@ -1,3 +0,0 @@
-Background images:
- Mikael Eriksson <mikael_eriksson@miffe.org>
- Licensed under CC-BY-SA-3.0
diff --git a/awesome/theme/background.png b/awesome/theme/background.png
deleted file mode 100644
index d72a39e..0000000
--- a/awesome/theme/background.png
+++ /dev/null
Binary files differ
diff --git a/awesome/theme/background_white.png b/awesome/theme/background_white.png
deleted file mode 100644
index 363ddd6..0000000
--- a/awesome/theme/background_white.png
+++ /dev/null
Binary files differ
diff --git a/awesome/theme/layouts/dwindle.png b/awesome/theme/layouts/dwindle.png
deleted file mode 100644
index 943ece5..0000000
--- a/awesome/theme/layouts/dwindle.png
+++ /dev/null
Binary files differ
diff --git a/awesome/theme/layouts/dwindlew.png b/awesome/theme/layouts/dwindlew.png
deleted file mode 100644
index 36de1ba..0000000
--- a/awesome/theme/layouts/dwindlew.png
+++ /dev/null
Binary files differ
diff --git a/awesome/theme/layouts/fairh.png b/awesome/theme/layouts/fairh.png
deleted file mode 100644
index b4e289d..0000000
--- a/awesome/theme/layouts/fairh.png
+++ /dev/null
Binary files differ
diff --git a/awesome/theme/layouts/fairhw.png b/awesome/theme/layouts/fairhw.png
deleted file mode 100644
index 514d66d..0000000
--- a/awesome/theme/layouts/fairhw.png
+++ /dev/null
Binary files differ
diff --git a/awesome/theme/layouts/fairv.png b/awesome/theme/layouts/fairv.png
deleted file mode 100644
index e5aad70..0000000
--- a/awesome/theme/layouts/fairv.png
+++ /dev/null
Binary files differ
diff --git a/awesome/theme/layouts/fairvw.png b/awesome/theme/layouts/fairvw.png
deleted file mode 100644
index f97ce56..0000000
--- a/awesome/theme/layouts/fairvw.png
+++ /dev/null
Binary files differ
diff --git a/awesome/theme/layouts/floating.png b/awesome/theme/layouts/floating.png
deleted file mode 100644
index cbc7804..0000000
--- a/awesome/theme/layouts/floating.png
+++ /dev/null
Binary files differ
diff --git a/awesome/theme/layouts/floatingw.png b/awesome/theme/layouts/floatingw.png
deleted file mode 100644
index 7ddf7ae..0000000
--- a/awesome/theme/layouts/floatingw.png
+++ /dev/null
Binary files differ
diff --git a/awesome/theme/layouts/fullscreen.png b/awesome/theme/layouts/fullscreen.png
deleted file mode 100644
index 46716f5..0000000
--- a/awesome/theme/layouts/fullscreen.png
+++ /dev/null
Binary files differ
diff --git a/awesome/theme/layouts/fullscreenw.png b/awesome/theme/layouts/fullscreenw.png
deleted file mode 100644
index 2c3cfad..0000000
--- a/awesome/theme/layouts/fullscreenw.png
+++ /dev/null
Binary files differ
diff --git a/awesome/theme/layouts/magnifier.png b/awesome/theme/layouts/magnifier.png
deleted file mode 100644
index 1476555..0000000
--- a/awesome/theme/layouts/magnifier.png
+++ /dev/null
Binary files differ
diff --git a/awesome/theme/layouts/magnifierw.png b/awesome/theme/layouts/magnifierw.png
deleted file mode 100644
index 97c1d11..0000000
--- a/awesome/theme/layouts/magnifierw.png
+++ /dev/null
Binary files differ
diff --git a/awesome/theme/layouts/max.png b/awesome/theme/layouts/max.png
deleted file mode 100644
index fe70bef..0000000
--- a/awesome/theme/layouts/max.png
+++ /dev/null
Binary files differ
diff --git a/awesome/theme/layouts/maxw.png b/awesome/theme/layouts/maxw.png
deleted file mode 100644
index d8debb8..0000000
--- a/awesome/theme/layouts/maxw.png
+++ /dev/null
Binary files differ
diff --git a/awesome/theme/layouts/spiral.png b/awesome/theme/layouts/spiral.png
deleted file mode 100644
index a24faf5..0000000
--- a/awesome/theme/layouts/spiral.png
+++ /dev/null
Binary files differ
diff --git a/awesome/theme/layouts/spiralw.png b/awesome/theme/layouts/spiralw.png
deleted file mode 100644
index f34ceb0..0000000
--- a/awesome/theme/layouts/spiralw.png
+++ /dev/null
Binary files differ
diff --git a/awesome/theme/layouts/tile.png b/awesome/theme/layouts/tile.png
deleted file mode 100644
index 071a385..0000000
--- a/awesome/theme/layouts/tile.png
+++ /dev/null
Binary files differ
diff --git a/awesome/theme/layouts/tilebottom.png b/awesome/theme/layouts/tilebottom.png
deleted file mode 100644
index aeedbe2..0000000
--- a/awesome/theme/layouts/tilebottom.png
+++ /dev/null
Binary files differ
diff --git a/awesome/theme/layouts/tilebottomw.png b/awesome/theme/layouts/tilebottomw.png
deleted file mode 100644
index f42da9d..0000000
--- a/awesome/theme/layouts/tilebottomw.png
+++ /dev/null
Binary files differ
diff --git a/awesome/theme/layouts/tileleft.png b/awesome/theme/layouts/tileleft.png
deleted file mode 100644
index ab55e08..0000000
--- a/awesome/theme/layouts/tileleft.png
+++ /dev/null
Binary files differ
diff --git a/awesome/theme/layouts/tileleftw.png b/awesome/theme/layouts/tileleftw.png
deleted file mode 100644
index c18e7b4..0000000
--- a/awesome/theme/layouts/tileleftw.png
+++ /dev/null
Binary files differ
diff --git a/awesome/theme/layouts/tiletop.png b/awesome/theme/layouts/tiletop.png
deleted file mode 100644
index 3febc35..0000000
--- a/awesome/theme/layouts/tiletop.png
+++ /dev/null
Binary files differ
diff --git a/awesome/theme/layouts/tiletopw.png b/awesome/theme/layouts/tiletopw.png
deleted file mode 100644
index daf965f..0000000
--- a/awesome/theme/layouts/tiletopw.png
+++ /dev/null
Binary files differ
diff --git a/awesome/theme/layouts/tilew.png b/awesome/theme/layouts/tilew.png
deleted file mode 100644
index c722a35..0000000
--- a/awesome/theme/layouts/tilew.png
+++ /dev/null
Binary files differ
diff --git a/awesome/theme/submenu.png b/awesome/theme/submenu.png
deleted file mode 100644
index b2778e2..0000000
--- a/awesome/theme/submenu.png
+++ /dev/null
Binary files differ
diff --git a/awesome/theme/taglist/squarefw.png b/awesome/theme/taglist/squarefw.png
deleted file mode 100644
index 2a86430..0000000
--- a/awesome/theme/taglist/squarefw.png
+++ /dev/null
Binary files differ
diff --git a/awesome/theme/taglist/squarew.png b/awesome/theme/taglist/squarew.png
deleted file mode 100644
index 913f2ca..0000000
--- a/awesome/theme/taglist/squarew.png
+++ /dev/null
Binary files differ
diff --git a/awesome/theme/theme.lua b/awesome/theme/theme.lua
deleted file mode 100644
index 904c2bd..0000000
--- a/awesome/theme/theme.lua
+++ /dev/null
@@ -1,105 +0,0 @@
----------------------------
--- Default awesome theme --
----------------------------
-
-function load_theme(avgcolor, comcolor)
- if not avgcolor then avgcolor = "#000000" end
- if not comcolor then comcolor = "#FFFFFF" end
-
- local theme = {}
-
- theme.font = "sans 8"
-
- --theme.bg_normal = "#222222"
- theme.bg_normal = avgcolor
- theme.bg_focus = theme.bg_normal
- theme.bg_urgent = "#ff0000" -- TODO should be opposite of bg_normal
- theme.bg_minimize = theme.bg_normal
- theme.bg_systray = theme.bg_normal
-
-
- --theme.fg_normal = "#aaaaaa"
- theme.fg_normal = comcolor
- theme.fg_focus = comcolor
- theme.fg_urgent = "#ffffff"
- theme.fg_minimize = comcolor
-
- theme.border_width = 1
- theme.border_normal = "#000000"
- theme.border_focus = "#535d6c"
- theme.border_marked = "#91231c"
-
- -- There are other variable sets
- -- overriding the default one when
- -- defined, the sets are:
- -- [taglist|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]
- -- Example:
- --theme.taglist_bg_focus = "#ff0000"
-
- -- Display the taglist squares
- theme.taglist_squares_sel = "/usr/share/awesome/themes/default/taglist/squarefw.png"
- theme.taglist_squares_unsel = "/usr/share/awesome/themes/default/taglist/squarew.png"
-
- -- Variables set for theming the menu:
- -- menu_[bg|fg]_[normal|focus]
- -- menu_[border_color|border_width]
- theme.menu_submenu_icon = "/usr/share/awesome/themes/default/submenu.png"
- theme.menu_height = 15
- theme.menu_width = 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 = "/usr/share/awesome/themes/default/titlebar/close_normal.png"
- theme.titlebar_close_button_focus = "/usr/share/awesome/themes/default/titlebar/close_focus.png"
-
- theme.titlebar_ontop_button_normal_inactive = "/usr/share/awesome/themes/default/titlebar/ontop_normal_inactive.png"
- theme.titlebar_ontop_button_focus_inactive = "/usr/share/awesome/themes/default/titlebar/ontop_focus_inactive.png"
- theme.titlebar_ontop_button_normal_active = "/usr/share/awesome/themes/default/titlebar/ontop_normal_active.png"
- theme.titlebar_ontop_button_focus_active = "/usr/share/awesome/themes/default/titlebar/ontop_focus_active.png"
-
- theme.titlebar_sticky_button_normal_inactive = "/usr/share/awesome/themes/default/titlebar/sticky_normal_inactive.png"
- theme.titlebar_sticky_button_focus_inactive = "/usr/share/awesome/themes/default/titlebar/sticky_focus_inactive.png"
- theme.titlebar_sticky_button_normal_active = "/usr/share/awesome/themes/default/titlebar/sticky_normal_active.png"
- theme.titlebar_sticky_button_focus_active = "/usr/share/awesome/themes/default/titlebar/sticky_focus_active.png"
-
- theme.titlebar_floating_button_normal_inactive = "/usr/share/awesome/themes/default/titlebar/floating_normal_inactive.png"
- theme.titlebar_floating_button_focus_inactive = "/usr/share/awesome/themes/default/titlebar/floating_focus_inactive.png"
- theme.titlebar_floating_button_normal_active = "/usr/share/awesome/themes/default/titlebar/floating_normal_active.png"
- theme.titlebar_floating_button_focus_active = "/usr/share/awesome/themes/default/titlebar/floating_focus_active.png"
-
- theme.titlebar_maximized_button_normal_inactive = "/usr/share/awesome/themes/default/titlebar/maximized_normal_inactive.png"
- theme.titlebar_maximized_button_focus_inactive = "/usr/share/awesome/themes/default/titlebar/maximized_focus_inactive.png"
- theme.titlebar_maximized_button_normal_active = "/usr/share/awesome/themes/default/titlebar/maximized_normal_active.png"
- theme.titlebar_maximized_button_focus_active = "/usr/share/awesome/themes/default/titlebar/maximized_focus_active.png"
-
- theme.wallpaper = "/usr/share/awesome/themes/default/background.png"
-
- -- You can use your own layout icons like this:
- theme.layout_fairh = "/usr/share/awesome/themes/default/layouts/fairhw.png"
- theme.layout_fairv = "/usr/share/awesome/themes/default/layouts/fairvw.png"
- theme.layout_floating = "/usr/share/awesome/themes/default/layouts/floatingw.png"
- theme.layout_magnifier = "/usr/share/awesome/themes/default/layouts/magnifierw.png"
- theme.layout_max = "/usr/share/awesome/themes/default/layouts/maxw.png"
- theme.layout_fullscreen = "/usr/share/awesome/themes/default/layouts/fullscreenw.png"
- theme.layout_tilebottom = "/usr/share/awesome/themes/default/layouts/tilebottomw.png"
- theme.layout_tileleft = "/usr/share/awesome/themes/default/layouts/tileleftw.png"
- theme.layout_tile = "/usr/share/awesome/themes/default/layouts/tilew.png"
- theme.layout_tiletop = "/usr/share/awesome/themes/default/layouts/tiletopw.png"
- theme.layout_spiral = "/usr/share/awesome/themes/default/layouts/spiralw.png"
- theme.layout_dwindle = "/usr/share/awesome/themes/default/layouts/dwindlew.png"
-
- theme.awesome_icon = "/usr/share/awesome/icons/awesome16.png"
-
- -- 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
-end
diff --git a/awesome/theme/titlebar/close_focus.png b/awesome/theme/titlebar/close_focus.png
deleted file mode 100644
index a5b7958..0000000
--- a/awesome/theme/titlebar/close_focus.png
+++ /dev/null
Binary files differ
diff --git a/awesome/theme/titlebar/close_normal.png b/awesome/theme/titlebar/close_normal.png
deleted file mode 100644
index d0fdb7e..0000000
--- a/awesome/theme/titlebar/close_normal.png
+++ /dev/null
Binary files differ
diff --git a/awesome/theme/titlebar/floating_focus_active.png b/awesome/theme/titlebar/floating_focus_active.png
deleted file mode 100644
index 3447bb2..0000000
--- a/awesome/theme/titlebar/floating_focus_active.png
+++ /dev/null
Binary files differ
diff --git a/awesome/theme/titlebar/floating_focus_inactive.png b/awesome/theme/titlebar/floating_focus_inactive.png
deleted file mode 100644
index fe5bb3c..0000000
--- a/awesome/theme/titlebar/floating_focus_inactive.png
+++ /dev/null
Binary files differ
diff --git a/awesome/theme/titlebar/floating_normal_active.png b/awesome/theme/titlebar/floating_normal_active.png
deleted file mode 100644
index 3108e9e..0000000
--- a/awesome/theme/titlebar/floating_normal_active.png
+++ /dev/null
Binary files differ
diff --git a/awesome/theme/titlebar/floating_normal_inactive.png b/awesome/theme/titlebar/floating_normal_inactive.png
deleted file mode 100644
index d6f19db..0000000
--- a/awesome/theme/titlebar/floating_normal_inactive.png
+++ /dev/null
Binary files differ
diff --git a/awesome/theme/titlebar/maximized_focus_active.png b/awesome/theme/titlebar/maximized_focus_active.png
deleted file mode 100644
index 78a2914..0000000
--- a/awesome/theme/titlebar/maximized_focus_active.png
+++ /dev/null
Binary files differ
diff --git a/awesome/theme/titlebar/maximized_focus_inactive.png b/awesome/theme/titlebar/maximized_focus_inactive.png
deleted file mode 100644
index 2c3a5b7..0000000
--- a/awesome/theme/titlebar/maximized_focus_inactive.png
+++ /dev/null
Binary files differ
diff --git a/awesome/theme/titlebar/maximized_normal_active.png b/awesome/theme/titlebar/maximized_normal_active.png
deleted file mode 100644
index 7eb34a9..0000000
--- a/awesome/theme/titlebar/maximized_normal_active.png
+++ /dev/null
Binary files differ
diff --git a/awesome/theme/titlebar/maximized_normal_inactive.png b/awesome/theme/titlebar/maximized_normal_inactive.png
deleted file mode 100644
index 63cc537..0000000
--- a/awesome/theme/titlebar/maximized_normal_inactive.png
+++ /dev/null
Binary files differ
diff --git a/awesome/theme/titlebar/ontop_focus_active.png b/awesome/theme/titlebar/ontop_focus_active.png
deleted file mode 100644
index f954bed..0000000
--- a/awesome/theme/titlebar/ontop_focus_active.png
+++ /dev/null
Binary files differ
diff --git a/awesome/theme/titlebar/ontop_focus_inactive.png b/awesome/theme/titlebar/ontop_focus_inactive.png
deleted file mode 100644
index 7b7cf11..0000000
--- a/awesome/theme/titlebar/ontop_focus_inactive.png
+++ /dev/null
Binary files differ
diff --git a/awesome/theme/titlebar/ontop_normal_active.png b/awesome/theme/titlebar/ontop_normal_active.png
deleted file mode 100644
index 48defb3..0000000
--- a/awesome/theme/titlebar/ontop_normal_active.png
+++ /dev/null
Binary files differ
diff --git a/awesome/theme/titlebar/ontop_normal_inactive.png b/awesome/theme/titlebar/ontop_normal_inactive.png
deleted file mode 100644
index fd1dc01..0000000
--- a/awesome/theme/titlebar/ontop_normal_inactive.png
+++ /dev/null
Binary files differ
diff --git a/awesome/theme/titlebar/sticky_focus_active.png b/awesome/theme/titlebar/sticky_focus_active.png
deleted file mode 100644
index 1106399..0000000
--- a/awesome/theme/titlebar/sticky_focus_active.png
+++ /dev/null
Binary files differ
diff --git a/awesome/theme/titlebar/sticky_focus_inactive.png b/awesome/theme/titlebar/sticky_focus_inactive.png
deleted file mode 100644
index d75fa0e..0000000
--- a/awesome/theme/titlebar/sticky_focus_inactive.png
+++ /dev/null
Binary files differ
diff --git a/awesome/theme/titlebar/sticky_normal_active.png b/awesome/theme/titlebar/sticky_normal_active.png
deleted file mode 100644
index b33956a..0000000
--- a/awesome/theme/titlebar/sticky_normal_active.png
+++ /dev/null
Binary files differ
diff --git a/awesome/theme/titlebar/sticky_normal_inactive.png b/awesome/theme/titlebar/sticky_normal_inactive.png
deleted file mode 100644
index 7aeac90..0000000
--- a/awesome/theme/titlebar/sticky_normal_inactive.png
+++ /dev/null
Binary files differ