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

@@ -6,14 +6,18 @@ in
   options.swarselmodules.general = lib.mkEnableOption "general nix settings";
   config = lib.mkIf config.swarselmodules.general {
     nix = lib.mkIf (!config.swarselsystems.isNixos) {
-      package = lib.mkForce pkgs.nixVersions.nix_2_28;
+      package = lib.mkForce pkgs.nixVersions.nix_2_30;
       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"];
-        })}/lib/nix/plugins
+        plugin-files = ${pkgs.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"];
+      #   })}/lib/nix/plugins
+      #   extra-builtins-file = ${self + /nix/extra-builtins.nix}
+      # '';
       settings = {
         experimental-features = [
           "nix-command"

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$"; }

modules/nixos/client/lid.nix

@@ -2,9 +2,9 @@
 {
   options.swarselmodules.lid = lib.mkEnableOption "lid config";
   config = lib.mkIf config.swarselmodules.lid {
-    services.logind = {
-      lidSwitch = "suspend";
-      lidSwitchDocked = "ignore";
+    services.logind.settings.Login = {
+      HandleLidSwitch = "suspend";
+      HandleLidSwitchDocked = "ignore";
     };
     services.acpid = {
       enable = true;

modules/nixos/client/nvd-rebuild.nix

@@ -7,12 +7,12 @@
       pkgs.nvd
     ];
 
-    system.activationScripts.diff = {
-      supportsDryActivation = true;
-      text = ''
-        ${pkgs.nvd}/bin/nvd --color=always --nix-bin-dir=${pkgs.nix}/bin diff \
-             /run/current-system "$systemConfig"
-      '';
-    };
+    # system.activationScripts.diff = {
+    #   supportsDryActivation = true;
+    #   text = ''
+    #     ${pkgs.nvd}/bin/nvd --color=always --nix-bin-dir=${pkgs.nix}/bin diff \
+    #          /run/current-system "$systemConfig"
+    #   '';
+    # };
   };
 }

modules/nixos/client/xdg-portal.nix

@@ -4,11 +4,11 @@
   config = lib.mkIf config.swarselmodules.xdg-portal {
     xdg.portal = {
       enable = true;
-      # config = {
-      #   common = {
-      #     default = "wlr";
-      #   };
-      # };
+      config = {
+        common = {
+          default = "wlr";
+        };
+      };
       wlr.enable = true;
       wlr.settings.screencast = {
         output_name = "eDP-1";

modules/nixos/common/settings.nix

@@ -61,7 +61,7 @@ in
         };
 
         nix = {
-          package = pkgs.nixVersions.nix_2_28;
+          package = pkgs.nixVersions.nix_2_30;
           settings = {
             experimental-features = [
               "nix-command"
@@ -72,19 +72,21 @@ in
             ];
             trusted-users = [ "@wheel" "${config.swarselsystems.mainUser}" ];
           };
-          # extraOptions = ''
-          #   plugin-files = ${pkgs.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"];
-            })}/lib/nix/plugins
+            plugin-files = ${pkgs.nix-plugins}/lib/nix/plugins
             extra-builtins-file = ${self + /nix/extra-builtins.nix}
           '' + lib.optionalString (!minimal) ''
             !include ${config.sops.secrets.github-api-token.path}
           '';
+          #   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"];
+          #     })}/lib/nix/plugins
+          #     extra-builtins-file = ${self + /nix/extra-builtins.nix}
+          #   '' + lib.optionalString (!minimal) ''
+          #     !include ${config.sops.secrets.github-api-token.path}
+          #   '';
         };
 
         system.stateVersion = lib.mkDefault "23.05";

modules/shared/vars.nix

@@ -77,7 +77,7 @@
             browserpass
             clearurls
             darkreader
-            enhancer-for-youtube
+            # enhancer-for-youtube
             istilldontcareaboutcookies
             translate-web-pages
             ublock-origin
@@ -90,7 +90,7 @@
             enhanced-github
             unpaywall
             don-t-fuck-with-paste
-            plasma-integration
+            # plasma-integration
             noscript
 
             # configure a shortcut 'ctrl+shift+c' with behaviour 'do nothing' in order to disable the dev console shortcut