Jimbo/NixOS-Config
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Whatever changes idk i just wanna pull on my server

Browse source
This commit is contained in:
Jimbo 2024-08-29 14:15:26 -04:00
parent 5560c87175
commit 1d3c95e680
10 changed files with 29 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
home-manager/home.nix
View file

@ -18,7 +18,8 @@
overlays = [ overlays = [
# Add overlays your own flake exports (from overlays and pkgs dir): # Add overlays your own flake exports (from overlays and pkgs dir):
outputs.overlays.additions outputs.overlays.additions
outputs.overlays.modifications outputs.overlays.selfsuper
outputs.overlays.finalprev
outputs.overlays.unstable-packages outputs.overlays.unstable-packages
inputs.blender-bin.overlays.default inputs.blender-bin.overlays.default
]; ];

1
home-manager/sway/sway.nix
View file

@ -15,7 +15,6 @@
# Enable Sway and write some scripts # Enable Sway and write some scripts
wayland.windowManager.sway = { wayland.windowManager.sway = {
enable = true; enable = true;
#package = pkgs.unstable.swayfx;
wrapperFeatures.gtk = true; wrapperFeatures.gtk = true;
checkConfig = false; checkConfig = false;
extraConfig = let extraConfig = let

20
nixos/modules/base.nix → nixos/base.nix
View file

@ -10,8 +10,8 @@
}: { }: {
# You can import other NixOS modules here # You can import other NixOS modules here
imports = [ imports = [
./networking.nix ./modules/networking.nix
./gpg.nix ./modules/gpg.nix
inputs.nix-minecraft.nixosModules.minecraft-servers inputs.nix-minecraft.nixosModules.minecraft-servers
]; ];
@ -20,7 +20,8 @@
overlays = [ overlays = [
# Add overlays your own flake exports (from overlays and pkgs dir): # Add overlays your own flake exports (from overlays and pkgs dir):
outputs.overlays.additions outputs.overlays.additions
outputs.overlays.modifications outputs.overlays.selfsuper
outputs.overlays.finalprev
outputs.overlays.unstable-packages outputs.overlays.unstable-packages
inputs.nix-minecraft.overlay inputs.nix-minecraft.overlay
]; ];
@ -63,18 +64,15 @@
# Set timezone # Set timezone
time.timeZone = let time.timeZone = let
secrets = import ../modules/secrets.nix; secrets = import ./modules/secrets.nix;
in secrets.timeZone; in secrets.timeZone;
# Select internationalisation properties. # Select a terminal font
console = { console = {
earlySetup = true; earlySetup = true;
font = "${pkgs.kbd}/share/consolefonts/Lat2-Terminus16.psfu.gz"; font = "${pkgs.terminus_font}/share/consolefonts/ter-u22n.psf.gz";
packages = with pkgs; [ packages = with pkgs; [ terminus_font ];
terminus_font keyMap = "us";
kbd
];
useXkbConfig = true;
}; };
# Enable git # Enable git

5
nixos/desktop.nix
View file

@ -1,7 +1,7 @@
{ {
imports = [ imports = [
# Base configs # Base configs
./modules/base.nix ./base.nix
# Import users and groups # Import users and groups
./users/jimbo.nix ./users/jimbo.nix
@ -24,8 +24,9 @@
# Hardware # Hardware
./hardware/machines/desktop.nix ./hardware/machines/desktop.nix
./hardware/systemdboot.nix ./hardware/systemdboot.nix
./hardware/nvidia.nix
./hardware/opengl.nix ./hardware/opengl.nix
./hardware/nvidia.nix
#./hardware/nouveau.nix
# Services # Services
./services/openssh.nix ./services/openssh.nix

1
nixos/hardware/machines/desktop.nix
View file

@ -4,6 +4,7 @@
commonKernelParams = [ commonKernelParams = [
# Nvidia settings # Nvidia settings
"nvidia_drm.fbdev=1" "nvidia_drm.fbdev=1"
"nouveau.config=NvGspRm=1"
# VM/GPU passthrough # VM/GPU passthrough
"amd_iommu=on" "amd_iommu=on"

4
nixos/hardware/nouveau.nix Normal file
View file

@ -0,0 +1,4 @@
{pkgs, ...}: {
# Enable video drivers
services.xserver.videoDrivers = ["nouveau"];
}

9
nixos/hardware/nvidia.nix
View file

@ -1,17 +1,10 @@
{pkgs, config, ... }: { {pkgs, config, ...}: {
# Enable video drivers # Enable video drivers
services.xserver.videoDrivers = ["nvidia"]; services.xserver.videoDrivers = ["nvidia"];
hardware.nvidia = { hardware.nvidia = {
modesetting.enable = true; modesetting.enable = true;
nvidiaSettings = false; nvidiaSettings = false;
package = config.boot.kernelPackages.nvidiaPackages.beta; package = config.boot.kernelPackages.nvidiaPackages.beta;
open = false; open = false;
}; };
environment.sessionVariables = {
CUDA_PATH = "${pkgs.cudatoolkit}";
EXTRA_LDFLAGS = "-L/lib -L${pkgs.linuxPackages.nvidia_x11}/lib";
EXTRA_CCFLAGS = "-I/usr/include";
};
} }

8
nixos/hardware/opengl.nix
View file

@ -1,13 +1,11 @@
{ {pkgs, ...}: {
config,
pkgs,
...
}: {
# Enable OpenGL # Enable OpenGL
hardware.opengl = { hardware.opengl = {
enable = true; enable = true;
driSupport = true; driSupport = true;
driSupport32Bit = true; driSupport32Bit = true;
package = pkgs.unstable.mesa.drivers;
package32 = pkgs.unstable.pkgsi686Linux.mesa.drivers;
extraPackages = with pkgs; [ extraPackages = with pkgs; [
vulkan-loader vulkan-loader
vulkan-validation-layers vulkan-validation-layers

2
nixos/server.nix
View file

@ -1,7 +1,7 @@
{ {
imports = [ imports = [
# Base configs # Base configs
./modules/base.nix ./base.nix
# Import users and groups # Import users and groups
./users/jimbo.nix ./users/jimbo.nix

6
overlays/default.nix
View file

@ -6,12 +6,16 @@
# This one contains whatever you want to overlay # This one contains whatever you want to overlay
# You can change versions, add patches, set compilation flags, anything really. # You can change versions, add patches, set compilation flags, anything really.
# https://nixos.wiki/wiki/Overlays # https://nixos.wiki/wiki/Overlays
modifications = (self: super: { selfsuper = (self: super: {
mpv = super.mpv.override { mpv = super.mpv.override {
scripts = with self.mpvScripts; [mpris sponsorblock thumbnail]; scripts = with self.mpvScripts; [mpris sponsorblock thumbnail];
}; };
}); });
finalprev = (final: prev: {
# Patches go here
});
# Unstable nixpkgs and nur through 'pkgs.unstable' and 'pkgs.nur' # Unstable nixpkgs and nur through 'pkgs.unstable' and 'pkgs.nur'
unstable-packages = final: _prev: { unstable-packages = final: _prev: {
unstable = import inputs.nixpkgs-unstable { unstable = import inputs.nixpkgs-unstable {