summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--krebs/3modules/tv/default.nix1
-rw-r--r--krebs/5pkgs/goify/default.nix17
-rw-r--r--krebs/5pkgs/much/cabal.nix28
-rw-r--r--krebs/5pkgs/much/default.nix31
-rw-r--r--lass/1systems/prism.nix18
-rw-r--r--lass/2configs/git.nix2
-rw-r--r--lass/2configs/hfos.nix2
-rw-r--r--lass/2configs/xresources.nix2
-rw-r--r--lib/types.nix4
-rw-r--r--tv/1systems/xu.nix2
-rw-r--r--tv/2configs/default.nix2
11 files changed, 73 insertions, 36 deletions
diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix
index 2da38e08..e387fabc 100644
--- a/krebs/3modules/tv/default.nix
+++ b/krebs/3modules/tv/default.nix
@@ -358,6 +358,7 @@ with import <stockholm/lib>;
ip6.addr = "42::1338";
aliases = [
"xu.r"
+ "cgit.xu.r"
];
tinc.pubkey = ''
-----BEGIN RSA PUBLIC KEY-----
diff --git a/krebs/5pkgs/goify/default.nix b/krebs/5pkgs/goify/default.nix
new file mode 100644
index 00000000..e2849b5c
--- /dev/null
+++ b/krebs/5pkgs/goify/default.nix
@@ -0,0 +1,17 @@
+{ pkgs, ... }:
+
+pkgs.writeDashBin "goify" ''
+ set -euf
+
+ GO_HOST=''${GO_HOST:-go}
+
+ while read line; do
+ echo "$line" | sed -E 's|https?://\S*|\n&\n|g' | while read word; do
+ if echo "$word" | grep -Eq ^https?:; then
+ ${pkgs.curl}/bin/curl -Ss -F uri="$word" http://"$GO_HOST" | tr -d '\r'
+ else
+ echo "$word";
+ fi;
+ done | sed '/^$/d' | tr '\n' ' '; echo;
+ done
+''
diff --git a/krebs/5pkgs/much/cabal.nix b/krebs/5pkgs/much/cabal.nix
new file mode 100644
index 00000000..09bc7b5d
--- /dev/null
+++ b/krebs/5pkgs/much/cabal.nix
@@ -0,0 +1,28 @@
+{ mkDerivation, aeson, attoparsec, base, base64-bytestring
+, blaze-builder, blessings, bytestring, case-insensitive
+, containers, deepseq, directory, docopt, email-header, fetchgit
+, filepath, friendly-time, hyphenation, linebreak, old-locale
+, process, random, rosezipper, safe, scanner, split, stdenv
+, terminal-size, text, time, transformers, transformers-compat
+, unix, vector
+}:
+mkDerivation {
+ pname = "much";
+ version = "1.1.0";
+ src = fetchgit {
+ url = "http://cgit.ni.krebsco.de/much";
+ sha256 = "1325554zymr1dd0clj8c5ygl70c791csvs0hz33jcfr6b8wysdrl";
+ rev = "dfec37d848e11c00d9b7f03295af1fc7b0e83ef5";
+ };
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ aeson attoparsec base base64-bytestring blaze-builder blessings
+ bytestring case-insensitive containers deepseq directory docopt
+ email-header filepath friendly-time hyphenation linebreak
+ old-locale process random rosezipper safe scanner split
+ terminal-size text time transformers transformers-compat unix
+ vector
+ ];
+ license = stdenv.lib.licenses.mit;
+}
diff --git a/krebs/5pkgs/much/default.nix b/krebs/5pkgs/much/default.nix
index aa3c56fe..cf55eb53 100644
--- a/krebs/5pkgs/much/default.nix
+++ b/krebs/5pkgs/much/default.nix
@@ -1,30 +1,3 @@
-{ pkgs, ... }:
+{ haskellPackages, ... }:
-pkgs.haskellPackages.callPackage (
-{ mkDerivation, aeson, attoparsec, base, base64-bytestring
-, blaze-builder, blessings, bytestring, case-insensitive, containers, deepseq
-, directory, docopt, email-header, fetchgit, filepath
-, friendly-time, hyphenation, linebreak, old-locale, process
-, random, rosezipper, safe, scanner, split, stdenv, terminal-size, text
-, time, transformers, transformers-compat, unix, vector
-}:
-mkDerivation {
- pname = "much";
- version = "1.0.0";
- src = fetchgit {
- url = "http://cgit.ni.krebsco.de/much";
- rev = "045dc986b4de225a927175f81c8ccfdab450202c";
- sha256 = "17jbw7x82a3bgn1qv5k764f103knrf865dmx48h7192vdh8gz766";
- };
- isLibrary = false;
- isExecutable = true;
- buildDepends = [
- aeson attoparsec base base64-bytestring blaze-builder blessings bytestring
- case-insensitive containers deepseq directory docopt email-header filepath
- friendly-time hyphenation linebreak old-locale process random rosezipper
- safe scanner split terminal-size text time transformers transformers-compat
- unix vector
- ];
- license = stdenv.lib.licenses.mit;
-}
-) {}
+haskellPackages.callPackage ./cabal.nix {}
diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix
index 41a909f1..c897ab65 100644
--- a/lass/1systems/prism.nix
+++ b/lass/1systems/prism.nix
@@ -26,7 +26,6 @@ in {
services.udev.extraRules = ''
SUBSYSTEM=="net", ATTR{address}=="54:04:a6:7e:f4:06", NAME="et0"
'';
-
}
../2configs/retiolum.nix
../2configs/exim-smarthost.nix
@@ -363,6 +362,23 @@ in {
];
};
}
+ {
+ #stuff for dritter
+ users.extraUsers.dritter = {
+ name = "dritter";
+ uid = genid "dritter";
+ home = "/home/dritter";
+ group = "users";
+ createHome = true;
+ useDefaultShell = true;
+ extraGroups = [
+ "download"
+ ];
+ openssh.authorizedKeys.keys = [
+ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDnqOWDDk7QkSAvrSLkEoz7dY22+xPyv5JDn2zlfUndfavmTMfZvPx9REMjgULbcCSM4m3Ncf40yUjciDpVleGoEz82+p/ObHAkVWPQyXRS3ZRM2IJJultBHEFc61+61Pi8k3p5pBhPPaig6VncJ4uUuuNqen9jqLesSTVXNtdntU2IvnC8B8k1Kq6fu9q1T2yEOMxkD31D5hVHlqAly0LdRiYvtsRIoCSmRvlpGl70uvPprhQxhtoiEUeDqmIL7BG9x7gU0Swdl7R0/HtFXlFuOwSlNYDmOf/Zrb1jhOpj4AlCliGUkM0iKIJhgH0tnJna6kfkGKHDwuzITGIh6SpZ dritter@Janeway"
+ ];
+ };
+ }
];
krebs.build.host = config.krebs.hosts.prism;
diff --git a/lass/2configs/git.nix b/lass/2configs/git.nix
index be08d0ec..72866c06 100644
--- a/lass/2configs/git.nix
+++ b/lass/2configs/git.nix
@@ -34,11 +34,11 @@ let
cgit.desc = "take all the computers hostage, they'll love you!";
cgit.section = "configuration";
};
- } // mapAttrs make-public-repo-silent {
the_playlist = {
cgit.desc = "Good Music collection + tools";
cgit.section = "art";
};
+ } // mapAttrs make-public-repo-silent {
};
restricted-repos = mapAttrs make-restricted-repo (
diff --git a/lass/2configs/hfos.nix b/lass/2configs/hfos.nix
index f63e5ea5..f8dd2f0d 100644
--- a/lass/2configs/hfos.nix
+++ b/lass/2configs/hfos.nix
@@ -40,7 +40,7 @@ with import <stockholm/lib>;
systemd.services.libvirtd.serviceConfig.ExecStartPost = let
restart-iptables = pkgs.writeDash "restart-iptables" ''
#soo hacky
- ${pkgs.coreutils}/bin/sleep 1s
+ ${pkgs.coreutils}/bin/sleep 5s
${pkgs.systemd}/bin/systemctl restart krebs-iptables.service
'';
in restart-iptables;
diff --git a/lass/2configs/xresources.nix b/lass/2configs/xresources.nix
index b5e72148..b5ba3df1 100644
--- a/lass/2configs/xresources.nix
+++ b/lass/2configs/xresources.nix
@@ -33,6 +33,8 @@ let
URxvt*.pointerBlankDelay: 987654321
URxvt*.pointerColor: #f042b0
URxvt*.pointerColor2: #050505
+
+ URxvt*color0: #232342
'';
in {
diff --git a/lib/types.nix b/lib/types.nix
index f511541b..30de5e17 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -284,8 +284,8 @@ rec {
default = "/home/${config.name}";
};
mail = mkOption {
- type = str; # TODO retiolum mail address
- default = "${config._module.args.name}@${config.networking.hostName}.r";
+ type = nullOr str;
+ default = null;
};
name = mkOption {
type = username;
diff --git a/tv/1systems/xu.nix b/tv/1systems/xu.nix
index 8cf6146b..60d1af23 100644
--- a/tv/1systems/xu.nix
+++ b/tv/1systems/xu.nix
@@ -43,7 +43,7 @@ with import <stockholm/lib>;
pass
q
qrencode
- #texLive
+ texlive.combined.scheme-full
tmux
#ack
diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index fd8bafe0..d16ff4eb 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -14,7 +14,7 @@ with import <stockholm/lib>;
stockholm.file = "/home/tv/stockholm";
nixpkgs.git = {
url = https://github.com/NixOS/nixpkgs;
- ref = "67c6638b089a5766435e07057ff73b35c82440cc"; # nixos-17.03
+ ref = "99dfb6dce37edcd1db7cb85c2db97089d9d5f442"; # nixos-17.03
};
} // optionalAttrs host.secure {
secrets-master.file = "/home/tv/secrets/master";
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 03:50:38 +0000