diff --git a/.config/bash/.bashrc b/.config/bash/.bashrc index b257f19..cd331b6 100644 --- a/.config/bash/.bashrc +++ b/.config/bash/.bashrc @@ -73,3 +73,7 @@ set_prompt() { } PROMPT_COMMAND=set_prompt + +#THIS MUST BE AT THE END OF THE FILE FOR SDKMAN TO WORK!!! +export SDKMAN_DIR="$HOME/.sdkman" +[[ -s "$HOME/.sdkman/bin/sdkman-init.sh" ]] && source "$HOME/.sdkman/bin/sdkman-init.sh" diff --git a/.config/lf/lfrc b/.config/lf/lfrc index 6533057..e2083ae 100644 --- a/.config/lf/lfrc +++ b/.config/lf/lfrc @@ -162,6 +162,7 @@ map gh cd map gd cd ~/Downloads map gr cd ~/repos map gn cd ~/nextcloud +map gH cd ~/nextcloud/university/Honours map gc cd ~/.config map A rename # at the very end diff --git a/.config/mutt/muttrc b/.config/mutt/muttrc index 1cc2ca5..4f79bf5 100644 --- a/.config/mutt/muttrc +++ b/.config/mutt/muttrc @@ -4,3 +4,4 @@ source /home/solomon/.config/mutt/accounts/solomon@inkletblot.com.muttrc macro index,pager i1 'source /home/solomon/.config/mutt/accounts/solomon@inkletblot.com.muttrc!;' "switch to solomon@inkletblot.com" macro index,pager i2 'source /home/solomon/.config/mutt/accounts/Solomonlaing@protonmail.com.muttrc!;' "switch to Solomonlaing@protonmail.com" macro index,pager i3 'source /home/solomon/.config/mutt/accounts/solomon.laing@hfoh.com.au.muttrc!;' "switch to solomon.laing@hfoh.com.au" +macro index,pager i4 'source /home/solomon/.config/mutt/accounts/solomon@inkletblot.com.muttrc!;' "switch to solomon@inkletblot.com" diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index 675fd01..e5bfb30 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -110,7 +110,7 @@ set noshowcmd autocmd BufRead,BufNewFile Xresources,Xdefaults,xresources,xdefaults set filetype=xdefaults autocmd BufWritePost Xresources,Xdefaults,xresources,xdefaults !xrdb % " Recompile xmonad on edit, also on xmobar edits - autocmd BufWritePost ~/.xmonad/xmonad.hs,~/.config/xmobar/xmobar-main.hs,~/.config/xmobar/xmobar-sub.hs,~/.config/xmobar/xmobar-single.hs !xmonad --restart + autocmd BufWritePost ~/.xmonad/xmonad.hs,~/.config/xmobar/xmobar-main.hs,~/.config/xmobar/xmobar-sub.hs,~/.config/xmobar/xmobar-single.hs !xmonad --recompile && xmonad --restart " Turns off highlighting on the bits of code that are changed, so the line that is changed is highlighted but the actual text that has changed stands out on the line and is readable. if &diff diff --git a/.config/xmobar/xmobarrc-single.hs b/.config/xmobar/xmobarrc-single.hs index e119e60..177450f 100644 --- a/.config/xmobar/xmobarrc-single.hs +++ b/.config/xmobar/xmobarrc-single.hs @@ -2,7 +2,7 @@ Config { -- appearance font = "xft:Fira Code:size=9:antialias=true:hinting=true" - , additionalFonts = [ "xft:Font Awesome:size=9:antialias=true:hinting=true" ] + , additionalFonts = [ "xft:FuraCode Nerd Font:style=Regular:size=9:antialias=true:hinting=true" ] , bgColor = "#282a36" , fgColor = "#f8f8f2" , position = Top @@ -14,7 +14,7 @@ Config { -- layout , sepChar = "%" -- delineator between plugin names and straight text , alignSep = "}{" -- separator between left-right alignment - , template = " %bat% %cpu% %memory% %network% %volume% | %UnsafeStdinReader% }{ %keyboard% | %date% | %weather% | %updates% %trayerpad%" + , template = " %bat% %cpu% %memory% %network% %volume% | %UnsafeStdinReader% }{ %keyboard% | %disk% | %date% | %weather% | %updates% %trayerpad%" -- general behavior , lowerOnStart = True -- send to bottom of window stack on start @@ -60,7 +60,7 @@ Config { -- time and date indicator -- (%F = y-m-d date, %a = day of week, %T = h:m:s time) - , Run Date "\xf073 %a %Y-%m-%d | \xf017 %H:%M:%S" "date" 10 + , Run Date "\xf073 %a %Y-%m-%d | \xf017 %H:%M:%S" "date" 10 -- Runs a simple script that counts the number of system updates to apply , Run Com "xmobar-status-updates" [] "updates" 3600 @@ -83,6 +83,9 @@ Config { -- Script polls the batter for info and displays nicely , Run Com "xmobar-status-bat" [] "bat" 20 + -- Script that outputs the free space on / + , Run Com "xmobar-status-disk" [] "disk" 20 + -- Prints out the left side items such as workspaces, layout, etc. , Run UnsafeStdinReader diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index e582587..0f0c234 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -191,3 +191,7 @@ ZSH_HIGHLIGHT_STYLES[redirection]='fg=#F8F8F2' ZSH_HIGHLIGHT_STYLES[arg0]='fg=#F8F8F2' ZSH_HIGHLIGHT_STYLES[default]='fg=#F8F8F2' ZSH_HIGHLIGHT_STYLES[cursor]='standout' + +#THIS MUST BE AT THE END OF THE FILE FOR SDKMAN TO WORK!!! +export SDKMAN_DIR="$HOME/.sdkman" +[[ -s "$HOME/.sdkman/bin/sdkman-init.sh" ]] && source "$HOME/.sdkman/bin/sdkman-init.sh" diff --git a/.xmonad/xmonad.hs b/.xmonad/xmonad.hs index 7852621..d0ad471 100644 --- a/.xmonad/xmonad.hs +++ b/.xmonad/xmonad.hs @@ -70,7 +70,7 @@ import XMonad.Util.SpawnOnce -- A simple way to switch between desktop and laptop related things isLaptop :: Bool -isLaptop = False +isLaptop = True --THEME @@ -227,11 +227,12 @@ myAppGrid = [ ("Runelite", "runelite") , ("qBittorrent", "qbittorrent") , ("Telegram", "telegram-desktop") , ("Element", "element-desktop") + , ("Thunder", "thunderbird") ] myScratchPads :: [NamedScratchpad] myScratchPads = [ NS "terminal" spawnTerm findTerm manageTerm - , NS "plexamp" spawnPlexamp findPlexamp managePlexamp + , NS "jellyfin" spawnJellyfin findJellyfin manageJellyfin , NS "calculator" spawnCalc findCalc manageCalc , NS "matrix" spawnMatrix findMatrix manageMatrix ] @@ -244,9 +245,9 @@ myScratchPads = [ NS "terminal" spawnTerm findTerm manageTerm w = 0.9 t = 0.95 -h l = 0.95 -w - spawnPlexamp = "Plexamp.AppImage" - findPlexamp = className =? "plexamp" - managePlexamp = customFloating $ W.RationalRect l t w h + spawnJellyfin = "jellyfinmediaplayer" + findJellyfin = className =? "jellyfinmediaplayer" + manageJellyfin = customFloating $ W.RationalRect l t w h where h = 0.9 w = 0.9 @@ -325,7 +326,7 @@ myStandardEZKeys = -- NOTE When you toggle them to show, it brings them to your current workspace. -- NOTE Toggle them to hide and it sends them back to hidden workspace (NSP). , ("M-s t", namedScratchpadAction myScratchPads "terminal") - , ("M-s m", namedScratchpadAction myScratchPads "plexamp") + , ("M-s m", namedScratchpadAction myScratchPads "jellyfin") , ("M-s c", namedScratchpadAction myScratchPads "calculator") , ("M-s e", namedScratchpadAction myScratchPads "matrix") @@ -528,7 +529,11 @@ myManageHook = composeAll , className =? "discord" --> doShift ( myWorkspaces !! (8-1) ) , className =? "telegram-desktop" --> doShift ( myWorkspaces !! (8-1) ) , className =? "slack" --> doShift ( myWorkspaces !! (8-1) ) - , className =? "Pavucontrol" --> doShift ( myWorkspaces !! (5-1) )] + , className =? "Pavucontrol" --> doShift ( myWorkspaces !! (5-1) ) + , className =? "plexamp" --> doShift ( myWorkspaces !! (5-1) ) + , className =? "Jellyfin Media Player" --> doShift ( myWorkspaces !! (5-1) ) + ] + ------------------------------------------------------------------------ -- Event handling