From 6ec1a6296930569c97cf029bad17c998d4fae66d Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 13 Mar 2017 23:54:15 +0100 Subject: [PATCH 1/9] m 2 urlwatch: supervise radare2 --- makefu/2configs/urlwatch.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/makefu/2configs/urlwatch.nix b/makefu/2configs/urlwatch.nix index 20eb031a1..6402b364a 100644 --- a/makefu/2configs/urlwatch.nix +++ b/makefu/2configs/urlwatch.nix @@ -19,6 +19,7 @@ https://api.github.com/repos/embray/d2to1/tags https://api.github.com/repos/dorimanx/exfat-nofuse/commits https://api.github.com/repos/dorimanx/exfat-nofuse/tags + https://api.github.com/repos/radare/radare2/tags ]; }; } From 679a03403f0b5152c091f23c4dc1b94625f5771b Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 17 Mar 2017 01:21:20 +0100 Subject: [PATCH 2/9] m 1 x: re-enable virtualbox want to test 3d acceleration --- makefu/1systems/x.nix | 3 ++- makefu/2configs/extra-fonts.nix | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 makefu/2configs/extra-fonts.nix diff --git a/makefu/1systems/x.nix b/makefu/1systems/x.nix index 9666f50ff..9cedc04a8 100644 --- a/makefu/1systems/x.nix +++ b/makefu/1systems/x.nix @@ -8,6 +8,7 @@ [ # base ../. ../2configs/main-laptop.nix + ../2configs/extra-fonts.nix ../2configs/tools/all.nix ../2configs/laptop-backup.nix ../2configs/dnscrypt.nix @@ -46,7 +47,7 @@ ../2configs/mail-client.nix ../2configs/printer.nix ../2configs/virtualization.nix - # ../2configs/virtualization-virtualbox.nix + ../2configs/virtualization-virtualbox.nix ../2configs/wwan.nix ../2configs/rad1o.nix diff --git a/makefu/2configs/extra-fonts.nix b/makefu/2configs/extra-fonts.nix new file mode 100644 index 000000000..7b3a5f197 --- /dev/null +++ b/makefu/2configs/extra-fonts.nix @@ -0,0 +1,14 @@ + { pkgs, ... }: + { + fonts = { + enableFontDir = true; + enableGhostscriptFonts = true; + fonts = with pkgs; [ + inconsolata # monospaced + ubuntu_font_family # Ubuntu fonts + unifont # some international languages + dejavu_fonts + terminus_font + ]; + }; + } From 8eb9bde68a5d2b3bfcc6086b8bc18588c1017448 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 24 Mar 2017 13:00:22 +0100 Subject: [PATCH 3/9] s 1 wolf: share directory --- shared/1systems/wolf.nix | 1 + shared/2configs/share-shack.nix | 38 +++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 shared/2configs/share-shack.nix diff --git a/shared/1systems/wolf.nix b/shared/1systems/wolf.nix index b0b822780..722a08812 100644 --- a/shared/1systems/wolf.nix +++ b/shared/1systems/wolf.nix @@ -15,6 +15,7 @@ in ../2configs/cgit-mirror.nix ../2configs/repo-sync.nix ../2configs/graphite.nix + ../2configs/share-shack.nix ]; # use your own binary cache, fallback use cache.nixos.org (which is used by # apt-cacher-ng in first place) diff --git a/shared/2configs/share-shack.nix b/shared/2configs/share-shack.nix new file mode 100644 index 000000000..247b9ee7d --- /dev/null +++ b/shared/2configs/share-shack.nix @@ -0,0 +1,38 @@ +{config, ... }:{ + users.users.smbguest = { + name = "smbguest"; + uid = config.ids.uids.smbguest; + group = "share"; + description = "smb guest user"; + home = "/home/share"; + createHome = true; + }; + + networking.firewall.allowedTCPPorts = [ + 139 445 # samba + ]; + + networking.firewall.allowedUDPPorts = [ + 137 138 + ]; + services.samba = { + enable = true; + shares = { + share-home = { + path = "/home/share/"; + "read only" = "no"; + browseable = "yes"; + "guest ok" = "yes"; + }; + }; + extraConfig = '' + guest account = smbguest + map to guest = bad user + # disable printing + load printers = no + printing = bsd + printcap name = /dev/null + disable spoolss = yes + ''; + }; +} From 12161121598deeb8467d50a25b540e436de9b0c1 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 24 Mar 2017 13:01:58 +0100 Subject: [PATCH 4/9] k 5 at-cacher-ng: bump to version 2 --- krebs/5pkgs/apt-cacher-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/krebs/5pkgs/apt-cacher-ng/default.nix b/krebs/5pkgs/apt-cacher-ng/default.nix index 53736dcfb..e3986713b 100644 --- a/krebs/5pkgs/apt-cacher-ng/default.nix +++ b/krebs/5pkgs/apt-cacher-ng/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "apt-cacher-ng-${version}"; - version = "0.9.3.2"; + version = "2"; src = fetchurl { url = "http://ftp.debian.org/debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_${version}.orig.tar.xz"; - sha256 = "1bvng9mwrggvc93q2alj0x72i56wifnjs2dsycr17mapsv0f2gnc"; + sha256 = "0bkc3012vinridl5ch46pwnxjalymx4wf6nxax64nm7bdkcj9azf"; }; NIX_LDFLAGS = "-lpthread"; From defaf14983770e880285c358f175e91244eaf2da Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 24 Mar 2017 13:02:26 +0100 Subject: [PATCH 5/9] m 2 base-gui: enable GS fonts --- makefu/2configs/base-gui.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefu/2configs/base-gui.nix b/makefu/2configs/base-gui.nix index 43b37cd8c..55dd44575 100644 --- a/makefu/2configs/base-gui.nix +++ b/makefu/2configs/base-gui.nix @@ -41,7 +41,7 @@ in fonts = { enableCoreFonts = true; enableFontDir = true; - enableGhostscriptFonts = false; + enableGhostscriptFonts = true; fonts = [ pkgs.terminus_font ]; }; From 5a004c891096b805f26fef818fa75227fe1d071f Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 24 Mar 2017 13:03:46 +0100 Subject: [PATCH 6/9] m 1 wry: mv Reaktor to omo --- makefu/1systems/omo.nix | 12 ++++++++++++ makefu/1systems/wry.nix | 14 +------------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/makefu/1systems/omo.nix b/makefu/1systems/omo.nix index a6a336fed..f77a19c11 100644 --- a/makefu/1systems/omo.nix +++ b/makefu/1systems/omo.nix @@ -182,5 +182,17 @@ in { zramSwap.enable = true; + krebs.Reaktor.reaktor = { + nickname = "Reaktor|bot"; + channels = [ "#krebs" "#shackspace" "#binaergewitter" ]; + plugins = with pkgs.ReaktorPlugins;[ + titlebot + # stockholm-issue + nixos-version + shack-correct + sed-plugin + random-emoji ]; + }; + krebs.build.host = config.krebs.hosts.omo; } diff --git a/makefu/1systems/wry.nix b/makefu/1systems/wry.nix index 2457ab92e..c403d2352 100644 --- a/makefu/1systems/wry.nix +++ b/makefu/1systems/wry.nix @@ -33,18 +33,6 @@ in { krebs.build.host = config.krebs.hosts.wry; - krebs.Reaktor.reaktor = { - nickname = "Reaktor|bot"; - channels = [ "#krebs" "#shackspace" "#binaergewitter" ]; - plugins = with pkgs.ReaktorPlugins;[ - titlebot - # stockholm-issue - nixos-version - shack-correct - sed-plugin - random-emoji ]; - }; - # prepare graphs services.nginx.enable = true; krebs.retiolum-bootstrap.enable = true; @@ -64,7 +52,7 @@ in { return 403; } ''; - serverAliases = [ "graphs.retiolum" "graphs.wry" "graphs.retiolum" "graphs.wry.retiolum" ]; + serverAliases = [ "graphs.r" "graphs.retiolum" "graphs.wry" "graphs.retiolum" "graphs.wry.retiolum" ]; }; anonymous = { enableSSL = true; From 4ddfc208e14bfb1b307a65960fa883166e49005e Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 24 Mar 2017 13:16:52 +0100 Subject: [PATCH 7/9] m 2 default: bump to 73a6832 --- makefu/2configs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix index 1ad7f0710..6d5a2f688 100644 --- a/makefu/2configs/default.nix +++ b/makefu/2configs/default.nix @@ -22,7 +22,7 @@ with import ; user = config.krebs.users.makefu; source = let inherit (config.krebs.build) host user; - ref = "53a2baa"; # unstable @ 2017-02-28 + ref = "73a6832"; # unstable @ 2017-03-24 in { nixpkgs = if config.makefu.full-populate || (getEnv "dummy_secrets" == "true") then { From a81a624345947848ed08a876c5ddd86a0dede62f Mon Sep 17 00:00:00 2001 From: makefu Date: Sat, 25 Mar 2017 00:39:56 +0100 Subject: [PATCH 8/9] m 5 dymo-cups-drivers: nuke --- makefu/5pkgs/dymo-cups-drivers/default.nix | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 makefu/5pkgs/dymo-cups-drivers/default.nix diff --git a/makefu/5pkgs/dymo-cups-drivers/default.nix b/makefu/5pkgs/dymo-cups-drivers/default.nix deleted file mode 100644 index d47bae6dd..000000000 --- a/makefu/5pkgs/dymo-cups-drivers/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, lib, pkgs, fetchurl, cups, ... }: - -stdenv.mkDerivation rec { - name = "dymo-cups-drivers-${version}"; - version = "1.4.0"; - src = fetchurl { - url = "http://download.dymo.com/dymo/Software/Download%20Drivers/Linux/Download/${name}.tar.gz"; - sha256 = "0wagsrz3q7yrkzb5ws0m5faq68rqnqfap9p98sgk5jl6x7krf1y6"; - }; - buildInputs = [ cups ]; - makeFlags = [ "cupsfilterdir=$(out)/lib/cups/filter" "cupsmodeldir=$(out)/share/cups/model" ]; - - # acd_cli gets dumped in bin and gets overwritten by fixupPhase - meta = { - description = "Dymo printer drivers"; - }; -} From 79737faaa693ee775f1b3e99ebb33a9729d95f9f Mon Sep 17 00:00:00 2001 From: makefu Date: Sat, 25 Mar 2017 16:37:10 +0100 Subject: [PATCH 9/9] m 2: fix printer --- makefu/2configs/printer.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefu/2configs/printer.nix b/makefu/2configs/printer.nix index 7c7b00abc..509ed512d 100644 --- a/makefu/2configs/printer.nix +++ b/makefu/2configs/printer.nix @@ -5,7 +5,7 @@ enable = true; drivers = [ pkgs.samsungUnifiedLinuxDriver - pkgs.dymo-cups-drivers + pkgs.cups-dymo ]; };