Move zsh config to better location, disable polkit, add back playerctl and mpris in mpc's place

modules/system/devices/boot/grub/default.nix

@@ -1,11 +1,8 @@
-{ config, lib, ... }:
+{ ... }:
 {
-  boot.loader = {
-    grub = {
-      efiSupport = true;
-      efiInstallAsRemovable = true;
-      device = "nodev";
-    };
-    efi.canTouchEfiVariables = false;
+  boot.loader.grub = {
+    efiSupport = true;
+    efiInstallAsRemovable = true;
+    device = "nodev";
   };
 }

modules/system/devices/boot/lanzaboote/default.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, lanzaboote, ... }:
+{ pkgs, lanzaboote, ... }:
 {
   imports = [ lanzaboote.nixosModules.lanzaboote ];
 

modules/system/devices/boot/systemd/default.nix

@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ ... }:
 {
   boot.loader.systemd-boot = {
     editor = false;

modules/system/devices/disks/impermanence/main/default.nix

@@ -16,10 +16,11 @@
 
         ".config/blender"
         ".config/dconf"
-        ".config/vesktop"
-        ".config/sunshine"
         ".config/heroic"
         ".config/obs-studio"
+        ".config/sunshine"
+        ".config/vesktop"
+        ".config/zsh"
 
         ".local/share/mpd"
         ".local/share/nvim/undo"
@@ -28,6 +29,7 @@
         ".local/share/TelegramDesktop"
 
         ".local/state/wireplumber"
+        ".local/state/lazygit"
 
         ".cache/nix-index"
 
@@ -35,11 +37,6 @@
         { directory = ".gnupg"; mode = "0700"; }
         { directory = ".local/share/keyrings"; mode = "0700"; }
       ];
-      files = [
-        ".zsh_history"
-        ".local/state/lazygit/state.yml"
-        ".local/share/applications" # Create directory so nothing generates inside of it
-      ];
     };
   };
 }

modules/system/services/server/mysql/default.nix

@@ -1,12 +1,5 @@
 { config, lib, pkgs, ... }:
 {
-  config = lib.mkIf config.system.server.enable {
-    services.mysql = {
-      enable = true;
-      package = pkgs.mariadb;
-    };
-    environment.persistence."/persist".directories = [
-      "/var/lib/mysql"
-    ];
-  };
+  services.mysql.package = pkgs.mariadb;
+  environment.persistence."/persist".directories = lib.mkIf config.services.mysql.enable [ "/var/lib/mysql" ];
 }

modules/system/settings/security/default.nix

@@ -2,7 +2,7 @@
 {
   imports = [
     ./apparmor
-    ./polkit
     ./privilege
+    ./rtkit
   ];
 }

modules/system/settings/security/polkit/default.nix

@@ -1,7 +0,0 @@
-{ config, lib, ... }:
-{
-  security = lib.mkIf config.system.desktop.enable {
-    polkit.enable = true;
-    rtkit.enable = true;
-  };
-}

modules/system/settings/security/rtkit/default.nix

@@ -0,0 +1,4 @@
+{ config, ... }:
+{
+  security.rtkit.enable = config.system.desktop.enable;
+}