summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAlan Pearce2019-10-04 16:43:20 +0200
committerAlan Pearce2019-10-04 16:43:20 +0200
commit4c0d444e91bd1a5813123dab93b3397715111913 (patch)
tree83f3eec6c85869bc2dd5593490419d0204ae0f15
parent9dad0ca18a9b689a0e119b33e18fd5bf195c7071 (diff)
downloadnixfiles-4c0d444e91bd1a5813123dab93b3397715111913.tar.lz
nixfiles-4c0d444e91bd1a5813123dab93b3397715111913.tar.zst
nixfiles-4c0d444e91bd1a5813123dab93b3397715111913.zip
Move satoshipay packages to home-manager
-rw-r--r--system/modules/satoshipay.nix25
-rw-r--r--user/modules/satoshipay.nix24
2 files changed, 24 insertions, 25 deletions
diff --git a/system/modules/satoshipay.nix b/system/modules/satoshipay.nix
index 4b648740..9cc5a341 100644
--- a/system/modules/satoshipay.nix
+++ b/system/modules/satoshipay.nix
@@ -22,31 +22,6 @@
     };
   };
 
-  nixpkgs.config.allowUnfree = true;
-
-  environment.variables = {
-    KUBECTX_IGNORE_FZF = "1";
-  };
-  environment.systemPackages = with pkgs; [
-    caddy
-    openssl
-    mongodb-tools
-    pgadmin
-    pgcli
-    s3cmd
-    sops
-    unstable.mkcert
-    unstable.google-cloud-sdk
-    unstable.docker_compose
-    unstable.kubernetes
-    unstable.kubectx
-    unstable.redis-desktop-manager
-    unstable.kubernetes-helm
-    unstable.helmfile
-    unstable.robo3t
-    unstable.slack
-  ];
-
   services.mongodb = {
     enable = true;
     replSetName = "rs0";
diff --git a/user/modules/satoshipay.nix b/user/modules/satoshipay.nix
index ca396aad..99eb22d6 100644
--- a/user/modules/satoshipay.nix
+++ b/user/modules/satoshipay.nix
@@ -10,6 +10,30 @@ in
     ./javascript.nix
   ];
 
+  systemd.user.sessionVariables = {
+    KUBECTX_IGNORE_FZF = "1";
+  };
+  home.packages = with pkgs; [
+    caddy
+    openssl
+    mongodb-tools
+    pgadmin
+    pgcli
+    s3cmd
+    sops
+
+    unstable.mkcert
+    unstable.google-cloud-sdk
+    unstable.docker_compose
+    unstable.kubernetes
+    unstable.kubectx
+    unstable.redis-desktop-manager
+    unstable.kubernetes-helm
+    unstable.helmfile
+    unstable.robo3t
+    unstable.slack
+  ];
+
   programs.git.includes = [
     {
       condition = "gitdir:~/projects/github.com/satoshipay/";