diff --git a/etcnixos/common.nix b/etcnixos/common.nix
index 29ecf53..e0d204b 100644
--- a/etcnixos/common.nix
+++ b/etcnixos/common.nix
@@ -163,6 +163,7 @@
       "wheel"
       "video"
       "camera"
+      "adbusers"
     ];
     hashedPasswordFile = config.age.secrets.primary-password.path;
   };
@@ -170,6 +171,8 @@
   services.gvfs.enable = true;
   programs.gphoto2.enable = true;
 
+  programs.adb.enable = true;
+
   # Enable thermal data
   services.thermald.enable = true;
 
@@ -192,6 +195,10 @@
     (inputs.agenix.packages.${pkgs.system}.default.override { ageBin = "${pkgs.rage}/bin/rage"; })
 
     doas-sudo-shim
+
+    glib
+    usbutils
+    libmtp
   ];
 
   #wayland with electron/chromium applications
diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock
index 15b4c18..3458432 100644
--- a/etcnixos/flake.lock
+++ b/etcnixos/flake.lock
@@ -316,11 +316,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1727437159,
-        "narHash": "sha256-v4qLwEw5OmprgQZTT7KZMNU7JjXJzRypw8+Cw6++fWk=",
+        "lastModified": 1727540359,
+        "narHash": "sha256-U+225h1kJZpWb23+RaX1sBkqC4fA7aa7eBbgiQ5HcO4=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "d830ad47cc992b4a46b342bbc79694cbd0e980b2",
+        "rev": "fb08bde00c20252b892a3e57fb094eb62b65ba61",
         "type": "github"
       },
       "original": {
@@ -332,11 +332,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1727122398,
-        "narHash": "sha256-o8VBeCWHBxGd4kVMceIayf5GApqTavJbTa44Xcg5Rrk=",
+        "lastModified": 1727348695,
+        "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "30439d93eb8b19861ccbe3e581abf97bdc91b093",
+        "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784",
         "type": "github"
       },
       "original": {
diff --git a/etcnixos/system-mreow.nix b/etcnixos/system-mreow.nix
index ddfa0ad..00e4728 100644
--- a/etcnixos/system-mreow.nix
+++ b/etcnixos/system-mreow.nix
@@ -28,7 +28,7 @@
 
       CPU_BOOST_ON_BAT = 0;
       START_CHARGE_THRESH_BAT0 = 90;
-      STOP_CHARGE_THRESH_BAT0 = 95;
+      STOP_CHARGE_THRESH_BAT0 = 90;
       RUNTIME_PM_ON_BAT = "auto";
     };
   };
