summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordakkar <dakkar@thenautilus.net>2018-07-19 17:30:04 +0100
committerdakkar <dakkar@thenautilus.net>2018-07-19 17:30:04 +0100
commitf46ec18a0d4818b33fa1303f1aa78fec579a78b3 (patch)
tree3457fe8f178da3f7f6be76ae5e59b42af0262e73
parentnicer NULL in psql (diff)
parentredshift (diff)
downloaddotfiles-f46ec18a0d4818b33fa1303f1aa78fec579a78b3.tar.gz
dotfiles-f46ec18a0d4818b33fa1303f1aa78fec579a78b3.tar.bz2
dotfiles-f46ec18a0d4818b33fa1303f1aa78fec579a78b3.zip
Merge remote-tracking branch 'origin/master' into nautilus
-rw-r--r--.bash_profile2
-rw-r--r--.config/redshift.conf15
-rw-r--r--.gitconfig2
-rwxr-xr-x.xinitrc3
4 files changed, 19 insertions, 3 deletions
diff --git a/.bash_profile b/.bash_profile
index 923f310..f2d8ae7 100644
--- a/.bash_profile
+++ b/.bash_profile
@@ -11,7 +11,7 @@ source ~/perl5/perlbrew/etc/bashrc
export PATH="${HOME}/bin:${PATH}"
export GPG_TTY="$(tty)"
-eval "$(keychain --eval --noask --inherit any-once --agents gpg,ssh id_rsa id_ed25519 75193F88 D7A5DBBE)"
+eval "$(keychain --eval --inherit any-once --agents ssh id_rsa id_ed25519)"
function e() {
emacsclient "$@"
diff --git a/.config/redshift.conf b/.config/redshift.conf
new file mode 100644
index 0000000..3629ea7
--- /dev/null
+++ b/.config/redshift.conf
@@ -0,0 +1,15 @@
+[redshift]
+temp-day=5700
+temp-night=3500
+
+transition=1
+
+location-provider=manual
+adjustment-method=randr
+
+[manual]
+lat=57
+lon=0
+
+[randr]
+screen=0
diff --git a/.gitconfig b/.gitconfig
index f15daf3..c28c1df 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -30,7 +30,7 @@
stat = true
autosquash = true
[transfer]
- fsckobjects = true
+ #fsckobjects = true
[grep]
patternType = perl
[alias]
diff --git a/.xinitrc b/.xinitrc
index fcc57c7..c72b7f6 100755
--- a/.xinitrc
+++ b/.xinitrc
@@ -15,7 +15,8 @@ gkrellm &
xsetwacom set stylus PressCurve 0 0 100 100
xsetwacom set eraser PressCurve 0 0 100 100
xpad &
-start-pulseaudio-x11&
+start-pulseaudio-x11
+gtk-redshift &
exec dbus-launch --exit-with-session fvwm-crystal