From 5dc448e8142dfd654b708b8864de595d2ac0a01c Mon Sep 17 00:00:00 2001 From: Your Name Date: Sat, 17 Feb 2024 20:30:32 +0300 Subject: [PATCH] unstable zen kernel --- configuration.nix | 7 ++---- flake.lock | 44 ++++++++++++++++++++++++++++++++++++++ flake.nix | 9 ++++++-- hardware-configuration.nix | 3 ++- 4 files changed, 55 insertions(+), 8 deletions(-) create mode 100644 flake.lock diff --git a/configuration.nix b/configuration.nix index 00b8ed6..11c246a 100644 --- a/configuration.nix +++ b/configuration.nix @@ -5,10 +5,7 @@ { config, pkgs, ... }: { - imports = - [ # Include the results of the hardware scan. - ./hardware-configuration.nix - ]; + nix.settings.experimental-features = [ "flakes" "nix-command" ]; # Bootloader. boot.loader.systemd-boot.enable = true; @@ -85,7 +82,7 @@ extraGroups = [ "networkmanager" "wheel" ]; packages = with pkgs; [ firefox - # thunderbird + git ]; }; diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..8bc5821 --- /dev/null +++ b/flake.lock @@ -0,0 +1,44 @@ +{ + "nodes": { + "nixpkgs": { + "locked": { + "lastModified": 1708105575, + "narHash": "sha256-sS4AItZeUnAei6v8FqxNlm+/27MPlfoGym/TZP0rmH0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1d1817869c47682a6bee85b5b0a6537b6c0fba26", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1708118438, + "narHash": "sha256-kk9/0nuVgA220FcqH/D2xaN6uGyHp/zoxPNUmPCMmEE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5863c27340ba4de8f83e7e3c023b9599c3cb3c80", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "nixpkgs": "nixpkgs", + "nixpkgs-unstable": "nixpkgs-unstable" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix index 06875eb..a3130bd 100644 --- a/flake.nix +++ b/flake.nix @@ -1,11 +1,16 @@ { inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; + nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; }; - outputs = inputs @ { nixpkgs, ... }: { + outputs = inputs @ { nixpkgs, nixpkgs-unstable, ... }: { nixosConfigurations.dlaptop = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; + specialArgs = { + inherit inputs; + unstable = import nixpkgs-unstable { system = "x86_64-linux"; config = { allowUnfree = true; }; }; + }; modules = [ ./configuration.nix ./hardware-configuration.nix diff --git a/hardware-configuration.nix b/hardware-configuration.nix index b98e6b2..1df72b5 100644 --- a/hardware-configuration.nix +++ b/hardware-configuration.nix @@ -1,7 +1,7 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: +{ unstable, config, lib, pkgs, modulesPath, ... }: { imports = @@ -11,6 +11,7 @@ boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-amd" ]; + boot.kernelPackages = unstable.linuxPackages_zen; boot.extraModulePackages = [ ]; fileSystems."/" =