From 3c723de808ed4dc7cecd924a093bb6a22127d4f7 Mon Sep 17 00:00:00 2001
From: Solomon Laing <solomonlaing@protonmail.com>
Date: Sun, 25 Jul 2021 19:17:44 +0930
Subject: [PATCH] updates re fish issues

---
 .config/Code/User/settings.json | 11 +++++------
 .config/fish/config.fish        |  7 +++----
 .xmonad/xmonad.hs               |  4 ++--
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/.config/Code/User/settings.json b/.config/Code/User/settings.json
index 2694649..a644e68 100644
--- a/.config/Code/User/settings.json
+++ b/.config/Code/User/settings.json
@@ -17,10 +17,9 @@
     "python.pythonPath": "/usr/bin/python3",
     "python.linting.pylintEnabled": true,
     "python.linting.enabled": true,
-    "workbench.editorAssociations": [
-        {
-            "viewType": "jupyter.notebook.ipynb",
-            "filenamePattern": "*.ipynb"
-        }
-    ]
+    "workbench.editorAssociations": {
+        "*.ipynb": "jupyter.notebook.ipynb"
+    },
+    "cSpell.enabled": true,
+    "git.ignoreMissingGitWarning": true
 }
\ No newline at end of file
diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index 41afbc8..f817e28 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -122,7 +122,7 @@ function fish_prompt
 end
 
 function _git_ahead
-  set -l commits (command git rev-list --left-right '@{upstream}...HEAD' ^/dev/null)
+  set -l commits (command git rev-list --left-right '@{upstream}...HEAD' 2>/dev/null)
   if [ $status != 0 ]
     return
   end
@@ -142,11 +142,10 @@ function _git_ahead
 end
 
 function _git_branch_name
-  echo (command git symbolic-ref HEAD ^/dev/null | sed -e 's|^refs/heads/||')
+  echo (command git symbolic-ref HEAD 2>/dev/null | sed -e 's|^refs/heads/||')
 end
 
 function _is_git_dirty
-  echo (command git status -s --ignore-submodules=dirty ^/dev/null)
+  echo (command git status -s --ignore-submodules=dirty 2>/dev/null)
 end
 ## fish prompt end ##
-
diff --git a/.xmonad/xmonad.hs b/.xmonad/xmonad.hs
index 99e7268..36a873b 100644
--- a/.xmonad/xmonad.hs
+++ b/.xmonad/xmonad.hs
@@ -425,7 +425,7 @@ myStartupHook = do
     spawnOnce "nm-applet &"
     spawnOnce "blueman-applet &"
     spawnOnce "kdeconnect-indicator &"
-    spownOnce "/usr/lib/kdeconnectd &"
+    spawnOnce "/usr/lib/kdeconnectd &"
     spawnOnce "dunst &" -- notification daemon
 
     -- Startup Applications
@@ -434,7 +434,7 @@ myStartupHook = do
     spawnOnce "nextcloud &"
     spawnOnce "slack &"
     spawnOnce "todoist &"
-    spownOnce "element-desktop --hidden &"
+    spawnOnce "element-desktop --hidden &"
 
     -- Start trayer last
     spawnOnce "trayer --edge top --align right --widthtype request --padding 6 --SetDockType true --SetPartialStrut true --expand true --monitor 1 --transparent true --alpha 0 --tint 0x121e32  --height 20 &"