Massive sweeping changes
This commit is contained in:
parent
cd265fa1a7
commit
40cac7a6f7
13 changed files with 484 additions and 144 deletions
|
@ -82,8 +82,7 @@
|
|||
description = "Aria";
|
||||
extraGroups = [ "networkmanager" "wheel" ];
|
||||
packages = with pkgs; with unstable; [
|
||||
git
|
||||
neovim
|
||||
|
||||
];
|
||||
};
|
||||
|
||||
|
@ -100,7 +99,7 @@
|
|||
environment.systemPackages = with pkgs; [
|
||||
# vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
|
||||
# wget
|
||||
unstable.nix-your-shell
|
||||
|
||||
];
|
||||
|
||||
# Some programs need SUID wrappers, can be configured further or are
|
||||
|
@ -122,6 +121,18 @@
|
|||
# Or disable the firewall altogether.
|
||||
networking.firewall.enable = false;
|
||||
|
||||
environment.sessionVariables = {
|
||||
# === Prefer RADV driver ===
|
||||
AMD_VULKAN_ICD = "RADV";
|
||||
VK_ICD_FILENAMES = "/run/opengl-driver/share/vulkan/icd.d/radeon_icd.x86_64.json";
|
||||
|
||||
FLAKE = "/home/aria/etc/nixos/";
|
||||
|
||||
MANGOHUD = "1";
|
||||
|
||||
DOTNET_SYSTEM_GLOBALIZATION_INVARIANT = "1"; # Fixes godot 4 mono's launch issues
|
||||
};
|
||||
|
||||
# This value determines the NixOS release from which the default
|
||||
# settings for stateful data, like file locations and database versions
|
||||
# on your system were taken. It‘s perfectly fine and recommended to leave
|
||||
|
|
|
@ -1,32 +1,47 @@
|
|||
# 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, ... }:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
modulesPath,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "sd_mod" ];
|
||||
boot.initrd.availableKernelModules = [
|
||||
"nvme"
|
||||
"xhci_pci"
|
||||
"ahci"
|
||||
"usb_storage"
|
||||
"sd_mod"
|
||||
];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/ea653cf0-e131-4241-978a-eb05cf9fd482";
|
||||
fsType = "ext4";
|
||||
};
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/ea653cf0-e131-4241-978a-eb05cf9fd482";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/C6A3-F1FD";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0077" "dmask=0077" ];
|
||||
};
|
||||
|
||||
swapDevices =
|
||||
[ { device = "/dev/disk/by-uuid/4585864a-d7e7-4b21-b1fd-4757e244e8bb"; }
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/C6A3-F1FD";
|
||||
fsType = "vfat";
|
||||
options = [
|
||||
"fmask=0077"
|
||||
"dmask=0077"
|
||||
];
|
||||
};
|
||||
|
||||
swapDevices = [
|
||||
{ device = "/dev/disk/by-uuid/4585864a-d7e7-4b21-b1fd-4757e244e8bb"; }
|
||||
];
|
||||
|
||||
# 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
|
||||
|
@ -38,4 +53,23 @@
|
|||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
hardware = {
|
||||
graphics = {
|
||||
# === vulkan/mesa ===
|
||||
enable = true;
|
||||
enable32Bit = true;
|
||||
# package = unstable.mesa;
|
||||
# === vulkan/mesa ===
|
||||
|
||||
# === amdvlk driver ===
|
||||
};
|
||||
amdgpu.amdvlk = {
|
||||
enable = true;
|
||||
support32Bit.enable = true;
|
||||
};
|
||||
# === amdvlk driver ===
|
||||
|
||||
# openrazer.enable = true;
|
||||
|
||||
};
|
||||
}
|
||||
|
|
|
@ -172,14 +172,8 @@
|
|||
[
|
||||
# vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
|
||||
# wget
|
||||
fzf
|
||||
nixfmt-rfc-style
|
||||
unstable.dwarfs
|
||||
unrar
|
||||
unstable.mpv
|
||||
pkgs.clamav
|
||||
unstable.waypipe
|
||||
unstable.nix-your-shell
|
||||
|
||||
amdgpu_top
|
||||
# unstable.mangohud
|
||||
|
@ -189,15 +183,8 @@
|
|||
unstable.ab-av1
|
||||
unstable.whisper-cpp-vulkan
|
||||
|
||||
vscode.fhs # .fhs version will be more compatable even if slightly less nix flavoured
|
||||
|
||||
# unstable.openrazer-daemon # Broken, enable again in a few days?
|
||||
|
||||
# === nix related ===
|
||||
comma
|
||||
nh
|
||||
# === nix related ===
|
||||
|
||||
rustc
|
||||
cargo
|
||||
go
|
||||
|
@ -220,63 +207,6 @@
|
|||
# xorg.xwininfo
|
||||
];
|
||||
|
||||
programs.nix-ld.enable = true;
|
||||
programs.nix-ld.libraries = with pkgs; [
|
||||
# === Godot ===
|
||||
xorg.libXcursor
|
||||
xorg.libXinerama
|
||||
xorg.libXext
|
||||
xorg.libXrandr
|
||||
xorg.libXrender
|
||||
xorg.libX11
|
||||
xorg.libXi
|
||||
libGL
|
||||
wayland
|
||||
wayland-scanner
|
||||
vulkan-loader
|
||||
fontconfig
|
||||
libxkbcommon
|
||||
dbus
|
||||
libpulseaudio
|
||||
dotnetCorePackages.sdk_8_0_3xx
|
||||
alsa-lib
|
||||
icu
|
||||
# === Godot ===
|
||||
|
||||
# === Ludusavi ===
|
||||
gtk3
|
||||
gtk4
|
||||
glib
|
||||
glibc
|
||||
# === Ludusavi ===
|
||||
|
||||
# === html wallpaper ===
|
||||
python312Packages.pyqt6-webengine
|
||||
# ===
|
||||
|
||||
zlib
|
||||
zstd
|
||||
stdenv.cc.cc
|
||||
curl
|
||||
openssl
|
||||
attr
|
||||
libssh
|
||||
bzip2
|
||||
libxml2
|
||||
acl
|
||||
libsodium
|
||||
util-linux
|
||||
xz
|
||||
systemd
|
||||
|
||||
# === jpegqs & jpeg2png ===
|
||||
mozjpeg
|
||||
libjpeg
|
||||
libjpeg8
|
||||
libpng
|
||||
# === jpegqs & jpeg2png ===
|
||||
];
|
||||
|
||||
# Some programs need SUID wrappers, can be configured further or are
|
||||
# started in user sessions.
|
||||
# programs.mtr.enable = true;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue