diff --git a/home/wayland/default.nix b/home/wayland/default.nix index fc64e5b..f6d8900 100644 --- a/home/wayland/default.nix +++ b/home/wayland/default.nix @@ -18,7 +18,8 @@ in { pkgs.wl-clipboard ]; - home.sessionVariables = mkIf cfg { #FIXME: migrate to hyprconf + home.sessionVariables = mkIf cfg { + #FIXME: migrate to hyprconf QT_QPA_PLATFORM = "wayland"; SDL_VIDEODRIVER = "wayland"; XDG_SESSION_TYPE = "wayland"; diff --git a/home/wayland/hyprland/settings.nix b/home/wayland/hyprland/settings.nix index 225ede9..4b97d18 100644 --- a/home/wayland/hyprland/settings.nix +++ b/home/wayland/hyprland/settings.nix @@ -1,4 +1,8 @@ -{lib, osConfig, ...}: { +{ + lib, + osConfig, + ... +}: { wayland.windowManager.hyprland.settings = { xwayland = { force_zero_scaling = true; @@ -89,14 +93,15 @@ vrr = 1; }; - windowrule = [ - "float, class:com.github.phase1geo.annotator" - "float, class:foot-somcli" - "size >30% >30%, class:foot-somcli" - ] ++ lib.optionals osConfig.niksos.fingerprint [ - "float, class:foot-fprintd" - ]; - #NOTE: Also check home/wayland/hyprland/binds + system/hardware/fingerprint - + windowrule = + [ + "float, class:com.github.phase1geo.annotator" + "float, class:foot-somcli" + "size >30% >30%, class:foot-somcli" + ] + ++ lib.optionals osConfig.niksos.fingerprint [ + "float, class:foot-fprintd" + ]; + #NOTE: Also check home/wayland/hyprland/binds + system/hardware/fingerprint }; } diff --git a/home/wayland/mako.nix b/home/wayland/mako.nix index a528178..57343b9 100644 --- a/home/wayland/mako.nix +++ b/home/wayland/mako.nix @@ -1,4 +1,4 @@ -{osConfig, ...}:{ +{osConfig, ...}: { services.mako = { enable = osConfig.niksos.desktop.hyprland; settings.defaultTimeout = 5000; diff --git a/hosts/default.nix b/hosts/default.nix index 7ffc0a6..79d99d1 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -55,9 +55,9 @@ in { niksos = { desktop = { - enable = true; - hyprland = true; - }; + enable = true; + hyprland = true; + }; neovim = true; }; diff --git a/hosts/minimal/default.nix b/hosts/minimal/default.nix index 69cc980..408b1d2 100644 --- a/hosts/minimal/default.nix +++ b/hosts/minimal/default.nix @@ -10,10 +10,18 @@ niksos = { bluetooth = false; - desktop = { enable = false; hyprland = false; kde = false; }; + desktop = { + enable = false; + hyprland = false; + kde = false; + }; fingerprint = false; games = false; - graphics = { enable = false; intel = false; nvidia = false; }; + graphics = { + enable = false; + intel = false; + nvidia = false; + }; neovim = false; portable = false; server = false; diff --git a/system/programs/games.nix b/system/programs/games.nix index a65faf3..8268512 100644 --- a/system/programs/games.nix +++ b/system/programs/games.nix @@ -8,61 +8,61 @@ in { options.niksos.games = lib.mkEnableOption "gaming related stuff."; config = lib.mkIf cfg { - # nixpkgs.overlays = [ - # (final: prev: let - # version = "1.4.2"; - # hash = "sha256-xe0qlbtt06CUK8bXyaGDtCcHOXpSnkbuvcxaDJjeS/c="; - # npmHash = "sha256-/+NhlQydGS6+2jEjpbwycwKplVo/++wcdPiBNY3R3FI="; - # cargoHash = "sha256-VwzGbm34t7mg9ndmTkht6Ho32NQ+6uxuPTKi3+VrhYo="; - # in { - # gale = prev.gale.overrideAttrs (new: old: { - # src = prev.fetchFromGitHub { - # inherit version hash; - # owner = "Kesomannen"; - # repo = "gale"; - # rev = "1.4.2"; - # }; - # npmDeps = prev.fetchNpmDeps { - # hash = npmHash; - # name = "${new.pname}-${new.version}-npm-deps"; - # inherit (new) src; - # }; - # cargoDeps = prev.rustPlatform.fetchCargoVendor { - # inherit - # (new) - # pname - # version - # src - # cargoRoot - # ; - # hash = cargoHash; - # }; - # }); - # }) - # ]; + # nixpkgs.overlays = [ + # (final: prev: let + # version = "1.4.2"; + # hash = "sha256-xe0qlbtt06CUK8bXyaGDtCcHOXpSnkbuvcxaDJjeS/c="; + # npmHash = "sha256-/+NhlQydGS6+2jEjpbwycwKplVo/++wcdPiBNY3R3FI="; + # cargoHash = "sha256-VwzGbm34t7mg9ndmTkht6Ho32NQ+6uxuPTKi3+VrhYo="; + # in { + # gale = prev.gale.overrideAttrs (new: old: { + # src = prev.fetchFromGitHub { + # inherit version hash; + # owner = "Kesomannen"; + # repo = "gale"; + # rev = "1.4.2"; + # }; + # npmDeps = prev.fetchNpmDeps { + # hash = npmHash; + # name = "${new.pname}-${new.version}-npm-deps"; + # inherit (new) src; + # }; + # cargoDeps = prev.rustPlatform.fetchCargoVendor { + # inherit + # (new) + # pname + # version + # src + # cargoRoot + # ; + # hash = cargoHash; + # }; + # }); + # }) + # ]; - programs = { - gamescope = { - enable = true; - capSysNice = true; - args = [ - "--rt" - "--expose-wayland" - ]; - }; - - steam = { - enable = true; - - extraCompatPackages = [ - pkgs.proton-ge-bin - ]; - - gamescopeSession.enable = true; - }; + programs = { + gamescope = { + enable = true; + capSysNice = true; + args = [ + "--rt" + "--expose-wayland" + ]; }; - environment.variables = { - "STEAM_FORCE_DESKTOP_UI_SCALING" = "1.5"; #FIXME:. + + steam = { + enable = true; + + extraCompatPackages = [ + pkgs.proton-ge-bin + ]; + + gamescopeSession.enable = true; }; }; + environment.variables = { + "STEAM_FORCE_DESKTOP_UI_SCALING" = "1.5"; #FIXME:. + }; + }; }