diff options
author | Ben Sima <ben@bsima.me> | 2024-12-21 10:40:06 -0400 |
---|---|---|
committer | Ben Sima <ben@bsima.me> | 2024-12-21 09:40:06 -0500 |
commit | 79390d4eea20ca15fd8e088345528f31ed5fad1e (patch) | |
tree | f08b71ffddead23484fd6df9e1aff54d20f12768 /Biz/Dev | |
parent | 18956baad9cde85bc55bd0113092e51786d9e1ee (diff) |
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.
Diffstat (limited to 'Biz/Dev')
-rw-r--r-- | Biz/Dev/Beryllium.nix | 2 | ||||
-rw-r--r-- | Biz/Dev/Beryllium/Configuration.nix | 45 | ||||
-rw-r--r-- | Biz/Dev/Lithium/Configuration.nix | 1 | ||||
-rw-r--r-- | Biz/Dev/Vpn.nix | 2 |
4 files changed, 5 insertions, 45 deletions
diff --git a/Biz/Dev/Beryllium.nix b/Biz/Dev/Beryllium.nix index cca0997..82374c3 100644 --- a/Biz/Dev/Beryllium.nix +++ b/Biz/Dev/Beryllium.nix @@ -1,5 +1,5 @@ { bild }: -bild.os-unstable { +bild.os { imports = [ ../OsBase.nix ../Packages.nix 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 diff --git a/Biz/Dev/Lithium/Configuration.nix b/Biz/Dev/Lithium/Configuration.nix index b4e0660..97b00c8 100644 --- a/Biz/Dev/Lithium/Configuration.nix +++ b/Biz/Dev/Lithium/Configuration.nix @@ -52,7 +52,6 @@ in { virtualisation.virtualbox.host.headless = false; virtualisation.virtualbox.host.addNetworkInterface = false; virtualisation.virtualbox.guest.enable = false; - virtualisation.virtualbox.guest.x11 = false; services.my-hoogle.enable = true; services.my-hoogle.port = ports.hoogle; diff --git a/Biz/Dev/Vpn.nix b/Biz/Dev/Vpn.nix index 47f9c6e..9b791b7 100644 --- a/Biz/Dev/Vpn.nix +++ b/Biz/Dev/Vpn.nix @@ -8,7 +8,7 @@ in { enable = true; address = "0.0.0.0"; port = ports.headscale; - settings = { }; + settings = { dns.base_domain = "simatime.com"; }; }; services.nginx.virtualHosts.${domain} = { |