1
0
mirror of https://github.com/frebib/dotfiles.git synced 2024-06-14 12:57:23 +00:00

21 Commits

Author SHA1 Message Date
8f969737ed aliases: show full message/stat in gd/gsh/glg 2019-09-15 11:30:00 +01:00
8287acf3a7 aliases: add daddrs function 2019-09-10 10:19:18 +01:00
2050b1a5b7 aliases: add polybarc to edit & reload polybar 2019-04-24 10:49:01 +01:00
d6289c47ba scripts/screenshot: fix putting capture in clipboard 2019-04-24 10:42:05 +01:00
6c19740e21 aliases: add grbom and gpoH 2019-04-08 14:14:18 +01:00
8b838aa771 aliases: remove -E from sudo alias
-E isn't compatible with -i and it doesn't seem to do a lot anyway
2019-04-08 14:14:00 +01:00
af65ab019e i3: add $mod+i for type-paste from xclip 2019-04-08 14:11:55 +01:00
a11dac4d00 aliases: add dnets alias 2019-03-08 22:30:37 +00:00
90750c0ede i3: always set wallpaper from $DOTFILES 2019-03-08 14:20:47 +00:00
18208e2362 aliases: improve dps/dpsa
Revert dmc to function instead of alias so it actually works
2019-03-03 13:33:15 +00:00
ad713cd680 scripts/screenshot: Use shorter hash name 2019-02-18 13:11:33 +00:00
b4e3cdeff3 aliases: add ipa & addrs 2019-01-19 13:14:05 +00:00
c6bd6a83c6 polybar: add weather winter icons (fa 3.6) 2018-12-29 22:06:36 +00:00
f247802bda profile: clean-up ~/.npm* files 2018-12-28 13:58:50 +00:00
abb66a954b i3: rofi-pass use multiple password stores 2018-12-28 13:54:40 +00:00
ed9d50d68e aliases: re-columnate zl output to remove big space 2018-12-14 15:58:45 +00:00
89b9222b7c i3: remove superfluous compton config path 2018-12-01 22:22:02 -08:00
ee6b7333fb polybar: use better workspace urgent colour 2018-12-01 22:22:02 -08:00
2ac1111b72 i3: fix xf86 media keys for all apps 2018-12-01 22:22:02 -08:00
83f8566faf i3: widen powermenu to account for padding 2018-12-01 22:21:53 -08:00
59ac129a85 i3: improve automatic/timeout/suspend locking 2018-12-01 22:21:43 -08:00
25 changed files with 102 additions and 118 deletions

View File

@ -12,7 +12,6 @@ export XDG_CURRENT_DESKTOP="GNOME" # Fixes xdg-open
# Load Xorg resources and set the DPI # Load Xorg resources and set the DPI
xrdb -merge $XDG_CONFIG_HOME/X11/xresources xrdb -merge $XDG_CONFIG_HOME/X11/xresources
xrandr --dpi $(xrdb -query | grep -i xft.dpi | cut -d: -f2) xrandr --dpi $(xrdb -query | grep -i xft.dpi | cut -d: -f2)
xrandr --output eDP1 --primary
setxkbmap -option caps:none setxkbmap -option caps:none
xset r rate 200 18 xset r rate 200 18
@ -23,6 +22,3 @@ if [ -n "$DISPLAY" ] && exists autocutsel && ! pidof autocutsel 1>/dev/null; the
autocutsel -fork autocutsel -fork
autocutsel -selection PRIMARY -fork autocutsel -selection PRIMARY -fork
fi fi
~/.local/share/surface-scripts/pend &
~/.local/share/surface-scripts/rotationd &

View File

@ -29,7 +29,7 @@
*.color15: #eceff1 *.color15: #eceff1
Xft.dpi: 140 Xft.dpi: 96
Xft.antialias: true Xft.antialias: true
Xft.rgba: rgb Xft.rgba: rgb
Xft.hinting: true Xft.hinting: true
@ -59,11 +59,11 @@ xterm.metaSendsEscape: true
urxvt.termName: xterm-256color urxvt.termName: xterm-256color
urxvt.font: xft:Source Code Pro:style=regular:size=9.8 urxvt.font: xft:Source Code Pro:style=regular:size=9
urxvt.imFont: xft:Source Code Pro:style=regular:size=9.8 urxvt.imFont: xft:Source Code Pro:style=regular:size=9
urxvt.boldFont: xft:Source Code Pro:style=bold:size=9 urxvt.boldFont: xft:Source Code Pro:style=bold:size=9
urxvt.italicFont: xft:Source Code Pro:style=italic:size=9.8 urxvt.italicFont: xft:Source Code Pro:style=italic:size=9
urxvt.boldItalicFont: xft:Source Code Pro:style=bold,italic:size=9.8 urxvt.boldItalicFont: xft:Source Code Pro:style=bold,italic:size=9
urxvt.iso14755: false urxvt.iso14755: false

