nix/{os,home-manager}: cleanup

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
 

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
   ]); 
 }

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
+      ]);
 }

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";
-      };
-    };
-  };
 }

nix/home-manager/programs/pass.nix

@@ -19,6 +19,7 @@
     pass-otp
     qtpass
     rofi-pass
+    gnupg
   ];
 }
 

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;
 }