uhhh
uhhh the 2nd rendition
This commit is contained in:
parent
132a109da8
commit
565aac949c
37 changed files with 2606 additions and 36 deletions
|
@ -1,6 +1,6 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
in {
|
||||
{
|
||||
imports = [
|
||||
./hardware.nix
|
||||
];
|
||||
|
@ -9,19 +9,60 @@ in {
|
|||
# archives
|
||||
zip xz unzip p7zip
|
||||
# utils
|
||||
ripgrep jq
|
||||
ripgrep jq libqalculate
|
||||
# nix
|
||||
nix-output-monitor
|
||||
# system
|
||||
btop duf killall
|
||||
btop duf lm_sensors ethtool pciutils usbutils powertop killall
|
||||
# debug
|
||||
strace ltrace lsof
|
||||
# apps
|
||||
firefox mpv qalculate-gtk
|
||||
# misc
|
||||
file which tree
|
||||
bat file which tree yt-dlp
|
||||
] ++ (with pkgs.my; [
|
||||
# none yet
|
||||
# none yet
|
||||
]) ++ (with pkgs.gnome; [
|
||||
# yay gnomeware!!!!!!!!!!!!!! yum
|
||||
nautilus gnome-disk-utility pkgs.gedit file-roller gnome-system-monitor loupe
|
||||
]);
|
||||
|
||||
modules = {
|
||||
security.useDoas = false;
|
||||
security.useDoas = true;
|
||||
|
||||
hardware = {
|
||||
pipewire.enable = true;
|
||||
};
|
||||
desktop = {
|
||||
envProto = "wayland";
|
||||
|
||||
hyprland.enable = true;
|
||||
hyprlock.enable = true;
|
||||
hypridle.enable = true;
|
||||
hyprpaper.enable = true;
|
||||
|
||||
dunst.enable = true;
|
||||
rofi.enable = true;
|
||||
nwg-drawer.enable = true;
|
||||
waybar.enable = true;
|
||||
|
||||
sddm.enable = true;
|
||||
|
||||
themes.active = "catppuccin";
|
||||
};
|
||||
software = {
|
||||
# system
|
||||
system.wezterm.enable = true;
|
||||
system.fish.enable = true;
|
||||
# editors
|
||||
editors.micro.enable = true;
|
||||
editors.vscode.enable = true;
|
||||
# distractions
|
||||
distractions.discord.enable = true;
|
||||
distractions.discord.armcord = true;
|
||||
# dev
|
||||
dev.git.enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
networking.networkmanager.enable = true;
|
||||
|
|
|
@ -1,32 +1,68 @@
|
|||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
{ inputs, config, lib, pkgs, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[
|
||||
inputs.hardware.nixosModules.common-cpu-intel
|
||||
inputs.hardware.nixosModules.common-gpu-nvidia
|
||||
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot = {
|
||||
initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ];
|
||||
initrd.kernelModules = [ ];
|
||||
kernelModules = [ ];
|
||||
extraModulePackages = [ ];
|
||||
# TODO: move bootloader, networking, boot speed to another file?
|
||||
kernelPackages = pkgs.linuxPackages_latest;
|
||||
loader = {
|
||||
# use u-boot over grub
|
||||
grub.enable = lib.mkForce false;
|
||||
generic-extlinux-compatible.enable = true;
|
||||
};
|
||||
boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
boot.loader = {
|
||||
# use systemd-boot over grub
|
||||
grub.enable = lib.mkForce false;
|
||||
systemd-boot.enable = true;
|
||||
efi.canTouchEfiVariables = true;
|
||||
};
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/44444444-4444-4444-8888-888888888888";
|
||||
# nvidia bullshit. Wow
|
||||
# i really, *really* wish i had an AMD card rn
|
||||
hardware.nvidia = {
|
||||
# this will cause problems down the line, but man i need that explicit sync ASAP
|
||||
package = config.boot.kernelPackages.nvidiaPackages.beta;
|
||||
modesetting.enable = true;
|
||||
# powermanagement breaks suspend i guess??
|
||||
#
|
||||
# im about to suspend lets see if turning it off fixed it
|
||||
#
|
||||
# it did not !! this time our computer actually shut off fully but..
|
||||
# hyprland turned into an eldrich horror then crashed. Lets just not for now!
|
||||
# powerManagement.enable = false;
|
||||
|
||||
prime = {
|
||||
offload = {
|
||||
enable = true;
|
||||
};
|
||||
|
||||
intelBusId = "PCI:0:2:0";
|
||||
nvidiaBusId = "PCI:1:0:0";
|
||||
};
|
||||
};
|
||||
hardware.opengl = {
|
||||
enable = true;
|
||||
driSupport = true;
|
||||
driSupport32Bit = true;
|
||||
};
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/08cfbb11-5943-4627-a2fc-fd41ce578027";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
swapDevices =
|
||||
[ ];
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/C321-2746";
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
swapDevices =
|
||||
[ { device = "/dev/disk/by-uuid/04eddb76-4925-4192-a472-1c2c7e4ac9f7"; }
|
||||
];
|
||||
|
||||
# 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
|
||||
|
@ -36,6 +72,6 @@
|
|||
# networking.interfaces.end0.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.wlan0.useDHCP = lib.mkDefault true;
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
|
||||
powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue