overlays/pub-solar/default.nix

@@ -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);
-  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);
-}

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);
+}

profiles/core/default.nix

@@ -127,9 +127,6 @@ in
 
     system.autoUpgrade.enable = true;
 
-<<<<<<< HEAD
-    services.earlyoom.enable = true;
-=======
     # For rage encryption, all hosts need a ssh key pair
     services.openssh = {
       enable = true;
@@ -137,7 +134,6 @@ in
     };
 
     services.earlyoom.enable = true;
->>>>>>> devos/core
 
     boot.kernelPackages = pkgs.linuxPackages_latest;
     boot.supportedFilesystems = [ "ntfs" ];