diff options
| author | spl3g <spleefer6@yandex.ru> | 2025-10-27 23:45:05 +0300 |
|---|---|---|
| committer | spl3g <spleefer6@yandex.ru> | 2025-10-27 23:50:34 +0300 |
| commit | 45da62a634546a7359b9654a1e01be3bd067189a (patch) | |
| tree | 30a8a5fa9ebae46dda2ccf0f03df8975bc45ca52 /nixos | |
| parent | 3ac3426144afa5eff1bb2551e27026c1cd0f2ca4 (diff) | |
chore: formatting
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/general.nix | 40 | ||||
| -rw-r--r-- | nixos/laptop/hardware-configuration.nix | 32 |
2 files changed, 39 insertions, 33 deletions
diff --git a/nixos/general.nix b/nixos/general.nix index 2162cda..cc400d2 100644 --- a/nixos/general.nix +++ b/nixos/general.nix @@ -1,15 +1,20 @@ -{ inputs, outputs, lib, config, pkgs, ... }: - { + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { imports = [ ./nixosModules ]; - + nixpkgs = { overlays = [ outputs.overlays.additions outputs.overlays.modifications - outputs.overlays.unstable-packages + outputs.overlays.truly-unstable-packages ]; config = { allowUnfree = true; @@ -19,7 +24,7 @@ nix = { # This will add each flake input as a registry # To make nix3 commands consistent with your flake - registry = lib.mapAttrs (_: value: { flake = value; }) inputs; + registry = lib.mapAttrs (_: value: {flake = value;}) inputs; # This will additionally add your inputs to the system's legacy channels # Making legacy nix commands consistent as well, awesome! @@ -36,7 +41,7 @@ # Deduplicate and optimize nix store auto-optimise-store = true; - trusted-users = [ "root" "@wheel" ]; + trusted-users = ["root" "@wheel"]; }; }; @@ -47,7 +52,7 @@ ly.enable = true; stylixConfig.enable = true; kanata.enable = true; - + networking = { networkmanager = { enable = true; @@ -56,7 +61,6 @@ hosts = { "127.0.0.1" = ["v2raya.local"]; }; - }; virtualisation.containers.enable = true; @@ -70,15 +74,15 @@ services.postgresql = { enable = true; }; - + boot.loader = { systemd-boot.enable = true; efi.canTouchEfiVariables = true; }; - + security.rtkit.enable = true; security.polkit.enable = true; - + services.pipewire = { enable = true; audio.enable = true; @@ -91,10 +95,12 @@ programs.gamemode = { enable = true; settings = { - gpu.amd_performance_level = "high"; + gpu.apply_gpu_optimizations = "accept-responsibility"; }; }; - + + services.udev.packages = with pkgs; [platformio-core.udev]; + environment.systemPackages = with pkgs; [ neovim git @@ -131,10 +137,10 @@ # the reason there's Noto Color Emoji everywhere is to override DejaVu's # B&W emojis that would sometimes show instead of some Color emojis fontconfig.defaultFonts = { - serif = [ "Noto Serif" "Noto Color Emoji" ]; - sansSerif = [ "Noto Sans" "Noto Color Emoji" ]; - monospace = [ "Sauce Code Pro Nerd Font" ]; - emoji = [ "Noto Color Emoji" ]; + serif = ["Noto Serif" "Noto Color Emoji"]; + sansSerif = ["Noto Sans" "Noto Color Emoji"]; + monospace = ["Sauce Code Pro Nerd Font"]; + emoji = ["Noto Color Emoji"]; }; }; diff --git a/nixos/laptop/hardware-configuration.nix b/nixos/laptop/hardware-configuration.nix index f8d847d..e63527d 100644 --- a/nixos/laptop/hardware-configuration.nix +++ b/nixos/laptop/hardware-configuration.nix @@ -1,18 +1,23 @@ # 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") - ]; + config, + lib, + pkgs, + modulesPath, + ... +}: { + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod" "sdhci_pci" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; - boot.kernelParams = [ "amdgpu.sg_display=0" ]; - boot.extraModulePackages = [ ]; + boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod" "sdhci_pci"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-amd"]; + # boot.kernelParams = ["amdgpu.sg_display=0" "amdgpu.dcdebugmask=0x10"]; + boot.kernelParams = []; + boot.extraModulePackages = []; # 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 @@ -25,16 +30,11 @@ nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - # hardware.amdgpu.amdvlk = { - # enable = true; - # support32Bit.enable = true; - # }; - hardware.graphics = { enable = true; enable32Bit = true; }; + hardware.amdgpu.initrd.enable = true; - services.xserver.videoDrivers = [ "modesetting" ]; hardware.bluetooth.enable = true; } |
