aboutsummaryrefslogtreecommitdiff
path: root/nixos
diff options
context:
space:
mode:
Diffstat (limited to 'nixos')
-rw-r--r--nixos/boot.nix1
-rw-r--r--nixos/cachix/cuda-maintainers.nix13
-rw-r--r--nixos/configuration.nix7
-rw-r--r--nixos/environment.nix1
-rw-r--r--nixos/hardware-configuration.nix38
-rw-r--r--nixos/nvidia.nix26
-rw-r--r--nixos/services.nix4
7 files changed, 7 insertions, 83 deletions
diff --git a/nixos/boot.nix b/nixos/boot.nix
index 92a7ae4..b404813 100644
--- a/nixos/boot.nix
+++ b/nixos/boot.nix
@@ -1,6 +1,5 @@
{ config, pkgs, ... }:
{
- fileSystems."/boot".device = "/dev/nvme0n1p6";
boot.loader = {
grub = {
enable = true;
diff --git a/nixos/cachix/cuda-maintainers.nix b/nixos/cachix/cuda-maintainers.nix
deleted file mode 100644
index b1d70d6..0000000
--- a/nixos/cachix/cuda-maintainers.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-
-{
- nix = {
- settings = {
- substituters = [
- "https://cuda-maintainers.cachix.org"
- ];
- trusted-public-keys = [
- "cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E="
- ];
- };
- };
-}
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 569d597..d12ccd3 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -3,9 +3,9 @@
imports =
[
./hardware-configuration.nix
+ ./cachix.nix
./boot.nix
./services.nix
- ./nvidia.nix
./home.nix
./desktop-environment.nix
./environment.nix
@@ -16,6 +16,11 @@
<home-manager/nixos>
];
+ nix.settings = {
+ cores = 6;
+ max-jobs = 2;
+ };
+
networking.hostName = "pegasus";
networking.networkmanager.enable = true;
diff --git a/nixos/environment.nix b/nixos/environment.nix
index a90c5ba..58da2ec 100644
--- a/nixos/environment.nix
+++ b/nixos/environment.nix
@@ -8,6 +8,7 @@
btop
yazi
scrcpy
+ cloc
wget
git
diff --git a/nixos/hardware-configuration.nix b/nixos/hardware-configuration.nix
deleted file mode 100644
index fd119a3..0000000
--- a/nixos/hardware-configuration.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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, ... }:
-
-{
- imports =
- [ (modulesPath + "/installer/scan/not-detected.nix")
- ];
-
- boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ];
- boot.initrd.kernelModules = [ ];
- boot.kernelModules = [ "kvm-intel" ];
-
- fileSystems."/" =
- { device = "/dev/disk/by-uuid/56ef1a1d-db2f-45e9-b66a-f70f673596bf";
- fsType = "ext4";
- };
-
- fileSystems."/boot" =
- { device = "/dev/nvme0n1p6";
- fsType = "vfat";
- options = [ "fmask=0077" "dmask=0077" ];
- };
-
- swapDevices = [ ];
-
- # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
- # (the default) this is the recommended approach. When using systemd-networkd it's
- # still possible to use this option, but it's recommended to use it in conjunction
- # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
- networking.useDHCP = lib.mkDefault true;
- # networking.interfaces.eno1.useDHCP = lib.mkDefault true;
- # networking.interfaces.wlo1.useDHCP = lib.mkDefault true;
-
- nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
- hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}
diff --git a/nixos/nvidia.nix b/nixos/nvidia.nix
deleted file mode 100644
index c6f08a9..0000000
--- a/nixos/nvidia.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ config, pkgs, ... }:
-let unstable = import <nixos-unstable> { config.allowUnfree = true; };
-in {
- hardware.graphics.enable = true;
- hardware.nvidia = {
- modesetting.enable = true;
- package = config.boot.kernelPackages.nvidiaPackages.stable;
- nvidiaSettings = true;
- open = true;
- };
- boot.kernelParams = [ "acpi_backlight=video" ];
- boot.initrd.kernelModules = [ "nvidia" "hp_wmi" ];
- services.xserver.videoDrivers = [ "nvidia" ];
- nixpkgs.config.cudaSupport = true;
-
- environment.systemPackages = with pkgs; [
- linuxPackages.nvidia_x11
- unstable.cudaPackages.cuda_cudart
- unstable.cudaPackages.cudatoolkit
- ];
- environment.sessionVariables = {
- CUDA_HOME = "${pkgs.cudatoolkit}";
- CUDA_PATH = "${pkgs.cudatoolkit}";
- LD_LIBRARY_PATH = "${pkgs.linuxPackages.nvidia_x11}/lib";
- };
-}
diff --git a/nixos/services.nix b/nixos/services.nix
index 5705e9d..19df9cc 100644
--- a/nixos/services.nix
+++ b/nixos/services.nix
@@ -21,10 +21,6 @@
bind_ip = "127.0.0.1";
package = pkgs.mongodb;
};
- services.ollama = {
- enable = true;
- acceleration = "cuda";
- };
services.kanata = {
enable = true;
keyboards = {