From c8d01edebb3c7dda7633fd4d8e885d88d0e56412 Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Sat, 26 Oct 2019 13:46:37 +0200 Subject: [PATCH] 19.09: use new packages and smaller adjustments --- configs/sputnik/nginx.nix | 4 ++-- configs/workhorse/prometheus.nix | 2 +- configs/workhorse/restic.nix | 2 +- images/yubikey-image.nix | 2 +- modules/system/audio.nix | 6 +----- system/all/default.nix | 25 ++++++++++++++--------- system/desktop/home-manager/spacemacs.nix | 3 ++- system/desktop/packages.nix | 8 ++++++-- system/desktop/yubikey.nix | 2 +- system/server/restic.nix | 7 ++++--- 10 files changed, 34 insertions(+), 27 deletions(-) diff --git a/configs/sputnik/nginx.nix b/configs/sputnik/nginx.nix index f5447e3..55544cf 100644 --- a/configs/sputnik/nginx.nix +++ b/configs/sputnik/nginx.nix @@ -55,7 +55,7 @@ root = "/srv/www/tech"; extraConfig = '' if (-d $request_filename) { - rewrite [^/]$ $scheme://$http_host$uri/ permanent; + rewrite [^/]$ $scheme://$http_host$request_uri/ permanent; } ''; }; @@ -72,7 +72,7 @@ root = "/srv/www/terranix"; extraConfig = '' if (-d $request_filename) { - rewrite [^/]$ $scheme://$http_host$uri/ permanent; + rewrite [^/]$ $scheme://$http_host$request_uri/ permanent; } ''; }; diff --git a/configs/workhorse/prometheus.nix b/configs/workhorse/prometheus.nix index 5949f71..130ed04 100644 --- a/configs/workhorse/prometheus.nix +++ b/configs/workhorse/prometheus.nix @@ -13,7 +13,7 @@ }; }; - services.prometheus2 = { + services.prometheus = { enable = true; scrapeConfigs = [ { diff --git a/configs/workhorse/restic.nix b/configs/workhorse/restic.nix index d7af1a0..e227982 100644 --- a/configs/workhorse/restic.nix +++ b/configs/workhorse/restic.nix @@ -1,4 +1,4 @@ -{config, ... }: +{ config, ... }: { backup.services.restic = { diff --git a/images/yubikey-image.nix b/images/yubikey-image.nix index 0dd254d..9c04f99 100644 --- a/images/yubikey-image.nix +++ b/images/yubikey-image.nix @@ -21,7 +21,7 @@ midori paperkey gnupg - haskellPackages.hopenpgp-tools + #haskellPackages.hopenpgp-tools ctmg ]; diff --git a/modules/system/audio.nix b/modules/system/audio.nix index c275abd..a61addd 100644 --- a/modules/system/audio.nix +++ b/modules/system/audio.nix @@ -89,11 +89,7 @@ in { # all in audio group can do audio systemWide = true; - package = pkgs.pulseaudioLight.override { - jackaudioSupport = true; - # todo : check for bluetooth enable - bluetoothSupport = true; - }; + package = pkgs.pulseaudioFull; extraConfig = '' diff --git a/system/all/default.nix b/system/all/default.nix index 4cc4f8b..b2c9a08 100644 --- a/system/all/default.nix +++ b/system/all/default.nix @@ -14,19 +14,18 @@ ./grub.nix - ./tinc.nix - ./sshd.nix - ./sshd-known-hosts-private.nix - ./sshd-known-hosts-public.nix - ./sshd-known-hosts-bootup.nix + ./networking-qos.nix + ./nginx-landingpage.nix + ./nginx.nix ./packages.nix ./restic.nix - ./syncthing.nix ./sftp-user.nix - - ./nginx.nix - ./nginx-landingpage.nix - ./networking-qos.nix + ./sshd-known-hosts-bootup.nix + ./sshd-known-hosts-private.nix + ./sshd-known-hosts-public.nix + ./sshd.nix + ./syncthing.nix + ./tinc.nix ]; @@ -70,4 +69,10 @@ zsh.enable = true; }; + # This value determines the NixOS release with which your system is to be + # compatible, in order to avoid breaking some software such as database + # servers. You should change this only after NixOS release notes say you + # should. + system.stateVersion = "19.03"; # Did you read the comment? + } diff --git a/system/desktop/home-manager/spacemacs.nix b/system/desktop/home-manager/spacemacs.nix index 85ad8e5..a2ad8b1 100644 --- a/system/desktop/home-manager/spacemacs.nix +++ b/system/desktop/home-manager/spacemacs.nix @@ -22,7 +22,8 @@ in # needed for the SPC p g pkgs.universal-ctags pkgs.nodePackages.tern - unstable.emacs + #unstable.emacs + pkgs.emacs ]; # download git repositories into the home folder diff --git a/system/desktop/packages.nix b/system/desktop/packages.nix index ad688f8..e308d27 100644 --- a/system/desktop/packages.nix +++ b/system/desktop/packages.nix @@ -8,8 +8,12 @@ let library = import { inherit pkgs lib; }; - seafileClient = unstablePkgs.seafile-client.override{ - seafile-shared = unstablePkgs.seafile-shared; + #seafileClient = unstablePkgs.seafile-client.override{ + # seafile-shared = unstablePkgs.seafile-shared; + #}; + + seafileClient = pkgs.seafile-client.override{ + seafile-shared = pkgs.seafile-shared; }; replaceLinks = pkgs.writers.writeBashBin "replace-link-with-content" /* sh */ '' diff --git a/system/desktop/yubikey.nix b/system/desktop/yubikey.nix index 6364bfe..986a25a 100644 --- a/system/desktop/yubikey.nix +++ b/system/desktop/yubikey.nix @@ -16,7 +16,7 @@ environment.systemPackages = [ # for `gpg --export $keyid | hokey lint` to check keys - pkgs.haskellPackages.hopenpgp-tools + #pkgs.haskellPackages.hopenpgp-tools # for otp keys (but I use pass otp) # pkgs.yubioath-desktop diff --git a/system/server/restic.nix b/system/server/restic.nix index 243c462..d46e299 100644 --- a/system/server/restic.nix +++ b/system/server/restic.nix @@ -1,9 +1,10 @@ +{ lib, ... }: { backup.services.restic = { - "on-porani".enable = true; - "on-workhorse".enable = true; - "on-workout".enable = true; + "on-porani".enable = lib.mkDefault true; + "on-workhorse".enable = lib.mkDefault true; + "on-workout".enable = lib.mkDefault true; }; }