19.09: use new packages and smaller adjustments

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;
             }
           '';
         };

configs/workhorse/prometheus.nix

@@ -13,7 +13,7 @@
     };
   };
 
-  services.prometheus2 = {
+  services.prometheus = {
     enable = true;
     scrapeConfigs = [
       {

configs/workhorse/restic.nix

@@ -1,4 +1,4 @@
-{config, ... }:
+{ config, ... }:
 {
 
   backup.services.restic = {

images/yubikey-image.nix

@@ -21,7 +21,7 @@
     midori
     paperkey
     gnupg
-    haskellPackages.hopenpgp-tools
+    #haskellPackages.hopenpgp-tools
     ctmg
   ];
 

modules/system/audio.nix

@@ -89,11 +89,7 @@ in {
       # all in audio group can do audio
       systemWide = true;
 
-      package = pkgs.pulseaudioLight.override {
+      package = pkgs.pulseaudioFull;
-        jackaudioSupport = true;
-        # todo : check for bluetooth enable
-        bluetoothSupport = true;
-      };
 
       extraConfig = ''
 

system/all/default.nix

@@ -14,19 +14,18 @@
     <cleverca22/qemu.nix>
 
     ./grub.nix
-    ./tinc.nix
+    ./networking-qos.nix
-    ./sshd.nix
+    ./nginx-landingpage.nix
-    ./sshd-known-hosts-private.nix
+    ./nginx.nix
-    ./sshd-known-hosts-public.nix
-    ./sshd-known-hosts-bootup.nix
     ./packages.nix
     ./restic.nix
-    ./syncthing.nix
     ./sftp-user.nix
-
+    ./sshd-known-hosts-bootup.nix
-    ./nginx.nix
+    ./sshd-known-hosts-private.nix
-    ./nginx-landingpage.nix
+    ./sshd-known-hosts-public.nix
-    ./networking-qos.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?
+
 }

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

system/desktop/packages.nix

@@ -8,8 +8,12 @@ let
 
   library = import <library> { inherit pkgs lib; };
 
-  seafileClient = unstablePkgs.seafile-client.override{
+  #seafileClient = unstablePkgs.seafile-client.override{
-    seafile-shared = unstablePkgs.seafile-shared;
+  #  seafile-shared = unstablePkgs.seafile-shared;
+  #};
+
+  seafileClient = pkgs.seafile-client.override{
+    seafile-shared = pkgs.seafile-shared;
   };
 
   replaceLinks = pkgs.writers.writeBashBin "replace-link-with-content" /* sh */ ''

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

system/server/restic.nix

@@ -1,9 +1,10 @@
+{ lib, ... }:
 {
 
   backup.services.restic = {
-    "on-porani".enable = true;
+    "on-porani".enable = lib.mkDefault true;
-    "on-workhorse".enable = true;
+    "on-workhorse".enable = lib.mkDefault true;
-    "on-workout".enable = true;
+    "on-workout".enable = lib.mkDefault true;
   };
 
 }