Merge

.config/fish/config.fish

@@ -4,6 +4,7 @@ end
 fish_default_key_bindings
 
 set -gx EDITOR nvim
+set -gx READER mupdf
 
 fish_add_path $HOME/.bun/bin
 fish_add_path $HOME/go/bin

.config/nvim/lua/plugins/cmp.lua

@@ -131,6 +131,19 @@ cmp.setup {
             cmp.config.compare.exact,
             cmp.config.compare.offset,
             cmp.config.compare.recently_used,
+
+            --Make entries that start with underline appear after
+            function(entry1, entry2)
+                local _, entry1_under = entry1.completion_item.label:find "^_+"
+                local _, entry2_under = entry2.completion_item.label:find "^_+"
+                entry1_under = entry1_under or 0
+                entry2_under = entry2_under or 0
+                if entry1_under > entry2_under then
+                    return false
+                elseif entry1_under < entry2_under then
+                    return true
+                end
+            end,
         }
     },
     sources = cmp.config.sources(

.config/xmonad/xmonad.norg

@@ -214,21 +214,20 @@ myXmobarPP s  =  def
 @code haskell
 
 myConfig =  def
-      {
+    {
-      terminal           = myTerminal,
+    terminal           = myTerminal,
-      focusFollowsMouse  = myFocusFollowsMouse,
+    focusFollowsMouse  = myFocusFollowsMouse,
-      clickJustFocuses   = myClickJustFocuses,
+    clickJustFocuses   = myClickJustFocuses,
-      borderWidth        = myBorderWidth,
+    borderWidth        = myBorderWidth,
-      modMask            = myModMask,
+    modMask            = myModMask,
-      workspaces         = myWorkspaces,
+    workspaces         = myWorkspaces,
-      normalBorderColor  = myNormalBorderColor,
+    normalBorderColor  = myNormalBorderColor,
-      focusedBorderColor = myFocusedBorderColor,
+    focusedBorderColor = myFocusedBorderColor,
-     -- keys               = myKeys,
+    layoutHook         = smartBorders . spacingWithEdge 5 $ myLayout,
-      layoutHook         = smartBorders . spacingWithEdge 10 $ myLayout,
+    manageHook         = manageSpawn <+> myManageHook <+> manageHook def,
-      manageHook         = manageSpawn <+> myManageHook <+> manageHook def,
+    handleEventHook    = myEventHook <+> fullscreenEventHook <+> swallowEventHook (className=?"Alacritty") (return True),
-      handleEventHook    = myEventHook <+> fullscreenEventHook <+> swallowEventHook (className=?"Alacritty") (return True),
+    startupHook        = myStartupHook
-      startupHook        = myStartupHook
+    }
-      }
 @end
 * Main
 @code haskell