Update to 21.05

This still uses the relase-21.05 branch which should later be changed to nixos-21.05.
2021-05-24 22:12:33 +02:00 · 2021-05-24 22:12:33 +02:00 · 091f6b0e14
parent ad0748ba1b
commit 091f6b0e14
14 changed files with 43 additions and 52 deletions
--- a/flake.lock
+++ b/flake.lock
@ -91,16 +91,16 @@
        ]
      },
      "locked": {
-        "lastModified": 1617824794,
-        "narHash": "sha256-UGkvzx0nIXHhNq/KwJLjXvKAQRE2V33MuX+UirvqrkQ=",
+        "lastModified": 1621794721,
+        "narHash": "sha256-JXfTSZUu9EVbT9D/MFsx0cXfa8bw1NFCzIxZ7gO73Uo=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "2aa20ae969f2597c4df10a094440a66e9d7f8c86",
+        "rev": "90493027e33ba9eb3f50dc1da365d0e4ca31bf14",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "release-20.09",
+        "ref": "release-21.05",
        "repo": "home-manager",
        "type": "github"
      }
@ -187,16 +187,16 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1621718065,
-        "narHash": "sha256-2xw+iyUzV3blVq0EQjL2Qhzpp3r9uCLzYQns4nW7m7Y=",
+        "lastModified": 1622104865,
+        "narHash": "sha256-TY2wQE1m8nhjHTJ0lDL8ZUb9lA7Pw2WD2+bOiIhSqcE=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "ac60476ed94fd5424d9f3410c438825f793a8cbb",
+        "rev": "676ddafd3dbdc8dd95471df84bc5198d2d37d241",
        "type": "github"
      },
      "original": {
        "owner": "nixos",
-        "ref": "nixos-20.09",
+        "ref": "release-21.05",
        "repo": "nixpkgs",
        "type": "github"
      }
--- a/flake.nix
+++ b/flake.nix
@ -4,10 +4,10 @@
  inputs = {
    flake-utils.url = "github:numtide/flake-utils";

-    nixpkgs.url = "github:nixos/nixpkgs/nixos-20.09";
+    nixpkgs.url = "github:nixos/nixpkgs/release-21.05"; # FIXME: nixos-
    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";

-    home-manager.url = "github:nix-community/home-manager/release-20.09";
+    home-manager.url = "github:nix-community/home-manager/release-21.05";
    home-manager.inputs.nixpkgs.follows = "nixpkgs";

    krops.url = "github:Mic92/krops";
--- a/machines/fuuko/services/binary-cache.nix
+++ b/machines/fuuko/services/binary-cache.nix
@ -70,7 +70,7 @@ in
  systemd.services.nar-serve =
    let
      # TODO: remove once new version is released and in nixpkgs
-      nar-serve = pkgs.unstable.nar-serve.overrideAttrs (o: o // {
+      nar-serve = pkgs.nar-serve.overrideAttrs (o: o // {
        version = "unstable-2021-04-08";

        src = pkgs.fetchFromGitHub {
--- a/machines/fuuko/services/drone/runner-exec.nix
+++ b/machines/fuuko/services/drone/runner-exec.nix
@ -47,7 +47,7 @@ in
        "/etc/static"
        "/nix"
      ];
-      ExecStart = "${pkgs.unstable.drone-runner-exec}/bin/drone-runner-exec";
+      ExecStart = "${pkgs.drone-runner-exec}/bin/drone-runner-exec";
      User = user;
      Group = group;
    };
--- a/machines/fuuko/services/drone/server.nix
+++ b/machines/fuuko/services/drone/server.nix
@ -28,7 +28,7 @@ in
        drone-rpc-environment.path
        drone-server-environment.path
      ];
-      ExecStart = "${pkgs.unstable.drone}/bin/drone-server";
+      ExecStart = "${pkgs.drone}/bin/drone-server";
      Restart = "on-failure";
      User = user;
      Group = group;
--- a/machines/nunotaba/configuration.nix
+++ b/machines/nunotaba/configuration.nix
@ -22,6 +22,10 @@
    enable = true;
    client.enable = true;
  };
