diff --git a/t480s/dwm/OFL.txt b/t480s/dwm/OFL.txt new file mode 100644 index 0000000..8bee414 --- /dev/null +++ b/t480s/dwm/OFL.txt @@ -0,0 +1,93 @@ +Copyright 2020 The JetBrains Mono Project Authors (https://github.com/JetBrains/JetBrainsMono) + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +https://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/t480s/dwm/dwm/config.def.h b/t480s/dwm/dwm/config.def.h index c50d2ae..cffcd87 100644 --- a/t480s/dwm/dwm/config.def.h +++ b/t480s/dwm/dwm/config.def.h @@ -15,7 +15,7 @@ static const unsigned int systraypinning = 0; /* 0: sloppy systray follows sel static const unsigned int systrayspacing = 2; /* systray spacing */ static const int systraypinningfailfirst = 1; /* 1: if pinning fails,display systray on the 1st monitor,False: display systray on last monitor*/ static const int showsystray = 1; /* 0 means no systray */ -static const int showbar = 1; /* 0 means no bar */ +static const int showbar = 0; /* 0 means no bar */ static const int showtab = showtab_auto; static const int toptab = 1; /* 0 means bottom tab */ static const int floatbar = 1;/* 1 means the bar will float(don't have padding),0 means the bar have padding */ @@ -31,14 +31,14 @@ static const int colorfultag = 1; /* 0 means use SchemeSel for sel static const char *upvol[] = { "/usr/bin/pactl", "set-sink-volume", "0", "+5%", NULL }; static const char *downvol[] = { "/usr/bin/pactl", "set-sink-volume", "0", "-5%", NULL }; static const char *mutevol[] = { "/usr/bin/pactl", "set-sink-mute", "0", "toggle", NULL }; -static const char *light_up[] = {"/usr/bin/light", "-A", "5", NULL}; -static const char *light_down[] = {"/usr/bin/light", "-U", "5", NULL}; +static const char *light_up[] = {"/usr/bin/brightnessctl", "set", "+50", NULL}; +static const char *light_down[] = {"/usr/bin/brightnessctl", "set", "50-", NULL}; static const int new_window_attach_on_end = 0; /* 1 means the new window will attach on the end; 0 means the new window will attach on the front,default is front */ #define ICONSIZE 19 /* icon size */ #define ICONSPACING 8 /* space between icon and title */ static const char *fonts[] = {"Noto Sans Mono:style:medium:size=12" ,"JetBrainsMono Nerd Font Mono:style:medium:size=19", - "Material Design Icons Desktop:size=11" }; + "Material Design Icons Desktop:size=12" }; // theme #include "themes/gruvbox-dark.h" @@ -56,6 +56,8 @@ static const char *colors[][3] = { [SchemeTag3] = { orange, black, black }, [SchemeTag4] = { green, black, black }, [SchemeTag5] = { pink, black, black }, + [SchemeTag6] = { blue, black, black }, + [SchemeTag7] = { red, black, black }, [SchemeLayout] = { green, black, black }, [SchemeBtnPrev] = { green, black, black }, [SchemeBtnNext] = { yellow, black, black }, @@ -63,7 +65,7 @@ static const char *colors[][3] = { }; /* tagging */ -static char *tags[] = {"", "", "", "", "", "", ""}; +static char *tags[] = {"", "", "", "", "", "", ""}; static const char* eww[] = { "eww", "open" , "eww", NULL }; @@ -73,7 +75,7 @@ static const Launcher launchers[] = { }; static const int tagschemes[] = { - SchemeTag1, SchemeTag2, SchemeTag3, SchemeTag4, SchemeTag5 + SchemeTag1, SchemeTag2, SchemeTag3, SchemeTag4, SchemeTag5, SchemeTag6, SchemeTag7 }; static const unsigned int ulinepad = 5; /* horizontal padding between the underline and tag */ @@ -122,7 +124,7 @@ static const Layout layouts[] = { }; /* key definitions */ -#define MODKEY Mod1Mask +#define MODKEY Mod4Mask #define TAGKEYS(KEY,TAG) \ { MODKEY, KEY, view, {.ui = 1 << TAG} }, \ { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \ @@ -151,8 +153,10 @@ static const Key keys[] = { SHCMD("maim --select | xclip -selection clipboard -t image/png")}, { MODKEY, XK_c, spawn, SHCMD("rofi -show drun") }, - { MODKEY, XK_Return, spawn, SHCMD("st")}, - + { MODKEY, XK_Return, spawn, SHCMD("st")}, + { MODKEY, XK_r, spawn, SHCMD("st -e lf")}, + { MODKEY, XK_w, spawn, SHCMD("qutebrowser")}, + // toggle stuff { MODKEY, XK_b, togglebar, {0} }, { MODKEY|ControlMask, XK_t, togglegaps, {0} }, @@ -162,8 +166,8 @@ static const Key keys[] = { { MODKEY|ControlMask, XK_w, tabmode, { -1 } }, { MODKEY, XK_j, focusstack, {.i = +1 } }, { MODKEY, XK_k, focusstack, {.i = -1 } }, - { MODKEY, XK_i, incnmaster, {.i = +1 } }, - { MODKEY, XK_d, incnmaster, {.i = -1 } }, + // { MODKEY, XK_i, incnmaster, {.i = +1 } }, + // { MODKEY, XK_d, incnmaster, {.i = -1 } }, // change m,cfact sizes { MODKEY, XK_h, setmfact, {.f = -0.05} }, diff --git a/t480s/dwm/dwm/config.h b/t480s/dwm/dwm/config.h index c50d2ae..cffcd87 100644 --- a/t480s/dwm/dwm/config.h +++ b/t480s/dwm/dwm/config.h @@ -15,7 +15,7 @@ static const unsigned int systraypinning = 0; /* 0: sloppy systray follows sel static const unsigned int systrayspacing = 2; /* systray spacing */ static const int systraypinningfailfirst = 1; /* 1: if pinning fails,display systray on the 1st monitor,False: display systray on last monitor*/ static const int showsystray = 1; /* 0 means no systray */ -static const int showbar = 1; /* 0 means no bar */ +static const int showbar = 0; /* 0 means no bar */ static const int showtab = showtab_auto; static const int toptab = 1; /* 0 means bottom tab */ static const int floatbar = 1;/* 1 means the bar will float(don't have padding),0 means the bar have padding */ @@ -31,14 +31,14 @@ static const int colorfultag = 1; /* 0 means use SchemeSel for sel static const char *upvol[] = { "/usr/bin/pactl", "set-sink-volume", "0", "+5%", NULL }; static const char *downvol[] = { "/usr/bin/pactl", "set-sink-volume", "0", "-5%", NULL }; static const char *mutevol[] = { "/usr/bin/pactl", "set-sink-mute", "0", "toggle", NULL }; -static const char *light_up[] = {"/usr/bin/light", "-A", "5", NULL}; -static const char *light_down[] = {"/usr/bin/light", "-U", "5", NULL}; +static const char *light_up[] = {"/usr/bin/brightnessctl", "set", "+50", NULL}; +static const char *light_down[] = {"/usr/bin/brightnessctl", "set", "50-", NULL}; static const int new_window_attach_on_end = 0; /* 1 means the new window will attach on the end; 0 means the new window will attach on the front,default is front */ #define ICONSIZE 19 /* icon size */ #define ICONSPACING 8 /* space between icon and title */ static const char *fonts[] = {"Noto Sans Mono:style:medium:size=12" ,"JetBrainsMono Nerd Font Mono:style:medium:size=19", - "Material Design Icons Desktop:size=11" }; + "Material Design Icons Desktop:size=12" }; // theme #include "themes/gruvbox-dark.h" @@ -56,6 +56,8 @@ static const char *colors[][3] = { [SchemeTag3] = { orange, black, black }, [SchemeTag4] = { green, black, black }, [SchemeTag5] = { pink, black, black }, + [SchemeTag6] = { blue, black, black }, + [SchemeTag7] = { red, black, black }, [SchemeLayout] = { green, black, black }, [SchemeBtnPrev] = { green, black, black }, [SchemeBtnNext] = { yellow, black, black }, @@ -63,7 +65,7 @@ static const char *colors[][3] = { }; /* tagging */ -static char *tags[] = {"", "", "", "", "", "", ""}; +static char *tags[] = {"", "", "", "", "", "", ""}; static const char* eww[] = { "eww", "open" , "eww", NULL }; @@ -73,7 +75,7 @@ static const Launcher launchers[] = { }; static const int tagschemes[] = { - SchemeTag1, SchemeTag2, SchemeTag3, SchemeTag4, SchemeTag5 + SchemeTag1, SchemeTag2, SchemeTag3, SchemeTag4, SchemeTag5, SchemeTag6, SchemeTag7 }; static const unsigned int ulinepad = 5; /* horizontal padding between the underline and tag */ @@ -122,7 +124,7 @@ static const Layout layouts[] = { }; /* key definitions */ -#define MODKEY Mod1Mask +#define MODKEY Mod4Mask #define TAGKEYS(KEY,TAG) \ { MODKEY, KEY, view, {.ui = 1 << TAG} }, \ { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \ @@ -151,8 +153,10 @@ static const Key keys[] = { SHCMD("maim --select | xclip -selection clipboard -t image/png")}, { MODKEY, XK_c, spawn, SHCMD("rofi -show drun") }, - { MODKEY, XK_Return, spawn, SHCMD("st")}, - + { MODKEY, XK_Return, spawn, SHCMD("st")}, + { MODKEY, XK_r, spawn, SHCMD("st -e lf")}, + { MODKEY, XK_w, spawn, SHCMD("qutebrowser")}, + // toggle stuff { MODKEY, XK_b, togglebar, {0} }, { MODKEY|ControlMask, XK_t, togglegaps, {0} }, @@ -162,8 +166,8 @@ static const Key keys[] = { { MODKEY|ControlMask, XK_w, tabmode, { -1 } }, { MODKEY, XK_j, focusstack, {.i = +1 } }, { MODKEY, XK_k, focusstack, {.i = -1 } }, - { MODKEY, XK_i, incnmaster, {.i = +1 } }, - { MODKEY, XK_d, incnmaster, {.i = -1 } }, + // { MODKEY, XK_i, incnmaster, {.i = +1 } }, + // { MODKEY, XK_d, incnmaster, {.i = -1 } }, // change m,cfact sizes { MODKEY, XK_h, setmfact, {.f = -0.05} }, diff --git a/t480s/dwm/dwm/dwm b/t480s/dwm/dwm/dwm index dfe735b..acbf6db 100755 Binary files a/t480s/dwm/dwm/dwm and b/t480s/dwm/dwm/dwm differ diff --git a/t480s/dwm/dwm/dwm.c b/t480s/dwm/dwm/dwm.c index 402bc1c..8d39d00 100644 --- a/t480s/dwm/dwm/dwm.c +++ b/t480s/dwm/dwm/dwm.c @@ -103,6 +103,8 @@ enum { SchemeTag3, SchemeTag4, SchemeTag5, + SchemeTag6, + SchemeTag7, SchemeLayout, TabSel, TabNorm, diff --git a/t480s/dwm/dwm/dwm.o b/t480s/dwm/dwm/dwm.o index 3cb5d0c..9cb2a8c 100644 Binary files a/t480s/dwm/dwm/dwm.o and b/t480s/dwm/dwm/dwm.o differ diff --git a/t480s/dwm/readme.md b/t480s/dwm/readme.md new file mode 100644 index 0000000..9f2e700 --- /dev/null +++ b/t480s/dwm/readme.md @@ -0,0 +1,8 @@ + +# Nerd Fonts + +This is an archived font from a Nerd Fonts release. + +For more information see: +* https://github.com/ryanoasis/nerd-fonts/ +* https://github.com/ryanoasis/nerd-fonts/releases/latest/ diff --git a/t480s/dwm/rofi/config.rasi b/t480s/dwm/rofi/config.rasi index bae4142..c5adc7c 100644 --- a/t480s/dwm/rofi/config.rasi +++ b/t480s/dwm/rofi/config.rasi @@ -1,7 +1,7 @@ configuration{ modi: "run,drun,window"; lines: 5; - font: "Iosevka 12"; + font: "Noto Sans Mono 12"; show-icons: true; icon-theme: "Paper Mono"; terminal: "st"; diff --git a/t480s/dwm/scripts/bar.sh b/t480s/dwm/scripts/bar.sh index ca222ed..0579788 100755 --- a/t480s/dwm/scripts/bar.sh +++ b/t480s/dwm/scripts/bar.sh @@ -28,7 +28,7 @@ pkg_updates() { } battery() { - get_capacity="$(cat /sys/class/power_supply/BAT1/capacity)" + get_capacity="$(cat /sys/class/power_supply/BAT0/capacity)" printf "^c$blue^  $get_capacity" } diff --git a/t480s/dwm/scripts/bar_themes/gruvbox-dark b/t480s/dwm/scripts/bar_themes/gruvbox-dark index 4999d0e..b9d5016 100755 --- a/t480s/dwm/scripts/bar_themes/gruvbox-dark +++ b/t480s/dwm/scripts/bar_themes/gruvbox-dark @@ -2,10 +2,10 @@ # colors -black=#222526 -green=#89b482 -white=#c7b89d +black=#282828 +green=#98971a +white=#a89984 grey=#2b2e2f blue=#6f8faf -red=#ec6b64 -darkblue=#6080a0 +red=#cc241d +darkblue=#458588 diff --git a/t480s/dwm/scripts/run.sh b/t480s/dwm/scripts/run.sh index 16e7787..4f87c4e 100755 --- a/t480s/dwm/scripts/run.sh +++ b/t480s/dwm/scripts/run.sh @@ -4,7 +4,8 @@ xrdb merge ~/.Xresources xbacklight -set 10 & feh --bg-fill ~/.wallpapers/wall.jpg & xset r rate 200 50 & -picom & +picom --no-fading-openclose & +setxkbmap -layout us -variant altgr-intl -option nodeadkeys ~/.config/dwm/scripts/bar.sh & while type dwm >/dev/null; do dwm && continue || break; done