diff --git a/homes/x86_64-linux/christopher@cobalt/config/dev.nix b/homes/x86_64-linux/christopher@cobalt/config/dev.nix index 040499e..482d6ba 100644 --- a/homes/x86_64-linux/christopher@cobalt/config/dev.nix +++ b/homes/x86_64-linux/christopher@cobalt/config/dev.nix @@ -11,6 +11,7 @@ devenv # Build tools + platformio cargo glibc gcc diff --git a/homes/x86_64-linux/christopher@cobalt/config/wayland.nix b/homes/x86_64-linux/christopher@cobalt/config/wayland.nix index 7ee5930..69f0f1f 100644 --- a/homes/x86_64-linux/christopher@cobalt/config/wayland.nix +++ b/homes/x86_64-linux/christopher@cobalt/config/wayland.nix @@ -36,7 +36,7 @@ in { monitor=,preferred,auto,1 # Gaps for eww - monitor=DP-1,addreserved,40,0,0,0 + monitor=DP-2,addreserved,40,0,0,0 # monitor=,addreserved,40,0,0,0 # Single tiled windows in a workspace on my main monitor @@ -63,8 +63,11 @@ in { env = XCURSOR_SIZE,28 env = HYPRCURSOR_THEME,rose-pine-hyprcursor env = HYPRCURSOR_SIZE,28 - env = WLR_NO_HARDWARE_CURSORS,1 + # env = WLR_NO_HARDWARE_CURSORS,1 env = NIXOS_OZONE_WL,1 + env = LIBVA_DRIVER_NAME,nvidia + env = __GLX_VENDOR_LIBRARY_NAME,nvidia + env = NVD_BACKEND,direct debug { disable_logs = false @@ -87,6 +90,10 @@ in { sensitivity = 0 # -1.0 - 1.0, 0 means no modification. } + cursor { + no_hardware_cursors = true + } + general { # See https://wiki.hyprland.org/Configuring/Variables/ for more diff --git a/packages/scripts/generate-wallpaper/generate-wallpaper b/packages/scripts/generate-wallpaper/generate-wallpaper index 934ec28..be4ce62 100755 --- a/packages/scripts/generate-wallpaper/generate-wallpaper +++ b/packages/scripts/generate-wallpaper/generate-wallpaper @@ -16,5 +16,5 @@ WALLPAPER_DIR=$(dirname "$WALLPAPER_PATH") npx themer -t wallpaper-circuits -o "$WALLPAPER_BASE" --color-set "$THEME_FILE_JSON" -s 3840x1080 -s 1080x1920 find "$WALLPAPER_DIR" -type f -iname '*.svg' | sed 'p;s/\.svg/\.png/' | sed 's/.*/"&"/' | xargs -n2 magick -hyprctl hyprpaper reload DP-1,"$WALLPAPER_PATH-3840x1080.png" -hyprctl hyprpaper reload DP-3,"$WALLPAPER_PATH-1080x1920.png" +hyprctl hyprpaper reload DP-2,"$WALLPAPER_PATH-3840x1080.png" +hyprctl hyprpaper reload DP-4,"$WALLPAPER_PATH-1080x1920.png" diff --git a/systems/x86_64-linux/cobalt/default.nix b/systems/x86_64-linux/cobalt/default.nix index a09d766..5249282 100644 --- a/systems/x86_64-linux/cobalt/default.nix +++ b/systems/x86_64-linux/cobalt/default.nix @@ -96,6 +96,7 @@ with lib._elements; { # Bluetooth manager blueman.enable = true; + udev.packages = [pkgs.platformio-core.udev]; # Linux link via MQTT lnxlink.enable = true; @@ -220,15 +221,20 @@ with lib._elements; { systemd.services.lactd.wantedBy = ["multi-user.target"]; hardware = { - amdgpu = { - opencl.enable = true; - overdrive.enable = true; - # amdvlk = { - # enable = true; - # support32Bit.enable = true; - # }; + nvidia = { + modesetting.enable = true; + powerManagement.enable = false; + powerManagement.finegrained = false; + open = true; + nvidiaSettings = true; + package = config.boot.kernelPackages.nvidiaPackages.stable; }; + # amdgpu = { + # opencl.enable = true; + # overdrive.enable = true; + # }; + bluetooth = { enable = true; powerOnBoot = true; diff --git a/systems/x86_64-linux/cobalt/hardware.nix b/systems/x86_64-linux/cobalt/hardware.nix index 1f68e31..2be6652 100644 --- a/systems/x86_64-linux/cobalt/hardware.nix +++ b/systems/x86_64-linux/cobalt/hardware.nix @@ -13,9 +13,9 @@ ]; boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"]; - boot.initrd.kernelModules = ["amdgpu"]; - boot.kernelModules = ["kvm-amd" "uinput"]; - boot.extraModulePackages = []; + boot.initrd.kernelModules = ["uinput"]; # nvidia + # boot.initrd.kernelModules = ["amdgpu"]; + # boot.kernelModules = ["kvm-amd" "uinput"]; boot.supportedFilesystems = ["ntfs"]; fileSystems."/mnt/games/ssd" = {