authorgravatar for nmarks413@gmail.comNatalie Marks <nmarks413@gmail.com> 2025-04-21 16:49:27-07:00
committergravatar for nmarks413@gmail.comNatalie Marks <nmarks413@gmail.com> 2025-04-21 16:49:27-07:00
logb103004218ddf9c510ccd29e6244c890545b9006
tree50eea426ee5ac5ae9c109309e4f17a14ffabf547
parent318316c05bd2f070497bd6d6064686050dc3fe10
signature Commit is signed but in an unrecognized format.

fix nixos config

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

hosts/desktop/configuration.nix+5-4
...@@ -1,6 +1,7 @@...@@ -1,6 +1,7 @@
1{1{
2 pkgs,2 pkgs,
3 userSettings,3 userSettings,
4 systemSettings,
4 ...5 ...
5}: {6}: {
6 imports = [7 imports = [
...@@ -30,9 +31,9 @@...@@ -30,9 +31,9 @@
3031
31 nh = {32 nh = {
32 enable = true;33 enable = true;
33 clean.enable = true;34 # clean.enable = true;
34 clean.extraArgs = "--keep-since 4d --keep 3";35 # clean.extraArgs = "--keep-since 4d --keep 3";
35 flake = "/home/nmarks/.dotfiles";36 flake = "/home/nmarks/.dotfiles#nixosConfigurations.nixos";
36 };37 };
3738
38 neovim = {39 neovim = {
...@@ -156,7 +157,7 @@...@@ -156,7 +157,7 @@
156 };157 };
157158
158 networking = {159 networking = {
159 hostName = userSettings.hostname; # Define your hostname.160 hostName = systemSettings.host; # Define your hostname.
160 # wireless.enable = true; # Enables wireless support via wpa_supplicant.161 # wireless.enable = true; # Enables wireless support via wpa_supplicant.
161 networkmanager.enable = true;162 networkmanager.enable = true;
162 firewall = {163 firewall = {
hosts/desktop/home.nix+11-4
...@@ -3,16 +3,22 @@...@@ -3,16 +3,22 @@
3 config,3 config,
4 pkgs,4 pkgs,
5 lib,5 lib,
6 zls,6 userSettings,
7 systemSettings,
7 ...8 ...
8}: let9}: 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;};
10in {11in {
12 imports = [
13 inputs.nixvim.homeManagerModules.nixvim
14 #set up nixvim
15 ../../modules/nixvim
16 ];
11 home = {17 home = {
12 stateVersion = "23.05"; # Please read the comment before changing.18 stateVersion = "23.05"; # Please read the comment before changing.
1319
14 packages = with pkgs; let20 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 in22 in
17 shared-packages23 shared-packages
18 ++ [24 ++ [
...@@ -51,9 +57,10 @@ in {...@@ -51,9 +57,10 @@ in {
51 calibre57 calibre
52 mpv58 mpv
53 wireguard-tools59 wireguard-tools
60 signal-desktop
54 ]61 ]
55 ++ [62 ++ [
56 zls.packages.x86_64-linux.zls63 inputs.zls.packages.x86_64-linux.zls
57 rust-bin.stable.latest.default64 rust-bin.stable.latest.default
58 ];65 ];
59 # programs.mangohud.enable = true;66 # programs.mangohud.enable = true;
hosts/laptop/configuration.nix+1
...@@ -6,6 +6,7 @@...@@ -6,6 +6,7 @@
6 environment.systemPackages = with pkgs; [6 environment.systemPackages = with pkgs; [
7 neovim7 neovim
8 pinentry_mac8 pinentry_mac
9 signal-desktop-bin
9 ];10 ];
1011
11 # Create /etc/zshrc that loads the nix-darwin environment.12 # Create /etc/zshrc that loads the nix-darwin environment.
modules/nixos/boot.nix+1-1
...@@ -10,7 +10,7 @@...@@ -10,7 +10,7 @@
10 grub = {10 grub = {
11 enable = true;11 enable = true;
12 device = "nodev";12 device = "nodev";
13 theme = pkgs.catppuccin-grub;13 # theme = pkgs.catppuccin-grub;
14 useOSProber = true;14 useOSProber = true;
15 efiSupport = true;15 efiSupport = true;
16 };16 };
modules/nixos/nvidia.nix+14-14
...@@ -19,6 +19,19 @@ in {...@@ -19,6 +19,19 @@ in {
1919
20 # Blacklist nouveau to avoid conflicts20 # Blacklist nouveau to avoid conflicts
21 boot.blacklistedKernelModules = ["nouveau"];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 };
2235
23 hardware = {36 hardware = {
24 nvidia = {37 nvidia = {
...@@ -28,7 +41,7 @@ in {...@@ -28,7 +41,7 @@ in {
2841
29 powerManagement = {42 powerManagement = {
30 enable = true; # Power management43 enable = true; # Power management
31 finegrained = true; # More precise power consumption control44 # finegrained = true; # More precise power consumption control
32 };45 };
3346
34 # Use the NVidia open source kernel module (not to be confused with the47 # Use the NVidia open source kernel module (not to be confused with the
...@@ -37,19 +50,6 @@ in {...@@ -37,19 +50,6 @@ in {
37 open = false;50 open = false;
3851
39 # Environment variables for better compatibility52 # 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 };
5353
54 # Enable the Nvidia settings menu,54 # Enable the Nvidia settings menu,
55 # accessible via `nvidia-settings`.55 # accessible via `nvidia-settings`.
modules/nixos/services.nix+1-2
...@@ -25,10 +25,9 @@...@@ -25,10 +25,9 @@
25 displayManager.cosmic-greeter.enable = true;25 displayManager.cosmic-greeter.enable = true;
2626
27 # Auto mount devices27 # Auto mount devices
28 udiskie = {28 udisks2 = {
29 enable = true;29 enable = true;
30 };30 };
31
32 # Configure keymap in X1131 # Configure keymap in X11
33 xserver = {32 xserver = {
34 xkb.layout = "us";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,4 +1,8 @@
1{pkgs, ...}:1{
2 pkgs,
3 systemSettings,
4 ...
5}:
2with pkgs; [6with pkgs; [
3 #general development7 #general development
4 just8 just
...@@ -59,7 +63,6 @@ with pkgs; [...@@ -59,7 +63,6 @@ with pkgs; [
59 withMoonlight = true;63 withMoonlight = true;
60 })64 })
61 vesktop65 vesktop
62 signal-desktop-bin
6366
64 #media67 #media
65 spotify68 spotify