diff --git a/hosts/snowfire/home.nix b/hosts/snowfire/home.nix index 5744a3c3..4bcb2129 100644 --- a/hosts/snowfire/home.nix +++ b/hosts/snowfire/home.nix @@ -48,9 +48,9 @@ wayland.windowManager.hyprland = lib.mkIf config.userSettings.hyprland.enable { settings = { monitor = [ - "eDP-1,1920x1080@300,900x1080,1" - "HDMI-A-1,1920x1080,1920x0,1" - "DP-1,1920x1080,0x0,1" + "eDP-1,1920x1080@300,720x864,1.25" + "HDMI-A-1,1920x1080,1536x0,1.25" + "DP-1,1920x1080,0x0,1.25" ]; }; diff --git a/hosts/zenith/home.nix b/hosts/zenith/home.nix index 48c65e16..912d83af 100644 --- a/hosts/zenith/home.nix +++ b/hosts/zenith/home.nix @@ -59,8 +59,8 @@ ]; monitor = [ - "eDP-1,1920x1080,1920x0,1" - "HDMI-A-1,1920x1080,0x0,1" + "eDP-1,1920x1080,1536x0,1.25" + "HDMI-A-1,1920x1080,0x0,1.25" ]; }; diff --git a/modules/user/emacs/default.nix b/modules/user/emacs/default.nix index 3f731270..82fe1bd4 100644 --- a/modules/user/emacs/default.nix +++ b/modules/user/emacs/default.nix @@ -13,7 +13,7 @@ in { home.packages = with pkgs; [ (pkgs.emacsWithPackagesFromUsePackage { config = ./init.el; - package = pkgs.emacs-pgtk; + package = pkgs.emacs-git-pgtk; alwaysEnsure = false; extraEmacsPackages = epkgs: with epkgs; [ org-modern olivetti diff --git a/modules/user/emacs/init.el b/modules/user/emacs/init.el index aba58e29..206591a0 100644 --- a/modules/user/emacs/init.el +++ b/modules/user/emacs/init.el @@ -413,16 +413,7 @@ (setq doom-themes-enable-bold t doom-themes-enable-italic t custom-theme-directory "~/.config/emacs/themes") - (load-theme 'doom-stylix t) - ;; Heading styles - (set-face-attribute 'outline-1 nil :height 195 :foreground (nth 1 (nth 14 doom-themes--colors))) - (set-face-attribute 'outline-2 nil :height 188 :foreground (nth 1 (nth 15 doom-themes--colors))) - (set-face-attribute 'outline-3 nil :height 180 :foreground (nth 1 (nth 19 doom-themes--colors))) - (set-face-attribute 'outline-4 nil :height 173 :foreground (nth 1 (nth 23 doom-themes--colors))) - (set-face-attribute 'outline-5 nil :height 173 :foreground (nth 1 (nth 24 doom-themes--colors))) - (set-face-attribute 'outline-6 nil :height 165 :foreground (nth 1 (nth 16 doom-themes--colors))) - (set-face-attribute 'outline-7 nil :height 160 :foreground (nth 1 (nth 18 doom-themes--colors))) - (set-face-attribute 'outline-8 nil :height 155 :foreground (nth 1 (nth 11 doom-themes--colors)))) + (load-theme 'doom-stylix t)) (use-package doom-modeline :init (doom-modeline-mode 1) diff --git a/modules/user/stylix/default.nix b/modules/user/stylix/default.nix index 05dc088c..a00053e2 100644 --- a/modules/user/stylix/default.nix +++ b/modules/user/stylix/default.nix @@ -33,20 +33,20 @@ in stylix.fonts = { # TODO abstract fonts into an option monospace = { - name = "FiraCode Nerd Font"; - package = pkgs.nerd-fonts.fira-code; + name = "Source Code Pro"; + package = pkgs.source-code-pro; }; serif = { - name = "FiraCode Nerd Font"; - package = pkgs.nerd-fonts.fira-code; + name = "Source Serif Pro"; + package = pkgs.source-serif-pro; }; sansSerif = { - name = "FiraCode Nerd Font"; - package = pkgs.nerd-fonts.fira-code; + name = "Source Sans Pro"; + package = pkgs.source-sans-pro; }; emoji = { - name = "Noto Color Emoji"; - package = pkgs.noto-fonts-emoji-blob-bin; + name = "Twitter Color Emoji"; + package = pkgs.twitter-color-emoji; }; sizes = { terminal = 18;