diff --git a/conf/config/alacritty/alacritty.yml b/conf/config/alacritty/alacritty.yml index 476ea96..72f7423 100644 --- a/conf/config/alacritty/alacritty.yml +++ b/conf/config/alacritty/alacritty.yml @@ -26,35 +26,37 @@ font: family: monospace size: 8.0 -colors: - # Default colors - primary: - background: '0x141c25' - foreground: '0xb6c0cc' - - # Normal colors - normal: - black: '0x141c25' - red: '0xb03b22' - green: '0x3fa534' - yellow: '0xc4b22d' - blue: '0x5fb5f1' - magenta: '0xbb6cb5' - cyan: '0x478f9c' - white: '0x85888b' - - # Bright colors - bright: - black: '0x384657' - red: '0xda8040' - green: '0x6ad461' - yellow: '0xd7db7a' - blue: '0x47c0d6' - magenta: '0xd19fce' - cyan: '0xa8bcbe' - white: '0xd2dcdb' - -visual_bell: +colors: + # Default colors + primary: + # hard contrast: background = '#1d2021' + background: '#282828' + # soft contrast: background = '#32302f' + foreground: '#ebdbb2' + + # Normal colors + normal: + black: '#282828' + red: '#cc241d' + green: '#98971a' + yellow: '#d79921' + blue: '#458588' + magenta: '#b16286' + cyan: '#689d6a' + white: '#a89984' + + # Bright colors + bright: + black: '#928374' + red: '#fb4934' + green: '#b8bb26' + yellow: '#fabd2f' + blue: '#83a598' + magenta: '#d3869b' + cyan: '#8ec07c' + white: '#ebdbb2' + +bell: animation: EaseOutExpo duration: 0 color: '#ffffff' @@ -66,7 +68,7 @@ selection: save_to_clipboard: true # Allow terminal applications to change Alacritty's window title. -dynamic_title: true +window.dynamic_title: true cursor: style: Block diff --git a/conf/config/micro/bindings.json b/conf/config/micro/bindings.json index b0e2dd6..ff1c42e 100644 --- a/conf/config/micro/bindings.json +++ b/conf/config/micro/bindings.json @@ -1,3 +1,7 @@ { - "Alt-/": "lua:comment.comment" + "Alt-/": "lua:comment.comment", + "Alt-d": "RemoveAllMultiCursors", + "Alt-n": "SpawnMultiCursorDown", + "Alt-s": "Save,Quit", + "CtrlUnderscore": "lua:comment.comment" } diff --git a/conf/config/micro/settings.json b/conf/config/micro/settings.json index 9427471..2b3d500 100644 --- a/conf/config/micro/settings.json +++ b/conf/config/micro/settings.json @@ -1,66 +1,13 @@ { - "autoclose": true, - "autoindent": true, - "autosave": 0, - "autosu": false, - "backup": true, - "basename": false, - "colorcolumn": 0, - "colorscheme": "solarized", - "comment": true, - "cursorline": true, - "diff": true, - "diffgutter": false, - "encoding": "utf-8", - "eofnewline": true, - "fastdirty": false, - "fileformat": "unix", - "filemanager": true, - "filemanager.compressparent": true, - "filemanager.foldersfirst": true, - "filemanager.openonstart": false, - "filemanager.showdotfiles": true, - "filemanager.showignored": true, - "filetype": "unknown", - "ftoptions": true, + "colorcolumn": 80, + "colorscheme": "gruvbox", "fzf": true, - "ignorecase": false, - "indentchar": " ", - "infobar": true, - "keepautoindent": false, - "keymenu": true, - "linter": true, - "literate": true, - "matchbrace": true, - "mkparents": false, - "mouse": true, "paste": true, "pluginchannels": [ "https://raw.githubusercontent.com/micro-editor/plugin-channel/master/channel.json" ], "pluginrepos": [], - "readonly": false, - "rmtrailingws": false, - "ruler": true, - "savecursor": false, - "savehistory": true, - "saveundo": false, "scrollbar": true, - "scrollmargin": 3, - "scrollspeed": 2, - "smartpaste": true, - "softwrap": false, - "splitbottom": true, - "splitright": true, - "status": true, - "statusformatl": "$(filename) $(modified)($(line),$(col)) $(status.paste)| ft:$(opt:filetype) | $(opt:fileformat) | $(opt:encoding)", - "statusformatr": "$(bind:ToggleKeyMenu): bindings, $(bind:ToggleHelp): help", - "statusline": true, - "sucmd": "sudo", - "syntax": true, - "tabmovement": false, - "tabsize": 4, - "tabstospaces": false, - "useprimary": true, - "xterm": false + "softwrap": true, + "tabsize": 8 } diff --git a/conf/outdated/sway/config b/conf/config/sway/config similarity index 100% rename from conf/outdated/sway/config rename to conf/config/sway/config diff --git a/conf/config/sxhkd/sxhkdrc b/conf/config/sxhkd/sxhkdrc index bc81639..7a1ec77 100644 --- a/conf/config/sxhkd/sxhkdrc +++ b/conf/config/sxhkd/sxhkdrc @@ -6,10 +6,16 @@ XF86MonBrightness{Up,Down} xbacklight -fps 25 -{inc,dec} 5 +ctrl + {Right,Left} + xbacklight -fps 25 -{inc,dec} 5 + # audio control XF86Audio{Raise,Lower}Volume amixer -q sset Master 3%{+,-} +ctrl + {Up,Down} + amixer -q sset Master 3%{+,-} + XF86AudioMute amixer -q sset Master toggle @@ -20,6 +26,9 @@ XF86AudioMicMute super + Return alacritty +alt + Return + alacritty + # program launcher super + @space rofi -show drun @@ -27,6 +36,13 @@ super + @space super + shift + space rofi -show run +# program launcher +alt + @space + rofi -show drun + +alt + shift + space + rofi -show run + # Screenshot Print $SCRIPT_DIR/screenshot @@ -34,109 +50,3 @@ Print # make sxhkd reload its configuration files: super + Escape pkill -USR1 -x sxhkd - -# -# bspwm hotkeys -# - -# quit/restart bspwm -super + alt + {q,r} - bspc {quit,wm -r} - -# close and kill -super + {_,shift + }w - bspc node -{c,k} - -# alternate between the tiled and monocle layout -super + m - bspc desktop -l next - -# send the newest marked node to the newest preselected node -super + y - bspc node newest.marked.local -n newest.!automatic.local - -# swap the current node and the biggest node -super + g - bspc node -s biggest - -# -# state/flags -# - -# set the window state -super + {t,shift + t,s,f} - bspc node -t {tiled,pseudo_tiled,floating,fullscreen} - -# set the node flags -super + ctrl + {m,x,y,z} - bspc node -g {marked,locked,sticky,private} - -# -# focus/swap -# - -# focus the node in the given direction -super + {_,shift + }{h,j,k,l} - bspc node -{f,s} {west,south,north,east} - -# focus the node for the given path jump -super + {p,b,comma,period} - bspc node -f @{parent,brother,first,second} - -# focus the next/previous node in the current desktop -super + {_,shift + }c - bspc node -f {next,prev}.local - -# focus the next/previous desktop in the current monitor -super + bracket{left,right} - bspc desktop -f {prev,next}.local - -# focus the last node/desktop -super + {grave,Tab} - bspc {node,desktop} -f last - -# focus the older or newer node in the focus history -super + {o,i} - bspc wm -h off; \ - bspc node {older,newer} -f; \ - bspc wm -h on - -# focus or send to the given desktop -super + {_,shift + }{1-9,0} - bspc {desktop -f,node -d} '^{1-9,10}' - -# -# preselect -# - -# preselect the direction -super + ctrl + {h,j,k,l} - bspc node -p {west,south,north,east} - -# preselect the ratio -super + ctrl + {1-9} - bspc node -o 0.{1-9} - -# cancel the preselection for the focused node -super + ctrl + space - bspc node -p cancel - -# cancel the preselection for the focused desktop -super + ctrl + shift + space - bspc query -N -d | xargs -I id -n 1 bspc node id -p cancel - -# -# move/resize -# - -# expand a window by moving one of its side outward -super + alt + {h,j,k,l} - bspc node -z {left -20 0,bottom 0 20,top 0 -20,right 20 0} - -# contract a window by moving one of its side inward -super + shift + alt + {h,j,k,l} - bspc node -z {right -20 0,top 0 20,bottom 0 -20,left 20 0} - -# move a floating window -super + {Left,Down,Up,Right} - bspc node -v {-20 0,0 20,0 -20,20 0} diff --git a/conf/config/sxhkd/sxhkdrc.old b/conf/config/sxhkd/sxhkdrc.old new file mode 100644 index 0000000..410c4e4 --- /dev/null +++ b/conf/config/sxhkd/sxhkdrc.old @@ -0,0 +1,165 @@ +# +# wm independent hotkeys +# + +# backlight keys +XF86MonBrightness{Up,Down} + xbacklight -fps 25 -{inc,dec} 5 + +ctrl + {Right,Left} + xbacklight -fps 25 -{inc,dec} 5 + +# audio control +XF86Audio{Raise,Lower}Volume + amixer -q sset Master 3%{+,-} + +ctrl + {Up,Down} + amixer -q sset Master 3%{+,-} + +XF86AudioMute + amixer -q sset Master toggle + +XF86AudioMicMute + amixer -q sset Capture toggle + +# terminal emulator +super + Return + alacritty + +alt + Return + alacritty + +# program launcher +super + @space + rofi -show drun + +super + shift + space + rofi -show run + +# program launcher +alt + @space + rofi -show drun + +alt + shift + space + rofi -show run + +# Screenshot +Print + $SCRIPT_DIR/screenshot + +# make sxhkd reload its configuration files: +super + Escape + pkill -USR1 -x sxhkd + +# +# bspwm hotkeys +# + +# quit/restart bspwm +super + alt + {q,r} + bspc {quit,wm -r} + +# close and kill +super + {_,shift + }w + bspc node -{c,k} + +alt + {_,shift + }w + bspc node -{c,k} + +# alternate between the tiled and monocle layout +super + m + bspc desktop -l next + +# send the newest marked node to the newest preselected node +super + y + bspc node newest.marked.local -n newest.!automatic.local + +# swap the current node and the biggest node +super + g + bspc node -s biggest + +# +# state/flags +# + +# set the window state +super + {t,shift + t,s,f} + bspc node -t {tiled,pseudo_tiled,floating,fullscreen} + +# set the node flags +super + ctrl + {m,x,y,z} + bspc node -g {marked,locked,sticky,private} + +# +# focus/swap +# + +# focus the node in the given direction +super + {_,shift + }{h,j,k,l} + bspc node -{f,s} {west,south,north,east} + +# focus the node for the given path jump +super + {p,b,comma,period} + bspc node -f @{parent,brother,first,second} + +# focus the next/previous node in the current desktop +super + {_,shift + }c + bspc node -f {next,prev}.local + +# focus the next/previous desktop in the current monitor +super + bracket{left,right} + bspc desktop -f {prev,next}.local + +# focus the last node/desktop +super + {grave,Tab} + bspc {node,desktop} -f last + +# focus the older or newer node in the focus history +super + {o,i} + bspc wm -h off; \ + bspc node {older,newer} -f; \ + bspc wm -h on + +# focus or send to the given desktop +super + {_,shift + }{1-9,0} + bspc {desktop -f,node -d} '^{1-9,10}' + +# focus or send to the given desktop +alt + {_,shift + }{1-9,0} + bspc {desktop -f,node -d} '^{1-9,10}' + +# +# preselect +# + +# preselect the direction +super + ctrl + {h,j,k,l} + bspc node -p {west,south,north,east} + +# preselect the ratio +super + ctrl + {1-9} + bspc node -o 0.{1-9} + +# cancel the preselection for the focused node +super + ctrl + space + bspc node -p cancel + +# cancel the preselection for the focused desktop +super + ctrl + shift + space + bspc query -N -d | xargs -I id -n 1 bspc node id -p cancel + +# +# move/resize +# + +# expand a window by moving one of its side outward +super + alt + {h,j,k,l} + bspc node -z {left -20 0,bottom 0 20,top 0 -20,right 20 0} + +# contract a window by moving one of its side inward +super + shift + alt + {h,j,k,l} + bspc node -z {right -20 0,top 0 20,bottom 0 -20,left 20 0} + +# move a floating window +super + {Left,Down,Up,Right} + bspc node -v {-20 0,0 20,0 -20,20 0} diff --git a/conf/home/bashrc b/conf/home/bashrc index c1ead02..62d74c5 100644 --- a/conf/home/bashrc +++ b/conf/home/bashrc @@ -17,8 +17,30 @@ alias gad='git add .' alias gs='git status' alias gp='git push' alias gco='git commit' +alias gd='git diff' alias rm='rm -i' alias mv='mv -i' alias ..='cd ..' +alias open='xdg-open' + +# Colored man pages with less(1) +export LESS="--RAW-CONTROL-CHARS" +export LESS_TERMCAP_mb=$(tput bold; tput setaf 2) # green +export LESS_TERMCAP_md=$(tput bold; tput setaf 6) # cyan +export LESS_TERMCAP_me=$(tput sgr0) +export LESS_TERMCAP_so=$(tput bold; tput setaf 3; tput setab 4) # yellow on blue +export LESS_TERMCAP_se=$(tput rmso; tput sgr0) +export LESS_TERMCAP_us=$(tput smul; tput bold; tput setaf 7) # white +export LESS_TERMCAP_ue=$(tput rmul; tput sgr0) +export LESS_TERMCAP_mr=$(tput rev) +export LESS_TERMCAP_mh=$(tput dim) +export LESS_TERMCAP_ZN=$(tput ssubm) +export LESS_TERMCAP_ZV=$(tput rsubm) +export LESS_TERMCAP_ZO=$(tput ssupm) +export LESS_TERMCAP_ZW=$(tput rsupm) +export GROFF_NO_SGR=1 # For Konsole and Gnome-terminal PS1='\[\033[33m\][\u] \[\033[1;34m\]\W $ \[\033[0;00m\]' + +# Created by `userpath` on 2020-07-06 16:46:37 +export PATH="$PATH:/home/ale/.local/bin" diff --git a/conf/home/xinitrc b/conf/home/xinitrc index 0aeb93e..7c154f1 100644 --- a/conf/home/xinitrc +++ b/conf/home/xinitrc @@ -69,8 +69,8 @@ export VDPAU_DRIVER=radeonsi # Set the default interface used by wpa_cli export WPA_CLI_INTERFACE=wlp2s0 # Set the editor -export EDITOR=vis -export VISUAL=vis +export EDITOR=micro +export VISUAL=micro # Application compatibility export GIO_USE_VFS="local" export GIO_USE_VOLUME_MONITOR="unix" @@ -127,14 +127,17 @@ if ! pgrep -x "devmon" > /dev/null then devmon 2>&1 | "$STARTW_ROOT"/addts >> "$STARTX_LOG_FILE" & fi -feh --no-fehbg --bg-fill "$WALLPAPER" & -polybar -r vantagev1 2>&1 | "$STARTW_ROOT"/addts >> "$STARTX_LOG_FILE" & +#feh --no-fehbg --bg-fill "$WALLPAPER" & +#polybar -r vantagev1 2>&1 | "$STARTW_ROOT"/addts >> "$STARTX_LOG_FILE" & +nitrogen --restore 2>/dev/null +tint2 | "$STARTW_ROOT"/addts >> "$STARTX_LOG_FILE" & xset s on -xset s 120/300 +xset s 600/660 xss-lock --ignore-sleep -- xsecurelock & # # START WINDOW MANAGER # -exec bspwm +sxhkd & +exec openbox