Merge branch 'master' of github.com:IvanMalison/dotfiles

This commit is contained in:
Ivan Malison 2018-07-11 23:26:54 -07:00
commit cfffe76778
No known key found for this signature in database
GPG Key ID: 62530EFBE99DC2F8
6 changed files with 37 additions and 42 deletions

View File

@ -5,8 +5,8 @@ After=taffybar.service
[Service] [Service]
Type=simple Type=simple
ExecStart=/usr/bin/env notifications-tray-icon --github-pass-token github-token ExecStart=/usr/bin/env notifications-tray-icon --github-token-pass github-token
ExecStop=/usr/bin/pkill 'notifications-tray-icon --github-pass-token github-token' ExecStop=/usr/bin/pkill 'notifications-tray-icon --github-token-pass github-token'
[Install] [Install]
WantedBy=wm.target WantedBy=wm.target

View File

@ -1,12 +0,0 @@
[Unit]
Description=KeePassX
Wants=taffybar.service
After=taffybar.service
[Service]
Type=simple
ExecStart=/usr/bin/env keepassxc --keyfile="$HOME/SparkleShare/config/creds/keepass.key" "$HOME/SparkleShare/config/db.kdbx"
ExecStop=/usr/bin/pkill keepassxc
[Install]
WantedBy=wm.target

View File

@ -1,12 +0,0 @@
[Unit]
Description=Keybase
Wants=taffybar.service
After=taffybar.service
[Service]
Type=forking
ExecStart=/usr/bin/env run_keybase
PIDFile=$XDG_RUNTIME_DIR/keybase/keybased.pid
[Install]
WantedBy=wm.target

View File

@ -6,7 +6,7 @@ After=taffybar.service
[Service] [Service]
Type=simple Type=simple
ExecStart=/usr/bin/env pasystray ExecStart=/usr/bin/env pasystray
ExecStop=/usr/bin/pkill pasystray ExecStop=/usr/bin/env pkill pasystray
[Install] [Install]
WantedBy=wm.target WantedBy=wm.target

View File

@ -1,13 +0,0 @@
[Unit]
Description=remmina
Wants=taffybar.service
After=taffybar.service
[Service]
Type=simple
ExecStart=/usr/bin/remmina -i
ExecStop=/usr/bin/pkill remmina
RemainAfterExit=Yes
[Install]
WantedBy=wm.target

View File

@ -52,6 +52,37 @@ let
makeWrapper libtool gnome3.gnome-common makeWrapper libtool gnome3.gnome-common
]; ];
}); });
keybase-gui-fixed = with pkgs; keybase-gui.overrideAttrs (oldAttrs: rec {
installPhase = ''
mkdir -p $out/bin
mv usr/share $out/share
mv opt/keybase $out/share/
cat > $out/bin/keybase-gui <<EOF
#!${stdenv.shell}
checkFailed() {
if [ "\$NIX_SKIP_KEYBASE_CHECKS" = "1" ]; then
return
fi
echo "Set NIX_SKIP_KEYBASE_CHECKS=1 if you want to skip this check." >&2
exit 1
}
if [ ! -S "\$XDG_RUNTIME_DIR/keybase/keybased.sock" ]; then
echo "Keybase service doesn't seem to be running." >&2
echo "You might need to run: keybase service" >&2
checkFailed
fi
if [ -z "\$(keybase status | grep kbfsfuse)" ]; then
echo "Could not find kbfsfuse client in keybase status." >&2
echo "You might need to run: kbfsfuse" >&2
checkFailed
fi
exec $out/share/keybase/Keybase "\$@"
EOF
chmod +x $out/bin/keybase-gui
substituteInPlace $out/share/applications/keybase.desktop \
--replace run_keybase $out/bin/keybase-gui
'';
});
in in
{ {
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
@ -105,7 +136,7 @@ in
kleopatra kleopatra
google-chrome google-chrome
hexchat hexchat
keybase-gui keybase-gui-fixed
kodi kodi
lxappearance lxappearance
rxvt_unicode rxvt_unicode
@ -195,6 +226,7 @@ in
valgrind valgrind
wget wget
wmctrl wmctrl
xorg.xev
zsh zsh
# Nix # Nix
@ -229,6 +261,7 @@ in
userServices = true; userServices = true;
}; };
}; };
services.kbfs.enable = true;
sound.enable = true; sound.enable = true;
hardware.pulseaudio.enable = true; hardware.pulseaudio.enable = true;
@ -242,7 +275,6 @@ in
}; };
windowManager = { windowManager = {
default = "xmonad"; default = "xmonad";
i3.enable = true;
session = [{ session = [{
name = "xmonad"; name = "xmonad";
start = '' start = ''