diff --git a/hosts/hakase/configuration.nix b/hosts/hakase/configuration.nix index 162ecce..b129db6 100644 --- a/hosts/hakase/configuration.nix +++ b/hosts/hakase/configuration.nix @@ -79,11 +79,10 @@ }; services = { - openssh.enable = true; + displayManager.gdm.enable = true; libinput.enable = true; blueman.enable = true; printing.enable = true; - displayManager.gdm.enable = false; pipewire = { enable = true; alsa.enable = true; @@ -109,6 +108,13 @@ }; }; + console = { + earlySetup = true; + font = "${pkgs.terminus_font}/share/consolefonts/ter-132n.psf.gz"; + packages = with pkgs; [terminus_font]; + useXkbConfig = true; + }; + networking = { networkmanager.enable = true; firewall = { diff --git a/modules/home/desktop.nix b/modules/home/desktop.nix index eaadd8a..c8dbe7d 100644 --- a/modules/home/desktop.nix +++ b/modules/home/desktop.nix @@ -1,6 +1,14 @@ { imports = [ ../../packages/fonts/home.nix + ../../packages/firefox/home.nix + + ../../packages/hyprland/home.nix + ../../packages/hyprlock/home.nix + ../../packages/hypridle/home.nix + + ../../packages/steam/home.nix + ../../packages/mangohud/home.nix ]; } diff --git a/packages/hyprland/home.nix b/packages/hyprland/home.nix index 6faec88..ddcd927 100644 --- a/packages/hyprland/home.nix +++ b/packages/hyprland/home.nix @@ -2,6 +2,7 @@ wayland.windowManager.hyprland = { enable = true; xwayland.enable = true; + systemd.enable = true; settings = { "$mod" = "SUPER"; "$term" = "kitty --single-instance"; @@ -141,7 +142,6 @@ [ "$mod, Return, exec, $term" "$mod, Q, killactive," - "$mod, M, exit," "$mod, E, exec, $fileManager" "$mod, V, togglefloating," "$mod, R, exec, $menu" @@ -154,6 +154,7 @@ "$mod, K, movefocus, u" "$mod, J, movefocus, d" + "$mod Shift, M, exit," "$mod SHIFT, K, movewindow, u" "$mod SHIFT, J, movewindow, d" "$mod SHIFT, H, movewindow, l"