feat(sway): wlsunset, mpd i3status-rust module

home/apps/media.nix

@@ -40,6 +40,11 @@ in {
   services = {
     discord-applemusic-rich-presence.enable = isDarwin;
     mpd.enable = isLinux;
+    mpdris2 = {
+      enable = isLinux;
+      multimediaKeys = true;
+      notifications = true;
+    };
     mpd-discord-rpc = {
       enable = isLinux;
       settings = {

home/apps/rice.nix

@@ -24,6 +24,10 @@ in {
     enable = true;
     bars.top = {
       blocks = [
+        {
+          block = "music";
+          format = "$icon $combo.str";
+        }
         {
           block = "vpn";
           driver = "mullvad";

home/apps/sway.nix

@@ -18,6 +18,8 @@
     red = "#f38ba8";
     mauve = "#cba6f7";
   };
+  lat = 48.210033;
+  lng = 16.363449;
 in {
   fonts.fontconfig.enable = true;
 
@@ -37,8 +39,7 @@ in {
     darkman = {
       enable = true;
       config = {
-        lat = 48.210033;
+        inherit lat lng;
-        lng = 16.363449;
         useGeoclue = false;
       };
     };
@@ -46,6 +47,11 @@ in {
       enable = true;
       components = ["secrets"];
     };
+    wlsunset = {
+      enable = true;
+      latitude = toString lat;
+      longitude = toString lng;
+    };
     udiskie.enable = true;
   };
 
@@ -351,23 +357,6 @@ in {
 
         layer_effects       "swaync-notification-window" blur enable; shadows enable; corner_radius 5;
       '';
-
-      wrapperFeatures = {
-        base = true;
-        gtk = true;
-      };
-      extraSessionCommands = ''
-        # session
-        export XDG_SESSION_TYPE=wayland
-        export XDG_SESSION_DESKTOP=sway
-        export XDG_CURRENT_DESKTOP=sway
-        # wayland
-        export NIXOS_OZONE_WL=1
-        export MOZ_ENABLE_WAYLAND=1
-        export QT_QPA_PLATFORM=wayland
-        export SDL_VIDEODRIVER=wayland
-        export _JAVA_AWT_WM_NONREPARENTING=1
-      '';
       systemd = {
         enable = true;
         xdgAutostart = true;

machines/common/linux/network.nix

@@ -1,4 +1,4 @@
-{
+{pkgs, ...}: {
   services = {
     dnsmasq = {
       enable = true;
@@ -15,9 +15,7 @@
         address = "/test/127.0.0.1";
       };
     };
-    mullvad-vpn = {
+    mullvad-vpn.enable = true;
-      enable = true;
-    };
     stubby = {
       enable = true;
       settings = {
@@ -38,4 +36,16 @@
       };
     };
   };
+  networking.stevenblack = {
+    enable = true;
+    block = ["fakenews" "gambling"];
+  };
+  networking.hostFiles = [
+    "${pkgs.runCommand "stevenblack-hosts-custom" {} ''
+      mkdir -p $out
+      grep -E "(facebook|instagram|tiktok|twitter)" \
+        ${pkgs.stevenblack-blocklist}/alternates/social/hosts \
+        > $out/hosts
+    ''}/hosts"
+  ];
 }

machines/common/linux/xsession.nix

@@ -23,6 +23,22 @@
       swaylock-effects
       swayidle
     ];
+    extraSessionCommands = ''
+      # session
+      export XDG_SESSION_TYPE=wayland
+      export XDG_SESSION_DESKTOP=sway
+      export XDG_CURRENT_DESKTOP=sway
+      # wayland
+      export NIXOS_OZONE_WL=1
+      export MOZ_ENABLE_WAYLAND=1
+      export QT_QPA_PLATFORM=wayland
+      export SDL_VIDEODRIVER=wayland
+      export _JAVA_AWT_WM_NONREPARENTING=1
+    '';
+    wrapperFeatures = {
+      base = true;
+      gtk = true;
+    };
   };
   # needed for gnome3 pinentry
   services.dbus.packages = [pkgs.gcr];