added git merge backup settings

flake.nix

@@ -12,7 +12,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     ghostty.url = "github:ghostty-org/ghostty";
-    ucodenix.url = "github:e-tho/ucodenix";
   };
 
   outputs = inputs @ {
@@ -22,7 +21,6 @@
     darwin,
     home-manager,
     ghostty,
-    ucodenix,
     ...
   }: let
     userName = "wyatt";
@@ -65,7 +63,6 @@
       };
       modules = [
         nix-flatpak.nixosModules.nix-flatpak
-        ucodenix.nixosModules.default
         ./modules/common
         ./modules/machine/cloud
 

home/browser.nix

@@ -39,13 +39,15 @@
         # ublock origin
         id = "cjpalhdlnbpafiamejdnhcphjbkeiagm";
         sha256 = "sha256:0pdh1v0vx1d5vnl1zh7nbk6j1fh4k4hhwp1ljs203icn306lahsn";
-        version = "1.63.2";
+        # sha256 = lib.fakeSha256;
+        version = "1.64.0";
       })
       (createChromiumExtension {
         # bitwarden
         id = "nngceckbapebfimnlniiiahkandclblb";
         sha256 = "sha256:0jxk3cqmgd5qj8hnw7s0k5s4bfrcmr0w0rckp3x0bmng07azw4gi";
-        version = "2025.3.1";
+        # sha256 = lib.fakeSha256;
+        version = "2025.5.0";
       })
     ];
   };

home/git.nix

@@ -17,6 +17,7 @@
       push.autoSetupRemote = true;
       pull.merge = true;
       merge.tool = "nvimdiff";
+      mergetool.keepBackup = false;
     };
 
     ignores = [

modules/machine/cloud/configuration.nix

@@ -24,7 +24,6 @@ in {
     ../../graphics
     ../../pwrMgmt
     ../../networking/core.nix
-    ../../security/sudo.nix
     ../../sound/pipewire.nix
     ../../sound/shairport.nix
     ../../virtualization/podman.nix
@@ -177,10 +176,5 @@ in {
     };
   };
 
-  # security.sudo.needsPassword = false;
-
-  # Enable microcode updates
-  services.ucodenix.enable = true;
-
   system.stateVersion = "24.11";
 }

modules/security/sudo.nix

@@ -1,4 +1,3 @@
-# FIXME: this file is broken but i don't know what is wrong with it
 {
   config,
   lib,