@@ -53,8 +53,6 @@
   };
 
   boot = {
-    enableContainers = true;
-
     lanzaboote = {
       enable = true;
       pkiBundle = "/etc/secureboot";
@@ -91,26 +89,12 @@
     TTYVTDisallocate = true;
   };
 
-  # Enable common container config files in /etc/containers
-  virtualisation = {
-    containers.enable = true;
-    podman = {
-      enable = true;
-
-      # Required for containers under podman-compose to be able to talk to each other.
-      # defaultNetwork.settings.dns_enabled = true;
-    };
-  };
-
-  environment.systemPackages = with pkgs; [
-    distrobox
-  ];
-
   #weird hack to get swaylock working? idk, if you don't put this here, password entry doesnt work
   #if I move to another lock screen program, i will have to replace `swaylock`
   security.pam.services.swaylock = { };
 
   system.activationScripts = {
+    # extract all my secureboot keys
     "secureboot-keys".text =
       let
         secureboot_path = "/etc/secureboot";
diff --git a/home-manager/flake.lock b/home-manager/flake.lock
index e38250a..cbb88c9 100644
--- a/home-manager/flake.lock
+++ b/home-manager/flake.lock
@@ -33,11 +33,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1727190706,
-        "narHash": "sha256-CUfCWwlZebQyZAQ5bmfmQJhOvc61HgExe1R/U202g2Q=",
+        "lastModified": 1727460389,
+        "narHash": "sha256-yxPhHEIUJbRQ9uet9slEE9tbu5A7Ls5RMoO4GOovJzE=",
         "owner": "orhun",
         "repo": "binsider",
-        "rev": "ec8dac79bf7f0d23257a521fc62b2888ebf55b86",
+        "rev": "3ec5db4e809e83d5dc88d6037904651082092e94",
         "type": "github"
       },
       "original": {
@@ -153,11 +153,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1727332193,
-        "narHash": "sha256-XnjG+n42JjrIj2Ts33Xa+Udg1QDp9N8FHYbvAkYL9qg=",
+        "lastModified": 1727573335,
+        "narHash": "sha256-RCcDnBgJpP8GVdIrmS7IFhpUCWQjaYS4j7NBT6cbZ3s=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "524000b81ba52f9d5a7b2ac78504468014121ebe",
+        "rev": "415bbec6b9482afa0605682cf31064964ae705c6",
         "type": "github"
       },
       "original": {
@@ -186,11 +186,11 @@
     "niri-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1726412705,
-        "narHash": "sha256-qRqGbvTpGRn3QhvjOyX0Sn/qPT1bLQUSSHz1vlW/7HE=",
+        "lastModified": 1727525902,
+        "narHash": "sha256-NUsPodaJn384rLdPawH1u1cxHzE25EdrXMLkpRTkGFA=",
         "owner": "YaLTeR",
         "repo": "niri",
-        "rev": "6ee5b5afa784c76b1c31c371b59177136e558fa6",
+        "rev": "c04ccafd0a2cb26c1f6a4835f4cbb01ffdb926a6",
         "type": "github"
       },
       "original": {
@@ -201,11 +201,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1727122398,
-        "narHash": "sha256-o8VBeCWHBxGd4kVMceIayf5GApqTavJbTa44Xcg5Rrk=",
+        "lastModified": 1727348695,
+        "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "30439d93eb8b19861ccbe3e581abf97bdc91b093",
+        "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784",
         "type": "github"
       },
       "original": {
@@ -229,11 +229,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1727264057,
-        "narHash": "sha256-KQPI8CTTnB9CrJ7LrmLC4VWbKZfljEPBXOFGZFRpxao=",
+        "lastModified": 1727540905,
+        "narHash": "sha256-40J9tW7Y794J7Uw4GwcAKlMxlX2xISBl6IBigo83ih8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "759537f06e6999e141588ff1c9be7f3a5c060106",
+        "rev": "fbca5e745367ae7632731639de5c21f29c8744ed",
         "type": "github"
       },
       "original": {
@@ -281,11 +281,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1727404165,
-        "narHash": "sha256-kZCiYpQJBZ3kL9QymS88mCxpQwqo8KqvZeHk6LATuY8=",
+        "lastModified": 1727577080,
+        "narHash": "sha256-2LPT76Acp6ebt7fCt90eq/M8T2+X09s/yTVgfVFrtno=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "76f0a61e733259e1034dd6523e039d04932ffefc",
+        "rev": "73a833855442ce8cee710cf4d8d054fea1c81196",
         "type": "github"
       },
       "original": {
diff --git a/home-manager/gui.nix b/home-manager/gui.nix
index 09cf3ea..68d11aa 100644
--- a/home-manager/gui.nix
+++ b/home-manager/gui.nix
@@ -73,8 +73,6 @@
     inkscape
     nomacs
 
-    nautilus
-
     lrcget
 
     #openstreetmap contributing
diff --git a/home-manager/progs/gpt4all/gpt4all.nix b/home-manager/progs/gpt4all/gpt4all.nix
index 2d502f8..93b3f65 100644
--- a/home-manager/progs/gpt4all/gpt4all.nix
+++ b/home-manager/progs/gpt4all/gpt4all.nix
@@ -53,7 +53,7 @@ let
           owner = "nomic-ai";
           repo = "gpt4all";
           rev = "HEAD";
-          sha256 = "RDYf+VaI5pl46Cd04ADvvi4ygNfYa4fY9rTv9Ui3qUk=";
+          sha256 = "/w1VAfLYlhB5y08cVG2u9RT2kajtFtyTPziQXSwVFcE=";
         };
 
         patches = [