View File

@ -1 +0,0 @@
--force-device-scale-factor=1.2

View File

@ -31,7 +31,7 @@ alpha-step = 0.02; # XRender backend: Step size for alpha pictures. Increasin
# Blurring # Blurring
blur-method = "dual_kawase"; blur-method = "dual_kawase";
blur-strength = 6; blur-strength = 5;
blur-background = true; # Blur background of transparent windows. blur-background = true; # Blur background of transparent windows.
blur-background-exclude = [ "class_g = 'Peek'", "class_g = 'Onboard'", "class_g = 'slop'", "class_g = 'Polybar'" ]; blur-background-exclude = [ "class_g = 'Peek'", "class_g = 'Onboard'", "class_g = 'slop'", "class_g = 'Polybar'" ];
blur-background-frame = true; # Blur background of opaque windows with transparent blur-background-frame = true; # Blur background of opaque windows with transparent

View File

@ -1,5 +1,5 @@
[global] [global]
font = sans 9 font = sans 9.5
# Allow a small subset of html markup: # Allow a small subset of html markup:
# <b>bold</b> # <b>bold</b>
@ -65,7 +65,7 @@
# screen width minus the width defined in within the geometry option. # screen width minus the width defined in within the geometry option.
# 53 = 30 + 23 (bar-height) # 53 = 30 + 23 (bar-height)
geometry = "560x5-30+30" geometry = "360x5-30+30"
# Shrink window if it's smaller than the width. Will be ignored if # Shrink window if it's smaller than the width. Will be ignored if
# width is 0. # width is 0.
@ -146,7 +146,7 @@
icon_position = left icon_position = left
# Scale larger icons down to this size, set to 0 to disable # Scale larger icons down to this size, set to 0 to disable
max_icon_size = 72 max_icon_size = 44
# Paths to default icons. # Paths to default icons.
icon_path = /usr/share/icons/Xenlism-Wildfire/Status/:/usr/share/icons/Xenlism-Wildfire/Devices/:/usr/share/icons/Adwaita/32x32/status:/usr/share/icons/Adwaita/32x32/devices icon_path = /usr/share/icons/Xenlism-Wildfire/Status/:/usr/share/icons/Xenlism-Wildfire/Devices/:/usr/share/icons/Adwaita/32x32/status:/usr/share/icons/Adwaita/32x32/devices

View File

