diff --git a/overlays/fonts.nix b/overlays/fonts.nix
deleted file mode 100644
index 4f837020..00000000
--- a/overlays/fonts.nix
+++ /dev/null
@@ -1 +0,0 @@
-import ./fonts
diff --git a/overlays/fonts/default.nix b/overlays/fonts/default.nix
deleted file mode 100644
index c5be3050..00000000
--- a/overlays/fonts/default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-final: prev:
-with final; {
-  futura-otf = import ./futura.nix;
-}
diff --git a/overlays/fonts/futura.nix b/overlays/fonts/futura.nix
deleted file mode 100644
index 3c2c3cc4..00000000
--- a/overlays/fonts/futura.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, fetchFromGitHub }:
-
-stdenv.mkDerivation rec {
-  pname = "futura";
-  version = "1.0.0";
-
-  src = ../secrets/fonts/Futura Std;
-
-  installPhase = ''
-    install -D -m 444 /* -t $out/share/fonts/otf
-  '';
-
-  meta = with stdenv.lib; {
-    description = "";
-    longDescription = ''
-    '';
-    homepage = "";
-  };
-}
diff --git a/overlays/pub-solar.nix b/overlays/pub-solar.nix
deleted file mode 100644
index e1215796..00000000
--- a/overlays/pub-solar.nix
+++ /dev/null
@@ -1 +0,0 @@
-import ./pub-solar
diff --git a/overlays/pub-solar/default.nix b/overlays/pub-solar/default.nix
deleted file mode 100644
index 88257773..00000000
--- a/overlays/pub-solar/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-final: prev:
-with final; {
-  import-gtk-settings = writeShellScriptBin "import-gtk-settings" (import ./import-gtk-settings.nix final);
-  mailto-mutt = writeShellScriptBin "mailto-mutt" (import ./mailto-mutt.nix final);
-  mu = writeShellScriptBin "mu" (import ./mu.nix final);
-  mopidy-jellyfin = import ./mopidy-jellyfin.nix final;
-  psos = writeShellScriptBin "psos" (import ./psos.nix final);
-  s = writeShellScriptBin "s" (import ./s.nix final);
-  swaylock-bg = writeScriptBin "swaylock-bg" (import ./swaylock-bg.nix final);
-  sway-launcher = writeScriptBin "sway-launcher" (import ./sway-launcher.nix final);
-  sway-service = writeShellScriptBin "sway-service" (import ./sway-service.nix final);
-  toggle-kbd-layout = writeShellScriptBin "toggle-kbd-layout" (import ./toggle-kbd-layout.nix final);
-  uhk-agent = import ./uhk-agent.nix final;
-  wcwd = writeShellScriptBin "wcwd" (import ./wcwd.nix final);
-}
diff --git a/overlays/pub-solar/image-gpu-rom.nix b/overlays/pub-solar/image-gpu-rom.nix
deleted file mode 100644
index a472ee52..00000000
--- a/overlays/pub-solar/image-gpu-rom.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-GPU_VGA_PORT="0000:01:00.0"
-
-echo 1 > "/sys/bus/pci/devices/$GPU_VGA_PORT/rom"
-cat "/sys/bus/pci/devices/$GPU_VGA_PORT/rom" > \
-"/usr/share/qemu/gpu-1060.rom"
-echo 0 > "/sys/bus/pci/devices/$GPU_VGA_PORT/rom"
-
diff --git a/overlays/pub-solar/iommu-test.nix b/overlays/pub-solar/iommu-test.nix
deleted file mode 100644
index e2439bfa..00000000
--- a/overlays/pub-solar/iommu-test.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-shopt - s nullglob
-  for
-  g in /sys/kernel/iommu_groups/*; do
-echo "IOMMU Group ${g##*/}:"
-for d in $g/devices/*; do
-echo -e "\t$(lspci -nns ${d##*/})"
-done;
-done;
-
diff --git a/overlays/pub-solar/overlay.nix b/overlays/pub-solar/overlay.nix
deleted file mode 100644
index 5378b910..00000000
--- a/overlays/pub-solar/overlay.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-# You can use this file as a nixpkgs overlay. This is useful in the
-# case where you don't want to add the whole NUR namespace to your
-# configuration.
-
-self: super: import ./default.nix { pkgs = super; }
diff --git a/pkgs/default.nix b/pkgs/default.nix
index ce168707..935206d9 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1 +1,15 @@
-final: prev: { }
+final: prev:
+with final; {
+  import-gtk-settings = writeShellScriptBin "import-gtk-settings" (import ./import-gtk-settings.nix final);
+  mailto-mutt = writeShellScriptBin "mailto-mutt" (import ./mailto-mutt.nix final);
+  mopidy-jellyfin = import ./mopidy-jellyfin.nix final;
+  mu = writeShellScriptBin "mu" (import ./mu.nix final);
+  psos = writeShellScriptBin "psos" (import ./psos.nix final);
+  s = writeShellScriptBin "s" (import ./s.nix final);
+  sway-launcher = writeScriptBin "sway-launcher" (import ./sway-launcher.nix final);
+  sway-service = writeShellScriptBin "sway-service" (import ./sway-service.nix final);
+  swaylock-bg = writeScriptBin "swaylock-bg" (import ./swaylock-bg.nix final);
+  toggle-kbd-layout = writeShellScriptBin "toggle-kbd-layout" (import ./toggle-kbd-layout.nix final);
+  uhk-agent = import ./uhk-agent.nix final;
+  wcwd = writeShellScriptBin "wcwd" (import ./wcwd.nix final);
+}
diff --git a/overlays/pub-solar/import-gtk-settings.nix b/pkgs/import-gtk-settings.nix
similarity index 100%
rename from overlays/pub-solar/import-gtk-settings.nix
rename to pkgs/import-gtk-settings.nix
diff --git a/overlays/pub-solar/mailto-mutt.nix b/pkgs/mailto-mutt.nix
similarity index 100%
rename from overlays/pub-solar/mailto-mutt.nix
rename to pkgs/mailto-mutt.nix
diff --git a/overlays/pub-solar/mopidy-jellyfin.nix b/pkgs/mopidy-jellyfin.nix
similarity index 100%
rename from overlays/pub-solar/mopidy-jellyfin.nix
rename to pkgs/mopidy-jellyfin.nix
diff --git a/overlays/pub-solar/mu.nix b/pkgs/mu.nix
similarity index 100%
rename from overlays/pub-solar/mu.nix
rename to pkgs/mu.nix
diff --git a/overlays/pub-solar/psos.nix b/pkgs/psos.nix
similarity index 100%
rename from overlays/pub-solar/psos.nix
rename to pkgs/psos.nix
diff --git a/overlays/pub-solar/s.nix b/pkgs/s.nix
similarity index 100%
rename from overlays/pub-solar/s.nix
rename to pkgs/s.nix
diff --git a/overlays/pub-solar/sway-launcher.nix b/pkgs/sway-launcher.nix
similarity index 100%
rename from overlays/pub-solar/sway-launcher.nix
rename to pkgs/sway-launcher.nix
diff --git a/overlays/pub-solar/sway-service.nix b/pkgs/sway-service.nix
similarity index 100%
rename from overlays/pub-solar/sway-service.nix
rename to pkgs/sway-service.nix
diff --git a/overlays/pub-solar/swaylock-bg.nix b/pkgs/swaylock-bg.nix
similarity index 100%
rename from overlays/pub-solar/swaylock-bg.nix
rename to pkgs/swaylock-bg.nix
diff --git a/overlays/pub-solar/toggle-kbd-layout.nix b/pkgs/toggle-kbd-layout.nix
similarity index 100%
rename from overlays/pub-solar/toggle-kbd-layout.nix
rename to pkgs/toggle-kbd-layout.nix
diff --git a/overlays/pub-solar/uhk-agent.nix b/pkgs/uhk-agent.nix
similarity index 100%
rename from overlays/pub-solar/uhk-agent.nix
rename to pkgs/uhk-agent.nix
diff --git a/overlays/pub-solar/wcwd.nix b/pkgs/wcwd.nix
similarity index 100%
rename from overlays/pub-solar/wcwd.nix
rename to pkgs/wcwd.nix
diff --git a/profiles/core/default.nix b/profiles/core/default.nix
index f523fc1c..b20a6d79 100644
--- a/profiles/core/default.nix
+++ b/profiles/core/default.nix
@@ -127,17 +127,13 @@ in
 
     system.autoUpgrade.enable = true;
 
-<<<<<<< HEAD
-    services.earlyoom.enable = true;
-=======
-  # For rage encryption, all hosts need a ssh key pair
-  services.openssh = {
-    enable = true;
-    openFirewall = lib.mkDefault false;
-  };
+    # For rage encryption, all hosts need a ssh key pair
+    services.openssh = {
+      enable = true;
+      openFirewall = lib.mkDefault false;
+    };
 
-  services.earlyoom.enable = true;
->>>>>>> devos/core
+    services.earlyoom.enable = true;
 
     boot.kernelPackages = pkgs.linuxPackages_latest;
     boot.supportedFilesystems = [ "ntfs" ];