diff --git a/home/common/programs/ghostty/config b/home/common/programs/ghostty/config index b08146d..3422d1f 100644 --- a/home/common/programs/ghostty/config +++ b/home/common/programs/ghostty/config @@ -7,6 +7,7 @@ window-padding-color = extend custom-shader-animation = true # font +font-size = 12 font-family = "FiraCode Nerd Font Mono" font-family-italic = "VictorMono Nerd Font mono Oblique" font-family-bold-italic = "VictorMono Nerd Font mono Bold Oblique" diff --git a/home/desktop/default.nix b/home/desktop/default.nix index 2e3f3fe..2d71300 100644 --- a/home/desktop/default.nix +++ b/home/desktop/default.nix @@ -43,9 +43,9 @@ "fullscreen, class:bevy-.*" ]; - env = [ - "GDK_SCALE, 2" - ]; + # env = [ + # "GDK_SCALE, 2" + # ]; render = { explicit_sync = 2; diff --git a/hosts/common/features/networking.nix b/hosts/common/features/networking.nix index df5d507..6805a05 100644 --- a/hosts/common/features/networking.nix +++ b/hosts/common/features/networking.nix @@ -9,7 +9,7 @@ services.avahi = { enable = true; - nssmdns = true; + nssmdns4 = true; openFirewall = true; }; diff --git a/hosts/common/features/wayland.nix b/hosts/common/features/wayland.nix index d19d8c4..0e2b496 100644 --- a/hosts/common/features/wayland.nix +++ b/hosts/common/features/wayland.nix @@ -1,12 +1,22 @@ { inputs, pkgs, ... }: { - environment.systemPackages = [ - pkgs.wl-clipboard + environment.systemPackages = with pkgs; [ + wl-clipboard + hyprland ]; # thumbnail support for images services.tumbler.enable = true; + environment.etc."xdg/wayland-sessions/hyprland.desktop".text = '' + [Desktop Entry] + Name=Hyprland + Comment=Hyprland Wayland Compositor + Exec=Hyprland + Type=Application + DesktopNames=Hyprland + ''; + nix.settings = { substituters = [ "https://hyprland.cachix.org" ]; trusted-public-keys = [ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" ]; diff --git a/hosts/common/features/x11.nix b/hosts/common/features/x11.nix index 6f0a3ba..8d104ef 100644 --- a/hosts/common/features/x11.nix +++ b/hosts/common/features/x11.nix @@ -16,28 +16,26 @@ in autoRepeatDelay = 250; autoRepeatInterval = 30; }; - # services.xserver.displayManager.sessionPackages = [ hyprland-session ]; + services.displayManager.sessionPackages = with pkgs; [ + hyprland + ]; - # services.xserver.windowManager.gnome.enable = true; - # services.xserver.windowManager.gnome.wayland = false; - # hardware.opengl.enable = true; - # - # environment.systemPackages = with pkgs; [ - # xorg.xhost - # xorg.xrandr - # xorg.xinit - # gnome-session - # gnome-shell - # ]; - # - # xdg = { - # portal = { - # enable = true; - # }; - # }; + services.desktopManager = { + gnome.enable = true; + }; + services.xserver.windowManager = { + # gnome.enable = true; + i3 = { + enable = true; + extraPackages = with pkgs; [ + dmenu + i3status + ]; + }; + }; + programs.i3lock.enable = true; services.displayManager.gdm.enable = true; - services.desktopManager.gnome.enable = true; programs.dconf.enable = true; services = { sysprof.enable = true; diff --git a/hosts/desktop/default.nix b/hosts/desktop/default.nix index fb36568..aef15e5 100644 --- a/hosts/desktop/default.nix +++ b/hosts/desktop/default.nix @@ -34,9 +34,9 @@ programs.zsh.enable = true; - environment.variables = { - GDK_SCALE = 2; - }; + # environment.variables = { + # GDK_SCALE = 2; + # }; users.users.naps62 = { isNormalUser = true;