From b0329750e2699ed11515586a8e633b79b8d24bc7 Mon Sep 17 00:00:00 2001
From: kiana-S <kiana.a.sheibani@gmail.com>
Date: Sat, 8 Oct 2022 21:31:02 -0400
Subject: [PATCH] Finalize design changes

---
 common/config/config.nix                 | 4 +---
 common/home-manager/wayland/sway.nix     | 5 ++++-
 common/home-manager/wayland/swaylock.nix | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/common/config/config.nix b/common/config/config.nix
index 62dd722..614216f 100644
--- a/common/config/config.nix
+++ b/common/config/config.nix
@@ -42,9 +42,7 @@
       noto-fonts
       noto-fonts-cjk
       noto-fonts-emoji
-      font-awesome
       (nerdfonts.override { fonts = [ "UbuntuMono" "JetBrainsMono" ]; })
-      meslo-lgs-nf
       victor-mono
       ubuntu_font_family
     ];
@@ -54,7 +52,7 @@
       defaultFonts = {
         serif = [ "Noto Serif" ];
         sansSerif = [ "Noto Sans" ];
-        monospace = [ "Meslo Nerd Font" ];
+        monospace = [ "VictorMono" ];
       };
     };
   };
diff --git a/common/home-manager/wayland/sway.nix b/common/home-manager/wayland/sway.nix
index 7601f61..1d5b619 100644
--- a/common/home-manager/wayland/sway.nix
+++ b/common/home-manager/wayland/sway.nix
@@ -82,10 +82,13 @@ in {
           "${modifier}+t" = "layout tabbed";
           "${modifier}+Shift+m" = "exec swaylock";
 
+          # Emacs Everywhere
+          "${modifier}+Mod1+e" = "emacsclient --eval '(emacs-everywhere)'";
+
           # Screenshot
           "Print"             = ''exec grim ${filename}'';
           "Shift+Print"       = ''exec grim -g "$(slurp)" ${filename}'';
-          "Control+Print" = ''exec grim -g "$(swaymsg -t get_tree | jq -j '.. | select(.type?) | select(.focused).rect | "\(.x),\(.y) \(.width)x\(.height)"')" ${filename}'';
+          "Mod1+Print" = ''exec grim -g "$(swaymsg -t get_tree | jq -j '.. | select(.type?) | select(.focused).rect | "\(.x),\(.y) \(.width)x\(.height)"')" ${filename}'';
 
           # Special XF86 key bindings
           "XF86AudioRaiseVolume"       = audio "-ui 2";
diff --git a/common/home-manager/wayland/swaylock.nix b/common/home-manager/wayland/swaylock.nix
index 29fe6ee..641a301 100644
--- a/common/home-manager/wayland/swaylock.nix
+++ b/common/home-manager/wayland/swaylock.nix
@@ -26,7 +26,7 @@
 
 
       clock
-      datestr=%A, %Y-%m-%e
+      datestr=%A, %Y-%m-%d
 
       effect-scale=0.4
       effect-vignette=0.3:0.7