Merge remote-tracking branch 'gum/master'
This commit is contained in:
commit
18ff162945
@ -56,6 +56,16 @@ with config.krebs.lib;
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
ossim = { # vm on darth
|
||||||
|
nets = {
|
||||||
|
siem = {
|
||||||
|
ip4.addr = "10.8.10.6";
|
||||||
|
aliases = [
|
||||||
|
"ossim.siem"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
tsp = {
|
tsp = {
|
||||||
cores = 1;
|
cores = 1;
|
||||||
nets = {
|
nets = {
|
||||||
@ -291,6 +301,10 @@ with config.krebs.lib;
|
|||||||
wbob = rec {
|
wbob = rec {
|
||||||
cores = 1;
|
cores = 1;
|
||||||
nets = {
|
nets = {
|
||||||
|
siem = {
|
||||||
|
ip4.addr = "10.8.10.7";
|
||||||
|
aliases = [ "display.siem" ];
|
||||||
|
};
|
||||||
retiolum = {
|
retiolum = {
|
||||||
ip4.addr = "10.243.214.15";
|
ip4.addr = "10.243.214.15";
|
||||||
ip6.addr = "42:5a02:2c30:c1b1:3f2e:7c19:2496:a732";
|
ip6.addr = "42:5a02:2c30:c1b1:3f2e:7c19:2496:a732";
|
||||||
|
@ -64,7 +64,7 @@
|
|||||||
|
|
||||||
# configure pulseAudio to provide a HDMI sink as well
|
# configure pulseAudio to provide a HDMI sink as well
|
||||||
networking.firewall.enable = true;
|
networking.firewall.enable = true;
|
||||||
networking.firewall.allowedTCPPorts = [ 80 ];
|
networking.firewall.allowedTCPPorts = [ 80 24800 ];
|
||||||
networking.firewall.allowedUDPPorts = [ 665 ];
|
networking.firewall.allowedUDPPorts = [ 665 ];
|
||||||
|
|
||||||
krebs.build.host = config.krebs.hosts.pornocauster;
|
krebs.build.host = config.krebs.hosts.pornocauster;
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
{ config, pkgs, ... }:
|
{ config, pkgs, ... }:
|
||||||
{
|
{
|
||||||
|
makefu.awesome = {
|
||||||
|
modkey = "Mod1";
|
||||||
|
#TODO: integrate kiosk config into full config by templating the autostart
|
||||||
|
baseConfig = pkgs.awesomecfg.kiosk;
|
||||||
|
};
|
||||||
imports =
|
imports =
|
||||||
[ # Include the results of the hardware scan.
|
[ # Include the results of the hardware scan.
|
||||||
../.
|
../.
|
||||||
@ -10,6 +15,15 @@
|
|||||||
retiolum.enable = true;
|
retiolum.enable = true;
|
||||||
build.host = config.krebs.hosts.wbob;
|
build.host = config.krebs.hosts.wbob;
|
||||||
};
|
};
|
||||||
|
networking.firewall.allowedUDPPorts = [ 1655 ];
|
||||||
|
networking.firewall.allowedTCPPorts = [ 1655 ];
|
||||||
|
services.tinc.networks.siem = {
|
||||||
|
name = "display";
|
||||||
|
extraConfig = ''
|
||||||
|
ConnectTo = sjump
|
||||||
|
Port = 1655
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
# rt2870.bin wifi card, part of linux-unfree
|
# rt2870.bin wifi card, part of linux-unfree
|
||||||
hardware.enableAllFirmware = true;
|
hardware.enableAllFirmware = true;
|
||||||
@ -39,23 +53,18 @@
|
|||||||
xrandr --output HDMI2 --right-of HDMI1
|
xrandr --output HDMI2 --right-of HDMI1
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
## TODO Awesomecfg + autostart chrome
|
# TODO: update synergy package with these extras (username)
|
||||||
#
|
# TODO: add crypto layer
|
||||||
#local current_screen = 1
|
systemd.services."synergy-client" = {
|
||||||
#awful.rules.rules = {
|
environment.DISPLAY = ":0";
|
||||||
# { rule = { class = "chromium-browser" },
|
serviceConfig.User = "makefu";
|
||||||
# callback = function()
|
};
|
||||||
# awful.client.movetotag(tags[current_screen][1],c)
|
|
||||||
# if (current_screen == 1) then
|
|
||||||
# current_screen = current_screen+1
|
|
||||||
# else
|
|
||||||
# current_screen = current_screen-1
|
|
||||||
# end
|
|
||||||
# end
|
|
||||||
# },
|
|
||||||
#}
|
|
||||||
#awful.util.spawn_with_shell("chromium --new-window --kiosk http://wolf:3000/dashboard/db/soc-critical-values")
|
|
||||||
# prevent Race Condition
|
|
||||||
#awful.util.spawn_with_shell("sleep 0.5;chromium --new-window --kiosk http://wolf:3000/dashboard/db/aralast")
|
|
||||||
|
|
||||||
|
services.synergy = {
|
||||||
|
client = {
|
||||||
|
enable = true;
|
||||||
|
screenName = "wbob";
|
||||||
|
serverAddress = "pornocauster.r";
|
||||||
|
};
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
@ -2,4 +2,5 @@ _:
|
|||||||
|
|
||||||
{
|
{
|
||||||
full = ./full.cfg;
|
full = ./full.cfg;
|
||||||
|
kiosk = ./kiosk.lua;
|
||||||
}
|
}
|
||||||
|
533
makefu/5pkgs/awesomecfg/kiosk.lua
Normal file
533
makefu/5pkgs/awesomecfg/kiosk.lua
Normal file
@ -0,0 +1,533 @@
|
|||||||
|
-- Standard awesome library
|
||||||
|
local gears = require("gears")
|
||||||
|
local awful = require("awful")
|
||||||
|
local vicious = require("vicious")
|
||||||
|
awful.rules = require("awful.rules")
|
||||||
|
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")
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
-- {{{ 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 = err })
|
||||||
|
in_error = false
|
||||||
|
end)
|
||||||
|
end
|
||||||
|
-- }}}
|
||||||
|
|
||||||
|
-- {{{ Mails widget type
|
||||||
|
local function worker(format,warg)
|
||||||
|
local ncount = 0
|
||||||
|
for line in io.popen("ls "..warg..'/new'):lines() do
|
||||||
|
ncount = ncount +1
|
||||||
|
end
|
||||||
|
local count = 2
|
||||||
|
--for line in io.popen("ls "..warg..'/new'):lines() do
|
||||||
|
-- count = count +1
|
||||||
|
--end
|
||||||
|
return {ncount,count}
|
||||||
|
end
|
||||||
|
|
||||||
|
vicious_mails = setmetatable({}, { __call = function(_, ...) return worker(...) end })
|
||||||
|
mailwidget = wibox.widget.textbox()
|
||||||
|
|
||||||
|
local function only_new (widget,args)
|
||||||
|
if args[1] > 0 then
|
||||||
|
return string.format("%s new",args[1])
|
||||||
|
else
|
||||||
|
return ""
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
vicious.register(mailwidget, vicious_mails,only_new ,60,"~/Mail/localhost")
|
||||||
|
|
||||||
|
--mdirwidget = wibox.widget.textbox()
|
||||||
|
--vicious.register(mdirwidget, vicious.widgets.mdir, )
|
||||||
|
|
||||||
|
cpuwidget = awful.widget.graph()
|
||||||
|
-- Graph properties
|
||||||
|
cpuwidget:set_width(50)
|
||||||
|
cpuwidget:set_background_color("#494B4F")
|
||||||
|
cpuwidget:set_color({ type = "linear", from = { 0, 0 }, to = { 10,0 }, stops = { {0, "#FF5656"}, {0.5, "#88A175"},
|
||||||
|
{1, "#AECF96" }}})
|
||||||
|
vicious.register(cpuwidget, vicious.widgets.cpu, "$1")
|
||||||
|
|
||||||
|
-- Register widget
|
||||||
|
batwidget = wibox.widget.textbox()
|
||||||
|
vicious.register(batwidget, vicious.widgets.bat, "$2%", 61, "BAT0")
|
||||||
|
|
||||||
|
-- {{{ Variable definitions
|
||||||
|
-- Themes define colours, icons, and wallpapers
|
||||||
|
-- beautiful.init("/usr/share/awesome/themes/default/theme.lua")
|
||||||
|
-- ./qbx8r72yzaxpz41zq00902zwajl31b5h-awesome-3.5.6/share/awesome/lib/beautiful.lua
|
||||||
|
--
|
||||||
|
-- Find the default theme
|
||||||
|
|
||||||
|
--
|
||||||
|
-- beautiful.init("/nix/store/qbx8r72yzaxpz41zq00902zwajl31b5h-awesome-3.5.6/share/awesome/themes/default/theme.lua")
|
||||||
|
|
||||||
|
function find_default_theme()
|
||||||
|
-- find the default lua theme in the package path
|
||||||
|
for path in package.path:gmatch('([^;]+);') do
|
||||||
|
if path:match('awesome.*share') then
|
||||||
|
theme_path = path:match('^([^?]*)') .. '../themes/default/theme.lua'
|
||||||
|
if awful.util.file_readable(theme_path) then return theme_path end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
beautiful.init(find_default_theme())
|
||||||
|
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)
|
||||||
|
|
||||||
|
-- This is used later as the default terminal and editor to run.
|
||||||
|
terminal = "urxvt"
|
||||||
|
editor = os.getenv("EDITOR") or "vim"
|
||||||
|
editor_cmd = terminal .. " -e " .. editor
|
||||||
|
browser = "firefox"
|
||||||
|
|
||||||
|
modkey = "@modkey@"
|
||||||
|
|
||||||
|
-- Table of layouts to cover with awful.layout.inc, order matters.
|
||||||
|
local layouts =
|
||||||
|
{
|
||||||
|
awful.layout.suit.tile,
|
||||||
|
-- awful.layout.suit.tile.left,
|
||||||
|
awful.layout.suit.tile.bottom,
|
||||||
|
awful.layout.suit.floating,
|
||||||
|
-- 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
|
||||||
|
}
|
||||||
|
-- }}}
|
||||||
|
|
||||||
|
-- {{{ Wallpaper
|
||||||
|
if beautiful.wallpaper then
|
||||||
|
for s = 1, screen.count() do
|
||||||
|
gears.wallpaper.maximized(beautiful.wallpaper, s, true)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
-- }}}
|
||||||
|
|
||||||
|
-- {{{ Tags
|
||||||
|
-- Define a tag table which hold all screen tags.
|
||||||
|
tags = {}
|
||||||
|
for s = 1, screen.count() do
|
||||||
|
-- Each screen has its own tag table.
|
||||||
|
tags[s] = awful.tag({ "tmp", "news", "www", "im", "work1","work2","net","misc","remote" }, s, layouts[1])
|
||||||
|
end
|
||||||
|
-- }}}
|
||||||
|
|
||||||
|
-- {{{ Menu
|
||||||
|
-- Create a laucher widget and a main menu
|
||||||
|
myawesomemenu = {
|
||||||
|
{ "manual", terminal .. " -e man awesome" },
|
||||||
|
{ "edit config", editor_cmd .. " " .. awesome.conffile },
|
||||||
|
{ "restart", awesome.restart },
|
||||||
|
{ "quit", awesome.quit }
|
||||||
|
}
|
||||||
|
|
||||||
|
mymainmenu = awful.menu({ items = { { "awesome", myawesomemenu, beautiful.awesome_icon },
|
||||||
|
{ "open terminal", terminal },
|
||||||
|
{ "pcmanfm", "pcmanfm"}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
mylauncher = awful.widget.launcher({ image = beautiful.awesome_icon,
|
||||||
|
menu = mymainmenu })
|
||||||
|
|
||||||
|
-- Menubar configuration
|
||||||
|
menubar.utils.terminal = terminal -- Set the terminal for applications that require it
|
||||||
|
-- }}}
|
||||||
|
|
||||||
|
-- {{{ Wibox
|
||||||
|
-- Create a textclock widget
|
||||||
|
mytextclock = awful.widget.textclock()
|
||||||
|
|
||||||
|
-- Create a wibox for each screen and add it
|
||||||
|
mywibox = {}
|
||||||
|
mypromptbox = {}
|
||||||
|
mylayoutbox = {}
|
||||||
|
mytaglist = {}
|
||||||
|
mytaglist.buttons = awful.util.table.join(
|
||||||
|
awful.button({ }, 1, awful.tag.viewonly),
|
||||||
|
awful.button({ modkey }, 1, awful.client.movetotag),
|
||||||
|
awful.button({ }, 3, awful.tag.viewtoggle),
|
||||||
|
awful.button({ modkey }, 3, awful.client.toggletag),
|
||||||
|
awful.button({ }, 4, function(t) awful.tag.viewnext(awful.tag.getscreen(t)) end),
|
||||||
|
awful.button({ }, 5, function(t) awful.tag.viewprev(awful.tag.getscreen(t)) end)
|
||||||
|
)
|
||||||
|
mytasklist = {}
|
||||||
|
mytasklist.buttons = awful.util.table.join(
|
||||||
|
awful.button({ }, 1, function (c)
|
||||||
|
if c == client.focus then
|
||||||
|
c.minimized = true
|
||||||
|
else
|
||||||
|
-- Without this, the following
|
||||||
|
-- :isvisible() makes no sense
|
||||||
|
c.minimized = false
|
||||||
|
if not c:isvisible() then
|
||||||
|
awful.tag.viewonly(c:tags()[1])
|
||||||
|
end
|
||||||
|
-- This will also un-minimize
|
||||||
|
-- the client, if needed
|
||||||
|
client.focus = c
|
||||||
|
c:raise()
|
||||||
|
end
|
||||||
|
end),
|
||||||
|
awful.button({ }, 3, function ()
|
||||||
|
if instance then
|
||||||
|
instance:hide()
|
||||||
|
instance = nil
|
||||||
|
else
|
||||||
|
instance = awful.menu.clients({ width=250 })
|
||||||
|
end
|
||||||
|
end),
|
||||||
|
awful.button({ }, 4, function ()
|
||||||
|
awful.client.focus.byidx(1)
|
||||||
|
if client.focus then client.focus:raise() end
|
||||||
|
end),
|
||||||
|
awful.button({ }, 5, function ()
|
||||||
|
awful.client.focus.byidx(-1)
|
||||||
|
if client.focus then client.focus:raise() end
|
||||||
|
end))
|
||||||
|
|
||||||
|
for s = 1, screen.count() do
|
||||||
|
-- Create a promptbox for each screen
|
||||||
|
mypromptbox[s] = awful.widget.prompt()
|
||||||
|
-- Create an imagebox widget which will contains an icon indicating which layout we're using.
|
||||||
|
-- We need one layoutbox per screen.
|
||||||
|
mylayoutbox[s] = awful.widget.layoutbox(s)
|
||||||
|
mylayoutbox[s]:buttons(awful.util.table.join(
|
||||||
|
awful.button({ }, 1, function () awful.layout.inc(layouts, 1) end),
|
||||||
|
awful.button({ }, 3, function () awful.layout.inc(layouts, -1) end),
|
||||||
|
awful.button({ }, 4, function () awful.layout.inc(layouts, 1) end),
|
||||||
|
awful.button({ }, 5, function () awful.layout.inc(layouts, -1) end)))
|
||||||
|
-- Create a taglist widget
|
||||||
|
mytaglist[s] = awful.widget.taglist(s, awful.widget.taglist.filter.all, mytaglist.buttons)
|
||||||
|
|
||||||
|
-- Create a tasklist widget
|
||||||
|
mytasklist[s] = awful.widget.tasklist(s, awful.widget.tasklist.filter.currenttags, mytasklist.buttons)
|
||||||
|
|
||||||
|
-- Create the wibox
|
||||||
|
mywibox[s] = awful.wibox({ position = "top", screen = s })
|
||||||
|
|
||||||
|
-- Widgets that are aligned to the left
|
||||||
|
local left_layout = wibox.layout.fixed.horizontal()
|
||||||
|
left_layout:add(mylauncher)
|
||||||
|
left_layout:add(mytaglist[s])
|
||||||
|
left_layout:add(mypromptbox[s])
|
||||||
|
|
||||||
|
-- Widgets that are aligned to the right
|
||||||
|
local right_layout = wibox.layout.fixed.horizontal()
|
||||||
|
right_layout:add(mailwidget)
|
||||||
|
if s == 1 then right_layout:add(wibox.widget.systray()) end
|
||||||
|
right_layout:add(cpuwidget)
|
||||||
|
right_layout:add(batwidget)
|
||||||
|
right_layout:add(mytextclock)
|
||||||
|
right_layout:add(mylayoutbox[s])
|
||||||
|
|
||||||
|
-- Now bring it all together (with the tasklist in the middle)
|
||||||
|
local layout = wibox.layout.align.horizontal()
|
||||||
|
layout:set_left(left_layout)
|
||||||
|
layout:set_middle(mytasklist[s])
|
||||||
|
layout:set_right(right_layout)
|
||||||
|
|
||||||
|
mywibox[s]:set_widget(layout)
|
||||||
|
end
|
||||||
|
-- }}}
|
||||||
|
|
||||||
|
-- {{{ Mouse bindings
|
||||||
|
root.buttons(awful.util.table.join(
|
||||||
|
awful.button({ }, 3, function () mymainmenu:toggle() end),
|
||||||
|
awful.button({ }, 4, awful.tag.viewnext),
|
||||||
|
awful.button({ }, 5, awful.tag.viewprev)
|
||||||
|
))
|
||||||
|
-- }}}
|
||||||
|
|
||||||
|
-- {{{ Key bindings
|
||||||
|
globalkeys = awful.util.table.join(
|
||||||
|
awful.key({ modkey, }, "Left", awful.tag.viewprev ),
|
||||||
|
awful.key({ modkey, }, "Right", awful.tag.viewnext ),
|
||||||
|
awful.key({ modkey, }, "Escape", awful.tag.history.restore),
|
||||||
|
|
||||||
|
awful.key({ modkey, }, "j",
|
||||||
|
function ()
|
||||||
|
awful.client.focus.byidx( 1)
|
||||||
|
if client.focus then client.focus:raise() end
|
||||||
|
end),
|
||||||
|
awful.key({ modkey, }, "k",
|
||||||
|
function ()
|
||||||
|
awful.client.focus.byidx(-1)
|
||||||
|
if client.focus then client.focus:raise() end
|
||||||
|
end),
|
||||||
|
awful.key({ modkey, }, "w", function () mymainmenu:show() end),
|
||||||
|
|
||||||
|
-- Layout manipulation
|
||||||
|
awful.key({ modkey, "Shift" }, "j", function () awful.client.swap.byidx( 1) end),
|
||||||
|
awful.key({ modkey, "Shift" }, "k", function () awful.client.swap.byidx( -1) end),
|
||||||
|
awful.key({ modkey, "Control" }, "j", function () awful.screen.focus_relative( 1) end),
|
||||||
|
awful.key({ modkey, "Control" }, "k", function () awful.screen.focus_relative(-1) end),
|
||||||
|
awful.key({ modkey, }, "u", awful.client.urgent.jumpto),
|
||||||
|
awful.key({ modkey, }, "Tab",
|
||||||
|
function ()
|
||||||
|
awful.client.focus.history.previous()
|
||||||
|
if client.focus then
|
||||||
|
client.focus:raise()
|
||||||
|
end
|
||||||
|
end),
|
||||||
|
|
||||||
|
-- Standard program
|
||||||
|
awful.key({ modkey, }, "Return", function () awful.util.spawn(terminal) end),
|
||||||
|
awful.key({ modkey, "Control" }, "r", awesome.restart),
|
||||||
|
awful.key({ modkey, "Shift" }, "q", awesome.quit),
|
||||||
|
|
||||||
|
awful.key({ modkey, }, "l", function () awful.tag.incmwfact( 0.05) end),
|
||||||
|
awful.key({ modkey, }, "h", function () awful.tag.incmwfact(-0.05) end),
|
||||||
|
awful.key({ modkey, "Shift" }, "h", function () awful.tag.incnmaster( 1) end),
|
||||||
|
awful.key({ modkey, "Shift" }, "l", function () awful.tag.incnmaster(-1) end),
|
||||||
|
awful.key({ modkey, "Control" }, "h", function () awful.tag.incncol( 1) end),
|
||||||
|
awful.key({ modkey, "Control" }, "l", function () awful.tag.incncol(-1) end),
|
||||||
|
awful.key({ modkey, }, "space", function () awful.layout.inc(layouts, 1) end),
|
||||||
|
awful.key({ modkey, "Shift" }, "space", function () awful.layout.inc(layouts, -1) end),
|
||||||
|
|
||||||
|
awful.key({ modkey, "Control" }, "n", awful.client.restore),
|
||||||
|
awful.key({ }, "XF86AudioRaiseVolume", function ()
|
||||||
|
awful.util.spawn("amixer set Master 5%+", false) end),
|
||||||
|
awful.key({ }, "XF86AudioLowerVolume", function ()
|
||||||
|
awful.util.spawn("amixer set Master 5%-", false) end),
|
||||||
|
awful.key({ }, "XF86AudioMute", function ()
|
||||||
|
awful.util.spawn("amixer -q -D default sset Master toggle", false) end),
|
||||||
|
|
||||||
|
-- Prompt
|
||||||
|
awful.key({ modkey }, "r", function () mypromptbox[mouse.screen]:run() end),
|
||||||
|
-- awful.key({ modkey }, "r", function () awful.util.spawn( "dmenu_run" ) end ),
|
||||||
|
awful.key({ modkey,"Control" }, "BackSpace", function () awful.util.spawn("xlock -mode blank") end),
|
||||||
|
awful.key({ }, "XF86ScreenSaver", function () awful.util.spawn("xlock -mode blank") end),
|
||||||
|
|
||||||
|
awful.key({ modkey }, "x",
|
||||||
|
function ()
|
||||||
|
awful.prompt.run({ prompt = "Run Lua code: " },
|
||||||
|
mypromptbox[mouse.screen].widget,
|
||||||
|
awful.util.eval, nil,
|
||||||
|
awful.util.getdir("cache") .. "/history_eval")
|
||||||
|
end),
|
||||||
|
-- Menubar
|
||||||
|
awful.key({ modkey }, "p", function() menubar.show() end)
|
||||||
|
)
|
||||||
|
|
||||||
|
clientkeys = awful.util.table.join(
|
||||||
|
awful.key({ modkey, }, "f", function (c) c.fullscreen = not c.fullscreen end),
|
||||||
|
awful.key({ modkey, "Shift" }, "c", function (c) c:kill() end),
|
||||||
|
awful.key({ modkey, "Control" }, "space", awful.client.floating.toggle ),
|
||||||
|
awful.key({ modkey, "Control" }, "Return", function (c) c:swap(awful.client.getmaster()) end),
|
||||||
|
awful.key({ modkey, }, "o", awful.client.movetoscreen ),
|
||||||
|
awful.key({ modkey, }, "t", function (c) c.ontop = not c.ontop end),
|
||||||
|
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),
|
||||||
|
awful.key({ modkey, }, "m",
|
||||||
|
function (c)
|
||||||
|
c.maximized_horizontal = not c.maximized_horizontal
|
||||||
|
c.maximized_vertical = not c.maximized_vertical
|
||||||
|
end)
|
||||||
|
)
|
||||||
|
|
||||||
|
-- Compute the maximum number of digit we need, limited to 9
|
||||||
|
keynumber = 0
|
||||||
|
for s = 1, screen.count() do
|
||||||
|
keynumber = math.min(9, math.max(#tags[s], keynumber))
|
||||||
|
end
|
||||||
|
|
||||||
|
-- Bind all key numbers to tags.
|
||||||
|
-- Be careful: we use keycodes to make it works on any keyboard layout.
|
||||||
|
-- This should map on the top row of your keyboard, usually 1 to 9.
|
||||||
|
for i = 1, keynumber do
|
||||||
|
globalkeys = awful.util.table.join(globalkeys,
|
||||||
|
awful.key({ modkey }, "#" .. i + 9,
|
||||||
|
function ()
|
||||||
|
local screen = mouse.screen
|
||||||
|
if tags[screen][i] then
|
||||||
|
awful.tag.viewonly(tags[screen][i])
|
||||||
|
end
|
||||||
|
end),
|
||||||
|
awful.key({ modkey, "Control" }, "#" .. i + 9,
|
||||||
|
function ()
|
||||||
|
local screen = mouse.screen
|
||||||
|
if tags[screen][i] then
|
||||||
|
awful.tag.viewtoggle(tags[screen][i])
|
||||||
|
end
|
||||||
|
end),
|
||||||
|
awful.key({ modkey, "Shift" }, "#" .. i + 9,
|
||||||
|
function ()
|
||||||
|
if client.focus and tags[client.focus.screen][i] then
|
||||||
|
awful.client.movetotag(tags[client.focus.screen][i])
|
||||||
|
end
|
||||||
|
end),
|
||||||
|
awful.key({ modkey, "Control", "Shift" }, "#" .. i + 9,
|
||||||
|
function ()
|
||||||
|
if client.focus and tags[client.focus.screen][i] then
|
||||||
|
awful.client.toggletag(tags[client.focus.screen][i])
|
||||||
|
end
|
||||||
|
end))
|
||||||
|
end
|
||||||
|
|
||||||
|
clientbuttons = awful.util.table.join(
|
||||||
|
awful.button({ }, 1, function (c) client.focus = c; c:raise() end),
|
||||||
|
awful.button({ modkey }, 1, awful.mouse.client.move),
|
||||||
|
awful.button({ modkey }, 3, awful.mouse.client.resize))
|
||||||
|
|
||||||
|
-- Set keys
|
||||||
|
root.keys(globalkeys)
|
||||||
|
-- }}}
|
||||||
|
|
||||||
|
-- {{{ Rules
|
||||||
|
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,
|
||||||
|
keys = clientkeys,
|
||||||
|
buttons = clientbuttons } },
|
||||||
|
{ rule = { class = "MPlayer" },
|
||||||
|
properties = { floating = true } },
|
||||||
|
{ rule = { class = "pinentry" },
|
||||||
|
properties = { floating = true } },
|
||||||
|
{ rule = { class = "gimp" },
|
||||||
|
properties = { floating = true } },
|
||||||
|
{ rule = { class = "Anamnesis" },
|
||||||
|
properties = { floating = true } },
|
||||||
|
-- Set Firefox to always map on tags number 2 of screen 1.
|
||||||
|
-- { rule = { class = "Firefox" },
|
||||||
|
-- properties = { tag = tags[1][2] } },
|
||||||
|
}
|
||||||
|
-- }}}
|
||||||
|
|
||||||
|
-- {{{ Signals
|
||||||
|
-- Signal function to execute when a new client appears.
|
||||||
|
client.connect_signal("manage", function (c, startup)
|
||||||
|
-- Enable sloppy focus
|
||||||
|
c:connect_signal("mouse::enter", function(c)
|
||||||
|
if awful.layout.get(c.screen) ~= awful.layout.suit.magnifier
|
||||||
|
and awful.client.focus.filter(c) then
|
||||||
|
client.focus = c
|
||||||
|
end
|
||||||
|
end)
|
||||||
|
|
||||||
|
if not startup then
|
||||||
|
-- Set the windows at the slave,
|
||||||
|
-- i.e. put it at the end of others instead of setting it master.
|
||||||
|
-- awful.client.setslave(c)
|
||||||
|
|
||||||
|
-- Put windows in a smart way, only if they does not set an initial position.
|
||||||
|
if not c.size_hints.user_position and not c.size_hints.program_position then
|
||||||
|
awful.placement.no_overlap(c)
|
||||||
|
awful.placement.no_offscreen(c)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
local titlebars_enabled = false
|
||||||
|
if titlebars_enabled and (c.type == "normal" or c.type == "dialog") then
|
||||||
|
-- Widgets that are aligned to the left
|
||||||
|
local left_layout = wibox.layout.fixed.horizontal()
|
||||||
|
left_layout:add(awful.titlebar.widget.iconwidget(c))
|
||||||
|
|
||||||
|
-- Widgets that are aligned to the right
|
||||||
|
local right_layout = wibox.layout.fixed.horizontal()
|
||||||
|
right_layout:add(awful.titlebar.widget.floatingbutton(c))
|
||||||
|
right_layout:add(awful.titlebar.widget.maximizedbutton(c))
|
||||||
|
right_layout:add(awful.titlebar.widget.stickybutton(c))
|
||||||
|
right_layout:add(awful.titlebar.widget.ontopbutton(c))
|
||||||
|
right_layout:add(awful.titlebar.widget.closebutton(c))
|
||||||
|
|
||||||
|
-- The title goes in the middle
|
||||||
|
local title = awful.titlebar.widget.titlewidget(c)
|
||||||
|
title:buttons(awful.util.table.join(
|
||||||
|
awful.button({ }, 1, function()
|
||||||
|
client.focus = c
|
||||||
|
c:raise()
|
||||||
|
awful.mouse.client.move(c)
|
||||||
|
end),
|
||||||
|
awful.button({ }, 3, function()
|
||||||
|
client.focus = c
|
||||||
|
c:raise()
|
||||||
|
awful.mouse.client.resize(c)
|
||||||
|
end)
|
||||||
|
))
|
||||||
|
|
||||||
|
-- Now bring it all together
|
||||||
|
local layout = wibox.layout.align.horizontal()
|
||||||
|
layout:set_left(left_layout)
|
||||||
|
layout:set_right(right_layout)
|
||||||
|
layout:set_middle(title)
|
||||||
|
|
||||||
|
awful.titlebar(c):set_widget(layout)
|
||||||
|
end
|
||||||
|
end)
|
||||||
|
local setmetatable = setmetatable
|
||||||
|
local os = {
|
||||||
|
date = os.date,
|
||||||
|
time = os.time
|
||||||
|
}
|
||||||
|
|
||||||
|
-- }}}
|
||||||
|
|
||||||
|
local current_screen = 1
|
||||||
|
awful.rules.rules = {
|
||||||
|
{ rule = { class = "chromium-browser" },
|
||||||
|
callback = function()
|
||||||
|
-- TODO different tags, switch tag
|
||||||
|
awful.client.movetotag(tags[current_screen][1],c)
|
||||||
|
if (current_screen == 1) then
|
||||||
|
current_screen = current_screen+1
|
||||||
|
else
|
||||||
|
current_screen = current_screen-1
|
||||||
|
end
|
||||||
|
end
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
-- awful.util.spawn_with_shell("chromium --new-window --kiosk https://www.checkpoint.com/ThreatPortal/livemap.html")
|
||||||
|
awful.util.spawn_with_shell("chromium --new-window --kiosk http://wolf:3000/dashboard/db/soc-critical-values")
|
||||||
|
-- awful.util.spawn_with_shell("sleep 0.5;chromium --new-window --kiosk http://wolf:3000/dashboard/db/aralast")
|
||||||
|
--awful.util.spawn_with_shell("chromium --new-window --kiosk http://gast.aramark.de/thales-deutschland/menu/pdf/woche_de.php")
|
||||||
|
|
||||||
|
awful.util.spawn_with_shell("sleep 0.5;chromium --new-window --kiosk http://map.norsecorp.com")
|
||||||
|
--awful.util.spawn_with_shell("sleep 0.5;chromium --new-window --kiosk http://threatmap.fortiguard.com")
|
||||||
|
|
||||||
|
|
||||||
|
-- }}}
|
||||||
|
|
@ -9,12 +9,15 @@ in
|
|||||||
alsa-hdspconf = callPackage ./alsa-tools { alsaToolTarget="hdspconf";};
|
alsa-hdspconf = callPackage ./alsa-tools { alsaToolTarget="hdspconf";};
|
||||||
alsa-hdsploader = callPackage ./alsa-tools { alsaToolTarget="hdsploader";};
|
alsa-hdsploader = callPackage ./alsa-tools { alsaToolTarget="hdsploader";};
|
||||||
awesomecfg = callPackage ./awesomecfg {};
|
awesomecfg = callPackage ./awesomecfg {};
|
||||||
|
bintray-upload = callPackage ./bintray-upload {};
|
||||||
mycube-flask = callPackage ./mycube-flask {};
|
mycube-flask = callPackage ./mycube-flask {};
|
||||||
nodemcu-uploader = callPackage ./nodemcu-uploader {};
|
nodemcu-uploader = callPackage ./nodemcu-uploader {};
|
||||||
tw-upload-plugin = callPackage ./tw-upload-plugin {};
|
tw-upload-plugin = callPackage ./tw-upload-plugin {};
|
||||||
inherit (callPackage ./devpi {}) devpi-web devpi-server;
|
inherit (callPackage ./devpi {}) devpi-web devpi-server;
|
||||||
skytraq-logger = callPackage ./skytraq-logger {};
|
skytraq-logger = callPackage ./skytraq-logger {};
|
||||||
taskserver = callPackage ./taskserver {};
|
taskserver = callPackage ./taskserver {};
|
||||||
bintray-upload = callPackage ./bintray-upload {};
|
ps3netsrv = callPackage ./ps3netsrv {};
|
||||||
|
honeyd = callPackage ./honeyd {};
|
||||||
|
farpd = callPackage ./farpd {};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
59
makefu/5pkgs/farpd/default.nix
Normal file
59
makefu/5pkgs/farpd/default.nix
Normal file
@ -0,0 +1,59 @@
|
|||||||
|
{ stdenv, lib, pkgs, fetchurl,fetchFromGitHub,
|
||||||
|
libpcap, libdnet, libevent, readline, autoconf, automake, libtool, zlib, pcre,
|
||||||
|
... }:
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "farpd-${version}";
|
||||||
|
|
||||||
|
|
||||||
|
version = "0.2";
|
||||||
|
src = fetchurl {
|
||||||
|
url = https://launchpad.net/ubuntu/+archive/primary/+files/farpd_0.2.orig.tar.gz ;
|
||||||
|
sha256 = "1m3pynvynr4vgkwh7z5i0yqlang2y0ph32cys3vbi2hx2apk9abd";
|
||||||
|
};
|
||||||
|
|
||||||
|
buildInputs = with pkgs;[
|
||||||
|
automake
|
||||||
|
gnugrep
|
||||||
|
libpcap
|
||||||
|
libdnet
|
||||||
|
pcre
|
||||||
|
libevent
|
||||||
|
readline
|
||||||
|
autoconf
|
||||||
|
libtool
|
||||||
|
zlib
|
||||||
|
coreutils
|
||||||
|
python
|
||||||
|
pythonPackages.sqlite3
|
||||||
|
];
|
||||||
|
patches = [
|
||||||
|
./farpd_0.2-11.diff
|
||||||
|
];
|
||||||
|
# removes user install script from Makefile before automake
|
||||||
|
#patches = [ ./autoconf.patch ];
|
||||||
|
preConfigure = ''
|
||||||
|
autoreconf -fi
|
||||||
|
|
||||||
|
substituteInPlace configure \
|
||||||
|
--replace "libpcap.a" "libpcap.so" \
|
||||||
|
--replace "libevent.a" "libevent.so" \
|
||||||
|
--replace "net/bpf.h" "pcap/bpf.h"
|
||||||
|
'';
|
||||||
|
|
||||||
|
makeFlags = [ "LIBS=-lz" ];
|
||||||
|
configureFlags = [
|
||||||
|
"--with-libpcap=${libpcap}"
|
||||||
|
"--with-libevent=${libevent}"
|
||||||
|
"--with-libdnet=${libdnet}"
|
||||||
|
];
|
||||||
|
postInstall = ''
|
||||||
|
mv $out/sbin/arpd $out/sbin/farpd
|
||||||
|
mv $out/share/man/man8/arpd.8 $out/share/man/man8/farpd.8
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
homepage = https://launchpad.net/ubuntu/+source/farpd/ ;
|
||||||
|
description = "fake arp";
|
||||||
|
license = lib.licenses.gpl2;
|
||||||
|
};
|
||||||
|
}
|
1606
makefu/5pkgs/farpd/farpd_0.2-11.diff
Normal file
1606
makefu/5pkgs/farpd/farpd_0.2-11.diff
Normal file
File diff suppressed because it is too large
Load Diff
62
makefu/5pkgs/honeyd/default.nix
Normal file
62
makefu/5pkgs/honeyd/default.nix
Normal file
@ -0,0 +1,62 @@
|
|||||||
|
{ stdenv, lib, pkgs, fetchurl,fetchFromGitHub,
|
||||||
|
libpcap, libdnet, libevent, readline, autoconf, automake, libtool, zlib, pcre,
|
||||||
|
... }:
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "honeyd-${version}";
|
||||||
|
|
||||||
|
#version = "1.5c"; #original, does not compile due to libc errors
|
||||||
|
#src = fetchurl {
|
||||||
|
# url = "http://www.honeyd.org/uploads/honeyd-${version}.tar.gz";
|
||||||
|
# sha256 = "0vcih16fk5pir5ssfil8x79nvi62faw0xvk8s5klnysv111db1ii";
|
||||||
|
#};
|
||||||
|
|
||||||
|
#version = "64d087c"; # honeyd-1.6.7
|
||||||
|
# sha256 = "0zhnn13r24y1q494xcfx64vyp84zqk8qmsl41fq2674230bn0p31";
|
||||||
|
|
||||||
|
version = "c135fea08"; #nova-13.09
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "DataSoft";
|
||||||
|
repo = "honeyd";
|
||||||
|
rev = version;
|
||||||
|
sha256 = "1r9qds7a1yp3nkccwh3isrizpr2njhpf1m6qp3lqkj0i9c4w6x44";
|
||||||
|
};
|
||||||
|
|
||||||
|
buildInputs = with pkgs;[
|
||||||
|
automake
|
||||||
|
gnugrep
|
||||||
|
libpcap
|
||||||
|
libdnet
|
||||||
|
pcre
|
||||||
|
libevent
|
||||||
|
readline
|
||||||
|
autoconf
|
||||||
|
libtool
|
||||||
|
zlib
|
||||||
|
coreutils
|
||||||
|
python
|
||||||
|
pythonPackages.sqlite3
|
||||||
|
];
|
||||||
|
patches = [ ./fix-autogen.patch ];
|
||||||
|
|
||||||
|
# removes user install script from Makefile before automake
|
||||||
|
preConfigure = ''
|
||||||
|
sed -i '/init.py$/d' Makefile.am
|
||||||
|
sh ./autogen.sh
|
||||||
|
'';
|
||||||
|
|
||||||
|
makeFlags = [ "LIBS=-lz" ];
|
||||||
|
configureFlags = [
|
||||||
|
"--with-libpcap=${libpcap}"
|
||||||
|
"--with-libevent=${libevent}"
|
||||||
|
"--with-zlib=${zlib}"
|
||||||
|
"--with-python"
|
||||||
|
"--with-libpcre=${pcre}"
|
||||||
|
"--with-libreadline=${readline}"
|
||||||
|
];
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
homepage = http://www.honeyd.org/;
|
||||||
|
description = "virtual Honeypots";
|
||||||
|
license = lib.licenses.gpl2;
|
||||||
|
};
|
||||||
|
}
|
42
makefu/5pkgs/honeyd/fix-autogen.patch
Normal file
42
makefu/5pkgs/honeyd/fix-autogen.patch
Normal file
@ -0,0 +1,42 @@
|
|||||||
|
--- ./configure.in 2016-06-27 18:36:06.640779048 +0200
|
||||||
|
+++ ./configure.in 2016-06-27 18:34:53.968803854 +0200
|
||||||
|
@@ -119,11 +119,11 @@
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
AC_MSG_RESULT($withval)
|
||||||
|
- if test -f $withval/pcap.h -a -f $withval/libpcap.a; then
|
||||||
|
+ if test -f $withval/include/pcap.h -a -f $withval/lib/libpcap.so; then
|
||||||
|
owd=`pwd`
|
||||||
|
if cd $withval; then withval=`pwd`; cd $owd; fi
|
||||||
|
- PCAPINC="-I$withval -I$withval/bpf"
|
||||||
|
- PCAPLIB="-L$withval -lpcap"
|
||||||
|
+ PCAPINC="-I$withval/include -I$withval/include/bpf"
|
||||||
|
+ PCAPLIB="-L$withval/lib -lpcap"
|
||||||
|
else
|
||||||
|
AC_ERROR(pcap.h or libpcap.a not found in $withval)
|
||||||
|
fi
|
||||||
|
@@ -230,7 +230,7 @@
|
||||||
|
if cd $withval; then withval=`pwd`; cd $owd; fi
|
||||||
|
EVENTINC="-I$withval"
|
||||||
|
EVENTLIB="-L$withval -levent"
|
||||||
|
- elif test -f $withval/include/event.h -a -f $withval/lib/libevent.a; then
|
||||||
|
+ elif test -f $withval/include/event.h -a -f $withval/lib/libevent.so; then
|
||||||
|
owd=`pwd`
|
||||||
|
if cd $withval; then withval=`pwd`; cd $owd; fi
|
||||||
|
EVENTINC="-I$withval/include"
|
||||||
|
@@ -354,12 +354,12 @@
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
AC_MSG_RESULT($withval)
|
||||||
|
- if test -f $withval/readline/readline.h -a -f $withval/libreadline.a; then
|
||||||
|
+ if test -f $withval/include/readline/readline.h -o -f $withval/lib/libreadline.so; then
|
||||||
|
owd=`pwd`
|
||||||
|
if cd $withval; then withval=`pwd`; cd $owd; fi
|
||||||
|
AC_DEFINE(HAVE_LIBREADLINE, 1, [Define if you have libreadline])
|
||||||
|
- EDITINC="-I$withval"
|
||||||
|
- EDITLIB="-L$withval -lreadline"
|
||||||
|
+ EDITINC="-I$withval/include"
|
||||||
|
+ EDITLIB="-L$withval/lib -lreadline"
|
||||||
|
else
|
||||||
|
AC_ERROR(readline/readline.h or libreadline.a not found in $withval)
|
||||||
|
fi
|
29
makefu/5pkgs/ps3netsrv/default.nix
Normal file
29
makefu/5pkgs/ps3netsrv/default.nix
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
{ stdenv, fetchgit, clang, makeWrapper, gnugrep }:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "ps3netsrv-${version}";
|
||||||
|
version = "1.1.0";
|
||||||
|
|
||||||
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
src = fetchgit {
|
||||||
|
url = "https://github.com/dirkvdb/ps3netsrv--";
|
||||||
|
fetchSubmodules = true;
|
||||||
|
rev = "e54a66cbf142b86e2cffc1701984b95adb921e81"; # latest @ 2016-05-24
|
||||||
|
sha256 = "0l7bp18cs3xr2qgsmcf18diccski49mj9whngxm9isi8wd4r9inj";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [ gnugrep ];
|
||||||
|
buildPhase = "make CXX=g++";
|
||||||
|
installPhase = ''
|
||||||
|
mkdir -p $out/bin
|
||||||
|
cp ps3netsrv++ $out/bin
|
||||||
|
'';
|
||||||
|
meta = {
|
||||||
|
description = "C++ implementation of the ps3netsrv server";
|
||||||
|
homepage = https://github.com/dirkvdb/ps3netsrv--;
|
||||||
|
license = stdenv.lib.licenses.mit;
|
||||||
|
platforms = stdenv.lib.platforms.linux;
|
||||||
|
maintainers = with stdenv.lib.maintainers; [ makefu ];
|
||||||
|
};
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user