add nebula

This commit is contained in:
RingOfStorms (Joshua Bell) 2024-05-13 11:57:13 -05:00
parent ccc61e9693
commit 595c8aa59b
3 changed files with 96 additions and 74 deletions

View file

@ -1,22 +1,27 @@
{ config, lib, pkgs, settings, ... } @ args:
{ {
imports = config,
[ lib,
# TODO revisit pkgs,
(settings.hostsDir + "/_common/components/neovim.nix") settings,
# Common components this machine uses ...
(settings.hostsDir + "/_common/components/systemd_boot.nix") }@args:
(settings.hostsDir + "/_common/components/ssh.nix") {
(settings.hostsDir + "/_common/components/caps_to_escape_in_tty.nix") imports = [
(settings.hostsDir + "/_common/components/font_jetbrainsmono.nix") # Common components this machine uses
(settings.hostsDir + "/_common/components/home_manager.nix") (settings.hostsDir + "/_common/components/neovim.nix")
(settings.hostsDir + "/_common/components/gnome_wayland.nix") (settings.hostsDir + "/_common/components/systemd_boot.nix")
# Users this machine has (settings.hostsDir + "/_common/components/ssh.nix")
(settings.usersDir + "/root/configuration.nix") (settings.hostsDir + "/_common/components/caps_to_escape_in_tty.nix")
(settings.usersDir + "/josh/configuration.nix") (settings.hostsDir + "/_common/components/font_jetbrainsmono.nix")
# Our custom stuff (settings.hostsDir + "/_common/components/home_manager.nix")
./stupid-keyboard.nix (settings.hostsDir + "/_common/components/gnome_wayland.nix")
]; (settings.hostsDir + "/_common/components/nebula.nix")
# Users this machine has
(settings.usersDir + "/root/configuration.nix")
(settings.usersDir + "/josh/configuration.nix")
# Our custom stuff
./stupid-keyboard.nix
];
# machine specific configuration # machine specific configuration
# ============================== # ==============================
@ -68,7 +73,12 @@
"mem_sleep_default=s2idel" "mem_sleep_default=s2idel"
]; ];
boot.kernelModules = [ "btusb" ]; boot.kernelModules = [ "btusb" ];
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usbhid" "thunderbolt" ]; boot.initrd.availableKernelModules = [
"nvme"
"xhci_pci"
"usbhid"
"thunderbolt"
];
services.xserver.videoDrivers = [ "intel" ]; services.xserver.videoDrivers = [ "intel" ];
hardware.opengl = { hardware.opengl = {
enable = true; enable = true;
@ -81,9 +91,10 @@
# Stuff from https://github.com/NixOS/nixos-hardware/blob/9a763a7acc4cfbb8603bb0231fec3eda864f81c0/gpd/pocket-3/default.nix # Stuff from https://github.com/NixOS/nixos-hardware/blob/9a763a7acc4cfbb8603bb0231fec3eda864f81c0/gpd/pocket-3/default.nix
services.fstrim.enable = true; services.fstrim.enable = true;
services.xserver.libinput.enable = true; services.xserver.libinput.enable = true;
services.tlp.enable = lib.mkDefault ((lib.versionOlder (lib.versions.majorMinor lib.version) "21.05") services.tlp.enable = lib.mkDefault (
|| !config.services.power-profiles-daemon.enable); (lib.versionOlder (lib.versions.majorMinor lib.version) "21.05")
|| !config.services.power-profiles-daemon.enable
);
# KVM module video # KVM module video

View file

@ -1,22 +1,28 @@
{ config, lib, pkgs, settings, ... } @ args:
{ {
imports = config,
[ lib,
(settings.hostsDir + "/_common/components/neovim.nix") pkgs,
# Common components this machine uses settings,
(settings.hostsDir + "/_common/components/ssh.nix") ...
(settings.hostsDir + "/_common/components/caps_to_escape_in_tty.nix") }@args:
# (settings.hostsDir + "/_common/components/font_jetbrainsmono.nix") {
(settings.hostsDir + "/_common/components/home_manager.nix") imports = [
# (settings.hostsDir + "/_common/components/gnome_xorg.nix") # Common components this machine uses
(settings.hostsDir + "/_common/components/docker.nix") (settings.hostsDir + "/_common/components/neovim.nix")
# Users this machine has (settings.hostsDir + "/_common/components/ssh.nix")
(settings.hostsDir + "/_common/components/caps_to_escape_in_tty.nix")
(settings.hostsDir + "/_common/components/home_manager.nix")
(settings.hostsDir + "/_common/components/docker.nix")
(settings.hostsDir + "/_common/components/nebula.nix")
# Users this machine has
(settings.usersDir + "/root/configuration.nix")
(settings.usersDir + "/luser/configuration.nix")
];
(settings.usersDir + "/root/configuration.nix") boot.loader.grub = {
(settings.usersDir + "/luser/configuration.nix") enable = true;
]; device = "/dev/sdb";
};
boot.loader.grub = { enable = true; device = "/dev/sdb" ; };
# machine specific configuration # machine specific configuration
# ============================== # ==============================
@ -46,33 +52,33 @@ boot.loader.grub = { enable = true; device = "/dev/sdb" ; };
# Load nvidia driver for Xorg and Wayland # Load nvidia driver for Xorg and Wayland
#services.xserver.videoDrivers = [ "nvidia" ]; #services.xserver.videoDrivers = [ "nvidia" ];
#hardware.nvidia = { #hardware.nvidia = {
# Modesetting is required. # Modesetting is required.
# modesetting.enable = true; # modesetting.enable = true;
# Nvidia power management. Experimental, and can cause sleep/suspend to fail. # Nvidia power management. Experimental, and can cause sleep/suspend to fail.
# Enable this if you have graphical corruption issues or application crashes after waking # Enable this if you have graphical corruption issues or application crashes after waking
# up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead # up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead
# of just the bare essentials. # of just the bare essentials.
# powerManagement.enable = false; # powerManagement.enable = false;
# Fine-grained power management. Turns off GPU when not in use. # Fine-grained power management. Turns off GPU when not in use.
# Experimental and only works on modern Nvidia GPUs (Turing or newer). # Experimental and only works on modern Nvidia GPUs (Turing or newer).
# powerManagement.finegrained = false; # powerManagement.finegrained = false;
# Use the NVidia open source kernel module (not to be confused with the # Use the NVidia open source kernel module (not to be confused with the
# independent third-party "nouveau" open source driver). # independent third-party "nouveau" open source driver).
# Support is limited to the Turing and later architectures. Full list of # Support is limited to the Turing and later architectures. Full list of
# supported GPUs is at: # supported GPUs is at:
# https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus
# Only available from driver 515.43.04+ # Only available from driver 515.43.04+
# Currently alpha-quality/buggy, so false is currently the recommended setting. # Currently alpha-quality/buggy, so false is currently the recommended setting.
# open = false; # open = false;
# Enable the Nvidia settings menu, # Enable the Nvidia settings menu,
# accessible via `nvidia-settings`. # accessible via `nvidia-settings`.
# nvidiaSettings = true; # nvidiaSettings = true;
# Optionally, you may need to select the appropriate driver version for your specific GPU. # Optionally, you may need to select the appropriate driver version for your specific GPU.
# package = config.boot.kernelPackages.nvidiaPackages.stable; # package = config.boot.kernelPackages.nvidiaPackages.stable;
# }; # };
} }

View file

@ -1,21 +1,26 @@
{ config, lib, pkgs, settings, ... } @ args:
{ {
imports = config,
[ lib,
(settings.hostsDir + "/_common/components/neovim.nix") pkgs,
# Common components this machine uses settings,
(settings.hostsDir + "/_common/components/systemd_boot.nix") ...
(settings.hostsDir + "/_common/components/ssh.nix") }@args:
(settings.hostsDir + "/_common/components/caps_to_escape_in_tty.nix") {
(settings.hostsDir + "/_common/components/font_jetbrainsmono.nix") imports = [
(settings.hostsDir + "/_common/components/home_manager.nix") # Common components this machine uses
(settings.hostsDir + "/_common/components/gnome_xorg.nix") (settings.hostsDir + "/_common/components/neovim.nix")
(settings.hostsDir + "/_common/components/docker.nix") (settings.hostsDir + "/_common/components/systemd_boot.nix")
(settings.hostsDir + "/_common/components/nebula.nix") (settings.hostsDir + "/_common/components/ssh.nix")
# Users this machine has (settings.hostsDir + "/_common/components/caps_to_escape_in_tty.nix")
(settings.usersDir + "/root/configuration.nix") (settings.hostsDir + "/_common/components/font_jetbrainsmono.nix")
(settings.usersDir + "/josh/configuration.nix") (settings.hostsDir + "/_common/components/home_manager.nix")
]; (settings.hostsDir + "/_common/components/gnome_xorg.nix")
(settings.hostsDir + "/_common/components/docker.nix")
(settings.hostsDir + "/_common/components/nebula.nix")
# Users this machine has
(settings.usersDir + "/root/configuration.nix")
(settings.usersDir + "/josh/configuration.nix")
];
# machine specific configuration # machine specific configuration
# ============================== # ==============================