Update system configurations to 22.05

defaults/base/applications.nix

@@ -40,11 +40,10 @@
       git
       git-lfs
     ] ++ [ # Filesystem & Disk Utilities
-      fuse_exfat
+      exfat
+      samba
       cifs-utils
       keyutils # required for cifs kerberos auth
-      smbclient
-      exfat-utils
       sshfs-fuse
       hdparm
       mtpfs
@@ -56,9 +55,7 @@
       bind
       curl
       wget
-      ncat
       tor
-      tor-arm
       mosh
       whois
       wol

defaults/base/default.nix

@@ -84,7 +84,7 @@ in {
 
   security.acme = {
     acceptTerms = true;
-    email = "sysadmin@qo.is";
+    defaults.email = "sysadmin@qo.is";
   };
 
   # Default Settings

defaults/desktop/desktop-environment.nix

@@ -11,7 +11,6 @@
       xfce.thunar
       xfce.thunar-archive-plugin
       xfce.xfce4-appfinder # xfce.thunar-volman # needed?
-      xfce.terminal
       pinentry-gtk2 # Required by gnupg
     ];
 

defaults/desktop/hardware.nix

@@ -12,35 +12,6 @@
     enable = true;
     alsa.enable = true;
     pulse.enable = true;
-    media-session.enable = true;
-    media-session.config.bluez-monitor.rules = [
-      {
-        # Matches all cards
-        matches = [{ "device.name" = "~bluez_card.*"; }];
-        actions = {
-          "update-props" = {
-            "bluez5.reconnect-profiles" = [
-              "a2dp_sink"
-            ]; # Optional: "hfp_hf" "hsp_hs" for microphone support
-            # mSBC is not expected to work on all headset + adapter combinations.
-            "bluez5.msbc-support" = true;
-            # SBC-XQ is not expected to work on all headset + adapter combinations.
-            "bluez5.sbc-xq-support" = true;
-          };
-        };
-      }
-      {
-        matches = [
-          # Matches all sources
-          {
-            "node.name" = "~bluez_input.*";
-          }
-          # Matches all outputs
-          { "node.name" = "~bluez_output.*"; }
-        ];
-        actions = { "node.pause-on-idle" = false; };
-      }
-    ];
   };
   security.rtkit.enable = true;
 

home/fhauser/applications/default.nix

@@ -62,7 +62,7 @@
         #      gutenprintBin
         #      hplipWithPlugin
         simple-scan
-        gnome.gnome-online-accounts
+        pkgs.gnome-online-accounts
         gnome.gnome-control-center
       ] ++ [ # Communication
         #TODO: ekiga?

home/fhauser/applications/sway.nix

@@ -18,7 +18,7 @@ in rec {
     sway-contrib.grimshot
     wl-clipboard
     libappindicator
-    gnome.defaultIconTheme
+    gnome.adwaita-icon-theme
     gnome2.gnome-icon-theme
     hicolor-icon-theme # TODO: Move these requirements?
   ];

home/fhauser/applications/waybar.nix

@@ -24,7 +24,6 @@
         "tray"
         "clock"
       ];
-      modules = {
       backlight.format = " {percent}%";
       disk.format = " {percentage_used}%";
       clock.format = "{:%Y-%2m-%2d %H:%M}";
@@ -156,7 +155,6 @@
         icon-size = "21";
         spacing = "10";
       };
-      };
     }];
 
     systemd.enable = true;

host/ochsenchopf/networking.nix

@@ -4,7 +4,7 @@
   networking = {
     networkmanager = {
       enable = true;
-      #enableFccUnlock = true; # TODO: Enable with nixos 22.05
+      enableFccUnlock = true;
     };
     useDHCP = false;
     hostName = "ochsenchopf";