cleanup

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

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": {

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";