diff options
| author | Ben Sima <ben@bsima.me> | 2024-05-03 22:34:10 -0400 |
|---|---|---|
| committer | Ben Sima <ben@bsima.me> | 2024-05-09 21:38:52 -0400 |
| commit | d71c6f8c5955e8a9861e3f3957b293a369aac954 (patch) | |
| tree | da77bbbec8e082a77c0d553cf2216dce9b4ced0b /Biz/Dev | |
| parent | d36b4360c9c359e6eea480b39e9699b1deae70f1 (diff) | |
Switch to nixpkgs-23.11, ghc 9.6.3
This brings a bunch of improvements. I got rid of some custom packages, I can
now build exllama without using a non-default cuda version. Oh yeah and I get to
use GHC 9.6.2 now, a huge upgrade from 9.4. Unfortunately I also updated ormolu
and some unrelated formatting changed, but that's life I guess.
Diffstat (limited to 'Biz/Dev')
| -rw-r--r-- | Biz/Dev/Beryllium/Configuration.nix | 5 | ||||
| -rw-r--r-- | Biz/Dev/Lithium/Configuration.nix | 9 |
2 files changed, 2 insertions, 12 deletions
diff --git a/Biz/Dev/Beryllium/Configuration.nix b/Biz/Dev/Beryllium/Configuration.nix index 7699305..e3e4232 100644 --- a/Biz/Dev/Beryllium/Configuration.nix +++ b/Biz/Dev/Beryllium/Configuration.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, ... }: +{ pkgs, ... }: { imports = [ # Include the results of the hardware scan. @@ -109,9 +109,6 @@ services.eternal-terminal.enable = true; - # Allow unfree packages - nixpkgs.config.allowUnfree = true; - # List packages installed in system profile. To search, run: # $ nix search wget environment.systemPackages = with pkgs; [ diff --git a/Biz/Dev/Lithium/Configuration.nix b/Biz/Dev/Lithium/Configuration.nix index e6cbdfe..b4e0660 100644 --- a/Biz/Dev/Lithium/Configuration.nix +++ b/Biz/Dev/Lithium/Configuration.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ lib, pkgs, ... }: let ghcCompiler = (import ../../Bild/Constants.nix).ghcCompiler; @@ -27,13 +27,6 @@ in { environment.systemPackages = [ pkgs.nvtop pkgs.k3s pkgs.wemux pkgs.tmux pkgs.wireguard-tools ]; - nixpkgs = { - config = { - allowUnfree = true; - allowBroken = true; - }; - }; - hardware = { opengl.enable = true; pulseaudio = { |