From 45f1b865f4364c60a3f0f83db1cadd98e26b0edb Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Wed, 11 Jul 2018 20:14:18 -0700 Subject: [PATCH 1/6] [NixOS] Enable kbfs filesystem --- dotfiles/config/systemd/user/keybase.service | 12 ------------ nixos/configuration.nix | 1 + 2 files changed, 1 insertion(+), 12 deletions(-) delete mode 100644 dotfiles/config/systemd/user/keybase.service diff --git a/dotfiles/config/systemd/user/keybase.service b/dotfiles/config/systemd/user/keybase.service deleted file mode 100644 index fe30c2bb..00000000 --- a/dotfiles/config/systemd/user/keybase.service +++ /dev/null @@ -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 diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 06e8665e..dbc8bc13 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -229,6 +229,7 @@ in userServices = true; }; }; + services.kbfs.enable = true; sound.enable = true; hardware.pulseaudio.enable = true; From f227b82d387c581bbaec7a541ad7c813c2a48901 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Wed, 11 Jul 2018 20:14:53 -0700 Subject: [PATCH 2/6] [NixOS] Add xev --- nixos/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/configuration.nix b/nixos/configuration.nix index dbc8bc13..cd7cc96b 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -195,6 +195,7 @@ in valgrind wget wmctrl + xorg.xev zsh # Nix From 191b68bf6921eabc28c3f4fbf961d7ad5e99b4d1 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Wed, 11 Jul 2018 20:28:41 -0700 Subject: [PATCH 3/6] [NixOS] Fix keybase gui --- nixos/configuration.nix | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/nixos/configuration.nix b/nixos/configuration.nix index cd7cc96b..a672d225 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -52,6 +52,37 @@ let 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 <&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 { nixpkgs.config.allowUnfree = true; @@ -105,7 +136,7 @@ in kleopatra google-chrome hexchat - keybase-gui + keybase-gui-fixed kodi lxappearance rxvt_unicode From 6599b4e7f30dbb39f689125c8f8cb14673e2d3ed Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Wed, 11 Jul 2018 20:28:50 -0700 Subject: [PATCH 4/6] [NixOS] Disable i3 --- nixos/configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/configuration.nix b/nixos/configuration.nix index a672d225..b2d7c219 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -275,7 +275,6 @@ in }; windowManager = { default = "xmonad"; - i3.enable = true; session = [{ name = "xmonad"; start = '' From 38fba84c1aa5c29d0d76ee4a8e58c555e883b84a Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Wed, 11 Jul 2018 20:29:15 -0700 Subject: [PATCH 5/6] [Linux] Delete keepass service --- dotfiles/config/systemd/user/keepassx.service | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 dotfiles/config/systemd/user/keepassx.service diff --git a/dotfiles/config/systemd/user/keepassx.service b/dotfiles/config/systemd/user/keepassx.service deleted file mode 100644 index f1e75228..00000000 --- a/dotfiles/config/systemd/user/keepassx.service +++ /dev/null @@ -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 From de20cd94c668e221e0c535f630d7ea0ce9f41661 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Wed, 11 Jul 2018 20:30:35 -0700 Subject: [PATCH 6/6] [Linux] Service cleanup --- .../systemd/user/github-notifications.service | 4 ++-- dotfiles/config/systemd/user/pasystray.service | 2 +- dotfiles/config/systemd/user/remmina.service | 13 ------------- 3 files changed, 3 insertions(+), 16 deletions(-) delete mode 100644 dotfiles/config/systemd/user/remmina.service diff --git a/dotfiles/config/systemd/user/github-notifications.service b/dotfiles/config/systemd/user/github-notifications.service index 2fac459d..3f26ee3a 100644 --- a/dotfiles/config/systemd/user/github-notifications.service +++ b/dotfiles/config/systemd/user/github-notifications.service @@ -5,8 +5,8 @@ After=taffybar.service [Service] Type=simple -ExecStart=/usr/bin/env notifications-tray-icon --github-pass-token github-token -ExecStop=/usr/bin/pkill '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-token-pass github-token' [Install] WantedBy=wm.target diff --git a/dotfiles/config/systemd/user/pasystray.service b/dotfiles/config/systemd/user/pasystray.service index 16c0c5c9..3997b938 100644 --- a/dotfiles/config/systemd/user/pasystray.service +++ b/dotfiles/config/systemd/user/pasystray.service @@ -6,7 +6,7 @@ After=taffybar.service [Service] Type=simple ExecStart=/usr/bin/env pasystray -ExecStop=/usr/bin/pkill pasystray +ExecStop=/usr/bin/env pkill pasystray [Install] WantedBy=wm.target diff --git a/dotfiles/config/systemd/user/remmina.service b/dotfiles/config/systemd/user/remmina.service deleted file mode 100644 index f6d497ca..00000000 --- a/dotfiles/config/systemd/user/remmina.service +++ /dev/null @@ -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