Merge pull request #20 from caperren/working-branch

Working branch

modules/application-groups/android.nix

@@ -1,4 +1,5 @@
 { config, pkgs, ... }:
 {
   programs.adb.enable = true;
+  virtualisation.waydroid.enable = true;
 }

modules/application-groups/virtualization.nix

@@ -1,14 +1,8 @@
 { config, pkgs, ... }:
 {
-
-  virtualisation.containers.policy = {
-    default = [ { type = "insecureAcceptAnything"; } ];
-
-  };
   virtualisation.podman = {
     enable = true;
     dockerCompat = true;
-    dockerSocket.enable = true;
   };
 
   environment.systemPackages = with pkgs; [

users/caperren/caperren.nix

@@ -13,13 +13,12 @@ in
     isNormalUser = true;
     description = "Corwin Perren";
     extraGroups = [
-      "adbusers"
-      "dialout"
-      "input"
       "networkmanager"
-      "plugdev"
-      "podman"
       "wheel"
+      "input"
+      "dialout"
+      "plugdev"
+      "adbusers"
     ];
   };
 
@@ -56,7 +55,6 @@ in
     home.file.".config/hypr/scripts".source = ./dotfiles/.config/hypr/scripts;
 
     # Application config files
-    home.file.".config/containers/policy.json".source = ./dotfiles/.config/containers/policy.json;
     home.file.".config/glances/glances.conf".source = ./dotfiles/.config/glances/glances.conf;
     home.file.".config/hypr/hypridle.conf".source = ./dotfiles/hypridle/hypridle.conf;
     home.file.".config/hypr/hyprpaper.conf".source = ./dotfiles/hyprpaper/hyprpaper.conf;
@@ -92,7 +90,7 @@ in
     # Custom bash aliases
     home.shellAliases = {
       # Phone remote desktop over usb (adb), with some default flags I want
-      phonerdp = "scrcpy --no-audio --orientation=0 --turn-screen-off --stay-awake --power-off-on-close";
+      phonerdp = "scrcpy --no-audio --orientation=0 --turn-screen-off --stay-awake";
 
       # Streamdeck isn't easy to manually edit, so make a save command to copy any updates to the repo
       savestreamdeck = "cp ~/.streamdeck_ui.json ~/.nixos-configs/users/caperren/dotfiles/streamdeck/.streamdeck_ui.json";

users/caperren/dotfiles/.config/containers/policy.json

@@ -1,7 +0,0 @@
-{
-    "default": [
-        {
-            "type": "insecureAcceptAnything"
-        }
-    ]
-}

users/caperren/dotfiles/.local/share/applications/phonerdp.desktop

@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=Phone RDP
-Exec=bash -c "scrcpy --no-audio --orientation=0 --turn-screen-off --stay-awake --power-off-on-close"
+Exec=bash -c "scrcpy --no-audio --orientation=0 --turn-screen-off --stay-awake"
 Icon=phonerdp
 Terminal=false
 Categories=Utilities;