diff --git a/systems/x86_64-linux/carbon/default.nix b/systems/x86_64-linux/carbon/default.nix
index a2825f1..dc5ae8b 100644
--- a/systems/x86_64-linux/carbon/default.nix
+++ b/systems/x86_64-linux/carbon/default.nix
@@ -1,6 +1,3 @@
-# Edit this configuration file to define what should be installed on
-# your system.  Help is available in the configuration.nix(5) man page
-# and in the NixOS manual (accessible by running ‘nixos-help’).
 {
   config,
   pkgs,
@@ -37,65 +34,12 @@
   };
 
   networking = {
-    hostName = "carbon"; # Define your hostname.
+    hostName = "carbon";
     networkmanager.enable = true; # Enables wireless support via wpa_supplicant.
-
-    #wg-quick.interfaces = {
-    #wg0 = {
-    #address = [ "10.10.13.25/32" ];
-    #dns = [ "192.168.113.69" ];
-    #listenPort = 51820;
-    #privateKeyFile = "/home/alejandro/wireguard_keys/carbon.pub";
-
-    #peers = [
-    #{
-    #publicKey = "HGm7lx+DbACPxEN7gaiuz4XklV/RdzmBj//FBSO7QUU=";
-    #allowedIPs = [ "10.13.13.0/24" "192.168.113.0/24" ];
-    #endpoint = "wg.kilonull.com:51820";
-    #}
-    #];
-    #};
-    #};
   };
 
-  # Set your time zone.
   time.timeZone = "America/Los_Angeles";
 
-  # Configure network proxy if necessary
-  # networking.proxy.default = "http://user:password@proxy:port/";
-  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
-
-  # Select internationalisation properties.
-  # i18n.defaultLocale = "en_US.UTF-8";
-  # console = {
-  #   font = "Lat2-Terminus16";
-  #   keyMap = "us";
-  # };
-
-  # Enable the X11 windowing system.
-  # services.xserver.enable = true;
-
-  # Configure keymap in X11
-  # services.xserver.layout = "us";
-  # services.xserver.xkbOptions = "eurosign:e";
-
-  # Enable CUPS to print documents.
-  # services.printing.enable = true;
-
-  # Enable sound.
-  # sound.enable = true;
-  # hardware.pulseaudio.enable = true;
-
-  # Enable touchpad support (enabled default in most desktopManager).
-  # services.xserver.libinput.enable = true;
-
-  # Define a user account. Don't forget to set a password with ‘passwd’.
-  # users.users.alejandro = {
-  #   isNormalUser = true;
-  #   extraGroups = ["wheel" "video" "networkmanager"];
-  #   shell = pkgs.zsh;
-  # };
-
   fonts.fonts = with pkgs; [
     (nerdfonts.override {fonts = ["Hack"];})
   ];
@@ -125,54 +69,8 @@
     vlc
   ];
 
-  # Some programs need SUID wrappers, can be configured further or are
-  # started in user sessions.
-  # programs.mtr.enable = true;
-  # programs.gnupg.agent = {
-  #   enable = true;
-  #   enableSSHSupport = true;
-  # };
-
-  programs.zsh.enable = true;
-
   programs.light.enable = true;
 
-  programs.sway = {
-    enable = true;
-    wrapperFeatures.gtk = true; # so that gtk works properly
-    extraPackages = with pkgs; [
-      swaylock
-      swayidle
-      wl-clipboard
-      mako
-      alacritty
-      rofi
-      waybar
-      pavucontrol
-    ];
-  };
-
-  # List services that you want to enable:
-
-  # Enable the OpenSSH daemon.
-  services.openssh.enable = true;
-
-  services.avahi.enable = true;
-  services.geoclue2 = {
-    enable = true;
-    #appConfig."gammastep" = {
-    #isAllowed = true;
-    #isSystem = true;
-    #users = ["1000"];
-    #};
-  };
-
-  # Open ports in the firewall.
-  # networking.firewall.allowedTCPPorts = [ ... ];
-  # networking.firewall.allowedUDPPorts = [ ... ];
-  # Or disable the firewall altogether.
-  # networking.firewall.enable = false;
-
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave
diff --git a/systems/x86_64-linux/gospel/default.nix b/systems/x86_64-linux/gospel/default.nix
index f56232b..4e213a6 100644
--- a/systems/x86_64-linux/gospel/default.nix
+++ b/systems/x86_64-linux/gospel/default.nix
@@ -45,18 +45,11 @@
 
   boot.binfmt.emulatedSystems = ["aarch64-linux" "armv6l-linux"];
 
-  networking.hostName = "gospel"; # Define your hostname.
-  # Pick only one of the below networking options.
-  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
-  # networking.networkmanager.enable = true;  # Easiest to use and most distros use this by default.
+  networking.hostName = "gospel";
 
   # Set your time zone.
   time.timeZone = "America/Los_Angeles";
 
-  # fonts.fonts = with pkgs; [
-  #   (nerdfonts.override {fonts = ["Hack"];})
-  # ];
-
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
@@ -82,12 +75,6 @@
     file
   ];
 
-
-  # Copy the NixOS configuration file and link it from the resulting system
-  # (/run/current-system/configuration.nix). This is useful in case you
-  # accidentally delete configuration.nix.
-  # system.copySystemConfiguration = true;
-
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave