From 0f7f9e77dc4e0f1cc894db94c11f35437ffc67eb Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 11 Oct 2024 13:44:28 -0400 Subject: [PATCH] add reflac and misc changes --- configuration.nix | 30 ++++++++++++++++-------------- flake.lock | 14 +++++++------- flake.nix | 4 ++-- 3 files changed, 25 insertions(+), 23 deletions(-) diff --git a/configuration.nix b/configuration.nix index be3ee62..9c924e5 100644 --- a/configuration.nix +++ b/configuration.nix @@ -55,23 +55,22 @@ systemd-boot.enable = true; efi.canTouchEfiVariables = true; - # 1 sec timeout + # 1s timeout timeout = 1; }; initrd = { compressor = "zstd"; - compressorArgs = [ "-19" ]; }; - kernelModules = [ - # kernel module for case fan control - "nct6775" - ]; + # kernelModules = [ + # # kernel module for case fan control + # "nct6775" + # ]; }; environment.etc = { - "issue".text = "muffin server :3\n"; + "issue".text = ""; }; # Set your time zone. @@ -86,11 +85,6 @@ }; }; - #Intel GPU stuff - nixpkgs.config.packageOverrides = pkgs: { - vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; }; - }; - hardware.graphics = { enable = true; extraPackages = with pkgs; [ @@ -100,8 +94,6 @@ ]; }; - hardware.intelgpu.driver = "xe"; - #fwupd for updating firmware services.fwupd = { enable = true; @@ -146,6 +138,16 @@ ${pkgs.smartmontools}/bin/smartctl -a "$i" | ${pkgs.gnugrep}/bin/grep "SMART overall-health self-assessment test result:" | ${pkgs.coreutils}/bin/cut -d' ' -f6 done '') + + flac + (pkgs.writeScriptBin "reflac" ( + builtins.readFile ( + pkgs.fetchurl { + url = "https://raw.githubusercontent.com/chungy/reflac/refs/heads/master/reflac"; + sha256 = "61c6cc8be3d276c6714e68b55e5de0e6491f50bbf195233073dbce14a1e278a7"; + } + ) + )) ]; services.zfs = { diff --git a/flake.lock b/flake.lock index ab73c22..d0316c9 100644 --- a/flake.lock +++ b/flake.lock @@ -43,11 +43,11 @@ ] }, "locked": { - "lastModified": 1728351976, - "narHash": "sha256-X83r7hCo6fzllvgVGT2sJhl0dwZbA4xfud3GFtkwaBg=", + "lastModified": 1728611137, + "narHash": "sha256-P3IMlCnXU2yK1eosUjZy/zGvjYJLv4aCIK0s/d9iUKY=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "02bae91cf389340c62bb367d4a5b6ad06a2562d1", + "rev": "76dd43c0d72e8ada06a7f04348e88f91385791bf", "type": "github" }, "original": { @@ -74,16 +74,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728352754, - "narHash": "sha256-rIa/pEDxkQqSaDMxNIlsFq0GpKSCeNxWkvhUzdLLrWk=", + "lastModified": 1728492678, + "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3727d51a8e07e635b9bcbc5f812b16d80d46eaeb", + "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", "type": "github" }, "original": { "owner": "NixOS", - "ref": "master", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index dd28d8f..46491c0 100644 --- a/flake.nix +++ b/flake.nix @@ -2,8 +2,8 @@ description = "Flake for server muffin"; inputs = { - # nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - nixpkgs.url = "github:NixOS/nixpkgs/master"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + # nixpkgs.url = "github:NixOS/nixpkgs/master"; nixos-hardware.url = "github:NixOS/nixos-hardware/master";