diff --git a/nixos/common/modules/networking.nix b/nixos/common/modules/networking.nix
index db5fcb12..8d6fcf2c 100644
--- a/nixos/common/modules/networking.nix
+++ b/nixos/common/modules/networking.nix
@@ -5,9 +5,9 @@
     networkmanager = { 
       enable = true;
     };
-
+    
     useDHCP = lib.mkDefault true;
-    enableIPv6 = false;
+    enableIPv6 = lib.mkForce false;
     firewall = { 
       enable = true;
       allowedTCPPorts = [  ];
diff --git a/nixos/common/software/packages.nix b/nixos/common/software/packages.nix
new file mode 100644
index 00000000..07dee248
--- /dev/null
+++ b/nixos/common/software/packages.nix
@@ -0,0 +1,46 @@
+{ pkgs, ... }: {
+  # List packages installed in system profile
+  environment.systemPackages = with pkgs; [
+    tmux         # terminal multiplexer
+    rbw          # CLI app for Bitwarden
+    nfs-utils    # nfs network share tools
+    nixfmt       # Formatting nix output
+    dconf        # Required for stylix
+    ripgrep      # Better grep
+    sbctl        # Secureboot Control
+    wget         # WebGet
+    killall      # Killall
+    curl         # Curl - For web requests
+    neofetch     # system information viewer
+    rsync        # copy/sync 
+    git          # git!
+    duf          # replacement / prettier UI for df
+    ncdu         # ncurses style browser for du/dust
+    du-dust      # better UI for 'du"
+    home-manager # manage dotfiles
+    btop         # like htop, but prettier
+    iftop        # interface top - network usage
+    nload        # network load - Network usage graphs
+    iotop        # I/O top viewer - disk r/w, etc
+    sops         # manage secrets
+    gnupg        # GNU Privacy Guard
+    fx           # Pretty print JSON
+    nodejs       # Required by fx
+    eza          # like ls, but prettier
+    cryptsetup   # used to open LUKS devices
+    parted       # Disk partitioner / Formatter
+    screen       # Terminal screen manager
+    e2fsprogs    # disk format utilities, like mkfs.ext4
+    bat          # Like cat, but with syntax highlighting
+    openssl      # Used to generate certs, random strings, etc
+    tree         # CLI directory display software
+    nmap         # network mapping / discovery software
+    busybox      # General linux commands, nslookup, dig, etc
+    sshpass      # ssh password helper
+    cbonsai      # ncurses bonsai tree
+    busybox      # Linux utilities
+    ethtool      # Ethernet troubleshooting
+    fd           # alternative to "Find"
+    lazygit      # Decent Git TUI 
+  ];
+}
diff --git a/nixos/containers/rdesktop/default.nix b/nixos/containers/rdesktop/default.nix
index e6408deb..b12f78f2 100644
--- a/nixos/containers/rdesktop/default.nix
+++ b/nixos/containers/rdesktop/default.nix
@@ -3,7 +3,7 @@
     ../../common/desktops/${desktop}
   ];
 
-  networking.firewall.allowedTCPPorts = [ 3389 ];:
+  networking.firewall.allowedTCPPorts = [ 3389 ];
 
   services.xrdp = {
     enable = true;
diff --git a/nixos/containers/rdesktop/mounts.nix b/nixos/containers/rdesktop/mounts.nix
index 49dab741..38bc157d 100644
--- a/nixos/containers/rdesktop/mounts.nix
+++ b/nixos/containers/rdesktop/mounts.nix
@@ -1,4 +1,4 @@
-{ ... }: {
+{
   "/etc/nixos/git" = {
     hostPath = "/etc/nixos/git";
     isReadOnly = true;
diff --git a/nixos/default.nix b/nixos/default.nix
index 3480518c..1fd673b5 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -11,7 +11,10 @@
       ./common/services/tailscale.nix
       ./common/services/gnupg-agent.nix
       ./common/services/opensnitch.nix
+
+      # Software
       ./common/software/cli/weechat.nix
+      ./common/software/packages.nix
 
       # NixOS Modules
       ./common/modules/fonts.nix           # Font Configs
@@ -23,51 +26,6 @@
       ./hosts/${hostname}
     ] ++ lib.optional (builtins.isString desktop) ./common/desktops/${desktop};
 
-  # List packages installed in system profile
-  environment.systemPackages = with pkgs; [
-    tmux         # terminal multiplexer
-    rbw          # CLI app for Bitwarden
-    nfs-utils    # nfs network share tools
-    nixfmt       # Formatting nix output
-    dconf        # Required for stylix
-    ripgrep      # Better grep
-    sbctl        # Secureboot Control
-    wget         # WebGet
-    killall      # Killall
-    curl         # Curl - For web requests
-    neofetch     # system information viewer
-    rsync        # copy/sync 
-    git          # git!
-    duf          # replacement / prettier UI for df
-    ncdu         # ncurses style browser for du/dust
-    du-dust      # better UI for 'du"
-    home-manager # manage dotfiles
-    btop         # like htop, but prettier
-    iftop        # interface top - network usage
-    nload        # network load - Network usage graphs
-    iotop        # I/O top viewer - disk r/w, etc
-    sops         # manage secrets
-    gnupg        # GNU Privacy Guard
-    fx           # Pretty print JSON
-    nodejs       # Required by fx
-    eza          # like ls, but prettier
-    cryptsetup   # used to open LUKS devices
-    parted       # Disk partitioner / Formatter
-    screen       # Terminal screen manager
-    e2fsprogs    # disk format utilities, like mkfs.ext4
-    bat          # Like cat, but with syntax highlighting
-    openssl      # Used to generate certs, random strings, etc
-    tree         # CLI directory display software
-    nmap         # network mapping / discovery software
-    busybox      # General linux commands, nslookup, dig, etc
-    sshpass      # ssh password helper
-    cbonsai      # ncurses bonsai tree
-    busybox      # Linux utilities
-    ethtool      # Ethernet troubleshooting
-    fd           # alternative to "Find"
-    lazygit      # Decent Git TUI 
-  ];
-
   # Select internationalisation properties.
   i18n.defaultLocale = "en_US.UTF-8";
   i18n.extraLocaleSettings = {