git: unset conflictStyle

diff3 adds a lot of lines to do the conflict,
which can make it harder to understand in full sometimes.

especially when the lsp is just filling it with errors

defaults/git.nix

@@ -8,16 +8,10 @@
 let
   name = "git";
   cfg = config.nixowos.defaults.${name};
-  superCfg = config.programs.${name};
 in
 {
   options = {
     nixowos.defaults.${name}.enable = lib.mkEnableOption name;
-
-    # FIXME: this doesn't really belong in defaults/
-    programs.${name}.delta.enable = lib.mkEnableOption "delta within git" // {
-      default = true;
-    };
   };
 
   config = lib.mkIf cfg.enable {
@@ -34,15 +28,10 @@ in
         # causing further problems
         pull.ff = "only";
 
-        merge.conflictStyle = "zdiff3"; # easiest to understand style
+        push.autoSetupRemote = true;
+
         commit.verbose = true; # show diffs in commit editor
-      }
+      };
-      // (lib.optionalAttrs (superCfg.delta.enable && config.nixowos.allowAddingPackages) {
-        core.pager = "${lib.getExe pkgs.delta}";
-        interactive.diffFilter = "${lib.getExe pkgs.delta} --color-only";
-        delta.navigate = true; # use n and N to move between diff sections
-        delta.diff-highlight = true; # simpler mode, highlights inter-line changes
-      });
     };
 
   };

defaults/lix.nix

@@ -17,11 +17,11 @@ in
   config = lib.mkIf cfg.enable {
     # use lix, a fork of nix
     # see: https://lix.systems/about
-    nix.package = pkgs.lixPackageSets.lix_2_95.lix;
+    nix.package = pkgs.lixPackageSets.latest.lix;
     # overlays so that all nix tools use lix
     nixpkgs.overlays = [
       (final: prev: {
-        inherit (prev.lixPackageSets.lix_2_95)
+        inherit (prev.lixPackageSets.latest)
           nixpkgs-review
           nix-eval-jobs
           nix-fast-build

defaults/nix.nix

@@ -25,11 +25,11 @@ in
     # source: https://nix.dev/manual/nix/2.26/command-ref/new-cli/nix3-store-optimise
     nix.settings.auto-optimise-store = true;
 
-    environment.systemPackages =
+    # trigger the garbage collector automatically
-      with pkgs;
+    # when free space in /nix/store goes below this
-      lib.mkIf config.nixowos.allowAddingPackages [
+    nix.settings.min-free = 1000000000; # 1GB
-        nixd
+    # free up to this many bytes in an automatic invocation
-        nixfmt
+    # to avoid it taking too long
-      ];
+    nix.settings.max-free = 5000000000; # 5GB
   };
 }

defaults/plasma.nix

@@ -28,11 +28,6 @@ in
   config = lib.mkIf cfg.enable {
     hardware.graphics.enable = true;
 
-    fonts = lib.mkIf config.nixowos.allowAddingPackages {
-      enableDefaultPackages = lib.mkDefault true;
-      packages = [ pkgs.noto-fonts-cjk-sans ];
-    };
-
     environment.systemPackages =
       with pkgs;
       lib.mkIf config.nixowos.allowAddingPackages [

defaults/shell.nix

@@ -28,8 +28,6 @@ in
           compsize
 
           ffmpeg
-
-          python3
         ]
         ++ (
           if config.nixowos.nvidia.enable then
@@ -40,7 +38,6 @@ in
           else
             [
               btop-rocm
-              nvtopPackages.amd
             ]
         );
     };
@@ -50,9 +47,6 @@ in
     # use Fish, the nicest shell :)
     programs.fish.enable = lib.mkIf config.nixowos.allowAddingPackages true;
     users.defaultUserShell = lib.mkIf config.nixowos.allowAddingPackages pkgs.fish;
-    # avoid generating caches (enabled by fish) due to slowdowns during nixos-rebuild
-    # this may degrade autocompletion
-    documentation.man.generateCaches = false;
 
     environment.shellAliases = {
       # make nix-shell preserve the user's $SHELL

defaults/system.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   lib,
   config,
   ...
@@ -12,19 +11,10 @@ in
 {
   options.nixowos.defaults.${name} = {
     enable = lib.mkEnableOption name;
-
-    extraPackages = lib.mkOption {
-      type = lib.types.listOf lib.types.package;
-      default = with pkgs; [
-        sshfs
-      ];
-    };
   };
 
   config = lib.mkIf cfg.enable {
 
-    environment.systemPackages = lib.mkIf config.nixowos.allowAddingPackages cfg.extraPackages;
-
     boot.loader.grub = lib.mkDefault {
       # modern installation
       device = "nodev";
@@ -52,6 +42,9 @@ in
       tmpfsHugeMemoryPages = "within_size";
     };
 
+    # this is useful not only for having a user named "tmp"
+    # but also if any user wants to use a temporary directory,
+    # it's much nicer than /tmp because it isn't filled with system files
     fileSystems."/home/tmp" = lib.mkDefault {
       fsType = "tmpfs";
 

nvidia.nix

@@ -22,7 +22,12 @@ in
       # Enable this if you have graphical corruption issues or application crashes after waking
       # up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead
       # of just the bare essentials.
-      # powerManagement.enable = false;
+      powerManagement.enable = true;
+      # the following is from @tlater:matrix.tlater.net (Lix Off Topic, 2026-06-24)
+      # `powerManagement.enable` maps to this set of NVIDIA driver features: https://download.nvidia.com/XFree86/Linux-x86_64/610.43.02/README/powermanagement.html
+      # You can read through those docs yourself, but tl;dr: modern GPUs have more memory than can normally be stored on suspend, so they need a workaround.
+      # The modern open source drivers can use some cool kernel features that were behind the GPL lock beforehand to achieve that, the proprietary drivers are stuck with a hack. But basically, you always want to enable that option on NixOS.
+      # The `powermanagement.finegrained` stuff on the other hand has to do with multi-GPU setups. The two options should really not be grouped together like this.
 
       # Use the NVidia open source kernel module (not to be confused with the
       # independent third-party "nouveau" open source driver).