From 0eda8382491b691b8c51215d3625b0daf12b1aeb Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Thu, 14 Oct 2021 14:05:57 +0200 Subject: [PATCH 1/2] put nix unstable in global config --- systems/LoutreOS/configuration.nix | 7 ------- systems/common-cli.nix | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/systems/LoutreOS/configuration.nix b/systems/LoutreOS/configuration.nix index 0cf9bc5..016a386 100644 --- a/systems/LoutreOS/configuration.nix +++ b/systems/LoutreOS/configuration.nix @@ -23,13 +23,6 @@ tmpOnTmpfs = true; }; - nix = { - package = pkgs.nixUnstable; - extraOptions = '' - experimental-features = nix-command flakes - ''; - }; - documentation.nixos.enable = false; nixpkgs.config.allowUnfree = false; diff --git a/systems/common-cli.nix b/systems/common-cli.nix index 25e08ff..431da82 100644 --- a/systems/common-cli.nix +++ b/systems/common-cli.nix @@ -4,6 +4,13 @@ time.timeZone = "Europe/Paris"; + nix = { + package = pkgs.nixUnstable; + extraOptions = '' + experimental-features = nix-command flakes + ''; + }; + environment.systemPackages = with pkgs; [ # Editeurs (neovim.override { From 1a42ae58b8d454f1f2ad1b000bc96de03a3d6d35 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Thu, 14 Oct 2021 14:16:53 +0200 Subject: [PATCH 2/2] paul-fixe: fix flake config --- flake.nix | 2 +- systems/PC-Fixe/hardware-configuration.nix | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/flake.nix b/flake.nix index 2fc6582..bd155ed 100644 --- a/flake.nix +++ b/flake.nix @@ -29,7 +29,7 @@ "nixpkgs=${nixpkgs}" ]; }) - nixpkgs.nixosModules.notDetected + nixpkgs-unstable.nixosModules.notDetected ./systems/PC-Fixe/configuration.nix ]; }; diff --git a/systems/PC-Fixe/hardware-configuration.nix b/systems/PC-Fixe/hardware-configuration.nix index 1c08f14..5d50505 100644 --- a/systems/PC-Fixe/hardware-configuration.nix +++ b/systems/PC-Fixe/hardware-configuration.nix @@ -4,10 +4,6 @@ { config, lib, pkgs, ... }: { - imports = - [ - ]; - boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.kernelModules = [ "dm-snapshot" ]; boot.kernelModules = [ "kvm-amd" "coretemp" "it87" ];