diff --git a/system/configuration.nix b/system/configuration.nix
index 2e0a675..58737b0 100644
--- a/system/configuration.nix
+++ b/system/configuration.nix
@@ -85,9 +85,10 @@
     brave
     tealdeer
     alsa-utils
-    tofi
+    wofi
     waybar
     swaylock-effects
+    swayidle
     bitwarden-cli
     bitwarden
     pcmanfm
diff --git a/users/tristan/home.nix b/users/tristan/home.nix
index 8c6eba1..74061e0 100644
--- a/users/tristan/home.nix
+++ b/users/tristan/home.nix
@@ -22,6 +22,47 @@
     gimp
   ];
 
+  programs.git = {
+    enable = true;
+    userName = "tristan";
+    userEmail = "tristan@tristans.cloud";
+    aliases = {
+      graph = "log --oneline --all --graph";
+    };
+  };
+
+  programs.swaylock.settings = {
+    clock = true;
+    screenshots = true;
+    effect-scale = 0.5;
+    effect-blur = "10x10";
+  };
+
+  services.swayidle.enable = true;
+  services.swayidle.events = [
+    { event = "before-sleep"; command = "${pkgs.swaylock}/bin/swaylock"; }
+    { event = "lock"; command = "lock"; }
+  ];
+
+  programs.waybar.enable = true;
+  programs.waybar.settings = {
+    mainBar = {
+      layer = "top";
+      position = "top";
+      height = 30;
+      modules-right = [ "mpd" "pulseaudio" "clock" "tray" ];
+      clock = {
+        format = "📅 {:%a %b-%d %I:%M %p}";
+      };
+      pulseaudio = {
+        format-muted = "🔇 {volume}%";
+        format = "{icon} {volume}";
+        format-icons.default = ["🔈" "🔉" "🔊"];
+        on-click = "pavucontrol";
+      };
+    };
+  };
+
   gtk = {
     enable = true;
     theme = {