treewide: cleanup

devshell/patches.nix

@@ -5,9 +5,6 @@ let
     text = ''
       cd "$PRJ_ROOT/patches"
       # TODO broken on newest commits
-      # curl https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3751.patch >mutter-text-input-v1.patch
-      curl https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3318.patch >gnome-shell-preedit-fix.patch
-      curl https://patch-diff.githubusercontent.com/raw/Alexays/Waybar/pull/3551.patch >waybar-niri.patch
     '';
   };
 in

flake.nix

@@ -55,8 +55,7 @@
     home-manager.url = "github:nix-community/home-manager";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
 
-    # TODO wait for https://github.com/Mic92/sops-nix/pull/619
-    sops-nix.url = "github:Mic92/sops-nix/pull/619/head";
+    sops-nix.url = "github:Mic92/sops-nix";
     sops-nix.inputs.nixpkgs.follows = "nixpkgs";
     sops-nix.inputs.nixpkgs-stable.follows = "nixpkgs";
 

flake/nixpkgs.nix

@@ -128,18 +128,6 @@ let
       waydroid = prev.waydroid.overrideAttrs (old: {
         patches = (old.patches or [ ]) ++ [ ../patches/waydroid-mount-nix-and-run-binfmt.patch ];
       });
-      gnome-shell = (prev.gnome-shell.override { stdenv = final.ccacheStdenv; }).overrideAttrs (old: {
-        patches = (old.patches or [ ]) ++ [ ../patches/gnome-shell-preedit-fix.patch ];
-      });
-      # mutter =
-      #   assert (lib.versions.major prev.mutter.version == "46");
-      #   (prev.mutter.override { stdenv = final.ccacheStdenv; }).overrideAttrs (old: {
-      #     patches = (old.patches or [ ]) ++ [
-      #       # git format-patch (git merge-base origin/gnome-$MV ubuntu/triple-buffering-$PV-$MV)..ubuntu/triple-buffering-$PV-$MV --stdout
-      #       ../patches/mutter-triple-buffering.patch
-      #       ../patches/mutter-text-input-v1.patch
-      #     ];
-      #   });
       linuxManualConfig = prev.linuxManualConfig.override { stdenv = final.ccacheStdenv; };
       blender = prev.blender.override {
         cudaSupport = true;

flake/treefmt.nix

@@ -14,6 +14,12 @@
       '';
     in
     lib.mkMerge [
+      {
+        treefmt = {
+          flakeFormatter = config.isDevSystem;
+          flakeCheck = config.isDevSystem;
+        };
+      }
       (lib.mkIf config.isDevSystem {
         treefmt = {
           projectRootFile = "flake.nix";

nixos/profiles/global-persistence/default.nix

@@ -12,7 +12,4 @@
     ];
     user.directories = [ ".local/share/nix" ];
   };
-
-  # TODO wait for https://github.com/nix-community/impermanence/issues/229
-  systemd.suppressedSystemUnits = [ "systemd-machine-id-commit.service" ];
 }

nixos/profiles/programs/tools/default.nix

@@ -45,7 +45,7 @@ in
       bc
       binutils
       btop
-      # compsize # TODO wait for https://github.com/kilobyte/compsize/issues/52
+      compsize
       coreutils
       cryptsetup
       dosfstools