@ -31,7 +31,6 @@ bindsym $mod+w split v
# enter fullscreen mode for the focused container # enter fullscreen mode for the focused container
bindsym $mod+Shift+f fullscreen toggle global bindsym $mod+Shift+f fullscreen toggle global
bindsym $mod+f fullscreen toggle bindsym $mod+f fullscreen toggle
popup_during_fullscreen leave_fullscreen
# change container layout (stacked, tabbed, toggle split) # change container layout (stacked, tabbed, toggle split)
bindsym $mod+p layout stacking bindsym $mod+p layout stacking
@ -46,7 +45,21 @@ bindsym $mod+e sticky toggle
bindsym $mod+a focus parent bindsym $mod+a focus parent
bindsym $mod+o focus child bindsym $mod+o focus child
set $10 "10:" # Screen configs #
set $bl "DP-5"
set $tl "DP-1"
set $br "HDMI-0"
set $tr "DP-3"
# Workspace -> Screen
workspace 1 output $bl
workspace 2 output $br
workspace 3 output $tl
workspace 4 output $tr
workspace 5 output $bl
workspace 6 output $br
workspace 7 output $tl
workspace 8 output $tr
# switch to workspace # switch to workspace
bindsym $mod+1 workspace 1 bindsym $mod+1 workspace 1
@ -58,7 +71,7 @@ bindsym $mod+6 workspace 6
bindsym $mod+7 workspace 7 bindsym $mod+7 workspace 7
bindsym $mod+8 workspace 8 bindsym $mod+8 workspace 8
bindsym $mod+9 workspace 9 bindsym $mod+9 workspace 9
bindsym $mod+0 workspace $10 bindsym $mod+0 workspace 10
# move workspaces across screens # move workspaces across screens
bindsym $mod+$alt+d move workspace to output left bindsym $mod+$alt+d move workspace to output left
@ -76,7 +89,7 @@ bindsym $mod+Shift+6 move container to workspace 6
bindsym $mod+Shift+7 move container to workspace 7 bindsym $mod+Shift+7 move container to workspace 7
bindsym $mod+Shift+8 move container to workspace 8 bindsym $mod+Shift+8 move container to workspace 8
bindsym $mod+Shift+9 move container to workspace 9 bindsym $mod+Shift+9 move container to workspace 9
bindsym $mod+Shift+0 move container to workspace $10 bindsym $mod+Shift+0 move container to workspace 10
# opens logout/shutdown menu # opens logout/shutdown menu
bindsym $mod+Shift+Escape exec --no-startup-id ~/.config/i3/powermenu.sh bindsym $mod+Shift+Escape exec --no-startup-id ~/.config/i3/powermenu.sh
@ -95,6 +108,7 @@ client.focused_inactive $inactive-bg-color $inactive-bg-color $inactive-text-co
client.urgent $urgent-bg-color $urgent-bg-color $text-color $bg-color client.urgent $urgent-bg-color $urgent-bg-color $text-color $bg-color
exec_always --no-startup-id killall -q polybar; while pgrep -u $UID -x polybar >/dev/null; do sleep 1; done; exec polybar -r i3bar exec_always --no-startup-id killall -q polybar; while pgrep -u $UID -x polybar >/dev/null; do sleep 1; done; exec polybar -r i3bar
exec_always --no-startup-id feh --no-fehbg --no-xinerama --bg-fill $DOTFILES/lakesidesunrise.jpg
# Window rules # Window rules
for_window [class="Pinentry"] floating enable for_window [class="Pinentry"] floating enable
@ -124,9 +138,9 @@ bindsym $mod+Return exec i3-sensible-terminal
bindsym $mod+Ctrl+Return exec i3-sensible-terminal -r floating-term bindsym $mod+Ctrl+Return exec i3-sensible-terminal -r floating-term
bindsym $mod+Shift+Return exec i3-sensible-terminal -d "`xcwd`" bindsym $mod+Shift+Return exec i3-sensible-terminal -d "`xcwd`"
bindsym $mod+Ctrl+Shift+Return exec i3-sensible-terminal -r floating-term -d "`xcwd`" bindsym $mod+Ctrl+Shift+Return exec i3-sensible-terminal -r floating-term -d "`xcwd`"
bindsym $mod+l exec ~/.config/i3/lock.sh bindsym $mod+l exec dm-tool switch-to-greeter
bindsym $mod+space exec "pkill rofi; rofi -show run -sidebar-mode -terminal i3-sensible-terminal -normal-window" bindsym $mod+space exec "pkill rofi; rofi -show run -sidebar-mode -terminal i3-sensible-terminal -normal-window"
bindsym $mod+Shift+p exec rofi-pass bindsym $mod+Shift+p exec rofi-pass --root $(grep path ~/.config/gopass/config.yml | sed -E 's|^.*fs\+file://||g' | tr '\n' ':') | sed 's/:$//g'
bindsym $mod+Shift+e exec rofi-emoji bindsym $mod+Shift+e exec rofi-emoji
bindsym $mod+Shift+i exec rofi-fontawesome bindsym $mod+Shift+i exec rofi-fontawesome
bindsym --release Print exec screenshot bindsym --release Print exec screenshot
@ -135,13 +149,14 @@ bindsym $mod+$alt+space exec --no-startup-id ~/.config/i3/cycleaudio.py
bindsym $mod+numbersign exec "i3-sensible-terminal -e 'sh -c xclip\ -o\ |\ gpg\ --decrypt\ 2>&1\ \;\ $SHELL'" bindsym $mod+numbersign exec "i3-sensible-terminal -e 'sh -c xclip\ -o\ |\ gpg\ --decrypt\ 2>&1\ \;\ $SHELL'"
bindsym $mod+r exec "bash -c 'pwgen -nc 32 1 | tee >(xargs notify-send Generated\ password\:) | xclip -i'" bindsym $mod+r exec "bash -c 'pwgen -nc 32 1 | tee >(xargs notify-send Generated\ password\:) | xclip -i'"
bindsym $mod+g exec "LINK=$(gist -PRpc); notify-send -c transfer \\"<a href=\\\\"$LINK\\\\">$LINK</a>\\"" bindsym $mod+g exec "LINK=$(gist -PRpc); notify-send -c transfer \\"<a href=\\\\"$LINK\\\\">$LINK</a>\\""
bindsym --release $mod+i exec sh -c 'sleep 0.5 && xdotool type --delay 400 "$(xclip -o -selection clipboard)"'
# Media player controls # Media player controls
bindsym XF86AudioPlay exec --no-startup-id mpc toggle bindsym XF86AudioPlay exec --no-startup-id playerctl -a play-pause
bindsym XF86AudioPause exec --no-startup-id mpc pause bindsym XF86AudioPause exec --no-startup-id playerctl -a pause
bindsym XF86AudioStop exec --no-startup-id mpc stop bindsym XF86AudioStop exec --no-startup-id playerctl -a stop
bindsym XF86AudioNext exec --no-startup-id mpc next bindsym XF86AudioNext exec --no-startup-id playerctl -a next
bindsym XF86AudioPrev exec --no-startup-id mpc previous bindsym XF86AudioPrev exec --no-startup-id playerctl -a previous
bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +1000 bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +1000
bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -1000 bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -1000
bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle
@ -151,23 +166,22 @@ bindsym XF86MonBrightnessDown exec xbacklight -dec 5 && pkill -RTMIN+12 i3bloc
# app launch shortcuts # app launch shortcuts
exec --no-startup-id ~/.config/i3/disable-standby-fs.py exec --no-startup-id ~/.config/i3/disable-standby-fs.py
exec --no-startup-id feh --no-fehbg --no-xinerama --bg-fill ~/pictures/lakesidesunrise.jpg exec --no-startup-id feh --no-fehbg --no-xinerama --bg-fill ~/pictures/lakesidesunrise.jpg
exec --no-startup-id xautolock -time 5 -locker 'dm-tool lock' -nocloseout -nocloseerr exec --no-startup-id xautolock -time 5 -locker 'dm-tool switch-to-greeter' -nocloseout -nocloseerr
exec --no-startup-id xss-lock dm-tool switch-to-greeter
# startup programs # startup programs
exec --no-startup-id nextcloud exec --no-startup-id nextcloud
exec --no-startup-id nm-applet
exec --no-startup-id blueman-applet exec --no-startup-id blueman-applet
exec --no-startup-id redshift exec --no-startup-id redshift
exec --no-startup-id xbindkeys exec --no-startup-id xbindkeys
exec --no-startup-id solaar exec --no-startup-id solaar
exec --no-startup-id pullover exec --no-startup-id pullover
exec --no-startup-id onboard
exec --no-startup-id touchegg
exec --no-startup-id mailnag exec --no-startup-id mailnag
exec --no-startup-id compton -b --config ~/.config/compton.conf exec --no-startup-id compton -b
exec --no-startup-id chromium --no-startup-window exec --no-startup-id chromium --no-startup-window
exec --no-startup-id thunderbird exec --no-startup-id thunderbird
exec i3-msg 'workspace 1; exec chromium' exec i3-msg 'workspace 1; exec sleep 2 && chromium'
exec i3-msg 'workspace 2; exec i3-sensible-terminal'
# vim:ft=i3 # vim:ft=i3

