summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--system/marvin.nix1
-rw-r--r--system/modules/programs/dotfiles.nix13
-rw-r--r--system/prefect.nix1
-rw-r--r--system/satoshipad.nix1
-rw-r--r--system/trillian.nix1
-rw-r--r--user/modules/zsh.nix8
6 files changed, 8 insertions, 17 deletions
diff --git a/system/marvin.nix b/system/marvin.nix
index 6c2e4f28..8f070734 100644
--- a/system/marvin.nix
+++ b/system/marvin.nix
@@ -20,7 +20,6 @@
     ./modules/hardware/trezor.nix
     ./modules/machines/x250.nix
     ./modules/programs/accounting.nix
-    ./modules/programs/dotfiles.nix
     ./modules/programs/i3.nix
     ./modules/programs/infrastructure.nix
     ./modules/programs/passwords.nix
diff --git a/system/modules/programs/dotfiles.nix b/system/modules/programs/dotfiles.nix
deleted file mode 100644
index 2fb66306..00000000
--- a/system/modules/programs/dotfiles.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ config, pkgs, ... }:
-
-{ environment.systemPackages = with pkgs; [
-    fzf
-    ghq
-  ] ++ (
-    if stdenv.isDarwin
-    then [
-    ] else [
-      git
-    ]
-  );
-}
diff --git a/system/prefect.nix b/system/prefect.nix
index dc423d28..78fd68d6 100644
--- a/system/prefect.nix
+++ b/system/prefect.nix
@@ -20,7 +20,6 @@
     ./modules/services/zeroconf.nix
     ./modules/user-interface.nix
     ./modules/programs/accounting.nix
-    ./modules/programs/dotfiles.nix
     ./modules/programs/gnupg.nix
     ./modules/programs/keybase.nix
     ./modules/programs/i3.nix
diff --git a/system/satoshipad.nix b/system/satoshipad.nix
index 2a584fbe..183393fc 100644
--- a/system/satoshipad.nix
+++ b/system/satoshipad.nix
@@ -19,7 +19,6 @@
     ./modules/hardware/trackball.nix
     ./modules/hardware/trezor.nix
     ./modules/machines/t470s.nix
-    ./modules/programs/dotfiles.nix
     ./modules/programs/gnupg.nix
     ./modules/programs/keybase.nix
     ./modules/programs/tor.nix
diff --git a/system/trillian.nix b/system/trillian.nix
index 965e3345..93ad41e1 100644
--- a/system/trillian.nix
+++ b/system/trillian.nix
@@ -6,7 +6,6 @@
 
     ./modules/development/base.nix
     ./modules/programs/accounting.nix
-    ./modules/programs/dotfiles.nix
     ./modules/programs/shell.nix
   ];
 
diff --git a/user/modules/zsh.nix b/user/modules/zsh.nix
index 28e82293..be545635 100644
--- a/user/modules/zsh.nix
+++ b/user/modules/zsh.nix
@@ -5,6 +5,14 @@
     ".rm_recycle_home".text = ""; # use trash automatically in home directory
     ".zshenv".text = builtins.readFile ../zsh/.zshenv;
   };
+  home.packages = with pkgs; [
+    fzf
+    ghq
+  ] ++ (if stdenv.isDarwin
+  then []
+  else [
+    pkgs.git
+  ]);
   xdg.configFile.zsh = {
     recursive = true;
     source = ../zsh/.config/zsh;