+  services.privoxy = {
+    enable = true;
+    enableTor = true;
+  };

  networking.hostName = "nunotaba";

--- a/machines/sayuri/configuration.nix
+++ b/machines/sayuri/configuration.nix
@ -27,6 +27,10 @@
    enable = true;
    client.enable = true;
  };
+  services.privoxy = {
+    enable = true;
+    enableTor = true;
+  };

  networking.hostName = "sayuri";

--- a/machines/sayuri/hardware-configuration.nix
+++ b/machines/sayuri/hardware-configuration.nix
@ -6,9 +6,6 @@
  ];

  boot = {
-    # async trim on btrfs requires kernel 5.6+
-    # TODO: Remove with kernel 5.6+ in stable
-    kernelPackages = pkgs.linuxPackages_latest;
    kernelModules = [ "kvm-intel" ];
    extraModulePackages = [ ];
    loader.grub.device = "/dev/disk/by-id/nvme-Samsung_SSD_970_EVO_Plus_250GB_S4EUNJ0N412342P";
@ -78,7 +75,7 @@

  environment.systemPackages = with pkgs; [
    clinfo
-    unstable.radeontop
+    radeontop
    rocm-smi
  ];
 }
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@ -18,17 +18,6 @@ in
  # version that works in my setup
  prometheus-fritzbox-exporter = callPackage ./prometheus-fritzbox-exporter { };

