diff --git a/config.nix b/config.nix index 0a4e3a6..cc91f16 100644 --- a/config.nix +++ b/config.nix @@ -39,7 +39,6 @@ ]; }; Hyprland = { - enable = false; monitors = [ # "DP-2, highres@165,0x1080,1,vrr,1" # "DP-2, highres@180,0x1080,1,cm,hdr, sdrbrightness, 1.5, sdrsaturation, 0.98" diff --git a/hosts/hakase/configuration.nix b/hosts/hakase/configuration.nix index 71968e5..0261757 100644 --- a/hosts/hakase/configuration.nix +++ b/hosts/hakase/configuration.nix @@ -96,16 +96,15 @@ }; services = { - displayManager.sessionPackages = [inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland]; - # getty.autologinUser = "${myConfig.essentials.Username}"; - # greetd = { - # enable = true; - # settings.default_session = { - # user = "${myConfig.essentials.Username}"; - # command = "Hyprland"; - # }; - # }; - + displayManager.sessionPackages = lib.mkIf (!myConfig.nixos.enableSteamOS) [inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland]; + getty.autologinUser = lib.mkIf (!myConfig.nixos.enableSteamOS) "${myConfig.essentials.Username}"; + greetd = lib.mkIf (!myConfig.nixos.enableSteamOS) { + enable = true; + settings.default_session = { + user = "${myConfig.essentials.Username}"; + command = "Hyprland"; + }; + }; seatd.enable = true; upower.enable = true; scx.enable = true; # by default uses scx_rustland scheduler @@ -147,6 +146,7 @@ networking = { # wakeOnLan.enable = true; + # networkd.enable = true; networkmanager.enable = true; firewall = { enable = true; @@ -156,6 +156,7 @@ proxy.default = null; proxy.noProxy = null; }; + systemd.network.enable = true; boot.loader.timeout = 0; boot.loader.limine.maxGenerations = 5; @@ -166,7 +167,8 @@ "boot.shell_on_fail" "udev.log_priority=3" "rd.systemd.show_status=auto" - "amd_pstate=active" + "kvm.enable_virt_at_load=0" # for virtualbox + # "amd_pstate=active" ]; boot.kernelPackages = pkgs.linuxPackages_cachyos; # boot.kernel.sysctl = { diff --git a/modules/default/desktop.nix b/modules/default/desktop.nix index 093f50a..ba30d49 100644 --- a/modules/default/desktop.nix +++ b/modules/default/desktop.nix @@ -14,8 +14,6 @@ ++ [ ../../packages/steam/default.nix ../../packages/bottles/default.nix - ] - ++ lib.optionals (myConfig.nixos.enableSteamOS == true) [ ../../packages/steam/jovian.nix ]; } diff --git a/packages/hyprland/config/binds.nix b/packages/hyprland/config/binds.nix index 5f86e94..bf36797 100644 --- a/packages/hyprland/config/binds.nix +++ b/packages/hyprland/config/binds.nix @@ -40,6 +40,7 @@ "$mod, D, global, caelestia:launcherInterrupt" "$mod, Escape, global, caelestia:launcherInterrupt" "$mod, PERIOD, global, caelestia:launcherInterrupt" + "$mod, SPACE, global, caelestia:launcherInterrupt" "$mod, E, global, caelestia:launcherInterrupt" "$mod, V, global, caelestia:launcherInterrupt" diff --git a/packages/hyprland/config/rules.nix b/packages/hyprland/config/rules.nix index f3002b0..9cbd9dd 100644 --- a/packages/hyprland/config/rules.nix +++ b/packages/hyprland/config/rules.nix @@ -69,7 +69,7 @@ # Steam "workspace special:steam, class:steam" - "workspace special:gaming, class:^(steam_app_.*)$" + # "workspace special:gaming, class:^(steam_app_.*)$" "rounding 10, title:, class:steam" "float, title:Friends List, class:steam" "immediate, class:steam_app_[0-9]+" diff --git a/packages/virtualbox/default.nix b/packages/virtualbox/default.nix index 453c0cb..fed2a80 100644 --- a/packages/virtualbox/default.nix +++ b/packages/virtualbox/default.nix @@ -1,4 +1,5 @@ { virtualisation.virtualbox.host.enable = true; users.extraGroups.vboxusers.members = ["user-with-access-to-virtualbox"]; + virtualisation.virtualbox.host.enableExtensionPack = true; }