From d7d5390a94dbc250d173bf75c1f38eebed056520 Mon Sep 17 00:00:00 2001 From: Natalie Marks Date: Tue, 22 Jul 2025 16:17:26 -0700 Subject: [PATCH] do something with discord --- flake.nix | 1 + modules/neovim/default.nix | 6 +++--- modules/nixos/nvidia.nix | 21 ++++++++++++++++----- users/natalie/packages.nix | 2 ++ 4 files changed, 22 insertions(+), 8 deletions(-) diff --git a/flake.nix b/flake.nix index 3c0f470..7088f99 100644 --- a/flake.nix +++ b/flake.nix @@ -50,6 +50,7 @@ inputs.zig.overlays.default inputs.rust-overlay.overlays.default inputs.nh.overlays.default + inputs.moonlight.overlays.default # https://github.com/LnL7/nix-darwin/issues/1041 (_: prev: { diff --git a/modules/neovim/default.nix b/modules/neovim/default.nix index ec3abab..9357898 100644 --- a/modules/neovim/default.nix +++ b/modules/neovim/default.nix @@ -18,11 +18,12 @@ enable = true; }; + undoFile.enable = true; + options = { tabstop = 2; softtabstop = 2; shiftwidth = 2; - undofile = true; swapfile = false; showmode = false; foldlevel = 99; @@ -53,7 +54,6 @@ lsp = { # Must be enabled for language modules to hook into the LSP API. enable = true; - formatOnSave = true; # show errors inline # https://github.com/folke/trouble.nvim @@ -119,7 +119,7 @@ lua.enable = true; # sort-lines: off - ts.format.enable = false; # deno fmt is enabled elsewhere + ts.format.enable = true; # deno fmt is enabled elsewhere nix.format.type = "nixfmt"; # looks so much nicer }; formatter.conform-nvim = { diff --git a/modules/nixos/nvidia.nix b/modules/nixos/nvidia.nix index 3776fb5..fb64da3 100644 --- a/modules/nixos/nvidia.nix +++ b/modules/nixos/nvidia.nix @@ -7,7 +7,7 @@ let nvidiaDriverChannel = config.boot.kernelPackages.nvidiaPackages.latest; in { - services.xserver.videoDrivers = [ "nvidia" ]; + services.xserver.videoDrivers = [ "nvidia" "amdgpu"]; nixpkgs.config = { nvidia.acceptLicense = true; @@ -42,10 +42,21 @@ in modesetting.enable = true; powerManagement = { - enable = false; # Power management - # finegrained = true; # More precise power consumption control + enable = true; # Power management + finegrained = true; # More precise power consumption control }; + prime = { + offload = { + enable = true; + enableOffloadCmd = true; + }; + + nvidiaBusId = "PCI:1:0:0"; + amdgpuBusId = "PCI:15:0:0"; + + }; + # Use the NVidia open source kernel module (not to be confused with the # independent third-party "nouveau" open source driver). # Currently alpha-quality/buggy, so false is currently the recommended setting. @@ -59,8 +70,8 @@ in package = nvidiaDriverChannel; - #Fixes a glitch - nvidiaPersistenced = true; + # #Fixes a glitch + # nvidiaPersistenced = true; }; nvidia-container-toolkit.enable = true; diff --git a/users/natalie/packages.nix b/users/natalie/packages.nix index 7fd7eeb..f96623c 100644 --- a/users/natalie/packages.nix +++ b/users/natalie/packages.nix @@ -15,6 +15,8 @@ with pkgs; clang cmake gnupg + typescript-language-server + deno #ides zed-editor