From 36bf7e247eeaf17502f12ae9bb113ebc7bca03b2 Mon Sep 17 00:00:00 2001 From: kat witch Date: Wed, 28 Apr 2021 04:22:16 +0100 Subject: [PATCH] profiles/gui: Migrated things into private, home nixdirfmt --- home.nix | 3 ++- profiles/gui/home/email.nix | 4 ---- profiles/gui/home/packages.nix | 8 +------- profiles/gui/home/weechat.nix | 9 --------- 4 files changed, 3 insertions(+), 21 deletions(-) diff --git a/home.nix b/home.nix index d504ccf9..11fdd808 100644 --- a/home.nix +++ b/home.nix @@ -2,6 +2,7 @@ { imports = [ ./modules/home ] - ++ lib.optional (builtins.pathExists (./private/profile/home)) (import ./private/profile/home); + ++ lib.optional (builtins.pathExists (./private/profile/home)) + (import ./private/profile/home); } diff --git a/profiles/gui/home/email.nix b/profiles/gui/home/email.nix index 99395937..78178048 100644 --- a/profiles/gui/home/email.nix +++ b/profiles/gui/home/email.nix @@ -14,10 +14,6 @@ primary = true; realName = "kat witch"; userName = "kat@kittywit.ch"; - passwordCommand = '' - ${pkgs.arc.pkgs.rbw-bitw}/bin/bitw -p gpg://${ - ../../../private/files/bitw/master.gpg - } get "email/kittywitch"''; msmtp.enable = true; mbsync.enable = true; mbsync.create = "maildir"; diff --git a/profiles/gui/home/packages.nix b/profiles/gui/home/packages.nix index 1b6da590..fb7be929 100644 --- a/profiles/gui/home/packages.nix +++ b/profiles/gui/home/packages.nix @@ -1,15 +1,9 @@ { config, lib, pkgs, ... }: -let - bitw = pkgs.writeShellScriptBin "bitw" '' - ${pkgs.arc.pkgs.rbw-bitw}/bin/bitw -p gpg://${ - ../../../private/files/bitw/master.gpg - } "$@"''; -in { +{ home.packages = with pkgs; [ _1password bitwarden - bitw wire-desktop element-desktop wf-recorder diff --git a/profiles/gui/home/weechat.nix b/profiles/gui/home/weechat.nix index c3678743..ace4914b 100644 --- a/profiles/gui/home/weechat.nix +++ b/profiles/gui/home/weechat.nix @@ -57,15 +57,6 @@ plugins.var.python.title.title_suffix = " ]"; plugins.var.python.notify_send.icon = ""; plugins.var.python.go.short_name = true; - sec = { - crypt = { - passphrase_command = '' - ${pkgs.rbw-bitw}/bin/bitw -p gpg://${ - ../../../private/files/bitw/master.gpg - } get "comms/weechat"''; - hash_algo = "sha512"; - }; - }; irc = { look = { server_buffer = "independent"; }; server = {