From 69cd0d6c891b50f910aec12e55848f793eb6312e Mon Sep 17 00:00:00 2001 From: Emmet Date: Fri, 14 Jun 2024 09:36:31 -0500 Subject: [PATCH 1/7] Hyprland consistently breaks normal browser blurs --- user/wm/hyprland/hyprland.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/user/wm/hyprland/hyprland.nix b/user/wm/hyprland/hyprland.nix index cce0113..2231365 100644 --- a/user/wm/hyprland/hyprland.nix +++ b/user/wm/hyprland/hyprland.nix @@ -305,9 +305,6 @@ in windowrulev2 = opacity 0.90,class:^(Element)$ windowrulev2 = opacity 1.0,class:^(Brave-browser),fullscreen:1 windowrulev2 = opacity 1.0,class:^(librewolf),fullscreen:1 - windowrulev2 = opacity 0.80,title:^(LibreWolf)$ - windowrulev2 = opacity 0.80,title:^(New Tab - LibreWolf)$ - windowrulev2 = opacity 0.80,title:^(New Tab - Brave)$ windowrulev2 = opacity 0.75,title:^(My Local Dashboard Awesome Homepage - qutebrowser)$ windowrulev2 = opacity 0.75,title:\[.*\] - My Local Dashboard Awesome Homepage windowrulev2 = opacity 0.9,class:^(org.keepassxc.KeePassXC)$ From bdfde8c4a6715917eafe33d42d916ee7edb965e6 Mon Sep 17 00:00:00 2001 From: Emmet Date: Fri, 14 Jun 2024 09:37:31 -0500 Subject: [PATCH 2/7] Fixes to emacs theming --- user/app/doom-emacs/config.el | 4 ++-- user/app/doom-emacs/doom.org | 4 ++-- user/app/doom-emacs/themes/doom-stylix-theme.el.mustache | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/user/app/doom-emacs/config.el b/user/app/doom-emacs/config.el index de41ac5..c268a10 100644 --- a/user/app/doom-emacs/config.el +++ b/user/app/doom-emacs/config.el @@ -51,8 +51,8 @@ (add-hook 'marginalia-mode-hook #'all-the-icons-completion-marginalia-setup) (all-the-icons-completion-mode) -;; This makes non-main buffers dimmer, so you can focus on main buffers -(solaire-global-mode +1) +;; Lighter/darker backgrounds can get annoying +(solaire-global-mode -1) ;; Grammar tasing should be voluntary (setq writegood-mode nil) diff --git a/user/app/doom-emacs/doom.org b/user/app/doom-emacs/doom.org index 072b823..7c7510b 100644 --- a/user/app/doom-emacs/doom.org +++ b/user/app/doom-emacs/doom.org @@ -114,8 +114,8 @@ Doom Emacs is traditionally installed by cloning the repository ([[https://githu (add-hook 'marginalia-mode-hook #'all-the-icons-completion-marginalia-setup) (all-the-icons-completion-mode) -;; This makes non-main buffers dimmer, so you can focus on main buffers -(solaire-global-mode +1) +;; Lighter/darker backgrounds can get annoying +(solaire-global-mode -1) ;; Grammar tasing should be voluntary (setq writegood-mode nil) diff --git a/user/app/doom-emacs/themes/doom-stylix-theme.el.mustache b/user/app/doom-emacs/themes/doom-stylix-theme.el.mustache index bfa7ec7..e83b979 100644 --- a/user/app/doom-emacs/themes/doom-stylix-theme.el.mustache +++ b/user/app/doom-emacs/themes/doom-stylix-theme.el.mustache @@ -68,7 +68,7 @@ Can be an integer to determine the exact padding." (grey base4) (red '("#{{base08-hex}}" "#ff6655" "red" )) - (orange '("#{{base08-hex}}" "#dd8844" "brightred" )) + (orange '("#{{base09-hex}}" "#dd8844" "brightred" )) (green '("#{{base0B-hex}}" "#99bb66" "green" )) (teal '("#{{base0C-hex}}" "#44b9b1" "brightgreen" )) (yellow '("#{{base0A-hex}}" "#ECBE7B" "yellow" )) From 0518f6c72e4ddc7b13fc550f1cef156b0e774642 Mon Sep 17 00:00:00 2001 From: Emmet Date: Fri, 14 Jun 2024 09:38:34 -0500 Subject: [PATCH 3/7] Io: higher contrast and more desaturated/dark bgs --- themes/io/io.yaml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/themes/io/io.yaml b/themes/io/io.yaml index 2c2ecb2..5af69a4 100644 --- a/themes/io/io.yaml +++ b/themes/io/io.yaml @@ -1,18 +1,18 @@ -scheme: "UwUnicorn" +scheme: "Io" author: "LibrePhoenix (forked from Fernando Marques (https://github.com/RakkiUwU) and Gabriel Fontes (https://github.com/Misterio77))" -base00: "241b26" -base01: "2f2a3f" -base02: "46354a" -base03: "6c3c62" -base04: "7e5f83" -base05: "eed5d9" -base06: "d9c2c6" -base07: "e4ccd0" +base00: "1a181a" +base01: "262326" +base02: "302c30" +base03: "373238" +base04: "463f47" +base05: "bfaab7" +base06: "dbd7da" +base07: "faf7f9" base08: "de5b44" base09: "e39755" base0A: "a84a73" base0B: "c965bf" base0C: "9c5fce" -base0D: "6a9eb5" +base0D: "0e85b9" base0E: "6ac38f" base0F: "a3ab5a" From 457f990a19ce7347b675d727d03bd5db217cdbe7 Mon Sep 17 00:00:00 2001 From: Emmet Date: Sat, 15 Jun 2024 12:42:10 -0500 Subject: [PATCH 4/7] Less opacity improves readability --- user/app/doom-emacs/config.el | 4 ++-- user/app/doom-emacs/doom.org | 4 ++-- user/app/terminal/alacritty.nix | 2 +- user/app/terminal/kitty.nix | 2 +- user/wm/hyprland/hyprland.nix | 12 ++++++------ 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/user/app/doom-emacs/config.el b/user/app/doom-emacs/config.el index c268a10..e1aed01 100644 --- a/user/app/doom-emacs/config.el +++ b/user/app/doom-emacs/config.el @@ -42,8 +42,8 @@ )) ;; On Linux I can enable blur, however (funcall (lambda () - (set-frame-parameter nil 'alpha-background 75) - (add-to-list 'default-frame-alist '(alpha-background . 75)) + (set-frame-parameter nil 'alpha-background 85) + (add-to-list 'default-frame-alist '(alpha-background . 85)) )) ) diff --git a/user/app/doom-emacs/doom.org b/user/app/doom-emacs/doom.org index 7c7510b..d60fa33 100644 --- a/user/app/doom-emacs/doom.org +++ b/user/app/doom-emacs/doom.org @@ -105,8 +105,8 @@ Doom Emacs is traditionally installed by cloning the repository ([[https://githu )) ;; On Linux I can enable blur, however (funcall (lambda () - (set-frame-parameter nil 'alpha-background 75) - (add-to-list 'default-frame-alist '(alpha-background . 75)) + (set-frame-parameter nil 'alpha-background 85) + (add-to-list 'default-frame-alist '(alpha-background . 85)) )) ) diff --git a/user/app/terminal/alacritty.nix b/user/app/terminal/alacritty.nix index 8cec461..8dd7a18 100644 --- a/user/app/terminal/alacritty.nix +++ b/user/app/terminal/alacritty.nix @@ -6,6 +6,6 @@ ]; programs.alacritty.enable = true; programs.alacritty.settings = { - window.opacity = lib.mkForce 0.75; + window.opacity = lib.mkForce 0.85; }; } diff --git a/user/app/terminal/kitty.nix b/user/app/terminal/kitty.nix index a4ea19f..a2d0b51 100644 --- a/user/app/terminal/kitty.nix +++ b/user/app/terminal/kitty.nix @@ -6,7 +6,7 @@ ]; programs.kitty.enable = true; programs.kitty.settings = { - background_opacity = lib.mkForce "0.75"; + background_opacity = lib.mkForce "0.85"; modify_font = "cell_width 90%"; }; } diff --git a/user/wm/hyprland/hyprland.nix b/user/wm/hyprland/hyprland.nix index 2231365..5499be7 100644 --- a/user/wm/hyprland/hyprland.nix +++ b/user/wm/hyprland/hyprland.nix @@ -302,14 +302,14 @@ in windowrulev2 = opacity 0.80,title:ORUI windowrulev2 = opacity 1.0,class:^(org.qutebrowser.qutebrowser),fullscreen:1 - windowrulev2 = opacity 0.90,class:^(Element)$ + windowrulev2 = opacity 0.85,class:^(Element)$ windowrulev2 = opacity 1.0,class:^(Brave-browser),fullscreen:1 windowrulev2 = opacity 1.0,class:^(librewolf),fullscreen:1 - windowrulev2 = opacity 0.75,title:^(My Local Dashboard Awesome Homepage - qutebrowser)$ - windowrulev2 = opacity 0.75,title:\[.*\] - My Local Dashboard Awesome Homepage - windowrulev2 = opacity 0.9,class:^(org.keepassxc.KeePassXC)$ - windowrulev2 = opacity 0.75,class:^(org.gnome.Nautilus)$ - windowrulev2 = opacity 0.75,class:^(org.gnome.Nautilus)$ + windowrulev2 = opacity 0.85,title:^(My Local Dashboard Awesome Homepage - qutebrowser)$ + windowrulev2 = opacity 0.85,title:\[.*\] - My Local Dashboard Awesome Homepage + windowrulev2 = opacity 0.85,class:^(org.keepassxc.KeePassXC)$ + windowrulev2 = opacity 0.85,class:^(org.gnome.Nautilus)$ + windowrulev2 = opacity 0.85,class:^(org.gnome.Nautilus)$ layerrule = blur,waybar layerrule = xray,waybar From cd68eedf59d59f59385902a0fad0dbf7283f6a74 Mon Sep 17 00:00:00 2001 From: Emmet Date: Sat, 15 Jun 2024 12:55:58 -0500 Subject: [PATCH 5/7] My sun... it's setting... It's dark, so dark... --- user/app/doom-emacs/config.el | 3 --- user/app/doom-emacs/doom.org | 4 +--- user/app/doom-emacs/packages.el | 1 + 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/user/app/doom-emacs/config.el b/user/app/doom-emacs/config.el index e1aed01..8f6507f 100644 --- a/user/app/doom-emacs/config.el +++ b/user/app/doom-emacs/config.el @@ -51,9 +51,6 @@ (add-hook 'marginalia-mode-hook #'all-the-icons-completion-marginalia-setup) (all-the-icons-completion-mode) -;; Lighter/darker backgrounds can get annoying -(solaire-global-mode -1) - ;; Grammar tasing should be voluntary (setq writegood-mode nil) diff --git a/user/app/doom-emacs/doom.org b/user/app/doom-emacs/doom.org index d60fa33..ec9c63e 100644 --- a/user/app/doom-emacs/doom.org +++ b/user/app/doom-emacs/doom.org @@ -114,9 +114,6 @@ Doom Emacs is traditionally installed by cloning the repository ([[https://githu (add-hook 'marginalia-mode-hook #'all-the-icons-completion-marginalia-setup) (all-the-icons-completion-mode) -;; Lighter/darker backgrounds can get annoying -(solaire-global-mode -1) - ;; Grammar tasing should be voluntary (setq writegood-mode nil) @@ -2072,6 +2069,7 @@ Any git package can be configured for a particular commit or branch: (package! org-ql) (package! persist) (package! sudo-edit) +(package! solaire-mode :disable t) #+END_SRC * Nix Integration In order to have Nix load my Doom Emacs configuration [[./doom.nix][doom.nix]], which I source in the =imports= block of my [[../../../profiles/work/home.nix][home.nix]]. diff --git a/user/app/doom-emacs/packages.el b/user/app/doom-emacs/packages.el index 2d797b7..f1e94d3 100644 --- a/user/app/doom-emacs/packages.el +++ b/user/app/doom-emacs/packages.el @@ -31,3 +31,4 @@ (package! org-ql) (package! persist) (package! sudo-edit) +(package! solaire-mode :disable t) From 9c1b371f2de4458759c387c4733f3f3b02175acc Mon Sep 17 00:00:00 2001 From: Emmet Date: Sat, 15 Jun 2024 20:38:23 -0500 Subject: [PATCH 6/7] Trying new emojis --- user/style/stylix.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/user/style/stylix.nix b/user/style/stylix.nix index 6c2e492..1aa70a9 100644 --- a/user/style/stylix.nix +++ b/user/style/stylix.nix @@ -33,8 +33,8 @@ in package = userSettings.fontPkg; }; emoji = { - name = "Noto Color Emoji"; - package = pkgs.noto-fonts-emoji-blob-bin; + name = "Noto Emoji"; + package = pkgs.noto-fonts-monochrome-emoji; }; sizes = { terminal = 18; @@ -107,7 +107,7 @@ in ''; home.packages = with pkgs; [ - libsForQt5.qt5ct pkgs.libsForQt5.breeze-qt5 libsForQt5.breeze-icons + libsForQt5.qt5ct pkgs.libsForQt5.breeze-qt5 libsForQt5.breeze-icons pkgs.noto-fonts-monochrome-emoji ]; qt = { enable = true; From 87443f927f947b16c0b9b6628f0b1fbe1c9b974c Mon Sep 17 00:00:00 2001 From: Emmet Date: Sat, 15 Jun 2024 20:38:31 -0500 Subject: [PATCH 7/7] Removed unnecessary fonts --- system/wm/fonts.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/system/wm/fonts.nix b/system/wm/fonts.nix index a75544c..d4b1793 100644 --- a/system/wm/fonts.nix +++ b/system/wm/fonts.nix @@ -4,14 +4,8 @@ # Fonts are nice to have fonts.packages = with pkgs; [ # Fonts - (nerdfonts.override { fonts = [ "Inconsolata" ]; }) + nerdfonts powerline - inconsolata - inconsolata-nerdfont - iosevka - font-awesome - ubuntu_font_family - terminus_font ]; }