updates re fish issues

This commit is contained in:
Solomon Laing 2021-07-25 19:17:44 +09:30
parent 06f08c58de
commit 3c723de808
3 changed files with 10 additions and 12 deletions

View File

@ -17,10 +17,9 @@
"python.pythonPath": "/usr/bin/python3", "python.pythonPath": "/usr/bin/python3",
"python.linting.pylintEnabled": true, "python.linting.pylintEnabled": true,
"python.linting.enabled": true, "python.linting.enabled": true,
"workbench.editorAssociations": [ "workbench.editorAssociations": {
{ "*.ipynb": "jupyter.notebook.ipynb"
"viewType": "jupyter.notebook.ipynb", },
"filenamePattern": "*.ipynb" "cSpell.enabled": true,
} "git.ignoreMissingGitWarning": true
]
} }

View File

@ -122,7 +122,7 @@ function fish_prompt
end end
function _git_ahead 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 ] if [ $status != 0 ]
return return
end end
@ -142,11 +142,10 @@ function _git_ahead
end end
function _git_branch_name 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 end
function _is_git_dirty 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 end
## fish prompt end ## ## fish prompt end ##

View File

@ -425,7 +425,7 @@ myStartupHook = do
spawnOnce "nm-applet &" spawnOnce "nm-applet &"
spawnOnce "blueman-applet &" spawnOnce "blueman-applet &"
spawnOnce "kdeconnect-indicator &" spawnOnce "kdeconnect-indicator &"
spownOnce "/usr/lib/kdeconnectd &" spawnOnce "/usr/lib/kdeconnectd &"
spawnOnce "dunst &" -- notification daemon spawnOnce "dunst &" -- notification daemon
-- Startup Applications -- Startup Applications
@ -434,7 +434,7 @@ myStartupHook = do
spawnOnce "nextcloud &" spawnOnce "nextcloud &"
spawnOnce "slack &" spawnOnce "slack &"
spawnOnce "todoist &" spawnOnce "todoist &"
spownOnce "element-desktop --hidden &" spawnOnce "element-desktop --hidden &"
-- Start trayer last -- 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 &" 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 &"