-  # FIXME: 21.05: Move to home-manager module package attribute
-  mpv-unwrapped = prev.mpv-unwrapped.overrideAttrs (o: o // {
-    patches = [
-      # FIXME: 21.05: Remove since it has mpv 0.33
-      (prev.fetchpatch {
-        url = "https://github.com/mpv-player/mpv/commit/43c13e5ea23230edca38426d4a9eed049a70890e.patch";
-        sha256 = "0g73ws36cs2hfzqck6xiaimj5yd5hz68b4wf3qayyv4nrf5sz02c";
-      })
-    ];
-  });
-
  # TODO: Remove when pavucontrol > 4.0 is released
  pavucontrol = prev.pavucontrol.overrideAttrs (o: o // {
    patches = [
--- a/users/simon/modules/mpd.nix
+++ b/users/simon/modules/mpd.nix
@ -7,7 +7,6 @@ lib.mkIf nixosConfig.sbruder.gui.enable {
    enable = true;
    musicDirectory = "~/Music";
    network.listenAddress = "${config.services.mpd.dataDir}/socket";
-    package = pkgs.unstable.mpd;
    extraConfig = ''
      zeroconf_enabled   "no"

--- a/users/simon/modules/programs.nix
+++ b/users/simon/modules/programs.nix
@ -19,7 +19,7 @@ let
  };
  # waifu2x-converter-cpp wrapper for real life images
  waifu2x-photo = pkgs.writeShellScriptBin "waifu2x-photo" ''
-    ${pkgs.unstable.waifu2x-converter-cpp}/bin/waifu2x-converter-cpp \
+    ${pkgs.waifu2x-converter-cpp}/bin/waifu2x-converter-cpp \
      --model-dir ${waifu2x-photo-models} \
      $@
  '';
@ -57,7 +57,7 @@ in

    # network tools
    dnsutils # dig
-    unstable.dogdns # better dig
+    dogdns # better dig
    gatling # high performance web server
    sshfs # mount remote host
    vnstat # client for vnstatd
@ -77,7 +77,7 @@ in

    # end user programs
    apacheHttpd # for htpasswd
-    unstable.libqalculate # flexible calculator for humans
+    libqalculate # flexible calculator for humans
    taskwarrior # todo list manager

    # passwords
@ -113,8 +113,8 @@ in
    ffmpeg-full # A/V multitool
    mediainfo # show information about media files
    mkvtoolnix-cli # matroska (de-)muxing
-    unstable.streamlink # video stream downloader
-    unstable.waifu2x-converter-cpp # super-resolution for anime-style images
+    streamlink # video stream downloader
+    waifu2x-converter-cpp # super-resolution for anime-style images
    waifu2x-photo # waifu2x-converter-cpp for real life photos

    # audio
@ -176,7 +176,7 @@ in
    antimicroX # gamepad to keyboard/mouse mapping
    filezilla # ftp client
    gparted # gui for parted
-    unstable.qalculate-gtk # flexible calculator
+    qalculate-gtk # flexible calculator
    scrcpy # stream/control android phones over adb
    wev # wayland event monitor
    wl-clipboard # not really gui, but cli tool to manage wayland clipboard
--- a/users/simon/modules/sway.nix
+++ b/users/simon/modules/sway.nix
@ -29,10 +29,6 @@ lib.mkIf nixosConfig.sbruder.gui.enable {
  wayland.windowManager.sway = {
    enable = true;

-    # TODO: remove with 21.05
-    package = pkgs.unstable.sway;
-    xwayland = false;
-
    config = {
      modifier = "Mod4";

@ -202,7 +198,11 @@ lib.mkIf nixosConfig.sbruder.gui.enable {
        urgent = rec { border = "#073642"; background = "#dc322f"; text = "#073642"; indicator = "#2aa198"; childBorder = background; };
      };

-      fonts = [ "monospace 10" ];
+      fonts = {
+        names = [ "monospace" ];
+        style = "Regular";
+        size = 10.0;
+      };
    };

    extraConfig = ''
@ -282,7 +282,6 @@ lib.mkIf nixosConfig.sbruder.gui.enable {
    brightnessctl # control screen brightness
    sway-contrib.grimshot # screenshots
    wdisplays # graphical output manager
-    pkgs.unstable.xwayland # TODO: remove with 21.05
  ];

  xdg.configFile."swaynag/config".text =
@ -517,8 +516,7 @@ lib.mkIf nixosConfig.sbruder.gui.enable {
    Service = {
      # ensure sway is already started, otherwise workspaces will not work
      ExecStartPre = "${config.wayland.windowManager.sway.package}/bin/swaymsg";
-      # FIXME: Remove override with 21.05 (https://github.com/NixOS/nixpkgs/pull/98490)
-      ExecStart = "${pkgs.waybar.override { pulseSupport = true; }}/bin/waybar";
+      ExecStart = "${pkgs.waybar}/bin/waybar";
      ExecReload = "${pkgs.utillinux}/bin/kill -SIGUSR2 $MAINPID";
      Restart = "on-failure";
      RestartSec = "1s";
--- a/users/simon/modules/youtube-dl.nix
+++ b/users/simon/modules/youtube-dl.nix
@ -1,13 +1,13 @@
 { lib, pkgs, ... }:
 let
-  formats = (lib.flatten
-    (lib.crossLists (x: y: [ "${x}+${y}" ])
-      [
-        [ "bestvideo[vcodec^=av01]" "bestvideo[vcodec^=vp9]" "bestvideo[vcodec^=avc1]" "bestvideo" ]
-        [ "bestaudio[acodec^=opus]" "bestaudio[acodec^=mp4a]" "bestaudio" ]
-      ])) ++ [
-    "best"
-  ];
+  # zAudioFormat because a better video format is preferred and
+  # cartesianProductOfSets cycles through the attributes in lexicographic order
+  formats = (map
+    ({ videoFormat, zAudioFormat }: "${videoFormat}+${zAudioFormat}")
+    (lib.cartesianProductOfSets {
+      videoFormat = [ "bestvideo[vcodec^=av01]" "bestvideo[vcodec^=vp9]" "bestvideo[vcodec^=avc1]" "bestvideo" ];
+      zAudioFormat = [ "bestaudio[acodec^=opus]" "bestaudio[acodec^=mp4a]" "bestaudio" ];
+    })) ++ [ "best" ];

  options = {
    format = lib.concatStringsSep "/" formats;
--- a/users/simon/modules/ytcc.nix
+++ b/users/simon/modules/ytcc.nix
@ -17,5 +17,5 @@
    };
  };

-  home.packages = with pkgs; [ unstable.ytcc ];
+  home.packages = with pkgs; [ ytcc ];
 }