diff --git a/roles/xmonad/files/bashrc_t460p b/roles/xmonad/files/bashrc_t460p index dd7dd14..a80e793 100644 --- a/roles/xmonad/files/bashrc_t460p +++ b/roles/xmonad/files/bashrc_t460p @@ -27,6 +27,8 @@ alias gb='git branch' alias gr='git reset' alias grm='git rm' +alias lg='lazygit' + # starting ssh-agent if [ -z "$SSH_AUTH_SOCK" ] ; then eval `ssh-agent -s` 2>&1 >/dev/null @@ -64,14 +66,14 @@ n () vw () { if [[ $# == 0 ]] then - git -C ~/.local/share/vimwiki pull - nvim ~/.local/share/vimwiki/index.md - git -C ~/.local/share/vimwiki add ~/.local/share/vimwiki/* - git -C ~/.local/share/vimwiki commit -m "autosync-$(date +%FT%T)" - git -C ~/.local/share/vimwiki push + git -C ~/dokumente/wiki pull + nvim ~/dokumente/wiki/index.md + git -C ~/dokumente/wiki add -A + git -C ~/dokumente/wiki commit -m "autosync-$(date +%FT%T)" + git -C ~/dokumente/wiki push elif [[ $1 == 'g' ]] then - git -C ~/.local/share/vimwiki ${@:2} + git -C ~/dokumente/wiki ${@:2} else echo 'Usage: vw [g] [args ...]' fi diff --git a/roles/xmonad/files/xmonad_t460p.hs b/roles/xmonad/files/xmonad_t460p.hs index 37e484f..fbcbad9 100644 --- a/roles/xmonad/files/xmonad_t460p.hs +++ b/roles/xmonad/files/xmonad_t460p.hs @@ -66,7 +66,7 @@ myScratchpads :: [NamedScratchpad] myScratchpads = [ NS "keepassxc" "keepassxc ~/db.kdbx" (title =? "it factum Max Hohlfeld - KeePassXC" <||> title =? "db.kdbx [Gesperrt] - KeePassXC") defaultFloating , NS "nnn" "alacritty -t nnn -e nnnwrapper" (title =? "nnn") (customFloating $ W.RationalRect (1/4) (1/6) (2/4) (4/6)) - , NS "vimwiki" "alacritty -t vimwiki -e vwwrapper" (title =? "vimwiki") (customFloating $ W.RationalRect (1/6) (1/6) (2/3) (2/3)) + , NS "vimwiki" "alacritty -t vimwiki -e vwwrapper" (title =? "vimwiki") (customFloating $ W.RationalRect (1/10) (1/10) (4/5) (4/5)) , NS "pavucontrol" "pavucontrol" (title =? "Lautstärkeregler") (customFloating $ W.RationalRect (1/6) (1/6) (2/3) (2/3)) , NS "cmus" "alacritty -t 'cmus' -e cmus" (title =? "cmus") (customFloating $ W.RationalRect (1/6) (1/6) (2/3) (2/3)) , NS "qalculate" "qalculate-gtk" (title =? "Qalculate!") (customFloating $ W.RationalRect (3/6) (1/6) (1/6) (1/6)) @@ -88,7 +88,7 @@ topicItems = , TI "AK_A" "~/projekte/Abwesenheitskalender/Ansible" (switchToLayout "Programming" *> spawnShell *> spawnEditor) , TI "aoc" "~/projekte/aoc" (switchToLayout "Programming" *> spawnShell *> spawnEditor) , TI "ST_Frontend" "~/projekte/SchulungsTracker/Frontend" (switchToLayout "Programming" *> spawnShellAndExecute "npm start" *> spawnShell *> spawnEditor) - , TI "ST_Backend" "~/projekte/SchulungsTracker/Backend" (switchToLayout "Full" *> spawnShellAndExecute "rider ~/projekte/SchulungsTracker/Backend/Schulungstracker.backend.sln") + , TI "ST_Backend" "~/projekte/SchulungsTracker/Backend" (switchToLayout "Full" *> spawn "rider ~/projekte/SchulungsTracker/Backend/SchulungsTracker_Backend.sln") , TI "ST_Wiki" "~/projekte/SchulungsTracker/Wiki" (switchToLayout "Programming" *> spawnEditor) , TI "azsql-dump" "~/projekte/azsql-dump" (switchToLayout "Programming" *> spawnShell *> spawnEditor) ] @@ -183,6 +183,7 @@ myAdditionalKeys = , ("M-s a", namedScratchpadAction myScratchpads "pavucontrol") , ("M-s c", namedScratchpadAction myScratchpads "cmus") , ("M-s q", namedScratchpadAction myScratchpads "qalculate") + , ("M-s g", spawnShellAndExecute "lazygit") -- open terminal , ("M-S-", spawnShell)