Merge remote-tracking branch 'origin/master' into kargathkargath

4 files changed, 61 insertions, 18 deletions

diff --git a/git/gitconfig b/git/gitconfig
index cfd012c..e293a8c 100644
--- a/git/gitconfig
+++ b/git/gitconfig
@@ -22,5 +22,7 @@
 [push]
 	default = simple
 	recurseSubmodules = check
+[submodule]
+	recurse = true
 [log]
 	decorate = full
diff --git a/openbox/menu.xml b/openbox/menu.xml
index b3f83a5..d2919c6 100644
--- a/openbox/menu.xml
+++ b/openbox/menu.xml
@@ -9,7 +9,7 @@
   <item label="XTerm" icon="/usr/share/icons/hicolor/48x48/apps/xterm-color.png">
     <action name="Execute"><execute>x-terminal-emulator</execute></action>
   </item>
-  <item label="Chromium" icon="/usr/share/icons/hicolor/32x32/apps/chromium.png">
+  <item label="Web browser" icon="/usr/share/icons/gnome/32x32/apps/web-browser.png">
     <action name="Execute"><execute>x-www-browser</execute></action>
   </item>
   <item label="qpdfview" icon="/usr/share/icons/hicolor/scalable/apps/qpdfview.svg">
@@ -18,9 +18,15 @@
   <item label="Discord" icon="/usr/share/pixmaps/discord.png">
     <action name="Execute"><execute>discord</execute></action>
   </item>
+  <item label="Remmina" icon="/usr/share/icons/hicolor/48x48/apps/org.remmina.Remmina.png">
+    <action name="Execute"><execute>remmina</execute></action>
+  </item>
   <item label="Skype" icon="/usr/share/pixmaps/skypeforlinux.png">
     <action name="Execute"><execute>skypeforlinux</execute></action>
   </item>
+  <item label="Teams" icon="/usr/share/pixmaps/teams.png">
+    <action name="Execute"><execute>teams</execute></action>
+  </item>
   <item label="Eye of GNOME" icon="/usr/share/icons/hicolor/16x16/apps/eog.png">
     <action name="Execute"><execute>eog</execute></action>
   </item>
@@ -45,9 +51,12 @@
   <item label="Stellarium" icon="/usr/share/icons/hicolor/16x16/apps/stellarium.png">
     <action name="Execute"><execute>stellarium</execute></action>
   </item>
+  <item label="Solfege" icon="/usr/share/pixmaps/solfege.svg">
+    <action name="Execute"><execute>solfege</execute></action>
+  </item>
   <separator />
   <item label="Wireshark" icon="/usr/share/icons/hicolor/scalable/apps/wireshark.svg">
-    <action name="Execute"><execute>wireshark</execute></action>
+    <action name="Execute"><execute>wireshark-gtk</execute></action>
   </item>
   <separator />
   <item label="Shutdown">
diff --git a/sysctl/sysctl_desktop.conf b/sysctl/sysctl_desktop.conf
index bb6979c..01752ff 100644
--- a/sysctl/sysctl_desktop.conf
+++ b/sysctl/sysctl_desktop.conf
@@ -61,23 +61,14 @@
 
 ###################################################################
 # Magic system request Key
-# 0=disable, 1=enable all
-# Debian kernels have this set to 0 (disable the key)
-# See https://www.kernel.org/doc/Documentation/sysrq.txt
+# 0=disable, 1=enable all, >1 bitmask of sysrq functions
+# See https://www.kernel.org/doc/html/latest/admin-guide/sysrq.html
 # for what other values do
-#kernel.sysrq=1
+#kernel.sysrq=438
 
-###################################################################
-# Protected links
-#
-# Protects against creating or following links under certain conditions
-# Debian kernels have both set to 1 (restricted) 
-# See https://www.kernel.org/doc/Documentation/sysctl/fs.txt
-#fs.protected_hardlinks=0
-#fs.protected_symlinks=0
-
-vm.dirty_background_ratio = 55
-vm.dirty_ratio = 60
+kernel.dmesg_restrict = 0
+kernel.sched_autogroup_enabled = 1
+vm.dirty_background_ratio = 9
+vm.dirty_ratio = 10
 vm.swappiness = 0
 vm.overcommit_memory = 1
