diff options
| -rw-r--r-- | jeschli/1systems/brauerei/config.nix | 2 | ||||
| -rw-r--r-- | krebs/3modules/lass/default.nix | 26 | ||||
| -rw-r--r-- | krebs/source.nix | 2 | ||||
| -rw-r--r-- | lass/2configs/mail.nix | 18 | ||||
| -rw-r--r-- | nin/1systems/axon/config.nix | 4 | ||||
| -rw-r--r-- | nin/2configs/ableton.nix | 20 | ||||
| -rw-r--r-- | nin/2configs/git.nix | 11 | ||||
| -rw-r--r-- | nin/2configs/im.nix | 19 | ||||
| -rw-r--r-- | nin/source.nix | 5 |
9 files changed, 86 insertions, 21 deletions
diff --git a/jeschli/1systems/brauerei/config.nix b/jeschli/1systems/brauerei/config.nix index e4109c638..eb2bb11d2 100644 --- a/jeschli/1systems/brauerei/config.nix +++ b/jeschli/1systems/brauerei/config.nix @@ -79,6 +79,8 @@ jetbrains.goland # document viewer zathura + # xorg + xorg.xbacklight ]; # Some programs need SUID wrappers, can be configured further or are diff --git a/krebs/3modules/lass/default.nix b/krebs/3modules/lass/default.nix index 655a38030..e269d1fa1 100644 --- a/krebs/3modules/lass/default.nix +++ b/krebs/3modules/lass/default.nix @@ -551,6 +551,32 @@ with import <stockholm/lib>; }; }; }; + dpdkm = { + ci = false; + external = true; + nets = rec { + retiolum = { + ip4.addr = "10.243.29.173"; + ip6.addr = "42:4992:6a6d:900::1"; + aliases = [ "dpdkm.r" ]; + tinc.pubkey = '' + -----BEGIN RSA PUBLIC KEY----- + MIICCgKCAgEAuW31xGBdPMSS45KmsCX81yuTcDZv1z7wSpsGQiAw7RsApG0fbBDj + NvzWZaZpTTUueG7gtt7U9Gk8DhWYR1hNt8bLXxE5QlY+gxVjU8+caRvlv10Y9XYp + qZEr1n1O5R7jS1srvutPt74uiA8I3hBoeP5TXndu8tVcehjRWXPqJj4VCy9pT2gP + X880Z30cXm0jUIu9XKhzQU2UNaxbqRzhJTvFUG04M+0a9olsUoN7PnDV6MC5Dxzn + f0ZZZDgHkcx6vsSkN/C8Tik/UCXr3tS/VX6/3+PREz6Z3bPd2QfaWdowrlFQPeYa + bELPvuqYiq7zR/jw3vVsWX2e91goAfKH5LYKNmzJCj5yYq+knB7Wil3HgBn86zvL + Joj56VsuB8fQrrUxjrDetNgtdwci+yFeXkJouQRLM0r0W24liyCuBX4B6nqbj71T + B6rAMzhBbl1yixgf31EgiCYFSusk+jiT+hye5lAhes4gBW9GAWxGNU9zE4QeAc1w + tkPH/CxRIAeuPYNwmjvYI2eQH9UQkgSBa3/Kz7/KT9scbykbs8nhDHCXwT6oAp+n + dR5aHkuBrTQOCU3Xx5ZwU5A0T83oLExIeH8jR1h2mW1JoJDdO85dAOrIBHWnjLls + mqrJusBh2gbgvNqIrDaQ9J+o1vefw1QeSvcF71JjF1CEBUmTbUAp8KMCAwEAAQ== + -----END RSA PUBLIC KEY----- + ''; + }; + }; + }; xerxes = { cores = 2; nets = rec { diff --git a/krebs/source.nix b/krebs/source.nix index c2fbbc5f8..b22ef3574 100644 --- a/krebs/source.nix +++ b/krebs/source.nix @@ -18,7 +18,7 @@ in stockholm.file = toString <stockholm>; nixpkgs.git = { url = https://github.com/NixOS/nixpkgs; - ref = "d09e425aea3e09b6cec5c7b05cc0603f6853748b"; # nixos-17.09 @ 2018-02-22 + ref = "c5bc83b503dfb29eb27c1deb0268f15c1858e7ce"; # nixos-17.09 @ 2018-02-27 }; } override diff --git a/lass/2configs/mail.nix b/lass/2configs/mail.nix index e83201cd8..c6866c69d 100644 --- a/lass/2configs/mail.nix +++ b/lass/2configs/mail.nix @@ -21,13 +21,21 @@ let ''; mailboxes = { - wireguard = [ "to:wireguard@lists.zx2c4" ]; c-base = [ "to:c-base.org" ]; - security = [ "to:seclists.org" "to:security" "to:bugtraq" ]; + dezentrale = [ "to:dezentrale.space" ]; + kaosstuff = [ "to:gearbest@lassul.us" "to:banggood@lassul.us" ]; nix-devel = [ "to:nix-devel@googlegroups.com" ]; + patreon = [ "to:patreon@lassul.us" ]; + security = [ "to:seclists.org" "to:security" "to:bugtraq" ]; shack = [ "to:shackspace.de" ]; + wireguard = [ "to:wireguard@lists.zx2c4" ]; }; + tag-mails = pkgs.writeDashBin "nm-init-tag" '' + ${pkgs.notmuch}/bin/notmuch new + ${concatMapStringsSep "\n" (i: ''${pkgs.notmuch}/bin/notmuch tag -inbox +${i.name} -- tag:inbox ${concatMapStringsSep " or " (f: "${f}") i.value}'') (mapAttrsToList nameValuePair mailboxes)} + ''; + muttrc = pkgs.writeText "muttrc" '' # gpg source ${pkgs.neomutt}/share/doc/mutt/samples/gpg.rc @@ -80,10 +88,9 @@ let # V ''} %r |" - virtual-mailboxes "INBOX" "notmuch://?query=tag:inbox ${concatMapStringsSep " " (f: "and NOT ${f}") (flatten (attrValues mailboxes))}" + virtual-mailboxes "INBOX" "notmuch://?query=tag:inbox" virtual-mailboxes "Unread" "notmuch://?query=tag:unread" - ${concatMapStringsSep "\n" (i: ''${" "}virtual-mailboxes "${i.name}" "notmuch://?query=${concatMapStringsSep " or " (f: "${f}") i.value}"'') (mapAttrsToList nameValuePair mailboxes)} - virtual-mailboxes "BOX" "notmuch://?query=${concatMapStringsSep " and " (f: "NOT ${f}") (flatten (attrValues mailboxes))}" + ${concatMapStringsSep "\n" (i: ''${" "}virtual-mailboxes "${i.name}" "notmuch://?query=tag:${i.name}"'') (mapAttrsToList nameValuePair mailboxes)} virtual-mailboxes "TODO" "notmuch://?query=tag:TODO" virtual-mailboxes "Starred" "notmuch://?query=tag:*" virtual-mailboxes "Archive" "notmuch://?query=tag:archive" @@ -163,5 +170,6 @@ in { mutt pkgs.much pkgs.notmuch + tag-mails ]; } diff --git a/nin/1systems/axon/config.nix b/nin/1systems/axon/config.nix index c5f38c1f3..483a4f84b 100644 --- a/nin/1systems/axon/config.nix +++ b/nin/1systems/axon/config.nix @@ -11,6 +11,7 @@ with lib; <stockholm/nin> <nixpkgs/nixos/modules/installer/scan/not-detected.nix> #../2configs/copyq.nix + <stockholm/nin/2configs/ableton.nix> <stockholm/nin/2configs/games.nix> <stockholm/nin/2configs/git.nix> <stockholm/nin/2configs/retiolum.nix> @@ -98,6 +99,9 @@ with lib; enable = true; }; + services.xserver.displayManager.sessionCommands = '' + ${pkgs.xorg.xhost}/bin/xhost + local: + ''; services.xserver.desktopManager.xfce = let xbindConfig = pkgs.writeText "xbindkeysrc" '' diff --git a/nin/2configs/ableton.nix b/nin/2configs/ableton.nix new file mode 100644 index 000000000..343a9089d --- /dev/null +++ b/nin/2configs/ableton.nix @@ -0,0 +1,20 @@ +{ config, pkgs, ... }: let + mainUser = config.users.extraUsers.nin; +in { + users.users= { + ableton = { + isNormalUser = true; + extraGroups = [ + "audio" + "video" + ]; + packages = [ + pkgs.wine + pkgs.winetricks + ]; + }; + }; + security.sudo.extraConfig = '' + ${mainUser.name} ALL=(ableton) NOPASSWD: ALL + ''; +} diff --git a/nin/2configs/git.nix b/nin/2configs/git.nix index 9ebbaabd2..aed4a9f48 100644 --- a/nin/2configs/git.nix +++ b/nin/2configs/git.nix @@ -36,17 +36,6 @@ let make-public-repo = name: { cgit ? {}, ... }: { inherit cgit name; public = true; - hooks = { - post-receive = pkgs.git-hooks.irc-announce { - # TODO make nick = config.krebs.build.host.name the default - nick = config.krebs.build.host.name; - channel = "#xxx"; - server = "irc.r"; - verbose = config.krebs.build.host.name == "onondaga"; - # TODO define branches in some kind of option per repo - branches = [ "master" ]; - }; - }; }; make-rules = diff --git a/nin/2configs/im.nix b/nin/2configs/im.nix new file mode 100644 index 000000000..b078dbd53 --- /dev/null +++ b/nin/2configs/im.nix @@ -0,0 +1,19 @@ +{ config, lib, pkgs, ... }: +with import <stockholm/lib>; +{ + environment.systemPackages = with pkgs; [ + (pkgs.writeDashBin "im" '' + export PATH=${makeSearchPath "bin" (with pkgs; [ + tmux + gnugrep + weechat + ])} + ssh chat@onondaga + if tmux list-sessions -F\#S | grep -q '^im''$'; then + exec tmux attach -t im + else + exec tmux new -s im weechat + fi + '') + ]; +} diff --git a/nin/source.nix b/nin/source.nix index ccf5e6acc..ce1879357 100644 --- a/nin/source.nix +++ b/nin/source.nix @@ -12,8 +12,5 @@ in nin = "/home/nin/secrets/${name}"; }; stockholm.file = toString <stockholm>; - nixpkgs.git = { - url = https://github.com/nixos/nixpkgs; - ref = "afe9649"; - }; + nixpkgs = (import <stockholm/krebs/source.nix> host).nixpkgs; } |