chore: update flake

modules/home/common/packages.nix

@@ -81,7 +81,7 @@
       # spotify
       vesktop # discord client
       # nextcloud-client # enables a systemd service that I do not want
-      stable.spotify-player
+      spotify-player
       element-desktop
       nicotine-plus
       stable.transmission_3

modules/home/common/settings.nix

@@ -7,10 +7,14 @@ in
   config = lib.mkIf config.swarselmodules.general {
     nix = lib.mkIf (!config.swarselsystems.isNixos) {
       package = lib.mkForce pkgs.nixVersions.nix_2_28;
+      # extraOptions = ''
+      #   plugin-files = ${pkgs.dev.nix-plugins}/lib/nix/plugins
+      #   extra-builtins-file = ${self + /nix/extra-builtins.nix}
+      # '';
       extraOptions = ''
         plugin-files = ${pkgs.nix-plugins.overrideAttrs (o: {
-          buildInputs = [pkgs.nixVersions.nix_2_28 pkgs.boost];
-          patches = (o.patches or []) ++ ["${self}/nix/nix-plugins.patch"];
+          buildInputs = [config.nix.package pkgs.boost];
+          patches = o.patches or [];
         })}/lib/nix/plugins
         extra-builtins-file = ${self + /nix/extra-builtins.nix}
       '';

modules/home/common/spicetify.nix

@@ -8,7 +8,8 @@ in
   config = lib.mkIf config.swarselmodules.${moduleName} {
     programs.spicetify = {
       enable = true;
-      spotifyPackage = pkgs.stable24_11.spotify;
+      # spotifyPackage = pkgs.stable24_11.spotify;
+      spotifyPackage = pkgs.spotify;
       enabledExtensions = with spicePkgs.extensions; [
         fullAppDisplay
         shuffle

modules/home/common/ssh.nix

@@ -4,12 +4,24 @@
   config = lib.mkIf config.swarselmodules.ssh {
     programs.ssh = {
       enable = true;
-      forwardAgent = true;
+      enableDefaultConfig = false;
       extraConfig = ''
         SetEnv TERM=xterm-256color
         ServerAliveInterval 20
       '';
       matchBlocks = {
+        "*" = {
+          forwardAgent = true;
+          addKeysToAgent = "no";
+          compression = false;
+          serverAliveInterval = 0;
+          serverAliveCountMax = 3;
+          hashKnownHosts = false;
+          userKnownHostsFile = "~/.ssh/known_hosts";
+          controlMaster = "no";
+          controlPath = "~/.ssh/master-%r@%n:%p";
+          controlPersist = "no";
+        };
         "pfsense" = {
           hostname = "192.168.1.1";
           user = "root";

modules/home/common/sway.nix

@@ -262,7 +262,7 @@ in
             { app_id = "pavucontrol"; }
             { app_id = "syncthingtray"; }
             { app_id = "Element"; }
-            { class = "1Password"; }
+            { app_id = "1Password"; }
             { app_id = "com.nextcloud.desktopclient.nextcloud"; }
             { title = "(?:Open|Save) (?:File|Folder|As)"; }
             { title = "^Add$"; }