From a7f53fad262e1cc60df5c52415f7a623e116d7e4 Mon Sep 17 00:00:00 2001 From: blahai Date: Sat, 31 Aug 2024 00:52:01 +0300 Subject: [PATCH] more hypr stuffies and whatnot --- flake.lock | 6 ++-- hosts/nyx/configuration.nix | 5 +++- hosts/nyx/home.nix | 13 ++++---- modules/home-manager/hypr/default.nix | 30 +++++++++++-------- .../home-manager/hypr/hyprland/keybinds.nix | 2 +- modules/home-manager/hypr/hyprlock.nix | 4 +-- modules/nixos/games/default.nix | 7 ++--- 7 files changed, 37 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index 7c453f3..c96fe5e 100644 --- a/flake.lock +++ b/flake.lock @@ -64,11 +64,11 @@ "yafas": "yafas" }, "locked": { - "lastModified": 1725042633, - "narHash": "sha256-ri9tUKMeL+91m5Tfr/ZLpPgUDdNgXOGaycxUisFbnb8=", + "lastModified": 1725043054, + "narHash": "sha256-wNKROMH0TmS3yqpces3ldlRLE75Bec0gfmaP9DF6OPc=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "c15b70230c274d2aa11d6c56ce5d50a198c2a994", + "rev": "1de4f25728a7f37785da5742f6d3fe98daffe83f", "type": "github" }, "original": { diff --git a/hosts/nyx/configuration.nix b/hosts/nyx/configuration.nix index 8f65a5c..9fb1a9d 100644 --- a/hosts/nyx/configuration.nix +++ b/hosts/nyx/configuration.nix @@ -4,6 +4,7 @@ imports = [ ./hardware-configuration.nix + ../../modules/nixos/games/default.nix inputs.home-manager.nixosModules.default ]; @@ -110,7 +111,7 @@ package = inputs.hyprland.packages."${pkgs.system}".hyprland; }; - dir{ + direnv = { enable = true; }; @@ -146,6 +147,7 @@ }; environment.systemPackages = with pkgs; [ + hyprcursor neovim wget git @@ -167,6 +169,7 @@ busybox rustup vscode-fhs + bibata-cursors ]; fonts.packages = with pkgs; [ diff --git a/hosts/nyx/home.nix b/hosts/nyx/home.nix index 841619f..6f146a6 100644 --- a/hosts/nyx/home.nix +++ b/hosts/nyx/home.nix @@ -3,7 +3,6 @@ { imports = [ ../../modules/home-manager/hypr/default.nix - ../../modules/nixos/games/default.nix ]; # Home Manager needs a bit of information about you and the paths it should @@ -61,7 +60,7 @@ EDITOR = "nvim"; XMODIFIERS = "@im=ibus"; GTK_IM_MODULE = "ibus"; - QT_IM_MODULE = "ibus" + QT_IM_MODULE = "ibus"; QT_QPA_PLATFORMTHEME = "qt5ct"; WLR_NO_HARDWARE_CURSORS = "1"; GSK_RENDERER = "cairo"; @@ -71,13 +70,13 @@ XDG_SESSION_TYPE = "wayland"; XDG_SESSION_DESKTOP = "Hyprland"; - _JAVA_AWT_WM_NONREPARENTING = "1" + _JAVA_AWT_WM_NONREPARENTING = "1"; XCURSOR_THEME = "Bibata-Modern-Classic"; - HYPRCURSOR_THEME = "HyprBibataModernClassicSVG" - XCURSOR_SIZE, 24 - __GL_THREADED_OPTIMIZATIONS, 0 + HYPRCURSOR_THEME = "HyprBibataModernClassicSVG"; + XCURSOR_SIZE = "24"; + __GL_THREADED_OPTIMIZATIONS = "0"; QT_QPA_PLATFORM = "wayland"; - QT_WAYLAND_DISABLE_WINDOWDECORATION = 1 + QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; }; # Let Home Manager install and manage itself. diff --git a/modules/home-manager/hypr/default.nix b/modules/home-manager/hypr/default.nix index a2864e7..06242f2 100644 --- a/modules/home-manager/hypr/default.nix +++ b/modules/home-manager/hypr/default.nix @@ -1,4 +1,4 @@ -{ pkgs, config, inputs, ... }: { +{ pkgs, config, inputs, lib, ... }: { imports = [ ./hyprland/rules.nix @@ -8,8 +8,6 @@ ../ags/default.nix ]; - # apparently hyprcursor doesn't work with hm? - environment.systemPackages = [ pkgs.hyprcursor ]; home.packages = with pkgs; [ hyprshot hyprpicker @@ -25,7 +23,8 @@ mpvpaper ]; - home.file."~/.config/hypr/colors.conf" = { + + home.file."~/.config/hypr/hyprland/colors.conf" = { text = '' general { col.active_border = rgba(DFE2EF39) @@ -38,21 +37,28 @@ windowrulev2 = bordercolor rgba(ADC6FFAA) rgba(ADC6FF77),pinned:1 ''; - checkPhase = '' - if [ -f "$out" ]; then - echo "File already exists, skipping creation" - exit 0 - fi - ''; - }; + }; + xdg.portal = { + enable = true; + configPackages = [ config.wayland.windowManager.hyprland.package ]; + extraPortals = [ + pkgs.xdg-desktop-portal-gtk + inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland + ]; + }; + wayland.windowManager.hyprland = { enable = true; xwayland.enable = true; package = inputs.hyprland.packages."${pkgs.system}".hyprland; settings = { + source = [ + "~/.config/hypr/hyprland/colors.conf" + ]; + monitor = [ ",prefered,auto,1" ]; @@ -110,7 +116,7 @@ drop_shadow = true; shadow_ignore_window = true; shadow_range = 20; - shadow_offset = 0 2; + shadow_offset = "0 2"; shadow_render_power = 4; "col.shadow" = "rgba(0000002A)"; diff --git a/modules/home-manager/hypr/hyprland/keybinds.nix b/modules/home-manager/hypr/hyprland/keybinds.nix index 2feac08..4c9b125 100644 --- a/modules/home-manager/hypr/hyprland/keybinds.nix +++ b/modules/home-manager/hypr/hyprland/keybinds.nix @@ -14,7 +14,7 @@ "Super, Q, exec, ${pkgs.foot}/bin/foot" "Super, C, killactive" "Super, V, togglefloating" - "Super, E, exec, ${pkgs.gnome.nautilus} --new-window" + "Super, E, exec, ${pkgs.nautilus} --new-window" # This horror of a mess is from having more than 10 workspaces and I'm very much considering just removing this shit ] ++ map (n: "Alt, ${toString n}, exec, ~/.config/ags/scripts/hyprland/workspace_adction.sh movetoworkspacesilent ${toString ( diff --git a/modules/home-manager/hypr/hyprlock.nix b/modules/home-manager/hypr/hyprlock.nix index a66215b..cddd88e 100644 --- a/modules/home-manager/hypr/hyprlock.nix +++ b/modules/home-manager/hypr/hyprlock.nix @@ -11,7 +11,7 @@ }; backgruond = { - color = "rgba(000000FF)" + color = "rgba(000000FF)"; }; input-field = [{ @@ -39,7 +39,7 @@ font_size = "65"; font_family = "Rubik Light"; - position = "0, 300" + position = "0, 300"; } { # Greeting diff --git a/modules/nixos/games/default.nix b/modules/nixos/games/default.nix index a64b618..62a8c88 100644 --- a/modules/nixos/games/default.nix +++ b/modules/nixos/games/default.nix @@ -1,6 +1,6 @@ { config, pkgs, ... }: { - home.packages = with pkgs; [ + environment.systemPackages = with pkgs; [ protonup-qt prismlauncher osu-lazer-bin @@ -17,10 +17,9 @@ }; hardware.opentabletdriver.enable = true; - hardware.opengl = { + hardware.graphics = { enable = true; - driSupport = true; - driSupport32Bit = true; + enable32Bit = true; }; } \ No newline at end of file