diff --git a/config/nix/linux/hyprland.nix b/config/nix/linux/hyprland.nix index 6e6f9550..54658f59 100644 --- a/config/nix/linux/hyprland.nix +++ b/config/nix/linux/hyprland.nix @@ -7,7 +7,10 @@ systemd.enable = true; systemd.target = "hyprland-session.target"; settings.preload = wallpapers.all; - settings.wallpapers = { "DP-1" = wallpapers.shapes; }; + settings.wallpapers = { + "DP-4" = wallpapers.lights; + "DP-2" = wallpapers.shapes; + }; }; wayland.windowManager.hyprland = { enable = true; @@ -16,8 +19,8 @@ source = "${pkgs.catppuccinThemes.hyprland}/themes/mocha.conf"; monitor = [ ",preferred,auto,auto" - "DP-1, 2560x1440@170, 0x0, 1, transform, 0" - "HDMI-A-2, 2560x1440@144, -1440x-800,1, transform, 1" + "DP-4, 2560x1440@170, 0x0, 1, transform, 0" + "DP-2, 2560x1440@170, -1440x-800,1, transform, 1" ",highrr,auto,1" ]; @@ -213,16 +216,16 @@ ]; workspace = [ - "1, monitor:DP-1" - "2, monitor:DP-1" - "3, monitor:DP-1" - "4, monitor:DP-1" - "5, monitor:DP-1" - "6, monitor:DP-1" - "7, monitor:DP-1" - "8, monitor:HDMI-A-2" - "9, monitor:HDMI-A-2" - "10, monitor:HDMI-A-2" + "1, monitor:DP-4" + "2, monitor:DP-4" + "3, monitor:DP-4" + "4, monitor:DP-4" + "5, monitor:DP-4" + "6, monitor:DP-4" + "7, monitor:DP-4" + "8, monitor:DP-2" + "9, monitor:DP-2" + "10, monitor:DP-2" ]; }; }; diff --git a/config/nix/linux/ironbar/default.nix b/config/nix/linux/ironbar/default.nix index 39a622e2..74b4f561 100644 --- a/config/nix/linux/ironbar/default.nix +++ b/config/nix/linux/ironbar/default.nix @@ -3,7 +3,7 @@ programs.ironbar = { enable = true; config.monitors = { - HDMI-A-2 = { + DP-2 = { position = "bottom"; start = [ { @@ -28,7 +28,7 @@ { type = "clock"; } ]; }; - DP-1 = { + DP-4 = { position = "bottom"; icon_theme = "Papirus-Dark"; end = [ diff --git a/config/nix/nixos/configuration.nix b/config/nix/nixos/configuration.nix index 7e4a3add..d1b8cc04 100644 --- a/config/nix/nixos/configuration.nix +++ b/config/nix/nixos/configuration.nix @@ -31,19 +31,21 @@ boot.plymouth.themePackages = with pkgs; [ (catppuccin-plymouth.override { variant = "mocha"; }) ]; - services.greetd = let - tuigreet = "${pkgs.greetd.tuigreet}/bin/tuigreet"; - hyprland-session = "${pkgs.hyprland}/share/wayland-sessions"; - in { - enable = true; - settings = { - default_session = { - command = - "${tuigreet} --time --remember --remember-session --sessions ${hyprland-session}"; - user = "greeter"; + services.greetd = + let + tuigreet = "${pkgs.greetd.tuigreet}/bin/tuigreet"; + hyprland-session = "${pkgs.hyprland}/share/wayland-sessions"; + in + { + enable = true; + settings = { + default_session = { + command = + "${tuigreet} --time --remember --remember-session --sessions ${hyprland-session}"; + user = "greeter"; + }; }; }; - }; systemd.services.greetd.serviceConfig = { Type = "idle"; @@ -143,11 +145,15 @@ fish nushellFull (pkgs.wrapFirefox - (pkgs.firefox-unwrapped.override { pipewireSupport = true; }) { }) + (pkgs.firefox-unwrapped.override { pipewireSupport = true; }) + { }) gnumake python3 (nerdfonts.override { fonts = [ "FiraCode" "Hasklig" ]; }) ]; + environment.sessionVariables = { + WLR_NO_HARDWARE_CURSORS = "1"; + }; programs = { hyprland.enable = true; diff --git a/config/nix/nixos/ryu.nix b/config/nix/nixos/ryu.nix index e831c16e..c822b57a 100644 --- a/config/nix/nixos/ryu.nix +++ b/config/nix/nixos/ryu.nix @@ -6,6 +6,47 @@ { imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; + hardware.opengl = { + enable = true; + driSupport = true; + driSupport32Bit = true; + }; + + services.xserver.videoDrivers = [ "nvidia" ]; # or "nvidiaLegacy470 etc. + hardware.nvidia = { + + # Modesetting is required. + modesetting.enable = true; + + # Nvidia power management. Experimental, and can cause sleep/suspend to fail. + # Enable this if you have graphical corruption issues or application crashes after waking + # up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead + # of just the bare essentials. + powerManagement.enable = false; + + # Fine-grained power management. Turns off GPU when not in use. + # Experimental and only works on modern Nvidia GPUs (Turing or newer). + powerManagement.finegrained = false; + + # Use the NVidia open source kernel module (not to be confused with the + # independent third-party "nouveau" open source driver). + # Support is limited to the Turing and later architectures. Full list of + # supported GPUs is at: + # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus + # Only available from driver 515.43.04+ + # Currently alpha-quality/buggy, so false is currently the recommended setting. + open = true; + + # Enable the Nvidia settings menu, + # accessible via `nvidia-settings`. + nvidiaSettings = true; + + # Optionally, you may need to select the appropriate driver version for your specific GPU. + package = config.boot.kernelPackages.nvidiaPackages.stable; + }; + + + boot.initrd.availableKernelModules = [ "vmd" "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.kernelModules = [ ];