From 22f3225547ae0dce900a1cd39f5ccce29e9552ed Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Sat, 5 Oct 2019 18:01:57 +0200
Subject: Move password module to user

---
 system/marvin.nix                     |  1 -
 system/modules/programs/passwords.nix |  9 ---------
 system/modules/user-interface.nix     |  2 --
 system/prefect.nix                    |  1 -
 system/satoshipad.nix                 |  1 -
 user/modules/passwords.nix            | 10 ++++++++++
 user/prefect.nix                      |  1 +
 user/satoshipad.nix                   |  1 +
 8 files changed, 12 insertions(+), 14 deletions(-)
 delete mode 100644 system/modules/programs/passwords.nix
 create mode 100644 user/modules/passwords.nix

diff --git a/system/marvin.nix b/system/marvin.nix
index e13a7d6a..c8b46085 100644
--- a/system/marvin.nix
+++ b/system/marvin.nix
@@ -20,7 +20,6 @@
     ./modules/programs/accounting.nix
     ./modules/programs/i3.nix
     ./modules/programs/infrastructure.nix
-    ./modules/programs/passwords.nix
     ./modules/programs/shell.nix
     ./modules/services/syncthing.nix
   ];
diff --git a/system/modules/programs/passwords.nix b/system/modules/programs/passwords.nix
deleted file mode 100644
index 094ad29e..00000000
--- a/system/modules/programs/passwords.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ config, pkgs, ... }:
-
-{ environment.systemPackages = with pkgs.unstable; [
-    keepassx-community
-    rofi-pass
-    pass
-    pwgen
-  ];
-}
diff --git a/system/modules/user-interface.nix b/system/modules/user-interface.nix
index 4cc600d4..d25a9176 100644
--- a/system/modules/user-interface.nix
+++ b/system/modules/user-interface.nix
@@ -30,8 +30,6 @@
 
     weechat
 
-    unstable.pass-otp
-
     mpv
 
     mosh
diff --git a/system/prefect.nix b/system/prefect.nix
index 14a86c9a..d375b3c0 100644
--- a/system/prefect.nix
+++ b/system/prefect.nix
@@ -22,7 +22,6 @@
     ./modules/programs/keybase.nix
     ./modules/programs/i3.nix
     ./modules/programs/infrastructure.nix
-    ./modules/programs/passwords.nix
     ./modules/programs/shell.nix
     ./modules/gaming.nix
     ./modules/programs/tor.nix
diff --git a/system/satoshipad.nix b/system/satoshipad.nix
index 98849c35..e910859d 100644
--- a/system/satoshipad.nix
+++ b/system/satoshipad.nix
@@ -23,7 +23,6 @@
     ./modules/programs/tor.nix
     ./modules/programs/i3.nix
     ./modules/programs/infrastructure.nix
-    ./modules/programs/passwords.nix
     ./modules/programs/shell.nix
     ./modules/satoshipay.nix
   ];
diff --git a/user/modules/passwords.nix b/user/modules/passwords.nix
new file mode 100644
index 00000000..b3fbddc3
--- /dev/null
+++ b/user/modules/passwords.nix
@@ -0,0 +1,10 @@
+{ config, pkgs, ... }:
+
+{ environment.systemPackages = with pkgs.unstable; [
+    keepassx-community
+    rofi-pass
+    pass
+    pass-otp
+    pwgen
+  ];
+}
diff --git a/user/prefect.nix b/user/prefect.nix
index 8a21b04a..0e0a3a1f 100644
--- a/user/prefect.nix
+++ b/user/prefect.nix
@@ -13,6 +13,7 @@
     ./modules/javascript.nix
     ./modules/nixos.nix
     ./modules/rofi.nix
+    ./modules/passwords.nix
     ./modules/satoshipay.nix
     ./modules/sxhkd.nix
     ./modules/tabnine.nix
diff --git a/user/satoshipad.nix b/user/satoshipad.nix
index e76693d2..4ccccb30 100644
--- a/user/satoshipad.nix
+++ b/user/satoshipad.nix
@@ -15,6 +15,7 @@
     ./modules/msmtp.nix
     ./modules/nixos.nix
     ./modules/rofi.nix
+    ./modules/passwords.nix
     ./modules/satoshipay.nix
     ./modules/sxhkd.nix
     ./modules/tabnine.nix
-- 
cgit 1.4.1