chore: upgrade to 21.05

configs/alacritty.nix

@@ -25,7 +25,7 @@
       };
       key_bindings = [
         {
-          key = "Add";
+          key = "Plus";
           mods = "Control";
           action = "IncreaseFontSize";
         }

configs/bluetooth.nix

@@ -1,7 +1,7 @@
 { pkgs, lib, ... }: {
   hardware.bluetooth = {
     enable = true;
-    config.General.Enable =
+    settings.General.Enable =
       lib.concatStringsSep "," [ "Source" "Sink" "Media" "Socket" ];
   };
 

configs/default.nix

@@ -42,7 +42,6 @@ in {
     {
       boot.cleanTmpDir = true;
       boot.loader.timeout = 1;
-      boot.extraModulePackages = [ config.boot.kernelPackages.exfat-nofuse ];
     }
     {
       home-manager.users.me = {
@@ -181,7 +180,7 @@ in {
       services.atd.enable = true;
     }
     {
-      services.mingetty = {
+      services.getty = {
         greetingLine = lib.mkForce "";
         helpLine = lib.mkForce "";
       };
@@ -224,7 +223,7 @@ in {
     ./neovim.nix
     ./nix.nix
     ./newsboat.nix
-    ./flameshot-once.nix
+    # ./flameshot-once.nix
     ./packages
     ./power-action.nix
     ./printing.nix
@@ -242,7 +241,7 @@ in {
     ./theming.nix
     ./tmux.nix
     ./tor.nix
-    ./traadfri.nix
+    # ./traadfri.nix
     ./unclutter.nix
     ./version.nix
     ./vscode.nix

configs/fonts.nix

@@ -1,7 +1,9 @@
 { pkgs, ... }: {
+  nixpkgs.config.joypixels.acceptLicense = true;
+
   fonts = {
     enableDefaultFonts = true;
-    enableFontDir = true;
+    fontDir.enable = true;
     fonts = with pkgs; [
       corefonts
       eb-garamond

configs/htop.nix

@@ -2,45 +2,28 @@
   home-manager.users.me = {
     programs.htop = {
       enable = true;
-      colorScheme = 0;
-      accountGuestInCpuMeter = true;
-      cpuCountFromZero = false;
-      delay = 15;
-      detailedCpuTime = false;
-      headerMargin = true;
-      hideKernelThreads = true;
-      hideThreads = true;
-      hideUserlandThreads = true;
-      highlightBaseName = true;
-      highlightMegabytes = true;
-      highlightThreads = true;
-      shadowOtherUsers = true;
-      showProgramPath = false;
-      showThreadNames = false;
-      sortDescending = true;
-      sortKey = "PERCENT_CPU";
-      treeView = true;
-      updateProcessNames = false;
-      meters = {
-        left = [
-          {
-            kind = "LeftCPUs2";
-            mode = 1;
-          }
-          {
-            kind = "RightCPUs2";
-            mode = 1;
-          }
-          {
-            kind = "Memory";
-            mode = 1;
-          }
-          {
-            kind = "Swap";
-            mode = 1;
-          }
-        ];
-        right = [ "Uptime" "Tasks" "LoadAverage" "Battery" ];
+      settings = {
+        color_scheme = 0;
+        account_guest_in_cpu_meter = true;
+        cpu_count_from_zero = false;
+        delay = 15;
+        detailed_cpu_time = false;
+        header_margin = true;
+        hide_kernel_threads = true;
+        hide_threads = true;
+        hide_userland_threads = true;
+        highlight_base_name = true;
+        highlight_megabytes = true;
+        highlight_threads = true;
+        shadow_other_users = true;
+        show_program_path = false;
+        show_thread_names = false;
+        sort_descending = true;
+        sort_key = "PERCENT_CPU";
+        tree_view = true;
+        update_process_names = false;
+        right_meters = [ "Uptime" "Tasks" "LoadAverage" "Battery" ];
+        left_meters = [ "LeftCPUs2" "RightCPUs2" "Memory" "Swap" ];
       };
     };
   };

configs/i3.nix

@@ -67,7 +67,7 @@ in {
   home-manager.users.me.xsession.windowManager.i3 = {
     enable = true;
     config = rec {
-      fonts = [ "Sans 10" ];
+      fonts = {names = ["Sans"]; size = 10.0;};
       modifier = "Mod4";
       window = {
         titlebar = false;
@@ -129,7 +129,7 @@ in {
       };
       bars = [{
         workspaceButtons = false;
-        fonts = [ "Sans 8" ];
+        fonts = {names = ["Sans"]; size = 8.0;};
         mode = "hide"; # "dock"
         position = "bottom";
         colors = rec {

configs/packages/default.nix

@@ -93,6 +93,7 @@ in {
     posix_man_pages
     # moreutils # for parallel, sponge, combine
     tree
+    fuse_exfat # to mount windows drives
     parallel # for parallel, since moreutils shadows task spooler
     ripgrep # better grep
     rlwrap

configs/packages/haskell/packages.nix

@@ -87,7 +87,6 @@ with haskellPackages; [
   time
   transformers
   turtle
-  type-unary
   unix-time
   unordered-containers
   vector

configs/packages/writing.nix

@@ -1,7 +1,5 @@
 { pkgs, lib, config, ... }:
 let
-  nixpkgs-unstable = import <nixpkgs-unstable> {};
-
   zoteroStyle = { name, sha256 }: {
     name = "${name}.csl";
     path = pkgs.fetchurl {
@@ -64,14 +62,14 @@ in {
     texlive.combined.scheme-full
     latexrun
     (aspellWithDicts (dict: [ dict.de dict.en dict.en-computers ]))
-    haskellPackages.pandoc-citeproc
+    # haskellPackages.pandoc-citeproc
     nur.repos.kmein.text2pdf
     lowdown
     glow # markdown to term
     libreoffice
     # gnumeric
     dia
-    nixpkgs-unstable.pandoc
+    pandoc
     # proselint
     asciidoctor
     wordnet

configs/radio.nix

@@ -1,7 +1,6 @@
 { lib, pkgs, config, ... }:
 let
   inherit (import <niveum/lib>) tmpfilesConfig;
-  nixpkgs-unstable = import <nixpkgs-unstable> {};
 
   radioStore = "/var/lib/radio";
   htgenPort = 8080;
@@ -98,7 +97,7 @@ in
           ${pkgs.youtube-dl}/bin/youtube-dl -j "https://www.youtube.com/watch?v=$video_id" \
             | ${pkgs.jq}/bin/jq -r '"% [\(.title)](\(.webpage_url))\n\n\(.description)"' \
             | sed 's/$/  /g' \
-            | ${nixpkgs-unstable.pandoc}/bin/pandoc -s
+            | ${pandoc}/bin/pandoc -s
 
           exit
         ;;

configs/urlwatch.nix

@@ -109,6 +109,7 @@ in
   users.extraUsers.urlwatch = {
     home = urlwatchDir;
     createHome = true;
+    isSystemUser = true;
   };
 
   systemd.services.urlwatch = {

configs/wallpaper.nix

@@ -7,6 +7,8 @@
     url = "http://prism.r/realwallpaper-krebs-stars-berlin.png";
   };
 
+  users.users.fetchWallpaper.isSystemUser = true;
+
   services.xserver = {
     display = lib.mkForce 0; # needed for fetchWallpaper to find the X display
     displayManager.sessionCommands = "${pkgs.xorg.xhost}/bin/xhost +LOCAL:";

configs/weechat.nix

@@ -1,7 +1,6 @@
 { lib, pkgs, ... }:
 let
   inherit (import <niveum/lib>) kieran;
-  nixpkgs-unstable = import <nixpkgs-unstable> {};
   relayPassword = lib.fileContents <system-secrets/weechat/relay>;
 in {
   systemd.services.weechat =
@@ -24,7 +23,7 @@ in {
     '';
     weechat = pkgs.weechat.override {
       configure = { ... }: {
-        scripts = [ pkgs.weechatScripts.weechat-autosort nixpkgs-unstable.weechatScripts.colorize_nicks ];
+        scripts = [ pkgs.weechatScripts.weechat-autosort pkgs.weechatScripts.colorize_nicks ];
         init = let
           coolColors = lib.lists.subtractLists (lib.range 52 69 ++ lib.range 231 248) (lib.range 31 254);
           nick = "kmein";