From 79390d4eea20ca15fd8e088345528f31ed5fad1e Mon Sep 17 00:00:00 2001
From: Ben Sima <ben@bsima.me>
Date: Sat, 21 Dec 2024 10:40:06 -0400
Subject: Upgrade to nixos-24.05

I think this is the only "supported" nixos version now. But in any case scipy
seemed to be broken on the older version, and I couldn't build my code that uses
llm. Also, this allows me to get rid of the bild.os-unstable thing for
Beryllium, which was just a sitting timebomb of breaking stuff.

There are a lot of changes here because ruff updated to the very latest, and it
changed some minor lint things. Also with the new nixos I get a proper cgit
module, and some other breaking changes needed fixing.
---
 Biz/Dev/Beryllium/Configuration.nix | 45 +++----------------------------------
 1 file changed, 3 insertions(+), 42 deletions(-)

(limited to 'Biz/Dev/Beryllium')

diff --git a/Biz/Dev/Beryllium/Configuration.nix b/Biz/Dev/Beryllium/Configuration.nix
index e3e4232..b051315 100644
--- a/Biz/Dev/Beryllium/Configuration.nix
+++ b/Biz/Dev/Beryllium/Configuration.nix
@@ -1,7 +1,3 @@
-# Edit this configuration file to define what should be installed on
-# your system.  Help is available in the configuration.nix(5) man page
-# and in the NixOS manual (accessible by running ‘nixos-help’).
-
 { pkgs, ... }:
 
 {
@@ -54,7 +50,6 @@
   services.printing.enable = true;
 
   # Enable sound with pipewire.
-  sound.enable = true;
   hardware.pulseaudio.enable = false;
   security.rtkit.enable = true;
   services.pipewire = {
@@ -70,11 +65,7 @@
     #media-session.enable = true;
   };
 
-  # Enable touchpad support (enabled default in most desktopManager).
-  # services.xserver.libinput.enable = true;
-
   hardware.opengl.enable = true;
-  hardware.opengl.driSupport = true;
   hardware.opengl.driSupport32Bit = true;
   services.xserver.videoDrivers = [ "nvidia" ];
   hardware.nvidia.nvidiaPersistenced = true;
@@ -84,17 +75,7 @@
   hardware.nvidia.open = true;
   hardware.nvidia.nvidiaSettings = true;
 
-  # Define a user account. Don't forget to set a password with ‘passwd’.
-  #users.users.ben = {
-  #  isNormalUser = true;
-  #  description = "Ben Sima";
-  #  extraGroups = [ "networkmanager" "wheel" ];
-  #  packages = with pkgs; [
-  #    firefox
-  #    kate
-  #  #  thunderbird
-  #  ];
-  #};
+  hardware.keyboard.zsa.enable = true;
 
   services.xserver.displayManager.autoLogin.enable = false;
   services.xserver.displayManager.autoLogin.user = "ben";
@@ -109,36 +90,16 @@
 
   services.eternal-terminal.enable = true;
 
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
   environment.systemPackages = with pkgs; [
     v4l-utils
     linuxPackages.v4l2loopback
     nvtop
-    #  vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
-    #  wget
+    keymapp
   ];
 
   systemd.services.NetworkManager-wait-online.enable = false;
 
-  # Some programs need SUID wrappers, can be configured further or are
-  # started in user sessions.
-  # programs.mtr.enable = true;
-  # programs.gnupg.agent = {
-  #   enable = true;
-  #   enableSSHSupport = true;
-  # };
-
-  # List services that you want to enable:
-
-  # Enable the OpenSSH daemon.
-  # services.openssh.enable = true;
-
-  # Open ports in the firewall.
-  networking.firewall.allowedTCPPorts = [ 24800 ];
-  # networking.firewall.allowedUDPPorts = [ ... ];
-  # Or disable the firewall altogether.
-  # networking.firewall.enable = false;
+  networking.firewall.allowedTCPPorts = [ ports.barrier ];
 
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
-- 
cgit v1.2.3