View File

@ -1,9 +1,9 @@
#!/bin/sh #!/bin/sh
option=$(echo "lock|logout|sleep|hibernate|power off|reboot|windows" | rofi -sep "|" -dmenu -i -p "" -auto-select -hide-scrollbar -monitor 0 -width 8 -lines 7 -location 3 -tokenize false -matching normal | xargs) option=$(echo "lock|logout|sleep|hibernate|power off|reboot|windows" | rofi -sep "|" -dmenu -i -p "" -auto-select -hide-scrollbar -monitor 0 -width 10 -lines 7 -location 3 -tokenize false -matching normal | xargs)
case $option in case $option in
lock) ./lock.sh;; lock) dm-tool switch-to-greeter;;
logout) i3-msg exit;; logout) i3-msg exit;;
sleep) systemctl suspend;; sleep) systemctl suspend;;
hibernate) systemctl hibernate;; hibernate) systemctl hibernate;;

3
.config/npm/npmrc Normal file
View File

@ -0,0 +1,3 @@
prefix=${XDG_DATA_HOME}/npm
cache=${XDG_CACHE_HOME}/npm
tmp=${XDG_RUNTIME_DIR}/npm

View File

@ -13,13 +13,13 @@ format-margin = 2.5
format-offset = 0 format-offset = 0
[bar/i3bar] [bar/i3bar]
monitor = ${env:MONITOR:eDP1} monitor = ${env:MONITOR:HDMI-0}
dpi = ${xrdb:Xft.dpi:-1} dpi = ${xrdb:Xft.dpi:96}
fixed-center = false fixed-center = false
enable-ipc = true enable-ipc = true
width = 100% width = 100%
height = 44 height = 32
bottom = true bottom = true
radius = 0 radius = 0
@ -44,9 +44,9 @@ modules-right = volume updates weather wlan eth memory cpu xbacklight battery te
tray-position = right tray-position = right
tray-detached = false tray-detached = false
tray-background = ${root.background} tray-background = ${root.background}
tray-offset-x = -6 tray-offset-x = -4
tray-offset-y = -2 tray-offset-y = 0
tray-maxsize = 24 tray-maxsize = 16
tray-padding = 2 tray-padding = 2
tray-scale = 1.0 tray-scale = 1.0
@ -89,7 +89,7 @@ wrapping-scroll = false
; Only show workspaces on the same output as the bar ; Only show workspaces on the same output as the bar
; pin-workspaces = true ; pin-workspaces = true
label-mode-padding = 3 label-mode-padding = 2
label-mode-foreground = ${colours.text} label-mode-foreground = ${colours.text}
label-mode-background = ${colours.background} label-mode-background = ${colours.background}
@ -115,7 +115,7 @@ label-visible-underline = ${self.label-focused-underline}
; urgent = Workspace with urgency hint set ; urgent = Workspace with urgency hint set
label-urgent = ${self.label-focused} label-urgent = ${self.label-focused}
label-urgent-foreground = ${colours.warning} label-urgent-foreground = ${colours.critical}
label-urgent-padding = ${self.label-focused-padding} label-urgent-padding = ${self.label-focused-padding}
@ -254,7 +254,7 @@ ramp-capacity-1-foreground = ${colours.warning}
[module/temperature] [module/temperature]
type = internal/temperature type = internal/temperature
thermal-zone = 1 thermal-zone = 2
warn-temperature = 70 warn-temperature = 70
format = <ramp> <label> format = <ramp> <label>
@ -267,11 +267,9 @@ label-warn-foreground = ${colours.background}
ramp-0 =  ramp-0 = 
ramp-1 =  ramp-1 = 
ramp-2 =  ramp-2 = 
ramp-3 = ramp-3 =
ramp-4 = ramp-4 =
ramp-5 = ramp-5 =
ramp-6 = 
ramp-7 = 
ramp-foreground = ${colours.icon} ramp-foreground = ${colours.icon}

