Add android-studio

flake.lock

@@ -61,11 +61,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1704786394,
-        "narHash": "sha256-aJM0ln9fMGWw1+tjyl5JZWZ3ahxAA2gw2ZpZY/hkEMs=",
+        "lastModified": 1705187059,
+        "narHash": "sha256-dSj+iIYqLA+7/5rLXWfUxw9IXRm0w8Mrm39af8klUH0=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "b34a6075e9e298c4124e35c3ccaf2210c1f3a43b",
+        "rev": "ef811636cc847355688804593282078bac7758d4",
         "type": "github"
       },
       "original": {
@@ -91,11 +91,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1704842529,
-        "narHash": "sha256-OTeQA+F8d/Evad33JMfuXC89VMetQbsU4qcaePchGr4=",
+        "lastModified": 1705204527,
+        "narHash": "sha256-WVz9WdaFBhAwO/7A+HlW8HPJ4VQ8QnpCD1WZAcAPneo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "eabe8d3eface69f5bb16c18f8662a702f50c20d5",
+        "rev": "dd5621df6dcb90122b50da5ec31c411a0de3e538",
         "type": "github"
       },
       "original": {
@@ -107,11 +107,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1704874635,
-        "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=",
+        "lastModified": 1705183652,
+        "narHash": "sha256-rnfkyUH0x72oHfiSDhuCHDHg3gFgF+lF8zkkg5Zihsw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356",
+        "rev": "428544ae95eec077c7f823b422afae5f174dee4b",
         "type": "github"
       },
       "original": {

modules/overlays/default.nix

@@ -2,5 +2,4 @@ final: prev: {
   rfd = prev.callPackage ./rfd {};
   tmux-sessionizer = prev.callPackage ./tmux-sessionizer {};
   vpngate = prev.callPackage ./vpngate {};
-  yar = prev.callPackage ./yar {};
 }

modules/overlays/vpngate/default.nix

@@ -7,7 +7,7 @@ buildGoModule rec {
   pname = "vpngate";
   version = "v0.1.5";
 
-  vendorSha256 = "sha256-TQLHvoVAMvDtm/9EQUaNVVjQajyMBnJu8NF6Kt0+RJ8=";
+  vendorHash = "sha256-TQLHvoVAMvDtm/9EQUaNVVjQajyMBnJu8NF6Kt0+RJ8=";
 
   src = fetchFromGitHub {
     owner = "davegallant";

modules/overlays/yar/default.nix

@@ -1,25 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  buildGoModule,
-}:
-buildGoModule rec {
-  pname = "yar";
-  version = "master";
-
-  vendorSha256 = "sha256-bBaAP9HQ1fG6gPtoYg9HXnv53DueAFnT4OHE4rwlxvA=";
-
-  src = fetchFromGitHub {
-    owner = "nielsing";
-    repo = "yar";
-    rev = version;
-    sha256 = "sha256-f7pTS5Ur8ImbIkPkyunyQEgpeF79CIQFEodg69VxA9I=";
-  };
-
-  meta = with lib; {
-    description = "Yar is a tool for plunderin' organizations, users and/or repositories.";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [davegallant];
-    platforms = platforms.linux ++ platforms.darwin;
-  };
-}

modules/packages/common.nix

@@ -74,9 +74,9 @@ in {
       stylua
 
       # golang
+      gofumpt
       golangci-lint
       gopls
-      gofumpt
 
       # rust
       rustup

modules/packages/linux.nix

@@ -59,6 +59,7 @@ in {
       strace
       tailscale
       traceroute
+      unstable.android-studio
       unstable.obsidian
       unstable.signal-desktop
       unstable.unityhub