From c9ad1359f1605040860db136ceaf8be984baa7b2 Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 18 Apr 2019 07:53:44 +0200 Subject: ma x.r: clean up imports, remove pyload --- makefu/1systems/x/config.nix | 51 +++++++++++++++++++++++++++++++------------- 1 file changed, 36 insertions(+), 15 deletions(-) diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix index de55e9e89..3c5e50c4b 100644 --- a/makefu/1systems/x/config.nix +++ b/makefu/1systems/x/config.nix @@ -11,9 +11,13 @@ + + + { programs.adb.enable = true; } + # #{ @@ -23,7 +27,14 @@ # }; #} + # Restore: + # systemctl cat borgbackup-job-state + # export BORG_PASSCOMMAND BORG_REPO BORG_RSH + # borg list "$BORG_REPO" + # mount newroot somewhere && cd somewhere + # borg extract "$BORG_REPO::x-state-2019-04-17T01:41:51" --progress # < extract to cwd + # @@ -46,19 +57,18 @@ # Krebs - + # # applications - # # Virtualization - - + # + # #{ # networking.firewall.allowedTCPPorts = [ 8080 ]; @@ -71,35 +81,43 @@ # Services - + # # - - { nixpkgs.overlays = [ (self: super: super.prefer-remote-fetch self super) ]; } + # + # { nixpkgs.overlays = [ (self: super: super.prefer-remote-fetch self super) ]; } + + + # Hardware - - + # # # - - + # + # + # # + { + services.upower.enable = true; + users.users.makefu.packages = [ pkgs.gnome3.gnome-power-manager ]; + } + # Filesystem # Security - { programs.adb.enable = true; } + # temporary - { services.redis.enable = true; } - + # { services.redis.enable = true; } + # # # # @@ -136,6 +154,9 @@ makefu.server.primary-itf = "wlp3s0"; nixpkgs.config.allowUnfree = true; + nixpkgs.config.oraclejdk.accept_license = true; + + # configure pulseAudio to provide a HDMI sink as well networking.firewall.enable = true; @@ -163,7 +184,6 @@ "/home/makefu/.ssh/" "/home/makefu/.zsh_history" "/home/makefu/.bash_history" - "/home/makefu/.zshrc" "/home/makefu/bin" "/home/makefu/.gnupg" "/home/makefu/.imapfilter" @@ -171,6 +191,7 @@ "/home/makefu/docs" "/home/makefu/.password-store" "/home/makefu/.secrets-pass" + "/home/makefu/.config/syncthing" ]; services.syncthing.user = lib.mkForce "makefu"; -- cgit v1.2.3 From 398f96dfff0579e3d62d8ea0f7fd49dd91014d16 Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 18 Apr 2019 08:32:33 +0200 Subject: ma binary-cache: add gum --- makefu/2configs/binary-cache/gum.nix | 13 +++++++++++++ makefu/2configs/binary-cache/server.nix | 7 ++++--- 2 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 makefu/2configs/binary-cache/gum.nix diff --git a/makefu/2configs/binary-cache/gum.nix b/makefu/2configs/binary-cache/gum.nix new file mode 100644 index 000000000..fc54bd917 --- /dev/null +++ b/makefu/2configs/binary-cache/gum.nix @@ -0,0 +1,13 @@ + +{ config, ... }: + +{ + nix = { + binaryCaches = [ + "https://cache.euer.krebsco.de/" + ]; + binaryCachePublicKeys = [ + "gum:iIXIFlCAotib+MgI3V/i3HMlFXiVYOT/jfP0y54Zuvg=" + ]; + }; +} diff --git a/makefu/2configs/binary-cache/server.nix b/makefu/2configs/binary-cache/server.nix index ad6256830..c8f68c84d 100644 --- a/makefu/2configs/binary-cache/server.nix +++ b/makefu/2configs/binary-cache/server.nix @@ -19,9 +19,10 @@ }; services.nginx = { enable = true; - virtualHosts.nix-serve = { - serverAliases = [ "cache.gum.r" - "cache.euer.krebsco.de" + virtualHosts."cache.euer.krebsco.de" = { + forceSSL = true; + enableACME = true; + serverAliases = [ # "cache.gum.r" "cache.gum.krebsco.de" ]; locations."/".proxyPass= "http://localhost:${toString config.services.nix-serve.port}"; -- cgit v1.2.3