add Android shell, migrate back to Firefox

flake.lock

@@ -19,6 +19,28 @@
         "type": "github"
       }
     },
+    "android-nixpkgs": {
+      "inputs": {
+        "devshell": "devshell",
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1745871622,
+        "narHash": "sha256-HhQPekt/yPlNiHw1CwQBamDRMDHopGYx7vgYaAQuKmQ=",
+        "owner": "tadfisher",
+        "repo": "android-nixpkgs",
+        "rev": "2277d844349f0f520f8637ac80f7ae233ad1e700",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tadfisher",
+        "repo": "android-nixpkgs",
+        "type": "github"
+      }
+    },
     "apple-emoji": {
       "inputs": {
         "nixpkgs": "nixpkgs_2"
@@ -188,6 +210,27 @@
         "type": "github"
       }
     },
+    "devshell": {
+      "inputs": {
+        "nixpkgs": [
+          "android-nixpkgs",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1741473158,
+        "narHash": "sha256-kWNaq6wQUbUMlPgw8Y+9/9wP0F8SHkjy24/mN3UAppg=",
+        "owner": "numtide",
+        "repo": "devshell",
+        "rev": "7c9e793ebe66bcba8292989a68c0419b737a22a0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "devshell",
+        "type": "github"
+      }
+    },
     "fingerprint-sensor": {
       "inputs": {
         "nixpkgs": [
@@ -279,6 +322,24 @@
       }
     },
     "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_2": {
       "inputs": {
         "systems": [
           "stylix",
@@ -678,7 +739,7 @@
     "hyprspace": {
       "inputs": {
         "hyprland": "hyprland",
-        "systems": "systems"
+        "systems": "systems_2"
       },
       "locked": {
         "lastModified": 1742767019,
@@ -814,11 +875,11 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1744440957,
+        "lastModified": 1745487689,
-        "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=",
+        "narHash": "sha256-FQoi3R0NjQeBAsEOo49b5tbDPcJSMWc3QhhaIi9eddw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d",
+        "rev": "5630cf13cceac06cefe9fc607e8dfa8fb342dde3",
         "type": "github"
       },
       "original": {
@@ -906,6 +967,7 @@
     "root": {
       "inputs": {
         "ags": "ags",
+        "android-nixpkgs": "android-nixpkgs",
         "apple-emoji": "apple-emoji",
         "apple-fonts": "apple-fonts",
         "fingerprint-sensor": "fingerprint-sensor",
@@ -1007,13 +1069,13 @@
         "base16-vim": "base16-vim",
         "firefox-gnome-theme": "firefox-gnome-theme",
         "flake-compat": "flake-compat_2",
-        "flake-utils": "flake-utils",
+        "flake-utils": "flake-utils_2",
         "git-hooks": "git-hooks",
         "gnome-shell": "gnome-shell",
         "home-manager": "home-manager_2",
         "nixpkgs": "nixpkgs_6",
         "nur": "nur",
-        "systems": "systems_2",
+        "systems": "systems_3",
         "tinted-foot": "tinted-foot",
         "tinted-kitty": "tinted-kitty",
         "tinted-schemes": "tinted-schemes",
@@ -1021,11 +1083,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1744668092,
+        "lastModified": 1744910471,
-        "narHash": "sha256-XDmpI3ywMkypsHKRF2am6BzZ5OjwpQMulAe8L87Ek8U=",
+        "narHash": "sha256-HItOUMA2whFnPMJuyN2XHq9TZttgrgOAZcoUXsaD4Js=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "38aff11a7097f4da6b95d4c4d2c0438f25a08d52",
+        "rev": "8d5cd725ad591890c0cd804bf68cc842b8afca51",
         "type": "github"
       },
       "original": {
@@ -1035,6 +1097,21 @@
       }
     },
     "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_2": {
       "locked": {
         "lastModified": 1689347949,
         "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
@@ -1049,7 +1126,7 @@
         "type": "github"
       }
     },
-    "systems_2": {
+    "systems_3": {
       "locked": {
         "lastModified": 1681028828,
         "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",

flake.nix

@@ -1,6 +1,8 @@
 {
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
+		android-nixpkgs.url = "github:tadfisher/android-nixpkgs";
+		android-nixpkgs.inputs.nixpkgs.follows = "nixpkgs";
 
     home-manager.url = "github:nix-community/home-manager/release-24.11";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
@@ -18,7 +20,7 @@
   };
 
   outputs =
-    { self, nixpkgs, ... }:
+    { self, nixpkgs, android-nixpkgs, ... }:
     let
       forAllSystems = nixpkgs.lib.genAttrs [
         "aarch64-linux"
@@ -35,6 +37,7 @@
         in
         {
           ddt4all = import ./shells/ddt4all.nix { inherit pkgs; };
+					android = import ./shells/android.nix { inherit pkgs android-nixpkgs; };
 					rust = import ./shells/rust.nix { inherit pkgs; };
         }
       );

hosts/base-configuration.nix

@@ -17,6 +17,8 @@
     allowInsecurePredicate =
       pkg:
       builtins.elem (pkgs.lib.getName pkg) [
+				"android-sdk-cmdline-tools"
+				"fluffychat-linux"
         "olm"
       ];
   };

hosts/hulk/default.nix

@@ -6,11 +6,11 @@
     ./networking.nix
   ];
 
-  nix.settings.experimental-features = [
+  nix.settings = {
-    "nix-command"
+		experimental-features = [ "nix-command" "flakes" ];
-    "flakes"
+  	auto-optimise-store = true;
-  ];
+	};
-  nix.settings.auto-optimise-store = true;
+
   nix.gc = {
     automatic = true;
     dates = "weekly";

profiles/hulk/packages.nix

@@ -15,21 +15,17 @@
       cmakeFlags = [ "-DOPT_THUNDERBIRD_CMDLINE=${thunderbird}/bin/thunderbird" ];
     }))
 
-    jq
+		jq
-    starship
+		starship
-    element-desktop
+		firefox
-    firefox-beta-bin
+		fluffychat
     thunderbird-bin
     youtube-music
     libreoffice-qt6-fresh
     gimp
-    vscodium
     git
-    nodejs
-    postgresql
     fprintd
     cups
-    fish
     anydesk
     fastfetch
     playerctl
@@ -39,7 +35,6 @@
     bitwarden-desktop
     davinci-resolve
     mpv
-    wget
     sshfs
   ];
 }

profiles/hulk/programs.nix

@@ -30,7 +30,7 @@
     additionalConfig = {
       "$terminal" = "alacritty";
       "$fileManager" = "thunar";
-      "$browser" = "firefox-beta";
+      "$browser" = "firefox";
       "$email" = "thunderbird";
       "$shell" = "fish";
 
@@ -87,4 +87,13 @@
       wlrobs
     ];
   };
+
+	programs.vscode = {
+		enable = true;
+		package = pkgs.vscodium;
+		extensions = with pkgs.vscode-extensions; [
+			rust-lang.rust-analyzer
+			bbenoist.nix	
+		];	
+	};
 }

shells/android.nix

@@ -0,0 +1,22 @@
+{ pkgs, android-nixpkgs }:
+
+let
+  android = pkgs.callPackage android-nixpkgs {};
+	androidSdk = android.sdk (sdkPkgs: with sdkPkgs; [
+    cmdline-tools-latest
+    build-tools-35-0-0
+    platform-tools
+    platforms-android-35
+  ]);
+
+in pkgs.mkShell rec {
+  buildInputs = with pkgs; [
+		androidSdk
+		jdk17
+		glibc
+	];
+
+	ANDROID_JAVA_HOME = "${pkgs.jdk17.home}";
+  ANDROID_SDK_ROOT = "${androidSdk}/share/android-sdk";
+	GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${ANDROID_SDK_ROOT}/build-tools/35.0.0/aapt2";
+}

shells/rust.nix

@@ -3,10 +3,13 @@
 pkgs.mkShell {
   buildInputs = with pkgs; [
     rustc
-    cargo
+		cargo
     rustfmt
     rust-analyzer
     clippy
+		gcc
+		libpqxx
+		postgresql
   ];
 
 	RUST_BACKTRACE = 1;