Merge remote-tracking branch 'prism/master'
This commit is contained in:
commit
506c9ee6c1
@ -16,6 +16,7 @@
|
|||||||
vimperator|https://sites.google.com/a/vimperator.org/www/blog/posts.xml|#news
|
vimperator|https://sites.google.com/a/vimperator.org/www/blog/posts.xml|#news
|
||||||
weechat|http://dev.weechat.org/feed/atom|#news
|
weechat|http://dev.weechat.org/feed/atom|#news
|
||||||
xkcd|https://xkcd.com/rss.xml|#news
|
xkcd|https://xkcd.com/rss.xml|#news
|
||||||
|
painload|https://github.com/krebscode/painload/commits/master.atom|#news
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -420,7 +420,16 @@ let
|
|||||||
];
|
];
|
||||||
locations."/".extraConfig = ''
|
locations."/".extraConfig = ''
|
||||||
include ${pkgs.nginx}/conf/fastcgi_params;
|
include ${pkgs.nginx}/conf/fastcgi_params;
|
||||||
fastcgi_param SCRIPT_FILENAME ${pkgs.cgit}/cgit/cgit.cgi;
|
fastcgi_param SCRIPT_FILENAME ${pkgs.writeDash "cgit-wrapper" ''
|
||||||
|
set -efu
|
||||||
|
exec 3>&1
|
||||||
|
${pkgs.cgit}/cgit/cgit.cgi "$@" 2>&1 >&3 3>&- \
|
||||||
|
| ${pkgs.gnused}/bin/sed \
|
||||||
|
'
|
||||||
|
\|^${pkgs.cgit}/cgit/cgit.cgi: Relink |d
|
||||||
|
'
|
||||||
|
exec 3>&-
|
||||||
|
''};
|
||||||
fastcgi_param PATH_INFO $uri;
|
fastcgi_param PATH_INFO $uri;
|
||||||
fastcgi_param QUERY_STRING $args;
|
fastcgi_param QUERY_STRING $args;
|
||||||
fastcgi_param HTTP_HOST $server_name;
|
fastcgi_param HTTP_HOST $server_name;
|
||||||
|
@ -144,7 +144,8 @@ rec {
|
|||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
wiki-todo-show = buildSimpleReaktorPlugin "wiki-todo" {
|
wiki-todo-show = buildSimpleReaktorPlugin "wiki-todo" {
|
||||||
script = pkgs.writeDash "wiki-todo-add" ''
|
pattern = "^wiki-show$";
|
||||||
|
script = pkgs.writeDash "wiki-show" ''
|
||||||
${pkgs.coreutils}/bin/cat wiki-todo
|
${pkgs.coreutils}/bin/cat wiki-todo
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
@ -1,15 +1,16 @@
|
|||||||
{ coreutils, git, stdenv, writeDashBin }:
|
{ coreutils, git, writeDashBin }:
|
||||||
|
|
||||||
writeDashBin "git-preview" ''
|
writeDashBin "git-preview" ''
|
||||||
PATH=${stdenv.lib.makeBinPath [
|
set -efu
|
||||||
coreutils
|
head_commit=$(${git}/bin/git log -1 --format=%H)
|
||||||
git
|
merge_commit=$1; shift
|
||||||
]}''${PATH+:$PATH}
|
merge_message='Merge for git-preview'
|
||||||
hashes=$(git log --format=%h "..$1")
|
preview_dir=$(${coreutils}/bin/mktemp --tmpdir -d git-preview.XXXXXXXX)
|
||||||
end=$(echo "$hashes" | head -1)
|
preview_name=$(${coreutils}/bin/basename "$preview_dir")
|
||||||
start=$(echo "$hashes" | tail -1)
|
${git}/bin/git worktree add --detach -f "$preview_dir" 2>/dev/null
|
||||||
# exit if no diff was found
|
${git}/bin/git -C "$preview_dir" checkout -q "$head_commit"
|
||||||
test -z "$start" && exit 0
|
${git}/bin/git -C "$preview_dir" merge -qm "$merge_message" "$merge_commit"
|
||||||
shift
|
${git}/bin/git -C "$preview_dir" diff "$head_commit.." "$@"
|
||||||
git diff "$start^..$end" "$@"
|
${coreutils}/bin/rm -fR "$preview_dir"
|
||||||
|
${coreutils}/bin/rm -R .git/worktrees/"$preview_name"
|
||||||
''
|
''
|
||||||
|
@ -115,4 +115,6 @@ with import <stockholm/lib>;
|
|||||||
(pkgs.fetchurl { url = "http://pki.dcso.de/ca/PEM/DCSOCAIDENC2G1.pem"; sha256 = "1z2qkyhgjvri13bvi06ynkb7mjmpcznmc9yw8chx1lnwc3cxa7kf"; })
|
(pkgs.fetchurl { url = "http://pki.dcso.de/ca/PEM/DCSOCAIDENC2G1.pem"; sha256 = "1z2qkyhgjvri13bvi06ynkb7mjmpcznmc9yw8chx1lnwc3cxa7kf"; })
|
||||||
(pkgs.fetchurl { url = "http://pki.dcso.de/ca/PEM/DCSOCAIDENC3G1.pem"; sha256 = "0smdjjvz95n652cb45yhzdb2lr83zg52najgbzf6lm3w71f8mv7f"; })
|
(pkgs.fetchurl { url = "http://pki.dcso.de/ca/PEM/DCSOCAIDENC3G1.pem"; sha256 = "0smdjjvz95n652cb45yhzdb2lr83zg52najgbzf6lm3w71f8mv7f"; })
|
||||||
];
|
];
|
||||||
|
|
||||||
|
lass.screenlock.command = "${pkgs.i3lock}/bin/i3lock -i /home/lass/lock.png -t -f";
|
||||||
}
|
}
|
||||||
|
@ -168,6 +168,14 @@ in {
|
|||||||
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDBQhLGvfv4hyQ/nqJGy1YgHXPSVl6igeWTroJSvAhUFgoh+rG+zvqY0EahKXNb3sq0/OYDCTJVuucc0hgCg7T2KqTqMtTb9EEkRmCFbD7F7DWZojCrh/an6sHneqT5eFvzAPZ8E5hup7oVQnj5P5M3I9keRHBWt1rq6q0IcOEhsFvne4qJc73aLASTJkxzlo5U8ju3JQOl6474ECuSn0lb1fTrQ/SR1NgF7jV11eBldkS8SHEB+2GXjn4Yrn+QUKOnDp+B85vZmVlJSI+7XR1/U/xIbtAjGTEmNwB6cTbBv9NCG9jloDDOZG4ZvzzHYrlBXjaigtQh2/4mrHoKa5eV juhulian@juhulian"
|
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDBQhLGvfv4hyQ/nqJGy1YgHXPSVl6igeWTroJSvAhUFgoh+rG+zvqY0EahKXNb3sq0/OYDCTJVuucc0hgCg7T2KqTqMtTb9EEkRmCFbD7F7DWZojCrh/an6sHneqT5eFvzAPZ8E5hup7oVQnj5P5M3I9keRHBWt1rq6q0IcOEhsFvne4qJc73aLASTJkxzlo5U8ju3JQOl6474ECuSn0lb1fTrQ/SR1NgF7jV11eBldkS8SHEB+2GXjn4Yrn+QUKOnDp+B85vZmVlJSI+7XR1/U/xIbtAjGTEmNwB6cTbBv9NCG9jloDDOZG4ZvzzHYrlBXjaigtQh2/4mrHoKa5eV juhulian@juhulian"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
users.users.hellrazor = {
|
||||||
|
uid = genid "hellrazor";
|
||||||
|
isNormalUser = true;
|
||||||
|
extraGroups = [
|
||||||
|
"download"
|
||||||
|
];
|
||||||
|
openssh.authorizedKeys.keys = [ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDQFaYOWRUvHP6I37q9Dd4PJOq8FNQqAeJZ8pLx0G62uC450kbPGcG80rHHvXmk7HqQP6biJmMg48bOsvXAScPot2Qhp1Qc35CuUqVhLiTvUAsi8l/iJjhjZ23yRGDCAmW5+JIOzIvECkcbMnG7YoYAQ9trNGHe9qwGzQGhpt3QVClE23WtE3PVKRLQx1VbiabSnAm6tXVd2zpUoSdpWt8Gpi2taM4XXJ5+l744MNxFHvDapN5xqpYzwrA34Ii13jNLWcGbtgxESpR+VjnamdWByrkBsW4X5/xn2K1I1FrujaM/DBHV1QMaDKst9V8+uL5X7aYNt0OUBu2eyZdg6aujY2BYovB9uRyR1JIuSbA/a54MM96yN9WirMUufJF/YZrV0L631t9EW8ORyWUo1GRzMuBHVHQlfApj7NCU/jEddUuTqKgwyRgTmMFMUI4M0tRULAB/7pBE1Vbcx9tg6RsKIk8VkskfbBJW9Y6Sx6YoFlxPdgMNIrBefqEjIV62piP7YLMlvfIDCJ7TNd9dLN86XGggZ/nD5zt6SL1o61vVnw9If8pHosppxADPJsJvcdN6fOe16/tFAeE0JRo0jTcyFVTBGfhpey+rFfuW8wtUyuO5WPUxkOn7xMHGMWHJAtWX2vwVIDtLxvqn48B4SmEOpPD6ii+vcpwqAex3ycqBUQ==" ];
|
||||||
|
};
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
#hotdog
|
#hotdog
|
||||||
|
@ -6,7 +6,6 @@ in {
|
|||||||
imports = [
|
imports = [
|
||||||
./mpv.nix
|
./mpv.nix
|
||||||
./power-action.nix
|
./power-action.nix
|
||||||
./screenlock.nix
|
|
||||||
./copyq.nix
|
./copyq.nix
|
||||||
./xresources.nix
|
./xresources.nix
|
||||||
./livestream.nix
|
./livestream.nix
|
||||||
@ -31,15 +30,15 @@ in {
|
|||||||
options.lass.fonts = {
|
options.lass.fonts = {
|
||||||
regular = mkOption {
|
regular = mkOption {
|
||||||
type = types.str;
|
type = types.str;
|
||||||
default = "xft:Hack-Regular:pixelsize=11,xft:Symbola";
|
default = "-*-clean-*-*-*-*-*-*-*-*-*-*-iso10646-1";
|
||||||
};
|
};
|
||||||
bold = mkOption {
|
bold = mkOption {
|
||||||
type = types.str;
|
type = types.str;
|
||||||
default = "xft:Hack-Bold:pixelsize=11,xft:Symbola";
|
default = "-*-clean-*-*-*-*-*-*-*-*-*-*-iso10646-1";
|
||||||
};
|
};
|
||||||
italic = mkOption {
|
italic = mkOption {
|
||||||
type = types.str;
|
type = types.str;
|
||||||
default = "xft:Hack-RegularOblique:pixelsize=11,xft:Symbol";
|
default = "-*-clean-*-*-*-*-*-*-*-*-*-*-iso10646-1";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@ -136,4 +135,5 @@ in {
|
|||||||
};
|
};
|
||||||
|
|
||||||
services.urxvtd.enable = true;
|
services.urxvtd.enable = true;
|
||||||
|
lass.screenlock.enable = true;
|
||||||
}
|
}
|
||||||
|
@ -50,7 +50,7 @@ with import <stockholm/lib>;
|
|||||||
NIX_PATH = mkForce "secrets=/var/src/stockholm/null:/var/src";
|
NIX_PATH = mkForce "secrets=/var/src/stockholm/null:/var/src";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
(let ca-bundle = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; in {
|
(let ca-bundle = "/etc/ssl/certs/ca-bundle.crt"; in {
|
||||||
environment.variables = {
|
environment.variables = {
|
||||||
CURL_CA_BUNDLE = ca-bundle;
|
CURL_CA_BUNDLE = ca-bundle;
|
||||||
GIT_SSL_CAINFO = ca-bundle;
|
GIT_SSL_CAINFO = ca-bundle;
|
||||||
|
@ -13,6 +13,7 @@ with import <stockholm/lib>;
|
|||||||
};
|
};
|
||||||
services.dnsmasq = {
|
services.dnsmasq = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
resolveLocalQueries = false;
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
server=127.1.0.1
|
server=127.1.0.1
|
||||||
#no-resolv
|
#no-resolv
|
||||||
|
@ -1,17 +0,0 @@
|
|||||||
{ pkgs, config, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
systemd.services.screenlock = {
|
|
||||||
before = [ "sleep.target" ];
|
|
||||||
wantedBy = [ "sleep.target" ];
|
|
||||||
environment = {
|
|
||||||
DISPLAY = ":0";
|
|
||||||
};
|
|
||||||
serviceConfig = {
|
|
||||||
SyslogIdentifier = "screenlock";
|
|
||||||
ExecStart = "${pkgs.i3lock}/bin/i3lock -i /var/lib/wallpaper/wallpaper -f";
|
|
||||||
Type = "forking";
|
|
||||||
User = "lass";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
@ -8,6 +8,7 @@ _:
|
|||||||
./mysql-backup.nix
|
./mysql-backup.nix
|
||||||
./news.nix
|
./news.nix
|
||||||
./pyload.nix
|
./pyload.nix
|
||||||
|
./screenlock.nix
|
||||||
./umts.nix
|
./umts.nix
|
||||||
./usershadow.nix
|
./usershadow.nix
|
||||||
./xresources.nix
|
./xresources.nix
|
||||||
|
37
lass/3modules/screenlock.nix
Normal file
37
lass/3modules/screenlock.nix
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
{ pkgs, config, ... }:
|
||||||
|
|
||||||
|
with import <stockholm/lib>;
|
||||||
|
|
||||||
|
let
|
||||||
|
cfg = config.lass.screenlock;
|
||||||
|
|
||||||
|
out = {
|
||||||
|
options.lass.screenlock = api;
|
||||||
|
config = mkIf cfg.enable imp;
|
||||||
|
};
|
||||||
|
|
||||||
|
api = {
|
||||||
|
enable = mkEnableOption "news";
|
||||||
|
command = mkOption {
|
||||||
|
type = types.str;
|
||||||
|
default = "${pkgs.i3lock}/bin/i3lock -i /var/lib/wallpaper/wallpaper -f";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
imp = {
|
||||||
|
systemd.services.screenlock = {
|
||||||
|
before = [ "sleep.target" ];
|
||||||
|
wantedBy = [ "sleep.target" ];
|
||||||
|
environment = {
|
||||||
|
DISPLAY = ":0";
|
||||||
|
};
|
||||||
|
serviceConfig = {
|
||||||
|
SyslogIdentifier = "screenlock";
|
||||||
|
ExecStart = cfg.command;
|
||||||
|
Type = "forking";
|
||||||
|
User = "lass";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
in out
|
@ -97,7 +97,7 @@ displaySomeException = displayException
|
|||||||
|
|
||||||
myKeyMap :: [([Char], X ())]
|
myKeyMap :: [([Char], X ())]
|
||||||
myKeyMap =
|
myKeyMap =
|
||||||
[ ("M4-<F11>", spawn "${pkgs.i3lock}/bin/i3lock -i /var/lib/wallpaper/wallpaper -f")
|
[ ("M4-<F11>", spawn "${config.lass.screenlock.command}")
|
||||||
, ("M4-C-p", spawn "${pkgs.scrot}/bin/scrot ~/public_html/scrot.png")
|
, ("M4-C-p", spawn "${pkgs.scrot}/bin/scrot ~/public_html/scrot.png")
|
||||||
, ("M4-p", spawn "${pkgs.pass}/bin/passmenu --type")
|
, ("M4-p", spawn "${pkgs.pass}/bin/passmenu --type")
|
||||||
, ("M4-o", spawn "${pkgs.brain}/bin/brainmenu --type")
|
, ("M4-o", spawn "${pkgs.brain}/bin/brainmenu --type")
|
||||||
@ -139,6 +139,8 @@ myKeyMap =
|
|||||||
, ("M4-<F6>", spawn "${pkgs.xorg.xbacklight}/bin/xbacklight -set 10")
|
, ("M4-<F6>", spawn "${pkgs.xorg.xbacklight}/bin/xbacklight -set 10")
|
||||||
, ("M4-<F7>", spawn "${pkgs.xorg.xbacklight}/bin/xbacklight -set 33")
|
, ("M4-<F7>", spawn "${pkgs.xorg.xbacklight}/bin/xbacklight -set 33")
|
||||||
, ("M4-<F8>", spawn "${pkgs.xorg.xbacklight}/bin/xbacklight -set 100")
|
, ("M4-<F8>", spawn "${pkgs.xorg.xbacklight}/bin/xbacklight -set 100")
|
||||||
|
|
||||||
|
, ("<Pause>", spawn "${pkgs.xcalib}/bin/xcalib -invert -alter")
|
||||||
]
|
]
|
||||||
|
|
||||||
forkFile :: FilePath -> [String] -> Maybe [(String, String)] -> X ()
|
forkFile :: FilePath -> [String] -> Maybe [(String, String)] -> X ()
|
||||||
|
@ -10,7 +10,7 @@ in
|
|||||||
nixos-config.symlink = "stockholm/lass/1systems/${name}/config.nix";
|
nixos-config.symlink = "stockholm/lass/1systems/${name}/config.nix";
|
||||||
nixpkgs.git = {
|
nixpkgs.git = {
|
||||||
url = https://github.com/nixos/nixpkgs;
|
url = https://github.com/nixos/nixpkgs;
|
||||||
ref = "68ef4b1";
|
ref = "c99239b";
|
||||||
};
|
};
|
||||||
secrets.file = getAttr builder {
|
secrets.file = getAttr builder {
|
||||||
buildbot = toString <stockholm/lass/2configs/tests/dummy-secrets>;
|
buildbot = toString <stockholm/lass/2configs/tests/dummy-secrets>;
|
||||||
|
Loading…
Reference in New Issue
Block a user