update locks, use one password for signing, move deprecated options

modules/home/tools/git/default.nix

@@ -16,7 +16,9 @@ in
     enable = mkBoolOpt true "Enable Git (Default true)";
     userName = mkOpt types.str user.fullName "The name to configure git with.";
     userEmail = mkOpt types.str user.email "The email to configure git with.";
-    signingKey = mkOpt types.str "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN4iH29edivUi+k94apb6pasWq8qphfhYo0d6B2GhISf" "The pub key to sign commits with.";
+    signingKey =
+      mkOpt types.str "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN4iH29edivUi+k94apb6pasWq8qphfhYo0d6B2GhISf"
+        "The pub key to sign commits with.";
     signByDefault = mkOpt types.bool true "Whether to sign commits by default.";
   };
 

modules/nixos/submodules/basics/default.nix

@@ -50,7 +50,6 @@ in
         time = enabled;
         xkb = enabled;
       };
-
     };
   };
 }

modules/nixos/submodules/graphical-interface/default.nix

@@ -18,13 +18,15 @@ in
   config = mkIf cfg.enable {
     environment.systemPackages = with pkgs; [ ];
 
-    services.xserver = {
-      enable = true;
+    services = {
+      xserver = {
+        enable = true;
+      };
       displayManager.sddm = {
         enable = true;
         wayland.enable = true;
       };
+      desktopManager.plasma6 = enabled;
     };
-    services.desktopManager.plasma6 = enabled;
   };
 }

modules/nixos/system/boot/default.nix

@@ -18,5 +18,7 @@ in
   config = mkIf cfg.enable {
     boot.loader.systemd-boot.enable = true;
     boot.loader.efi.canTouchEfiVariables = true;
+
+    services.fstrim = enabled;
   };
 }

modules/nixos/system/hardware/audio/default.nix

@@ -16,8 +16,10 @@ in
   };
 
   config = mkIf cfg.enable {
-    environment.systemPackages = with pkgs; [ noisetorch pavucontrol
-];
+    environment.systemPackages = with pkgs; [
+      noisetorch
+      pavucontrol
+    ];
 
     programs.noisetorch.enable = true;
 

modules/nixos/system/hardware/gpu/nvidia/default.nix

@@ -32,6 +32,6 @@ in
     };
 
     services.xserver.videoDrivers = [ "nvidia" ];
-    services.xserver.displayManager.sddm.wayland.enable = lib.mkForce false;
+    services.displayManager.sddm.wayland.enable = lib.mkForce false;
   };
 }

modules/nixos/tools/git/default.nix

@@ -16,7 +16,9 @@ in
     enable = mkBoolOpt true "Wether or not to enable git (Default enabled)";
     userName = mkOpt types.str user.fullName "The name to use git with";
     userEmail = mkOpt types.str user.email "The email to use git with";
-    signingKey = mkOpt types.str "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN4iH29edivUi+k94apb6pasWq8qphfhYo0d6B2GhISf" "The key ID to sign commits with.";
+    signingKey =
+      mkOpt types.str "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN4iH29edivUi+k94apb6pasWq8qphfhYo0d6B2GhISf"
+        "The key ID to sign commits with.";
   };
 
   config = mkIf cfg.enable {
@@ -47,7 +49,7 @@ in
           safe = {
             directory = "${config.users.users.${user.name}.home}/projects/config";
           };
-          gpg ={
+          gpg = {
             format = "ssh";
             "ssh".program = "${pkgs._1password-gui}/bin/op-ssh-sign";
           };