Merge remote-tracking branch 'lass/master'
This commit is contained in:
makefu
commit
e437c7d17b
@ -45,7 +45,6 @@ let
|
||||
./reaktor2.nix
|
||||
./realwallpaper.nix
|
||||
./retiolum-bootstrap.nix
|
||||
./retiolum-hosts.nix
|
||||
./rtorrent.nix
|
||||
./secret.nix
|
||||
./setuid.nix
|
||||
@ -101,6 +100,7 @@ let
|
||||
{ krebs = import ./krebs { inherit config; }; }
|
||||
{ krebs = import ./lass { inherit config; }; }
|
||||
{ krebs = import ./makefu { inherit config; }; }
|
||||
{ krebs = import ./external/palo.nix { inherit config; }; }
|
||||
{ krebs = import ./tv { inherit config; }; }
|
||||
{
|
||||
krebs.dns.providers = {
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
with import <stockholm/lib>;
|
||||
{ config, ... }: let
|
||||
# TODO dedup functions with ./retiolum-hosts.nix
|
||||
check = hostname: any (domain: hasSuffix ".${domain}" hostname) domains;
|
||||
domains = attrNames (filterAttrs (_: eq "hosts") config.krebs.dns.providers);
|
||||
in {
|
||||
@ -30,6 +29,66 @@ in {
|
||||
map (addr: { ${addr} = aliases; }) net.addrs)
|
||||
(attrValues host.nets))
|
||||
(attrValues config.krebs.hosts)));
|
||||
|
||||
nixpkgs.config.packageOverrides = super: let
|
||||
# nameValuePair name value : { "name" : name, "value" : value }
|
||||
|
||||
# addr : str
|
||||
# aliase : str
|
||||
# hostname : str
|
||||
# netname : str
|
||||
|
||||
# addrAliases : nameValuePair addr [alias]
|
||||
|
||||
# hostNetAliases : host -> { ${netname} : [addrAliases] }
|
||||
hostNetAliases = host:
|
||||
mapAttrs (_: net: filter (x: x.name != null && x.value != []) [
|
||||
{ name = net.ip4.addr or null; value = net.aliases; }
|
||||
{ name = net.ip6.addr or null; value = net.aliases; }
|
||||
]) host.nets;
|
||||
|
||||
# netAliases : { ${netname} : [addrAliases] }
|
||||
netAliases =
|
||||
foldl'
|
||||
(result: host:
|
||||
foldl'
|
||||
# λ netAliases -> [addrAliases] -> netAliases
|
||||
(result: { name, value }: result // {
|
||||
${name} = result.${name} or [] ++ value;
|
||||
})
|
||||
result
|
||||
(mapAttrsToList nameValuePair (hostNetAliases host))
|
||||
)
|
||||
{}
|
||||
(attrValues config.krebs.hosts);
|
||||
|
||||
# writeHosts : str -> [addrAliases] -> package
|
||||
writeHosts = name: addrAliases: super.writeText name ''
|
||||
${concatMapStringsSep
|
||||
"\n"
|
||||
({ name, value }: "${name} ${toString value}")
|
||||
addrAliases}
|
||||
'';
|
||||
in
|
||||
{
|
||||
# hosts file for all krebs networks
|
||||
krebs-hosts =
|
||||
writeHosts "krebs-hosts" (concatLists [
|
||||
netAliases.internet
|
||||
netAliases.retiolum
|
||||
netAliases.wiregrill
|
||||
]);
|
||||
|
||||
# combined hosts file for all networks (even custom ones)
|
||||
krebs-hosts_combined =
|
||||
writeHosts "krebs-hosts_combined"
|
||||
(concatLists (attrValues netAliases));
|
||||
}
|
||||
//
|
||||
genAttrs' (attrNames netAliases) (netname: rec {
|
||||
name = "krebs-hosts-${netname}";
|
||||
value = writeHosts name netAliases.${netname};
|
||||
});
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -1,28 +0,0 @@
|
||||
with import <stockholm/lib>;
|
||||
{ config, ... }: let
|
||||
# TODO dedup functions with ./hosts.nix
|
||||
check = hostname: any (domain: hasSuffix ".${domain}" hostname) domains;
|
||||
domains = attrNames (filterAttrs (_: eq "hosts") config.krebs.dns.providers);
|
||||
in {
|
||||
nixpkgs.config.packageOverrides = super: {
|
||||
retiolum-hosts =
|
||||
super.writeText "retiolum-hosts" ''
|
||||
${
|
||||
concatStringsSep
|
||||
"\n"
|
||||
(flatten
|
||||
(map
|
||||
(host: let
|
||||
net = host.nets.retiolum;
|
||||
aliases = longs;
|
||||
longs = filter check net.aliases;
|
||||
in
|
||||
optionals
|
||||
(aliases != [])
|
||||
(map (addr: "${addr} ${toString aliases}") net.addrs))
|
||||
(filter (host: hasAttr "retiolum" host.nets)
|
||||
(attrValues config.krebs.hosts))))
|
||||
}
|
||||
'';
|
||||
};
|
||||
}
|
||||
@ -1,5 +1,5 @@
|
||||
with import <stockholm/lib>;
|
||||
{ mkDerivation, base, fetchgit, stdenv }: let
|
||||
{ mkDerivation, base, fetchgit, hspec, QuickCheck, stdenv, text }: let
|
||||
|
||||
cfg = {
|
||||
"18.03" = {
|
||||
@ -7,8 +7,8 @@ with import <stockholm/lib>;
|
||||
sha256 = "1k908zap3694fcxdk4bb29s54b0lhdh557y10ybjskfwnym7szn1";
|
||||
};
|
||||
"18.09" = {
|
||||
version = "2.1.0";
|
||||
sha256 = "0wc8v48bb0bkvypc0j6imvnf8xc8572hykk9sgjhzf2w0ggqxv5d";
|
||||
version = "2.2.0";
|
||||
sha256 = "1pb56dgf3jj2kq3cbbppwzyg3ccgqy9xara62hkjwyxzdx20clk1";
|
||||
};
|
||||
}.${versions.majorMinor nixpkgsVersion};
|
||||
|
||||
@ -20,7 +20,8 @@ in mkDerivation {
|
||||
rev = "refs/tags/v${cfg.version}";
|
||||
sha256 = cfg.sha256;
|
||||
};
|
||||
libraryHaskellDepends = [ base ];
|
||||
libraryHaskellDepends = [ base text ];
|
||||
testHaskellDepends = [ base hspec QuickCheck ];
|
||||
doHaddock = false;
|
||||
# WTFPL is the true license, which is unknown to cabal.
|
||||
license = stdenv.lib.licenses.wtfpl;
|
||||
|
||||
21
krebs/5pkgs/haskell/flameshot-once.nix
Normal file
21
krebs/5pkgs/haskell/flameshot-once.nix
Normal file
@ -0,0 +1,21 @@
|
||||
{ mkDerivation, async, base, blessings, bytestring, dbus, fetchgit
|
||||
, iso8601-time, process, random, stdenv, text, time, unagi-chan
|
||||
, unix
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "flameshot-once";
|
||||
version = "1.1.0";
|
||||
src = fetchgit {
|
||||
url = "https://cgit.krebsco.de/flameshot-once";
|
||||
sha256 = "158ha1yyj3p3mdjjga62j91ml83nhrsg34xbg3dir5cb399j8pxx";
|
||||
rev = "9d688b6ffad14912bd1afe42555747cb3d213d95";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
isLibrary = false;
|
||||
isExecutable = true;
|
||||
executableHaskellDepends = [
|
||||
async base blessings bytestring dbus iso8601-time process random
|
||||
text time unagi-chan unix
|
||||
];
|
||||
license = stdenv.lib.licenses.mit;
|
||||
}
|
||||
27
krebs/5pkgs/simple/flameshot-once/default.nix
Normal file
27
krebs/5pkgs/simple/flameshot-once/default.nix
Normal file
@ -0,0 +1,27 @@
|
||||
with import <stockholm/lib>;
|
||||
{ pkgs, ... }@args:
|
||||
|
||||
let
|
||||
# config cannot be declared in the input attribute set because that would
|
||||
# cause callPackage to inject the wrong config. Instead, get it from ...
|
||||
# via args.
|
||||
config = args.config or {};
|
||||
in
|
||||
|
||||
pkgs.symlinkJoin {
|
||||
name = "flameshot-once-wrapper";
|
||||
paths = [
|
||||
(pkgs.writeDashBin "flameshot-once" ''
|
||||
export PATH=${makeBinPath [
|
||||
pkgs.flameshot
|
||||
pkgs.qt5.qtbase
|
||||
pkgs.xclip
|
||||
]}
|
||||
${optionalString (config != null) /* sh */ ''
|
||||
. ${import ./profile.nix { inherit config pkgs; }}
|
||||
''}
|
||||
exec ${pkgs.haskellPackages.flameshot-once}/bin/flameshot-once "$@"
|
||||
'')
|
||||
pkgs.haskellPackages.flameshot-once
|
||||
];
|
||||
}
|
||||
129
krebs/5pkgs/simple/flameshot-once/profile.nix
Normal file
129
krebs/5pkgs/simple/flameshot-once/profile.nix
Normal file
@ -0,0 +1,129 @@
|
||||
with import <stockholm/lib>;
|
||||
{ config, pkgs }:
|
||||
let
|
||||
|
||||
# Refs https://github.com/lupoDharkael/flameshot/blob/master/src/widgets/capture/capturebutton.h
|
||||
ButtonType = {
|
||||
PENCIL = 0;
|
||||
DRAWER = 1;
|
||||
ARROW = 2;
|
||||
SELECTION = 3;
|
||||
RECTANGLE = 4;
|
||||
CIRCLE = 5;
|
||||
MARKER = 6;
|
||||
SELECTIONINDICATOR = 7;
|
||||
MOVESELECTION = 8;
|
||||
UNDO = 9;
|
||||
COPY = 10;
|
||||
SAVE = 11;
|
||||
EXIT = 12;
|
||||
IMAGEUPLOADER = 13;
|
||||
OPEN_APP = 14;
|
||||
BLUR = 15;
|
||||
REDO = 16;
|
||||
PIN = 17;
|
||||
TEXT = 18;
|
||||
};
|
||||
|
||||
cfg = eval.config;
|
||||
|
||||
eval = evalModules {
|
||||
modules = singleton {
|
||||
_file = toString ./config.nix;
|
||||
imports = singleton config;
|
||||
options = {
|
||||
buttons = mkOption {
|
||||
apply = map (name: ButtonType.${name});
|
||||
default = [
|
||||
"PENCIL"
|
||||
"DRAWER"
|
||||
"ARROW"
|
||||
"SELECTION"
|
||||
"RECTANGLE"
|
||||
"CIRCLE"
|
||||
"MARKER"
|
||||
"SELECTIONINDICATOR"
|
||||
"MOVESELECTION"
|
||||
"UNDO"
|
||||
"SAVE"
|
||||
"EXIT"
|
||||
"BLUR"
|
||||
];
|
||||
type = types.listOf (types.enum (attrNames ButtonType));
|
||||
};
|
||||
disabledTrayIcon = mkOption {
|
||||
default = true;
|
||||
type = types.bool;
|
||||
};
|
||||
drawThickness = mkOption {
|
||||
default = 8;
|
||||
type = types.positive;
|
||||
};
|
||||
filenamePattern = mkOption {
|
||||
default = "%FT%T%z_flameshot.png";
|
||||
type =
|
||||
# This is types.filename extended by [%:][%:+]*
|
||||
types.addCheck types.str (test "[%:0-9A-Za-z._][%:+0-9A-Za-z._-]*");
|
||||
};
|
||||
savePath = mkOption {
|
||||
default = "/tmp";
|
||||
type = types.absolute-pathname;
|
||||
};
|
||||
showDesktopNotification = mkOption {
|
||||
default = false;
|
||||
type = types.bool;
|
||||
};
|
||||
showHelp = mkOption {
|
||||
default = false;
|
||||
type = types.bool;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
hexchars = stringToCharacters "0123456789abcdef";
|
||||
|
||||
# Encode integer to C-escaped string of bytes, little endian / LSB 0
|
||||
le = rec {
|
||||
x1 = i: let
|
||||
i0 = mod i 16;
|
||||
i1 = i / 16;
|
||||
in
|
||||
"\\x${elemAt hexchars i1}${elemAt hexchars i0}";
|
||||
|
||||
x2 = i: let
|
||||
i0 = mod i 256;
|
||||
i1 = i / 256;
|
||||
in
|
||||
"${x1 i0}${x1 i1}";
|
||||
|
||||
x4 = i: let
|
||||
i0 = mod i 65536;
|
||||
i1 = i / 65536;
|
||||
in
|
||||
"${x2 i0}${x2 i1}";
|
||||
};
|
||||
|
||||
toQList = t: xs:
|
||||
assert t == "int";
|
||||
"QList<${t}>${le.x4 0}${le.x4 (length xs)}${concatMapStrings le.x4 xs}";
|
||||
|
||||
XDG_CONFIG_HOME = pkgs.write "flameshot-config" {
|
||||
"/Dharkael/flameshot.ini".text = ''
|
||||
[General]
|
||||
buttons=@Variant(\0\0\0\x7f\0\0\0\v${toQList "int" cfg.buttons})
|
||||
disabledTrayIcon=${toJSON cfg.disabledTrayIcon}
|
||||
drawThickness=${toJSON cfg.drawThickness}
|
||||
filenamePattern=${toJSON cfg.filenamePattern}
|
||||
savePath=${toJSON cfg.savePath}
|
||||
showDesktopNotification=${toJSON cfg.showDesktopNotification}
|
||||
showHelp=${toJSON cfg.showHelp}
|
||||
'';
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
pkgs.writeDash "flameshot.profile" ''
|
||||
export FLAMESHOT_CAPTURE_PATH=${cfg.savePath}
|
||||
export XDG_CONFIG_HOME=${XDG_CONFIG_HOME}
|
||||
''
|
||||
@ -1,7 +1,7 @@
|
||||
{
|
||||
"url": "https://github.com/NixOS/nixpkgs-channels",
|
||||
"rev": "97e0d53d669cd07f0750a42fd535524b3cdd46d1",
|
||||
"date": "2019-01-15T00:11:44+01:00",
|
||||
"sha256": "111xa7qn9142dar29cil4br2mvn8f1rbiy310lkhwl73126fq8dw",
|
||||
"rev": "9bd45dddf8171e2fd4288d684f4f70a2025ded19",
|
||||
"date": "2019-02-15T12:11:24-05:00",
|
||||
"sha256": "1idrxrymwqfsfysav3yl8lya1jhgg8xzgq9hy7dpdd63770vn8c1",
|
||||
"fetchSubmodules": false
|
||||
}
|
||||
|
||||
@ -61,7 +61,7 @@ in {
|
||||
alias ${config.krebs.tinc.retiolum.hostsArchive};
|
||||
'';
|
||||
locations."= /retiolum.hosts".extraConfig = ''
|
||||
alias ${pkgs.retiolum-hosts};
|
||||
alias ${pkgs.krebs-hosts-retiolum};
|
||||
'';
|
||||
locations."= /wireguard-key".extraConfig = ''
|
||||
alias ${pkgs.writeText "prism.wg" config.krebs.hosts.prism.nets.wiregrill.wireguard.pubkey};
|
||||
|
||||
@ -9,6 +9,7 @@ let
|
||||
krops = import ../submodules/krops/lib;
|
||||
shell = import ./shell.nix { inherit lib; };
|
||||
types = nixpkgs-lib.types // import ./types.nix { inherit lib; };
|
||||
xml = import ./xml.nix { inherit lib; };
|
||||
|
||||
eq = x: y: x == y;
|
||||
ne = x: y: x != y;
|
||||
@ -145,6 +146,11 @@ let
|
||||
in
|
||||
filter (x: x != []) ([acc.chunk] ++ acc.chunks);
|
||||
|
||||
warnOldVersion = oldName: newName:
|
||||
if compareVersions oldName newName != -1 then
|
||||
trace "Upstream `${oldName}' gets overridden by `${newName}'." newName
|
||||
else
|
||||
newName;
|
||||
};
|
||||
in
|
||||
|
||||
|
||||
88
lib/xml.nix
Normal file
88
lib/xml.nix
Normal file
@ -0,0 +1,88 @@
|
||||
{ lib }:
|
||||
with lib;
|
||||
with builtins;
|
||||
rec {
|
||||
|
||||
# Use `term` to construct XML.
|
||||
#
|
||||
# Examples:
|
||||
#
|
||||
# (term "bool" null null)
|
||||
# (term "cool" null [])
|
||||
# (term "fool" { hurr = "durr"; } null)
|
||||
# (term "hool" null [
|
||||
# (term "tool" null null)
|
||||
# ])
|
||||
#
|
||||
# See `render` for how these get transformed into actuall XML documents.
|
||||
#
|
||||
term = name: attrs: content: {
|
||||
inherit name attrs content;
|
||||
};
|
||||
|
||||
empty = term null null null;
|
||||
|
||||
# Ref http://www.w3.org/TR/xml/#syntax
|
||||
#
|
||||
# Example:
|
||||
#
|
||||
# (quote "<cheez!>") #===> <cheez!>
|
||||
#
|
||||
quote = let
|
||||
sub = {
|
||||
"&" = "&";
|
||||
"<" = "<";
|
||||
">" = ">";
|
||||
"'" = "'";
|
||||
"\"" = """;
|
||||
};
|
||||
in
|
||||
stringAsChars (c: sub.${c} or c);
|
||||
|
||||
# Turn an XML element to an XML document string.
|
||||
doc = t:
|
||||
"<?xml version='1.0' encoding='UTF-8'?>${render t}";
|
||||
|
||||
# Render an XML element to a string.
|
||||
#
|
||||
# Rendering `empty` yields the empty string.
|
||||
#
|
||||
# Examples:
|
||||
#
|
||||
# (term "bool" null null) #===> <bool/>
|
||||
# (term "cool" null []) #===> <cool></cool>
|
||||
# (term "fool" { hurr = "durr"; } null) #===> <fool hurr="durr"/>
|
||||
# (term "hool" null [
|
||||
# (term "tool" null null)
|
||||
# ]) #===> <hool><tool/></hool>
|
||||
#
|
||||
render = let
|
||||
render-attrs = attrs:
|
||||
getAttr (typeOf attrs) {
|
||||
null = "";
|
||||
set = concatStrings (mapAttrsToList (n: v: " ${n}=\"${v}\"") attrs);
|
||||
};
|
||||
|
||||
render-content = content:
|
||||
getAttr (typeOf content) {
|
||||
bool = toJSON content;
|
||||
int = toJSON content;
|
||||
list = concatMapStrings render content;
|
||||
string = quote content;
|
||||
};
|
||||
in
|
||||
{ name, attrs, content }:
|
||||
# XXX we're currently encoding too much information with `null`..
|
||||
if name == null
|
||||
then
|
||||
if content == null
|
||||
then ""
|
||||
else content
|
||||
else let
|
||||
attrs' = render-attrs attrs;
|
||||
content' = render-content content;
|
||||
in
|
||||
if content == null
|
||||
then "<${name}${attrs'}/>"
|
||||
else "<${name}${attrs'}>${content'}</${name}>";
|
||||
}
|
||||
@ -8,6 +8,7 @@ with import <stockholm/lib>;
|
||||
HISTCONTROL='erasedups:ignorespace'
|
||||
HISTSIZE=65536
|
||||
HISTFILESIZE=$HISTSIZE
|
||||
HISTTIMEFORMAT=
|
||||
|
||||
shopt -s checkhash
|
||||
shopt -s histappend histreedit histverify
|
||||
@ -27,6 +28,8 @@ with import <stockholm/lib>;
|
||||
export NIX_PATH="stockholm=$HOME/stockholm:$NIX_PATH"
|
||||
;;
|
||||
esac
|
||||
|
||||
${pkgs.bash-fzf-history.bind}
|
||||
'';
|
||||
promptInit = /* sh */ ''
|
||||
case $UID in
|
||||
|
||||
@ -47,6 +47,9 @@ let {
|
||||
disko = {
|
||||
cgit.desc = "declarative partitioning and formatting tool";
|
||||
};
|
||||
flameshot-once = {
|
||||
cgit.desc = "flameshot runner that automatically starts/stops the daemon";
|
||||
};
|
||||
fswm = {
|
||||
cgit.desc = "simple full screen window manager";
|
||||
};
|
||||
|
||||
@ -129,15 +129,65 @@ let {
|
||||
command! -n=0 -bar ShowSyntax :call ShowSyntax()
|
||||
'';
|
||||
})))
|
||||
((rtp: rtp // { inherit rtp; }) (pkgs.write "vim-tv" {
|
||||
#
|
||||
# Haskell
|
||||
#
|
||||
"/ftplugin/haskell.vim".text = ''
|
||||
if exists("g:vim_tv_ftplugin_haskell_loaded")
|
||||
finish
|
||||
endif
|
||||
let g:vim_tv_ftplugin_haskell_loaded = 1
|
||||
|
||||
setlocal iskeyword+='
|
||||
'';
|
||||
#
|
||||
# TODO
|
||||
#
|
||||
"/ftdetect/todo.vim".text = ''
|
||||
au BufRead,BufNewFile TODO set ft=todo
|
||||
'';
|
||||
"/ftplugin/todo.vim".text = ''
|
||||
setlocal foldmethod=syntax
|
||||
'';
|
||||
"/syntax/todo.vim".text = ''
|
||||
syn match Comment /#.*/
|
||||
|
||||
syn match todoDate /^[1-9]\S*/
|
||||
\ nextgroup=todoSummary
|
||||
|
||||
syn region todoSummary
|
||||
\ contained
|
||||
\ contains=todoTag
|
||||
\ start="." end="$\n"
|
||||
\ nextgroup=todoBlock
|
||||
|
||||
syn match todoTag /\[[A-Za-z]\+\]/hs=s+1,he=e-1
|
||||
\ contained
|
||||
|
||||
syn region todoBlock
|
||||
\ contained
|
||||
\ contains=Comment
|
||||
\ fold
|
||||
\ start="^[^1-9]" end="^[1-9 ]"re=s-1,he=s-1,me=s-1
|
||||
|
||||
syn sync minlines=1000
|
||||
|
||||
hi todoDate ctermfg=255
|
||||
hi todoSummary ctermfg=229
|
||||
hi todoBlock ctermfg=248
|
||||
hi todoTag ctermfg=217
|
||||
'';
|
||||
}))
|
||||
((rtp: rtp // { inherit rtp; }) (pkgs.write "vim-syntax-nix-nested" {
|
||||
"/syntax/haskell.vim".text = /* vim */ ''
|
||||
"/syntax/haskell.vim".text = ''
|
||||
syn region String start=+\[[[:alnum:]]*|+ end=+|]+
|
||||
|
||||
hi link ConId Identifier
|
||||
hi link VarId Identifier
|
||||
hi link hsDelimiter Delimiter
|
||||
'';
|
||||
"/syntax/nix.vim".text = /* vim */ ''
|
||||
"/syntax/nix.vim".text = ''
|
||||
"" Quit when a (custom) syntax file was already loaded
|
||||
"if exists("b:current_syntax")
|
||||
" finish
|
||||
@ -250,6 +300,9 @@ let {
|
||||
def = k: ''${k}[ \t\r\n]*='';
|
||||
writer = k: ''write${k}[^ \t\r\n]*[ \t\r\n]*\("[^"]*"\|[a-z]\+\)'';
|
||||
|
||||
writerExt = k: writerName ''[^"]*\.${k}'';
|
||||
writerName = k: ''write[^ \t\r\n]*[ \t\r\n]*"${k}"'';
|
||||
|
||||
in {
|
||||
c = {};
|
||||
cabal = {};
|
||||
@ -257,7 +310,7 @@ let {
|
||||
haskell = {};
|
||||
jq.extraStart = alts [
|
||||
(writer "Jq")
|
||||
''write[^ \t\r\n]*[ \t\r\n]*"[^"]*\.jq"''
|
||||
(writerExt "jq")
|
||||
];
|
||||
javascript.extraStart = ''/\* js \*/'';
|
||||
lua = {};
|
||||
@ -287,8 +340,11 @@ let {
|
||||
(writer (alts (map capitalize shells)))
|
||||
];
|
||||
yaml = {};
|
||||
vim.extraStart =
|
||||
''write[^ \t\r\n]*[ \t\r\n]*"\(\([^"]*\.\)\?vimrc\|[^"]*\.vim\)"'';
|
||||
vim.extraStart = alts [
|
||||
(def ''"[^"]*\.vim"\.text'')
|
||||
(writerExt "vim")
|
||||
(writerName ''\([^"]*\.\)\?vimrc'')
|
||||
];
|
||||
xdefaults = {};
|
||||
}))}
|
||||
|
||||
@ -329,7 +385,7 @@ let {
|
||||
|
||||
set isk=@,48-57,_,192-255,-,'
|
||||
'';
|
||||
"/syntax/sed.vim".text = /* vim */ ''
|
||||
"/syntax/sed.vim".text = ''
|
||||
syn region sedBranch
|
||||
\ matchgroup=sedFunction start="T"
|
||||
\ matchgroup=sedSemicolon end=";\|$"
|
||||
|
||||
@ -48,10 +48,24 @@ in {
|
||||
|
||||
systemd.services.xmonad = let
|
||||
xmonad = "${pkgs.haskellPackages.xmonad-tv}/bin/xmonad";
|
||||
xmonad-prepare = pkgs.writeDash "xmonad-prepare" ''
|
||||
xmonad-start = pkgs.writeDash "xmonad-start" ''
|
||||
${pkgs.coreutils}/bin/mkdir -p "$XMONAD_CACHE_DIR"
|
||||
${pkgs.coreutils}/bin/mkdir -p "$XMONAD_CONFIG_DIR"
|
||||
${pkgs.coreutils}/bin/mkdir -p "$XMONAD_DATA_DIR"
|
||||
|
||||
f=$HOME/.dbus/session-bus/$(${pkgs.coreutils}/bin/cat /etc/machine-id)-${
|
||||
toString config.services.xserver.display
|
||||
}
|
||||
if test -e "$f" &&
|
||||
. "$f" &&
|
||||
${pkgs.coreutils}/bin/kill -0 "$DBUS_SESSION_BUS_PID"
|
||||
then
|
||||
export DBUS_SESSION_BUS_ADDRESS
|
||||
else
|
||||
eval "$(${pkgs.dbus.lib}/bin/dbus-launch --sh-syntax)"
|
||||
fi
|
||||
|
||||
exec ${xmonad}
|
||||
'';
|
||||
xmonad-ready = pkgs.writeDash "xmonad-ready" ''
|
||||
{
|
||||
@ -97,8 +111,7 @@ in {
|
||||
"/run/wrappers" # for su
|
||||
];
|
||||
serviceConfig = {
|
||||
ExecStartPre = "@${xmonad-prepare} xmonad-prepare";
|
||||
ExecStart = "@${xmonad} xmonad-${currentSystem}";
|
||||
ExecStart = "@${xmonad-start} xmonad-${currentSystem}";
|
||||
ExecStop = "@${xmonad} xmonad-${currentSystem} --shutdown";
|
||||
SyslogIdentifier = "xmonad";
|
||||
User = cfg.user.name;
|
||||
|
||||
@ -9,6 +9,37 @@ let {
|
||||
config = lib.mkIf cfg.enable imp;
|
||||
};
|
||||
|
||||
extraTypes = {
|
||||
rules = types.submodule {
|
||||
options = {
|
||||
nat.OUTPUT = mkOption {
|
||||
type = with types; listOf str;
|
||||
default = [];
|
||||
};
|
||||
nat.PREROUTING = mkOption {
|
||||
type = with types; listOf str;
|
||||
default = [];
|
||||
};
|
||||
nat.POSTROUTING = mkOption {
|
||||
type = with types; listOf str;
|
||||
default = [];
|
||||
};
|
||||
filter.FORWARD = mkOption {
|
||||
type = with types; listOf str;
|
||||
default = [];
|
||||
};
|
||||
filter.INPUT = mkOption {
|
||||
type = with types; listOf str;
|
||||
default = [];
|
||||
};
|
||||
filter.Retiolum = mkOption {
|
||||
type = with types; listOf str;
|
||||
default = [];
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
api = {
|
||||
enable = mkEnableOption "tv.iptables";
|
||||
|
||||
@ -37,19 +68,19 @@ let {
|
||||
default = [];
|
||||
};
|
||||
|
||||
extra = {
|
||||
nat.POSTROUTING = mkOption {
|
||||
type = with types; listOf str;
|
||||
default = [];
|
||||
};
|
||||
filter.FORWARD = mkOption {
|
||||
type = with types; listOf str;
|
||||
default = [];
|
||||
};
|
||||
filter.INPUT = mkOption {
|
||||
type = with types; listOf str;
|
||||
default = [];
|
||||
};
|
||||
extra = mkOption {
|
||||
default = {};
|
||||
type = extraTypes.rules;
|
||||
};
|
||||
|
||||
extra4 = mkOption {
|
||||
default = {};
|
||||
type = extraTypes.rules;
|
||||
};
|
||||
|
||||
extra6 = mkOption {
|
||||
default = {};
|
||||
type = extraTypes.rules;
|
||||
};
|
||||
};
|
||||
|
||||
@ -112,6 +143,7 @@ let {
|
||||
"-o lo -p tcp -m tcp --dport 11423 -j REDIRECT --to-ports 22"
|
||||
]}
|
||||
${formatTable cfg.extra.nat}
|
||||
${formatTable cfg."extra${toString iptables-version}".nat}
|
||||
COMMIT
|
||||
*filter
|
||||
:INPUT DROP [0:0]
|
||||
@ -129,6 +161,7 @@ let {
|
||||
++ ["-i retiolum -j Retiolum"]
|
||||
)}
|
||||
${formatTable cfg.extra.filter}
|
||||
${formatTable cfg."extra${toString iptables-version}".filter}
|
||||
${concatMapStringsSep "\n" (rule: "-A Retiolum ${rule}") ([]
|
||||
++ optional (cfg.accept-echo-request == "retiolum") accept-echo-request
|
||||
++ map accept-tcp (unique (map toString cfg.input-retiolum-accept-tcp))
|
||||
|
||||
@ -1,8 +1,4 @@
|
||||
{-# LANGUAGE DeriveDataTypeable #-} -- for XS
|
||||
{-# LANGUAGE FlexibleContexts #-} -- for xmonad'
|
||||
{-# LANGUAGE LambdaCase #-}
|
||||
{-# LANGUAGE ScopedTypeVariables #-}
|
||||
|
||||
|
||||
module Main (main) where
|
||||
|
||||
@ -51,7 +47,7 @@ mainNoArgs = do
|
||||
let width = 1366
|
||||
workspaces0 <- getWorkspaces0
|
||||
handleShutdownEvent <- newShutdownEventHandler
|
||||
xmonad
|
||||
launch
|
||||
$ withUrgencyHook (SpawnUrgencyHook "echo emit Urgency ")
|
||||
$ def
|
||||
{ terminal = Paths.urxvtc
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
with import <stockholm/lib>;
|
||||
self: super: {
|
||||
rxvt_unicode = self.callPackage ./rxvt_unicode {
|
||||
rxvt_unicode = self.callPackage ./rxvt_unicode.nix {
|
||||
rxvt_unicode = super.rxvt_unicode;
|
||||
};
|
||||
}
|
||||
|
||||
9
tv/5pkgs/override/rxvt_unicode.nix
Normal file
9
tv/5pkgs/override/rxvt_unicode.nix
Normal file
@ -0,0 +1,9 @@
|
||||
{ fetchurl, rxvt_unicode }:
|
||||
rxvt_unicode.overrideAttrs (old: {
|
||||
patches = old.patches ++ [
|
||||
(fetchurl {
|
||||
url = https://cgit.krebsco.de/rxvt-unicode/patch/?id=15f3f94;
|
||||
sha256 = "12vldwsds27c9l15ffc6svk9mj17jhypcz736pvpmpqbsymlkz2p";
|
||||
})
|
||||
];
|
||||
})
|
||||
@ -1,6 +0,0 @@
|
||||
{ rxvt_unicode }:
|
||||
rxvt_unicode.overrideAttrs (old: {
|
||||
patches = old.patches ++ [
|
||||
./finish-running-selection.patch
|
||||
];
|
||||
})
|
||||
@ -1,41 +0,0 @@
|
||||
diff --git a/src/rxvttoolkit.h b/src/rxvttoolkit.h
|
||||
index 56c9a3f..429055d 100644
|
||||
--- a/src/rxvttoolkit.h
|
||||
+++ b/src/rxvttoolkit.h
|
||||
@@ -384,6 +384,7 @@ struct rxvt_selection
|
||||
{
|
||||
rxvt_selection (rxvt_display *disp, int selnum, Time tm, Window win, Atom prop, rxvt_term *term);
|
||||
void run ();
|
||||
+ void finish (char *data = 0, unsigned int len = 0);
|
||||
~rxvt_selection ();
|
||||
|
||||
rxvt_term *term; // terminal to paste to, may be 0
|
||||
@@ -404,7 +405,6 @@ private:
|
||||
void timer_cb (ev::timer &w, int revents); ev::timer timer_ev;
|
||||
void x_cb (XEvent &xev); xevent_watcher x_ev;
|
||||
|
||||
- void finish (char *data = 0, unsigned int len = 0);
|
||||
void stop ();
|
||||
bool request (Atom target, int selnum);
|
||||
void handle_selection (Window win, Atom prop, bool delete_prop);
|
||||
diff --git a/src/screen.C b/src/screen.C
|
||||
index 9eb375a..77e7109 100644
|
||||
--- a/src/screen.C
|
||||
+++ b/src/screen.C
|
||||
@@ -2736,11 +2736,11 @@ rxvt_term::paste (char *data, unsigned int len) NOTHROW
|
||||
void
|
||||
rxvt_term::selection_request (Time tm, int selnum) NOTHROW
|
||||
{
|
||||
- if (!selection_req)
|
||||
- {
|
||||
- selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
|
||||
- selection_req->run ();
|
||||
- }
|
||||
+ if (selection_req)
|
||||
+ selection_req->finish ();
|
||||
+
|
||||
+ selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
|
||||
+ selection_req->run ();
|
||||
}
|
||||
|
||||
/* ------------------------------------------------------------------------- */
|
||||
102
tv/5pkgs/simple/bash-fzf-history.nix
Normal file
102
tv/5pkgs/simple/bash-fzf-history.nix
Normal file
@ -0,0 +1,102 @@
|
||||
with import <stockholm/lib>;
|
||||
{ pkgs
|
||||
|
||||
, edit-key ? "ctrl-e"
|
||||
, exec-key ? "enter"
|
||||
, edit-mark ? "${mark-prefix}${edit-key}"
|
||||
, exec-mark ? "${mark-prefix}${exec-key}"
|
||||
, edit-command ? "\"\""
|
||||
, exec-command ? "accept-line"
|
||||
, mark-prefix ? " #FZFKEY:"
|
||||
, finish-keyseq ? "\\C-x\\C-p"
|
||||
, rebind-keyseq ? "\\C-x\\C-o"
|
||||
|
||||
, start-keyseq ? "\\C-f"
|
||||
, load-keyseq ? start-keyseq
|
||||
}: let
|
||||
script = pkgs.writeBash "bash-fzf-history.sh" ''
|
||||
if ! command -v fzf >/dev/null; then
|
||||
# Alternatively rewrite ${pkgs.fzf}/share/fzf/* to use absolute paths.
|
||||
fzf() {
|
||||
${pkgs.fzf}/bin/fzf "$@"
|
||||
}
|
||||
fi
|
||||
|
||||
. ${pkgs.fzf}/share/fzf/key-bindings.bash
|
||||
. ${pkgs.fzf}/share/fzf/completion.bash
|
||||
|
||||
FZF_DEFAULT_OPTS='${toString [
|
||||
/* sh */ "--height=40%"
|
||||
/* sh */ "--inline-info"
|
||||
/* sh */ "--min-height=4"
|
||||
/* sh */ "--reverse"
|
||||
]}'
|
||||
|
||||
__fzf_history__() (
|
||||
IFS=$'\n'
|
||||
result=( $(
|
||||
# To add "unknown timestamps" to each line of the history:
|
||||
# sed -i '/^#[0-9]/{n;b};s/^/#1\n/' "$HISTFILE"
|
||||
HISTTIMEFORMAT=$'\e[38;5;244m%Y-%m-%dT%H:%M:%S\e[m ' history |
|
||||
${pkgs.gnused}/bin/sed '
|
||||
s/\(\x1b\[[0-9;]*\)244m1970-[0-9T:-]*/\1237m????-??-??T??:??:??/
|
||||
' |
|
||||
FZF_DEFAULT_OPTS="${toString [
|
||||
/* sh */ "--ansi"
|
||||
/* sh */ "--tac"
|
||||
/* sh */ "--sync"
|
||||
/* sh */ "-n2..,.."
|
||||
/* sh */ "--tiebreak=index"
|
||||
/* sh */ "--bind=ctrl-r:toggle-sort"
|
||||
/* sh */ "--expect=${edit-key},${exec-key}"
|
||||
/* sh */ "$FZF_DEFAULT_OPTS"
|
||||
/* sh */ "+m"
|
||||
]}" \
|
||||
${pkgs.fzf}/bin/fzf |
|
||||
${pkgs.gnused}/bin/sed '
|
||||
/^ *[0-9]/{
|
||||
s/^ *//
|
||||
s/ \+/\n/;# index
|
||||
s/ \+/\n/;# date
|
||||
}
|
||||
'
|
||||
) )
|
||||
if test -n "$result"; then
|
||||
key=''${result[0]}
|
||||
index=''${result[1]}
|
||||
date=''${result[2]}
|
||||
command=''${result[3]}
|
||||
|
||||
echo "$command${mark-prefix}$key"
|
||||
else
|
||||
# Ensure no empty new line gets produced when fzf was aborted.
|
||||
echo '${edit-mark}'
|
||||
fi
|
||||
)
|
||||
|
||||
__fzf_rebind_finish_keyseq__() {
|
||||
local suffix=
|
||||
case $READLINE_LINE in
|
||||
*'${edit-mark}')
|
||||
suffix='${edit-mark}'
|
||||
bind '"${finish-keyseq}": ${edit-command}'
|
||||
;;
|
||||
*'${exec-mark}')
|
||||
suffix='${exec-mark}'
|
||||
bind '"${finish-keyseq}": ${exec-command}'
|
||||
;;
|
||||
esac
|
||||
READLINE_LINE=${"\${READLINE_LINE:0:-\${#suffix}}"}
|
||||
}
|
||||
bind -x '"${rebind-keyseq}": __fzf_rebind_finish_keyseq__'
|
||||
|
||||
bind '"\C-r": reverse-search-history'
|
||||
bind '"${start-keyseq}": " \C-e\C-u\C-y\ey\C-u`__fzf_history__`\e\C-e\er\e^${rebind-keyseq}${finish-keyseq}"'
|
||||
|
||||
echo '# fzf key bindings loaded:' >&2
|
||||
bind -s | ${pkgs.gnugrep}/bin/grep __fzf_ >&2
|
||||
'';
|
||||
in
|
||||
script.overrideAttrs (old: rec {
|
||||
bind = /* sh */ ''bind -x '"${load-keyseq}": . ${script}' '';
|
||||
})
|
||||
Loading…
Reference in New Issue
Block a user