diff --git a/flake.lock b/flake.lock
index 6881b8a..a1f521c 100755
--- a/flake.lock
+++ b/flake.lock
@@ -35,13 +35,13 @@
     },
     "buildbot-nix": {
       "inputs": {
-        "flake-parts": "flake-parts_3",
+        "flake-parts": "flake-parts_4",
         "hercules-ci-effects": "hercules-ci-effects",
         "nixpkgs": [
           "ngipkgs",
           "nixpkgs"
         ],
-        "treefmt-nix": "treefmt-nix_2"
+        "treefmt-nix": "treefmt-nix_3"
       },
       "locked": {
         "lastModified": 1758897213,
@@ -138,6 +138,28 @@
         "type": "github"
       }
     },
+    "filesorter": {
+      "inputs": {
+        "flake-parts": "flake-parts",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "treefmt-nix": "treefmt-nix"
+      },
+      "locked": {
+        "lastModified": 1759393584,
+        "narHash": "sha256-2EYN9CXFZmqL0Gj0+G+iiJ9/uoopBe1VqfGw0PW0F48=",
+        "ref": "refs/heads/main",
+        "rev": "d2cb9c7867adc0054c8b80b6f22419bc9b1c5b92",
+        "revCount": 1,
+        "type": "git",
+        "url": "ssh://git@gitlab.com/uprootnutrition/filesorter.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "ssh://git@gitlab.com/uprootnutrition/filesorter.git"
+      }
+    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -251,6 +273,24 @@
       }
     },
     "flake-parts": {
+      "inputs": {
+        "nixpkgs-lib": "nixpkgs-lib"
+      },
+      "locked": {
+        "lastModified": 1759362264,
+        "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "758cf7296bee11f1706a574c77d072b8a7baa881",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "flake-parts_2": {
       "inputs": {
         "nixpkgs-lib": [
           "nixpkgs"
@@ -270,9 +310,9 @@
         "type": "github"
       }
     },
-    "flake-parts_2": {
+    "flake-parts_3": {
       "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib"
+        "nixpkgs-lib": "nixpkgs-lib_2"
       },
       "locked": {
         "lastModified": 1756770412,
@@ -288,7 +328,7 @@
         "type": "github"
       }
     },
-    "flake-parts_3": {
+    "flake-parts_4": {
       "inputs": {
         "nixpkgs-lib": [
           "ngipkgs",
@@ -310,7 +350,7 @@
         "type": "github"
       }
     },
-    "flake-parts_4": {
+    "flake-parts_5": {
       "inputs": {
         "nixpkgs-lib": [
           "nur",
@@ -331,9 +371,9 @@
         "type": "github"
       }
     },
-    "flake-parts_5": {
+    "flake-parts_6": {
       "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib_2"
+        "nixpkgs-lib": "nixpkgs-lib_3"
       },
       "locked": {
         "lastModified": 1759362264,
@@ -458,7 +498,7 @@
       "inputs": {
         "flake-compat": "flake-compat",
         "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
         "zig": "zig",
         "zon2nix": "zon2nix"
       },
@@ -1001,9 +1041,9 @@
     },
     "linkpage": {
       "inputs": {
-        "flake-parts": "flake-parts_2",
-        "nixpkgs": "nixpkgs_3",
-        "treefmt-nix": "treefmt-nix"
+        "flake-parts": "flake-parts_3",
+        "nixpkgs": "nixpkgs_4",
+        "treefmt-nix": "treefmt-nix_2"
       },
       "locked": {
         "lastModified": 1759121630,
@@ -1086,7 +1126,7 @@
       "inputs": {
         "elm-spa": "elm-spa",
         "elm-watch": "elm-watch",
-        "nixpkgs": "nixpkgs_8"
+        "nixpkgs": "nixpkgs_9"
       },
       "locked": {
         "lastModified": 1759023814,
@@ -1107,7 +1147,7 @@
         "buildbot-nix": "buildbot-nix",
         "dream2nix": "dream2nix",
         "flake-utils": "flake-utils_3",
-        "nixpkgs": "nixpkgs_5",
+        "nixpkgs": "nixpkgs_6",
         "pre-commit-hooks": "pre-commit-hooks_2",
         "sbt-derivation": "sbt-derivation",
         "sops-nix": "sops-nix",
@@ -1188,7 +1228,7 @@
     "nixos-cosmic": {
       "inputs": {
         "flake-compat": "flake-compat_5",
-        "nixpkgs": "nixpkgs_6",
+        "nixpkgs": "nixpkgs_7",
         "nixpkgs-stable": "nixpkgs-stable_2",
         "rust-overlay": "rust-overlay_2"
       },
@@ -1208,15 +1248,18 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1748189127,
-        "narHash": "sha256-zRDR+EbbeObu4V2X5QCd2Bk5eltfDlCr5yvhBwUT6pY=",
-        "rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334",
-        "type": "tarball",
-        "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.802491.7c43f080a7f2/nixexprs.tar.xz"
+        "lastModified": 1754340878,
+        "narHash": "sha256-lgmUyVQL9tSnvvIvBp7x1euhkkCho7n3TMzgjdvgPoU=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "cab778239e705082fe97bb4990e0d24c50924c04",
+        "type": "github"
       },
       "original": {
-        "type": "tarball",
-        "url": "https://channels.nixos.org/nixos-25.05/nixexprs.tar.xz"
+        "owner": "nixos",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
       }
     },
     "nixpkgs-lib": {
@@ -1249,6 +1292,21 @@
         "type": "github"
       }
     },
+    "nixpkgs-lib_3": {
+      "locked": {
+        "lastModified": 1754788789,
+        "narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "a73b9c743612e4244d865a2fdee11865283c04e6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "type": "github"
+      }
+    },
     "nixpkgs-stable": {
       "locked": {
         "lastModified": 1759143472,
@@ -1314,6 +1372,22 @@
       }
     },
     "nixpkgs_10": {
+      "locked": {
+        "lastModified": 1759036355,
+        "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_11": {
       "locked": {
         "lastModified": 1754340878,
         "narHash": "sha256-lgmUyVQL9tSnvvIvBp7x1euhkkCho7n3TMzgjdvgPoU=",
@@ -1329,7 +1403,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_11": {
+    "nixpkgs_12": {
       "locked": {
         "lastModified": 1756288264,
         "narHash": "sha256-Om8adB1lfkU7D33VpR+/haZ2gI5r3Q+ZbIPzE5sYnwE=",
@@ -1346,6 +1420,19 @@
       }
     },
     "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1748189127,
+        "narHash": "sha256-zRDR+EbbeObu4V2X5QCd2Bk5eltfDlCr5yvhBwUT6pY=",
+        "rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334",
+        "type": "tarball",
+        "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.802491.7c43f080a7f2/nixexprs.tar.xz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://channels.nixos.org/nixos-25.05/nixexprs.tar.xz"
+      }
+    },
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1758360447,
         "narHash": "sha256-XDY3A83bclygHDtesRoaRTafUd80Q30D/Daf9KSG6bs=",
@@ -1358,7 +1445,7 @@
         "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"
       }
     },
-    "nixpkgs_3": {
+    "nixpkgs_4": {
       "locked": {
         "lastModified": 1758690382,
         "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=",
@@ -1374,7 +1461,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_5": {
       "locked": {
         "lastModified": 1754340878,
         "narHash": "sha256-lgmUyVQL9tSnvvIvBp7x1euhkkCho7n3TMzgjdvgPoU=",
@@ -1390,7 +1477,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_5": {
+    "nixpkgs_6": {
       "locked": {
         "lastModified": 1759036355,
         "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=",
@@ -1406,7 +1493,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_6": {
+    "nixpkgs_7": {
       "locked": {
         "lastModified": 1751011381,
         "narHash": "sha256-krGXKxvkBhnrSC/kGBmg5MyupUUT5R6IBCLEzx9jhMM=",
@@ -1422,7 +1509,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_7": {
+    "nixpkgs_8": {
       "locked": {
         "lastModified": 1759036355,
         "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=",
@@ -1438,7 +1525,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_8": {
+    "nixpkgs_9": {
       "locked": {
         "lastModified": 1696757521,
         "narHash": "sha256-cfgtLNCBLFx2qOzRLI6DHfqTdfWI+UbvsKYa3b3fvaA=",
@@ -1454,22 +1541,6 @@
         "type": "github"
       }
     },
-    "nixpkgs_9": {
-      "locked": {
-        "lastModified": 1759036355,
-        "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "npm-fix": {
       "inputs": {
         "nixpkgs": [
@@ -1511,7 +1582,7 @@
     },
     "nur": {
       "inputs": {
-        "flake-parts": "flake-parts_4",
+        "flake-parts": "flake-parts_5",
         "nixpkgs": [
           "nixpkgs"
         ]
@@ -1646,7 +1717,8 @@
     },
     "root": {
       "inputs": {
-        "flake-parts": "flake-parts",
+        "filesorter": "filesorter",
+        "flake-parts": "flake-parts_2",
         "ghostty": "ghostty",
         "helix": "helix",
         "home-manager": "home-manager",
@@ -1658,7 +1730,7 @@
         "ngipkgs": "ngipkgs",
         "niri": "niri",
         "nixos-cosmic": "nixos-cosmic",
-        "nixpkgs": "nixpkgs_7",
+        "nixpkgs": "nixpkgs_8",
         "nixpkgs-stable": "nixpkgs-stable_3",
         "nur": "nur",
         "pre-commit-hooks-nix": "pre-commit-hooks-nix",
@@ -1963,7 +2035,7 @@
     },
     "treefmt-nix": {
       "inputs": {
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": "nixpkgs"
       },
       "locked": {
         "lastModified": 1758728421,
@@ -1980,6 +2052,24 @@
       }
     },
     "treefmt-nix_2": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_5"
+      },
+      "locked": {
+        "lastModified": 1758728421,
+        "narHash": "sha256-ySNJ008muQAds2JemiyrWYbwbG+V7S5wg3ZVKGHSFu8=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "5eda4ee8121f97b218f7cc73f5172098d458f1d1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
+    },
+    "treefmt-nix_3": {
       "inputs": {
         "nixpkgs": [
           "ngipkgs",
@@ -2001,9 +2091,9 @@
         "type": "github"
       }
     },
-    "treefmt-nix_3": {
+    "treefmt-nix_4": {
       "inputs": {
-        "nixpkgs": "nixpkgs_10"
+        "nixpkgs": "nixpkgs_11"
       },
       "locked": {
         "lastModified": 1758728421,
@@ -2021,11 +2111,11 @@
     },
     "upRootNutrition": {
       "inputs": {
-        "flake-parts": "flake-parts_5",
+        "flake-parts": "flake-parts_6",
         "mkElmDerivation": "mkElmDerivation",
-        "nixpkgs": "nixpkgs_9",
+        "nixpkgs": "nixpkgs_10",
         "nixpkgs-stable": "nixpkgs-stable_4",
-        "treefmt-nix": "treefmt-nix_3"
+        "treefmt-nix": "treefmt-nix_4"
       },
       "locked": {
         "lastModified": 1759365126,
@@ -2161,7 +2251,7 @@
     "yazi": {
       "inputs": {
         "flake-utils": "flake-utils_5",
-        "nixpkgs": "nixpkgs_11",
+        "nixpkgs": "nixpkgs_12",
         "rust-overlay": "rust-overlay_4"
       },
       "locked": {
@@ -2232,7 +2322,7 @@
     },
     "zon2nix": {
       "inputs": {
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs_3"
       },
       "locked": {
         "lastModified": 1758405547,
diff --git a/flake.nix b/flake.nix
index 3a7d196..0d7d6e4 100755
--- a/flake.nix
+++ b/flake.nix
@@ -82,6 +82,10 @@
     linkpage = {
       url = "git+ssh://git@gitlab.com/uprootnutrition/linkpage.git";
     };
+    filesorter = {
+      url = "git+ssh://git@gitlab.com/uprootnutrition/filesorter.git";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
   outputs =
     inputs:
@@ -143,6 +147,7 @@
               config.nixosModules.ceres
               config.nixosModules.core
               config.nixosModules.mantle
+              inputs.filesorter.nixosModules.default
               inputs.home-manager.nixosModules.home-manager
               inputs.lix-module.nixosModules.default
               # inputs.ngipkgs.nixosModules."services.peertube"
diff --git a/modules/home/default.nix b/modules/home/default.nix
index 2596033..8a3c31f 100755
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -54,6 +54,7 @@ in
             scrcpy
             systemMonitor
             usbImager
+            gparted
             ledger
             virtManager
             espanso
diff --git a/modules/home/gui/apps/tools/gparted/default.nix b/modules/home/gui/apps/tools/gparted/default.nix
new file mode 100755
index 0000000..61cbf02
--- /dev/null
+++ b/modules/home/gui/apps/tools/gparted/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      gnome-calculator
+      ;
+  };
+}
diff --git a/modules/home/gui/desktop/hypr/land/config/windowrulev2.nix b/modules/home/gui/desktop/hypr/land/config/windowrulev2.nix
index f42ee10..5b3196c 100755
--- a/modules/home/gui/desktop/hypr/land/config/windowrulev2.nix
+++ b/modules/home/gui/desktop/hypr/land/config/windowrulev2.nix
@@ -78,8 +78,7 @@ let
   ];
 
   workspaceInit2 = builtins.map (x: "workspace 2 silent, " + x) [
-    "class:^${code}$"
-    # "class:^${floorp}$"
+
   ];
 
   workspaceInit3 = builtins.map (x: "workspace 3 silent, " + x) [
@@ -88,10 +87,12 @@ let
   ];
 
   workspaceInit4 = builtins.map (x: "workspace 4 silent, " + x) [
+
+  ];
+  workspaceInit5 = builtins.map (x: "workspace 5 silent, " + x) [
     "class:^${feishin}$"
     "class:^${scrcpy}$"
   ];
-
   centerWindows = builtins.map (x: "center, " + x) [
     "class:^${blueman}$"
     "class:^${calculator}$"
diff --git a/modules/nixos/desktop/network/default.nix b/modules/nixos/desktop/network/default.nix
old mode 100644
new mode 100755
index 8e08eae..cbcf3a5
--- a/modules/nixos/desktop/network/default.nix
+++ b/modules/nixos/desktop/network/default.nix
@@ -1,6 +1,6 @@
 { config, flake, ... }:
 let
-  inherit (flake.config.people.users) user0;
+  inherit (flake.config.people) user0;
 in
 {
   networking.wireless = {
diff --git a/modules/nixos/services/filesorter/default.nix b/modules/nixos/services/filesorter/default.nix
new file mode 100644
index 0000000..cf7b685
--- /dev/null
+++ b/modules/nixos/services/filesorter/default.nix
@@ -0,0 +1,6 @@
+
+{
+  services.filesorter = {
+    enable = true;
+  };
+}
diff --git a/systems/mars/config/sops.nix b/systems/mars/config/sops.nix
index 376faf3..9fad1f2 100755
--- a/systems/mars/config/sops.nix
+++ b/systems/mars/config/sops.nix
@@ -1,11 +1,7 @@
 { flake, ... }:
 let
-  inherit (flake.config.people)
-    user0
-    ;
-  inherit (flake.config.people.users.${user0})
-    paths
-    ;
+  inherit (flake.config.people) user0;
+  inherit (flake.config.people.users.${user0}) paths;
 in
 {
   sops = {