X-Git-Url: https://git.armaanb.net/?a=blobdiff_plain;f=config.org;h=a7f47bc128ecb9fd00403355a53dae3d5dd4e698;hb=e6efdeb53d3643c1b979314a82fe0333057826e2;hp=f3b1334ba386159471b9a7db90154dbbdfc964a0;hpb=f7873c9ce8d0fefc97fd1228e6befe096e5ade07;p=config.org.git

diff --git a/config.org b/config.org
index f3b1334..a7f47bc 100644
--- a/config.org
+++ b/config.org
@@ -6,7 +6,7 @@
 * Welcome
 Welcome to my system configuration! This file contains my Emacs configuration, but also my config files for many of the other programs on my system!
 ** Compatability
-I am currently using Emacs 28 with native compilation, so some settings and packages may not be available for older versions of Emacs. This is a purely personal configuration, so while I can guarantee that it works on my setup, it might not work for you.
+I am currently using Emacs 27.2 on Linux, so some settings and packages may not be available for older versions of Emacs. This is a purely personal configuration, so while I can guarantee that it works on my setup, it might not work for you.
 ** Choices
 I chose to create a powerful, yet not overly heavy Emacs configuration. Things like a fancy modeline, icons, or LSP mode do not increase my productivity, and create visual clutter, and thus have been excluded.
 
@@ -201,7 +201,11 @@ Makes commenting super easy
 ** Undo redo
 Fix the oopsies!
 #+begin_src emacs-lisp
