From 6b66a28152c56a79aaad90087519ce563c76b5a4 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sun, 15 May 2016 15:46:17 +0200 Subject: additional oh-my-zsh modules --- custom/zsh.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'custom') diff --git a/custom/zsh.nix b/custom/zsh.nix index 7279cf4f..826a3511 100644 --- a/custom/zsh.nix +++ b/custom/zsh.nix @@ -31,6 +31,8 @@ in rec { tmux zsh-users/zsh-syntax-highlighting systemd + pass + mosh EOBUNDLES if [[ -e ~/.zsh-theme ]]; then -- cgit v1.2.3 From 96b03e1bf70e5ed6021481710a7d6a53a9211c1f Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sun, 15 May 2016 23:07:27 +0200 Subject: allow selection of uucp protocols --- custom/uucp.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'custom') diff --git a/custom/uucp.nix b/custom/uucp.nix index 51caf13c..b58268ae 100644 --- a/custom/uucp.nix +++ b/custom/uucp.nix @@ -6,7 +6,7 @@ let portSpec = name: '' port ${name} type pipe - protocol e + protocol ${if config.services.uucp.protocols ? name then config.services.uucp.protocols."${name}" else config.services.uucp.defaultProtocol} reliable true command ${pkgs.openssh}/bin/ssh -x -o batchmode=yes ${name} ''; @@ -15,7 +15,7 @@ let time Any port ${name} chat "" - protocol e + protocol ${if config.services.uucp.protocols ? name then config.services.uucp.protocols."${name}" else config.services.uucp.defaultProtocol} command-path ${concatStringsSep " " config.services.uucp.commandPath} commands ${concatStringsSep " " (if config.services.uucp.commands ? name then config.services.uucp.commands."${name}" else config.services.uucp.defaultCommands)} ''; @@ -77,6 +77,18 @@ in { description = "Override commands for specific remotes"; }; + defaultProtocol = mkOption { + type = types.string; + default = "e"; + description = "UUCP protocol to use within ssh unless overriden"; + }; + + protocols = mkOption { + type = types.attrsOf types.string; + default = {}; + description = "UUCP protocols to use for specific remotes"; + }; + spoolDir = mkOption { type = types.path; default = "/var/spool/uucp"; -- cgit v1.2.3 From 1683de93383e8cd17dfa2e1206d965093e57c8bb Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sun, 15 May 2016 23:22:32 +0200 Subject: syntax --- custom/uucp.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'custom') diff --git a/custom/uucp.nix b/custom/uucp.nix index b58268ae..7035b934 100644 --- a/custom/uucp.nix +++ b/custom/uucp.nix @@ -6,7 +6,7 @@ let portSpec = name: '' port ${name} type pipe - protocol ${if config.services.uucp.protocols ? name then config.services.uucp.protocols."${name}" else config.services.uucp.defaultProtocol} + protocol ${if builtins.hasAttr name config.services.uucp.protocols then config.services.uucp.protocols."${name}" else config.services.uucp.defaultProtocol} reliable true command ${pkgs.openssh}/bin/ssh -x -o batchmode=yes ${name} ''; @@ -17,7 +17,7 @@ let chat "" protocol ${if config.services.uucp.protocols ? name then config.services.uucp.protocols."${name}" else config.services.uucp.defaultProtocol} command-path ${concatStringsSep " " config.services.uucp.commandPath} - commands ${concatStringsSep " " (if config.services.uucp.commands ? name then config.services.uucp.commands."${name}" else config.services.uucp.defaultCommands)} + commands ${concatStringsSep " " (if builtins.hasAttr name config.services.uucp.commands then config.services.uucp.commands."${name}" else config.services.uucp.defaultCommands)} ''; in { options = { -- cgit v1.2.3 From fdcccad60499bb0599303664dd9e1c2472812a0d Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sun, 15 May 2016 23:23:14 +0200 Subject: syntax --- custom/uucp.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'custom') diff --git a/custom/uucp.nix b/custom/uucp.nix index 7035b934..57a5c23e 100644 --- a/custom/uucp.nix +++ b/custom/uucp.nix @@ -15,7 +15,7 @@ let time Any port ${name} chat "" - protocol ${if config.services.uucp.protocols ? name then config.services.uucp.protocols."${name}" else config.services.uucp.defaultProtocol} + protocol ${if builtins.hasAttr name config.services.uucp.protocols then config.services.uucp.protocols."${name}" else config.services.uucp.defaultProtocol} command-path ${concatStringsSep " " config.services.uucp.commandPath} commands ${concatStringsSep " " (if builtins.hasAttr name config.services.uucp.commands then config.services.uucp.commands."${name}" else config.services.uucp.defaultCommands)} ''; -- cgit v1.2.3 From 40e6133451785fed08d1ae65c5a92130b1ac1b9e Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sun, 15 May 2016 23:30:56 +0200 Subject: uucp extraSys --- custom/uucp.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'custom') diff --git a/custom/uucp.nix b/custom/uucp.nix index 57a5c23e..ef0d98e7 100644 --- a/custom/uucp.nix +++ b/custom/uucp.nix @@ -139,6 +139,14 @@ in { default = ""; description = "Extra configuration to append verbatim to `/etc/uucp/config'"; }; + + extraSys = mkOption { + type = types.string; + default = '' + protocol-parameter g packet-size 4096 + ''; + description = "Extra configuration to prepend verbatim to `/etc/uucp/sys`"; + }; }; }; @@ -195,7 +203,7 @@ in { '' + concatStringsSep "\n" (map portSpec config.services.uucp.remoteNodes); }; environment.etc."uucp/sys" = { - text = concatStringsSep "\n" (map sysSpec config.services.uucp.remoteNodes); + text = config.services.uucp.extraSys + "\n" + concatStringsSep "\n" (map sysSpec config.services.uucp.remoteNodes); }; security.setuidOwners = map (p: {program = p; owner = "root"; group = "root"; setuid = true; setgid = false;}) ["uucico" "uuxqt" "cu" "uucp" "uuname" "uustat" "uux"]; -- cgit v1.2.3 From 7febeb62240c5f9c9e440d5713eedc14005f1ec8 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sun, 15 May 2016 23:57:18 +0200 Subject: no experiments! --- custom/tinc/def.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'custom') diff --git a/custom/tinc/def.nix b/custom/tinc/def.nix index e14ce5e9..41007ad4 100644 --- a/custom/tinc/def.nix +++ b/custom/tinc/def.nix @@ -118,6 +118,7 @@ in DeviceType = ${data.interfaceType} Device = /dev/net/tun Interface = tinc.${network} + ExperimentalProtocol = no ${data.extraConfig} ''; }; -- cgit v1.2.3 From d6a340e5d9916f7c7e8a57dd676d5d7adb19a2ed Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sun, 15 May 2016 23:58:51 +0200 Subject: tabs break everything --- custom/tinc/def.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'custom') diff --git a/custom/tinc/def.nix b/custom/tinc/def.nix index 41007ad4..3de31418 100644 --- a/custom/tinc/def.nix +++ b/custom/tinc/def.nix @@ -118,7 +118,7 @@ in DeviceType = ${data.interfaceType} Device = /dev/net/tun Interface = tinc.${network} - ExperimentalProtocol = no + ExperimentalProtocol = no ${data.extraConfig} ''; }; -- cgit v1.2.3 From 59bd0a0b15d1dc4c111115c8680be7438459127a Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Mon, 16 May 2016 00:04:20 +0200 Subject: tabs! *shakes fist* --- custom/uucp.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'custom') diff --git a/custom/uucp.nix b/custom/uucp.nix index ef0d98e7..8b476363 100644 --- a/custom/uucp.nix +++ b/custom/uucp.nix @@ -143,7 +143,7 @@ in { extraSys = mkOption { type = types.string; default = '' - protocol-parameter g packet-size 4096 + protocol-parameter g packet-size 4096 ''; description = "Extra configuration to prepend verbatim to `/etc/uucp/sys`"; }; -- cgit v1.2.3 From e985c76e88a6d9818371da2c3cf1d678dfd049a4 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Mon, 16 May 2016 00:04:56 +0200 Subject: =?UTF-8?q?my=20nemesis=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- custom/uucp.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'custom') diff --git a/custom/uucp.nix b/custom/uucp.nix index 8b476363..ed452f22 100644 --- a/custom/uucp.nix +++ b/custom/uucp.nix @@ -142,9 +142,9 @@ in { extraSys = mkOption { type = types.string; - default = '' + default = '' protocol-parameter g packet-size 4096 - ''; + ''; description = "Extra configuration to prepend verbatim to `/etc/uucp/sys`"; }; }; -- cgit v1.2.3