hosts/capibara/default.nix

@@ -9,7 +9,6 @@
     ./hardware-configuration.nix
     ./file-systems.nix
     ./home-manager.nix
-    ./snapcast.nix
     outputs.nixosModules.common
     outputs.nixosModules.desktop
   ];

hosts/capibara/home-manager.nix

@@ -15,9 +15,7 @@
       imports = [
         outputs.homeManagerModules.common
         outputs.homeManagerModules.extra
-        outputs.homeManagerModules.snapclient
       ];
-      snapclient.enable = true;
     };
   };
 }

hosts/capibara/snapcast.nix

@@ -1,25 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  services.snapserver = {
-    enable = true;
-    codec = "flac";
-    streams = {
-      pipewire = {
-        type = "pipe";
-        location = "/run/snapserver/pipewire";
-      };
-    };
-  };
-
-  systemd.user.services.snapcast-sink = {
-    wantedBy = [ "pipewire.service" ];
-    after = [ "pipewire.service" ];
-    bindsTo = [ "pipewire.service" ];
-    path = with pkgs; [ gawk pulseaudio ];
-    script = ''
-      pactl load-module module-pipe-sink file=/run/snapserver/pipewire sink_name=Snapcast format=s16le rate=48000
-    '';
-  };
-
-}

modules/home-manager/browsers/default.nix

@@ -3,11 +3,8 @@
 {
   home.packages = [ pkgs.librewolf pkgs.tor-browser-bundle-bin ];
 
-  programs.firefox = {
-    enable = true;
-    package = pkgs.firefox-esr;
-  };
-  home.sessionVariables.BROWSER = "${pkgs.firefox-esr}/bin/firefox";
+  programs.firefox.enable = true;
+  home.sessionVariables.BROWSER = "${pkgs.firefox}/bin/firefox";
 
   programs.chromium = {
     enable = true;

modules/home-manager/default.nix

@@ -29,7 +29,7 @@
   neovim = import ./neovim;
   pass = import ./pass;
   rss = import ./rss;
-  snapclient = import ./snapclient;
+  snapcast = import ./snapcast;
   sound = import ./sound;
   ssh = import ./ssh;
   syncthing = import ./syncthing;

modules/home-manager/desktop-river/default.nix

@@ -2,11 +2,10 @@
 
 {
   imports = [
+    ./kile
     ./bemenu.nix
-    ./fusuma.nix
     ./init.nix
     ./kanshi.nix
-    ./kile
     ./mako.nix
     ./swaybg.nix
     ./swaylock.nix

modules/home-manager/desktop-river/fusuma.nix

@@ -1,14 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  services.fusuma = {
-    enable = true;
-    extraPackages = with pkgs; [ coreutils ydotool ];
-    settings = {};
-    # settings = {
-    #   swipe."3" = {
-    #     left.command = "do the thing";
-    #   };
-    # };
-  };
-}

modules/home-manager/extra/default.nix

@@ -20,6 +20,7 @@
     ../msg
     ../music
     ../rss
+    ../snapcast
     ../sound
     ../syncthing
     ../theming

modules/home-manager/snapcast/default.nix

@@ -0,0 +1,21 @@
+{ config, pkgs, ... }:
+
+let snapserver_ip = "192.168.1.144";
+in
+{
+  home.packages = [ pkgs.snapcast ];
+
+  systemd.user.services.snapclient = {
+    Unit = {
+      After = [ "pipewire.service" ];
+    };
+    Service = {
+      Type = "simple";
+      ExecStart = "${pkgs.snapcast}/bin/snapclient --host ${snapserver_ip}";
+    };
+    Install = {
+      WantedBy = [ "pipewire.service" ];
+    };
+  };
+
+}

modules/home-manager/snapclient/default.nix

@@ -1,33 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  cfg = config.snapclient;
-in
-{
-  options.snapclient = {
-    enable = lib.mkEnableOption "snapclient";
-    snapserver-host = lib.mkOption {
-      type = lib.types.str;
-      default = "localhost";
-      description = "host running snapserver to connect to";
-    };
-    package = lib.mkOption {
-      type = lib.types.package;
-      default = pkgs.snapcast;
-      defaultText = "pkgs.snapcast";
-      description = "package for snapcast";
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    systemd.user.services.snapclient = {
-      Service = {
-        Type = "simple";
-        ExecStart = "${cfg.package}/bin/snapclient --host ${cfg.snapserver-host}";
-      };
-      Unit.After = [ "pipewire.service" ];
-      Install.WantedBy = [ "pipewire.service" ];
-    };
-  };
-
-}

pkgs/default.nix

@@ -1,5 +1,5 @@
-{ pkgs ? import <nixpkgs> { } }: rec {
-  offline-backups = pkgs.callPackage ./offline-backups { };
-  rss-sync = pkgs.callPackage ./rss-sync { };
-  dav-sync = pkgs.callPackage ./dav-sync { };
+{ pkgs ? import <nixpkgs> {}}: rec {
+  offline-backups = pkgs.callPackage ./offline-backups {};
+  rss-sync = pkgs.callPackage ./rss-sync {};
+  dav-sync = pkgs.callPackage ./dav-sync {};
 }