Whatever changes idk i just wanna pull on my server
This commit is contained in:
parent
5560c87175
commit
1d3c95e680
|
@ -18,7 +18,8 @@
|
|||
overlays = [
|
||||
# Add overlays your own flake exports (from overlays and pkgs dir):
|
||||
outputs.overlays.additions
|
||||
outputs.overlays.modifications
|
||||
outputs.overlays.selfsuper
|
||||
outputs.overlays.finalprev
|
||||
outputs.overlays.unstable-packages
|
||||
inputs.blender-bin.overlays.default
|
||||
];
|
||||
|
|
|
@ -15,7 +15,6 @@
|
|||
# Enable Sway and write some scripts
|
||||
wayland.windowManager.sway = {
|
||||
enable = true;
|
||||
#package = pkgs.unstable.swayfx;
|
||||
wrapperFeatures.gtk = true;
|
||||
checkConfig = false;
|
||||
extraConfig = let
|
||||
|
|
|
@ -10,8 +10,8 @@
|
|||
}: {
|
||||
# You can import other NixOS modules here
|
||||
imports = [
|
||||
./networking.nix
|
||||
./gpg.nix
|
||||
./modules/networking.nix
|
||||
./modules/gpg.nix
|
||||
inputs.nix-minecraft.nixosModules.minecraft-servers
|
||||
];
|
||||
|
||||
|
@ -20,7 +20,8 @@
|
|||
overlays = [
|
||||
# Add overlays your own flake exports (from overlays and pkgs dir):
|
||||
outputs.overlays.additions
|
||||
outputs.overlays.modifications
|
||||
outputs.overlays.selfsuper
|
||||
outputs.overlays.finalprev
|
||||
outputs.overlays.unstable-packages
|
||||
inputs.nix-minecraft.overlay
|
||||
];
|
||||
|
@ -63,18 +64,15 @@
|
|||
|
||||
# Set timezone
|
||||
time.timeZone = let
|
||||
secrets = import ../modules/secrets.nix;
|
||||
secrets = import ./modules/secrets.nix;
|
||||
in secrets.timeZone;
|
||||
|
||||
# Select internationalisation properties.
|
||||
# Select a terminal font
|
||||
console = {
|
||||
earlySetup = true;
|
||||
font = "${pkgs.kbd}/share/consolefonts/Lat2-Terminus16.psfu.gz";
|
||||
packages = with pkgs; [
|
||||
terminus_font
|
||||
kbd
|
||||
];
|
||||
useXkbConfig = true;
|
||||
font = "${pkgs.terminus_font}/share/consolefonts/ter-u22n.psf.gz";
|
||||
packages = with pkgs; [ terminus_font ];
|
||||
keyMap = "us";
|
||||
};
|
||||
|
||||
# Enable git
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
imports = [
|
||||
# Base configs
|
||||
./modules/base.nix
|
||||
./base.nix
|
||||
|
||||
# Import users and groups
|
||||
./users/jimbo.nix
|
||||
|
@ -24,8 +24,9 @@
|
|||
# Hardware
|
||||
./hardware/machines/desktop.nix
|
||||
./hardware/systemdboot.nix
|
||||
./hardware/nvidia.nix
|
||||
./hardware/opengl.nix
|
||||
./hardware/nvidia.nix
|
||||
#./hardware/nouveau.nix
|
||||
|
||||
# Services
|
||||
./services/openssh.nix
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
commonKernelParams = [
|
||||
# Nvidia settings
|
||||
"nvidia_drm.fbdev=1"
|
||||
"nouveau.config=NvGspRm=1"
|
||||
|
||||
# VM/GPU passthrough
|
||||
"amd_iommu=on"
|
||||
|
|
4
nixos/hardware/nouveau.nix
Normal file
4
nixos/hardware/nouveau.nix
Normal file
|
@ -0,0 +1,4 @@
|
|||
{pkgs, ...}: {
|
||||
# Enable video drivers
|
||||
services.xserver.videoDrivers = ["nouveau"];
|
||||
}
|
|
@ -1,17 +1,10 @@
|
|||
{pkgs, config, ... }: {
|
||||
{pkgs, config, ...}: {
|
||||
# Enable video drivers
|
||||
services.xserver.videoDrivers = ["nvidia"];
|
||||
|
||||
hardware.nvidia = {
|
||||
modesetting.enable = true;
|
||||
nvidiaSettings = false;
|
||||
package = config.boot.kernelPackages.nvidiaPackages.beta;
|
||||
open = false;
|
||||
};
|
||||
|
||||
environment.sessionVariables = {
|
||||
CUDA_PATH = "${pkgs.cudatoolkit}";
|
||||
EXTRA_LDFLAGS = "-L/lib -L${pkgs.linuxPackages.nvidia_x11}/lib";
|
||||
EXTRA_CCFLAGS = "-I/usr/include";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,13 +1,11 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
{pkgs, ...}: {
|
||||
# Enable OpenGL
|
||||
hardware.opengl = {
|
||||
enable = true;
|
||||
driSupport = true;
|
||||
driSupport32Bit = true;
|
||||
package = pkgs.unstable.mesa.drivers;
|
||||
package32 = pkgs.unstable.pkgsi686Linux.mesa.drivers;
|
||||
extraPackages = with pkgs; [
|
||||
vulkan-loader
|
||||
vulkan-validation-layers
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
imports = [
|
||||
# Base configs
|
||||
./modules/base.nix
|
||||
./base.nix
|
||||
|
||||
# Import users and groups
|
||||
./users/jimbo.nix
|
||||
|
|
|
@ -6,11 +6,15 @@
|
|||
# This one contains whatever you want to overlay
|
||||
# You can change versions, add patches, set compilation flags, anything really.
|
||||
# https://nixos.wiki/wiki/Overlays
|
||||
modifications = (self: super: {
|
||||
selfsuper = (self: super: {
|
||||
mpv = super.mpv.override {
|
||||
scripts = with self.mpvScripts; [mpris sponsorblock thumbnail];
|
||||
};
|
||||
});
|
||||
|
||||
finalprev = (final: prev: {
|
||||
# Patches go here
|
||||
});
|
||||
|
||||
# Unstable nixpkgs and nur through 'pkgs.unstable' and 'pkgs.nur'
|
||||
unstable-packages = final: _prev: {
|
||||
|
|
Loading…
Reference in a new issue