From d1bbf5c3c394b6859a0398c337af54674a0beda7 Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Fri, 17 Jun 2022 09:47:01 -0500 Subject: [PATCH] stupid? --- README.org | 15 ++++++++++----- system/kaladin/configuration.nix | 15 ++++++++++----- system/syl/configuration.nix | 1 + 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/README.org b/README.org index cab6398..8cb3ac1 100644 --- a/README.org +++ b/README.org @@ -350,6 +350,7 @@ qt5.qtx11extras libsForQt5.kirigami2 libsForQt5.ki18n libsForQt5.kcoreaddons +sqlite fennel #+end_src @@ -652,14 +653,18 @@ Kaladin is my desktop machine. A powerhouse for the most part with a recent i7 a <> # Use the systemd-boot EFI boot loader. - boot.kernelPackages = pkgs.linuxPackages_zen; - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; + boot = { + kernelPackages = pkgs.linuxPackages_zen; + kernelParams = [ "mem_sleep_default=deep" ]; + initrd.kernelModules = [ "amdgpu" ]; + loader = { + systemd-boot.enable = true; + efi.canTouchEfiVariables = true; + }; + }; nixpkgs.config.allowUnfree = true; - boot.kernelParams = [ "mem_sleep_default=deep" ]; - networking.hostName = "kaladin"; # Define your hostname. networking.networkmanager.enable = true; # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. diff --git a/system/kaladin/configuration.nix b/system/kaladin/configuration.nix index bc4f784..a0f9347 100644 --- a/system/kaladin/configuration.nix +++ b/system/kaladin/configuration.nix @@ -11,14 +11,18 @@ }; # Use the systemd-boot EFI boot loader. - boot.kernelPackages = pkgs.linuxPackages_zen; - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; + boot = { + kernelPackages = pkgs.linuxPackages_zen; + kernelParams = [ "mem_sleep_default=deep" ]; + initrd.kernelModules = [ "amdgpu" ]; + loader = { + systemd-boot.enable = true; + efi.canTouchEfiVariables = true; + }; + }; nixpkgs.config.allowUnfree = true; - boot.kernelParams = [ "mem_sleep_default=deep" ]; - networking.hostName = "kaladin"; # Define your hostname. networking.networkmanager.enable = true; # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. @@ -256,6 +260,7 @@ libsForQt5.kirigami2 libsForQt5.ki18n libsForQt5.kcoreaddons + sqlite fennel (libsForQt5.callPackage ../../LightlyShaders {}) ]; diff --git a/system/syl/configuration.nix b/system/syl/configuration.nix index 522a3fd..dc7ad15 100644 --- a/system/syl/configuration.nix +++ b/system/syl/configuration.nix @@ -282,6 +282,7 @@ libsForQt5.kirigami2 libsForQt5.ki18n libsForQt5.kcoreaddons + sqlite fennel (libsForQt5.callPackage ../../LightlyShaders {}) ];