lot of stuff
This commit is contained in:
parent
9920545fdd
commit
6edc41d678
34
.Xresources
34
.Xresources
|
|
@ -5,23 +5,23 @@
|
|||
*.foreground: white
|
||||
*.cursorColor: white
|
||||
|
||||
/* !! gruvbox: */
|
||||
/* *.color0: #1d2021 */
|
||||
/* *.color1: #cc241d */
|
||||
/* *.color2: #98971a */
|
||||
/* *.color3: #d79921 */
|
||||
/* *.color4: #458588 */
|
||||
/* *.color5: #b16286 */
|
||||
/* *.color6: #689d6a */
|
||||
/* *.color7: #a89984 */
|
||||
/* *.color8: #928374 */
|
||||
/* *.color9: #fb4934 */
|
||||
/* *.color10: #b8bb26 */
|
||||
/* *.color11: #fabd2f */
|
||||
/* *.color12: #83a598 */
|
||||
/* *.color13: #d3869b */
|
||||
/* *.color14: #8ec07c */
|
||||
/* *.color15: #ebdbb2 */
|
||||
!/* !! gruvbox: */
|
||||
!/* *.color0: #1d2021 */
|
||||
!/* *.color1: #cc241d */
|
||||
!/* *.color2: #98971a */
|
||||
!/* *.color3: #d79921 */
|
||||
!/* *.color4: #458588 */
|
||||
!/* *.color5: #b16286 */
|
||||
!/* *.color6: #689d6a */
|
||||
!/* *.color7: #a89984 */
|
||||
!/* *.color8: #928374 */
|
||||
!/* *.color9: #fb4934 */
|
||||
!/* *.color10: #b8bb26 */
|
||||
!/* *.color11: #fabd2f */
|
||||
!/* *.color12: #83a598 */
|
||||
!/* *.color13: #d3869b */
|
||||
!/* *.color14: #8ec07c */
|
||||
!/* *.color15: #ebdbb2 */
|
||||
|
||||
!! Transparency (0-1):
|
||||
st.alpha: 0.9
|
||||
|
|
|
|||
|
|
@ -58,6 +58,10 @@ LABELS["websearch"]=""
|
|||
COMMANDS["workspace"]="~/.config/Scripts/i3_switch_workspace.sh"
|
||||
LABELS["workspace"]=""
|
||||
|
||||
# wifi-menu
|
||||
COMMANDS["wifi-menu"]="~/.config/Scripts/rofi-wifi-menu.sh"
|
||||
LABELS["wifi-menu"]=""
|
||||
|
||||
# show clipboard history
|
||||
# source: https://github.com/erebe/greenclip
|
||||
#COMMANDS["clipboard"]='rofi -modi "clipboard:greenclip print" -show clipboard'
|
||||
|
|
|
|||
|
|
@ -0,0 +1,100 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
# Starts a scan of available broadcasting SSIDs
|
||||
# nmcli dev wifi rescan
|
||||
|
||||
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||
|
||||
FIELDS=SSID,SECURITY
|
||||
POSITION=0
|
||||
YOFF=0
|
||||
XOFF=0
|
||||
FONT="DejaVu Sans Mono 8"
|
||||
|
||||
if [ -r "$DIR/config" ]; then
|
||||
source "$DIR/config"
|
||||
elif [ -r "$HOME/.config/rofi/wifi" ]; then
|
||||
source "$HOME/.config/rofi/wifi"
|
||||
else
|
||||
echo "WARNING: config file not found! Using default values."
|
||||
fi
|
||||
|
||||
LIST=$(nmcli --fields "$FIELDS" device wifi list | sed '/^--/d')
|
||||
# For some reason rofi always approximates character width 2 short... hmmm
|
||||
RWIDTH=$(($(echo "$LIST" | head -n 1 | awk '{print length($0); }')+2))
|
||||
# Dynamically change the height of the rofi menu
|
||||
LINENUM=$(echo "$LIST" | wc -l)
|
||||
# Gives a list of known connections so we can parse it later
|
||||
KNOWNCON=$(nmcli connection show)
|
||||
# Really janky way of telling if there is currently a connection
|
||||
CONSTATE=$(nmcli -fields WIFI g)
|
||||
|
||||
CURRSSID=$(LANGUAGE=C nmcli -t -f active,ssid dev wifi | awk -F: '$1 ~ /^yes/ {print $2}')
|
||||
|
||||
if [[ ! -z $CURRSSID ]]; then
|
||||
HIGHLINE=$(echo "$(echo "$LIST" | awk -F "[ ]{2,}" '{print $1}' | grep -Fxn -m 1 "$CURRSSID" | awk -F ":" '{print $1}') + 1" | bc )
|
||||
fi
|
||||
|
||||
# HOPEFULLY you won't need this as often as I do
|
||||
# If there are more than 8 SSIDs, the menu will still only have 8 lines
|
||||
if [ "$LINENUM" -gt 8 ] && [[ "$CONSTATE" =~ "enabled" ]]; then
|
||||
LINENUM=8
|
||||
elif [[ "$CONSTATE" =~ "disabled" ]]; then
|
||||
LINENUM=1
|
||||
fi
|
||||
|
||||
|
||||
if [[ "$CONSTATE" =~ "enabled" ]]; then
|
||||
TOGGLE="toggle off"
|
||||
elif [[ "$CONSTATE" =~ "disabled" ]]; then
|
||||
TOGGLE="toggle on"
|
||||
fi
|
||||
|
||||
|
||||
|
||||
CHENTRY=$(echo -e "$TOGGLE\nmanual\n$LIST" | uniq -u | rofi -dmenu -p "Wi-Fi SSID: " -lines "$LINENUM" -a "$HIGHLINE" -location "$POSITION" -yoffset "$YOFF" -xoffset "$XOFF" -font "$FONT" -width -"$RWIDTH")
|
||||
#echo "$CHENTRY"
|
||||
CHSSID=$(echo "$CHENTRY" | sed 's/\s\{2,\}/\|/g' | awk -F "|" '{print $1}')
|
||||
#echo "$CHSSID"
|
||||
|
||||
# If the user inputs "manual" as their SSID in the start window, it will bring them to this screen
|
||||
if [ "$CHENTRY" = "manual" ] ; then
|
||||
# Manual entry of the SSID and password (if appplicable)
|
||||
MSSID=$(echo "enter the SSID of the network (SSID,password)" | rofi -dmenu -p "Manual Entry: " -font "$FONT" -lines 1)
|
||||
# Separating the password from the entered string
|
||||
MPASS=$(echo "$MSSID" | awk -F "," '{print $2}')
|
||||
|
||||
#echo "$MSSID"
|
||||
#echo "$MPASS"
|
||||
|
||||
# If the user entered a manual password, then use the password nmcli command
|
||||
if [ "$MPASS" = "" ]; then
|
||||
nmcli dev wifi con "$MSSID"
|
||||
else
|
||||
nmcli dev wifi con "$MSSID" password "$MPASS"
|
||||
fi
|
||||
|
||||
elif [ "$CHENTRY" = "toggle on" ]; then
|
||||
nmcli radio wifi on
|
||||
|
||||
elif [ "$CHENTRY" = "toggle off" ]; then
|
||||
nmcli radio wifi off
|
||||
|
||||
else
|
||||
|
||||
# If the connection is already in use, then this will still be able to get the SSID
|
||||
if [ "$CHSSID" = "*" ]; then
|
||||
CHSSID=$(echo "$CHENTRY" | sed 's/\s\{2,\}/\|/g' | awk -F "|" '{print $3}')
|
||||
fi
|
||||
|
||||
# Parses the list of preconfigured connections to see if it already contains the chosen SSID. This speeds up the connection process
|
||||
if [[ $(echo "$KNOWNCON" | grep "$CHSSID") = "$CHSSID" ]]; then
|
||||
nmcli con up "$CHSSID"
|
||||
else
|
||||
if [[ "$CHENTRY" =~ "WPA2" ]] || [[ "$CHENTRY" =~ "WEP" ]]; then
|
||||
WIFIPASS=$(echo "if connection is stored, hit enter" | rofi -dmenu -p "password: " -lines 1 -font "$FONT" )
|
||||
fi
|
||||
nmcli dev wifi con "$CHSSID" password "$WIFIPASS"
|
||||
fi
|
||||
|
||||
fi
|
||||
|
|
@ -62,11 +62,11 @@ no-dock-shadow = true;
|
|||
# Zero the part of the shadow's mask behind the window. Fix some weirdness with ARGB windows.
|
||||
clear-shadow = true;
|
||||
# The blur radius for shadows. (default 12)
|
||||
shadow-radius = 10;
|
||||
shadow-radius = 7;
|
||||
# The left offset for shadows. (default -15)
|
||||
shadow-offset-x = -10;
|
||||
shadow-offset-x = -7;
|
||||
# The top offset for shadows. (default -15)
|
||||
shadow-offset-y = -10;
|
||||
shadow-offset-y = -7;
|
||||
# The translucency for shadows. (default .75)
|
||||
shadow-opacity = 0.5;
|
||||
|
||||
|
|
@ -84,11 +84,13 @@ shadow-exclude = [
|
|||
"name *= 'Chrome'",
|
||||
"class_g ?= 'Notify-osd'",
|
||||
"name *= 'Firefox'",
|
||||
"name = 'Polybar'",
|
||||
"class_g = 'rofi'",
|
||||
"_GTK_FRAME_EXTENTS@:c",
|
||||
#"class_g = 'i3-frame'",
|
||||
"class_g = 'i3-frame'",
|
||||
"_NET_WM_STATE@:32a *= '_NET_WM_STATE_HIDDEN'",
|
||||
"_NET_WM_STATE@:32a *= '_NET_WM_STATE_STICKY'"
|
||||
#"!I3_FLOATING_WINDOW@:c"
|
||||
"_NET_WM_STATE@:32a *= '_NET_WM_STATE_STICKY'",
|
||||
"!I3_FLOATING_WINDOW@:c"
|
||||
];
|
||||
# Avoid drawing shadow on all shaped windows (see also: --detect-rounded-corners)
|
||||
shadow-ignore-shaped = false;
|
||||
|
|
@ -111,16 +113,15 @@ blur-method = "kawase";
|
|||
blur-strength = 15;
|
||||
|
||||
opacity-rule = [
|
||||
"80:class_g = 'St' && focused",
|
||||
"85:class_g = 'St' && focused",
|
||||
"60:class_g = 'St' && !focused",
|
||||
"70:class_g = 'Code'",
|
||||
"70:class_g = 'code-oss'"
|
||||
"70:name *?= 'rofi'"
|
||||
];
|
||||
|
||||
# Dim inactive windows. (0.0 - 1.0)
|
||||
# inactive-dim = 0.2;
|
||||
inactive-dim = 0.2;
|
||||
# Do not let dimness adjust based on window opacity.
|
||||
# inactive-dim-fixed = true;
|
||||
inactive-dim-fixed = true;
|
||||
# Blur background of transparent windows. Bad performance with X Render backend. GLX backend is preferred.
|
||||
blur-background = true;
|
||||
# Blur background of opaque windows with transparent frames as well.
|
||||
|
|
@ -128,13 +129,14 @@ blur-background-frame = true;
|
|||
# Do not let blur radius adjust based on window opacity.
|
||||
blur-background-fixed = true;
|
||||
blur-background-exclude = [
|
||||
# "window_type = 'dock'",
|
||||
"window_type = 'dock'",
|
||||
"window_type = 'desktop'",
|
||||
"name *= 'Chromium'",
|
||||
"name *= 'Chrome'",
|
||||
"name *= 'Firefox'",
|
||||
"class_g = 'Synapse'",
|
||||
"name = 'Polybar'",
|
||||
"class_g ?= 'Notify-osd'",
|
||||
"class_g = 'mpv'",
|
||||
"_GTK_FRAME_EXTENTS@:c"
|
||||
];
|
||||
|
||||
|
|
@ -153,10 +155,11 @@ fade-in-step = 0.03;
|
|||
# Opacity change between steps while fading out. (default 0.03).
|
||||
fade-out-step = 0.03;
|
||||
# Fade windows in/out when opening/closing
|
||||
# no-fading-openclose = true;
|
||||
no-fading-openclose = false;
|
||||
|
||||
# Specify a list of conditions of windows that should not be faded.
|
||||
fade-exclude = [ ];
|
||||
fade-exclude = [
|
||||
];
|
||||
|
||||
#################################
|
||||
#
|
||||
|
|
@ -202,12 +205,12 @@ paint-on-overlay = true;
|
|||
# Limit compton to repaint at most once every 1 / refresh_rate second to boost performance.
|
||||
# This should not be used with --vsync drm/opengl/opengl-oml as they essentially does --sw-opti's job already,
|
||||
# unless you wish to specify a lower refresh rate than the actual value.
|
||||
sw-opti = true;
|
||||
sw-opti = false;
|
||||
|
||||
# Unredirect all windows if a full-screen opaque window is detected, to maximize performance for full-screen windows, like games.
|
||||
# Known to cause flickering when redirecting/unredirecting windows.
|
||||
# paint-on-overlay may make the flickering less obvious.
|
||||
unredir-if-possible = false;
|
||||
unredir-if-possible = true;
|
||||
|
||||
# Specify a list of conditions of windows that should always be considered focused.
|
||||
focus-exclude = [ ];
|
||||
|
|
|
|||
|
|
@ -53,9 +53,9 @@ client.background $black
|
|||
###---Starting External Scripts---###
|
||||
|
||||
#Load .Xresources
|
||||
exec --no-stsrtup-id xrdb -merge .Xresources
|
||||
exec --no-startup-id xrdb -merge .Xresources
|
||||
#Restore wal colors
|
||||
#exec --no-startup-id wal -R &
|
||||
#exec_always --no-startup-id wal -i "$(< "${HOME}/.cache/wal/wal")"
|
||||
#Start mopidy
|
||||
#exec --no-startup-id mopidy &
|
||||
#Twmn
|
||||
|
|
|
|||
|
|
@ -11,7 +11,9 @@ set autoindent " indent a new line the same amount as the line just
|
|||
set number " add line numbers
|
||||
set wildmode=longest,list " get bash-like tab completions
|
||||
set autoread " refresh file
|
||||
set termguicolors
|
||||
if (has("termguicolors"))
|
||||
set termguicolors
|
||||
endif
|
||||
syntax on
|
||||
|
||||
" set the runtime path to include Vundle and initialize
|
||||
|
|
@ -26,6 +28,7 @@ call plug#begin('~/.local/share/nvim/site/autoload')
|
|||
Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' }
|
||||
Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
|
||||
Plug 'dylanaraps/wal'
|
||||
Plug 'PotatoesMaster/i3-vim-syntax'
|
||||
Plug 'Xuyuanp/nerdtree-git-plugin'
|
||||
Plug 'mhinz/vim-startify'
|
||||
Plug 'tpope/vim-fugitive'
|
||||
|
|
|
|||
|
|
@ -5,14 +5,14 @@
|
|||
;
|
||||
[colors]
|
||||
;Transparent background
|
||||
background = #00FFFFFF
|
||||
background = #00000000
|
||||
;background = ${xrdb:color12:#AD9161}
|
||||
;background = #8a8061
|
||||
background-alt = ${xrdb:color2:#7B8349}
|
||||
background-alt = #061E28
|
||||
;foreground = ${xrdb:color7}
|
||||
foreground = #bdaf97
|
||||
foreground-alt = #264D4C
|
||||
highlight = #1B4446
|
||||
foreground = #6C6044
|
||||
foreground-alt = #6C6044
|
||||
highlight = #bdaf97
|
||||
;error = ${xrdb:color9:#DD712E}
|
||||
error = #1B4446
|
||||
red = #1B4446
|
||||
|
|
@ -62,7 +62,7 @@ format-muted-foreground = ${colors.highlight}
|
|||
label-muted = muted
|
||||
ramp-volume-0 =
|
||||
ramp-volume-1 =
|
||||
ramp-volume-foreground = ${colors.foreground-alt}
|
||||
ramp-volume-foreground = ${colors.foreground}
|
||||
ramp-headphones-0 =
|
||||
ramp-headphones-1 =
|
||||
|
||||
|
|
@ -73,7 +73,7 @@ exec = ~/.config/Scripts/backlight.sh
|
|||
scroll-up = exec light -A 5
|
||||
scroll-down = exec light -U 5
|
||||
format-prefix = " "
|
||||
format-prefix-foreground = ${colors.foreground-alt}
|
||||
format-prefix-foreground = ${colors.foreground}
|
||||
label = %output%
|
||||
label-foreground = ${colors.foreground}
|
||||
format-padding = 1
|
||||
|
|
@ -112,7 +112,7 @@ interval = 256
|
|||
format = "<label> "
|
||||
format-prefix = " "
|
||||
;format-prefix = " "
|
||||
format-prefix-foreground = ${colors.foreground-alt}
|
||||
format-prefix-foreground = ${colors.foreground}
|
||||
exec = echo "$(uname -nr)"
|
||||
|
||||
[module/temperature]
|
||||
|
|
@ -140,7 +140,7 @@ exec = "~/.config/Scripts/arch-updates.sh -s"
|
|||
tail = true
|
||||
format = <label>
|
||||
format-prefix = " "
|
||||
format-prefix-foreground = ${colors.foreground-alt}
|
||||
format-prefix-foreground = ${colors.foreground}
|
||||
click-left = st -e yay --noconfirm -Syu
|
||||
click-right = "~/.config/Scripts/arch-updates.sh -c&"
|
||||
click-middle = "~/.config/Scripts/arch-updates.sh -n"
|
||||
|
|
@ -311,14 +311,14 @@ label-indicator-background = ${colors.background}
|
|||
type = internal/cpu
|
||||
interval = 1
|
||||
format-prefix = " "
|
||||
format-prefix-foreground = ${colors.foreground-alt}
|
||||
format-prefix-foreground = ${colors.foreground}
|
||||
label = %{A1:st --geometry 86x10 -e htop:}%percentage%%%{A}
|
||||
|
||||
[module/memory]
|
||||
type = internal/memory
|
||||
interval = 1
|
||||
format-prefix = " "
|
||||
format-prefix-foreground = ${colors.foreground-alt}
|
||||
format-prefix-foreground = ${colors.foreground}
|
||||
label = %{A1:st --geometry 86x10 -e htop:}%percentage_used%%%{A}
|
||||
|
||||
[module/date]
|
||||
|
|
@ -374,7 +374,7 @@ ramp-volume-foreground = ${colors.foreground-alt}
|
|||
ramp-headphones-0 =
|
||||
ramp-headphones-1 =
|
||||
|
||||
[module/battery]
|
||||
[module/battery1]
|
||||
type = internal/battery
|
||||
battery = BAT1
|
||||
adapter = ADP1
|
||||
|
|
@ -382,22 +382,54 @@ full-at = 98
|
|||
format-charging = <animation-charging> <label-charging>
|
||||
format-discharging = <ramp-capacity> <label-discharging>
|
||||
format-full-prefix = " "
|
||||
format-full-prefix-foreground = ${colors.foreground-alt}
|
||||
format-full-prefix-foreground = ${colors.foreground}
|
||||
ramp-capacity-0-foreground = ${colors.alert}
|
||||
ramp-capacity-0 =
|
||||
ramp-capacity-1 =
|
||||
ramp-capacity-2 =
|
||||
ramp-capacity-3 =
|
||||
ramp-capacity-4 =
|
||||
ramp-capacity-foreground = ${colors.foreground-alt}
|
||||
ramp-capacity-foreground = ${colors.foreground}
|
||||
animation-charging-0 =
|
||||
animation-charging-1 =
|
||||
animation-charging-2 =
|
||||
animation-charging-3 =
|
||||
animation-charging-4 =
|
||||
animation-charging-foreground = ${colors.foreground-alt}
|
||||
animation-charging-foreground = ${colors.foreground}
|
||||
animation-charging-framerate = 750
|
||||
|
||||
[module/battery]
|
||||
type = internal/battery
|
||||
battery = BAT1
|
||||
adapter = ADP1
|
||||
full-at = 98
|
||||
time-format = %H:%M
|
||||
label-charging = %percentage%%
|
||||
label-discharging = %percentage%%
|
||||
format-charging = <animation-charging> <label-charging>
|
||||
format-discharging = <animation-discharging> <label-discharging>
|
||||
format-charging-foreground = ${colors.foreground}
|
||||
label-charging-foreground = ${colors.foreground}
|
||||
format-discharging-foreground = ${colors.foreground}
|
||||
label-discharging-foreground = ${colors.foreground}
|
||||
format-full-prefix = " "
|
||||
format-full-prefix-foreground = ${colors.foreground}
|
||||
label-full-foreground = ${colors.foreground}
|
||||
animation-charging-0 =
|
||||
animation-charging-1 =
|
||||
animation-charging-2 =
|
||||
animation-charging-3 =
|
||||
animation-charging-4 =
|
||||
animation-charging-foreground = ${colors.foreground}
|
||||
animation-charging-framerate = 500
|
||||
animation-discharging-0 =
|
||||
animation-discharging-1 =
|
||||
animation-discharging-2 =
|
||||
animation-discharging-3 =
|
||||
animation-discharging-4 =
|
||||
animation-discharging-framerate = 1000
|
||||
animation-discharging-foreground = ${colors.foreground}
|
||||
|
||||
[module/networkmanager]
|
||||
type = custom/text
|
||||
content = net
|
||||
|
|
@ -416,18 +448,34 @@ label-connected = %{A1:networkmanager_dmenu:}%downspeed%%{A}
|
|||
label-connected-foreground = ${colors.foreground}
|
||||
label-disconnected =
|
||||
|
||||
;[module/wlan]
|
||||
;type = internal/network
|
||||
;interface = wlp2s0
|
||||
;interval = 3.0
|
||||
;format-connected = <label-connected>
|
||||
;format-connected-prefix = " "
|
||||
;format-connected-prefix-foreground = ${colors.foreground-alt}
|
||||
;format-disconnected = <label-disconnected>
|
||||
;label-connected = %{A1:networkmanager_dmenu:}%downspeed%%{A} %essid%
|
||||
;label-connected-foreground = ${colors.foreground}
|
||||
;label-disconnected = %ifname% disconnected
|
||||
;label-disconnected-foreground = ${colors.foreground-alt}
|
||||
|
||||
[module/wlan]
|
||||
type = internal/network
|
||||
interface = wlp2s0
|
||||
interval = 3.0
|
||||
format-connected = <label-connected>
|
||||
format-connected-prefix = " "
|
||||
format-connected-prefix-foreground = ${colors.foreground-alt}
|
||||
format-disconnected = <label-disconnected>
|
||||
label-connected = %{A1:networkmanager_dmenu:}%downspeed%%{A} %essid%
|
||||
label-connected-foreground = ${colors.foreground}
|
||||
label-disconnected = %ifname% disconnected
|
||||
label-disconnected-foreground = ${colors.foreground-alt}
|
||||
label-connected = %essid% %signal% %upspeed% %downspeed%
|
||||
label-disconnected = "%{A1:connman-gtk &:}%{A}"
|
||||
label-disconnected-foreground = #5b
|
||||
ramp-signal-0 =
|
||||
ramp-signal-1 =
|
||||
ramp-signal-2 =
|
||||
ramp-signal-3 =
|
||||
ramp-signal-4 =
|
||||
ramp-signal-foreground = ${colors.foreground}
|
||||
format-connected-foreground = ${colors.foreground}
|
||||
|
||||
[module/powermenu]
|
||||
type = custom/menu
|
||||
|
|
|
|||
|
|
@ -0,0 +1,19 @@
|
|||
# Config for rofi-wifi-menu
|
||||
|
||||
# position values:
|
||||
# 1 2 3
|
||||
# 8 0 4
|
||||
# 7 6 5
|
||||
POSITION=0
|
||||
|
||||
#y-offset
|
||||
YOFF=17
|
||||
|
||||
#x-offset
|
||||
XOFF=0
|
||||
|
||||
#fields to be displayed
|
||||
FIELDS=SSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,DEVICE,ACTIVE,IN-USE
|
||||
|
||||
#font
|
||||
FONT="TamzenForPowerline 12"
|
||||
|
|
@ -10,7 +10,7 @@
|
|||
#
|
||||
#############################
|
||||
# Tmuxline theme-file
|
||||
source-file ~/minimalist
|
||||
source-file ~/.config/nvim/minimalist
|
||||
# use vim motion keys while in copy mode
|
||||
setw -g mode-keys vi
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,274 @@
|
|||
alsa-utils
|
||||
arandr
|
||||
autoconf
|
||||
autofs
|
||||
automake
|
||||
awesome-terminal-fonts-git
|
||||
awesome-terminal-fonts-patched
|
||||
bash
|
||||
bat
|
||||
betterlockscreen
|
||||
binutils
|
||||
bison
|
||||
bitwarden-rofi-git
|
||||
bluez
|
||||
bluez-utils
|
||||
borg
|
||||
breeze-snow-cursor-theme
|
||||
bzip2
|
||||
cava
|
||||
ccat
|
||||
clipster
|
||||
cmatrix
|
||||
colorz
|
||||
compton-tryone-git
|
||||
conky-lua
|
||||
coreutils
|
||||
crda
|
||||
cronie
|
||||
cryptsetup
|
||||
device-mapper
|
||||
dhcpcd
|
||||
dialog
|
||||
diffutils
|
||||
dmenu
|
||||
dmenu-extended-git
|
||||
downgrade
|
||||
dtrx
|
||||
e2fsprogs
|
||||
exfat-utils
|
||||
expac
|
||||
expressvpn
|
||||
fakeroot
|
||||
fasd-git
|
||||
fd
|
||||
feh
|
||||
file
|
||||
filesystem
|
||||
findutils
|
||||
firefox
|
||||
flex
|
||||
fzf
|
||||
gawk
|
||||
gcc
|
||||
gcc-libs
|
||||
gettext
|
||||
git
|
||||
gksu
|
||||
glibc
|
||||
glxinfo
|
||||
gnome-keyring
|
||||
google-chrome
|
||||
googler
|
||||
gpmdp
|
||||
grep
|
||||
groff
|
||||
gtop
|
||||
gucharmap-gtk2
|
||||
gzip
|
||||
hideit.sh-git
|
||||
htop
|
||||
i3-gaps-next-git
|
||||
i3ipc-python-git
|
||||
inetutils
|
||||
intel-media-driver
|
||||
intel-ucode
|
||||
inxi
|
||||
iproute2
|
||||
iputils
|
||||
jfsutils
|
||||
jq
|
||||
jsoncpp
|
||||
laptop-mode-tools
|
||||
less
|
||||
lf-git
|
||||
libtool
|
||||
libva-utils
|
||||
libvdpau-va-gl
|
||||
licenses
|
||||
light-git
|
||||
lightdm
|
||||
lightdm-mini-greeter
|
||||
linux
|
||||
linux-firmware
|
||||
logrotate
|
||||
lsb-release
|
||||
lsd
|
||||
lvm2
|
||||
lxappearance
|
||||
m4
|
||||
make
|
||||
man-db
|
||||
man-pages
|
||||
mdadm
|
||||
mlocate
|
||||
mopidy
|
||||
mopidy-gmusic-git
|
||||
mpc
|
||||
mpd
|
||||
mpv
|
||||
nano
|
||||
ncdu
|
||||
ncmpcpp
|
||||
neofetch
|
||||
neovim
|
||||
netctl
|
||||
network-manager-applet
|
||||
networkmanager
|
||||
networkmanager-dmenu-git
|
||||
networkmanager-openvpn
|
||||
newaita-icons-git
|
||||
newsboat
|
||||
nfs-utils
|
||||
noto-fonts
|
||||
noto-fonts-emoji
|
||||
numix-cursor-theme
|
||||
oomox-git
|
||||
openvpn
|
||||
otf-font-awesome-4
|
||||
p7zip
|
||||
pac-util-git
|
||||
pacman
|
||||
pacmarge
|
||||
papirus-icon-theme
|
||||
pass
|
||||
patch
|
||||
pavucontrol
|
||||
pciutils
|
||||
pcmanfm
|
||||
perl
|
||||
pikaur
|
||||
pkgconf
|
||||
polkit-gnome
|
||||
polybar-git
|
||||
powerline-fonts-git
|
||||
procps-ng
|
||||
pscircle-git
|
||||
psmisc
|
||||
pulseaudio-bluetooth
|
||||
python-cairo
|
||||
python-mpd2
|
||||
python-mpv-git
|
||||
python-musicbrainzngs
|
||||
python-mutagen
|
||||
python-pip
|
||||
python-pyqt5
|
||||
python-pywal
|
||||
python-setuptools
|
||||
python2-dbus
|
||||
python2-mpd
|
||||
python2-pip
|
||||
ranger-git
|
||||
reflector
|
||||
reiserfsprogs
|
||||
ripgrep
|
||||
rofi
|
||||
roficlip
|
||||
s-nail
|
||||
sacad
|
||||
scrot
|
||||
sed
|
||||
shadow
|
||||
siji-git
|
||||
stacer
|
||||
sudo
|
||||
surfraw
|
||||
suru-plus-aspromauros-git
|
||||
sysfsutils
|
||||
sysstat
|
||||
systemd
|
||||
systemd-boot-pacman-hook
|
||||
systemd-sysvcompat
|
||||
tamzen-font-git
|
||||
tar
|
||||
task-spooler
|
||||
texinfo
|
||||
tmux
|
||||
ttf-liberation
|
||||
ttf-material-icons
|
||||
ttf-openlogos-archupdate
|
||||
ttf-unifont
|
||||
twmn-git
|
||||
udiskie
|
||||
udisks2
|
||||
unclutter
|
||||
unzip
|
||||
upower
|
||||
usbutils
|
||||
util-linux
|
||||
vdpauinfo
|
||||
vi
|
||||
w3m
|
||||
wget
|
||||
which
|
||||
wireless_tools
|
||||
wpa_supplicant
|
||||
wpgtk-git
|
||||
xcursor-vanilla-dmz
|
||||
xdg-user-dirs
|
||||
xdg-utils
|
||||
xdo
|
||||
xdotool
|
||||
xf86-video-vesa
|
||||
xfsprogs
|
||||
xinit-xsession
|
||||
xkeycaps
|
||||
xorg-bdftopcf
|
||||
xorg-docs
|
||||
xorg-font-util
|
||||
xorg-fonts-100dpi
|
||||
xorg-fonts-75dpi
|
||||
xorg-fonts-encodings
|
||||
xorg-iceauth
|
||||
xorg-luit
|
||||
xorg-mkfontscale
|
||||
xorg-server
|
||||
xorg-server-common
|
||||
xorg-server-devel
|
||||
xorg-server-xdmx
|
||||
xorg-server-xephyr
|
||||
xorg-server-xnest
|
||||
xorg-server-xvfb
|
||||
xorg-server-xwayland
|
||||
xorg-sessreg
|
||||
xorg-setxkbmap
|
||||
xorg-smproxy
|
||||
xorg-x11perf
|
||||
xorg-xauth
|
||||
xorg-xbacklight
|
||||
xorg-xcmsdb
|
||||
xorg-xcursorgen
|
||||
xorg-xdpyinfo
|
||||
xorg-xdriinfo
|
||||
xorg-xev
|
||||
xorg-xgamma
|
||||
xorg-xhost
|
||||
xorg-xinit
|
||||
xorg-xinput
|
||||
xorg-xkbcomp
|
||||
xorg-xkbevd
|
||||
xorg-xkbutils
|
||||
xorg-xkill
|
||||
xorg-xlsatoms
|
||||
xorg-xlsclients
|
||||
xorg-xmodmap
|
||||
xorg-xpr
|
||||
xorg-xprop
|
||||
xorg-xrandr
|
||||
xorg-xrdb
|
||||
xorg-xrefresh
|
||||
xorg-xset
|
||||
xorg-xsetroot
|
||||
xorg-xvinfo
|
||||
xorg-xwd
|
||||
xorg-xwininfo
|
||||
xorg-xwud
|
||||
xst-git
|
||||
xterm
|
||||
yad
|
||||
yadm-git
|
||||
yay
|
||||
youtube-dl
|
||||
zathura
|
||||
zathura-pdf-poppler
|
||||
zsh
|
||||
|
|
@ -0,0 +1,71 @@
|
|||
#!/usr/bin/env bash
|
||||
#
|
||||
# Parses DHCP options from openvpn to update resolv.conf
|
||||
# To use set as 'up' and 'down' script in your openvpn *.conf:
|
||||
# up /etc/openvpn/update-resolv-conf
|
||||
# down /etc/openvpn/update-resolv-conf
|
||||
#
|
||||
# Used snippets of resolvconf script by Thomas Hood <jdthood@yahoo.co.uk>
|
||||
# and Chris Hanson
|
||||
# Licensed under the GNU GPL. See /usr/share/common-licenses/GPL.
|
||||
# 07/2013 colin@daedrum.net Fixed intet name
|
||||
# 05/2006 chlauber@bnc.ch
|
||||
#
|
||||
# Example envs set from openvpn:
|
||||
# foreign_option_1='dhcp-option DNS 193.43.27.132'
|
||||
# foreign_option_2='dhcp-option DNS 193.43.27.133'
|
||||
# foreign_option_3='dhcp-option DOMAIN be.bnc.ch'
|
||||
# foreign_option_4='dhcp-option DOMAIN-SEARCH bnc.local'
|
||||
|
||||
## The 'type' builtins will look for file in $PATH variable, so we set the
|
||||
## PATH below. You might need to directly set the path to 'resolvconf'
|
||||
## manually if it still doesn't work, i.e.
|
||||
## RESOLVCONF=/usr/sbin/resolvconf
|
||||
export PATH=$PATH:/sbin:/usr/sbin:/bin:/usr/bin
|
||||
RESOLVCONF=$(type -p resolvconf)
|
||||
|
||||
case $script_type in
|
||||
|
||||
up)
|
||||
for optionname in ${!foreign_option_*} ; do
|
||||
option="${!optionname}"
|
||||
echo $option
|
||||
part1=$(echo "$option" | cut -d " " -f 1)
|
||||
if [ "$part1" == "dhcp-option" ] ; then
|
||||
part2=$(echo "$option" | cut -d " " -f 2)
|
||||
part3=$(echo "$option" | cut -d " " -f 3)
|
||||
if [ "$part2" == "DNS" ] ; then
|
||||
IF_DNS_NAMESERVERS="$IF_DNS_NAMESERVERS $part3"
|
||||
fi
|
||||
if [[ "$part2" == "DOMAIN" || "$part2" == "DOMAIN-SEARCH" ]] ; then
|
||||
IF_DNS_SEARCH="$IF_DNS_SEARCH $part3"
|
||||
fi
|
||||
fi
|
||||
done
|
||||
R=""
|
||||
if [ "$IF_DNS_SEARCH" ]; then
|
||||
R="search "
|
||||
for DS in $IF_DNS_SEARCH ; do
|
||||
R="${R} $DS"
|
||||
done
|
||||
R="${R}
|
||||
"
|
||||
fi
|
||||
|
||||
for NS in $IF_DNS_NAMESERVERS ; do
|
||||
R="${R}nameserver $NS
|
||||
"
|
||||
done
|
||||
#echo -n "$R" | $RESOLVCONF -x -p -a "${dev}"
|
||||
echo -n "$R" | $RESOLVCONF -x -a "${dev}.inet"
|
||||
;;
|
||||
down)
|
||||
$RESOLVCONF -d "${dev}.inet"
|
||||
;;
|
||||
esac
|
||||
|
||||
# Workaround / jm@epiclabs.io
|
||||
# force exit with no errors. Due to an apparent conflict with the Network Manager
|
||||
# $RESOLVCONF sometimes exits with error code 6 even though it has performed the
|
||||
# action correctly and OpenVPN shuts down.
|
||||
exit 0
|
||||
Loading…
Reference in New Issue