View File

@ -71,8 +71,8 @@ get_icon() {
522) echo;; # heavy intensity shower rain 522) echo;; # heavy intensity shower rain
531) echo;; # ragged shower rain 531) echo;; # ragged shower rain
600) echo;; # light snow 600) echo;; # light snow
601) echo ;; # snow 601) echo ;; # snow
602) echo ;; # heavy snow 602) echo ;; # heavy snow
611) echo;; # sleet 611) echo;; # sleet
612) echo;; # shower sleet 612) echo;; # shower sleet
615) echo;; # light rain and snow 615) echo;; # light rain and snow
@ -86,11 +86,6 @@ get_icon() {
741) echo;; # fog 741) echo;; # fog
762) echo;; # volcanic ash 762) echo;; # volcanic ash
781) echo;; # tornado 781) echo;; # tornado
800) echo ;; # clear sky
801) echo ;; # few clouds
802) echo ;; # scattered clouds
803) echo ;; # broken clouds
804) echo ;; # overcast clouds
# 731) echo ;; # sand, dust whirls # 731) echo ;; # sand, dust whirls
# 751) echo ;; # sand # 751) echo ;; # sand
# 761) echo ;; # dust # 761) echo ;; # dust

View File

@ -1,26 +0,0 @@
!-----------------------------
! Rofi config
!-----------------------------
! State: 'bg', 'fg', 'bgalt' 'hlbg', 'hlfg'
rofi.color-window: #F2383C4A, #2F343F
rofi.color-normal: #00383C4A, #D3DAE3, #00383C4A, #5294E2, #ECEFF1
rofi.bc: #CC383C4A
rofi.bw: 5
rofi.padding: 8
rofi.lines: 14
rofi.width: 40
rofi.font: Noto Sans 18
rofi.line-margin: 6
rofi.sep: |
rofi.prompt: >
rofi.ssh-command: {terminal} -e "{ssh-client} {host}"
rofi.separator-style: solid
rofi.kb-row-tab: Shift+Tab
rofi.kb-row-select: Tab
rofi.matching: glob
rofi.tokenize: true
rofi.normal-window: true
! vim: ft=xdefaults

