Update to 20.09

MPV is disabled since the override options no longer work.
This also applies updated formatting.

modules/base.nix

@@ -7,7 +7,7 @@
     git-crypt # used to store secrets in configuration
     git-lfs # not so essential, but required to clone config
     htop
-    (unstable.neovim.override { vimAlias = true; }) # FIXME unstable is for python-msgpack 1.0; use stable once python-msgpack 1.0 is in stable
+    (neovim.override { vimAlias = true; })
     tmux
   ];
 

modules/cli-tools.nix

@@ -79,7 +79,7 @@
     (pass-wayland.withExtensions (es: with es; [ pass-otp ])) # password manager
     pwgen
     pwgen-secure # password generator
-    unstable.xkcdpass # memorable password generator
+    xkcdpass # memorable password generator
 
     # misc
     toilet # free figlet
@@ -94,7 +94,7 @@
     nix-direnv # per-directory environment for nix
 
     # git
-    unstable.gitAndTools.git-annex
+    gitAndTools.git-annex
     gitAndTools.git-annex-remote-rclone # git for non source files
     gitAndTools.pre-commit # pre-commit hook for git
   ];

modules/creative.nix

@@ -8,6 +8,6 @@
     gimpPlugins.gmic # bitmap editor
     krita # drawing
     openscad # parametric/procedural 3d modelling
-    unstable.inkscape # vector graphics editor
+    inkscape # vector graphics editor
   ];
 }

modules/docker.nix

@@ -6,7 +6,8 @@
     docker-ls
   ];
 
-  virtualisation.docker = {
+  virtualisation = {
+    docker = {
       enable = true;
       logDriver = "journald";
       extraOptions = builtins.concatStringsSep " " [
@@ -15,12 +16,12 @@
       ];
     };
 
-  docker-containers.ipv6nat = {
+    oci-containers.containers.ipv6nat = {
       image = "robbertkl/ipv6nat";
       volumes = [
         "/var/run/docker.sock:/var/run/docker.sock:ro"
       ];
-    extraDockerOptions = [
+      extraOptions = [
         "--network=host"
         "--cap-drop=ALL"
         "--cap-add=NET_ADMIN"
@@ -28,6 +29,7 @@
         "--cap-add=SYS_MODULE"
       ];
     };
+  };
 
   environment.etc."modules-load.d/ipv6nat.conf".text = "ip6_tables\n";
 }

modules/fonts.nix

@@ -5,10 +5,10 @@
     fonts = with pkgs; [
       corefonts # good ol’ microsoft fonts
       google-fonts # google font collection (free)
-      (unstable.nerdfonts.override { fonts = [ "Iosevka" ]; })
+      (nerdfonts.override { fonts = [ "Iosevka" ]; })
       #roboto # standalone roboto has awful kerning
-      unstable.source-han-sans
+      source-han-sans
-      unstable.source-han-serif # CJK fonts
+      source-han-serif # CJK fonts
       vistafonts # newer microsoft fonts
     ];
 

modules/gui-tools.nix

@@ -6,7 +6,7 @@
     filezilla # ftp client
     gparted # gui for parted
     qalculate-gtk # flexible calculator
-    unstable.antimicroX # gamepad to keyboard/mouse mapping
+    antimicroX # gamepad to keyboard/mouse mapping
     wl-clipboard # not really gui, but cli tool to manage wayland clipboard
     wxhexeditor # hex editor
     xfce.thunar # graphical file manager

modules/media.nix

@@ -32,7 +32,7 @@
       # Audio + Video
       ffmpeg-full # A/V multitool
       mkvtoolnix # matroska (de-)muxing
-      (mpv.override { archiveSupport = true; vapoursynthSupport = true; }) # media player
+      #(mpv.override { archiveSupport = true; vapoursynthSupport = true; }) # media player
 
       # Literature
       calibre # ebook library

modules/mpd.nix

@@ -1,5 +1,4 @@
 { pkgs, ... }:
-
 let
   mpdConf = pkgs.writeText "mpd.conf" ''
     music_directory    "~/Music"

modules/prometheus/node_exporter.nix

@@ -1,5 +1,4 @@
 { config, ... }:
-
 let
   vpnNetRanges = config.networking.wireguard.interfaces.wg-home.ips;
   vpnNetRange = builtins.elemAt vpnNetRanges 0;

modules/restic.nix

@@ -1,5 +1,4 @@
 { pkgs, config, lib, ... }:
-
 let
   excludes = [
     # General

modules/ssh.nix

@@ -1,5 +1,4 @@
 { ... }:
-
 let
   pubkeys = import ./pubkeys.nix;
 in

modules/sway.nix

@@ -10,11 +10,11 @@
       (waybar.override { pulseSupport = true; }) # better status bar
       mako # notification daemon
       #kanshi # autorandr
-      unstable.alacritty # temrinal
+      alacritty # temrinal
-      unstable.dmenu-wayland # launcher
+      dmenu-wayland # launcher
       brightnessctl # control screen brightness
       #redshift-wlr # natural color temperature
-      unstable.sway-contrib.grimshot # screenshots
+      sway-contrib.grimshot # screenshots
     ];
     extraSessionCommands = ''
       export CLUTTER_BACKEND=wayland

users/simon/base.nix

@@ -1,11 +1,10 @@
 { pkgs, ... }:
-
 let
   pubkeys = import ../../modules/pubkeys.nix;
 in
 {
   imports = [
-    (import "${builtins.fetchTarball https://github.com/rycee/home-manager/archive/master.tar.gz}/nixos") # FIXME: pin to release
+    (import "${builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/master.tar.gz"}/nixos") # FIXME: pin to 20.09
   ];
 
   users.users.simon = {