diff --git a/packages/default.nix b/packages/default.nix
index fc191ba..2af188b 100644
--- a/packages/default.nix
+++ b/packages/default.nix
@@ -10,6 +10,7 @@
     ./emacs
     ./kitty
     ./rofi
+    ./tmux
 #    ./hyprland
 #    ./vscode
   ];
diff --git a/packages/default.nix~ b/packages/default.nix~
index 2ee7984..fc191ba 100644
--- a/packages/default.nix~
+++ b/packages/default.nix~
@@ -9,6 +9,7 @@
     ./nvim
     ./emacs
     ./kitty
+    ./rofi
 #    ./hyprland
 #    ./vscode
   ];
diff --git a/packages/tmux/default.nix b/packages/tmux/default.nix
new file mode 100644
index 0000000..e91a938
--- /dev/null
+++ b/packages/tmux/default.nix
@@ -0,0 +1,36 @@
+{ pkgs, config, lib,... }:
+{
+ home.packages = with pkgs; [
+ ];
+
+ programs.tmux = {
+   enable = true;
+   extraConfig = ''
+set-option -sa terminal-overrides ",xterm*:Tc"
+set -g @catppuccin_flavor 'mocha'
+set -g @catppuccin_window_status_style "rounded"
+
+set -g base-index 1
+set -g pane-base-index 1
+set-window-option -g pane-base-index 1
+set-option -g renumber-windows on
+
+bind '"' split-window -v -c "#{pane_current_path}"
+bind % split-window -h -c "#{pane_current_path}"
+
+unbind C-b
+set -g prefix C-Space
+bind C-Space send-prefix
+set -g mouse on
+
+bind -n M-H previous-window
+bind -n M-L next-window
+   '';
+
+   plugins = [
+    pkgs.tmuxPlugins.catppuccin
+    pkgs.tmuxPlugins.vim-tmux-navigator
+   ];
+ };
+
+}
diff --git a/packages/tmux/default.nix~ b/packages/tmux/default.nix~
new file mode 100644
index 0000000..3fe62f8
--- /dev/null
+++ b/packages/tmux/default.nix~
@@ -0,0 +1,34 @@
+{ pkgs, config, lib,... }:
+{
+ home.packages = with pkgs; [
+ ];
+
+ programs.tmux = {
+   enable = true;
+   extraConfig = ''
+set-option -sa terminal-overrides ",xterm*:Tc"
+set -g @catppuccin_flavor 'mocha'
+set -g @catppuccin_window_status_style "rounded"
+set -g status-right-length 100
+set -g status-left-length 100
+set -g status-left ""
+set -g status-right "#{E:@catppuccin_status_application}"
+set -ag status-right "#{E:@catppuccin_status_session}"
+set -ag status-right "#{E:@catppuccin_status_uptime}"
+
+
+unbind C-b
+set -g prefix C-Space
+bind C-Space send-prefix
+
+bind -n M-H previous-window
+bind -n M-L next-window
+   '';
+
+   plugins = [
+    pkgs.tmuxPlugins.catppuccin
+    pkgs.tmuxPlugins.vim-tmux-navigator
+   ];
+ };
+
+}
diff --git a/shells/flutter/flake.lock b/shells/flutter/flake.lock
new file mode 100644
index 0000000..052af3f
--- /dev/null
+++ b/shells/flutter/flake.lock
@@ -0,0 +1,61 @@
+{
+  "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1721138476,
+        "narHash": "sha256-+W5eZOhhemLQxelojLxETfbFbc19NWawsXBlapYpqIA=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "ad0b5eed1b6031efaed382844806550c3dcb4206",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/shells/flutter/flake.nix b/shells/flutter/flake.nix
new file mode 100644
index 0000000..9cc38ba
--- /dev/null
+++ b/shells/flutter/flake.nix
@@ -0,0 +1,48 @@
+{
+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 "28.0.3" ];
+        platformVersions = [ "34" "28" ];
+        abiVersions = [ "armeabi-v7a" "arm64-v8a" ];
+      };
+      androidSdk = androidComposition.androidsdk;
+    in
+    {
+      devShell =
+        with pkgs; mkShell rec {
+          ANDROID_SDK_ROOT = "${androidSdk}/libexec/android-sdk";
+          buildInputs = [
+            flutter
+            androidSdk # The customized SDK that we've made above
+            jdk17
+
+	
+  (vscode-with-extensions.override {
+    vscode = vscodium;
+    vscodeExtensions = with vscode-extensions; [
+	vscodevim.vim
+	dart-code.flutter
+jnoortheen.nix-ide
+      ];
+     }
+    )
+
+          ];
+        };
+    });
+}