From a1774489978e852ac72d44a047185c7f500ae2bc Mon Sep 17 00:00:00 2001 From: Nathan Anderson Date: Fri, 8 Nov 2024 13:30:45 -0700 Subject: [PATCH] Added new drive UUIDs, added ozone_wl to enable wayland support for electron apps, and removed davinci --- nate/modules/home-manager/home.nix | 17 +++++++++-------- nate/nixos/hardware-configuration.nix | 6 +++--- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/nate/modules/home-manager/home.nix b/nate/modules/home-manager/home.nix index 5d09c0e..5a0d85b 100644 --- a/nate/modules/home-manager/home.nix +++ b/nate/modules/home-manager/home.nix @@ -4,12 +4,12 @@ fullName = "Nathan Anderson"; email = "n8r@tuta.io"; unstable = import inputs.nixpkgs-unstable { system = "x86_64-linux"; config.allowUnfree = true; }; - oldstable = import inputs.nixpkgs-23 { system = "x86_64-linux"; config.allowUnfree = true; }; - davinciDesktop = pkgs.makeDesktopItem { - name = "davinci-resolve-studio"; - desktopName = "Davinci Resolve Studio"; - exec = "${oldstable.davinci-resolve-studio}"; - }; + # oldstable = import inputs.nixpkgs-23 { system = "x86_64-linux"; config.allowUnfree = true; }; + # davinciDesktop = pkgs.makeDesktopItem { + # name = "davinci-resolve-studio"; + # desktopName = "Davinci Resolve Studio"; + # exec = "${oldstable.davinci-resolve-studio}"; + # }; # overlay-unstable = final: prev: { # unstable = inputs.nixpkgs-unstable.legacyPackages.x86_64-linux; # }; @@ -113,8 +113,8 @@ # # Photo / Video # - oldstable.davinci-resolve-studio - davinciDesktop + # oldstable.davinci-resolve-studio + # davinciDesktop imv mpv gimp @@ -177,6 +177,7 @@ BAT_THEME="Catppuccin Macchiato"; EDITOR = "hx"; XDG_CURRENT_DESKTOP="sway"; + NIXOS_OZONE_WL = "1"; }; # Git setup diff --git a/nate/nixos/hardware-configuration.nix b/nate/nixos/hardware-configuration.nix index 7be46d5..04ef11e 100644 --- a/nate/nixos/hardware-configuration.nix +++ b/nate/nixos/hardware-configuration.nix @@ -8,18 +8,18 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "uas" "usb_storage" "sd_mod" ]; + boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "uas" "usb_storage" "sd_mod" ]; boot.initrd.kernelModules = [ "amdgpu" ]; boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/e48c53a4-6e7d-4b12-a46e-a408956268ea"; + { device = "/dev/disk/by-uuid/ab6f54b1-f9ba-482a-b1b4-ac3ebdbfe751"; fsType = "ext4"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/82B2-9D40"; + { device = "/dev/disk/by-uuid/69D1-3DFE"; fsType = "vfat"; };