From dfd8c57b609de9395cd6f38645a3699e16d81fbc Mon Sep 17 00:00:00 2001
From: Amneesh Singh <natto@weirdnatto.in>
Date: Tue, 6 Dec 2022 19:31:20 +0530
Subject: [PATCH] home/natto: emacs: use firacode and misc changes

Signed-off-by: Amneesh Singh <natto@weirdnatto.in>
---
 home/natto/config/bspwm/bspwmrc          |  0
 home/natto/config/dwm/autostart.sh       |  0
 home/natto/config/dwm/bruhstatus.sh      |  0
 home/natto/config/emacs/config.org       | 20 ++++++++++++++++----
 home/natto/config/xmonad/padding-icon.sh |  0
 home/natto/patches/dmenu.patch           |  0
 home/natto/patches/dwm.patch             |  0
 home/natto/pkgs.nix                      |  9 +++++----
 home/natto/programs.nix                  |  1 -
 9 files changed, 21 insertions(+), 9 deletions(-)
 mode change 100755 => 100644 home/natto/config/bspwm/bspwmrc
 mode change 100755 => 100644 home/natto/config/dwm/autostart.sh
 mode change 100755 => 100644 home/natto/config/dwm/bruhstatus.sh
 mode change 100755 => 100644 home/natto/config/xmonad/padding-icon.sh
 mode change 100755 => 100644 home/natto/patches/dmenu.patch
 mode change 100755 => 100644 home/natto/patches/dwm.patch

diff --git a/home/natto/config/bspwm/bspwmrc b/home/natto/config/bspwm/bspwmrc
old mode 100755
new mode 100644
diff --git a/home/natto/config/dwm/autostart.sh b/home/natto/config/dwm/autostart.sh
old mode 100755
new mode 100644
diff --git a/home/natto/config/dwm/bruhstatus.sh b/home/natto/config/dwm/bruhstatus.sh
old mode 100755
new mode 100644
diff --git a/home/natto/config/emacs/config.org b/home/natto/config/emacs/config.org
index f0dcce1..859b3b9 100644
--- a/home/natto/config/emacs/config.org
+++ b/home/natto/config/emacs/config.org
@@ -29,8 +29,8 @@ idk random variables to match my color theme
 * Settings
 ** Setting the default face
 #+begin_src emacs-lisp
-(set-frame-font "Monoid 12" nil t)
-(add-to-list 'default-frame-alist '(font . "Monoid-12"))
+(set-frame-font "Fira Code 12" nil t)
+(add-to-list 'default-frame-alist '(font . "Fira Code-12"))
 #+end_src
 
 ** Some mode settings based on personal preferences
@@ -394,10 +394,22 @@ For autocomplete
 #+end_src
 
 * Random eye candy stuff
+** Ligature
 #+begin_src emacs-lisp
-(use-package pretty-mode
+(use-package ligature
   :config
-  (global-pretty-mode t))
+  (ligature-set-ligatures 't '("www"))
+  (ligature-set-ligatures 'prog-mode '("www" "**" "***" "**/" "*>" "*/" "\\\\" "\\\\\\" "{-" "::"
+                                      ":::" ":=" "!!" "!=" "!==" "-}" "----" "-->" "->" "->>"
+                                      "-<" "-<<" "-~" "#{" "#[" "##" "###" "####" "#(" "#?" "#_"
+                                      "#_(" ".-" ".=" ".." "..<" "..." "?=" "??" ";;" "/*" "/**"
+                                      "/=" "/==" "/>" "//" "///" "&&" "||" "||=" "|=" "|>" "^=" "$>"
+                                      "++" "+++" "+>" "=:=" "==" "===" "==>" "=>" "=>>" "<="
+                                      "=<<" "=/=" ">-" ">=" ">=>" ">>" ">>-" ">>=" ">>>" "<*"
+                                      "<*>" "<|" "<|>" "<$" "<$>" "<!--" "<-" "<--" "<->" "<+"
+                                      "<+>" "<=" "<==" "<=>" "<=<" "<>" "<<" "<<-" "<<=" "<<<"
+                                      "<~" "<~~" "</" "</>" "~@" "~-" "~>" "~~" "~~>" "%%"))
+  (global-ligature-mode t))
 #+end_src
 
 * Custom mode line
diff --git a/home/natto/config/xmonad/padding-icon.sh b/home/natto/config/xmonad/padding-icon.sh
old mode 100755
new mode 100644
diff --git a/home/natto/patches/dmenu.patch b/home/natto/patches/dmenu.patch
old mode 100755
new mode 100644
diff --git a/home/natto/patches/dwm.patch b/home/natto/patches/dwm.patch
old mode 100755
new mode 100644
diff --git a/home/natto/pkgs.nix b/home/natto/pkgs.nix
index 8e27fc4..1017561 100644
--- a/home/natto/pkgs.nix
+++ b/home/natto/pkgs.nix
@@ -5,7 +5,8 @@
     # A/V, codec and media stuff
     ffmpeg-full
     sox
-    pamixer mpdas
+    pamixer
+    mpdas
     mpv
     mpc_cli
     pulseaudio
@@ -19,8 +20,8 @@
     rage
     curl
     (dmenu.override { patches = [ ./patches/dmenu.patch ]; })
-    (st.override { 
-      patches = [ ./patches/st.patch ]; 
+    (st.override {
+      patches = [ ./patches/st.patch ];
       extraLibs = [ harfbuzz ];
     })
     yt-dlp
@@ -73,6 +74,7 @@
     citra
     yuzu
     ryujinx
+    gaming.osu-stable
 
     # Dev shit
     rust-analyzer
@@ -98,7 +100,6 @@
     inform7
 
     # Misc
-    teams
     anki-bin
     tor-browser-bundle-bin
     mailcap
diff --git a/home/natto/programs.nix b/home/natto/programs.nix
index edf740e..7a7c2e9 100644
--- a/home/natto/programs.nix
+++ b/home/natto/programs.nix
@@ -3,7 +3,6 @@
   programs = {
     firefox = {
       enable = true;
-      package = pkgs.master.firefox;
       profiles.natto = {
         name = "natto";
       };