fix flutter flake

packages/emacs/default.nix

@@ -12,6 +12,7 @@ in {
 (telephone-line-mode 1)
 (xterm-mouse-mode 1)
 
+
 (setq evil-want-C-u-scroll t)
 
 (menu-bar--display-line-numbers-mode-relative)
@@ -137,9 +138,6 @@ in {
   :hook (dired-mode . treemacs-icons-dired-enable-once)
   :ensure t)
 
-(use-package treemacs-magit
-  :after (treemacs magit)
-  :ensure t)
 
 (use-package treemacs-persp ;;treemacs-perspective if you use perspective.el vs. persp-mode
   :after (treemacs persp-mode) ;;or perspective vs. persp-mode
@@ -232,13 +230,14 @@ in {
 
 (setq lsp-keymap-prefix "C-c l")
 (require 'lsp-mode)
-
+(evil-set-undo-system 'undo-redo)
 (flycheck-inline-mode nil)
+(global-evil-vimish-fold-mode 1)
     '';
     package = emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [
-    catppuccin-theme
       ])
-      ++ (with epkgs.melpaPackages; [
+    ++ (with epkgs.melpaPackages; [
+  catppuccin-theme
 	evil
 	nix-mode
   lsp-treemacs
@@ -258,6 +257,8 @@ in {
   which-key
   magit
   format-all
+  evil-vimish-fold
+  affe
       ])
       ++ (with epkgs.elpaPackages; [
   undo-tree

packages/emacs/default.nix~

@@ -232,6 +232,8 @@ in {
 
 (setq lsp-keymap-prefix "C-c l")
 (require 'lsp-mode)
+
+(flycheck-inline-mode nil)
     '';
     package = emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [
     catppuccin-theme

packages/emacs/flutter/flake.nix

@@ -36,7 +36,6 @@ outputs = { self, nixpkgs, flake-utils }:
             flutter
             androidSdk # The customized SDK that we've made above
             jdk17
-            vscode
 
             (vscode-with-extensions.override {
               vscode = vscodium;

packages/emacs/flutter/flake.nix~

@@ -0,0 +1,60 @@
+{
+description = "Flutter 3.13.x";
+inputs = {
+  nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+  flake-utils.url = "github:numtide/flake-utils";
+};
+outputs = { self, nixpkgs, flake-utils }:
+  flake-utils.lib.eachDefaultSystem (system:
+    let
+      pkgs = import nixpkgs {
+        inherit system;
+        config = {
+          android_sdk.accept_license = true;
+          allowUnfree = true;
+        };
+      };
+      buildToolsVersion = "34.0.0";
+      androidComposition = pkgs.androidenv.composeAndroidPackages {
+        buildToolsVersions = [ buildToolsVersion "33.0.1" ];
+        platformVersions = [ "34" "33" "28" ];
+        abiVersions = [ "armeabi-v7a" "arm64-v8a" ];
+      };
+      androidSdk = androidComposition.androidsdk;
+    in
+    {
+      devShell =
+        with pkgs; mkShell rec {
+          shellHook = ''
+            nu
+            exit
+          '';
+          GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${androidSdk}/libexec/android-sdk/build-tools/33.0.1/aapt2";   
+
+          ANDROID_SDK_ROOT = "${androidSdk}/libexec/android-sdk";
+          buildInputs = [
+            flutter
+            androidSdk # The customized SDK that we've made above
+            jdk17
+            vscode
+
+            (vscode-with-extensions.override {
+              vscode = vscodium;
+              vscodeExtensions = with vscode-extensions; [
+                vscodevim.vim
+                dart-code.dart-code
+                dart-code.flutter
+              ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace[
+                {
+                  name = "awesome-flutter-snippets";
+                  publisher = "nash";
+                  version = "4.0.1";
+                  sha256 = "lXdos/xB18h3Z0YfkgEk55G2JvRMYudUUIltugQjylU=";
+                }
+              ];
+            })
+          ];
+
+        };
+    });
+}