diff --git a/modules/base.nix b/modules/base.nix
new file mode 100644
index 0000000..25ad79f
--- /dev/null
+++ b/modules/base.nix
@@ -0,0 +1,13 @@
+{ lib, ... }:
+{
+  nixpkgs.config.allowUnfree = lib.mkDefault  true;
+
+  users = {
+    mutableUsers = lib.mkDefault false;
+  };
+
+  home-manager = {
+    useGlobalPkgs = true;
+    useUserPackages = true;
+  };
+}
diff --git a/systems/configuration.nix b/systems/configuration.nix
index 296e112..e5923c9 100644
--- a/systems/configuration.nix
+++ b/systems/configuration.nix
@@ -6,7 +6,6 @@
 }:
 {
   security.auditd.enable = true;
-  nixpkgs.config.allowUnfree = true;
 
   boot = {
     default = true;
@@ -15,16 +14,6 @@
     };
   };
 
-  home-manager = {
-    useGlobalPkgs = true;
-    useUserPackages = true;
-  };
-
-  users = {
-    defaultUserShell = pkgs.zsh;
-    mutableUsers = false;
-  };
-
   networking = {
     firewall = {
       enable = lib.mkDefault true;
@@ -118,21 +107,6 @@
       };
     };
 
-    neovim = {
-      enable = true;
-      defaultEditor = true;
-      configure = {
-        customRC = ''
-          set undofile         " save undo file after quit
-          set undolevels=1000  " number of steps to save
-          set undoreload=10000 " number of lines to save
-
-          " Save Cursor Position
-          au BufReadPost * if line("'\"") > 1 && line("'\"") <= line("$") | exe "normal! g'\"" | endif
-        '';
-      };
-    };
-
     zsh = {
       enable = true;
       syntaxHighlighting.enable = true;
diff --git a/users/alice/systems/artemision/non-server.nix b/users/alice/systems/artemision/non-server.nix
index eb59fd9..9f8c990 100644
--- a/users/alice/systems/artemision/non-server.nix
+++ b/users/alice/systems/artemision/non-server.nix
@@ -8,7 +8,6 @@
 {
   # Adds some items from the server config without importing everything
   security.auditd.enable = true;
-  nixpkgs.config.allowUnfree = true;
 
   i18n = {
     defaultLocale = "en_US.utf8";
@@ -19,14 +18,8 @@
     default = true;
   };
 
-  home-manager = {
-    useGlobalPkgs = true;
-    useUserPackages = true;
-  };
-
   users = {
     defaultUserShell = pkgs.zsh;
-    mutableUsers = false;
   };
 
   networking = {
diff --git a/users/alice/systems/non-server.nix b/users/alice/systems/non-server.nix
index 221c774..80a5574 100644
--- a/users/alice/systems/non-server.nix
+++ b/users/alice/systems/non-server.nix
@@ -8,7 +8,6 @@
 {
   # Adds some items from the server config without importing everything
   security.auditd.enable = true;
-  nixpkgs.config.allowUnfree = true;
 
   i18n = {
     defaultLocale = "en_US.utf8";
@@ -19,14 +18,8 @@
     default = true;
   };
 
-  home-manager = {
-    useGlobalPkgs = true;
-    useUserPackages = true;
-  };
-
   users = {
     defaultUserShell = pkgs.zsh;
-    mutableUsers = false;
   };
 
   networking = {
diff --git a/users/richie/home/vscode/default.nix b/users/richie/home/vscode/default.nix
index b14b300..62070b0 100644
--- a/users/richie/home/vscode/default.nix
+++ b/users/richie/home/vscode/default.nix
@@ -23,6 +23,7 @@ in
       oderwat.indent-rainbow
       usernamehw.errorlens
       streetsidesoftware.code-spell-checker
+      github.copilot
       # git
       eamodio.gitlens
       codezombiech.gitignore
diff --git a/users/richie/systems/rhapsody-in-green/configuration.nix b/users/richie/systems/rhapsody-in-green/configuration.nix
index a614ddc..81240db 100644
--- a/users/richie/systems/rhapsody-in-green/configuration.nix
+++ b/users/richie/systems/rhapsody-in-green/configuration.nix
@@ -4,7 +4,6 @@
     ./hardware.nix
     ../../syncthing_base.nix
   ];
-  nixpkgs.config.allowUnfree = true;
 
   boot = {
     useSystemdBoot = true;