From 3316605df5662727841c5951625ce80399166dff Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Sat, 3 Nov 2018 19:33:58 +0100
Subject: [PATCH] nix/{os,home-manager}: cleanup

---
 .../configuration/graphical-removable.nix             | 11 -----------
 nix/home-manager/configuration/text-minimal.txt       |  7 -------
 nix/home-manager/profiles/common.nix                  |  8 ++++++++
 nix/home-manager/profiles/nix-channels.nix            | 10 ----------
 nix/home-manager/programs/pass.nix                    |  1 +
 nix/os/profiles/removable-medium/pkg.nix              |  6 +-----
 6 files changed, 10 insertions(+), 33 deletions(-)

diff --git a/nix/home-manager/configuration/graphical-removable.nix b/nix/home-manager/configuration/graphical-removable.nix
index f09788f..a9cc11a 100644
--- a/nix/home-manager/configuration/graphical-removable.nix
+++ b/nix/home-manager/configuration/graphical-removable.nix
@@ -60,23 +60,13 @@ in {
 
   home.packages =
     [] ++ (with pkgs; [
-      # Authentication
-      cacert
-      fprintd
-      openssl
-      mkpasswd
-
       # Nix package related tools
       patchelf
       nix-index
       nix-prefetch-scripts
 
       # Version Control Systems
-      git-crypt
-      gitFull
       gitless
-      mr
-      gitRepo
 
       # Process/System Administration
       htop
@@ -96,7 +86,6 @@ in {
       lzop
 
       # Password Management
-      gnupg
       gnome3.gnome_keyring
       gnome3.seahorse
 
diff --git a/nix/home-manager/configuration/text-minimal.txt b/nix/home-manager/configuration/text-minimal.txt
index 51d3e57..42bb7e8 100644
--- a/nix/home-manager/configuration/text-minimal.txt
+++ b/nix/home-manager/configuration/text-minimal.txt
@@ -22,12 +22,5 @@ in {
 
   home.packages = []
     ++ (with pkgs; [
-      # Authentication
-      mkpasswd
-
-      # Version Control Systems
-      git-crypt
-      gitFull
-      mr
   ]); 
 }
diff --git a/nix/home-manager/profiles/common.nix b/nix/home-manager/profiles/common.nix
index ddfd3c7..8fa49be 100644
--- a/nix/home-manager/profiles/common.nix
+++ b/nix/home-manager/profiles/common.nix
@@ -47,4 +47,12 @@ in {
 
   programs.command-not-found.enable = true;
   programs.fzf.enable = true;
+
+  home.packages =
+    [] ++ (with pkgs; [
+      # Authentication
+      cacert
+      openssl
+      mkpasswd
+      ]);
 }
diff --git a/nix/home-manager/profiles/nix-channels.nix b/nix/home-manager/profiles/nix-channels.nix
index e038319..d8ac0b7 100644
--- a/nix/home-manager/profiles/nix-channels.nix
+++ b/nix/home-manager/profiles/nix-channels.nix
@@ -21,14 +21,4 @@ in {
     fi
     ''};
   '';
-
-  nixpkgs.config = {
-
-    packageOverrides = pkgs: with pkgs; {
-      homeshick = builtins.fetchGit {
-        url = "https://github.com/andsens/homeshick.git";
-        ref = "master";
-      };
-    };
-  };
 }
diff --git a/nix/home-manager/programs/pass.nix b/nix/home-manager/programs/pass.nix
index 78eb69f..39cdb19 100644
--- a/nix/home-manager/programs/pass.nix
+++ b/nix/home-manager/programs/pass.nix
@@ -19,6 +19,7 @@
     pass-otp
     qtpass
     rofi-pass
+    gnupg
   ];
 }
 
diff --git a/nix/os/profiles/removable-medium/pkg.nix b/nix/os/profiles/removable-medium/pkg.nix
index 25e09ff..fa43b2e 100644
--- a/nix/os/profiles/removable-medium/pkg.nix
+++ b/nix/os/profiles/removable-medium/pkg.nix
@@ -1,11 +1,7 @@
-{ 
+{
 ...
 }:
 
 {
-  imports = [
-    "${builtins.fetchGit { url = "https://github.com/rycee/home-manager.git"; ref = "master"; }}/nixos"
-  ];
-  
   home-manager.users.steveej = import ../../../home-manager/configuration/graphical-removable.nix;
 }