-  (evil-set-undo-system 'undo-redo)
+  (use-package undo-fu
+    :config (evil-set-undo-system 'undo-fu))
+
+  (use-package undo-fu-session
+    :config (global-undo-fu-session-mode))
 #+end_src
 ** Number incrementing
 Add back C-a/C-x bindings.
@@ -234,7 +238,7 @@ Add back C-a/C-x bindings.
     :custom
     (org-ellipsis " ▾")
     (org-agenda-start-with-log-mode t)
-    (org-agenda-files (quote ("~/Org/tasks.org" "~/Org/break.org")))
+    (org-agenda-files (quote ("~/org/tasks.org")))
     (org-log-done 'time)
     (org-log-into-drawer t)
     (org-src-tab-acts-natively t)
@@ -774,9 +778,9 @@ I'm not a huge fan of how spectrwm handles keybindings, probably my biggest grip
 **** WM actions
 #+begin_src conf :tangle ~/.spectrwm.conf
   program[term] = st -e tmux
-  program[screenshot_all] = flameshot gui
   program[notif] = /home/armaa/src/bin/setter status
   program[pass] = /home/armaa/src/bin/passmenu
+  program[lock] = slock
 
   bind[notif] = MOD+n
   bind[pass] = MOD+Shift+p
@@ -788,18 +792,12 @@ I'm not a huge fan of how spectrwm handles keybindings, probably my biggest grip
   program[pamute] = /home/armaa/src/bin/setter audio
   program[brigup] = /home/armaa/src/bin/setter brightness +10%
   program[brigdown] = /home/armaa/src/bin/setter brightness 10%-
-  program[next] = playerctl next
-  program[prev] = playerctl previous
-  program[pause] = playerctl play-pause
 
   bind[padown] = XF86AudioLowerVolume
   bind[paup] = XF86AudioRaiseVolume
   bind[pamute] = XF86AudioMute
   bind[brigdown] = XF86MonBrightnessDown
   bind[brigup] = XF86MonBrightnessUp
-  bind[pause] = XF86AudioPlay
-  bind[next] = XF86AudioNext
-  bind[prev] = XF86AudioPrev
 #+end_src
 **** HJKL
 #+begin_src conf :tangle ~/.spectrwm.conf
@@ -834,6 +832,7 @@ Float some specific programs by default.
 #+begin_src conf :tangle ~/.spectrwm.conf
   quirk[Castle Menu] = FLOAT
   quirk[momen] = FLOAT
+  quirk[pinentry-fltk] = FLOAT
 #+end_src
 ** Ash
 *** Options
@@ -857,7 +856,7 @@ Use the vi editing mode. I still haven't found a good way to show visual feedbac
   }
 
   _uup() {
-      rsync "$1" "root@armaanb.net:/var/ftp/pub/$2" --chmod 644
+      rsync "$1" "armaa@armaanb.net:/srv/ftp/pub/$2" --chmod 644 --progress
   }
 
   ufile() {
@@ -894,22 +893,21 @@ Use the vi editing mode. I still haven't found a good way to show visual feedbac
   export LC_ALL="en_US.UTF-8"
   export LC_CTYPE="en_US.UTF-8"
   export LANGUAGE="en_US.UTF-8"
-
-  export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig"
+  export TZ="America/New_York"
 
   export KISS_PATH=""
+  export KISS_PATH="$KISS_PATH:$HOME/repos/personal"
   export KISS_PATH="$KISS_PATH:$HOME/repos/bin/bin"
-  export KISS_PATH="$KISS_PATH:$HOME/repos/community/community"
   export KISS_PATH="$KISS_PATH:$HOME/repos/main/core"
   export KISS_PATH="$KISS_PATH:$HOME/repos/main/extra"
   export KISS_PATH="$KISS_PATH:$HOME/repos/main/xorg"
-  export KISS_PATH="$KISS_PATH:$HOME/repos/main/xorg"
+  export KISS_PATH="$KISS_PATH:$HOME/repos/community/community"
   export KISS_PATH="$KISS_PATH:$HOME/repos/mid/ports"
-  export KISS_PATH="$KISS_PATH:$HOME/repos/personal"
 
   export CFLAGS="-O3 -pipe -march=native"
   export CXXFLAGS="$CFLAGS"
   export MAKEFLAGS="-j$(nproc)"
+  export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig"
 
   export XDG_DESKTOP_DIR="/dev/null"
   export XDG_DOCUMENTS_DIR="$HOME/documents"
@@ -917,12 +915,11 @@ Use the vi editing mode. I still haven't found a good way to show visual feedbac
   export XDG_MUSIC_DIR="$HOME/music"
   export XDG_PICTURES_DIR="$HOME/pictures"
   export XDG_VIDEOS_DIR="$HOME/videos"
-
 #+end_src
 *** Aliases
 **** SSH
 #+begin_src shell :tangle ~/.config/ash/ashrc
-  alias bhoji-drop='ssh -p 23 root@armaanb.net'
+  alias poki='ssh armaanb.net'
   alias irc='ssh root@armaanb.net -t abduco -A irc catgirl freenode'
   alias union='ssh 192.168.1.18'
   alias mine='ssh -p 23 root@pickupserver.cc'
@@ -945,7 +942,7 @@ Use the vi editing mode. I still haven't found a good way to show visual feedbac
   alias ln='ln -v'
   alias grep='grep -in'
   alias mkdir='mkdir -pv'
-  alias lanex='java -jar ~/.local/share/lxc/lanxchange.jar'
+  alias lanex='java -jar ~/.local/share/lxc/lanxchange.jar && rm lxc*'
   emacs() { $EDITOR "$@" & }
   alias vim="emacs"
 #+end_src
@@ -963,14 +960,14 @@ Use the vi editing mode. I still haven't found a good way to show visual feedbac
   alias gps='gpg --keyserver keyserver.ubuntu.com --search-keys'
   alias gpp='gpg --keyserver keyserver.ubuntu.com --recv-key'
   alias plan='T=$(mktemp) && \
-          rsync root@armaanb.net:/etc/finger/plan.txt "$T" && \
+          rsync armaanb.net:/home/armaa/plan.txt "$T" && \
           TT=$(mktemp) && \
           head -n -2 $T > $TT && \
           /bin/nvim $TT && \
           echo >> "$TT" && \
           echo "Last updated: $(date -R)" >> "$TT" && \
           fold -sw 72 "$TT" > "$T"| \
-          rsync "$T" root@armaanb.net:/etc/finger/plan.txt && \
+          rsync "$T" armaanb.net:/home/armaa/plan.txt && \
           rm -f "$T"'
 #+end_src
 **** Virtual machines, chroots
@@ -1068,6 +1065,11 @@ This file is used for any GNU Readline programs. I use Emacs editing mode mostly
   gpgsign = true
   verbose = true
 #+end_src
+*** Tag
+#+begin_src conf :tangle ~/.gitconfig
+  [tag]
+  gpgsign = true
+#+end_src
 ** Zathura
 The best document reader!
 *** Options
@@ -1150,27 +1152,21 @@ I use tmux in order to keep my st build light. Still learning how it works.
 #+end_src
 *** Agent
 #+begin_src conf :tangle ~/.gnupg/gpg-agent.conf
-  pinentry-program /sbin/pinentry-fltk
+  pinentry-program /sbin/pinentry
   max-cache-ttl 600
   default-cache-ttl 600
   allow-emacs-pinentry
 #+end_src
 ** Xmodmap
-#+begin_src conf :tangle ~/.config/xmodmap
-  !
+#+begin_src conf (if (eq system-name "frost.armaanb.net") ":tangle ~/.config/xmodmap")
   ! Unmap left super
-  !
   clear mod4
 
-  !
   ! Turn right alt into super
-  !
   remove mod1 = Alt_R
   add mod4 = Alt_R
 
-  !
   ! Swap caps and control
-  !
   remove Lock = Caps_Lock
   remove Control = Control_L
   remove Lock = Control_L