diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..b38d49d
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+  "cSpell.words": ["nixos", "nixpkgs", "pkgs"]
+}
diff --git a/home/default.nix b/home/default.nix
index e06f678..587fd5d 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -3,6 +3,8 @@
 {
   imports = [
     ./programs/bash.nix
+    ./programs/starship.nix
+    ./programs/git.nix
   ];
 
   home.username = "river";
diff --git a/home/desktop/hyprland/default.nix b/home/desktop/hyprland/default.nix
new file mode 100644
index 0000000..d61d2f2
--- /dev/null
+++ b/home/desktop/hyprland/default.nix
@@ -0,0 +1,9 @@
+{ config, pkgs, ... }:
+
+{
+  programs.hyprland = {
+    enable = true;
+    withUWSM = false;
+    xwayland.enable = true;
+  };
+}
diff --git a/home/desktop/hyprland/hyprland.lua b/home/desktop/hyprland/hyprland.lua
new file mode 100644
index 0000000..e69de29
diff --git a/home/desktop/niri/default.nix b/home/desktop/niri/default.nix
new file mode 100644
index 0000000..e69de29
diff --git a/home/desktop/plasma/default.nix b/home/desktop/plasma/default.nix
new file mode 100644
index 0000000..e69de29
diff --git a/home/programs/bash.nix b/home/programs/bash.nix
index 8006f28..819664e 100644
--- a/home/programs/bash.nix
+++ b/home/programs/bash.nix
@@ -1,6 +1,10 @@
 { config, pkgs, ... }:
 
 {
+  imports = [
+    ./starship.nix
+  ];
+
   programs.bash = {
     enable = true;
     shellAliases = {
@@ -23,6 +27,7 @@
 
     initExtra = ''
       eval "$(zoxide init bash)"
+      eval "$(starship init bash)"
       source ${pkgs.carapace}/share/bash/carapace.bash
       export EDITOR=nvim
     '';
diff --git a/home/programs/git.nix b/home/programs/git.nix
new file mode 100644
index 0000000..ae4100a
--- /dev/null
+++ b/home/programs/git.nix
@@ -0,0 +1,15 @@
+{ pkgs, ... }:
+
+{
+  programs.git = {
+    enable = true;
+    settings = {
+      user = {
+        name = "Maaz Khokhar";
+        email = "khokharmaaz@gmail.com";
+      };
+
+      init.defaultBranch = "main";
+    };
+  };
+}
diff --git a/home/programs/starship.nix b/home/programs/starship.nix
new file mode 100644
index 0000000..d731798
--- /dev/null
+++ b/home/programs/starship.nix
@@ -0,0 +1,17 @@
+{ config, pkgs, ... }:
+
+{
+  programs.starship = {
+    enable = true;
+    settings = {
+      add_newline = true;
+      command_timeout = 1300;
+      scan_timeout = 50;
+      format = "$all$nix_shell$nodejs$lua$golang$rust$php$git_branch$git_commit$git_state$git_status\n$username$hostname$directory";
+      character = {
+        success_symbol = "[❯](bold green) ";
+        error_symbol = "[❯](bold red) ";
+      };
+    };
+  };
+}