diff options
Diffstat (limited to 'config/X')
-rw-r--r-- | config/X/alacritty/alacritty.yml | 9 | ||||
-rw-r--r-- | config/X/picom/picom.conf | 5 | ||||
-rwxr-xr-x | config/X/x11/xinitrc | 4 | ||||
-rwxr-xr-x | config/X/xmobar/scripts/winfo | 6 | ||||
-rw-r--r-- | config/X/xmobar/scripts/winfo_icons | 30 | ||||
-rw-r--r-- | config/X/xmobar/xmobarrc.hs | 98 | ||||
-rw-r--r-- | config/X/xmobar/xmobarrc0.hs | 20 | ||||
-rw-r--r-- | config/X/xmobar/xmobarrc1.hs | 149 | ||||
-rwxr-xr-x | config/X/xmonad/autostart/fehbg.sh | 2 | ||||
-rwxr-xr-x | config/X/xmonad/autostart/getvolume.sh | 8 | ||||
-rw-r--r-- | config/X/xmonad/xmonad.hs | 10 |
11 files changed, 135 insertions, 206 deletions
diff --git a/config/X/alacritty/alacritty.yml b/config/X/alacritty/alacritty.yml index 3b29294..475f9a6 100644 --- a/config/X/alacritty/alacritty.yml +++ b/config/X/alacritty/alacritty.yml @@ -67,7 +67,7 @@ window: # # Window opacity as a floating point number from `0.0` to `1.0`. # The value `0.0` is completely transparent and `1.0` is opaque. - opacity: 0.80 + opacity: 0.97 # Startup Mode (changes require restart) # @@ -505,6 +505,13 @@ hints: binding: key: U mods: Control|Shift + - regex: "(ipfs:|ipns:|magnet:|mailto:|gemini:|gopher:|https:|http:|news:|file:|git:|ssh:|ftp:)\ + [^\u0000-\u001F\u007F-\u009F<>\"\\s{-}\\^⟨⟩`]+" + action: Copy + post_processing: false + binding: + key: L + mods: Control|Shift - regex: "([0-9]{2}[0-9]*)" action: Copy post_processing: false diff --git a/config/X/picom/picom.conf b/config/X/picom/picom.conf index 7de16e4..4a677de 100644 --- a/config/X/picom/picom.conf +++ b/config/X/picom/picom.conf @@ -33,10 +33,7 @@ shadow-exclude = [ # Fading # ################################# -fading = false; - -no-fading-openclose = true; - +fade-delta = 0; ################################# # Transparency / Opacity # diff --git a/config/X/x11/xinitrc b/config/X/x11/xinitrc index c438f1b..3e6679c 100755 --- a/config/X/x11/xinitrc +++ b/config/X/x11/xinitrc @@ -30,7 +30,7 @@ if [ -d /etc/X11/xinit/xinitrc.d ] ; then unset f fi -picom -b +xcompmgr & setxkbmap -option ctrl:nocaps xautolock -time 5 -locker slock & -exec xmonad +exec dwm diff --git a/config/X/xmobar/scripts/winfo b/config/X/xmobar/scripts/winfo index 033ab49..f60bd7f 100755 --- a/config/X/xmobar/scripts/winfo +++ b/config/X/xmobar/scripts/winfo @@ -45,9 +45,9 @@ GetCWD (){ echo -n "${PROCESS}" \ | sed \ - -e "s;^zsh$;<fn=1></fn>&;g" \ - -e "s;^htop$;<fn=1></fn> &;g" \ - -e "s;^ranger$;<fn=1></fn> &;g" + -e "s;^zsh$;&;g" \ + -e "s;^htop$; &;g" \ + -e "s;^ranger$; &;g" } # Get title of window / name of process diff --git a/config/X/xmobar/scripts/winfo_icons b/config/X/xmobar/scripts/winfo_icons index dbdc3ae..7cfeda0 100644 --- a/config/X/xmobar/scripts/winfo_icons +++ b/config/X/xmobar/scripts/winfo_icons @@ -1,15 +1,15 @@ -<fn=1></fn> alacritty kitty -<fn=1></fn> firefox -<fn=1></fn> minecraft multimc -<fn=1></fn> virt-manager virtualbox rustdesk -<fn=1></fn> mpv -<fn=1>ﭮ</fn> discord -<fn=1></fn> jetbrains-clion -<fn=1></fn> pinentry-gtk-2 -<fn=1></fn> code-oss -<fn=1>響</fn> mumble -<fn=1></fn> soffice libreoffice-writer -<fn=1></fn> steam -<fn=1></fn> packettracer -<fn=1></fn> ktouch -<fn=1></fn> signal + alacritty kitty + firefox + minecraft multimc + virt-manager virtualbox rustdesk + mpv +ﭮ discord + jetbrains-clion + pinentry-gtk-2 + code-oss +響 mumble + soffice libreoffice-writer + steam + packettracer + ktouch + signal diff --git a/config/X/xmobar/xmobarrc.hs b/config/X/xmobar/xmobarrc.hs new file mode 100644 index 0000000..2f18a46 --- /dev/null +++ b/config/X/xmobar/xmobarrc.hs @@ -0,0 +1,98 @@ +Config { font = "Cantarell Mono Regular 12" + , position = Top + -- , borderColor = "#2e3440" + -- , borderWidth = 2 + -- , border = BottomB + , bgColor = "#2e3440" + , fgColor = "#2aa198" + , lowerOnStart = True + , pickBroadest = False + , persistent = False + , hideOnStart = False + , iconRoot = "/home/aluc/.config/xmobar/icons" + , overrideRedirect = True + , wmName = "xmobar2" + , commands = [ Run Cpu [ "-t", "<total>%" + ,"-l", "#2e3440,#58e1ac" + ,"-L", "20" + ,"-n", "#4c566a,#58e1ac" + ,"-h", "#cb4b16,#58e1ac" + ,"-H", "50" + ,"-w", "3" + ] 10 + + , Run Memory ["-t", "<usedratio>%" + ,"-l", "#2e3440,#58e1ac" + ,"-L", "20" + ,"-n", "#4c566a,#58e1ac" + ,"-h", "#cb4b16,#58e1ac" + ,"-H", "50" + ,"-w", "2" + ] 10 + + -- Focused window info + , Run Com "/home/aluc/.config/xmobar/scripts/winfo" ["-n"] "FWname" 3 + , Run Com "/home/aluc/.config/xmobar/scripts/winfo" ["-t"] "FWtitle" 3 + , Run Com "/home/aluc/.config/xmobar/scripts/winfo" ["-i"] "FWicon" 3 + , Run Com "/home/aluc/.config/xmobar/scripts/checkupds" ["-i"] "updates" 3600 + -- , Run ComX "$HOME/bin/cmusP" [] "" "cmus" 1 + , Run Com "uname" ["-r"] "" 36000 + , Run Date " %b %_d %Y - %H:%M:%S" "date" 10 + , Run PipeReader "/home/aluc/.config/xmobar/scripts/volume-pipe" "vol" + , Run StdinReader + ] + , sepChar = "%" + , alignSep = "}{" + + + -- COLORS + -- #2aa198 : Blue/green -- fg + -- + -- #d08770 : pinkish brown -- memory + -- #ff00ff : pink/purple -- swap + -- #828be6 : perrywinkle -- FWname + -- #825be6 : purpley -- FWtitle + -- bgColor = "#2e3440" + -- fgColor = "#2aa198" + -- #58e1ac + + , template = " \ + -- Left + + \<fc=#eceff4>%StdinReader% </fc>\ + + \<fc=#b48ead,#2e3440></fc>\ + \<fc=#2e3440,#b48ead> %uname% </fc>\ + \<fc=#2e3440,#b48ead></fc>\ + + \<fc=#58e1ac,#2e3440></fc>\ + \<fc=#2e3440,#58e1ac> %vol% </fc>\ + \<fc=#2e3440,#58e1ac></fc>\ + + \<fc=#88c0d0,#2e3440></fc>\ + \<fc=#2e3440,#88c0d0><action=`dmenu_run` button=1> Dmenu </action></fc>\ + \<fc=#88c0d0></fc>\ + + + -- Centered + \}\ + + -- Right + \{ \ + + \<fc=#88c0d0,#2e3440></fc>\ + \<fc=#2e3440,#88c0d0> %updates% </fc>\ + \<fc=#88c0d0></fc>\ + + \<fc=#2e3440,#58e1ac></fc>\ + \<fc=#2e3440,#58e1ac> %cpu% </fc>\ + \<fc=#2e3440,#58e1ac>%memory% </fc>\ + \<fc=#58e1ac></fc>\ + + \<fc=#2e3440,#b48ead></fc>\ + \<fc=#2e3440,#b48ead> %date% </fc>\ + \<fc=#b48ead></fc> " + + } + + diff --git a/config/X/xmobar/xmobarrc0.hs b/config/X/xmobar/xmobarrc0.hs deleted file mode 100644 index e3824f2..0000000 --- a/config/X/xmobar/xmobarrc0.hs +++ /dev/null @@ -1,20 +0,0 @@ -Config { font = "xft:Ubuntu Mono:pixelsize=14:style=bold:antialias=true:hinting:=true" - -- Only 1 font, so height automatic - , position = BottomW C 16 - , bgColor = "#2e3440" - , fgColor = "#2aa198" - , lowerOnStart = True - , pickBroadest = False - , persistent = False - , hideOnStart = False - , overrideRedirect = True - , wmName = "xmobar2" - - , commands = [ - Run StdinReader - ] - , sepChar = "%" - , alignSep = "}{" - - , template = "}<fc=#eceff4> %StdinReader% </fc>{"} - diff --git a/config/X/xmobar/xmobarrc1.hs b/config/X/xmobar/xmobarrc1.hs deleted file mode 100644 index a187055..0000000 --- a/config/X/xmobar/xmobarrc1.hs +++ /dev/null @@ -1,149 +0,0 @@ -Config { font = "xft:Ubuntu Mono:pixelsize=14:style=bold:antialias=true:hinting:=true" - , additionalFonts = [ - "xft:Mononoki Nerd Font Mono:style=bold:pixelsize=24:antialias=true:hinting=true", - "xft:Mononoki Nerd Font Mono:style=bold:pixelsize=24:antialias=false:hinting=true" - ] - , position = TopH 24 - , borderColor = "#2e3440" - , borderWidth = 2 - , border = BottomB - , bgColor = "#2e3440" - , fgColor = "#2aa198" - , lowerOnStart = True - , pickBroadest = False - , persistent = False - , hideOnStart = False - , iconRoot = "/home/aluc/.config/xmobar/icons" - , overrideRedirect = True - , commands = [ Run Cpu [ "-t", "<total>%" - ,"-l", "#2e3440,#58e1ac" - ,"-L", "20" - ,"-n", "#4c566a,#58e1ac" - ,"-h", "#cb4b16,#58e1ac" - ,"-H", "50" - ,"-w", "3" - ] 10 - - , Run Memory ["-t", "<usedratio>%" - ,"-l", "#2e3440,#58e1ac" - ,"-L", "20" - ,"-n", "#4c566a,#58e1ac" - ,"-h", "#cb4b16,#58e1ac" - ,"-H", "50" - ,"-w", "2" - ] 10 - - -- Focused window info - , Run Com "/home/aluc/.config/xmobar/scripts/winfo" ["-n"] "FWname" 3 - , Run Com "/home/aluc/.config/xmobar/scripts/winfo" ["-t"] "FWtitle" 3 - , Run Com "/home/aluc/.config/xmobar/scripts/winfo" ["-i"] "FWicon" 3 - , Run Com "/home/aluc/.config/xmobar/scripts/checkupds" ["-i"] "updates" 3600 - -- , Run ComX "$HOME/bin/cmusP" [] "" "cmus" 1 - , Run Com "uname" ["-r"] "" 36000 - , Run Date "<fn=1>\xf073</fn> %b %_d %Y - %H:%M:%S" "date" 10 - , Run PipeReader "/home/aluc/.config/xmobar/scripts/volume-pipe" "vol" - ] - , sepChar = "%" - , alignSep = "}{" - - - -- COLORS - -- #2aa198 : Blue/green -- fg - -- - -- #d08770 : pinkish brown -- memory - -- #ff00ff : pink/purple -- swap - -- #828be6 : perrywinkle -- FWname - -- #825be6 : purpley -- FWtitle - -- bgColor = "#2e3440" - -- fgColor = "#2aa198" - -- #58e1ac - - , template = " \ - -- Left - - \<fc=#b48ead,#2e3440><fn=2></fn></fc>\ - \<fc=#2e3440,#b48ead>\ - \<box type=VBoth width=4 color=#b48ead>\ - \ <fn=1></fn> %uname% \ - \</box>\ - \</fc>\ - \<fc=#2e3440,#b48ead><fn=2></fn></fc>\ - - \<fc=#58e1ac,#2e3440><fn=2></fn></fc>\ - \<fc=#2e3440,#58e1ac>\ - \<box type=VBoth width=4 color=#58e1ac>\ - \ %vol% \ - \</box>\ - \</fc>\ - \<fc=#2e3440,#58e1ac><fn=2></fn></fc>\ - - \<fc=#88c0d0,#2e3440><fn=2></fn></fc>\ - \<fc=#2e3440,#88c0d0>\ - \<box type=VBoth width=4 color=#88c0d0>\ - \<action=`dmenu_run` button=1>\ - \ dmenu \ - \</action>\ - \</box>\ - \</fc>\ - \<fc=#88c0d0><fn=2></fn></fc>\ - - - -- Centered - \}\ - \<fc=#ebcb8b,#2e3440><fn=2></fn></fc>\ - \<fc=#4c566a,#ebcb8b>\ - \<box type=VBoth width=4 color=#ebcb8b>\ - \ %FWicon% \ - \</box>\ - \</fc>\ - \<fc=#4c566a,#ebcb8b>\ - \<box type=VBoth width=4 color=#ebcb8b>\ - \%FWname% \ - \</box>\ - \</fc>\ - \<fc=#b48ead,#ebcb8b>\ - \<box type=VBoth width=4 color=#ebcb8b>\ - \<box type=Bottom width=2 mb=3 color=#b48ead>\ - \%FWtitle%\ - \</box>\ - \</box>\ - \</fc>\ - \<fc=#2e3440,#ebcb8b><fn=2> </fn></fc>\ - \<fc=#ebcb8b,#2e3440><fn=2></fn></fc>\ - - - -- Right - \{ \ - - \<fc=#88c0d0,#2e3440><fn=2></fn></fc>\ - \<fc=#2e3440,#88c0d0>\ - \<box type=VBoth width=4 color=#88c0d0>\ - \ %updates% <fn=1></fn>\ - \</box>\ - \</fc>\ - \<fc=#88c0d0><fn=2></fn></fc>\ - - \<fc=#2e3440,#58e1ac><fn=2></fn></fc>\ - \<fc=#2e3440,#58e1ac>\ - \<box type=VBoth width=4 color=#58e1ac>\ - \ <fn=1></fn>%cpu% \ - \</box>\ - \<fc=#2e3440,#58e1ac>\ - \<box type=VBoth width=4 color=#58e1ac>\ - \%memory% \ - \</box>\ - \</fc>\ - \</fc>\ - \<fc=#58e1ac><fn=2></fn></fc>\ - - \<fc=#2e3440,#b48ead><fn=2></fn></fc>\ - \<fc=#2e3440,#b48ead>\ - \<box type=VBoth width=4 color=#b48ead>\ - \ %date% \ - \</box>\ - \</fc>\ - \<fc=#b48ead><fn=2></fn></fc> " - - } - - diff --git a/config/X/xmonad/autostart/fehbg.sh b/config/X/xmonad/autostart/fehbg.sh index 4b65f3a..f1ef545 100755 --- a/config/X/xmonad/autostart/fehbg.sh +++ b/config/X/xmonad/autostart/fehbg.sh @@ -1,2 +1,2 @@ #!/bin/sh -feh --no-fehbg --bg-scale "$HOME/pictures/Wallpapers/nord/nord_background3.jpg" +feh --no-fehbg --bg-scale "$HOME/pics/wallpaper" diff --git a/config/X/xmonad/autostart/getvolume.sh b/config/X/xmonad/autostart/getvolume.sh index ee2509e..1683db8 100755 --- a/config/X/xmonad/autostart/getvolume.sh +++ b/config/X/xmonad/autostart/getvolume.sh @@ -5,16 +5,16 @@ do muted=$(pamixer --get-mute) if [[ "$muted" == "true" ]] then - icon="<fn=1></fn>" + icon="" elif [ $string -gt 49 ] then - icon="<fn=1></fn>" + icon="" elif [ $string -eq 0 ] then - icon="<fn=1></fn>" + icon="" elif [ $string -lt 50 ] then - icon="<fn=1></fn>" + icon="" fi echo "${string}% $icon" > $HOME/.config/xmobar/scripts/volume-pipe done diff --git a/config/X/xmonad/xmonad.hs b/config/X/xmonad/xmonad.hs index 6d5c139..bc1115d 100644 --- a/config/X/xmonad/xmonad.hs +++ b/config/X/xmonad/xmonad.hs @@ -76,9 +76,6 @@ color05 = "#81a1c1" color09 = "#4c566a" color17 = "#d03a3f" -leftwp = "<box type=Bottom width=2 mb=2 color=" ++ colorfg ++ ">" -rightwp = "</box>" - -- Count of window in active workspace windowCount :: X (Maybe String) windowCount = gets $ Just . show . length . W.integrate' . W.stack . W.workspace . W.current . windowset @@ -189,16 +186,15 @@ myStartupHook = do main = do -- Setup xmobar as docks -- - xmproc0 <- spawnPipe "xmobar $HOME/.config/xmobar/xmobarrc0.hs" - xmproc1 <- spawnPipe "xmobar $HOME/.config/xmobar/xmobarrc1.hs" + xmproc <- spawnPipe "xmobar $HOME/.config/xmobar/xmobarrc.hs" -- ewmh: Add fullscreen handling support xmonad $ docks . ewmh $ defaults { layoutHook = avoidStruts $ layoutHook defaults , logHook = dynamicLogWithPP $ filterOutWsPP ["hid"] $ xmobarPP { - ppOutput = \x -> hPutStrLn xmproc0 x + ppOutput = \x -> hPutStrLn xmproc x - , ppCurrent = xmobarColor colorfg colorbg . wrap leftwp rightwp -- Visible but not current workspace + , ppCurrent = xmobarColor colorfg colorbg -- Visible but not current workspace , ppVisible = xmobarColor colorfg colorbg -- Hidden workspace , ppHidden = xmobarColor color01 colorbg -- Hidden workspaces (no windows) , ppHiddenNoWindows = xmobarColor color04 colorbg -- Title of active window |