init

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)
@@ -232,13 +233,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 +260,7 @@ in {
   which-key
   magit
   format-all
+  evil-vimish-fold
       ])
       ++ (with epkgs.elpaPackages; [
   undo-tree

packages/emacs/flutter/flake.nix

@@ -1,7 +1,7 @@
 {
 description = "Flutter 3.13.x";
 inputs = {
-  nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+  nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
   flake-utils.url = "github:numtide/flake-utils";
 };
 outputs = { self, nixpkgs, flake-utils }:
@@ -14,46 +14,18 @@ outputs = { self, nixpkgs, flake-utils }:
           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;
+      androidSdk = pkgs.androidenv.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
+            androidSdk
             jdk17
-
-            (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=";
-                }
-              ];
-            })
           ];
-
         };
     });
 }
+