From 87d37e0acc42dab2625241285d5aff6108bf20d8 Mon Sep 17 00:00:00 2001 From: Martin Klimes Klimi Date: Thu, 12 Dec 2019 20:34:27 +0100 Subject: [PATCH] cleanup --- nix/configuration.nix | 3 +-- nix/machines/G560.nix | 3 ++- nix/user.nix | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nix/configuration.nix b/nix/configuration.nix index 77f130e..5b94d07 100644 --- a/nix/configuration.nix +++ b/nix/configuration.nix @@ -30,8 +30,7 @@ in { # Linux kernel Latest boot.kernelPackages = pkgs.linuxPackages_latest; # Use the GRUB 2 boot loader. - boot.loader.grub.enable = true; - boot.loader.grub.version = 2; + # boot.loader.grub.efiSupport = true; # boot.loader.grub.efiInstallAsRemovable = true; # boot.loader.efi.efiSysMountPoint = "/boot/efi"; diff --git a/nix/machines/G560.nix b/nix/machines/G560.nix index 6a0a876..1c77580 100644 --- a/nix/machines/G560.nix +++ b/nix/machines/G560.nix @@ -1,5 +1,6 @@ { config, pkgs, ... }: { - + boot.loader.grub.enable = true; + boot.loader.grub.version = 2; boot.loader.grub.device = "/dev/sda"; # or "nodev" for efi only } diff --git a/nix/user.nix b/nix/user.nix index 804abaf..5445c6c 100644 --- a/nix/user.nix +++ b/nix/user.nix @@ -48,6 +48,8 @@ in "sudo nixos-rebuild switch -I nixos-config=/home/klimi/dotfiles/nix/configuration.nix"; nrb = "sudo nixos-rebuild boot -I nixos-config=/home/klimi/dotfiles/nix/configuration.nix"; + un = + "NIXPKGS_ALLOW_UNFREE=1 "; }; @@ -86,6 +88,7 @@ in programs.firefox.enable = true; home = { packages = [ + pkgs.ncat pkgs.lm_sensors pkgs.dunst pkgs.libnotify