From 7f517f8867aa63c7b01b0d0e687d61908aece743 Mon Sep 17 00:00:00 2001 From: Horhik Date: Sun, 11 Apr 2021 02:36:27 +0300 Subject: [PATCH] some colorscheme updates --- home/xmonad/.config/xmobar/config.hs | 4 ++-- home/xmonad/.config/xmobar/config_second.hs | 6 ++--- .../.config/xmobar/lib/GruvboxColors.hs | 11 +++++---- home/xmonad/.xmonad/.#xmonad.hs | 1 - home/xmonad/.xmonad/lib/GruvboxColors.hi | Bin 1508 -> 1573 bytes home/xmonad/.xmonad/lib/GruvboxColors.hs | 1 + home/xmonad/.xmonad/lib/GruvboxColors.o | Bin 8368 -> 8816 bytes home/xmonad/.xmonad/xmonad.hs | 22 +++++++++++------- 8 files changed, 26 insertions(+), 19 deletions(-) delete mode 120000 home/xmonad/.xmonad/.#xmonad.hs diff --git a/home/xmonad/.config/xmobar/config.hs b/home/xmonad/.config/xmobar/config.hs index ede81b0..3b432ac 100644 --- a/home/xmonad/.config/xmobar/config.hs +++ b/home/xmonad/.config/xmobar/config.hs @@ -17,7 +17,7 @@ Config { , sepChar = "%" -- delineator between plugin names and straight text , alignSep = "][" -- separator between left-right alignment - , template = "——{%StdinReader%}—————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————][%xmobarstatus%" + , template = "——{%StdinReader%}—————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————][%xmobarstatus%" -- general behavior , lowerOnStart = False -- send to bottom of window stack on start @@ -106,7 +106,7 @@ Config { , Run Date "%F (%a) %T" "date" 10 -- keyboard layout indicator - , Run Kbd [ ("us" , "EN") + , Run Kbd [ ("us" , "EN") , ("ru" , "RU") ] , Run StdinReader diff --git a/home/xmonad/.config/xmobar/config_second.hs b/home/xmonad/.config/xmobar/config_second.hs index e205e6f..e7ab255 100644 --- a/home/xmonad/.config/xmobar/config_second.hs +++ b/home/xmonad/.config/xmobar/config_second.hs @@ -1,4 +1,4 @@ -Config { + Config { -- appearance font = "xft:Mononoki Nerd Font-11:bold:antialias=true:hinting=true" @@ -16,7 +16,7 @@ Config { -- layout , sepChar = "%" -- delineator between plugin names and straight text , alignSep = "][" -- separator between left-right alignment - , template = "--{%StdinReader%}————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————][%xmobarstatus2%" + , template = "--{%StdinReader%}————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————][%xmobarstatus2%" -- general behavior , lowerOnStart = False -- send to bottom of window stack on start @@ -104,7 +104,7 @@ Config { , Run Date "%F (%a) %T" "date" 10 -- keyboard layout indicator - , Run Kbd [ ("us" , "EN") + , Run Kbd [ ("us" , "EN") , ("ru" , "RU") ] , Run StdinReader diff --git a/home/xmonad/.config/xmobar/lib/GruvboxColors.hs b/home/xmonad/.config/xmobar/lib/GruvboxColors.hs index 6819087..4c0d1c5 100644 --- a/home/xmonad/.config/xmobar/lib/GruvboxColors.hs +++ b/home/xmonad/.config/xmobar/lib/GruvboxColors.hs @@ -1,16 +1,19 @@ module GruvboxColors where backgroundColor = "#282828" -currentLineColor = "#504945" -selectionColor = "#504945" +currentLineColor = "#fabd2f" +selectionColor = "#665c54" foregroundColor = "#ebdbb2" +foregroundSecondColor = "#fbf1c1" commentColor = "#458588" cyanColor = "#83a598" -greenColor = "#589d6a" +greenColor = "#8ec07c" +greenDarkerColor = "#689d6a" orangeColor = "#fe8019" pinkColor = "#d3869b" -purpleColor = "#bd93f9" +purpleColor = "#b16286" redColor = "#cc241d" yellowColor = "#fabd2f" +grayColor = "#a89984" diff --git a/home/xmonad/.xmonad/.#xmonad.hs b/home/xmonad/.xmonad/.#xmonad.hs deleted file mode 120000 index b94bc91..0000000 --- a/home/xmonad/.xmonad/.#xmonad.hs +++ /dev/null @@ -1 +0,0 @@ -horhik@lap.12603:1614299246 \ No newline at end of file diff --git a/home/xmonad/.xmonad/lib/GruvboxColors.hi b/home/xmonad/.xmonad/lib/GruvboxColors.hi index f1fb8c41d8be4838a206cd18b2b9084263418a25..25e0001b85d8e1be99e01ca7c8adbf49f79776a8 100644 GIT binary patch delta 394 zcmaFDy_Co4$(+~x3@jFg1}4lYm3a&dEM-8f%D}+Lz_5JU{Zr3(T%CG{v7v2i*Q0wE zCQM?yefq_L#_I=XY-YUwfB%BM$Kd)CEZG8Iw=a~tM3mEu;GPaZT z7?l{aCkHa>GR_2&Vw0ybN-&-PvyL!|GkycJJ^@)OV3q=t1YbJ8_3H7^DLM}S$TlGSzulUkjD$;odWY_FpIGA0eL?sZ)BEYVqutkmRXXI pMH=W^76lNY${;ZL3$r)SNsJ8g3Y#5REErii(~A--Cl|980su6ff3W}n delta 374 zcmZ3=^Mu>+$(+~x3@jFg1}4lYm3a&dEcOfx%%2$;7#SGWAOE^>`lp4jJ}_=L@o?$n ze=oNs&E40&ZQI>D4Mk^O?ccd)>4JZ)j1!%L823(`sv~t1sD+9DPy4hxw|{Rx6mx3L zman%LZEiPV;G1|`#^TGqpKa}TcXVE3oOt-i|JEh#vlAGAfKdQMh%)d$zSREj)Zw4k ztBy84{r~gKgvA96d_Wn?$wrJyjOmjfFp5piW)x?f3TDk@lwdppW}N_veFCy{85O{M z6($Kre=w_&NtBfh=%RWsZzGd1D?5<47RoI@-o1@SwJ2SkT(O&JH;%*$_wNj2l0Sb0h#9}|7VuuV}1!@zXK7U8Tcow Sv3N7eZ!TxCV4S>@H3tB4J%x4v diff --git a/home/xmonad/.xmonad/lib/GruvboxColors.hs b/home/xmonad/.xmonad/lib/GruvboxColors.hs index 6ca7f3c..4c0d1c5 100644 --- a/home/xmonad/.xmonad/lib/GruvboxColors.hs +++ b/home/xmonad/.xmonad/lib/GruvboxColors.hs @@ -14,5 +14,6 @@ pinkColor = "#d3869b" purpleColor = "#b16286" redColor = "#cc241d" yellowColor = "#fabd2f" +grayColor = "#a89984" diff --git a/home/xmonad/.xmonad/lib/GruvboxColors.o b/home/xmonad/.xmonad/lib/GruvboxColors.o index 4169220fd8a100385847919ec93ae6260f8b2ad8..c5d51d6359713988c54eb90166d1a19346990eb4 100644 GIT binary patch literal 8816 zcmeI2U2GIp6vuDDj}}EJpcX+{U6ta;x?9>h%Y$j@*J4(Rv}o0sadvmQ-O%oAXJ@6Y z8Zl_3K_Vn37T6)w56$1(H%?ewsNygtygze;N8?poa~xU#uwb~ z#Ib9&$;r9I`xr~wl?wJjJGp!;{NjXavmUK(A3frknD%Au$H5g0BRJggtXfZ%%?6z9sSlj97(`nEf@l2})I@^fG z;wqfkZM4QyDx8Y7HW{rdoK812$1+R)mJyE|&1%HTd@HlZp@OI*Dg6|`q5d3-K2LykK_<-OR@z(^; z5g!tKlz2h#aoCn?hLYn|_*cL;!O_uU`cMqzd-!Np2J~mX3cp^3uZII4MYKy+QhEq5p*RhR|OieTZ%%+W#u)2Za6x>5mJ218igdF`?fB9P`f${R^a@68aM9 z2k-_5Md$g5^wUEBCFy5`{tD@5h5irVLFe;U7+*f0>A3i_E42rBkY1%b472FDP`gy` zqxxmP?#xm>Ms=@WcePMGLUkwAhy1!bMRk$tXZ^Y-TCR&;*6cgjZ^q1Ae$Y|bq4dN^ z!Oe}B@RXRyb@X{|E}u0^`GS=`Oj{E}W_s8umRx)Jlf_JdChIz-e5U-U@g2>cWbfYg zq}kiu-PhG`_P6g%c9|+~AL(fCRyccV$Sf5y=Adhh*!~ctR>91hgI3YI$sEB+(k0im z^IkHSw^@{B&p~sACfKTI58G)k=j5vz2}Q8YpyS#r)@FGiDY=L(5F z4mK#{@`tO2Sn8}Yxa1awtIu9w-N6Q~&9A-XCq$($c<8u2JnS5)8l86s8)RK;yz20! zPCZ!MYWl|ucG2v2_rqx zXFk6%JUNPb_Pdjm$=K%Am1wXxCFETyPV-c5m-ef))S^JzJF7tfK z{Q31Y&3x*Z&(}=P^IRe>^Zdemc%B-(XrahF^~B}+govZvI{4`Q+R5}hPmH+ClVmKtTbDimVo*FcU zBJ*q~j_b_x#EHv1`-scqHNbq?;luXo<`!h&KuyP*XJpw=Xv79WuAWK!}E+1mwDb{ z{`~wo#eDF4kx%d^PzJWn0{geCL9&~m{n zo2ZQy-ea*KM;~4A-2e;nE#;Q~$DlUy`xqZ!d^_V~j6cBm6yqVrrx|~U@maLcz7#3APQi9P{EhIx zmJk@=e#u{S+kj!&EIRac;P)!E4H|fjwrN21M!FaZG+-TYoJWsuAl>7{>9IppsR5eT z(CbP)db}3mxg0eAQM$O=Xgto3bLjDU{unVi|0ykmeqL}Nc)@cE89#@yUynb58?5N@ zy50+Yy3J&2TOHq8YD?`w8qcpSRO|6e|3`%Hp~vg`6~OpDE0$R`()`j_E(`j|u{hHJ yjn}{5;X4oBPxW}c{wR}c4@jNEhb|P8?%)2_%C*9KebD$Bx{2oXK&thAYy3ATRg{qc delta 1811 zcmZ9NO-K}B7{_N;S9jC3UH4;lc3pS3vNpxc#IJ+GruIb}r3HHt5wWn)G%f5P85LM5 zqz{1?ArA#nmSTYf9y|m^cu*?ru%I`Mto0yxNa}s&eHP}O0p~ya{C@9$hM5;k)=x*D zL`>a*nZgD0Y*U8Y1VfhoS&Q|T36!onnNx70N*;(Sz#6wy}Dz9tjKX^8q zWl6F_Ylc&H!VFtk&3@y`ep-=Q*$iup-Y2?hpfA9Yt*Bp!o??kdYVB``GU_t%=4k`1 zfgVOXh*qgzCW4Ac$_j2>fCe3MB7JqKHib`p)7#pYoM=P2ekjA~yc@ReOTq%>)V z-WseC! z6U=56J4aOPd~PsLv+aZjzx$?U27G9i`^3%}!5r{m=agoCG?*%FZQg0~qgms}&P#r= z^R8e{Xy&3{Q5E(?sa>Q!9y{Sja==KQ0>gRPHZP5F>V)|`MOA5n5vOaUe%NF*Kog8{ zx<(p=KtNH$G{IP*Yoz-j#%KXeFuXWs2gV^7VDzx|o1fx3S_D&!7VGG^j+Q_optP6j z=!%Y(>E^4tIc}>e`gC4!get8oJ`N*rAyjFySlB-n4?GJ+tQHFg_h5;E#~g&h5xhJT pt~HHY;8D2N{fRU?wPvwZ4oHNHtSdHN-~-3LN~=WQu?t2+!T;0%YFz*T diff --git a/home/xmonad/.xmonad/xmonad.hs b/home/xmonad/.xmonad/xmonad.hs index 21503d9..067ad91 100644 --- a/home/xmonad/.xmonad/xmonad.hs +++ b/home/xmonad/.xmonad/xmonad.hs @@ -22,6 +22,7 @@ import XMonad.Layout.Gaps import XMonad.Util.EZConfig import XMonad.Layout.Spacing import XMonad.Layout.NoBorders +import XMonad.Layout.Tabbed import XMonad.Hooks.DynamicLog import XMonad.Util.Scratchpad import XMonad.Util.NamedScratchpad @@ -53,7 +54,7 @@ myWorkspaces = ["I","II","III","IV","V","VI","VII", "VIII","IX"] -- Border colors for unfocused and focused windows, respectively. -- myNormalBorderColor = backgroundColor -myFocusedBorderColor = currentLineColor +myFocusedBorderColor = grayColor ------------------------------------------------------------------------ @@ -64,12 +65,13 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $ [ ((modm .|. shiftMask, xK_Return), spawn $ XMonad.terminal conf) -- launch dmenu - , ((modm, xK_p ), spawn ("dmenu_run " ++ " -fn '" ++ myDmenuFont ++ "' -nb '" ++ backgroundColor ++ "' -nf '" ++ selectionColor ++ "' -sb '"++ selectionColor ++"' -sf '"++foregroundSecondColor++"' -shb '"++ greenDarkerColor ++ "' -c "++" -l "++" 20 ")) +-- , ((modm, xK_p ), spawn ("dmenu_run " ++ " -fn '" ++ myDmenuFont ++ "' -nb '" ++ backgroundColor ++ "' -nf '" ++ selectionColor ++ "' -sb '"++ selectionColor ++"' -sf '"++foregroundSecondColor++"' -shb '"++ greenDarkerColor ++ "' -c "++" -l "++" 20 ")) + -- launch emoji picker + , ((modm , xK_e ), spawn "emoji-menu") + , ((modm , xK_p ), spawn "rofi -show drun") + , ((modm .|. shiftMask , xK_p ), spawn "rofi -show window") - -- launch gmrun - , ((modm .|. shiftMask, xK_p ), spawn "gmrun") - -- close focused window , ((modm .|. shiftMask, xK_c ), kill) @@ -145,6 +147,7 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $ , ((modm .|. mod1Mask , xK_space ), spawn "$HOME/.local/scripts/deadd_notify") -- change lang , ((modm, xK_Control_R) , spawn "xkblayout-state set +1") + , ((modm, xK_d) , spawn "eww-toggl") -- toggle fullscreen , ((mod4Mask .|. shiftMask, xK_f), sendMessage ToggleStruts) @@ -155,7 +158,6 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $ , ((modm .|. shiftMask , xK_m), namedScratchpadAction myScratchpads "pulse") , ((modm .|. shiftMask , xK_n), namedScratchpadAction myScratchpads "notion") , ((modm .|. shiftMask , xK_d), namedScratchpadAction myScratchpads "todoist") - , ((modm , xK_d), namedScratchpadAction myScratchpads "pomo") -- | Programs , ((modm .|. shiftMask, xK_z), spawn "zathura &") -- book reader (zathura) @@ -231,7 +233,7 @@ defaultGaps = gaps [(U,defaultGapSize), (R,defaultGapSize), (D, defaultGapSize), defaultSpaces = spacingRaw True (Border 10 10 10 10) True (Border 10 10 10 10) True spacesAndGaps = defaultSpaces . defaultGaps -myLayout = smartBorders . avoidStruts $ spacesAndGaps $ tiled ||| Mirror tiled ||| Full +myLayout = smartBorders . avoidStruts $ spacesAndGaps $ tiled ||| Mirror tiled ||| Full ||| simpleTabbed where -- default tiling algorithm partitions the screen into two panes tiled = Tall nmaster delta ratio @@ -390,10 +392,12 @@ myStartupHook = do spawnOnce "picom --experimental-backends &" spawnOnce "deadd-notification-center &" spawnOnce "setxkbmap us,ru &" + spawnOnce "eww daemon" + spawnOnce "nextcloud" spawnOnce "sh ssh-agent bash ; ssh-add ~/.ssh/arch" spawnOnce "eval '$(ssh-agent -s)'; ssh-add ~/.ssh/id_rsa" - spawnOnce ("enact --pos top --watch &") - spawnOnce ("xrandr --output HDMI1 --above eDP1&") + spawnOnce ("enact --pos left --watch &") + spawnOnce ("xrandr --output HDMI1 --left-of eDP1&") spawnOnce (home ++ ".local/scripts/status/launch &") spawnOnce (home ++ ".local/scripts/touchpad.sh &") -- spawnOnce ("cd /home/horhik/Freenet/downloads/fms; ./fms --daemon &")