Compare commits
9 Commits
3216589f1f
...
c4b2483d02
Author | SHA1 | Date |
---|---|---|
Yorick van Pelt | c4b2483d02 | |
Yorick van Pelt | d2cd69add3 | |
Yorick van Pelt | f79c523b96 | |
Yorick van Pelt | 7463817aa7 | |
Yorick van Pelt | 8210c8b397 | |
Yorick van Pelt | e79cacb57c | |
Yorick van Pelt | 882f86ead6 | |
Yorick van Pelt | 2e60402320 | |
Yorick van Pelt | 3853ff7e49 |
34
bash/.bashrc
34
bash/.bashrc
|
@ -1,34 +0,0 @@
|
||||||
|
|
||||||
# don't put duplicate lines or lines starting with space in the history.
|
|
||||||
# See bash(1) for more options
|
|
||||||
HISTCONTROL=ignoreboth
|
|
||||||
|
|
||||||
# append to the history file, don't overwrite it
|
|
||||||
shopt -s histappend
|
|
||||||
|
|
||||||
# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
|
|
||||||
HISTSIZE=100000
|
|
||||||
HISTFILESIZE=200000
|
|
||||||
|
|
||||||
alias nr="nix repl '<nixpkgs>'"
|
|
||||||
alias ns="nix-shell"
|
|
||||||
alias nsp="nix-shell -p"
|
|
||||||
alias niA="nix-env -iA nixos."
|
|
||||||
alias subl="sublime3"
|
|
||||||
|
|
||||||
# eval $(thefuck --alias)
|
|
||||||
|
|
||||||
function fuck () {
|
|
||||||
TF_PYTHONIOENCODING=$PYTHONIOENCODING;
|
|
||||||
export TF_ALIAS=fuck;
|
|
||||||
export TF_SHELL_ALIASES=$(alias);
|
|
||||||
export TF_HISTORY=$(fc -ln -10);
|
|
||||||
export PYTHONIOENCODING=utf-8;
|
|
||||||
TF_CMD=$(
|
|
||||||
thefuck THEFUCK_ARGUMENT_PLACEHOLDER $@
|
|
||||||
) && eval $TF_CMD;
|
|
||||||
unset TF_HISTORY;
|
|
||||||
export PYTHONIOENCODING=$TF_PYTHONIOENCODING;
|
|
||||||
history -s $TF_CMD;
|
|
||||||
}
|
|
||||||
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
exec alacritty --class ala-fzf -e "$HOME/dotfiles/bin/fzf-pass-inner.sh"
|
|
@ -0,0 +1,8 @@
|
||||||
|
DPI=$1
|
||||||
|
echo "setting dpi: $DPI"
|
||||||
|
sed -i "s#Xft/DPI [0-9]*#Xft/DPI $((DPI*1024))#" ~/.xsettingsd
|
||||||
|
echo "Xft.dpi: $DPI" | xrdb -merge
|
||||||
|
echo "*dpi: $DPI" | xrdb -merge
|
||||||
|
xrandr --dpi $DPI
|
||||||
|
pkill -HUP xsettingsd
|
||||||
|
pkill -USR1 polybar
|
|
@ -0,0 +1,40 @@
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
DIR=~/dotfiles/x/solarized
|
||||||
|
COL=${1:-$(readlink $DIR/alternate)}
|
||||||
|
if [ $COL == "dark" ]; then
|
||||||
|
ROFI_THEME=solarized_alternate
|
||||||
|
ALTERNATE=light;
|
||||||
|
GTK_THEME=NumixSolarizedDark
|
||||||
|
nitrogen --set-auto wp/067\ -\ *
|
||||||
|
fi
|
||||||
|
if [ $COL == "light" ]; then
|
||||||
|
ALTERNATE=dark;
|
||||||
|
ROFI_THEME=Arc
|
||||||
|
GTK_THEME=NumixSolarized
|
||||||
|
nitrogen --set-auto wp/037\ -\ Ducks\ On\ A\ Misty\ Pond.jpg
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "changing to solarized_$COL"
|
||||||
|
# rofi
|
||||||
|
sed -i "s/theme: .*;/theme: \"$ROFI_THEME\";/" ~/dotfiles/rofi/.config/rofi/config.rasi
|
||||||
|
# xrdb
|
||||||
|
ln -fs $ALTERNATE $DIR/alternate
|
||||||
|
ln -fs $COL $DIR/actual
|
||||||
|
xrdb ~/dotfiles/x/.Xdefaults
|
||||||
|
#polybar
|
||||||
|
pkill -USR1 polybar
|
||||||
|
#emacs
|
||||||
|
emacsclient -e "(load-theme 'solarized-$COL)"
|
||||||
|
# urxvt
|
||||||
|
RECOLOR=$(xrdb -query | tr -d ' \t' | sed -n '
|
||||||
|
s/.*background:/\x1b]11;/p
|
||||||
|
s/.*foreground:/\x1b]10;/p
|
||||||
|
s/.*borderColor:/\x1b]708;/p
|
||||||
|
s/.*color\([0-9][^:]*\):/\x1b]4;\1;/p
|
||||||
|
' | tr \\n \\a)
|
||||||
|
for i in /dev/pts/*; do
|
||||||
|
echo -n $RECOLOR > $i
|
||||||
|
done
|
||||||
|
#gtk3
|
||||||
|
sed -i "s#Net/ThemeName \".*\"#Net/ThemeName \"$GTK_THEME\"#" ~/.xsettingsd
|
||||||
|
pkill -HUP xsettingsd
|
|
@ -2,6 +2,10 @@
|
||||||
#+AUTHOR: Yorick van Pelt
|
#+AUTHOR: Yorick van Pelt
|
||||||
|
|
||||||
* Prelims
|
* Prelims
|
||||||
|
** start server
|
||||||
|
#+BEGIN_SRC emacs-lisp
|
||||||
|
(server-start)
|
||||||
|
#+END_SRC
|
||||||
** use-package compile-time
|
** use-package compile-time
|
||||||
#+BEGIN_SRC emacs-lisp
|
#+BEGIN_SRC emacs-lisp
|
||||||
(eval-when-compile (require 'use-package))
|
(eval-when-compile (require 'use-package))
|
||||||
|
|
|
@ -1,27 +0,0 @@
|
||||||
[color]
|
|
||||||
ui = auto
|
|
||||||
diff = auto
|
|
||||||
status = auto
|
|
||||||
branch = auto
|
|
||||||
[alias]
|
|
||||||
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
|
|
||||||
st = status
|
|
||||||
remotes = remote -v
|
|
||||||
branches = branch -a
|
|
||||||
tags = tag
|
|
||||||
stashes = stash list
|
|
||||||
unstage = reset -q HEAD --
|
|
||||||
discard = checkout --
|
|
||||||
uncommit = reset --mixed HEAD~
|
|
||||||
graph = log --graph -10 --branches --remotes --tags --format=format:'%Cgreen%h %Creset• %<(75,trunc)%s (%cN, %cr) %Cred%d' --date-order
|
|
||||||
dad = !curl https://icanhazdadjoke.com/ && git add
|
|
||||||
[push]
|
|
||||||
default = simple
|
|
||||||
[user]
|
|
||||||
email = yorick@yorickvanpelt.nl
|
|
||||||
name = Yorick van Pelt
|
|
||||||
signingkey = A36E70F9DC014A15
|
|
||||||
[help]
|
|
||||||
autocorrect = 5
|
|
||||||
[includeIf "gitdir:~/serokell/"]
|
|
||||||
path=~/serokell/.gitconfig
|
|
|
@ -1,3 +0,0 @@
|
||||||
[Settings]
|
|
||||||
gtk-theme-name = Arc-Dark
|
|
||||||
gtk-font-name = Source Code Pro 10
|
|
|
@ -1,2 +0,0 @@
|
||||||
gtk-theme-name = "Arc-Dark"
|
|
||||||
gtk-font-name = "Source Code Pro 10"
|
|
|
@ -1,7 +1,7 @@
|
||||||
{writeTextDir, writeScript, lib,
|
{writeTextDir, writeScript, lib,
|
||||||
rofi, xss-lock, nitrogen, compton-git, i3status, i3-gaps,
|
rofi, xss-lock, nitrogen, compton-git, i3status, i3-gaps,
|
||||||
i3lock-color, xset, alsaUtils, light, screenshot_public, xorg, libinput-gestures,
|
i3lock-color, xset, alsaUtils, light, screenshot_public, xorg, libinput-gestures,
|
||||||
haskellPackages, polybar, rofi-pass,
|
haskellPackages, polybar, rofi-pass, xsettingsd,
|
||||||
with_lock ? true, compton_name ? "default"}:
|
with_lock ? true, compton_name ? "default"}:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
@ -173,6 +173,7 @@ ${kill-and-then "polybar" "PATH=${polybar}/bin:$PATH /home/yorick/dotfiles/i3/po
|
||||||
${kill-and-restart xss-lock "xss-lock -l -- ${locker}"}
|
${kill-and-restart xss-lock "xss-lock -l -- ${locker}"}
|
||||||
${kill-and-restart libinput-gestures "libinput-gestures"}
|
${kill-and-restart libinput-gestures "libinput-gestures"}
|
||||||
${kill-and-restart haskellPackages.arbtt "arbtt-capture"}
|
${kill-and-restart haskellPackages.arbtt "arbtt-capture"}
|
||||||
|
${kill-and-restart xsettingsd "xsettingsd"}
|
||||||
'') + ''
|
'') + ''
|
||||||
|
|
||||||
bindsym XF86MonBrightnessUp exec ${light}/bin/light -A 5
|
bindsym XF86MonBrightnessUp exec ${light}/bin/light -A 5
|
||||||
|
@ -185,6 +186,7 @@ bindsym XF86AudioMute exec ${alsaUtils}/bin/amixer set Master toggle
|
||||||
bindsym $mod+Shift+s exec --no-startup-id ${screenshot_public}/bin/screenshot_public
|
bindsym $mod+Shift+s exec --no-startup-id ${screenshot_public}/bin/screenshot_public
|
||||||
bindsym Print exec --no-startup-id ${screenshot_public}/bin/screenshot_public
|
bindsym Print exec --no-startup-id ${screenshot_public}/bin/screenshot_public
|
||||||
bindsym $mod+p exec --no-startup-id ${rofi-pass}/bin/rofi-pass
|
bindsym $mod+p exec --no-startup-id ${rofi-pass}/bin/rofi-pass
|
||||||
|
bindsym $mod+Shift+t exec --no-startup-id /home/yorick/dotfiles/bin/toggle_solarized.sh
|
||||||
workspace_auto_back_and_forth yes
|
workspace_auto_back_and_forth yes
|
||||||
|
|
||||||
hide_edge_borders smart
|
hide_edge_borders smart
|
||||||
|
|
121
i3/polybar
121
i3/polybar
|
@ -8,23 +8,22 @@
|
||||||
;=====================================================
|
;=====================================================
|
||||||
|
|
||||||
[colors]
|
[colors]
|
||||||
background = #002b36
|
background = ${xrdb:background}
|
||||||
;background = #222
|
background-alt = ${xrdb:color0}
|
||||||
background-alt = #073642
|
foreground = ${xrdb:foreground:}
|
||||||
foreground = ${xrdb:foreground:#222}
|
|
||||||
;foreground = #dfdfdf
|
|
||||||
foreground-alt = ${xrdb:foreground:#555}
|
foreground-alt = ${xrdb:foreground:#555}
|
||||||
primary = #ffb52a
|
primary = ${xrdb:color6}
|
||||||
secondary = #e60053
|
secondary = ${xrdb:color5}
|
||||||
alert = #bd2c40
|
alert = ${xrdb:color1}
|
||||||
|
|
||||||
[bar/common]
|
[bar/common]
|
||||||
monitor = ${env:MONITOR:}
|
monitor = ${env:MONITOR:}
|
||||||
width = 100%
|
width = 100%
|
||||||
fixed-center = true
|
fixed-center = true
|
||||||
|
dpi = ${env:DPI:${xrdb:Xft.dpi:-1}}
|
||||||
|
|
||||||
height = 20
|
height = 2.5%
|
||||||
radius = 6.0
|
radius = 8%
|
||||||
|
|
||||||
background = ${colors.background}
|
background = ${colors.background}
|
||||||
foreground = ${colors.foreground}
|
foreground = ${colors.foreground}
|
||||||
|
@ -33,22 +32,21 @@ scroll-up = i3wm-wsnext
|
||||||
scroll-down = i3wm-wsprev
|
scroll-down = i3wm-wsprev
|
||||||
|
|
||||||
font-0 = FontAwesome:size=10;1
|
font-0 = FontAwesome:size=10;1
|
||||||
font-1 = FiraMono:size=10;0
|
font-1 = ${xrdb:polybar.font}
|
||||||
|
|
||||||
|
|
||||||
|
tray-maxsize = 1000
|
||||||
;tray-padding = 2
|
|
||||||
tray-scale = 1.0
|
|
||||||
;tray-transparent = true
|
|
||||||
tray-background = ${colors.background}
|
tray-background = ${colors.background}
|
||||||
|
|
||||||
|
modules-left = i3 xwindow
|
||||||
|
modules-center =
|
||||||
;override-redirect = true
|
;override-redirect = true
|
||||||
|
|
||||||
|
|
||||||
line-size = 3
|
line-size = 5%
|
||||||
line-color = #f00
|
line-color = #f00
|
||||||
|
|
||||||
border-size = 4
|
border-size = 2%
|
||||||
border-color = #00000000
|
border-color = #00000000
|
||||||
|
|
||||||
padding-left = 0
|
padding-left = 0
|
||||||
|
@ -57,12 +55,9 @@ padding-right = 2
|
||||||
module-margin-left = 1
|
module-margin-left = 1
|
||||||
module-margin-right = 2
|
module-margin-right = 2
|
||||||
|
|
||||||
|
|
||||||
[bar/ascanius_primary]
|
[bar/ascanius_primary]
|
||||||
inherit = bar/common
|
inherit = bar/common
|
||||||
|
|
||||||
modules-left = i3 xwindow
|
|
||||||
modules-center =
|
|
||||||
modules-right = spotify filesystem volume eth memory battery temperature date
|
modules-right = spotify filesystem volume eth memory battery temperature date
|
||||||
|
|
||||||
|
|
||||||
|
@ -71,41 +66,21 @@ tray-position = right
|
||||||
[bar/ascanius_other]
|
[bar/ascanius_other]
|
||||||
inherit = bar/common
|
inherit = bar/common
|
||||||
|
|
||||||
modules-left = i3 xwindow
|
|
||||||
modules-center =
|
|
||||||
modules-right = date
|
modules-right = date
|
||||||
|
|
||||||
; jarvis: retina screen
|
; jarvis: retina screen
|
||||||
[bar/jarvis_primary]
|
[bar/jarvis_primary]
|
||||||
inherit = bar/common
|
inherit = bar/common
|
||||||
monitor = eDP-1
|
|
||||||
width = 100%
|
|
||||||
height = 40
|
|
||||||
;offset-x = 1%
|
|
||||||
;offset-y = 1%
|
|
||||||
radius = 6.0
|
|
||||||
|
|
||||||
line-size = 6
|
|
||||||
|
|
||||||
border-size = 4
|
|
||||||
|
|
||||||
padding-left = 0
|
|
||||||
padding-right = 2
|
|
||||||
|
|
||||||
module-margin-left = 1
|
|
||||||
module-margin-right = 2
|
|
||||||
|
|
||||||
font-0 = FontAwesome:size=20;1
|
|
||||||
font-1 = FiraMono:size=20;0
|
|
||||||
|
|
||||||
modules-left = i3 xwindow
|
|
||||||
modules-center =
|
|
||||||
modules-right = spotify filesystem volume backlight-acpi wlan battery temperature date
|
|
||||||
|
|
||||||
|
modules-right = spotify filesystem volume backlight-acpi wlan memory battery temperature date
|
||||||
|
|
||||||
tray-position = right
|
tray-position = right
|
||||||
tray-padding = 2
|
|
||||||
tray-scale = 1.0
|
[bar/jarvis_other]
|
||||||
|
inherit = bar/common
|
||||||
|
|
||||||
|
modules-right = eth wlan memory battery temperature date
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
; modules
|
; modules
|
||||||
|
@ -188,17 +163,7 @@ type = internal/xbacklight
|
||||||
|
|
||||||
format = <label>
|
format = <label>
|
||||||
label = %percentage%%
|
label = %percentage%%
|
||||||
format-underline = #9f78e1
|
format-underline = ${xrdb:color13}
|
||||||
bar-width = 10
|
|
||||||
bar-indicator = |
|
|
||||||
bar-indicator-foreground = #ff
|
|
||||||
bar-indicator-font = 2
|
|
||||||
bar-fill = ─
|
|
||||||
bar-fill-font = 2
|
|
||||||
bar-fill-foreground = #9f78e1
|
|
||||||
bar-empty = ─
|
|
||||||
bar-empty-font = 2
|
|
||||||
bar-empty-foreground = ${colors.foreground-alt}
|
|
||||||
|
|
||||||
[module/backlight-acpi]
|
[module/backlight-acpi]
|
||||||
inherit = module/xbacklight
|
inherit = module/xbacklight
|
||||||
|
@ -210,7 +175,7 @@ type = internal/cpu
|
||||||
interval = 2
|
interval = 2
|
||||||
format-prefix = " "
|
format-prefix = " "
|
||||||
format-prefix-foreground = ${colors.foreground-alt}
|
format-prefix-foreground = ${colors.foreground-alt}
|
||||||
format-underline = #f90000
|
format-underline = ${xrdb:color1}
|
||||||
label = %percentage%%
|
label = %percentage%%
|
||||||
|
|
||||||
[module/spotify]
|
[module/spotify]
|
||||||
|
@ -224,7 +189,7 @@ type = internal/memory
|
||||||
interval = 2
|
interval = 2
|
||||||
format-prefix = "m "
|
format-prefix = "m "
|
||||||
format-prefix-foreground = ${colors.foreground-alt}
|
format-prefix-foreground = ${colors.foreground-alt}
|
||||||
format-underline = #4bffdc
|
format-underline = ${xrdb:color6}
|
||||||
label = %percentage_used%%
|
label = %percentage_used%%
|
||||||
|
|
||||||
[module/wlan]
|
[module/wlan]
|
||||||
|
@ -233,7 +198,7 @@ interface = wlp58s0
|
||||||
interval = 3.0
|
interval = 3.0
|
||||||
|
|
||||||
format-connected =
|
format-connected =
|
||||||
format-connected-underline = #9f78e1
|
format-connected-underline = ${xrdb:color13}
|
||||||
label-connected = %essid%
|
label-connected = %essid%
|
||||||
|
|
||||||
format-disconnected =
|
format-disconnected =
|
||||||
|
@ -254,7 +219,7 @@ type = internal/network
|
||||||
interface = eth0
|
interface = eth0
|
||||||
interval = 3.0
|
interval = 3.0
|
||||||
|
|
||||||
format-connected-underline = #55aa55
|
format-connected-underline = ${xrdb:color2}
|
||||||
format-connected-prefix = " "
|
format-connected-prefix = " "
|
||||||
format-connected-prefix-foreground = ${colors.foreground-alt}
|
format-connected-prefix-foreground = ${colors.foreground-alt}
|
||||||
label-connected = %local_ip%
|
label-connected = %local_ip%
|
||||||
|
@ -277,7 +242,7 @@ time-alt = %H:%M:%S
|
||||||
|
|
||||||
format-prefix =
|
format-prefix =
|
||||||
format-prefix-foreground = ${colors.foreground-alt}
|
format-prefix-foreground = ${colors.foreground-alt}
|
||||||
format-underline = #0a6cf5
|
format-underline = ${xrdb:color4}
|
||||||
|
|
||||||
label = %date% %time%
|
label = %date% %time%
|
||||||
|
|
||||||
|
@ -294,24 +259,8 @@ format-muted-prefix = " "
|
||||||
;
|
;
|
||||||
format-muted-foreground = ${colors.foreground-alt}
|
format-muted-foreground = ${colors.foreground-alt}
|
||||||
label-muted = muted
|
label-muted = muted
|
||||||
format-volume-underline = #55aa55
|
format-volume-underline = ${xrdb:color2}
|
||||||
format-muted-underline = #f5a70a
|
format-muted-underline = ${xrdb:color9}
|
||||||
bar-volume-width = 10
|
|
||||||
bar-volume-foreground-0 = #55aa55
|
|
||||||
bar-volume-foreground-1 = #55aa55
|
|
||||||
bar-volume-foreground-2 = #55aa55
|
|
||||||
bar-volume-foreground-3 = #55aa55
|
|
||||||
bar-volume-foreground-4 = #55aa55
|
|
||||||
bar-volume-foreground-5 = #f5a70a
|
|
||||||
bar-volume-foreground-6 = #ff5555
|
|
||||||
bar-volume-gradient = false
|
|
||||||
bar-volume-indicator = |
|
|
||||||
bar-volume-indicator-font = 2
|
|
||||||
bar-volume-fill = ─
|
|
||||||
bar-volume-fill-font = 2
|
|
||||||
bar-volume-empty = ─
|
|
||||||
bar-volume-empty-font = 2
|
|
||||||
bar-volume-empty-foreground = ${colors.foreground-alt}
|
|
||||||
|
|
||||||
[module/battery]
|
[module/battery]
|
||||||
type = internal/battery
|
type = internal/battery
|
||||||
|
@ -320,7 +269,7 @@ adapter = ADP1
|
||||||
full-at = 100
|
full-at = 100
|
||||||
|
|
||||||
format-charging = <animation-charging> <label-charging>
|
format-charging = <animation-charging> <label-charging>
|
||||||
format-charging-underline = #ffb52a
|
format-charging-underline = ${xrdb:color9}
|
||||||
time-format = %H:%M
|
time-format = %H:%M
|
||||||
label-charging = %percentage%% - %time%
|
label-charging = %percentage%% - %time%
|
||||||
label-discharging = %percentage%% - %time%
|
label-discharging = %percentage%% - %time%
|
||||||
|
@ -353,7 +302,7 @@ thermal-zone = 1
|
||||||
warn-temperature = 100
|
warn-temperature = 100
|
||||||
|
|
||||||
format = <ramp> <label>
|
format = <ramp> <label>
|
||||||
format-underline = #f50a4d
|
format-underline = ${xrdb:color5}
|
||||||
format-warn = <ramp> <label-warn>
|
format-warn = <ramp> <label-warn>
|
||||||
format-warn-underline = ${self.format-underline}
|
format-warn-underline = ${self.format-underline}
|
||||||
|
|
||||||
|
@ -396,14 +345,10 @@ menu-2-1 = cancel
|
||||||
menu-2-1-exec = menu-open-0
|
menu-2-1-exec = menu-open-0
|
||||||
|
|
||||||
[settings]
|
[settings]
|
||||||
screenchange-reload = true
|
;screenchange-reload = true
|
||||||
;compositing-background = xor
|
;compositing-background = xor
|
||||||
;compositing-background = screen
|
;compositing-background = screen
|
||||||
;compositing-foreground = source
|
;compositing-foreground = source
|
||||||
;compositing-border = over
|
;compositing-border = over
|
||||||
|
|
||||||
[global/wm]
|
|
||||||
margin-top = 5
|
|
||||||
margin-bottom = 5
|
|
||||||
|
|
||||||
; vim:ft=dosini
|
; vim:ft=dosini
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
for m in $(xrandr --listactivemonitors | grep ": +" | cut -d " " -f 3 -); do
|
for m in $(xrandr --listactivemonitors | grep ": +" | cut -d " " -f 3 -); do
|
||||||
MONITOR=$(echo $m | tr -d +*) polybar -c ~/dotfiles/i3/polybar $(hostname)_$(echo $m | grep -q "*" && echo primary || echo other) &
|
MONITOR=$(echo $m | tr -d +*) polybar -c ~/dotfiles/i3/polybar $(hostname -s)_$(echo $m | grep -q "*" && echo primary || echo other) &
|
||||||
done
|
done
|
||||||
|
|
|
@ -1,20 +1,3 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
#Spotify
|
#Spotify
|
||||||
spotify_status(){
|
exec playerctl metadata -f '{{emoji(status)}} {{xesam:artist}} - {{xesam:title}}' -F
|
||||||
current_track=$(playerctl -p spotify metadata xesam:title)
|
|
||||||
album=$(playerctl -p spotify metadata xesam:artist)
|
|
||||||
echo -e $album" - " $current_track
|
|
||||||
}
|
|
||||||
|
|
||||||
spotify_control(){
|
|
||||||
current_status=$(playerctl -p spotify status)
|
|
||||||
if echo $current_status | grep -q "Playing"
|
|
||||||
then echo "%{F#FF1DB954}%{A:i3-msg [class=Spotify] focus:}%{A}%{F-} %{A:playerctl -p spotify previous:} %{A}%{A:playerctl -p spotify play-pause:} $(spotify_status) %{A}%{A:playerctl -p spotify next:} %{A}"
|
|
||||||
elif echo $current_status | grep -q "Paused"
|
|
||||||
then echo "%{F#FF1DB954}%{A:i3-msg [class=Spotify] focus:}%{A}%{F-} %{A:playerctl -p spotify previous:} %{A}%{A:playerctl -p spotify play-pause:} $(spotify_status) %{A}%{A:playerctl -p spotify next:} %{A}"
|
|
||||||
else
|
|
||||||
echo ""
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
spotify_control
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
#!nix-shell -i bash -p stow
|
#!nix-shell -i bash -p stow
|
||||||
set -e
|
set -e
|
||||||
$(nix-build '<nixpkgs>' -A stow --no-out-link)/bin/stow -d `dirname $0` -t ~ nix git x gtk gpg mutt misc bash stow rofi
|
$(nix-build '<nixpkgs>' -A stow --no-out-link)/bin/stow -d `dirname $0` -t ~ nix x gpg mutt stow rofi
|
||||||
nix build -f. $(hostname -s)
|
nix build -f. $(hostname -s)
|
||||||
|
|
|
@ -1,51 +0,0 @@
|
||||||
Compression yes
|
|
||||||
ServerAliveInterval 120
|
|
||||||
ControlMaster auto
|
|
||||||
ControlPath ~/.ssh/socket-%r@%h:%p
|
|
||||||
|
|
||||||
Host oxygen
|
|
||||||
HostName oxygen.obfusk.ch
|
|
||||||
|
|
||||||
Host nyamsas
|
|
||||||
hostname nyamsas.quezacotl.nl
|
|
||||||
port 1337
|
|
||||||
|
|
||||||
Host phassa
|
|
||||||
hostname karpenoktem.nl
|
|
||||||
port 33933
|
|
||||||
|
|
||||||
|
|
||||||
Host lilo4
|
|
||||||
HostName lilo4.science.ru.nl
|
|
||||||
User yvpelt
|
|
||||||
Host lilo5
|
|
||||||
HostName lilo5.science.ru.nl
|
|
||||||
User yvpelt
|
|
||||||
Host lilo
|
|
||||||
HostName lilo.science.ru.nl
|
|
||||||
User yvpelt
|
|
||||||
|
|
||||||
Host c2n_fr
|
|
||||||
HostName collect2net.osso.nl
|
|
||||||
User alectryon
|
|
||||||
ProxyJump yorick@frumar.yori.cc
|
|
||||||
|
|
||||||
Host pub.yori.cc
|
|
||||||
User public
|
|
||||||
IdentityFile ~/.ssh/id_rsa_pub
|
|
||||||
IdentitiesOnly yes
|
|
||||||
|
|
||||||
Host asc_wh
|
|
||||||
hostname 192.168.1.4
|
|
||||||
ProxyJump yorick@woodhouse.onion
|
|
||||||
|
|
||||||
Host skl_deployer
|
|
||||||
hostname deployer.serokell.team
|
|
||||||
RemoteForward /home/yorick/.aws/pass-socket /home/yorick/.aws/pass-socket
|
|
||||||
RemoteForward /home/yorick/.gnupg/S.gpg-agent /home/yorick/.gnupg/S.gpg-agent.extra
|
|
||||||
ForwardAgent yes
|
|
||||||
Host skl_deployer_vbox
|
|
||||||
hostname 192.168.56.101
|
|
||||||
ForwardAgent yes
|
|
||||||
RemoteForward /home/yorick/.aws/pass-socket /home/yorick/.aws/pass-socket
|
|
||||||
RemoteForward /home/yorick/.gnupg/S.gpg-agent /home/yorick/.gnupg/S.gpg-agent.extra
|
|
|
@ -1,2 +0,0 @@
|
||||||
player = mpv --cache 2048
|
|
||||||
default-stream = best
|
|
|
@ -0,0 +1,114 @@
|
||||||
|
{ pkgs, ... }: {
|
||||||
|
programs = {
|
||||||
|
home-manager = {
|
||||||
|
enable = true;
|
||||||
|
path = https://github.com/rycee/home-manager/archive/master.tar.gz;
|
||||||
|
};
|
||||||
|
git = {
|
||||||
|
enable = true;
|
||||||
|
userName = "Yorick van Pelt";
|
||||||
|
userEmail = "yorick@yorickvanpelt.nl";
|
||||||
|
signing.key = "A36E70F9DC014A15";
|
||||||
|
# signing.signByDefault = true;
|
||||||
|
extraConfig.help.autocorrect = 5;
|
||||||
|
extraConfig.push.default = "simple";
|
||||||
|
extraConfig."includeIf \"gitdir:~/serokell/\"".path = "~/serokell/.gitconfig";
|
||||||
|
aliases = {
|
||||||
|
lg = "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative";
|
||||||
|
st = "status";
|
||||||
|
remotes = "remote -v";
|
||||||
|
branches = "branch -a";
|
||||||
|
tags = "tag";
|
||||||
|
stashes = "stash list";
|
||||||
|
unstage = "reset -q HEAD --";
|
||||||
|
discard = "checkout --";
|
||||||
|
uncommit = "reset --mixed HEAD~";
|
||||||
|
graph = "log --graph -10 --branches --remotes --tags --format=format:'%Cgreen%h %Creset• %<(75,trunc)%s (%cN, %cr) %Cred%d' --date-order ";
|
||||||
|
dad = "!curl https://icanhazdadjoke.com/ && git add";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
ssh = {
|
||||||
|
enable = true;
|
||||||
|
compression = true;
|
||||||
|
serverAliveInterval = 120;
|
||||||
|
controlMaster = "auto";
|
||||||
|
matchBlocks = {
|
||||||
|
"pub.yori.cc" = {
|
||||||
|
user = "public";
|
||||||
|
identityFile = "~/.ssh/id_rsa_pub";
|
||||||
|
identitiesOnly = true;
|
||||||
|
};
|
||||||
|
oxygen.hostname = "oxygen.obfusk.ch";
|
||||||
|
nyamsas = { hostname = "nyamsas.quezacotl.nl"; port = 1337; };
|
||||||
|
phassa = { hostname = "karpenoktem.nl"; port = 33933; };
|
||||||
|
};
|
||||||
|
};
|
||||||
|
bash = {
|
||||||
|
enable = true;
|
||||||
|
historyControl = [ "erasedups" "ignoredups" "ignorespace" ];
|
||||||
|
shellAliases = {
|
||||||
|
nr = "nix repl \"<nixpkgs>\"";
|
||||||
|
nsp = "nix-shell -p";
|
||||||
|
};
|
||||||
|
initExtra = "eval $(thefuck --alias)";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
xresources.properties =
|
||||||
|
let font = "DejaVu Sans Mono";
|
||||||
|
fsize = 11;
|
||||||
|
dpi = 192; in
|
||||||
|
{
|
||||||
|
"URxvt.scrollstyle" = "plain";
|
||||||
|
"URxvt.scrollBar_right" = "true";
|
||||||
|
"URxvt.perl-ext-common" = "default,matcher,font-size,vtwheel";
|
||||||
|
"URxvt.url-launcher" = "xdg-open";
|
||||||
|
"URxvt.matcher.button" = "1";
|
||||||
|
"URxvt.urgentOnBell" = "True";
|
||||||
|
"URxvt.depth" = "32";
|
||||||
|
"URxvt.borderColor" = "S_base03";
|
||||||
|
# "! URxvt.background" = "[95]#202020";
|
||||||
|
"*font" = "xft:${font}:size=${toString fsize}:antialias=true:hinting=true";
|
||||||
|
"polybar.font" = "${font}:size=${toString fsize}:antialias=true:hinting=true;2";
|
||||||
|
"URxvt.geometry" = "100x30";
|
||||||
|
"URxvt.scrollColor" = "S_base0";
|
||||||
|
|
||||||
|
"rofi.font" = "${font} ${toString fsize}";
|
||||||
|
"Emacs.font" = "${font}-${toString fsize}";
|
||||||
|
|
||||||
|
"URxvt.font-size.step" = "4";
|
||||||
|
"URxvt.keysym.C-equal" = "perl:font-size:increase";
|
||||||
|
"URxvt.keysym.C-minus" = "perl:font-size:decrease";
|
||||||
|
|
||||||
|
"Xft.dpi" = dpi;
|
||||||
|
"*dpi" = dpi;
|
||||||
|
};
|
||||||
|
xresources.extraConfig = builtins.readFile (
|
||||||
|
pkgs.fetchFromGitHub {
|
||||||
|
owner = "solarized";
|
||||||
|
repo = "xresources";
|
||||||
|
rev = "025ceddbddf55f2eb4ab40b05889148aab9699fc";
|
||||||
|
sha256 = "0lxv37gmh38y9d3l8nbnsm1mskcv10g3i83j0kac0a2qmypv1k9f";
|
||||||
|
} + "/Xresources.light");
|
||||||
|
xdg.configFile."streamlink/config".text = ''
|
||||||
|
player = mpv --cache 2048
|
||||||
|
default-stream = best
|
||||||
|
'';
|
||||||
|
services = {
|
||||||
|
compton = {
|
||||||
|
enable = true;
|
||||||
|
backend = "glx";
|
||||||
|
extraOptions = ''
|
||||||
|
glx-no-stencil = true;
|
||||||
|
unredir-if-possible = true;
|
||||||
|
'';
|
||||||
|
# nvidia = ''
|
||||||
|
# paint-on-overlay = true;
|
||||||
|
# glx-no-rebind-pixmap = true;
|
||||||
|
# glx-swap-method = -1;
|
||||||
|
# xrender-sync-fence = true;
|
||||||
|
# ''; vsync = "opengl-oml";
|
||||||
|
};
|
||||||
|
|
||||||
|
};
|
||||||
|
}
|
|
@ -20,4 +20,28 @@ in
|
||||||
librarySystemDepends = drv.librarySystemDepends ++ [ self.xorg.libXScrnSaver ];
|
librarySystemDepends = drv.librarySystemDepends ++ [ self.xorg.libXScrnSaver ];
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
# numix-solarized-gtk-theme = super.numix-solarized-gtk-theme.overrideDerivation (attrs: rec {
|
||||||
|
# version = "20180204";
|
||||||
|
# name = "numix-solarized-gtk-theme-${version}";
|
||||||
|
# buildInputs = attrs.buildInputs ++ [ self.python3 self.inkscape ];
|
||||||
|
# src = self.fetchFromGitHub {
|
||||||
|
# owner = "Ferdi265";
|
||||||
|
# repo = "numix-solarized-gtk-theme";
|
||||||
|
# rev = "3da78b0dbe74d0af0e3cc12e18ec1c30c7cf2b16";
|
||||||
|
# sha256 = "0dyqfcs1laff7hr64dg4n5y6qrcki47mdr332yn3yxp3bk7xybc3";
|
||||||
|
# };
|
||||||
|
# postPatch = attrs.postPatch + ''
|
||||||
|
# sed -i s#/usr/bin/inkscape#${self.inkscape}/bin/inkscape# scripts/render-assets.sh
|
||||||
|
# '';
|
||||||
|
# buildPhase = ''
|
||||||
|
# # for i in Solarized*.colors; do
|
||||||
|
# # THEME=`basename $i` make
|
||||||
|
# # done
|
||||||
|
# '';
|
||||||
|
# installPhase = ''
|
||||||
|
# for i in Solarized*.colors; do
|
||||||
|
# HOME=/tmp/inkscape make install THEME=`basename $i .colors`
|
||||||
|
# done
|
||||||
|
# '';
|
||||||
|
# });
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,6 +6,7 @@ self: super: {
|
||||||
nottetris2 = self.callPackage ../pkgs/nottetris2.nix {};
|
nottetris2 = self.callPackage ../pkgs/nottetris2.nix {};
|
||||||
mailpile = self.callPackage ../pkgs/mailpile.nix {};
|
mailpile = self.callPackage ../pkgs/mailpile.nix {};
|
||||||
lejos = self.callPackage ../pkgs/lejos.nix {};
|
lejos = self.callPackage ../pkgs/lejos.nix {};
|
||||||
|
playerctl = self.callPackage ../pkgs/playerctl.nix {};
|
||||||
libinput-gestures = super.libinput-gestures.override { extraUtilsPath = [
|
libinput-gestures = super.libinput-gestures.override { extraUtilsPath = [
|
||||||
self.xdotool self.python3
|
self.xdotool self.python3
|
||||||
];};
|
];};
|
||||||
|
|
|
@ -0,0 +1,108 @@
|
||||||
|
{ stdenv,
|
||||||
|
lib,
|
||||||
|
fetchFromGitHub,
|
||||||
|
rustPlatform,
|
||||||
|
cmake,
|
||||||
|
makeWrapper,
|
||||||
|
ncurses,
|
||||||
|
expat,
|
||||||
|
pkgconfig,
|
||||||
|
freetype,
|
||||||
|
fontconfig,
|
||||||
|
libX11,
|
||||||
|
gzip,
|
||||||
|
libXcursor,
|
||||||
|
libXxf86vm,
|
||||||
|
libXi,
|
||||||
|
libXrandr,
|
||||||
|
libGL,
|
||||||
|
wayland,
|
||||||
|
libxkbcommon,
|
||||||
|
python3,
|
||||||
|
libxcb
|
||||||
|
# Darwin Frameworks
|
||||||
|
}:
|
||||||
|
|
||||||
|
with rustPlatform;
|
||||||
|
|
||||||
|
let
|
||||||
|
rpathLibs = [
|
||||||
|
expat
|
||||||
|
freetype
|
||||||
|
fontconfig
|
||||||
|
libX11
|
||||||
|
libXcursor
|
||||||
|
libXxf86vm
|
||||||
|
libXrandr
|
||||||
|
libGL
|
||||||
|
libXi
|
||||||
|
python3
|
||||||
|
libxcb
|
||||||
|
] ++ lib.optionals stdenv.isLinux [
|
||||||
|
wayland
|
||||||
|
libxkbcommon
|
||||||
|
];
|
||||||
|
in buildRustPackage rec {
|
||||||
|
pname = "alacritty";
|
||||||
|
version = "0.3.3-20190430";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "jwilm";
|
||||||
|
repo = pname;
|
||||||
|
rev = "bc038f8295830cbd66851d308fd2963f2e0eb60c";
|
||||||
|
sha256 = "14kjlilbkh589vb2xq2agw54blwn3vk0lxs0plkhnf3jrib3k6nd";
|
||||||
|
};
|
||||||
|
|
||||||
|
cargoSha256 = "04mfdm0b7jj0mkchrzzq9bm99m5y9h4ajj848kkf679k5wfiqc12";
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
cmake
|
||||||
|
makeWrapper
|
||||||
|
pkgconfig
|
||||||
|
ncurses
|
||||||
|
gzip
|
||||||
|
];
|
||||||
|
|
||||||
|
buildInputs = rpathLibs;
|
||||||
|
|
||||||
|
outputs = [ "out" "terminfo" ];
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
runHook preInstall
|
||||||
|
|
||||||
|
install -D target/release/alacritty $out/bin/alacritty
|
||||||
|
|
||||||
|
'' + (if stdenv.isDarwin then ''
|
||||||
|
mkdir $out/Applications
|
||||||
|
cp -r target/release/osx/Alacritty.app $out/Applications/Alacritty.app
|
||||||
|
'' else ''
|
||||||
|
install -D extra/linux/alacritty.desktop -t $out/share/applications/
|
||||||
|
install -D extra/logo/alacritty-term.svg $out/share/icons/hicolor/scalable/apps/Alacritty.svg
|
||||||
|
patchelf --set-rpath "${stdenv.lib.makeLibraryPath rpathLibs}" $out/bin/alacritty
|
||||||
|
'') + ''
|
||||||
|
|
||||||
|
install -D extra/completions/_alacritty -t "$out/share/zsh/site-functions/"
|
||||||
|
install -D extra/completions/alacritty.bash -t "$out/etc/bash_completion.d/"
|
||||||
|
install -D extra/completions/alacritty.fish -t "$out/share/fish/vendor_completions.d/"
|
||||||
|
|
||||||
|
install -dm 755 "$out/share/man/man1"
|
||||||
|
gzip -c extra/alacritty.man > "$out/share/man/man1/alacritty.1.gz"
|
||||||
|
|
||||||
|
install -dm 755 "$terminfo/share/terminfo/a/"
|
||||||
|
tic -x -o "$terminfo/share/terminfo" extra/alacritty.info
|
||||||
|
mkdir -p $out/nix-support
|
||||||
|
echo "$terminfo" >> $out/nix-support/propagated-user-env-packages
|
||||||
|
|
||||||
|
runHook postInstall
|
||||||
|
'';
|
||||||
|
|
||||||
|
dontPatchELF = true;
|
||||||
|
|
||||||
|
meta = with stdenv.lib; {
|
||||||
|
description = "GPU-accelerated terminal emulator";
|
||||||
|
homepage = https://github.com/jwilm/alacritty;
|
||||||
|
license = with licenses; [ asl20 ];
|
||||||
|
maintainers = with maintainers; [ mic92 ];
|
||||||
|
platforms = [ "x86_64-linux" "x86_64-darwin" ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -0,0 +1,28 @@
|
||||||
|
{ stdenv, meson, ninja, fetchFromGitHub, glib, pkgconfig, gobjectIntrospection }:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "playerctl-${version}";
|
||||||
|
version = "2.0.1";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "acrisci";
|
||||||
|
repo = "playerctl";
|
||||||
|
rev = "v${version}";
|
||||||
|
sha256 = "0j1fvcc80307ybl1z9l752sr4bcza2fmb8qdivpnm4xmm82faigb";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection ];
|
||||||
|
buildInputs = [ glib ];
|
||||||
|
|
||||||
|
# docs somehow crashes the install phase:
|
||||||
|
# https://github.com/acrisci/playerctl/issues/85
|
||||||
|
mesonFlags = [ "-Dgtk-doc=false" ];
|
||||||
|
|
||||||
|
meta = with stdenv.lib; {
|
||||||
|
description = "Command-line utility and library for controlling media players that implement MPRIS";
|
||||||
|
homepage = https://github.com/acrisci/playerctl;
|
||||||
|
license = licenses.lgpl3;
|
||||||
|
platforms = platforms.unix;
|
||||||
|
maintainers = with maintainers; [ puffnfresh ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -1,40 +1,35 @@
|
||||||
let pkgs = import <nixpkgs> {};
|
{ fetchurl, fetchFromGitHub, python2Packages }:
|
||||||
in
|
with python2Packages;
|
||||||
{ fetchurl ? pkgs.fetchurl,
|
|
||||||
fetchFromGitHub ? pkgs.fetchFromGitHub,
|
|
||||||
python27Packages ? pkgs.python27Packages }:
|
|
||||||
|
|
||||||
with python27Packages;
|
|
||||||
let
|
let
|
||||||
ProxyTypes = buildPythonPackage rec {
|
ProxyTypes = buildPythonPackage rec {
|
||||||
name = "ProxyTypes-0.9";
|
pname = "ProxyTypes";
|
||||||
src = pkgs.fetchurl {
|
version = "0.10.0";
|
||||||
url = "https://pypi.python.org/packages/72/bd/24f45710e7e6909b2129332363be2c981179ed2eda1166f18bc2baef98a1/${name}.zip";
|
src = fetchPypi {
|
||||||
sha256 = "03zfq1ib23dc9rq759n43ri2ki6841yjisdcb59jvp5dqww5bcr0";
|
inherit pname version;
|
||||||
};
|
sha256 = "11cr6c39vq9fky4c4h2ai2v2dva8fk4cfhaja0mrh4y9wzal3k42";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
pyrobase = buildPythonApplication rec {
|
pyrobase = buildPythonApplication rec {
|
||||||
name = "pyrobase-0.3";
|
pname = "pyrobase";
|
||||||
|
version = "0.5.2";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
repo = "pyrobase"; owner = "pyroscope";
|
repo = pname; owner = "pyroscope";
|
||||||
rev = "cf64da5d89df1c1174e0184c63a51a46f2f955fd";
|
rev = "v${version}";
|
||||||
sha256 = "12qn1gx64byi76kkx8p7y5gdrq016fw2s23l4yik0q1hdg2b99y8";
|
sha256 = "170lsls3dmhlfa5abk40l365pk8486w48vkxjgs3pnqnhpp67z18";
|
||||||
};
|
};
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
patches = [./fix_readme.diff];
|
buildInputs = [six paver];
|
||||||
buildInputs = [paver];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
in
|
in
|
||||||
buildPythonApplication rec {
|
buildPythonApplication rec {
|
||||||
name = "pyrocore-0.4.3";
|
pname = "pyrocore";
|
||||||
|
version = "0.5.3";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
repo = "pyrocore"; owner = "pyroscope";
|
repo = pname; owner = "pyroscope";
|
||||||
rev = "a8d81af33959333a42a95714631c69870b717329";
|
rev = "v${version}";
|
||||||
sha256 = "1fvahnkhh4nj7qy9m4j2c0djmf4ichy29s7b9wkn7ivhlcgv9hs0";
|
sha256 = "0yg11nhrx8jzx8g09npf0pcpiscyh35nahhw473mir418plji5jw";
|
||||||
};
|
};
|
||||||
doCheck = false;
|
buildInputs = [paver];
|
||||||
buildInputs = [python27Packages.paver];
|
propagatedBuildInputs = [six pyrobase ProxyTypes];
|
||||||
propagatedBuildInputs = [pyrobase ProxyTypes];
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,12 +0,0 @@
|
||||||
let pkgs = import <nixpkgs> {config = import ./nix/.nixpkgs/config.nix;};
|
|
||||||
all_userspace = pkgs.lib.mapAttrs (name: paths: pkgs.buildEnv {inherit name paths;}) pkgs.hosts;
|
|
||||||
in
|
|
||||||
with pkgs;
|
|
||||||
{
|
|
||||||
dotfiles = {
|
|
||||||
inherit (import ./default.nix pkgs) woodhouse pennyworth frumar;
|
|
||||||
};
|
|
||||||
userspace = {
|
|
||||||
inherit (all_userspace) woodhouse pennyworth frumar;
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -1,12 +0,0 @@
|
||||||
let pkgs = import <nixpkgs> {config = import ./nix/.nixpkgs/config.nix;};
|
|
||||||
all_userspace = pkgs.lib.mapAttrs (name: paths: pkgs.buildEnv {inherit name paths;}) pkgs.hosts;
|
|
||||||
in
|
|
||||||
with pkgs;
|
|
||||||
{
|
|
||||||
dotfiles = {
|
|
||||||
inherit (import ./default.nix pkgs) ascanius jarvis;
|
|
||||||
};
|
|
||||||
userspace = {
|
|
||||||
inherit (all_userspace) ascanius jarvis;
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -3,7 +3,7 @@ configuration {
|
||||||
/* width: 50;*/
|
/* width: 50;*/
|
||||||
/* lines: 15;*/
|
/* lines: 15;*/
|
||||||
/* columns: 1;*/
|
/* columns: 1;*/
|
||||||
font: "Source Code Pro 12";
|
/* font: "Source Code Pro 12";*/
|
||||||
/* bw: 1;*/
|
/* bw: 1;*/
|
||||||
/* location: 0;*/
|
/* location: 0;*/
|
||||||
/* padding: 5;*/
|
/* padding: 5;*/
|
||||||
|
@ -18,7 +18,7 @@ configuration {
|
||||||
/* run-list-command: "";*/
|
/* run-list-command: "";*/
|
||||||
/* run-shell-command: "{terminal} -e {cmd}";*/
|
/* run-shell-command: "{terminal} -e {cmd}";*/
|
||||||
/* window-command: "xkill -id {window}";*/
|
/* window-command: "xkill -id {window}";*/
|
||||||
/* drun-icon-theme: ;*/
|
/* drun-icon-theme: "Arc";*/
|
||||||
/* disable-history: false;*/
|
/* disable-history: false;*/
|
||||||
/* sort: false;*/
|
/* sort: false;*/
|
||||||
/* levenshtein-sort: false;*/
|
/* levenshtein-sort: false;*/
|
||||||
|
@ -40,7 +40,7 @@ configuration {
|
||||||
/* hide-scrollbar: false;*/
|
/* hide-scrollbar: false;*/
|
||||||
/* fullscreen: false;*/
|
/* fullscreen: false;*/
|
||||||
/* fake-transparency: false;*/
|
/* fake-transparency: false;*/
|
||||||
dpi: 109;
|
/* dpi: 109; */
|
||||||
/* threads: 0;*/
|
/* threads: 0;*/
|
||||||
/* scrollbar-width: 8;*/
|
/* scrollbar-width: 8;*/
|
||||||
/* scroll-method: 0;*/
|
/* scroll-method: 0;*/
|
||||||
|
@ -48,7 +48,7 @@ configuration {
|
||||||
/* window-format: "{w} {i}{c} {t}";*/
|
/* window-format: "{w} {i}{c} {t}";*/
|
||||||
/* click-to-exit: true;*/
|
/* click-to-exit: true;*/
|
||||||
/* show-match: true;*/
|
/* show-match: true;*/
|
||||||
theme: "solarized_alternate";
|
theme: "Arc";
|
||||||
/* color-normal: ;*/
|
/* color-normal: ;*/
|
||||||
/* color-urgent: ;*/
|
/* color-urgent: ;*/
|
||||||
/* color-active: ;*/
|
/* color-active: ;*/
|
||||||
|
|
|
@ -1,92 +0,0 @@
|
||||||
#!/usr/bin/env bash
|
|
||||||
set -e
|
|
||||||
set -o pipefail
|
|
||||||
|
|
||||||
print-passwords() {
|
|
||||||
prefix=${PASSWORD_STORE_DIR-~/.password-store}
|
|
||||||
password_files=( "$prefix"/**/*.gpg )
|
|
||||||
password_files=( "${password_files[@]#"$prefix"/}" )
|
|
||||||
password_files=( "${password_files[@]%.gpg}" )
|
|
||||||
printf '%s\n' "${password_files[@]}"
|
|
||||||
}
|
|
||||||
|
|
||||||
copy-account-field() {
|
|
||||||
lpass show --clip "--${2}" "$1" >/dev/null 2>/dev/null
|
|
||||||
}
|
|
||||||
|
|
||||||
open-account-url() {
|
|
||||||
local url=$(lpass show --url "$1")
|
|
||||||
if [[ -n $url ]]; then
|
|
||||||
xdg-open "$url" >/dev/null 2>/dev/null
|
|
||||||
else
|
|
||||||
exit 2
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
is-actual-url() {
|
|
||||||
local url="$1"
|
|
||||||
if [[ -n $url && "$url" != " " && "$url" != "http://" && "$url" != "https://" ]]; then
|
|
||||||
return 0
|
|
||||||
else
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
show-account-options() {
|
|
||||||
local id="$1"
|
|
||||||
|
|
||||||
echo ">> Copy password [$id]"
|
|
||||||
echo ">> Copy username [$id]"
|
|
||||||
|
|
||||||
url=$(lpass show --url "$id")
|
|
||||||
if is-actual-url "$url"; then
|
|
||||||
echo ">> Open $url [$id]"
|
|
||||||
echo ">> Copy URL [$id]"
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo ">> Copy ID [$id]"
|
|
||||||
}
|
|
||||||
|
|
||||||
is-entry-selected() {
|
|
||||||
if [[ -n $@ ]]; then
|
|
||||||
return 0
|
|
||||||
else
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
id-in-selection() {
|
|
||||||
echo "$1" | grep -oE '\[[0-9]+\]$' | tr -d '[]'
|
|
||||||
}
|
|
||||||
|
|
||||||
debug() {
|
|
||||||
echo "$@" > /dev/stderr
|
|
||||||
}
|
|
||||||
|
|
||||||
if is-entry-selected "$1"; then
|
|
||||||
selected="$1"
|
|
||||||
|
|
||||||
id="$(id-in-selection "$selected")"
|
|
||||||
|
|
||||||
if [[ -n $id ]]; then
|
|
||||||
case "$selected" in
|
|
||||||
'>> Copy password'*)
|
|
||||||
copy-account-field "$id" password ;;
|
|
||||||
'>> Copy username'*)
|
|
||||||
copy-account-field "$id" username ;;
|
|
||||||
'>> Copy URL'*)
|
|
||||||
copy-account-field "$id" url ;;
|
|
||||||
'>> Copy ID'*)
|
|
||||||
copy-account-field "$id" id ;;
|
|
||||||
'>> Open'*)
|
|
||||||
open-account-url "$id" ;;
|
|
||||||
*)
|
|
||||||
show-account-options "$id" ;;
|
|
||||||
esac
|
|
||||||
else
|
|
||||||
echo "Could not detect the entry ID of \"${selection}\""
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
print-passwords
|
|
||||||
fi
|
|
33
x/.Xdefaults
33
x/.Xdefaults
|
@ -7,34 +7,14 @@
|
||||||
#define S_blue #268bd2
|
#define S_blue #268bd2
|
||||||
#define S_cyan #2aa198
|
#define S_cyan #2aa198
|
||||||
#define S_green #859900
|
#define S_green #859900
|
||||||
! Dark
|
#include "/home/yorick/dotfiles/x/solarized/actual"
|
||||||
#define S_base03 #002b36
|
|
||||||
#define S_base02 #073642
|
|
||||||
#define S_base01 #586e75
|
|
||||||
#define S_base00 #657b83
|
|
||||||
#define S_base0 #839496
|
|
||||||
#define S_base1 #93a1a1
|
|
||||||
#define S_base2 #eee8d5
|
|
||||||
#define S_base3 #fdf6e3
|
|
||||||
! Light
|
|
||||||
! #define S_base03 #fdf6e3
|
|
||||||
! #define S_base02 #eee8d5
|
|
||||||
! #define S_base01 #93a1a1
|
|
||||||
! #define S_base00 #839496
|
|
||||||
! #define S_base0 #657b83
|
|
||||||
! #define S_base1 #586e75
|
|
||||||
! #define S_base2 #073642
|
|
||||||
! #define S_base3 #002b36
|
|
||||||
! To only apply colors to your terminal, for example, prefix
|
! To only apply colors to your terminal, for example, prefix
|
||||||
! the color assignment statement with its name. Example:
|
! the color assignment statement with its name. Example:
|
||||||
!
|
!
|
||||||
! URxvt*background: S_base03
|
*background: S_base03
|
||||||
*background: S_base3
|
URxvt*background: S_base03_transp
|
||||||
URxvt*background: [85]#002b36
|
|
||||||
! S_base03
|
! S_base03
|
||||||
*foreground: S_base0
|
*foreground: S_base0
|
||||||
*fading: 10
|
|
||||||
*fadeColor: [70]#002b36
|
|
||||||
*cursorColor: S_base1
|
*cursorColor: S_base1
|
||||||
*pointerColorBackground: S_base01
|
*pointerColorBackground: S_base01
|
||||||
*pointerColorForeground: S_base1
|
*pointerColorForeground: S_base1
|
||||||
|
@ -62,13 +42,16 @@ URxvt.url-launcher: xdg-open
|
||||||
URxvt.matcher.button: 1
|
URxvt.matcher.button: 1
|
||||||
URxvt.urgentOnBell: True
|
URxvt.urgentOnBell: True
|
||||||
URxvt.depth: 32
|
URxvt.depth: 32
|
||||||
|
URxvt.borderColor: S_base03
|
||||||
! URxvt.background: [95]#202020
|
! URxvt.background: [95]#202020
|
||||||
URxvt.font: xft:SourceCodePro:size=12:antialias=true:hinting=true
|
*font: xft:DejaVu Sans Mono:size=11:antialias=true:hinting=true
|
||||||
|
polybar.font: DejaVu Sans Mono:size=11:antialias=true:hinting=true;2
|
||||||
! URxvt.boldFont: xft:SourceCodePro:bold:size=12:antialias=true:hinting=true
|
! URxvt.boldFont: xft:SourceCodePro:bold:size=12:antialias=true:hinting=true
|
||||||
URxvt.geometry: 100x30
|
URxvt.geometry: 100x30
|
||||||
URxvt.scrollColor: S_base0
|
URxvt.scrollColor: S_base0
|
||||||
|
|
||||||
rofi.font: Source Code Pro 12
|
rofi.font: DejaVu Sans Mono 11
|
||||||
|
Emacs.font: DejaVu Sans Mono-11
|
||||||
|
|
||||||
URxvt.font-size.step: 4
|
URxvt.font-size.step: 4
|
||||||
URxvt.keysym.C-equal: perl:font-size:increase
|
URxvt.keysym.C-equal: perl:font-size:increase
|
||||||
|
|
|
@ -1,20 +0,0 @@
|
||||||
# compton (https://github.com/chjj/compton) compositor config
|
|
||||||
|
|
||||||
# Latest git master version of compton is recommended. Configuring compton is
|
|
||||||
# tricky, these settings are what work for me with NVIDIA GeForce GTX 650 Ti,
|
|
||||||
# and the nvidia-352 driver.
|
|
||||||
|
|
||||||
# Use GLX backend for performance and vsync:
|
|
||||||
backend = "glx"
|
|
||||||
|
|
||||||
# Various performance optimizations:
|
|
||||||
paint-on-overlay = true;
|
|
||||||
glx-no-stencil = true;
|
|
||||||
glx-no-rebind-pixmap = true;
|
|
||||||
glx-swap-method = -1;
|
|
||||||
|
|
||||||
# With newer NVIDIA drivers, this option is needed to prevent lags/flickering:
|
|
||||||
xrender-sync-fence = true;
|
|
||||||
|
|
||||||
unredir-if-possible = true;
|
|
||||||
vsync = "opengl-oml";
|
|
|
@ -1,5 +0,0 @@
|
||||||
backend = "glx";
|
|
||||||
#paint-on-overlay = true;
|
|
||||||
glx-no-stencil = true;
|
|
||||||
#glx-swap-method = 4;
|
|
||||||
unredir-if-possible = true;
|
|
|
@ -0,0 +1 @@
|
||||||
|
light
|
|
@ -0,0 +1 @@
|
||||||
|
dark
|
|
@ -0,0 +1,11 @@
|
||||||
|
! Dark
|
||||||
|
#define S_base03 #002b36
|
||||||
|
#define S_base03_transp [85]#002b36
|
||||||
|
*fading: 10
|
||||||
|
#define S_base02 #073642
|
||||||
|
#define S_base01 #586e75
|
||||||
|
#define S_base00 #657b83
|
||||||
|
#define S_base0 #839496
|
||||||
|
#define S_base1 #93a1a1
|
||||||
|
#define S_base2 #eee8d5
|
||||||
|
#define S_base3 #fdf6e3
|
|
@ -0,0 +1,10 @@
|
||||||
|
! Light
|
||||||
|
#define S_base03 #fdf6e3
|
||||||
|
#define S_base03_transp [90]#fdf6e3
|
||||||
|
#define S_base02 #eee8d5
|
||||||
|
#define S_base01 #93a1a1
|
||||||
|
#define S_base00 #839496
|
||||||
|
#define S_base0 #657b83
|
||||||
|
#define S_base1 #586e75
|
||||||
|
#define S_base2 #073642
|
||||||
|
#define S_base3 #002b36
|
Loading…
Reference in New Issue