nvim: misc changes

- properly don't overwrite clipboard on s or c in visual mode
- added template for typst
- makefile now compiles with c++20

src/.config/fish/aliases.fish

@@ -42,12 +42,17 @@ function musrec
 	end
 end
 
+# discord in chromium
+function discord; chromium --profile-directory="Profile 2" --app=https://app.discord.com & disown; exit; end
+
 # git stuff
 abbr -a -- gs git status
 abbr -a -- gl git log
-abbr -a -- gc git commit -S
 abbr -a -- ga git add
-abbr -a -- gca git commit -aS
+abbr -a -- gcs git commit -S
+abbr -a -- gc git commit
+abbr -a -- gca git commit -a
+abbr -a -- gas git commit -aS
 abbr -a -- gp git push
 abbr -a --position anywhere -- pgh "&& git push gh"
 

src/.config/nvim/init.vim

@@ -23,7 +23,9 @@ set lazyredraw nocursorline ttyfast
 set clipboard=unnamedplus
 " when using c or s, do not overwrite clipboard
 nnoremap c "-c
+vnoremap c "-c
 nnoremap s "-s
+vnoremap s "-s
 
 let mapleader = ","
 

src/.config/nvim/makefile

@@ -2,7 +2,7 @@
 
 ~/.cache/termdebug/bin/%: %.cpp
 	mkdir -p ~/.cache/termdebug/bin/
-	$(LINK.cpp) -g -Wall -Wpedantic $^ $(LOADLIBES) $(LDLIBS) -o $@
+	$(LINK.cpp) -g -Wall -Wpedantic -std=c++20 $^ $(LOADLIBES) $(LDLIBS) -o $@
 
 ~/.cache/termdebug/bin/%: %.c
 	mkdir -p ~/.cache/termdebug/bin/

src/.config/nvim/ultisnips/typst.snippets

@@ -1,13 +1,22 @@
 snippet problem "template for problem notes" bi
 #import "../templates/problems.typ": template, source_code, status
 #show: template.with(
-  title: "$1",
+  problem_url: "$1",
-  problem_url: "$2",
+  title: "$2",
   stat: "${3:incomplete}",
 )
 
 endsnippet
 
+snippet contest "template for contest problems" bi
+#import "../../templates/contest.typ": template, source_code, status
+#show: template.with(
+  title: "$1",
+  stat: "${2:incomplete}",
+)
+
+endsnippet
+
 snippet algs "template for compsci notes" bi
 #import "../templates/algs.typ": template, source_code
 #show: template.with(

src/.config/xcompose/emoji

@@ -0,0 +1,16 @@
+# This file is autogenerated by emoji.py.
+
+<Multi_key> <Escape> <p> <e> <n> <s> : "😔"
+<Multi_key> <Escape> <c> <l> <o> <w> : "🤡"
+<Multi_key> <Escape> <s> <u> <n> <g> : "😎"
+<Multi_key> <Escape> <t> <h> <u> : "👍"
+<Multi_key> <Escape> <s> <o> <b> : "😭"
+<Multi_key> <Escape> <f> <r> <o> <g> : "🐸"
+<Multi_key> <Escape> <i> <n> <n> <o> <c> : "😇"
+<Multi_key> <Escape> <v> : "✌️"
+<Multi_key> <Escape> <r> <e> <l> <i> <e> <v> : "😌"
+<Multi_key> <Escape> <s> <k> <u> <l> : "💀"
+<Multi_key> <Escape> <e> <y> <e> <s> : "👀"
+<Multi_key> <Escape> <e> <y> <e> : "👁️"
+<Multi_key> <Escape> <t> <h> <i> <n> <k> : "🤔"
+<Multi_key> <Escape> <w> <a> <v> <e> : "👋"

src/.config/xcompose/emoji.py

@@ -0,0 +1,28 @@
+#!/usr/bin/env python
+# compiles list of emoji into valid xcompose file
+# ./emoji.py > emoji
+
+emoji = """
+😔 pens
+🤡 clow
+😎 sung
+👍 thu
+😭 sob
+🐸 frog
+😇 innoc
+✌️  v
+😌 reliev
+💀 skul
+👀 eyes
+👁️ eye
+🤔 think
+👋 wave
+""".strip()
+
+prefix = "<Multi_key> <Escape>"
+
+print("# This file is autogenerated by emoji.py.\n")
+for line in emoji.split("\n"):
+    sym, name = line.split()
+    codes = " ".join([f"<{char}>" for char in name])
+    print(f"{prefix} {codes} : \"{sym}\"")

src/.config/xcompose/main

@@ -0,0 +1,5 @@
+# include default settings
+include "%L"
+
+# emoji
+include "%H/.config/xcompose/emoji"

src/.local/bin/keyboard.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+# Set keyboard settings
+setxkbmap -layout us,ca -variant basic,fr -option 'grp:alts_toggle, caps:swapescape, compose:rctrl'
+xset r rate 300 50

src/.local/bin/mon-on.example

@@ -10,10 +10,6 @@ xsetwacom set 17 MapToOutput eDP1
 xsetwacom set 18 MapToOutput eDP1
 xsetwacom set 23 MapToOutput eDP1
 
-# Set keyboard settings
-setxkbmap -layout au,us,ca -variant basic,haw,multi -option 'grp:win_space_toggle, caps:swapescape'
-xset r rate 300 50
-
 # Configure touchpad sensitivity
 
 # To change this:

src/.xinitrc

@@ -10,6 +10,7 @@ fi
 if [ $SYSTEM_PROFILE = "DEFAULT" ]; then
 	picom &
 fi
+battwatch.sh &
 xwallpaper --center .config/wall.png
 # Host specific wallpapers
 wallpaper
@@ -30,7 +31,12 @@ export DBUS_SESSION_BUS_WINDOWID
 # IME
 export GTK_IM_MODULE=fcitx
 export QT_IM_MODULE=fcitx
-export XMODIFIERS=@im=fcitx
+# for some reason this breaks deadkeys
+#export XMODIFIERS=@im=fcitx
+
+# set up keyboard
+keyboard.sh
+export XCOMPOSEFILE="$XDG_CONFIG_HOME"/xcompose/main
 
 while true; do
 	DATE=$(date +'%H:%M:%S %a %b %d')