View File

@ -2,8 +2,8 @@ configuration {
theme: "arc-dark"; theme: "arc-dark";
font: "sans 14"; font: "sans 14";
dpi: 0; dpi: 0;
width: 40; width: 35;
lines: 12; lines: 10;
/* show-icons: true; */ /* show-icons: true; */
separator-style: "solid"; separator-style: "solid";

View File

@ -1,10 +0,0 @@
[Unit]
Description=Lock X session using i3lock
[Service]
User=%i
Environment=DISPLAY=:0
ExecStart=sh -c '~/.config/i3/lock.sh'
[Install]
WantedBy=sleep.target

View File

@ -0,0 +1,12 @@
[Unit]
Description=Lock X LightDM session before sleeping
Before=sleep.target
[Service]
Type=oneshot
ExecStart=/usr/bin/dm-tool switch-to-greeter
# Ensure enough time for the session to lock before sleeping
ExecStartPost=/usr/bin/sleep 1
[Install]
WantedBy=sleep.target

View File

@ -0,0 +1 @@
../sleep-lock-lightdm.service

View File

@ -1,5 +1,5 @@
[options] [options]
font = monospace 9.5 font = monospace 9
scrollback_lines = 1000000 scrollback_lines = 1000000
cursor_blink = off cursor_blink = off
size_hints = true size_hints = true

3
.gitmodules vendored
View File

@ -1,3 +0,0 @@
[submodule "surface-scripts"]
path = surface-scripts
url = https://github.com/frebib/surface-scripts.git

View File

@ -25,6 +25,7 @@ export CARGO_HOME="$XDG_DATA_HOME/cargo"
export GNUPGHOME="$XDG_CONFIG_HOME/gnupg" export GNUPGHOME="$XDG_CONFIG_HOME/gnupg"
export GOPATH="$XDG_DATA_HOME/go" export GOPATH="$XDG_DATA_HOME/go"
export GTK2_RC_FILES="$XDG_CONFIG_HOME/gtk-2.0/settings.ini" export GTK2_RC_FILES="$XDG_CONFIG_HOME/gtk-2.0/settings.ini"
export NPM_CONFIG_USERCONFIG=$XDG_CONFIG_HOME/npm/npmrc
export PASSWORD_STORE_DIR="$XDG_DATA_HOME/pass" export PASSWORD_STORE_DIR="$XDG_DATA_HOME/pass"
export PYTHONHISTFILE="$XDG_DATA_HOME/python/histfile" export PYTHONHISTFILE="$XDG_DATA_HOME/python/histfile"
export RUSTUP_HOME="$XDG_DATA_HOME/rustup" export RUSTUP_HOME="$XDG_DATA_HOME/rustup"
@ -38,7 +39,7 @@ export XINITRC="$XDG_CONFIG_HOME/X11/xinitrc"
export ZDOTDIR="$XDG_CONFIG_HOME/zsh" export ZDOTDIR="$XDG_CONFIG_HOME/zsh"
export DOTFILES="$(dirname "${thisfile:-$XDG_CONFIG_HOME/dotfiles/.profile}")" export DOTFILES="$(dirname "${thisfile:-$XDG_CONFIG_HOME/dotfiles/.profile}")"
export PATH="${PATH}:/sbin:/usr/sbin:$DOTFILES/scripts:$HOME/.local/share/surface-scripts:$GOPATH/bin" export PATH="${PATH}:/sbin:/usr/sbin:$DOTFILES/scripts:$GOPATH/bin"
exists() { which $@ 0<&- 1>/dev/null 2>/dev/null; } exists() { which $@ 0<&- 1>/dev/null 2>/dev/null; }
@ -76,6 +77,7 @@ fi
if [ -z "$DBUS_SESSION_BUS_ADDRESS" ] && exists dbus-launch; then if [ -z "$DBUS_SESSION_BUS_ADDRESS" ] && exists dbus-launch; then
eval $(dbus-launch --sh-syntax --exit-with-session) eval $(dbus-launch --sh-syntax --exit-with-session)
dbus-update-activation-environment --systemd \ dbus-update-activation-environment --systemd \
DBUS_SESSION_BUS_ADDRESS DISPLAY XAUTHORITY DBUS_SESSION_BUS_ADDRESS DISPLAY XAUTHORITY \
XDG_SEAT_PATH
fi fi

28
aliases
View File

@ -53,7 +53,7 @@ alias svim=sudoedit
# This will enable us to use aliases in sudo. # This will enable us to use aliases in sudo.
# (If alias finishes with a space or tab, the shell will check if the next command is also aliased.) # (If alias finishes with a space or tab, the shell will check if the next command is also aliased.)
# Source: https://github.com/mayah/home/blob/master/.zsh/zshrc.d/alias.zsh # Source: https://github.com/mayah/home/blob/master/.zsh/zshrc.d/alias.zsh
alias sudo='sudo -E ' alias sudo='sudo '
alias open=xdg-open alias open=xdg-open
# Command rewrites # Command rewrites
@ -140,19 +140,21 @@ alias gma="git merge --abort"
alias grb="git rebase" alias grb="git rebase"
alias grba="grb --abort" alias grba="grb --abort"
alias grbc="grb --continue" alias grbc="grb --continue"
alias grbom="git rebase origin/master"
alias gf="git fetch" alias gf="git fetch"
alias gp="git push" alias gp="git push"
alias gpf="gp --force" alias gpf="gp --force"
alias gpsu="git push --set-upstream" alias gpsu="git push --set-upstream"
alias gpoH="git push origin HEAD"
alias gpsuom="git push --set-upstream origin master" alias gpsuom="git push --set-upstream origin master"
alias gpall="git remote | xargs -L1 git push" alias gpall="git remote | xargs -L1 git push"
alias gl="git pull --rebase" alias gl="git pull --rebase"
alias glp="gl && gp" alias glp="gl && gp"
alias gd="git diff" alias gd="git diff --patch-with-stat"
alias gds="git diff --staged" alias gds="gd --staged"
alias gsh="git show" alias gsh="git show --format=full --patch-with-stat"
alias glg="git log --stat --color" alias glg="git log --format=full --stat --color"
alias glog="git log --oneline --decorate --color --graph" alias glog="git log --oneline --decorate --color --graph"
alias grst="git reset" alias grst="git reset"
@ -174,8 +176,11 @@ alias gstv="gsta show -p stash@{0}"
# Docker aliases # Docker aliases
alias d=docker alias d=docker
alias dps='docker ps' alias dps="docker ps --format='table {{.ID}}\t{{.Image}}\t{{.Label \"org.label-schema.version\"}}\t{{.Networks}}\t{{.RunningFor}}\t{{.Status}}\t{{.Names}}' | sed '1s/version/VERSION/'"
alias dpsa='docker ps -a' alias dpsa="docker ps -a --format='table {{.ID}}\t{{.Image}}\t{{.Label \"org.label-schema.version\"}}\t{{.Networks}}\t{{.RunningFor}}\t{{.Status}}\t{{.Names}}' | sed '1s/version/VERSION/'"
alias dnets="docker network ls -q | xargs docker inspect | jq '.[] | select(.Name != \"host\" and .Name != \"none\") | [.] | map(.Name + \"\t\" + (.IPAM.Config | map(.Subnet) | join(\"\t\")))[]' -r | sort -V -k2,3 | column -t"
daddrs() { docker inspect ${1:-bridge} | jq '.[0].Containers | map(.Name + "\t" + .IPv4Address + "\t" + .IPv6Address)[]' -r | sort -V -k2,3 | column -t; }
alias din='docker inspect'
alias drm='docker rm' alias drm='docker rm'
alias drmi='docker rmi' alias drmi='docker rmi'
alias dim='docker images' alias dim='docker images'
@ -259,14 +264,14 @@ do_dsh() {
alias dc='docker-compose' alias dc='docker-compose'
alias dm='docker-machine' alias dm='docker-machine'
alias dmc='eval $(docker-machine env $1)' dmc() { eval $(docker-machine env $1); }
# ZFS aliases # ZFS aliases
alias zfs='sudo zfs' alias zfs='sudo zfs'
alias zpool='sudo zpool' alias zpool='sudo zpool'
alias z=zfs alias z=zfs
alias zp=zpool alias zp=zpool
zl() { (set -o pipefail; command zfs list $@ | grep -Ev 'docker/[0-9a-f]{64}'); return $?; } zl() { (set -o pipefail; command zfs list $@ | grep -Ev 'docker/[0-9a-f]{64}' | column -t -R 2,3,4); return $?; }
_zl() { _zfs "list $@"; } _zl() { _zfs "list $@"; }
# General Aliases # General Aliases
@ -280,9 +285,14 @@ alias xresources="$EDITOR $XDG_CONFIG_HOME/X11/xresources ; xrdb merge $XDG_CONF
alias sshc="$EDITOR ~/.ssh/config" alias sshc="$EDITOR ~/.ssh/config"
alias dotfiles="cd $DOTFILES" alias dotfiles="cd $DOTFILES"
alias i3c="$EDITOR $XDG_CONFIG_HOME/i3/config ; i3-msg restart" alias i3c="$EDITOR $XDG_CONFIG_HOME/i3/config ; i3-msg restart"
alias polybarc="$EDITOR $XDG_CONFIG_HOME/polybar/config; killall -q polybar; while pgrep -u $UID -x polybar >/dev/null; do sleep 1; done; exec polybar -r i3bar"
alias sf=screenfetch alias sf=screenfetch
alias nf=neofetch alias nf=neofetch
alias rot13="tr '[A-Za-z]' '[N-ZA-Mn-za-m]'" alias rot13="tr '[A-Za-z]' '[N-ZA-Mn-za-m]'"
# Networking aliases
alias ipa="ip a"
alias addrs="ip a | grep inet | grep -ve fe80 -e '127\\.0\\.0\\.1/8' -e '::1/128' | sort -n | sed 's/^\\s*//'"
# vim: ft=sh # vim: ft=sh

View File

@ -11,4 +11,4 @@ xrandr --output $BOTTOM_LEFT --primary --mode 1920x1080 --pos 0x1080 --rotate no
--output $TOP_RIGHT --mode 1920x1080 --pos 1920x0 --rotate inverted \ --output $TOP_RIGHT --mode 1920x1080 --pos 1920x0 --rotate inverted \
--output $BOTTOM_RIGHT --mode 1920x1080 --pos 1920x1080 --rotate normal --output $BOTTOM_RIGHT --mode 1920x1080 --pos 1920x1080 --rotate normal
feh --no-fehbg --no-xinerama --bg-fill ~/pictures/lakesidesunrise.jpg feh --no-fehbg --no-xinerama --bg-fill $DOTFILES/lakesidesunrise.jpg

View File

@ -16,4 +16,4 @@ xrandr --newmode $MODELINE 2>/dev/null || true
xrandr --addmode $OUTPUT $MODENAME 2>/dev/null || true xrandr --addmode $OUTPUT $MODENAME 2>/dev/null || true
xrandr --output $OUTPUT --mode $MODENAME xrandr --output $OUTPUT --mode $MODENAME
feh --no-fehbg --no-xinerama --bg-fill ~/pictures/lakesidesunrise.jpg feh --no-fehbg --no-xinerama --bg-fill $DOTFILES/lakesidesunrise.jpg

View File

@ -23,8 +23,3 @@ echo cd `pwd`
for file in $conffiles; do for file in $conffiles; do
ln -sfv $confpath/.config/$file . ln -sfv $confpath/.config/$file .
done done
cd $HOME
mkdir -p .local/share/ && cd .local/share
echo cd `pwd`
ln -sfv $DOTFILES/surfacetools .

View File

@ -5,7 +5,7 @@ NOTIFY_APPNAME="$(basename "$0")"
NOTIFY_ICONPATH="/usr/share/icons/Xenlism-Wildfire/Apps/screenshot.svg" NOTIFY_ICONPATH="/usr/share/icons/Xenlism-Wildfire/Apps/screenshot.svg"
SCROT_CMD="maim -m 10 -us %" SCROT_CMD="maim -m 10 -us %"
FILENAME=`date "+$NOTIFY_APPNAME-%Y-%m-%d-%H%M%S.png"` FILENAME="$(date '+%s%N' | sha256sum | head -c7).png"
DIRECTORY="$HOME/pictures/screenshots" DIRECTORY="$HOME/pictures/screenshots"
SCP_HOST=frebib@Poseidon.nerdhouse.io SCP_HOST=frebib@Poseidon.nerdhouse.io
@ -40,7 +40,7 @@ fi
notif_id=$(send_notification "Screenshot uploading" "$FILENAME<br><br>The image is available in the clipboard immediately" || true) notif_id=$(send_notification "Screenshot uploading" "$FILENAME<br><br>The image is available in the clipboard immediately" || true)
# Add image to clipboard # Add image to clipboard
xclip -i "$out_path" -selection primary -t image/png xclip -i "$out_path" -selection clipboard -t image/png
# 'Upload' the screenshot # 'Upload' the screenshot
if ! error=$(scp -C $out_path $SCP_HOST:$SCP_PATH 2>&1); then if ! error=$(scp -C $out_path $SCP_HOST:$SCP_PATH 2>&1); then

Submodule surface-scripts deleted from f94e25f0b8

Submodule surface3-scripts deleted from bd6eaf1fb0