diff --git a/flake.lock b/flake.lock
index 6e82b2b..0363cdc 100644
--- a/flake.lock
+++ b/flake.lock
@@ -3061,11 +3061,11 @@
         "systems": "systems_3"
       },
       "locked": {
-        "lastModified": 1737951414,
-        "narHash": "sha256-BSE7KclfVdQzu8SnYnFrgfGBWND6MqWZ7jW6mz+aySk=",
+        "lastModified": 1738020300,
+        "narHash": "sha256-5cP4sRpYb4FARo+fX4/TzZG24BocslMn5+EDlPIV9MY=",
         "owner": "Gerg-L",
         "repo": "spicetify-nix",
-        "rev": "c54e245b9af38b432cb17cc918f3128c44abdf21",
+        "rev": "851372d7bdf4dfbce82c6378f580b5ae7ea39e9d",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index dc27f15..6b4b265 100644
--- a/flake.nix
+++ b/flake.nix
@@ -81,7 +81,7 @@
           inherit spicetifyPkgs;
         };
         modules = [
-	  nvf.homeManagerModules.default
+          nvf.homeManagerModules.default
           spicetify-nix.homeManagerModules.default
           ./user/home.nix
         ];
diff --git a/system/hardware-configuration.nix b/system/hardware-configuration.nix
index 306c63e..81ba872 100644
--- a/system/hardware-configuration.nix
+++ b/system/hardware-configuration.nix
@@ -8,25 +8,23 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" "rtsx_pci_sdmmc" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/385de99e-29f7-4f82-ab5b-b9f908f868f2";
+    { device = "/dev/disk/by-uuid/2b034ca9-3690-4c1e-a1eb-78d5d39e1d7f";
       fsType = "ext4";
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/F9F9-11BE";
+    { device = "/dev/disk/by-uuid/F57E-2E3D";
       fsType = "vfat";
       options = [ "fmask=0077" "dmask=0077" ];
     };
 
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/cf55eade-5b6f-456c-b9c3-a6d1110cfc19"; }
-    ];
+  swapDevices = [ ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's
diff --git a/user/home.nix b/user/home.nix
index 53c96d3..79f7008 100644
--- a/user/home.nix
+++ b/user/home.nix
@@ -8,9 +8,7 @@
     ./misc.nix
     ./git.nix
     ./gleam.nix
-#    ./nixvim.nix
     ./nvf.nix
-    ./vscode.nix
     ./themes.nix
     ./spotify.nix
   ];
diff --git a/user/kitty.nix b/user/kitty.nix
index b2f86df..7f80b22 100644
--- a/user/kitty.nix
+++ b/user/kitty.nix
@@ -7,6 +7,7 @@
       package = pkgs.nerd-fonts.jetbrains-mono;
     };
     settings = {
+      # TODO: Add on-click events
       scrollback_lines = 10000;
       enable_audio_bell = false;
       update_check_interval = 0;
diff --git a/user/nvf.nix b/user/nvf.nix
index 731820f..82d150a 100644
--- a/user/nvf.nix
+++ b/user/nvf.nix
@@ -26,6 +26,8 @@
           treesitter.enable = true;
         };
       };
+      # TODO: Update text when hovering over neovim icon, update neovim icon bc this one's ugly
+      presence.neocord.enable = true;
       statusline.lualine.enable = true;
       visuals.nvim-web-devicons.enable = true;
       tabline.nvimBufferline.enable = true;
diff --git a/user/spotify.nix b/user/spotify.nix
index 6dfb10c..e12f891 100644
--- a/user/spotify.nix
+++ b/user/spotify.nix
@@ -4,7 +4,5 @@
     enabledExtensions = with spicetifyPkgs.extensions; [
       adblock
     ];
-    theme = spicetifyPkgs.themes.sleek;
-    colorScheme = "Nord";
   };
-}
\ No newline at end of file
+}
diff --git a/user/waybar.nix b/user/waybar.nix
index 660521c..7e865cc 100644
--- a/user/waybar.nix
+++ b/user/waybar.nix
@@ -1,4 +1,5 @@
 {...}: {
+  # TODO: Everything tbh
   programs.waybar = {
     enable = true;
     settings.mainBar = {