summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAlan Pearce2019-10-05 18:01:57 +0200
committerAlan Pearce2019-10-05 18:01:57 +0200
commit22f3225547ae0dce900a1cd39f5ccce29e9552ed (patch)
treeaedd3c3eea249ec97f68f138b35777c72b79b7a8
parentc3a2956e94cfec917ed289ee18781d78dc7be6a9 (diff)
downloadnixfiles-22f3225547ae0dce900a1cd39f5ccce29e9552ed.tar.lz
nixfiles-22f3225547ae0dce900a1cd39f5ccce29e9552ed.tar.zst
nixfiles-22f3225547ae0dce900a1cd39f5ccce29e9552ed.zip
Move password module to user
-rw-r--r--system/marvin.nix1
-rw-r--r--system/modules/user-interface.nix2
-rw-r--r--system/prefect.nix1
-rw-r--r--system/satoshipad.nix1
-rw-r--r--user/modules/passwords.nix (renamed from system/modules/programs/passwords.nix)1
-rw-r--r--user/prefect.nix1
-rw-r--r--user/satoshipad.nix1
7 files changed, 3 insertions, 5 deletions
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/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/system/modules/programs/passwords.nix b/user/modules/passwords.nix
index 094ad29e..b3fbddc3 100644
--- a/system/modules/programs/passwords.nix
+++ b/user/modules/passwords.nix
@@ -4,6 +4,7 @@
     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