diff --git a/files/.config/configstore/update-notifier-npm.json b/files/.config/configstore/update-notifier-npm.json index fdd73ef..5ff04a0 100644 --- a/files/.config/configstore/update-notifier-npm.json +++ b/files/.config/configstore/update-notifier-npm.json @@ -1,4 +1,10 @@ { "optOut": false, - "lastUpdateCheck": 1600877130940 + "lastUpdateCheck": 1603028923250, + "update": { + "latest": "6.14.8", + "current": "6.14.6", + "type": "patch", + "name": "npm" + } } \ No newline at end of file diff --git a/files/.config/picom.conf b/files/.config/picom.conf index 2da5120..fd2ef5c 100644 --- a/files/.config/picom.conf +++ b/files/.config/picom.conf @@ -48,6 +48,7 @@ shadow-exclude = [ "name *= 'compton'", "name *= 'picom'", "class_g = 'Conky'", + "class_g *= 'volume_popup'", "class_g = 'Kupfer'", "class_g = 'Synapse'", "class_g ?= 'Notify-osd'", diff --git a/files/.xmonad/lib/Config.hs b/files/.xmonad/lib/Config.hs index 2f760e8..7059e0e 100644 --- a/files/.xmonad/lib/Config.hs +++ b/files/.xmonad/lib/Config.hs @@ -14,8 +14,7 @@ import Control.Monad (join, filterM import Control.Arrow ( (>>>) ) import Data.List ( isPrefixOf , isSuffixOf - - + , isInfixOf ) import qualified Foreign.C.Types import System.Exit (exitSuccess) @@ -355,8 +354,8 @@ myKeys = concat [ zoomRowBindings, tabbedBindings, multiMonitorBindings, program , ("M-M1-", sendMessage Rotate) -- Media - , ("", spawn "amixer sset Master 5%+") - , ("", spawn "amixer sset Master 5%-") + , ("", spawn "~/.config/eww/popup.sh 3 volume_popup && amixer sset Master 5%+") + , ("", spawn "~/.config/eww/popup.sh 3 volume_popup && amixer sset Master 5%-") , ("M-S-C-,", (notify "hi" (show $ map (\(a, _) -> show a) workspaceBindings)) >> (notify "ho" (show removedKeys))) , ("M-", spawn "flash_window") , ("M-g", incScreenWindowSpacing 5) @@ -551,9 +550,12 @@ main = do mySwallowEventHook = WindowSwallowing.swallowEventHook (className =? "Alacritty" <||> className =? "Termite" <||> className =? "NOPE Thunar") - ((not <$> (className =? "Dragon" <||> className =? "noswallow")) <||> className =? "re") -- remove that last part + ((not <$> (className =* "eww" <||> className =? "Dragon" <||> className =? "noswallow")) <||> className =? "re") -- remove that last part +(=*) :: Query String -> String -> Query Bool +query =* value = (value `isInfixOf`) <$> query + activateWindowEventHook :: Event -> X All activateWindowEventHook (ClientMessageEvent { ev_message_type = messageType, ev_window = window }) = withWindowSet $ \ws -> do activateWindowAtom <- getAtom "_NET_ACTIVE_WINDOW" diff --git a/files/nix-stuff/nixpkgs/modules/desktop.nix b/files/nix-stuff/nixpkgs/modules/desktop.nix index a9c765e..3174e16 100644 --- a/files/nix-stuff/nixpkgs/modules/desktop.nix +++ b/files/nix-stuff/nixpkgs/modules/desktop.nix @@ -23,6 +23,7 @@ in dragon-drop polybarFull discord + pinta #hyper-haskell ]; diff --git a/files/nix-stuff/nixpkgs/modules/term/zsh/prompt.zsh b/files/nix-stuff/nixpkgs/modules/term/zsh/prompt.zsh index 0165280..4571994 100644 --- a/files/nix-stuff/nixpkgs/modules/term/zsh/prompt.zsh +++ b/files/nix-stuff/nixpkgs/modules/term/zsh/prompt.zsh @@ -34,7 +34,7 @@ function _my_prompt() { echo -n "%F{$__bright_green} $(dir)" echo -n "%F{$__bright_white} $(git_status)" if [ ! "$exit_code" = 0 ]; then - echo -n "%F{red}$exit_code" + echo -n "%F{red}REEEEEEEEEEE $exit_code" fi echo # %3{stuff%} tell's zsh that the characters are printed as 3 chars wide diff --git a/files/scripts/preview.sh b/files/scripts/preview.sh index b0d2518..7c548f4 100755 --- a/files/scripts/preview.sh +++ b/files/scripts/preview.sh @@ -3,7 +3,7 @@ case "$(file --mime-type "$1")" in *text*) - bat --color always --plain --theme base16 "$1" + bat --color always --plain --theme gruvbox "$1" ;; *image* | *pdf) if command -v timg; then