From 54adc61a488ce9334161c931cb1f7736153773d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20B=C3=A4dorf?= Date: Wed, 9 Jun 2021 18:42:56 +0200 Subject: [PATCH] Move overlay to pkgs --- overlays/pub-solar/default.nix | 15 --------------- pkgs/default.nix | 16 +++++++++++++++- .../pub-solar => pkgs}/import-gtk-settings.nix | 0 {overlays/pub-solar => pkgs}/mailto-mutt.nix | 0 {overlays/pub-solar => pkgs}/mopidy-jellyfin.nix | 0 {overlays/pub-solar => pkgs}/mu.nix | 0 {overlays/pub-solar => pkgs}/psos.nix | 0 {overlays/pub-solar => pkgs}/s.nix | 0 {overlays/pub-solar => pkgs}/sway-launcher.nix | 0 {overlays/pub-solar => pkgs}/sway-service.nix | 0 {overlays/pub-solar => pkgs}/swaylock-bg.nix | 0 .../pub-solar => pkgs}/toggle-kbd-layout.nix | 0 {overlays/pub-solar => pkgs}/uhk-agent.nix | 0 {overlays/pub-solar => pkgs}/wcwd.nix | 0 profiles/core/default.nix | 16 ++++++---------- 15 files changed, 21 insertions(+), 26 deletions(-) delete mode 100644 overlays/pub-solar/default.nix rename {overlays/pub-solar => pkgs}/import-gtk-settings.nix (100%) rename {overlays/pub-solar => pkgs}/mailto-mutt.nix (100%) rename {overlays/pub-solar => pkgs}/mopidy-jellyfin.nix (100%) rename {overlays/pub-solar => pkgs}/mu.nix (100%) rename {overlays/pub-solar => pkgs}/psos.nix (100%) rename {overlays/pub-solar => pkgs}/s.nix (100%) rename {overlays/pub-solar => pkgs}/sway-launcher.nix (100%) rename {overlays/pub-solar => pkgs}/sway-service.nix (100%) rename {overlays/pub-solar => pkgs}/swaylock-bg.nix (100%) rename {overlays/pub-solar => pkgs}/toggle-kbd-layout.nix (100%) rename {overlays/pub-solar => pkgs}/uhk-agent.nix (100%) rename {overlays/pub-solar => pkgs}/wcwd.nix (100%) diff --git a/overlays/pub-solar/default.nix b/overlays/pub-solar/default.nix deleted file mode 100644 index 935206d9..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); - 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/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" ];