diff --git a/nix/common.nix b/nix/common.nix
index 7f50dff..c5a0206 100644
--- a/nix/common.nix
+++ b/nix/common.nix
@@ -10,9 +10,10 @@
   ];
 
   home.packages = with pkgs; [
+    nil
     # neovim
 
-    (pkgs.nerdfonts.override { fonts = [ "FiraCodeMono" ]; })
+    (pkgs.nerdfonts.override { fonts = [ "FiraCode" ]; })
 
     # (pkgs.writeShellScriptBin "my-hello" ''
     #   echo "Hello, ${config.home.username}!"
diff --git a/nix/user/git.nix b/nix/user/git.nix
index 4cc026d..4fab21b 100644
--- a/nix/user/git.nix
+++ b/nix/user/git.nix
@@ -3,7 +3,7 @@
 {
   programs.git = {
     enable = true;
-    
+
     aliases = {
       st = "status";
       ci = "commit";
@@ -22,6 +22,7 @@
         editor = "nvim";
       };
       push.default = "matching";
+      init.defaultBranch = "main";
     };
   };
 }
diff --git a/nix/user/nvim.nix b/nix/user/nvim.nix
index 7fb256b..004eab6 100644
--- a/nix/user/nvim.nix
+++ b/nix/user/nvim.nix
@@ -33,6 +33,8 @@
       cmp-git
       nvim-lspconfig
       lspkind-nvim
+      copilot-lua
+      copilot-cmp
       (nvim-treesitter.withPlugins (p: [ p.awk p.bash p.c p.c_sharp p.cpp p.css p.diff p.dockerfile p.doxygen p.git_config p.gitcommit p.go p.gomod p.gosum p.gotmpl p.helm p.haskell p.html p.http p.java p.javascript p.json p.latex p.lua p.markdown p.markdown_inline p.matlab p.nix p.printf p.python p.regex p.rust p.sql p.strace p.supercollider p.svelte p.swift p.terraform p.tmux p.toml p.typescript p.vim p.xml p.yaml p.zig ]))
     ];
 
@@ -46,5 +48,9 @@
       (lib.strings.fileContents ../../nvim/plugins.lua)
     ];
   };
+
+  home.packages = with pkgs; [
+    nodejs-slim
+  ];
 }
 
diff --git a/nix/user/tmux.nix b/nix/user/tmux.nix
index 7967968..b61c458 100644
--- a/nix/user/tmux.nix
+++ b/nix/user/tmux.nix
@@ -7,8 +7,10 @@
     mouse = true;
     keyMode = "vi";
     escapeTime = 0;
+    terminal = "screen-256color";
+    tmuxp.enable = true;
+    # newSession = true;
     extraConfig = ''
-      set -g default-terminal "screen-256color"
       set -g display-time 1500
 
       unbind S
diff --git a/nvim/plugins.lua b/nvim/plugins.lua
index 55fb6d8..a9d433a 100644
--- a/nvim/plugins.lua
+++ b/nvim/plugins.lua
@@ -36,13 +36,16 @@ cmp.setup({
     { name = 'path' },
     { name = 'cmp_yanky' },
     { name = 'git' },
+    { name = 'copilot' },
   -- }, {
     { name = 'buffer', keyword_length = 2 },
   }),
 
+  formatting = {
   formatting = {
     format = lspkind.cmp_format({
-      mode = "symbol_text",
+      -- mode = "symbol_text",
+      mode = "symbol",
       menu = ({
         buffer = "[buf]",
         nvim_lsp = "[lsp]",
@@ -51,7 +54,9 @@ cmp.setup({
         latex_symbols = "[tex]",
         path = "[path]",
         cmp_yanky = "[yank]",
-      })
+        copilot = "[copilot]",
+      }),
+      symbol_map = { Copilot = "" }
     }),
   },
 })
@@ -117,6 +122,7 @@ require("telescope").load_extension("yank_history")
 
 require'nvim-treesitter.configs'.setup {
   -- ensure_installed = { "lua", "vim", "help" },
+  ensure_installed = {},
   sync_install = false,
   auto_install = false,
 
@@ -176,3 +182,10 @@ require('lualine').setup({
   inactive_winbar = {},
   extensions = {}
 })
+
+
+require("copilot").setup({
+  suggestion = { enabled = false },
+  panel = { enabled = false },
+})
+require("copilot_cmp").setup()