From 59940cb436215341e33f591d7994e975ed4bf61d Mon Sep 17 00:00:00 2001 From: nin Date: Wed, 6 Sep 2017 00:56:26 +0200 Subject: nin: allow icmp6 --- nin/2configs/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nin/2configs/default.nix b/nin/2configs/default.nix index 212fd368..68521c6d 100644 --- a/nin/2configs/default.nix +++ b/nin/2configs/default.nix @@ -158,6 +158,7 @@ with import ; filter.INPUT.rules = [ { predicate = "-m conntrack --ctstate RELATED,ESTABLISHED"; target = "ACCEPT"; precedence = 10001; } { predicate = "-p icmp"; target = "ACCEPT"; precedence = 10000; } + { predicate = "-p ipv6-icmp"; target = "ACCEPT"; v4 = false; precedence = 10000; } { predicate = "-i lo"; target = "ACCEPT"; precedence = 9999; } { predicate = "-p tcp --dport 22"; target = "ACCEPT"; precedence = 9998; } { predicate = "-p tcp -i retiolum"; target = "REJECT --reject-with tcp-reset"; precedence = -10000; } -- cgit v1.2.3 From 036bd54f3142ba05409b742a809c3082176e4596 Mon Sep 17 00:00:00 2001 From: nin Date: Wed, 6 Sep 2017 00:57:28 +0200 Subject: nin: add skype --- nin/1systems/hiawatha/config.nix | 1 + nin/2configs/skype.nix | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 nin/2configs/skype.nix diff --git a/nin/1systems/hiawatha/config.nix b/nin/1systems/hiawatha/config.nix index 0e48b41c..31b6abe4 100644 --- a/nin/1systems/hiawatha/config.nix +++ b/nin/1systems/hiawatha/config.nix @@ -15,6 +15,7 @@ with lib; + ]; krebs.build.host = config.krebs.hosts.hiawatha; diff --git a/nin/2configs/skype.nix b/nin/2configs/skype.nix new file mode 100644 index 00000000..621dfae8 --- /dev/null +++ b/nin/2configs/skype.nix @@ -0,0 +1,27 @@ +{ config, lib, pkgs, ... }: + +let + mainUser = config.users.extraUsers.nin; + inherit (import ) genid; + +in { + users.extraUsers = { + skype = { + name = "skype"; + uid = genid "skype"; + description = "user for running skype"; + home = "/home/skype"; + useDefaultShell = true; + extraGroups = [ "audio" "video" ]; + createHome = true; + }; + }; + + krebs.per-user.skype.packages = [ + pkgs.skype + ]; + + security.sudo.extraConfig = '' + ${mainUser.name} ALL=(skype) NOPASSWD: ALL + ''; +} -- cgit v1.2.3 From 8c46da0bbf50a89438b2928e9830bc3e59bb46e5 Mon Sep 17 00:00:00 2001 From: nin Date: Thu, 14 Sep 2017 23:06:24 +0200 Subject: nin nixpkgs: 799435b -> 9e7db9a --- nin/source.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nin/source.nix b/nin/source.nix index 183c71ba..52881a35 100644 --- a/nin/source.nix +++ b/nin/source.nix @@ -14,6 +14,6 @@ in stockholm.file = toString ; nixpkgs.git = { url = https://github.com/nixos/nixpkgs; - ref = "799435b"; + ref = "9e7db9a"; }; } -- cgit v1.2.3 From 7a7d085d33e1aa8e97f9f91d0fe53a1e378ce75e Mon Sep 17 00:00:00 2001 From: nin Date: Fri, 29 Sep 2017 19:10:33 +0200 Subject: nin nixpkgs 9e7d9a -> 9824ca6 --- nin/source.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nin/source.nix b/nin/source.nix index 52881a35..2c80afaa 100644 --- a/nin/source.nix +++ b/nin/source.nix @@ -14,6 +14,6 @@ in stockholm.file = toString ; nixpkgs.git = { url = https://github.com/nixos/nixpkgs; - ref = "9e7db9a"; + ref = "9824ca6"; }; } -- cgit v1.2.3 From ebef1a355f1104a55d24010bc0d2be772849fa3e Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 17 Oct 2017 22:24:34 +0200 Subject: cgit: reduce log spam --- krebs/3modules/git.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/krebs/3modules/git.nix b/krebs/3modules/git.nix index 610c20bb..ba092468 100644 --- a/krebs/3modules/git.nix +++ b/krebs/3modules/git.nix @@ -420,7 +420,16 @@ let ]; locations."/".extraConfig = '' 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 QUERY_STRING $args; fastcgi_param HTTP_HOST $server_name; -- cgit v1.2.3 From daca154ce3c75d232ed6c8ccc2375ac681b213ad Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 17 Oct 2017 23:37:37 +0200 Subject: git-preview: use worktrees --- krebs/5pkgs/simple/git-preview/default.nix | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/krebs/5pkgs/simple/git-preview/default.nix b/krebs/5pkgs/simple/git-preview/default.nix index f20f2a63..77826f34 100644 --- a/krebs/5pkgs/simple/git-preview/default.nix +++ b/krebs/5pkgs/simple/git-preview/default.nix @@ -1,15 +1,16 @@ -{ coreutils, git, stdenv, writeDashBin }: +{ coreutils, git, writeDashBin }: writeDashBin "git-preview" '' - PATH=${stdenv.lib.makeBinPath [ - coreutils - git - ]}''${PATH+:$PATH} - hashes=$(git log --format=%h "..$1") - end=$(echo "$hashes" | head -1) - start=$(echo "$hashes" | tail -1) - # exit if no diff was found - test -z "$start" && exit 0 - shift - git diff "$start^..$end" "$@" + set -efu + head_commit=$(${git}/bin/git log -1 --format=%H) + merge_commit=$1; shift + merge_message='Merge for git-preview' + preview_dir=$(${coreutils}/bin/mktemp --tmpdir -d git-preview.XXXXXXXX) + preview_name=$(${coreutils}/bin/basename "$preview_dir") + ${git}/bin/git worktree add --detach -f "$preview_dir" 2>/dev/null + ${git}/bin/git -C "$preview_dir" checkout -q "$head_commit" + ${git}/bin/git -C "$preview_dir" merge -qm "$merge_message" "$merge_commit" + ${git}/bin/git -C "$preview_dir" diff "$head_commit.." "$@" + ${coreutils}/bin/rm -fR "$preview_dir" + ${coreutils}/bin/rm -R .git/worktrees/"$preview_name" '' -- cgit v1.2.3 From de93609ea27beeac2055fcba93f1319809dc512a Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 18 Oct 2017 19:49:55 +0200 Subject: news: add painload --- krebs/2configs/news.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/krebs/2configs/news.nix b/krebs/2configs/news.nix index 56395c16..2628c798 100644 --- a/krebs/2configs/news.nix +++ b/krebs/2configs/news.nix @@ -16,6 +16,7 @@ vimperator|https://sites.google.com/a/vimperator.org/www/blog/posts.xml|#news weechat|http://dev.weechat.org/feed/atom|#news xkcd|https://xkcd.com/rss.xml|#news + painload|https://github.com/krebscode/painload/commits/master.atom|#news ''; }; } -- cgit v1.2.3 From 15ca4d1d1f2e2942e6d8bce368414baa28205f3d Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 18 Oct 2017 19:50:33 +0200 Subject: Reaktor plugins: fix wiki-todo-show --- krebs/5pkgs/simple/Reaktor/plugins.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/krebs/5pkgs/simple/Reaktor/plugins.nix b/krebs/5pkgs/simple/Reaktor/plugins.nix index c611d747..518e80d0 100644 --- a/krebs/5pkgs/simple/Reaktor/plugins.nix +++ b/krebs/5pkgs/simple/Reaktor/plugins.nix @@ -144,7 +144,8 @@ rec { ''; }; 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 ''; }; -- cgit v1.2.3 From 9bdf63d6025bf39e1079a33e931b9214e722e261 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 18 Oct 2017 19:51:08 +0200 Subject: l prism.r: add hellrazor user --- lass/1systems/prism/config.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix index 30d5c8da..a0bc1b90 100644 --- a/lass/1systems/prism/config.nix +++ b/lass/1systems/prism/config.nix @@ -168,6 +168,14 @@ in { "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 -- cgit v1.2.3 From e108056603ee0c3187b20887b643f1a1d385c490 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 18 Oct 2017 19:52:00 +0200 Subject: l pkgs.xmonad: add color invert --- lass/5pkgs/xmonad-lass.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lass/5pkgs/xmonad-lass.nix b/lass/5pkgs/xmonad-lass.nix index 997b60b8..fe391fef 100644 --- a/lass/5pkgs/xmonad-lass.nix +++ b/lass/5pkgs/xmonad-lass.nix @@ -139,6 +139,8 @@ myKeyMap = , ("M4-", spawn "${pkgs.xorg.xbacklight}/bin/xbacklight -set 10") , ("M4-", spawn "${pkgs.xorg.xbacklight}/bin/xbacklight -set 33") , ("M4-", spawn "${pkgs.xorg.xbacklight}/bin/xbacklight -set 100") + + , ("", spawn "${pkgs.xcalib}/bin/xcalib -invert -alter") ] forkFile :: FilePath -> [String] -> Maybe [(String, String)] -> X () -- cgit v1.2.3 From 63493967419334d28ad43c31656fb4553f1093bc Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 18 Oct 2017 19:52:37 +0200 Subject: l: set ca-bundle to /etc/ssl --- lass/2configs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix index f745dc4a..10d14e15 100644 --- a/lass/2configs/default.nix +++ b/lass/2configs/default.nix @@ -50,7 +50,7 @@ with import ; 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 = { CURL_CA_BUNDLE = ca-bundle; GIT_SSL_CAINFO = ca-bundle; -- cgit v1.2.3 From 4640fd15c69c448405a55c846f544b9e289ee2bc Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 18 Oct 2017 19:53:05 +0200 Subject: l baseX: set default font to clean --- lass/2configs/baseX.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix index 9d4ad8c6..5669eb77 100644 --- a/lass/2configs/baseX.nix +++ b/lass/2configs/baseX.nix @@ -31,15 +31,15 @@ in { options.lass.fonts = { regular = mkOption { type = types.str; - default = "xft:Hack-Regular:pixelsize=11,xft:Symbola"; + default = "-*-clean-*-*-*-*-*-*-*-*-*-*-iso10646-1"; }; bold = mkOption { type = types.str; - default = "xft:Hack-Bold:pixelsize=11,xft:Symbola"; + default = "-*-clean-*-*-*-*-*-*-*-*-*-*-iso10646-1"; }; italic = mkOption { type = types.str; - default = "xft:Hack-RegularOblique:pixelsize=11,xft:Symbol"; + default = "-*-clean-*-*-*-*-*-*-*-*-*-*-iso10646-1"; }; }; } -- cgit v1.2.3 From 55f89e6ecae55e206ee6f0ac4e0edc116cdbba8e Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 18 Oct 2017 19:53:53 +0200 Subject: l dns: don't resolve local queries --- lass/2configs/dns-stuff.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lass/2configs/dns-stuff.nix b/lass/2configs/dns-stuff.nix index e305145f..411b0750 100644 --- a/lass/2configs/dns-stuff.nix +++ b/lass/2configs/dns-stuff.nix @@ -13,6 +13,7 @@ with import ; }; services.dnsmasq = { enable = true; + resolveLocalQueries = false; extraConfig = '' server=127.1.0.1 #no-resolv -- cgit v1.2.3 From cef1c830b1baeda34cd16d5da4aa09ca79a9b4b2 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 18 Oct 2017 20:06:30 +0200 Subject: l nixpkgs: 68ef4b1 -> c99239b --- lass/source.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lass/source.nix b/lass/source.nix index bd0395bc..910d7033 100644 --- a/lass/source.nix +++ b/lass/source.nix @@ -10,7 +10,7 @@ in nixos-config.symlink = "stockholm/lass/1systems/${name}/config.nix"; nixpkgs.git = { url = https://github.com/nixos/nixpkgs; - ref = "68ef4b1"; + ref = "c99239b"; }; secrets.file = getAttr builder { buildbot = toString ; -- cgit v1.2.3 From 9064b8e5ce92c3380b8765d55e5ba722361286aa Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 19 Oct 2017 18:42:09 +0200 Subject: l: make screenlock configureable --- lass/1systems/helios/config.nix | 2 ++ lass/2configs/baseX.nix | 2 +- lass/2configs/screenlock.nix | 17 ----------------- lass/3modules/default.nix | 1 + lass/3modules/screenlock.nix | 37 +++++++++++++++++++++++++++++++++++++ lass/5pkgs/xmonad-lass.nix | 2 +- 6 files changed, 42 insertions(+), 19 deletions(-) delete mode 100644 lass/2configs/screenlock.nix create mode 100644 lass/3modules/screenlock.nix diff --git a/lass/1systems/helios/config.nix b/lass/1systems/helios/config.nix index 6db6f8fd..70aa3832 100644 --- a/lass/1systems/helios/config.nix +++ b/lass/1systems/helios/config.nix @@ -115,4 +115,6 @@ with import ; (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"; }) ]; + + lass.screenlock.command = "${pkgs.i3lock}/bin/i3lock -i /home/lass/lock.png -t -f"; } diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix index 5669eb77..a8bb8693 100644 --- a/lass/2configs/baseX.nix +++ b/lass/2configs/baseX.nix @@ -6,7 +6,6 @@ in { imports = [ ./mpv.nix ./power-action.nix - ./screenlock.nix ./copyq.nix ./xresources.nix ./livestream.nix @@ -136,4 +135,5 @@ in { }; services.urxvtd.enable = true; + lass.screenlock.enable = true; } diff --git a/lass/2configs/screenlock.nix b/lass/2configs/screenlock.nix deleted file mode 100644 index b5bc4ee2..00000000 --- a/lass/2configs/screenlock.nix +++ /dev/null @@ -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"; - }; - }; -} diff --git a/lass/3modules/default.nix b/lass/3modules/default.nix index e7744395..e14e39bc 100644 --- a/lass/3modules/default.nix +++ b/lass/3modules/default.nix @@ -8,6 +8,7 @@ _: ./mysql-backup.nix ./news.nix ./pyload.nix + ./screenlock.nix ./umts.nix ./usershadow.nix ./xresources.nix diff --git a/lass/3modules/screenlock.nix b/lass/3modules/screenlock.nix new file mode 100644 index 00000000..cf38f835 --- /dev/null +++ b/lass/3modules/screenlock.nix @@ -0,0 +1,37 @@ +{ pkgs, config, ... }: + +with import ; + +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 diff --git a/lass/5pkgs/xmonad-lass.nix b/lass/5pkgs/xmonad-lass.nix index fe391fef..12c07894 100644 --- a/lass/5pkgs/xmonad-lass.nix +++ b/lass/5pkgs/xmonad-lass.nix @@ -97,7 +97,7 @@ displaySomeException = displayException myKeyMap :: [([Char], X ())] myKeyMap = - [ ("M4-", spawn "${pkgs.i3lock}/bin/i3lock -i /var/lib/wallpaper/wallpaper -f") + [ ("M4-", spawn "${config.lass.screenlock.command}") , ("M4-C-p", spawn "${pkgs.scrot}/bin/scrot ~/public_html/scrot.png") , ("M4-p", spawn "${pkgs.pass}/bin/passmenu --type") , ("M4-o", spawn "${pkgs.brain}/bin/brainmenu --type") -- cgit v1.2.3 From b9d4a986d7abd392f34272c51f204879b8246680 Mon Sep 17 00:00:00 2001 From: nin Date: Tue, 24 Oct 2017 21:43:33 +0200 Subject: n 2 default: update binary-cache --- nin/2configs/default.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/nin/2configs/default.nix b/nin/2configs/default.nix index 68521c6d..e7bd78eb 100644 --- a/nin/2configs/default.nix +++ b/nin/2configs/default.nix @@ -4,6 +4,7 @@ with import ; { imports = [ ../2configs/vim.nix + { users.extraUsers = mapAttrs (_: h: { hashedPassword = h; }) @@ -45,12 +46,6 @@ with import ; SSL_CERT_FILE = ca-bundle; }; }) - { - nix = { - binaryCaches = ["http://cache.prism.r"]; - binaryCachePublicKeys = ["cache.prism-1:+S+6Lo/n27XEtvdlQKuJIcb1yO5NUqUCE2lolmTgNJU="]; - }; - } ]; networking.hostName = config.krebs.build.host.name; -- cgit v1.2.3 From 28c882a74a4a8cd43267b07aee76ccfe55818a0c Mon Sep 17 00:00:00 2001 From: nin Date: Tue, 24 Oct 2017 21:45:52 +0200 Subject: nin hiawatha firefox: remove flash --- nin/1systems/hiawatha/config.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/nin/1systems/hiawatha/config.nix b/nin/1systems/hiawatha/config.nix index 31b6abe4..fdae354f 100644 --- a/nin/1systems/hiawatha/config.nix +++ b/nin/1systems/hiawatha/config.nix @@ -99,10 +99,6 @@ with lib; allowUnfree = true; - firefox = { - enableGoogleTalkPlugin = true; - enableAdobeFlash = true; - }; }; #services.logind.extraConfig = "HandleLidSwitch=ignore"; -- cgit v1.2.3 From bac616c2cb18950b6dfad07da7481c679233c1c6 Mon Sep 17 00:00:00 2001 From: nin Date: Tue, 24 Oct 2017 21:48:35 +0200 Subject: n 2 default: add pavucontrol --- nin/2configs/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nin/2configs/default.nix b/nin/2configs/default.nix index e7bd78eb..0d2253c2 100644 --- a/nin/2configs/default.nix +++ b/nin/2configs/default.nix @@ -91,6 +91,7 @@ with import ; gnumake jq proot + pavucontrol populate p7zip termite -- cgit v1.2.3 From 458bd5f6bda5b5718959613ceb989862a530ed7b Mon Sep 17 00:00:00 2001 From: nin Date: Tue, 24 Oct 2017 21:52:28 +0200 Subject: n nixpkgs: 9824ca6 -> c99239b --- nin/source.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nin/source.nix b/nin/source.nix index 2c80afaa..188ebafc 100644 --- a/nin/source.nix +++ b/nin/source.nix @@ -14,6 +14,6 @@ in stockholm.file = toString ; nixpkgs.git = { url = https://github.com/nixos/nixpkgs; - ref = "9824ca6"; + ref = "c99239b"; }; } -- cgit v1.2.3 From b091ebbab79d6780839ced56e3eef28241e6ea4c Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 24 Oct 2017 22:30:23 +0200 Subject: tv umts: import from lass --- tv/3modules/default.nix | 1 + tv/3modules/umts.nix | 112 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 113 insertions(+) create mode 100644 tv/3modules/umts.nix diff --git a/tv/3modules/default.nix b/tv/3modules/default.nix index 493cc8b7..0fcf8cc9 100644 --- a/tv/3modules/default.nix +++ b/tv/3modules/default.nix @@ -5,6 +5,7 @@ ./hosts.nix ./iptables.nix ./nixpkgs-overlays.nix + ./umts.nix ./x0vncserver.nix ]; } diff --git a/tv/3modules/umts.nix b/tv/3modules/umts.nix new file mode 100644 index 00000000..ebf4f780 --- /dev/null +++ b/tv/3modules/umts.nix @@ -0,0 +1,112 @@ +{ config, lib, pkgs, ... }: + +with import ; + +let + cfg = config.tv.umts; + + out = { + options.tv.umts = api; + config = lib.mkIf cfg.enable imp; + }; + + api = { + enable = mkEnableOption "umts"; + modem = mkOption { + type = types.str; + default = "/dev/ttyUSB0"; + }; + initstrings = mkOption { + type = types.str; + default = '' + Init1 = ATZ + Init2 = ATQ0 V1 E1 S0=0 &C1 &D2 + ''; + }; + username = mkOption { + type = types.str; + default = "default"; + }; + password = mkOption { + type = types.str; + default = "default"; + }; + pppDefaults = mkOption { + type = types.str; + default = '' + noipdefault + usepeerdns + defaultroute + persist + noauth + ''; + }; + }; + + nixpkgs-1509 = import (pkgs.fetchFromGitHub { + owner = "NixOS"; repo = "nixpkgs-channels"; + rev = "91371c2bb6e20fc0df7a812332d99c38b21a2bda"; + sha256 = "1as1i0j9d2n3iap9b471y4x01561r2s3vmjc5281qinirlr4al73"; + }) {}; + + wvdial = nixpkgs-1509.wvdial; # https://github.com/NixOS/nixpkgs/issues/16113 + + umts-bin = pkgs.writeScriptBin "umts" '' + #!/bin/sh + set -euf + systemctl start umts + trap "systemctl stop umts;trap - INT TERM EXIT;exit" INT TERM EXIT + echo nameserver 8.8.8.8 | tee -a /etc/resolv.conf + journalctl -xfu umts + ''; + + wvdial-defaults = '' + [Dialer Defaults] + Modem = ${cfg.modem} + ${cfg.initstrings} + Modem Type = Analog Modem + Baud = 460800 + phone= *99# + Username = ${cfg.username} + Password = ${cfg.password} + Stupid Mode = 1 + Idle Seconds = 0 + PPPD Path = ${pkgs.ppp}/bin/pppd + ''; + + imp = { + environment.shellAliases = { + umts = "sudo ${umts-bin}/bin/umts"; + }; + + environment.systemPackages = [ + pkgs.ppp + ]; + + security.sudo.extraConfig = '' + tv ALL= (root) NOPASSWD: ${umts-bin}/bin/umts + ''; + + environment.etc = [ + { + source = pkgs.writeText "wvdial.conf" wvdial-defaults; + target = "wvdial.conf"; + } + { + source = pkgs.writeText "wvdial" cfg.pppDefaults; + target = "ppp/peers/wvdial"; + } + ]; + + systemd.services.umts = { + description = "UMTS wvdial Service"; + serviceConfig = { + Type = "simple"; + Restart = "always"; + RestartSec = "10s"; + ExecStart = "${wvdial}/bin/wvdial -n"; + }; + }; + }; + +in out -- cgit v1.2.3 From 8c23c4d17ff89dbba18ce5ab2b6c8124a87c2c11 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 24 Oct 2017 22:48:57 +0200 Subject: tv umts: cleanup --- tv/3modules/umts.nix | 105 ++++++++++++++++++++++----------------------------- 1 file changed, 46 insertions(+), 59 deletions(-) diff --git a/tv/3modules/umts.nix b/tv/3modules/umts.nix index ebf4f780..a6062702 100644 --- a/tv/3modules/umts.nix +++ b/tv/3modules/umts.nix @@ -1,17 +1,32 @@ -{ config, lib, pkgs, ... }: - with import ; +{ config, lib, pkgs, ... }: let -let cfg = config.tv.umts; - out = { - options.tv.umts = api; - config = lib.mkIf cfg.enable imp; - }; + umts-dial = pkgs.writeDash "umts-dial" '' + set -euf + ${pkgs.systemd}/bin/systemctl start umts + trap 'cleanup; trap - EXIT INT TERM' EXIT INT TERM + cleanup() { + ${pkgs.systemd}/bin/systemctl stop umts + } + echo nameserver 8.8.8.8 >> /etc/resolv.conf + ${pkgs.systemd}/bin/journalctl -xfu umts + ''; - api = { - enable = mkEnableOption "umts"; + # https://github.com/NixOS/nixpkgs/issues/16113 + wvdial = let + nixpkgs-1509 = import (pkgs.fetchFromGitHub { + owner = "NixOS"; repo = "nixpkgs-channels"; + rev = "91371c2bb6e20fc0df7a812332d99c38b21a2bda"; + sha256 = "1as1i0j9d2n3iap9b471y4x01561r2s3vmjc5281qinirlr4al73"; + }) {}; + in + nixpkgs-1509.wvdial; + +in { + options.tv.umts = { + enable = mkEnableOption "tv.umts"; modem = mkOption { type = types.str; default = "/dev/ttyUSB0"; @@ -43,61 +58,34 @@ let }; }; - nixpkgs-1509 = import (pkgs.fetchFromGitHub { - owner = "NixOS"; repo = "nixpkgs-channels"; - rev = "91371c2bb6e20fc0df7a812332d99c38b21a2bda"; - sha256 = "1as1i0j9d2n3iap9b471y4x01561r2s3vmjc5281qinirlr4al73"; - }) {}; - - wvdial = nixpkgs-1509.wvdial; # https://github.com/NixOS/nixpkgs/issues/16113 - - umts-bin = pkgs.writeScriptBin "umts" '' - #!/bin/sh - set -euf - systemctl start umts - trap "systemctl stop umts;trap - INT TERM EXIT;exit" INT TERM EXIT - echo nameserver 8.8.8.8 | tee -a /etc/resolv.conf - journalctl -xfu umts - ''; - - wvdial-defaults = '' - [Dialer Defaults] - Modem = ${cfg.modem} - ${cfg.initstrings} - Modem Type = Analog Modem - Baud = 460800 - phone= *99# - Username = ${cfg.username} - Password = ${cfg.password} - Stupid Mode = 1 - Idle Seconds = 0 - PPPD Path = ${pkgs.ppp}/bin/pppd - ''; - - imp = { - environment.shellAliases = { - umts = "sudo ${umts-bin}/bin/umts"; + config = lib.mkIf cfg.enable { + environment.etc = { + "ppp/peers/wvdial".text = cfg.pppDefaults; + "wvdial.conf".text = '' + [Dialer Defaults] + Modem = ${cfg.modem} + ${cfg.initstrings} + Modem Type = Analog Modem + Baud = 460800 + phone= *99# + Username = ${cfg.username} + Password = ${cfg.password} + Stupid Mode = 1 + Idle Seconds = 0 + PPPD Path = ${pkgs.ppp}/bin/pppd + ''; }; - environment.systemPackages = [ - pkgs.ppp + krebs.per-user.tv.packages = [ + (pkgs.writeDashBin "umts" '' + exec sudo ${umts-dial} + '') ]; security.sudo.extraConfig = '' - tv ALL= (root) NOPASSWD: ${umts-bin}/bin/umts + tv ALL= (root) NOPASSWD: ${umts-dial} ''; - environment.etc = [ - { - source = pkgs.writeText "wvdial.conf" wvdial-defaults; - target = "wvdial.conf"; - } - { - source = pkgs.writeText "wvdial" cfg.pppDefaults; - target = "ppp/peers/wvdial"; - } - ]; - systemd.services.umts = { description = "UMTS wvdial Service"; serviceConfig = { @@ -108,5 +96,4 @@ let }; }; }; - -in out +} -- cgit v1.2.3 From 48e34b59ad446256f429528e4e8946299ed3c1a0 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 24 Oct 2017 22:49:19 +0200 Subject: tv xu: enable umts --- tv/1systems/xu/config.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tv/1systems/xu/config.nix b/tv/1systems/xu/config.nix index 0363c983..08bdfa52 100644 --- a/tv/1systems/xu/config.nix +++ b/tv/1systems/xu/config.nix @@ -161,5 +161,14 @@ with import ; tv = "/home/tv/stockholm/tv/5pkgs"; }; + tv.umts = { + enable = true; + modem = "/dev/serial/by-id/usb-Lenovo_F5521gw_097EAD658B094860-if09"; + initstrings = '' + Init1 = AT+CFUN=1 + Init2 = AT+CGDCONT=1,"IP","pinternet.interkom.de","",0,0 + ''; + }; + virtualisation.virtualbox.host.enable = true; } -- cgit v1.2.3 From 1993cbc42114c759a47fed8de1e73980d3df57d9 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 26 Oct 2017 08:09:05 +0200 Subject: brscan4: init at 0.4.4-4 --- krebs/5pkgs/default.nix | 9 +++++++++ tv/5pkgs/default.nix | 8 -------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix index af4cbb3b..84c00e82 100644 --- a/krebs/5pkgs/default.nix +++ b/krebs/5pkgs/default.nix @@ -13,6 +13,15 @@ foldl' mergeAttrs {} // { + # https://github.com/NixOS/nixpkgs/pull/30065 + brscan4 = overrideDerivation super.brscan4 (original: rec { + name = "brscan4-0.4.4-4"; + src = super.fetchurl { + url = "http://download.brother.com/welcome/dlf006645/${name}.amd64.deb"; + sha256 = "0xy5px96y1saq9l80vwvfn6anr2q42qlxdhm6ci2a0diwib5q9fd"; + }; + }); + ReaktorPlugins = self.callPackage ./simple/Reaktor/plugins.nix {}; # https://github.com/proot-me/PRoot/issues/106 diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix index 9dc7ae7b..261871e6 100644 --- a/tv/5pkgs/default.nix +++ b/tv/5pkgs/default.nix @@ -13,14 +13,6 @@ foldl' mergeAttrs {} // { - brscan4 = overrideDerivation super.brscan4 (original: rec { - name = "brscan4-0.4.4-4"; - src = super.fetchurl { - url = "http://download.brother.com/welcome/dlf006645/${name}.amd64.deb"; - sha256 = "0xy5px96y1saq9l80vwvfn6anr2q42qlxdhm6ci2a0diwib5q9fd"; - }; - }); - # TODO use XDG_RUNTIME_DIR? cr = self.writeDashBin "cr" '' set -efu -- cgit v1.2.3 From 27c919fbf35fbfab90bb9b1f79171c853f716442 Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 26 Oct 2017 19:13:02 +0200 Subject: l screenlock: fix enableOption --- lass/3modules/screenlock.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lass/3modules/screenlock.nix b/lass/3modules/screenlock.nix index cf38f835..06ca1f27 100644 --- a/lass/3modules/screenlock.nix +++ b/lass/3modules/screenlock.nix @@ -11,7 +11,7 @@ let }; api = { - enable = mkEnableOption "news"; + enable = mkEnableOption "screenlock"; command = mkOption { type = types.str; default = "${pkgs.i3lock}/bin/i3lock -i /var/lib/wallpaper/wallpaper -f"; -- cgit v1.2.3 From e2512c4634b83a172d6f927b21ce0791b39a0ba9 Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 26 Oct 2017 19:13:30 +0200 Subject: l: add tomtop@lassul.us --- lass/2configs/exim-smarthost.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lass/2configs/exim-smarthost.nix b/lass/2configs/exim-smarthost.nix index 0b56f6f4..f9c8f8eb 100644 --- a/lass/2configs/exim-smarthost.nix +++ b/lass/2configs/exim-smarthost.nix @@ -45,6 +45,7 @@ with import ; { from = "raf@lassul.us"; to = lass.mail; } { from = "apple@lassul.us"; to = lass.mail; } { from = "coinbase@lassul.us"; to = lass.mail; } + { from = "tomtop@lassul.us"; to = lass.mail; } ]; system-aliases = [ { from = "mailer-daemon"; to = "postmaster"; } -- cgit v1.2.3 From bdbddc4c281c2d108568901319ac0cdc2866578f Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 26 Oct 2017 19:16:24 +0200 Subject: l domsen: add habsys mails --- lass/2configs/websites/domsen.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix index 10ff142f..6fbd4d0d 100644 --- a/lass/2configs/websites/domsen.nix +++ b/lass/2configs/websites/domsen.nix @@ -126,6 +126,8 @@ in { { from = "dominik@apanowicz.de"; to = "dominik_a@gmx.de"; } { from = "dma@ubikmedia.de"; to = "domsen"; } { from = "dma@ubikmedia.eu"; to = "domsen"; } + { from = "mail@habsys.de"; to = "domsen"; } + { from = "mail@habsys.eu"; to = "domsen"; } { from = "bruno@apanowicz.de"; to = "bruno"; } { from = "mail@jla-trading.com"; to = "jla-trading"; } { from = "jms@ubikmedia.eu"; to = "jms"; } -- cgit v1.2.3 From 45f205e1c5b7d5d1d45eab1fb293c86f7c93bd49 Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 26 Oct 2017 19:18:53 +0200 Subject: l: allow dns requests from retiolum --- lass/2configs/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix index 10d14e15..180647a6 100644 --- a/lass/2configs/default.nix +++ b/lass/2configs/default.nix @@ -210,6 +210,7 @@ with import ; { predicate = "-p tcp -i retiolum"; target = "REJECT --reject-with tcp-reset"; precedence = -10000; } { predicate = "-p udp -i retiolum"; target = "REJECT --reject-with icmp-port-unreachable"; v6 = false; precedence = -10000; } { predicate = "-i retiolum"; target = "REJECT --reject-with icmp-proto-unreachable"; v6 = false; precedence = -10000; } + { predicate = "-i retiolum -p udp -m udp --dport 53"; target = "ACCEPT"; } ]; }; }; -- cgit v1.2.3 From 8083880f49973eff49673da30b442f75b729594c Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 26 Oct 2017 20:01:37 +0200 Subject: l: steal br from tv --- lass/1systems/mors/config.nix | 1 + lass/2configs/br.nix | 48 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 lass/2configs/br.nix diff --git a/lass/1systems/mors/config.nix b/lass/1systems/mors/config.nix index 610bfef8..6a61ce1f 100644 --- a/lass/1systems/mors/config.nix +++ b/lass/1systems/mors/config.nix @@ -29,6 +29,7 @@ with import ; + { #risk of rain port krebs.iptables.tables.filter.INPUT.rules = [ diff --git a/lass/2configs/br.nix b/lass/2configs/br.nix new file mode 100644 index 00000000..35bac8fe --- /dev/null +++ b/lass/2configs/br.nix @@ -0,0 +1,48 @@ +with import ; +{ config, pkgs, ... }: { + + imports = [ + + ]; + + krebs.nixpkgs.allowUnfreePredicate = pkg: any (flip hasPrefix pkg.name) [ + "brother-udev-rule-type1-" + "brscan4-" + "mfcl2700dnlpr-" + ]; + + hardware.sane = { + enable = true; + brscan4 = { + enable = true; + netDevices = { + bra = { + model = "MFCL2700DN"; + ip = "10.23.42.221"; + }; + }; + }; + }; + + services.saned.enable = true; + + # usage: scanimage -d "$(find-scanner bra)" --batch --format=tiff --resolution 150 -x 211 -y 298 + environment.systemPackages = [ + (pkgs.writeDashBin "find-scanner" '' + set -efu + name=$1 + ${pkgs.sane-backends}/bin/scanimage -f '%m %d + ' \ + | ${pkgs.gawk}/bin/awk -v dev="*$name" '$1 == dev { print $2; exit }' \ + | ${pkgs.gnugrep}/bin/grep . + '') + ]; + + services.printing = { + enable = true; + drivers = [ + pkgs.mfcl2700dncupswrapper + ]; + }; + +} -- cgit v1.2.3 From 7e269eaba530afd455f1438b18f68b1304244500 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 26 Oct 2017 20:41:07 +0200 Subject: tv umts: RIP --- tv/1systems/xu/config.nix | 9 ----- tv/3modules/umts.nix | 99 ----------------------------------------------- 2 files changed, 108 deletions(-) delete mode 100644 tv/3modules/umts.nix diff --git a/tv/1systems/xu/config.nix b/tv/1systems/xu/config.nix index 08bdfa52..0363c983 100644 --- a/tv/1systems/xu/config.nix +++ b/tv/1systems/xu/config.nix @@ -161,14 +161,5 @@ with import ; tv = "/home/tv/stockholm/tv/5pkgs"; }; - tv.umts = { - enable = true; - modem = "/dev/serial/by-id/usb-Lenovo_F5521gw_097EAD658B094860-if09"; - initstrings = '' - Init1 = AT+CFUN=1 - Init2 = AT+CGDCONT=1,"IP","pinternet.interkom.de","",0,0 - ''; - }; - virtualisation.virtualbox.host.enable = true; } diff --git a/tv/3modules/umts.nix b/tv/3modules/umts.nix deleted file mode 100644 index a6062702..00000000 --- a/tv/3modules/umts.nix +++ /dev/null @@ -1,99 +0,0 @@ -with import ; -{ config, lib, pkgs, ... }: let - - cfg = config.tv.umts; - - umts-dial = pkgs.writeDash "umts-dial" '' - set -euf - ${pkgs.systemd}/bin/systemctl start umts - trap 'cleanup; trap - EXIT INT TERM' EXIT INT TERM - cleanup() { - ${pkgs.systemd}/bin/systemctl stop umts - } - echo nameserver 8.8.8.8 >> /etc/resolv.conf - ${pkgs.systemd}/bin/journalctl -xfu umts - ''; - - # https://github.com/NixOS/nixpkgs/issues/16113 - wvdial = let - nixpkgs-1509 = import (pkgs.fetchFromGitHub { - owner = "NixOS"; repo = "nixpkgs-channels"; - rev = "91371c2bb6e20fc0df7a812332d99c38b21a2bda"; - sha256 = "1as1i0j9d2n3iap9b471y4x01561r2s3vmjc5281qinirlr4al73"; - }) {}; - in - nixpkgs-1509.wvdial; - -in { - options.tv.umts = { - enable = mkEnableOption "tv.umts"; - modem = mkOption { - type = types.str; - default = "/dev/ttyUSB0"; - }; - initstrings = mkOption { - type = types.str; - default = '' - Init1 = ATZ - Init2 = ATQ0 V1 E1 S0=0 &C1 &D2 - ''; - }; - username = mkOption { - type = types.str; - default = "default"; - }; - password = mkOption { - type = types.str; - default = "default"; - }; - pppDefaults = mkOption { - type = types.str; - default = '' - noipdefault - usepeerdns - defaultroute - persist - noauth - ''; - }; - }; - - config = lib.mkIf cfg.enable { - environment.etc = { - "ppp/peers/wvdial".text = cfg.pppDefaults; - "wvdial.conf".text = '' - [Dialer Defaults] - Modem = ${cfg.modem} - ${cfg.initstrings} - Modem Type = Analog Modem - Baud = 460800 - phone= *99# - Username = ${cfg.username} - Password = ${cfg.password} - Stupid Mode = 1 - Idle Seconds = 0 - PPPD Path = ${pkgs.ppp}/bin/pppd - ''; - }; - - krebs.per-user.tv.packages = [ - (pkgs.writeDashBin "umts" '' - exec sudo ${umts-dial} - '') - ]; - - security.sudo.extraConfig = '' - tv ALL= (root) NOPASSWD: ${umts-dial} - ''; - - systemd.services.umts = { - description = "UMTS wvdial Service"; - serviceConfig = { - Type = "simple"; - Restart = "always"; - RestartSec = "10s"; - ExecStart = "${wvdial}/bin/wvdial -n"; - }; - }; - }; -} -- cgit v1.2.3 From d5c6e52dd5793a7cb0fad3835a5d1ab014c5bcc1 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 26 Oct 2017 20:41:47 +0200 Subject: tv netzclub: init --- tv/1systems/xu/config.nix | 1 + tv/2configs/netzclub.nix | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 tv/2configs/netzclub.nix diff --git a/tv/1systems/xu/config.nix b/tv/1systems/xu/config.nix index 0363c983..3e008a1b 100644 --- a/tv/1systems/xu/config.nix +++ b/tv/1systems/xu/config.nix @@ -11,6 +11,7 @@ with import ; + diff --git a/tv/2configs/netzclub.nix b/tv/2configs/netzclub.nix new file mode 100644 index 00000000..659e0d4e --- /dev/null +++ b/tv/2configs/netzclub.nix @@ -0,0 +1,45 @@ +{ pkgs, ... }: { + + # usage: ppp dial netzclub + + environment.etc."ppp/peers/netzclub".text = '' + /dev/ttyACM2 + 921600 + crtscts + defaultroute + holdoff 10 + lock + maxfail 0 + noauth + nodetach + noipdefault + passive + persist + usepeerdns + connect "${pkgs.ppp}/bin/chat -f ${pkgs.writeText "netzclub.script" '' + ABORT 'BUSY' + ABORT 'NO CARRIER' + ABORT 'VOICE' + ABORT 'NO DIALTONE' + ABORT 'NO DIAL TONE' + ABORT 'NO ANSWER' + ABORT 'DELAYED' + REPORT CONNECT + TIMEOUT 6 + ''' 'ATQ0' + 'OK-AT-OK' 'ATZ' + TIMEOUT 3 + 'OK\d-AT-OK' 'ATI' + 'OK' 'ATZ' + 'OK' 'ATQ0 V1 E1 S0=0 &C1 &D2 +FCLASS=0' + 'OK' 'ATDT*99***1#' + TIMEOUT 30 + CONNECT ''' + ''} + ''; + + environment.systemPackages = [ + ppp + ]; + +} -- cgit v1.2.3 From a00d516b5897bae3583aeae16103d7b6657f7cc4 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 26 Oct 2017 20:45:30 +0200 Subject: tv xu: lol wvdial --- tv/1systems/xu/config.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/tv/1systems/xu/config.nix b/tv/1systems/xu/config.nix index 3e008a1b..6c99f6bd 100644 --- a/tv/1systems/xu/config.nix +++ b/tv/1systems/xu/config.nix @@ -100,7 +100,6 @@ with import ; #tlsdate #unetbootin #utillinuxCurses - #wvdial #xdotool #xkill #xl2tpd -- cgit v1.2.3 From 01409f4dbfb353855f95c38210d2cb5b3fc90ba8 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 26 Oct 2017 20:58:32 +0200 Subject: tv modules: rm umts --- tv/3modules/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/tv/3modules/default.nix b/tv/3modules/default.nix index 0fcf8cc9..493cc8b7 100644 --- a/tv/3modules/default.nix +++ b/tv/3modules/default.nix @@ -5,7 +5,6 @@ ./hosts.nix ./iptables.nix ./nixpkgs-overlays.nix - ./umts.nix ./x0vncserver.nix ]; } -- cgit v1.2.3 From 42f3a5661b4e53b76eb7315df1782b9942f47865 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 26 Oct 2017 21:10:36 +0200 Subject: tv netzclub: { -> pkgs.}ppp --- tv/2configs/netzclub.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tv/2configs/netzclub.nix b/tv/2configs/netzclub.nix index 659e0d4e..dc2de714 100644 --- a/tv/2configs/netzclub.nix +++ b/tv/2configs/netzclub.nix @@ -39,7 +39,7 @@ ''; environment.systemPackages = [ - ppp + pkgs.ppp ]; } -- cgit v1.2.3 From d19f415bb00368970f8e0a1548b89a472a24d634 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 26 Oct 2017 21:29:35 +0200 Subject: tv netzclub: fix example --- tv/2configs/netzclub.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tv/2configs/netzclub.nix b/tv/2configs/netzclub.nix index dc2de714..6e06005e 100644 --- a/tv/2configs/netzclub.nix +++ b/tv/2configs/netzclub.nix @@ -1,6 +1,6 @@ { pkgs, ... }: { - # usage: ppp dial netzclub + # usage: pppd call netzclub environment.etc."ppp/peers/netzclub".text = '' /dev/ttyACM2 -- cgit v1.2.3 From f645e07f719e4529373674b8e47e18cb454f125f Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 26 Oct 2017 22:57:51 +0200 Subject: tv netzclub: add missing " --- tv/2configs/netzclub.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tv/2configs/netzclub.nix b/tv/2configs/netzclub.nix index 6e06005e..c49498ed 100644 --- a/tv/2configs/netzclub.nix +++ b/tv/2configs/netzclub.nix @@ -35,7 +35,7 @@ 'OK' 'ATDT*99***1#' TIMEOUT 30 CONNECT ''' - ''} + ''}" ''; environment.systemPackages = [ -- cgit v1.2.3 From 6c8acbdf9ab464f09d2c08751528d31a81612351 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 27 Oct 2017 00:09:03 +0200 Subject: tv netzclub: simplify AT code --- tv/2configs/netzclub.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/tv/2configs/netzclub.nix b/tv/2configs/netzclub.nix index c49498ed..7286bc84 100644 --- a/tv/2configs/netzclub.nix +++ b/tv/2configs/netzclub.nix @@ -25,16 +25,8 @@ ABORT 'NO ANSWER' ABORT 'DELAYED' REPORT CONNECT - TIMEOUT 6 - ''' 'ATQ0' - 'OK-AT-OK' 'ATZ' - TIMEOUT 3 - 'OK\d-AT-OK' 'ATI' - 'OK' 'ATZ' - 'OK' 'ATQ0 V1 E1 S0=0 &C1 &D2 +FCLASS=0' - 'OK' 'ATDT*99***1#' - TIMEOUT 30 - CONNECT ''' + "" "ATDT*99#" + CONNECT "" ''}" ''; -- cgit v1.2.3 From 36c01359dcffd3c7424366b9c43eb0b8baae666a Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 27 Oct 2017 01:35:04 +0200 Subject: tv: netzclub -> ppp --- tv/1systems/xu/config.nix | 2 +- tv/2configs/netzclub.nix | 37 ------------------------------------- tv/2configs/ppp.nix | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 33 insertions(+), 38 deletions(-) delete mode 100644 tv/2configs/netzclub.nix create mode 100644 tv/2configs/ppp.nix diff --git a/tv/1systems/xu/config.nix b/tv/1systems/xu/config.nix index 6c99f6bd..14926fe3 100644 --- a/tv/1systems/xu/config.nix +++ b/tv/1systems/xu/config.nix @@ -11,9 +11,9 @@ with import ; - + diff --git a/tv/2configs/netzclub.nix b/tv/2configs/netzclub.nix deleted file mode 100644 index 7286bc84..00000000 --- a/tv/2configs/netzclub.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ pkgs, ... }: { - - # usage: pppd call netzclub - - environment.etc."ppp/peers/netzclub".text = '' - /dev/ttyACM2 - 921600 - crtscts - defaultroute - holdoff 10 - lock - maxfail 0 - noauth - nodetach - noipdefault - passive - persist - usepeerdns - connect "${pkgs.ppp}/bin/chat -f ${pkgs.writeText "netzclub.script" '' - ABORT 'BUSY' - ABORT 'NO CARRIER' - ABORT 'VOICE' - ABORT 'NO DIALTONE' - ABORT 'NO DIAL TONE' - ABORT 'NO ANSWER' - ABORT 'DELAYED' - REPORT CONNECT - "" "ATDT*99#" - CONNECT "" - ''}" - ''; - - environment.systemPackages = [ - pkgs.ppp - ]; - -} diff --git a/tv/2configs/ppp.nix b/tv/2configs/ppp.nix new file mode 100644 index 00000000..9cc7568a --- /dev/null +++ b/tv/2configs/ppp.nix @@ -0,0 +1,32 @@ +{ pkgs, ... }: { + + # usage: pppd call default + + environment.etc."ppp/peers/default".text = '' + /dev/ttyACM2 + 921600 + crtscts + defaultroute + holdoff 10 + lock + maxfail 0 + noauth + nodetach + noipdefault + passive + persist + usepeerdns + connect "${pkgs.ppp}/bin/chat -f ${pkgs.writeText "default.chat" '' + ABORT "BUSY" + ABORT "NO CARRIER" + REPORT CONNECT + "" "ATDT*99#" + CONNECT + ''}" + ''; + + environment.systemPackages = [ + pkgs.ppp + ]; + +} -- cgit v1.2.3 From b6be4c6f40a699e7fd6032e5d33395aaa9c8c497 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 27 Oct 2017 17:13:38 +0200 Subject: l nixpkgs: c99239b -> ac2bb56 --- lass/source.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lass/source.nix b/lass/source.nix index 910d7033..36210423 100644 --- a/lass/source.nix +++ b/lass/source.nix @@ -10,7 +10,7 @@ in nixos-config.symlink = "stockholm/lass/1systems/${name}/config.nix"; nixpkgs.git = { url = https://github.com/nixos/nixpkgs; - ref = "c99239b"; + ref = "ac2bb56"; }; secrets.file = getAttr builder { buildbot = toString ; -- cgit v1.2.3 From 6934b5d83f245b723cf7d685d7ab0a758947bdc8 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 1 Nov 2017 18:34:06 +0100 Subject: l nixpkgs: ac2bb56 -> 6a0a00d --- lass/source.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lass/source.nix b/lass/source.nix index 36210423..4849cadc 100644 --- a/lass/source.nix +++ b/lass/source.nix @@ -10,7 +10,7 @@ in nixos-config.symlink = "stockholm/lass/1systems/${name}/config.nix"; nixpkgs.git = { url = https://github.com/nixos/nixpkgs; - ref = "ac2bb56"; + ref = "6a0a00d"; }; secrets.file = getAttr builder { buildbot = toString ; -- cgit v1.2.3