-kernel.sched_autogroup_enabled = 1
diff --git a/vim/vim/after/syntax/c.vim b/vim/vim/after/syntax/c.vim
new file mode 100644
index 0000000..6b9444c
--- /dev/null
+++ b/vim/vim/after/syntax/c.vim
@@ -0,0 +1,41 @@
+syn keyword inttypesMacro PRId8 PRIi16 PRIo32 PRIu64
+syn keyword inttypesMacro PRId16 PRIi32 PRIo64 PRIuLEAST8
+syn keyword inttypesMacro PRId32 PRIi64 PRIoLEAST8 PRIuLEAST16
+syn keyword inttypesMacro PRId64 PRIiLEAST8 PRIoLEAST16 PRIuLEAST32
+syn keyword inttypesMacro PRIdLEAST8 PRIiLEAST16 PRIoLEAST32 PRIuLEAST64
+syn keyword inttypesMacro PRIdLEAST16 PRIiLEAST32 PRIoLEAST64 PRIuFAST8
+syn keyword inttypesMacro PRIdLEAST32 PRIiLEAST64 PRIoFAST8 PRIuFAST16
+syn keyword inttypesMacro PRIdLEAST64 PRIiFAST8 PRIoFAST16 PRIuFAST32
+syn keyword inttypesMacro PRIdFAST8 PRIiFAST16 PRIoFAST32 PRIuFAST64
+syn keyword inttypesMacro PRIdFAST16 PRIiFAST32 PRIoFAST64 PRIuMAX
+syn keyword inttypesMacro PRIdFAST32 PRIiFAST64 PRIoMAX PRIuPTR
+syn keyword inttypesMacro PRIdFAST64 PRIiMAX PRIoPTR PRIx8
+syn keyword inttypesMacro PRIdMAX PRIiPTR PRIu8 PRIx16
+syn keyword inttypesMacro PRIdPTR PRIo8 PRIu16 PRIx32
+syn keyword inttypesMacro PRIi8 PRIo16 PRIu32 PRIx64
+syn keyword inttypesMacro PRIxLEAST8 SCNd8 SCNiFAST32 SCNuLEAST32
+syn keyword inttypesMacro PRIxLEAST16 SCNd16 SCNiFAST64 SCNuLEAST64
+syn keyword inttypesMacro PRIxLEAST32 SCNd32 SCNiMAX SCNuFAST8
+syn keyword inttypesMacro PRIxLEAST64 SCNd64 SCNiPTR SCNuFAST16
+syn keyword inttypesMacro PRIxFAST8 SCNdLEAST8 SCNo8 SCNuFAST32
+syn keyword inttypesMacro PRIxFAST16 SCNdLEAST16 SCNo16 SCNuFAST64
+syn keyword inttypesMacro PRIxFAST32 SCNdLEAST32 SCNo32 SCNuMAX
+syn keyword inttypesMacro PRIxFAST64 SCNdLEAST64 SCNo64 SCNuPTR
+syn keyword inttypesMacro PRIxMAX SCNdFAST8 SCNoLEAST8 SCNx8
+syn keyword inttypesMacro PRIxPTR SCNdFAST16 SCNoLEAST16 SCNx16
+syn keyword inttypesMacro PRIX8 SCNdFAST32 SCNoLEAST32 SCNx32
+syn keyword inttypesMacro PRIX16 SCNdFAST64 SCNoLEAST64 SCNx64
+syn keyword inttypesMacro PRIX32 SCNdMAX SCNoFAST8 SCNxLEAST8
+syn keyword inttypesMacro PRIX64 SCNdPTR SCNoFAST16 SCNxLEAST16
+syn keyword inttypesMacro PRIXLEAST8 SCNi8 SCNoFAST32 SCNxLEAST32
+syn keyword inttypesMacro PRIXLEAST16 SCNi16 SCNoFAST64 SCNxLEAST64
+syn keyword inttypesMacro PRIXLEAST32 SCNi32 SCNoMAX SCNxFAST8
+syn keyword inttypesMacro PRIXLEAST64 SCNi64 SCNoPTR SCNxFAST16
+syn keyword inttypesMacro PRIXFAST8 SCNiLEAST8 SCNu8 SCNxFAST32
+syn keyword inttypesMacro PRIXFAST16 SCNiLEAST16 SCNu16 SCNxFAST64
+syn keyword inttypesMacro PRIXFAST32 SCNiLEAST32 SCNu32 SCNxMAX
+syn keyword inttypesMacro PRIXFAST64 SCNiLEAST64 SCNu64 SCNxPTR
+syn keyword inttypesMacro PRIXMAX SCNiFAST8 SCNuLEAST8
+syn keyword inttypesMacro PRIXPTR SCNiFAST16 SCNuLEAST16
+
+hi def link inttypesMacro cSpecial