diff --git a/config/home/packages.nix b/config/home/packages.nix index 83a34bf..abf9319 100644 --- a/config/home/packages.nix +++ b/config/home/packages.nix @@ -8,7 +8,7 @@ in { home.packages = with pkgs; [ pkgs."${browser}" discord libvirt swww grim slurp gnome.file-roller swaynotificationcenter rofi-wayland imv transmission-gtk mpv - gimp obs-studio rustup audacity pavucontrol tree + gimp obs-studio rustup audacity pavucontrol tree zeroad protonup-qt font-awesome spotify swayidle neovide element-desktop swaylock (nerdfonts.override { fonts = [ "JetBrainsMono" ]; }) # Import Scripts diff --git a/config/system/packages.nix b/config/system/packages.nix index 52f2698..07d4c3d 100644 --- a/config/system/packages.nix +++ b/config/system/packages.nix @@ -12,7 +12,7 @@ pkg-config meson hugo gnumake ninja go nodejs symbola noto-fonts-color-emoji material-icons brightnessctl toybox virt-viewer swappy ripgrep appimage-run - networkmanagerapplet yad playerctl nh + networkmanagerapplet yad playerctl nh nvtop ]; programs = { diff --git a/hardware.nix b/hardware.nix index 35af8f8..cc09fef 100644 --- a/hardware.nix +++ b/hardware.nix @@ -8,20 +8,27 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/b6d7783f-dd7c-493f-af02-923ca3394157"; + { device = "/dev/disk/by-uuid/8f47c564-523f-4eca-9644-69d2bed92f0a"; fsType = "ext4"; }; - boot.initrd.luks.devices."luks-0e0fc3ab-a29c-4a80-997a-9803ab509da7".device = "/dev/disk/by-uuid/0e0fc3ab-a29c-4a80-997a-9803ab509da7"; + boot.initrd.luks.devices."luks-4f3ec042-9a98-4e10-84b3-3e081b030d6e".device = "/dev/disk/by-uuid/4f3ec042-9a98-4e10-84b3-3e081b030d6e"; + + fileSystems."/home" = + { device = "/dev/disk/by-uuid/cb501f9a-6814-477f-b8d5-1a8aaba243a9"; + fsType = "ext4"; + }; + + boot.initrd.luks.devices."luks-9b120c21-77b6-4291-bee0-185c5a1e3682".device = "/dev/disk/by-uuid/9b120c21-77b6-4291-bee0-185c5a1e3682"; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/76A0-C7B3"; + { device = "/dev/disk/by-uuid/3B15-2EB6"; fsType = "vfat"; }; @@ -32,7 +39,8 @@ # still possible to use this option, but it's recommended to use it in conjunction # with explicit per-interface declarations with `networking.interfaces..useDHCP`. networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp7s0.useDHCP = lib.mkDefault true; + # networking.interfaces.enp61s0.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp62s0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; diff --git a/options.nix b/options.nix index d9a96ee..0637ce8 100644 --- a/options.nix +++ b/options.nix @@ -5,14 +5,14 @@ let # THINGS YOU NEED TO CHANGE username = "zaney"; - hostname = "hyprnix"; + hostname = "hyprbook"; userHome = "/home/${username}"; flakeDir = "${userHome}/zaneyos"; waybarStyle = "simplebar"; # simplebar, slickbar, or default in { # User Variables username = "zaney"; - hostname = "hyprnix"; + hostname = "hyprbook"; gitUsername = "Tyler Kelley"; gitEmail = "tylerzanekelley@gmail.com"; theme = "atelier-cave"; @@ -44,13 +44,13 @@ in { # For Hybrid Systems intel-nvidia # Should Be Used As gpuType cpuType = "intel"; - gpuType = "amd"; + gpuType = "intel-nvidia"; # Nvidia Hybrid Devices # ONLY NEEDED FOR HYBRID # SYSTEMS! - intel-bus-id = "PCI:0:2:0"; - nvidia-bus-id = "PCI:14:0:0"; + intel-bus-id = "PCI:1:0:0"; + nvidia-bus-id = "PCI:0:2:0"; # Enable / Setup NFS nfs = false;