update other things

flake.nix

@@ -68,6 +68,12 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    ciderd = {
+      url = "git+https://code.zoeys.cloud/zoey/ciderd";
+
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     hypridle = {
       url = "github:hyprwm/hypridle";
       inputs.nixpkgs.follows = "nixpkgs";

homes/x86_64-linux/zoey@earth/default.nix

@@ -150,8 +150,10 @@
     awscli2
     monero-cli
 
-    zoom-us
     pandoc
+    cider-2
+
+    feather
 
     qt6Packages.qt5compat
     libsForQt5.qt5.qtgraphicaleffects

modules/home/apps/helpers/waybar/default.nix

@@ -81,7 +81,7 @@ in {
           passthrough = false;
           "fixed-center" = true;
           "modules-left" = ["hyprland/workspaces" "hyprland/window" "niri/workspaces" "niri/window" "network#speed" "custom/cava-system" "custom/cava-tt"];
-          "modules-center" = ["mpris"];
+          "modules-center" = ["custom/spotify"];
           "modules-right" = [
             "cpu"
             "memory"
@@ -102,10 +102,10 @@ in {
           "custom/spotify" = {
             format = "{}";
             "return-type" = "json";
-            "on-click" = "playerctl -p spotify play-pause";
-            "on-click-right" = "spotifatius toggle-liked";
-            "on-click-middle" = "playerctl -p spotify next";
-            exec = "spotifatius monitor";
+            "on-click" = "${lib.getExe inputs.ciderd.packages.${pkgs.system}.default} play-pause";
+            "on-click-right" = "${lib.getExe inputs.ciderd.packages.${pkgs.system}.default} like";
+            "on-click-middle" = "${lib.getExe inputs.ciderd.packages.${pkgs.system}.default} skip";
+            exec = "${lib.getExe inputs.ciderd.packages.${pkgs.system}.default} monitor";
           };
 
           "custom/mullvad" = {

modules/home/apps/helpers/waybar/style.css

@@ -105,6 +105,11 @@ menu,
   border-radius: 6px;
 }
 
+#custom-spotify.paused {
+  font-style: italic;
+  opacity: 0.75;
+}
+
 #custom-mullvad,
 #custom-notification {
   padding-left: 12px;

modules/home/wms/niri/default.nix

@@ -177,7 +177,7 @@ with lib.custom; {
           {command = ["${pkgs.writeShellScriptBin "thunderbird-delayed" ''sleep 5; thunderbird''}/bin/thunderbird-delayed"];}
           {command = ["${pkgs.writeShellScriptBin "zen-delayed" ''sleep 5; zen''}/bin/zen-delayed"];}
           {command = ["vesktop"];}
-          {command = ["spotify"];}
+          {command = ["cider-2"];}
 
           {command = ["${spawnSlackOnWeekday}/bin/spawn-slack-on-weekday"];}
         ];

modules/nixos/services/vpn/default.nix

@@ -10,25 +10,12 @@ with lib.custom; let
 in {
   options.services.vpn = with types; {
     enable = mkBoolOpt false "Enable VPN service(s)";
-
-    mullvad = mkBoolOpt false "Enable Mullvad VPN Daemon";
   };
 
   config = mkIf cfg.enable {
     services.mullvad-vpn = {
-      enable = cfg.mullvad;
+      enable = true;
       package = nixos-stable.mullvad;
     };
-
-    services.openvpn = {
-      servers = {
-        work = {
-          config = ''config /home/zoey/Downloads/zachary_myers.ovpn'';
-          updateResolvConf = true;
-        };
-      };
-    };
-
-    systemd.services.openvpn-work.wantedBy = lib.mkForce [];
   };
 }

systems/x86_64-linux/earth/default.nix

@@ -106,15 +106,12 @@
 
   protocols.wayland.enable = true;
 
-  programs.openvpn3.enable = true;
-
   services.udev.extraRules = ''
     KERNEL=="hidraw*", SUBSYSTEM=="hidraw", MODE="0664", GROUP="plugdev"
   '';
   services.fstrim.enable = true;
   services.vpn.enable = true;
   services.xserver.enable = true;
-  services.vpn.mullvad = true;
   services.lorri.enable = true;
   services.udisks2.enable = true;
   services.crypto.enable = true;
@@ -143,6 +140,7 @@
   networking.extraHosts = ''
     127.0.0.1 blahaj.local
     127.0.0.1 test.blahaj.local
+    127.0.0.2 earth
   '';
 
   networking.networkmanager = {
@@ -227,7 +225,6 @@
       withDeltaUpdates = true;
     })
     inputs.agenix.packages.${system}.agenix
-    inputs.awsvpnclient.packages.${system}.awsvpnclient
   ];
 
   programs.fish.enable = true;