diff --git a/configuration.nix b/configuration.nix
index 87bf5d5..52cd04f 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -4,7 +4,6 @@
   imports = [
     ./hardware-configuration.nix
 
-    # Import Modules
     ./modules/boot.nix
     ./modules/networking.nix
     ./modules/locale.nix
diff --git a/hardware-configuration.nix b/hardware-configuration.nix
index 90f6751..0f8c6fb 100644
--- a/hardware-configuration.nix
+++ b/hardware-configuration.nix
@@ -1,32 +1,46 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:
 
 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
 
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" ];
+  boot.initrd.availableKernelModules = [
+    "nvme"
+    "xhci_pci"
+    "ahci"
+    "usbhid"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/1d9c0c94-23d1-4acf-8e68-39cec48dc75a";
-      fsType = "ext4";
-    };
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/1d9c0c94-23d1-4acf-8e68-39cec48dc75a";
+    fsType = "ext4";
+  };
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/AE5D-3C23";
-      fsType = "vfat";
-      options = [ "fmask=0077" "dmask=0077" ];
-    };
-
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/59acaf1c-702d-4547-a118-d8b5b16009a8"; }
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/AE5D-3C23";
+    fsType = "vfat";
+    options = [
+      "fmask=0077"
+      "dmask=0077"
     ];
+  };
+
+  swapDevices = [
+    { device = "/dev/disk/by-uuid/59acaf1c-702d-4547-a118-d8b5b16009a8"; }
+  ];
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
diff --git a/modules/home/librewolf.nix b/modules/home/librewolf.nix
index 8613d4b..69537c0 100644
--- a/modules/home/librewolf.nix
+++ b/modules/home/librewolf.nix
@@ -49,6 +49,7 @@
           "Bing"
           "Perplexity"
           "Wikipedia (en)"
+          "DuckDuckGo"
         ];
         Add = [
           {
@@ -59,15 +60,6 @@
             Alias = "searx";
             Description = "Searx (search.atri.dad)";
           }
-          {
-            Name = "DuckDuckGo";
-            URLTemplate = "https://duckduckgo.com/?q={searchTerms}";
-            SuggestURLTemplate = "https://duckduckgo.com/ac/?q={searchTerms}&type=list";
-            Method = "GET";
-            IconURL = "https://duckduckgo.com/favicon.ico";
-            Alias = "ddg";
-            Description = "DuckDuckGo";
-          }
         ];
       };
 
diff --git a/modules/home/packages.nix b/modules/home/packages.nix
index 0cdbd6b..9b1dae7 100644
--- a/modules/home/packages.nix
+++ b/modules/home/packages.nix
@@ -19,14 +19,15 @@
     nerd-fonts.iosevka
     desktop-file-utils
 
-    # CLI
+    # CLI/TUI
     bitwarden-cli
     tea
+    subtui
+    helix
 
     # Desktop applications
     bitwarden-desktop
     vlc
-    streamrip
     zotero
     lrcget
     impression
@@ -38,10 +39,7 @@
     signal-desktop
     unstable.fastmail-desktop
     supersonic
-    subtui
     mpv
     nicotine-plus
   ];
-
-  programs.obs-studio.enable = true;
 }
diff --git a/modules/home/ssh.nix b/modules/home/ssh.nix
index dad0382..dbe7a58 100644
--- a/modules/home/ssh.nix
+++ b/modules/home/ssh.nix
@@ -12,12 +12,12 @@
         extraOptions.UserKnownHostsFile = "/dev/null";
       };
       "tux" = {
-        hostname = "tuxworld.usask.ca";
+        hostname = "tux8.usask.ca";
         user = "atl175";
       };
       "haschel" = {
         hostname = "haschel";
-        user = "fedora";
+        user = "root";
       };
       "lloyd" = {
         hostname = "lloyd";
diff --git a/modules/programs.nix b/modules/programs.nix
index a6f05c3..2859046 100644
--- a/modules/programs.nix
+++ b/modules/programs.nix
@@ -1,10 +1,7 @@
 { pkgs, ... }:
 
 {
-  # Enable unfree globally
   nixpkgs.config.allowUnfree = true;
-
-  # Enable zsh globally
   programs.zsh.enable = true;
 
   environment.systemPackages = with pkgs; [
@@ -14,7 +11,6 @@
     qmk-udev-rules
   ];
 
-  # Programs with extra configuration
   programs.steam = {
     enable = true;
     remotePlay.openFirewall = true;
@@ -26,4 +22,6 @@
   programs.java.enable = true;
 
   programs.gamemode.enable = true;
+
+  programs.obs-studio.enable = true;
 }
diff --git a/modules/services.nix b/modules/services.nix
index 18fa7d8..164860a 100644
--- a/modules/services.nix
+++ b/modules/services.nix
@@ -54,6 +54,4 @@
 
   services.avahi.publish.enable = true;
   services.avahi.publish.userServices = true;
-
-  services.system76-scheduler.enable = true;
 }