From 9c95870b2b1f5d8c36d3720db9bc8839ab95b1c8 Mon Sep 17 00:00:00 2001 From: nathan mccarty Date: Sun, 3 Jul 2022 23:34:12 -0400 Subject: [PATCH] Cosmetic tweaks --- doom.d/config.el | 24 ++++++++----- doom.d/config.org | 32 +++++++++++------ home-manager/programs/core.nix | 2 ++ home-manager/programs/sway.nix | 65 ++++++++++++++++++---------------- 4 files changed, 73 insertions(+), 50 deletions(-) diff --git a/doom.d/config.el b/doom.d/config.el index ea903c4..d4428f8 100644 --- a/doom.d/config.el +++ b/doom.d/config.el @@ -22,7 +22,8 @@ ;; accept. For example: ;; (setq doom-font (font-spec :family "FiraCode Nerd Font" :size 11 :weight 'semi-light) - doom-variable-pitch-font (font-spec :family "Fira Sans" :size 15)) + doom-unicode-font (font-spec :family "FiraCode Nerd Font" :size 11 :weight 'semi-light) + doom-variable-pitch-font (font-spec :family "Fira" :size 15)) ;; ;; If you or Emacs can't find your font, use 'M-x describe-font' to look them ;; up, `M-x eval-region' to execute elisp code, and 'M-x doom/reload-font' to @@ -99,7 +100,8 @@ :config (setq mixed-pitch-set-height t)) -(setq doom-modeline-buffer-file-name-style 'truncate-with-project) +(setq doom-modeline-buffer-file-name-style 'truncate-with-project + doom-modeline-mu4e t) (display-time-mode 1) @@ -338,10 +340,14 @@ work if it thinks it needs to." message-sendmail-extra-arguments '("--read-envelope-from") message-send-mail-function #'message-send-mail-with-sendmail)) -(set-email-account! "mccarty.io" - '((mu4e-sent-folder . "/nathan@mccarty.io/Sent") - (mu4e-drafts-folder . "/nathan@mccarty.io/Drafts") - (mu4e-trash-folder . "/nathan@mccarty.io/Trash") - (mu4e-refile-folder . "/nathan@mccarty.io/Archive") - (smtpmail-smtp-user . "nathan@mccarty.io")) - t) +(after! mu4e + (set-email-account! "mccarty.io" + '((mu4e-sent-folder . "/nathan@mccarty.io/Sent") + (mu4e-drafts-folder . "/nathan@mccarty.io/Drafts") + (mu4e-trash-folder . "/nathan@mccarty.io/Trash") + (mu4e-refile-folder . "/nathan@mccarty.io/Archive") + (smtpmail-smtp-user . "nathan@mccarty.io")) + t)) + +(after! mu4e + (mu4e-alert-enable-mode-line-display)) diff --git a/doom.d/config.org b/doom.d/config.org index 202d37e..4f5e8a8 100644 --- a/doom.d/config.org +++ b/doom.d/config.org @@ -33,7 +33,8 @@ The provided default ~config.el~ ;; accept. For example: ;; (setq doom-font (font-spec :family "FiraCode Nerd Font" :size 11 :weight 'semi-light) - doom-variable-pitch-font (font-spec :family "Fira Sans" :size 15)) + doom-unicode-font (font-spec :family "FiraCode Nerd Font" :size 11 :weight 'semi-light) + doom-variable-pitch-font (font-spec :family "Fira" :size 15)) ;; ;; If you or Emacs can't find your font, use 'M-x describe-font' to look them ;; up, `M-x eval-region' to execute elisp code, and 'M-x doom/reload-font' to @@ -122,9 +123,12 @@ This tweak applies to: Setting ~mixed-pitch-set-height~ is required to get ~mixed-pitch-mode~ to render fonts with the correct size in doom emacs, apparently. ** Modeline configuration -Configure the modeline to truncate with project (so that ~~/Projects/Asuran/replicator/src/lib.rs~ becomes ~replicator/s/lib.rs~) +Configure the modeline to: + + truncate with project (so that ~~/Projects/Asuran/replicator/src/lib.rs~ becomes ~replicator/s/lib.rs~) + + Show the mu4e alert #+begin_src emacs-lisp -(setq doom-modeline-buffer-file-name-style 'truncate-with-project) +(setq doom-modeline-buffer-file-name-style 'truncate-with-project + doom-modeline-mu4e t) #+end_src Display the current time in the modeline @@ -539,13 +543,19 @@ First, tell mu4e to use msmtp message-sendmail-extra-arguments '("--read-envelope-from") message-send-mail-function #'message-send-mail-with-sendmail)) #+end_src -Then tell it where our account's stuff is +Tell it where our account's stuff is #+begin_src emacs-lisp -(set-email-account! "mccarty.io" - '((mu4e-sent-folder . "/nathan@mccarty.io/Sent") - (mu4e-drafts-folder . "/nathan@mccarty.io/Drafts") - (mu4e-trash-folder . "/nathan@mccarty.io/Trash") - (mu4e-refile-folder . "/nathan@mccarty.io/Archive") - (smtpmail-smtp-user . "nathan@mccarty.io")) - t) +(after! mu4e + (set-email-account! "mccarty.io" + '((mu4e-sent-folder . "/nathan@mccarty.io/Sent") + (mu4e-drafts-folder . "/nathan@mccarty.io/Drafts") + (mu4e-trash-folder . "/nathan@mccarty.io/Trash") + (mu4e-refile-folder . "/nathan@mccarty.io/Archive") + (smtpmail-smtp-user . "nathan@mccarty.io")) + t)) +#+end_src +Tell it to enable the modeline display +#+begin_src emacs-lisp +(after! mu4e + (mu4e-alert-enable-mode-line-display)) #+end_src diff --git a/home-manager/programs/core.nix b/home-manager/programs/core.nix index ef9379d..918ee16 100644 --- a/home-manager/programs/core.nix +++ b/home-manager/programs/core.nix @@ -20,6 +20,8 @@ with lib; choose # Man but terse tealdeer + # rsync for _The Cloud_ :tm: + rclone ]; }) (mkIf config.nathan.programs.util.productivity { diff --git a/home-manager/programs/sway.nix b/home-manager/programs/sway.nix index 3386cb6..f1bfb50 100644 --- a/home-manager/programs/sway.nix +++ b/home-manager/programs/sway.nix @@ -57,9 +57,19 @@ with lib; smartGaps = true; inner = 9; }; - # disable borders + # Window configuration window = { - border = 0; + # Configure borders + border = 2; + # Application specific configuration + commands = [ + { + command = "floating enable"; + criteria = { + app_id = "pinentry-qt"; + }; + } + ]; }; # Use windows key as modifier modifier = "Mod4"; @@ -67,7 +77,7 @@ with lib; terminal = "alacritty"; # Use krunner (from kde) as our launcher menu = '' - fuzzel -f Fira -b "103c48ff" -S "adbcbcff" -s "184956ff" -t "72898fff" -B 5 -r 5 -C "ed8649ff" + fuzzel -f "Fira Sans" -b "103c48ff" -S "adbcbcff" -s "184956ff" -t "72898fff" -B 5 -r 5 -C "ed8649ff" ''; # Use waybar, but through systemd bars = [ @@ -77,38 +87,38 @@ with lib; ]; # Use fira fonts = { - names = [ "Fira" ]; + names = [ "Fira Sans" ]; size = 10.0; }; # Selenize it colors = { focused = { - border = "75b938"; - background = "184956"; - text = "adbcbc"; - indicator = "fa5750"; - childBorder = "75b938"; + border = "#75b938"; + background = "#184956"; + text = "#adbcbc"; + indicator = "#84c747"; + childBorder = "#75b938"; }; focusedInactive = { - border = "84c747"; - background = "103c48"; - text = "adbcbc"; - indicator = "fa5750"; - childBorder = "84c747"; + border = "#41c7b9"; + background = "#103c48"; + text = "#adbcbc"; + indicator = "#53d6c7"; + childBorder = "#41c7b9"; }; unfocused = { - border = "72898f"; - background = "103c48"; - text = "72898f"; - indicator = "fa5750"; - childBorder = "72898f"; + border = "#72898f"; + background = "#103c48"; + text = "#72898f"; + indicator = "#adbcbc"; + childBorder = "#72898f"; }; urgent = { - border = "f275be"; - background = "184956"; - text = "fa5750"; - indicator = "fa5750"; - childBorder = "f275be"; + border = "#f275be"; + background = "#184956"; + text = "#fa5750"; + indicator = "#fa5750"; + childBorder = "#f275be"; }; }; # Setup keybindings @@ -132,12 +142,7 @@ with lib; # Mako, the notification daemon { command = "mako"; } ]; - # Other stuff }; - # disable transparency for minecraft - extraConfig = '' - for_window [title=".*Minecraft.*"] opacity 1 - ''; }; ######################### ## Mako (notifications) @@ -151,7 +156,7 @@ with lib; # Border configuration borderSize = 3; # Use Fira Code for font - font = "Fira 10"; + font = "Fira Sans 10"; # Group by application groupBy = "app-name"; # Bottom right corner