authorgravatar for nmarks413@gmail.comNatalie Marks <nmarks413@gmail.com> 2025-07-22 16:17:26-07:00
committergravatar for nmarks413@gmail.comNatalie Marks <nmarks413@gmail.com> 2025-07-22 16:17:26-07:00
logd7d5390a94dbc250d173bf75c1f38eebed056520
tree9dd65c8a9dadd1111fac62ae0c26a1bb13b841e1
parentd57615d9646af291a9e3af31a84bccef235bc388
signature Commit is signed but in an unrecognized format.

do something with discord

4 files changed, 22 insertions(+), 8 deletions(-)

flake.nix+1
...@@ -50,6 +50,7 @@...@@ -50,6 +50,7 @@
50 inputs.zig.overlays.default50 inputs.zig.overlays.default
51 inputs.rust-overlay.overlays.default51 inputs.rust-overlay.overlays.default
52 inputs.nh.overlays.default52 inputs.nh.overlays.default
53 inputs.moonlight.overlays.default
5354
54 # https://github.com/LnL7/nix-darwin/issues/104155 # https://github.com/LnL7/nix-darwin/issues/1041
55 (_: prev: {56 (_: prev: {
modules/neovim/default.nix+3-3
...@@ -18,11 +18,12 @@...@@ -18,11 +18,12 @@
18 enable = true;18 enable = true;
19 };19 };
2020
21 undoFile.enable = true;
22
21 options = {23 options = {
22 tabstop = 2;24 tabstop = 2;
23 softtabstop = 2;25 softtabstop = 2;
24 shiftwidth = 2;26 shiftwidth = 2;
25 undofile = true;
26 swapfile = false;27 swapfile = false;
27 showmode = false;28 showmode = false;
28 foldlevel = 99;29 foldlevel = 99;
...@@ -53,7 +54,6 @@...@@ -53,7 +54,6 @@
53 lsp = {54 lsp = {
54 # Must be enabled for language modules to hook into the LSP API.55 # Must be enabled for language modules to hook into the LSP API.
55 enable = true;56 enable = true;
56
57 formatOnSave = true;57 formatOnSave = true;
58 # show errors inline58 # show errors inline
59 # https://github.com/folke/trouble.nvim59 # https://github.com/folke/trouble.nvim
...@@ -119,7 +119,7 @@...@@ -119,7 +119,7 @@
119 lua.enable = true;119 lua.enable = true;
120 # sort-lines: off120 # sort-lines: off
121121
122 ts.format.enable = false; # deno fmt is enabled elsewhere122 ts.format.enable = true; # deno fmt is enabled elsewhere
123 nix.format.type = "nixfmt"; # looks so much nicer123 nix.format.type = "nixfmt"; # looks so much nicer
124 };124 };
125 formatter.conform-nvim = {125 formatter.conform-nvim = {
modules/nixos/nvidia.nix+16-5
...@@ -7,7 +7,7 @@ let...@@ -7,7 +7,7 @@ let
7 nvidiaDriverChannel = config.boot.kernelPackages.nvidiaPackages.latest;7 nvidiaDriverChannel = config.boot.kernelPackages.nvidiaPackages.latest;
8in8in
9{9{
10 services.xserver.videoDrivers = [ "nvidia" ];10 services.xserver.videoDrivers = [ "nvidia" "amdgpu"];
1111
12 nixpkgs.config = {12 nixpkgs.config = {
13 nvidia.acceptLicense = true;13 nvidia.acceptLicense = true;
...@@ -42,10 +42,21 @@ in...@@ -42,10 +42,21 @@ in
42 modesetting.enable = true;42 modesetting.enable = true;
4343
44 powerManagement = {44 powerManagement = {
45 enable = false; # Power management45 enable = true; # Power management
46 # finegrained = true; # More precise power consumption control46 finegrained = true; # More precise power consumption control
47 };47 };
4848
49 prime = {
50 offload = {
51 enable = true;
52 enableOffloadCmd = true;
53 };
54
55 nvidiaBusId = "PCI:1:0:0";
56 amdgpuBusId = "PCI:15:0:0";
57
58 };
59
49 # Use the NVidia open source kernel module (not to be confused with the60 # Use the NVidia open source kernel module (not to be confused with the
50 # independent third-party "nouveau" open source driver).61 # independent third-party "nouveau" open source driver).
51 # Currently alpha-quality/buggy, so false is currently the recommended setting.62 # Currently alpha-quality/buggy, so false is currently the recommended setting.
...@@ -59,8 +70,8 @@ in...@@ -59,8 +70,8 @@ in
5970
60 package = nvidiaDriverChannel;71 package = nvidiaDriverChannel;
6172
62 #Fixes a glitch73 # #Fixes a glitch
63 nvidiaPersistenced = true;74 # nvidiaPersistenced = true;
64 };75 };
65 nvidia-container-toolkit.enable = true;76 nvidia-container-toolkit.enable = true;
6677
users/natalie/packages.nix+2
...@@ -15,6 +15,8 @@ with pkgs;...@@ -15,6 +15,8 @@ with pkgs;
15 clang15 clang
16 cmake16 cmake
17 gnupg17 gnupg
18 typescript-language-server
19 deno
1820
19 #ides21 #ides
20 zed-editor22 zed-editor