From a163cb6edbb00d9ca1b9af2a57a86b8080c959f2 Mon Sep 17 00:00:00 2001 From: Timothy DeHerrera Date: Thu, 16 Jul 2020 15:15:13 -0600 Subject: [PATCH] core: move kernel out of core profile The boot options and packages moved from core are more appropriate in graphical. --- profiles/core.nix | 12 ------------ profiles/graphical/default.nix | 19 ++++++++++++++++--- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/profiles/core.nix b/profiles/core.nix index ad3ec3c..f851787 100644 --- a/profiles/core.nix +++ b/profiles/core.nix @@ -8,16 +8,6 @@ in { imports = [ ../local/locale.nix ]; - boot = { - - kernelPackages = pkgs.linuxPackages_latest; - - tmpOnTmpfs = true; - - kernel.sysctl."kernel.sysrq" = 1; - - }; - environment = { systemPackages = with pkgs; [ @@ -31,11 +21,9 @@ in { gotop gptfdisk iputils - manpages moreutils nmap ripgrep - stdmanpages utillinux whois ]; diff --git a/profiles/graphical/default.nix b/profiles/graphical/default.nix index 2912ea2..38c5bbc 100644 --- a/profiles/graphical/default.nix +++ b/profiles/graphical/default.nix @@ -7,7 +7,18 @@ in { hardware.opengl.driSupport = true; hardware.pulseaudio.enable = true; + boot = { + + kernelPackages = pkgs.linuxPackages_latest; + + tmpOnTmpfs = true; + + kernel.sysctl."kernel.sysrq" = 1; + + }; + environment = { + etc = { "xdg/gtk-3.0/settings.ini" = { text = '' @@ -37,14 +48,12 @@ in { }; systemPackages = with pkgs; [ - pulsemixer adapta-gtk-theme cursor dzen2 feh ffmpeg-full firefox - qt5.qtgraphicaleffects gnome3.adwaita-icon-theme gnome3.networkmanagerapplet gnome-themes-extra @@ -52,10 +61,14 @@ in { imlib2 librsvg libsForQt5.qtstyleplugins + manpages papirus-icon-theme + pulsemixer + qt5.qtgraphicaleffects sddm-chili - zathura + stdmanpages xsel + zathura ]; };