authorgravatar for nmarks413@gmail.comNatalie Marks <nmarks413@gmail.com> 2024-10-09 09:58:14-07:00
committergravatar for nmarks413@gmail.comNatalie Marks <nmarks413@gmail.com> 2024-10-09 09:58:14-07:00
log628ce100419573424c2cacf133335e7ac21b4034
tree3dd0a7baba36caed2529164f02ec0810da635cdc
parentf926d51b11a7017dd1746607cd1f77ee7bc8bae0
parent591db450c474553869e2c358a7e6aa49ca33c9d8

Merge branch 'main' of github.com:nmarks413/nix-config

2 files changed, 26 insertions(+), 6 deletions(-)

hosts/desktop/configuration.nix+7-1
...@@ -10,6 +10,12 @@...@@ -10,6 +10,12 @@
10}: {10}: {
11 nixpkgs.config.allowUnfree = true;11 nixpkgs.config.allowUnfree = true;
1212
13 services.avahi = {
14 enable = true;
15 nssmdns4 = true;
16 openFirewall = true;
17 };
18
13 programs._1password.enable = true;19 programs._1password.enable = true;
14 programs._1password-gui = {20 programs._1password-gui = {
15 enable = true;21 enable = true;
...@@ -156,7 +162,7 @@...@@ -156,7 +162,7 @@
156 imports = [162 imports = [
157 # Include the results of the hardware scan.163 # Include the results of the hardware scan.
158 ./hardware-configuration.nix164 ./hardware-configuration.nix
159 inputs.foundryvtt.nixosModules.foundryvtt165 # inputs.foundryvtt.nixosModules.foundryvtt
160 ];166 ];
161167
162 # Enable OpenGL168 # Enable OpenGL
hosts/desktop/hardware-configuration.nix+19-5
...@@ -8,10 +8,10 @@...@@ -8,10 +8,10 @@
8 [ (modulesPath + "/installer/scan/not-detected.nix")8 [ (modulesPath + "/installer/scan/not-detected.nix")
9 ];9 ];
1010
11 boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "sd_mod" ];11 boot.initrd.availableKernelModules = [ "nvme" "ahci" "xhci_pci" "usbhid" "sd_mod" ];
12 boot.initrd.kernelModules = [ ];12 boot.initrd.kernelModules = [ ];
13 boot.kernelModules = [ "kvm-amd" "wl" ];13 boot.kernelModules = [ "kvm-amd" ];
14 boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ];14 boot.extraModulePackages = [ ];
1515
16 fileSystems."/" =16 fileSystems."/" =
17 { device = "/dev/disk/by-uuid/5838d50d-e6e8-4ad2-a25e-524f4c46da35";17 { device = "/dev/disk/by-uuid/5838d50d-e6e8-4ad2-a25e-524f4c46da35";
...@@ -21,6 +21,18 @@...@@ -21,6 +21,18 @@
21 fileSystems."/boot" =21 fileSystems."/boot" =
22 { device = "/dev/disk/by-uuid/2319-EE79";22 { device = "/dev/disk/by-uuid/2319-EE79";
23 fsType = "vfat";23 fsType = "vfat";
24 options = [ "fmask=0022" "dmask=0022" ];
25 };
26
27 fileSystems."/home/nmarks/Games/steam" =
28 { device = "/dev/disk/by-uuid/e7ac46ce-edcb-4763-8717-a7c67de5c7f3";
29 fsType = "ext4";
30 };
31
32 fileSystems."/home/nmarks/Games/steam" =
33 { device = "/home/nmarks/Games/steam";
34 fsType = "none";
35 options = [ "bind" ];
24 };36 };
2537
26 swapDevices =38 swapDevices =
...@@ -32,8 +44,10 @@...@@ -32,8 +44,10 @@
32 # still possible to use this option, but it's recommended to use it in conjunction44 # still possible to use this option, but it's recommended to use it in conjunction
33 # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.45 # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
34 networking.useDHCP = lib.mkDefault true;46 networking.useDHCP = lib.mkDefault true;
35 # networking.interfaces.enp34s0.useDHCP = lib.mkDefault true;47 # networking.interfaces.docker0.useDHCP = lib.mkDefault true;
36 # networking.interfaces.wlo1.useDHCP = lib.mkDefault true;48 # networking.interfaces.enp11s0.useDHCP = lib.mkDefault true;
49 # networking.interfaces.tailscale0.useDHCP = lib.mkDefault true;
50 # networking.interfaces.wlp10s0.useDHCP = lib.mkDefault true;
3751
38 nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";52 nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
39 hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;53 hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;