upgrade to NixOS 22.05

4 files changed, 100 insertions, 112 deletions

diff --git a/usecases/desktop/development.nix b/usecases/desktop/development.nix
index 64e36cf..a7c9b6b 100644
--- a/usecases/desktop/development.nix
+++ b/usecases/desktop/development.nix
@@ -147,10 +147,7 @@ in
           enableBashIntegration = true;
           enableZshIntegration = true;
 
-          nix-direnv = {
-            enable = true;
-            enableFlakes = true;
-          };
+          nix-direnv.enable = true;
         };
       };
 
diff --git a/usecases/desktop/graphical.nix b/usecases/desktop/graphical.nix
index afc61a4..059087d 100644
--- a/usecases/desktop/graphical.nix
+++ b/usecases/desktop/graphical.nix
@@ -15,7 +15,7 @@ inputs:
 
   users.extraUsers.minijackson.packages = with pkgs; [
     arandr
-    gnome3.dconf
+    dconf
     gnome3.eog
     gnome3.evince
     gnome3.file-roller
@@ -87,26 +87,24 @@ inputs:
   networking.firewall.allowedUDPPortRanges = [{ from = 1714; to = 1764; }];
 
   home-manager.users.minijackson = {
-    gtk =
-      let
-        override-arc-theme = import ../../lib/override-arc-theme.nix {
-          inherit lib;
-          themeConfig = config.theme;
-        };
-      in
-      {
-        enable = true;
-        iconTheme = {
-          # TODO: properly modify the colors
-          package = pkgs.arc-icon-theme;
-          name = "Arc";
-        };
-        theme = {
-          package = override-arc-theme pkgs.arc-theme;
-          name = "Arc-Dark";
-        };
+    gtk = {
+      enable = true;
+      iconTheme = {
+        # TODO: properly modify the colors
+        package = pkgs.gruvbox-dark-icons-gtk;
+        name = "oomox-gruvbox-dark";
+      };
+      theme = {
+        # package = override-arc-theme pkgs.arc-theme;
+        package = pkgs.gruvbox-dark-gtk;
+        name = "gruvbox-dark";
       };
 
+      gtk4.extraConfig = {
+        gtk-application-prefer-dark-theme = true;
+      };
+    };
+
     services.kdeconnect = {
       enable = true;
       indicator = true;
diff --git a/usecases/desktop/graphical/waybar.nix b/usecases/desktop/graphical/waybar.nix
index e9a227a..84fa694 100644
--- a/usecases/desktop/graphical/waybar.nix
+++ b/usecases/desktop/graphical/waybar.nix
@@ -30,104 +30,102 @@ inputs:
           "tray"
         ];
 
-        modules = {
-          mpd = lib.mkIf config.services.mpd.enable {
-            format = "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) <span font_desc='Font Awesome 5 Free'></span>";
-            format-stopped = "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped <span font_desc='Font Awesome 5 Free'></span>";
-            format-disconnected = "Disconnected <span font_desc='Font Awesome 5 Free'></span>";
-
-            on-click-middle = "${pkgs.alacritty}/bin/alacritty --command ncmpcpp";
-
-            consume-icons = {
-              on = " ";
-            };
-
-            random-icons = {
-              on = " ";
-            };
-
-            repeat-icons = {
-              on = " ";
-            };
-
-            single-icons = {
-              on = "1 ";
-            };
-
-            state-icons = {
-              playing = "";
-              paused = "";
-            };
-          };
+        mpd = lib.mkIf config.services.mpd.enable {
+          format = "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) <span font_desc='Font Awesome 5 Free'></span>";
+          format-stopped = "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped <span font_desc='Font Awesome 5 Free'></span>";
+          format-disconnected = "Disconnected <span font_desc='Font Awesome 5 Free'></span>";
 
-          idle_inhibitor = {
-            format = "{icon}";
-            format-icons = {
-              activated = "";
-              deactivated = "";
-            };
-          };
+          on-click-middle = "${pkgs.alacritty}/bin/alacritty --command ncmpcpp";
 
-          clock = {
-            tooltip-format = "{:%Y-%m-%d | %H:%M}";
-            format-alt = "{:%Y-%m-%d}";
+          consume-icons = {
+            on = " ";
           };
 
-          cpu = { format = "{usage}% "; };
-
-          memory = { format = "{}% "; };
-
-          battery = {
-            states = { good = 90; };
-            format = "{capacity}% {icon}";
-            format-icons = [
-              "<span font_desc='Font Awesome 5 Free'></span>"
-              "<span font_desc='Font Awesome 5 Free'></span>"
-              "<span font_desc='Font Awesome 5 Free'></span>"
-              "<span font_desc='Font Awesome 5 Free'></span>"
-              "<span font_desc='Font Awesome 5 Free'></span>"
-            ];
+          random-icons = {
+            on = " ";
           };
 
-          "network#eth" = {
-            interface = "enp*";
-            format-ethernet = "{ipaddr}/{cidr} ";
-            format-disconnected = "Disconnected ";
+          repeat-icons = {
+            on = " ";
           };
 
-          "network#wlan" = {
-            interface = "wlp*";
-            format-wifi = "{essid} ({signalStrength}%) <span font_desc='Font Awesome 5 Free'></span>";
-            format-disconnected = "Disconnected <span font_desc='Font Awesome 5 Free'></span>";
-            tooltip = true;
-            tooltip-format-wifi = "{ipaddr}/{cidr}";
+          single-icons = {
+            on = "1 ";
           };
 
-          temperature = {
-            hwmon-path = "/sys/class/hwmon/hwmon0/temp1_input";
-            format = "{temperatureC} °C ���";
+          state-icons = {
+            playing = "";
+            paused = "���";
           };
+        };
 
-          backlight = {
-            format = "{percent}% <span font_desc='Font Awesome 5 Free'>{icon}</span>";
-            format-icons = [ "" "" ];
+        idle_inhibitor = {
+          format = "{icon}";
+          format-icons = {
+            activated = "";
+            deactivated = "";
           };
+        };
+
+        clock = {
+          tooltip-format = "{:%Y-%m-%d | %H:%M}";
+          format-alt = "{:%Y-%m-%d}";
+        };
+
+        cpu = { format = "{usage}% "; };
+
+        memory = { format = "{}% "; };
+
+        battery = {
+          states = { good = 90; };
+          format = "{capacity}% {icon}";
+          format-icons = [
+            "<span font_desc='Font Awesome 5 Free'></span>"
+            "<span font_desc='Font Awesome 5 Free'></span>"
+            "<span font_desc='Font Awesome 5 Free'></span>"
+            "<span font_desc='Font Awesome 5 Free'></span>"
+            "<span font_desc='Font Awesome 5 Free'></span>"
+          ];
+        };
+
+        "network#eth" = {
+          interface = "enp*";
+          format-ethernet = "{ipaddr}/{cidr} ";
+          format-disconnected = "Disconnected ";
+        };
+
+        "network#wlan" = {
+          interface = "wlp*";
+          format-wifi = "{essid} ({signalStrength}%) <span font_desc='Font Awesome 5 Free'></span>";
+          format-disconnected = "Disconnected <span font_desc='Font Awesome 5 Free'></span>";
+          tooltip = true;
+          tooltip-format-wifi = "{ipaddr}/{cidr}";
+        };
+
+        temperature = {
+          hwmon-path = "/sys/class/hwmon/hwmon0/temp1_input";
+          format = "{temperatureC} °C ";
+        };
+
+        backlight = {
+          format = "{percent}% <span font_desc='Font Awesome 5 Free'>{icon}</span>";
+          format-icons = [ "" "" ];
+        };
 
-          pulseaudio = {
-            format = "{volume}% {icon}";
-            format-bluetooth = "{volume}% {icon}";
-            format-muted = "";
-            format-icons = {
-              headphones = "";
-              handsfree = "";
-              headset = "";
-              phone = "";
-              portable = "";
-              car = "";
-              default = [ "" "" ];
-            };
-            on-click = "pavucontrol";
+        pulseaudio = {
+          format = "{volume}% {icon}";
+          format-bluetooth = "{volume}% {icon}";
+          format-muted = "";
+          format-icons = {
+            headphones = "";
+            handsfree = "";
+            headset = "";
+            phone = "";
+            portable = "";
+            car = "";
+            default = [ "" "" ];
           };
+          on-click = "pavucontrol";
         };
       }];
 
diff --git a/usecases/desktop/music.nix b/usecases/desktop/music.nix
index e65d08e..d6c3fde 100644
--- a/usecases/desktop/music.nix
+++ b/usecases/desktop/music.nix
@@ -34,7 +34,7 @@ inputs:
       }
     '';
 
-    startWhenNeeded = true;
+    #startWhenNeeded = true;
   };
 
   home-manager.users.minijackson = { config, ... }:
@@ -42,11 +42,6 @@ inputs:
       programs.beets = {
         enable = true;
 
-        package = pkgs.beets.override {
-          # Python SoCo failed to build
-          enableSonosUpdate = false;
-        };
-
         settings = {
           plugins = [
             "absubmit"