some adjustments to per-platform config

5 files changed, 20 insertions, 20 deletions

diff --git a/home/machines/chupacabra.nix b/home/machines/chupacabra.nix
index 69d1c604a6..06b0d21567 100644
--- a/home/machines/chupacabra.nix
+++ b/home/machines/chupacabra.nix
@@ -4,12 +4,16 @@ let
 in {
   imports = [
     ../platforms/linux.nix
-
     ../modules/common.nix
     ../modules/games.nix
     ../modules/rtlsdr.nix
+
+    ~/code/urb/urbos/home
   ];
 
+  # for when hacking
+  programs.home-manager.path = "/home/grfn/code/home-manager";
+
   system.machine = {
     wirelessInterface = "wlp59s0";
     i3FontSize = 9;
@@ -36,4 +40,6 @@ in {
       );
     };
   };
+
+  urbint.projectPath = "code/urb";
 }
diff --git a/home/modules/common.nix b/home/modules/common.nix
index ad712a335b..72107a459f 100644
--- a/home/modules/common.nix
+++ b/home/modules/common.nix
@@ -1,5 +1,7 @@
 { config, lib, pkgs, ... }:
 
+# Everything in here needs to work on linux or darwin
+
 {
   imports = [
     ../modules/shell.nix
@@ -7,17 +9,23 @@
     ../modules/emacs.nix
     ../modules/vim.nix
     ../modules/tarsnap.nix
+    ../modules/lib/cloneRepo.nix
   ];
 
   nixpkgs.config.allowUnfree = true;
+
   programs.password-store.enable = true;
 
-  impure.clonedRepos.passwordStore = {
+  grfn.impure.clonedRepos.passwordStore = {
     github = "glittershark/pass";
     path = ".local/share/password-store";
   };
 
+  urbint.projectPath = "code/urb";
+
   home.packages = with pkgs; [
+    # System utilities
+    bat
     htop
     killall
     bind
@@ -25,6 +33,7 @@
     tree
     ncat
 
+    # Security
     gnupg
     keybase
     openssl
diff --git a/home/modules/emacs.nix b/home/modules/emacs.nix
index 2a4babf5e1..b6b8994638 100644
--- a/home/modules/emacs.nix
+++ b/home/modules/emacs.nix
@@ -52,7 +52,7 @@ in {
         package = pkgs.emacsUnstable;
       };
 
-      impure.clonedRepos = {
+      grfn.impure.clonedRepos = {
         orgClubhouse = {
           github = "glittershark/org-clubhouse";
           path = "code/org-clubhouse";
diff --git a/home/modules/lib/cloneRepo.nix b/home/modules/lib/cloneRepo.nix
index 3f39ad57bd..dc487dc6bd 100644
--- a/home/modules/lib/cloneRepo.nix
+++ b/home/modules/lib/cloneRepo.nix
@@ -2,7 +2,7 @@
 with lib;
 {
   options = {
-    impure.clonedRepos = mkOption {
+    grfn.impure.clonedRepos = mkOption {
       description = "Repositories to clone";
       default = {};
       type = with types; loaOf (
@@ -62,6 +62,6 @@ with lib;
             popd
           fi
         '')
-      config.impure.clonedRepos;
+      config.grfn.impure.clonedRepos;
   };
 }
diff --git a/home/platforms/linux.nix b/home/platforms/linux.nix
index b49193442b..0b95241cbd 100644
--- a/home/platforms/linux.nix
+++ b/home/platforms/linux.nix
@@ -14,10 +14,6 @@
     ../modules/shell.nix
     ../modules/tarsnap.nix
     ../modules/vim.nix
-
-    ~/code/urb/urbos/home
-
-    machine
   ];
 
   xsession.enable = true;
@@ -61,10 +57,6 @@
     playerctl
   ];
 
-  nixpkgs.config.allowUnfree = true;
-
-  programs.password-store.enable = true;
-
   services.redshift = {
     enable = true;
     provider = "geoclue2";
@@ -72,13 +64,6 @@
 
   services.pasystray.enable = true;
 
-  impure.clonedRepos.passwordStore = {
-    github = "glittershark/pass";
-    path = ".local/share/password-store";
-  };
-
-  urbint.projectPath = "code/urb";
-
   services.gpg-agent = {
     enable = true;
   };