diff --git a/modules/users/crow/configs/tmux.nix b/modules/users/crow/configs/tmux.nix
new file mode 100644
index 0000000..7584946
--- /dev/null
+++ b/modules/users/crow/configs/tmux.nix
@@ -0,0 +1,17 @@
+{
+    programs.tmux = {
+        enable = true;
+        keyMode = "vi";
+        extraConfig = ''
+            bind | split-window -h
+            bind - split-window -v
+            unbind '"'
+            unbind %
+
+            bind -n M-Left select-pane -L
+            bind -n M-Right select-pane -R
+            bind -n M-Up select-pane -U
+            bind -n M-Down select-pane -D
+        '';
+    };
+}
diff --git a/modules/users/crow/configs/tmux/tmux.conf b/modules/users/crow/configs/tmux/tmux.conf
deleted file mode 100644
index bf62a3b..0000000
--- a/modules/users/crow/configs/tmux/tmux.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-# split panes using | and -
-bind | split-window -h
-bind - split-window -v
-unbind '"'
-unbind %
-
-# Alt-arrow pane nav
-bind -n M-Left select-pane -L
-bind -n M-Right select-pane -R
-bind -n M-Up select-pane -U
-bind -n M-Down select-pane -D
diff --git a/modules/users/crow/configs/waybar/config.jsonc b/modules/users/crow/configs/waybar/config.jsonc
deleted file mode 100644
index 5b002d8..0000000
--- a/modules/users/crow/configs/waybar/config.jsonc
+++ /dev/null
@@ -1,112 +0,0 @@
-// -*- mode: jsonc -*-
-{
-    "layer": "top",
-    "position": "top",
-    "height": 30, // Waybar height (to be removed for auto height)
-    "spacing": 4, // Gaps between modules (4px)
-    "mode": "dock",
-    "margin": 10, // float the bar off the edges of the screen
-    // Choose the order of the modules
-    "modules-left": [
-        "sway/workspaces"
-    ],
-    "modules-center": [
-        "clock"
-    ],
-    "modules-right": [
-        "network",
-        "battery",
-        "backlight",
-        "pulseaudio",
-        "tray"
-    ],
-    "tray": {
-        // "icon-size": 21,
-        "spacing": 10
-    },
-    "sway/workspaces": {
-        "format": "{icon}",
-        "format-icons" : {
-            "1": "󰈹",
-            "2": "",
-            "3": "",
-            "4": "󰎆",
-            "5": "󰓥",
-            "urgent": "",
-            "active": "",
-            "default": ""
-        },
-        "sort-by-number": true,
-        "persistent-workspaces": {
-            "1": [ "HDMI-A-1" ],
-            "2": [ "HDMI-A-1" ],
-            "3": [ "DP-1" ]
-        }
-    },
-    "clock": {
-        // "timezone": "America/New_York",
-        "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
-        "format-alt": "{:%m-%d-%Y}"
-    },
-    "cpu": {
-        "format": "{usage}% ",
-        "tooltip": false
-    },
-    "temperature": {
-        // "thermal-zone": 2,
-        // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
-        "critical-threshold": 80,
-        // "format-critical": "{temperatureC}°C {icon}",
-        "format": "{temperatureC}°C {icon}",
-        "format-icons": ["", "", ""]
-    },
-    "backlight": {
-        // "device": "acpi_video1",
-        "format": "{percent}% {icon}",
-        "format-icons": ["󰃞", "󰃟", "󰃠"]
-    },
-    "battery": {
-        "states": {
-            // "good": 95,
-            "warning": 30,
-            "critical": 15
-        },
-        "format": "{capacity}% {icon}",
-        "format-full": "{capacity}% {icon}",
-        "format-charging": "{capacity}% ",
-        "format-plugged": "{capacity}% ",
-        "format-alt": "{time} {icon}",
-        // "format-good": "", // An empty format will hide the module
-        // "format-full": "",
-        "format-icons": ["", "", "", "", ""]
-    },
-    "network": {
-        // "interface": "wlp2*", // (Optional) To force the use of this interface
-        "format-wifi": "{essid} ({signalStrength}%) ",
-        "format-ethernet": "{ipaddr}/{cidr} ",
-        "tooltip-format": "{ifname} via {gwaddr} ",
-        "format-linked": "{ifname} (No IP) ",
-        "format-disconnected": "Disconnected ⚠",
-        "format-alt": "{ifname}: {ipaddr}/{cidr}"
-    },
-    "pulseaudio": {
-        // "scroll-step": 1, // %, can be a float
-        "format": "{volume}% {icon} {format_source}",
-        "format-bluetooth": "{volume}% {icon} {format_source}",
-        "format-bluetooth-muted": " {icon} {format_source}",
-        "format-muted": " {format_source}",
-        "format-source": "{volume}% ",
-        "format-source-muted": "",
-        "format-icons": {
-            "headphone": "",
-            "hands-free": "",
-            "headset": "",
-            "phone": "",
-            "portable": "",
-            "car": "",
-            "default": ["", "", ""]
-        },
-        "on-click": "pavucontrol"
-    }
-}
-
diff --git a/modules/users/crow/configs/waybar/style.css b/modules/users/crow/configs/waybar/style.css
deleted file mode 100644
index 69a3d95..0000000
--- a/modules/users/crow/configs/waybar/style.css
+++ /dev/null
@@ -1,196 +0,0 @@
-@define-color fg #AAB775;
-@define-color bg #060617;
-@define-color disabled #a5a5a5;
-@define-color alert #f53c3c;
-@define-color activegreen #8fb666;
-
-* {
-  min-height: 0;
-  font-family: "JetBrainsMono Nerd Font", "Hack Nerd Font", "Font Awesome 6 Free Regular", "Font Awesome 6 Free Solid", "Font Awesome 6 Brands";
-  font-size: 14px;
-}
-
-window#waybar {
-  color: @fg;
-  background: @bg;
-  transition-property: background-color;
-  border-radius: 25px;
-  transition-duration: 0.5s;
-  
-}
-
-window#waybar.empty {
-  opacity: 0.3;
-}
-
-button {
-  /* Use box-shadow instead of border so the text isn't offset */
-  box-shadow: inset 0 -3px transparent;
-  /* Avoid rounded borders under each button name */
-  border: none;
-  border-radius: 0;
-}
-
-/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
-button:hover {
-  background: inherit;
-  box-shadow: inset 0 -3px transparent;
-}
-
-#workspaces button {
-  color: @fg;
-  /* padding : 0px 5px; */
-}
-
-#workspaces button.urgent {
-  color: @alert;
-}
-#workspaces button.empty {
-  color: @disabled;
-}
-
-#workspaces button.active {
-    border-bottom: 2px solid #DCAA9B;
-    border-radius: 0;
-    margin-top: 2px;
-    color: #DCAA9B;
-    transition: none;
-}
-
-/* If workspaces is the leftmost module, omit left margin */
-.modules-left > widget:first-child > #workspaces {
-  margin-left: 0;
-}
-
-/* If workspaces is the rightmost module, omit right margin */
-.modules-right > widget:last-child > #workspaces {
-  margin-right: 0;
-}
-
-#clock,
-#battery,
-#cpu,
-#memory,
-#disk,
-#temperature,
-#language,
-#backlight,
-#backlight-slider,
-#network,
-#pulseaudio,
-#wireplumber,
-#custom-media,
-#taskbar,
-#tray,
-#tray menu,
-#tray > .needs-attention,
-#tray > .passive,
-#tray > .active,
-#mode,
-#idle_inhibitor,
-#scratchpad,
-#custom-power,
-#window,
-#mpd {
-  padding: 0px 5px;
-  padding-right: 10px;
-  margin: 3px 3px;
-  color: @fg;
-}
-
-#custom-power {
-  color: @fg;
-  padding-left: 10px;
-}
-
-#custom-separator {
-  color: @disabled;
-}
-
-#network.disconnected,
-#pulseaudio.muted,
-#wireplumber.muted {
-  color: @alert;
-}
-
-#battery.charging,
-#battery.plugged {
-  color: #26a65b;
-}
-
-label:focus {
-  background-color: #333333;
-}
-
-#battery.critical:not(.charging) {
-  background-color: @alert;
-  color: @fg;
-  animation-name: blink;
-  animation-duration: 0.5s;
-  animation-timing-function: linear;
-  animation-iteration-count: infinite;
-  animation-direction: alternate;
-}
-
-/* #cpu { */
-/*   color: #cb221b; */
-/* } */
-/**/
-/* #temperature { */
-/*   color: #d55c0d; */
-/* } */
-/**/
-/* #memory { */
-/*   color: #679c68; */
-/* } */
-/**/
-/* #disk { */
-/*   color: #979618; */
-/* } */
-/**/
-/* #backlight { */
-/*   color: #d69821; */
-/* } */
-/**/
-/* #pulseaudio { */
-/*   color: #448486; */
-/* } */
-/**/
-/* #clock { */
-/*   color: #b16186; */
-/* } */
-/**/
-/* #battery { */
-/*   color: #5cc084; */
-/* } */
-/**/
-/* #network { */
-/*   color: #48aa4c; */
-/* } */
-
-/* In case you want to seperate the modules in left/right/center */
-/* .modules-left { */
-/*   background: @bg; */
-/*   border: 2px solid @bordercolor; */
-/*   border-radius: 20px; */
-/*   padding-right: 5px; */
-/*   padding-left: 5px; */
-/* } */
-/**/
-/* .modules-right { */
-/*   background: @bg; */
-/*   border: 2px solid @bordercolor; */
-/* border-radius: 20px; */
-/*   padding-right: 5px; */
-/*   padding-left: 5px; */
-/* } */
-/**/
-/* .modules-center { */
-/*   background: @bg; */
-/*   border: 2px solid @bordercolor; */
-/* border-radius: 20px; */
-/*   padding-right: 5px; */
-/*   padding-left: 5px; */
-/* } */
-
-
diff --git a/modules/users/crow/home.nix b/modules/users/crow/home.nix
index bcef0f3..7d5efa3 100644
--- a/modules/users/crow/home.nix
+++ b/modules/users/crow/home.nix
@@ -22,6 +22,7 @@ in {
   imports = [
     ./configs/firefox.nix
     ./configs/waybar.nix
+    ./configs/tmux.nix
   ];
   home = {
     username = "crow";
@@ -29,7 +30,6 @@ in {
     stateVersion = "24.05";
 
     # Tools
-    file.".config/tmux/tmux.conf".source = ./configs/tmux/tmux.conf;
     file.".config/git/config".source = ./configs/git/git.conf;
 
     # Hyprland