diff --git a/system/configuration.nix b/system/configuration.nix
index 9ba9ca9..5496096 100644
--- a/system/configuration.nix
+++ b/system/configuration.nix
@@ -100,11 +100,9 @@
     waybar
     swaylock-effects
     swayidle
-    bitwarden-cli
-    bitwarden
+    swaybg
     pcmanfm
     pavucontrol
-    exa
     (neovim.override {
       vimAlias = true;
       configure = {
diff --git a/users/tristan/home.nix b/users/tristan/home.nix
index 288f37e..95c6af0 100644
--- a/users/tristan/home.nix
+++ b/users/tristan/home.nix
@@ -10,6 +10,13 @@
 
   home.packages = with pkgs; [
     gimp
+    logseq
+    quickemu
+    exa
+    bitwarden-cli
+    bitwarden
+    playerctl
+    nextcloud-client
   ];
 
   programs.git = {
@@ -63,7 +70,12 @@
       name = "Materia-dark";
       package = pkgs.materia-theme;
     };
+    gtk3.bookmarks = [
+      "file:///home/tristan/Documents"
+    ];
   };
+  
+  # services.mako.enable = true;
 
   programs.ncmpcpp.enable = true;
   programs.ncmpcpp.settings.mpd_host = "192.168.1.2";
@@ -90,4 +102,81 @@
     c = "cycle sub-visibility";
   };
 
+  programs.foot.enable = true;
+  programs.foot.settings = {
+    main = {
+      term = "xterm-256color";
+      font = "mono:size=12";
+    };
+    colors = {
+      foreground="abb2bf";
+      background="282c34";
+      regular0="222222";
+      regular1="eb3a26";
+      regular2="7fbc59";
+      regular3="e9db65";
+      regular4="4781d1";
+      regular5="7d74bb";
+      regular6="50a2bd";
+      regular7="dcdccc";
+      bright0="666666";
+      bright1="e15d4e";
+      bright2="8fbd73";
+      bright3="e3d97e";
+      bright4="6791ce";
+      bright5="8f88be";
+      bright6="6caabf";
+      bright7="ffffff";
+    };
+  };
+
+  programs.vscode = {
+    enable = true;
+    package = pkgs.vscodium;
+    extensions = with pkgs; [
+      vscode-extensions.asvetliakov.vscode-neovim
+      vscode-extensions.jnoortheen.nix-ide
+    ];
+    userSettings = {
+      "vscode-neovim.neovimExecutablePaths.linux" = "/run/current-system/sw/bin/nvim";
+    };
+  };
+
+  services.nextcloud-client.enable = true;
+  services.nextcloud-client.startInBackground = true;
+  
+  accounts.email.accounts."tristan@tristans.cloud" = {
+    notmuch.enable = true;
+    neomutt.enable = true;
+    mbsync.enable = true;
+    userName = "tristan@tristans.cloud";
+    realName = "Tristan";
+    address = "tristan@tristans.cloud";
+    primary = true;
+    passwordCommand = "rbw get privateemail";
+    smtp = {
+      host = "mail.privateemail.com";
+      port = 465;
+      tls.enable = true;
+    };
+    imap = {
+      host = "mail.privateemail.com";
+      port = 993;
+      tls.enable = true;
+    };
+  };
+
+  programs.notmuch.enable = true;
+  programs.neomutt.enable = true;
+  programs.mbsync.enable = true;
+  services.mbsync.enable = true;
+
+  programs.rbw = {
+    enable = true;
+    settings = {
+      email = "tristan@tristans.cloud";
+      base_url = "https://vault.tristans.cloud";
+    };
+  };
+
 }