Commit b103004218ddf9c510ccd29e6244c890545b9006 | config

author	Natalie Marks <nmarks413@gmail.com> 2025-04-21 16:49:27-07:00
committer	Natalie Marks <nmarks413@gmail.com> 2025-04-21 16:49:27-07:00
log	b103004218ddf9c510ccd29e6244c890545b9006
tree	50eea426ee5ac5ae9c109309e4f17a14ffabf547
parent	318316c05bd2f070497bd6d6064686050dc3fe10
signature	Commit is signed but in an unrecognized format.

fix nixos config

8 files changed, 45 insertions(+), 27 deletions(-)

hosts
- desktop
  - configuration.nix
  - home.nix
- laptop
  - configuration.nix
modules
- nixos
- nixvim
  - plugins
    lz-n.nix
- shared
  - packages.nix

hosts/desktop/configuration.nix+5-4

...	...	@@ -1,6 +1,7 @@
1	1	{
2	2	pkgs,
3	3	userSettings,
	4	systemSettings,
4	5	...
5	6	}: {
6	7	imports = [
...	...	@@ -30,9 +31,9 @@
30	31
31	32	nh = {
32	33	enable = true;
33		clean.enable = true;
34		clean.extraArgs = "--keep-since 4d --keep 3";
35		flake = "/home/nmarks/.dotfiles";
	34	# clean.enable = true;
	35	# clean.extraArgs = "--keep-since 4d --keep 3";
	36	flake = "/home/nmarks/.dotfiles#nixosConfigurations.nixos";
36	37	};
37	38
38	39	neovim = {
...	...	@@ -156,7 +157,7 @@
156	157	};
157	158
158	159	networking = {
159		hostName = userSettings.hostname; # Define your hostname.
	160	hostName = systemSettings.host; # Define your hostname.
160	161	# wireless.enable = true; # Enables wireless support via wpa_supplicant.
161	162	networkmanager.enable = true;
162	163	firewall = {

hosts/desktop/home.nix+11-4

...	...	@@ -3,16 +3,22 @@
3	3	config,
4	4	pkgs,
5	5	lib,
6		zls,
	6	userSettings,
	7	systemSettings,
7	8	...
8	9	}: let
9		shared-programs = import ../../modules/shared/homeManagerPrograms.nix {inherit inputs config pkgs lib;};
	10	shared-programs = import ../../modules/shared/homeManagerPrograms.nix {inherit inputs config pkgs lib userSettings systemSettings;};
10	11	in {
	12	imports = [
	13	inputs.nixvim.homeManagerModules.nixvim
	14	#set up nixvim
	15	../../modules/nixvim
	16	];
11	17	home = {
12	18	stateVersion = "23.05"; # Please read the comment before changing.
13	19
14	20	packages = with pkgs; let
15		shared-packages = import ../../modules/shared/packages.nix {inherit pkgs;};
	21	shared-packages = import ../../modules/shared/packages.nix {inherit pkgs systemSettings;};
16	22	in
17	23	shared-packages
18	24	++ [
...	...	@@ -51,9 +57,10 @@ in {
51	57	calibre
52	58	mpv
53	59	wireguard-tools
	60	signal-desktop
54	61	]
55	62	++ [
56		zls.packages.x86_64-linux.zls
	63	inputs.zls.packages.x86_64-linux.zls
57	64	rust-bin.stable.latest.default
58	65	];
59	66	# programs.mangohud.enable = true;

hosts/laptop/configuration.nix+1

...	...	@@ -6,6 +6,7 @@
6	6	environment.systemPackages = with pkgs; [
7	7	neovim
8	8	pinentry_mac
	9	signal-desktop-bin
9	10	];
10	11
11	12	# Create /etc/zshrc that loads the nix-darwin environment.

modules/nixos/boot.nix+1-1

...	...	@@ -10,7 +10,7 @@
10	10	grub = {
11	11	enable = true;
12	12	device = "nodev";
13		theme = pkgs.catppuccin-grub;
	13	# theme = pkgs.catppuccin-grub;
14	14	useOSProber = true;
15	15	efiSupport = true;
16	16	};

modules/nixos/nvidia.nix+14-14

...	...	@@ -19,6 +19,19 @@ in {
19	19
20	20	# Blacklist nouveau to avoid conflicts
21	21	boot.blacklistedKernelModules = ["nouveau"];
	22	environment.variables = {
	23	LIBVA_DRIVER_NAME = "nvidia"; # Hardware video acceleration
	24	XDG_SESSION_TYPE = "wayland"; # Force Wayland
	25	GBM_BACKEND = "nvidia-drm"; # Graphics backend for Wayland
	26	__GLX_VENDOR_LIBRARY_NAME = "nvidia"; # Use Nvidia driver for GLX
	27	WLR_NO_HARDWARE_CURSORS = "1"; # Fix for cursors on Wayland
	28	NIXOS_OZONE_WL = "1"; # Wayland support for Electron apps
	29	__GL_GSYNC_ALLOWED = "1"; # Enable G-Sync if available
	30	__GL_VRR_ALLOWED = "1"; # Enable VRR (Variable Refresh Rate)
	31	WLR_DRM_NO_ATOMIC = "1"; # Fix for some issues with Hyprland
	32	NVD_BACKEND = "direct"; # Configuration for new driver
	33	MOZ_ENABLE_WAYLAND = "1"; # Wayland support for Firefox
	34	};
22	35
23	36	hardware = {
24	37	nvidia = {
...	...	@@ -28,7 +41,7 @@ in {
28	41
29	42	powerManagement = {
30	43	enable = true; # Power management
31		finegrained = true; # More precise power consumption control
	44	# finegrained = true; # More precise power consumption control
32	45	};
33	46
34	47	# Use the NVidia open source kernel module (not to be confused with the
...	...	@@ -37,19 +50,6 @@ in {
37	50	open = false;
38	51
39	52	# Environment variables for better compatibility
40		environment.variables = {
41		LIBVA_DRIVER_NAME = "nvidia"; # Hardware video acceleration
42		XDG_SESSION_TYPE = "wayland"; # Force Wayland
43		GBM_BACKEND = "nvidia-drm"; # Graphics backend for Wayland
44		__GLX_VENDOR_LIBRARY_NAME = "nvidia"; # Use Nvidia driver for GLX
45		WLR_NO_HARDWARE_CURSORS = "1"; # Fix for cursors on Wayland
46		NIXOS_OZONE_WL = "1"; # Wayland support for Electron apps
47		__GL_GSYNC_ALLOWED = "1"; # Enable G-Sync if available
48		__GL_VRR_ALLOWED = "1"; # Enable VRR (Variable Refresh Rate)
49		WLR_DRM_NO_ATOMIC = "1"; # Fix for some issues with Hyprland
50		NVD_BACKEND = "direct"; # Configuration for new driver
51		MOZ_ENABLE_WAYLAND = "1"; # Wayland support for Firefox
52		};
53	53
54	54	# Enable the Nvidia settings menu,
55	55	# accessible via `nvidia-settings`.

modules/nixos/services.nix+1-2

...	...	@@ -25,10 +25,9 @@
25	25	displayManager.cosmic-greeter.enable = true;
26	26
27	27	# Auto mount devices
28		udiskie = {
	28	udisks2 = {
29	29	enable = true;
30	30	};
31
32	31	# Configure keymap in X11
33	32	xserver = {
34	33	xkb.layout = "us";

modules/nixvim/plugins/lz-n.nix created+7

...	...	@@ -0,0 +1,7 @@
	1	{pkgs, ...}: {
	2	programs.nixvim.programs = {
	3	lz-n = {
	4	enable = true;
	5	};
	6	};
	7	}

modules/shared/packages.nix+5-2

...	...	@@ -1,4 +1,8 @@
1		{pkgs, ...}:
	1	{
	2	pkgs,
	3	systemSettings,
	4	...
	5	}:
2	6	with pkgs; [
3	7	#general development
4	8	just
...	...	@@ -59,7 +63,6 @@ with pkgs; [
59	63	withMoonlight = true;
60	64	})
61	65	vesktop
62		signal-desktop-bin
63	66
64	67	#media
65	68	spotify