From 2904502b4b9caac7938734b6c21bb71391743b82 Mon Sep 17 00:00:00 2001
From: David Morgan <djm_uk@protonmail.com>
Date: Sat, 22 Oct 2022 14:37:23 +0100
Subject: [PATCH] Tweak home-manager config

---
 nix-conf/home/common.nix       | 18 ------------------
 nix-conf/home/darwin.nix       |  2 +-
 nix-conf/home/dev-common.nix   | 31 +++++++++++++++++++++++++++++++
 nix-conf/home/djmuk1.nix       |  1 -
 nix-conf/home/egalmoth.nix     |  1 -
 nix-conf/home/linux-dev.nix    |  2 +-
 nix-conf/home/linux-server.nix | 16 ++++++++++------
 nix-conf/home/otm.nix          |  1 -
 8 files changed, 43 insertions(+), 29 deletions(-)
 create mode 100644 nix-conf/home/dev-common.nix

diff --git a/nix-conf/home/common.nix b/nix-conf/home/common.nix
index da161a6..b294601 100644
--- a/nix-conf/home/common.nix
+++ b/nix-conf/home/common.nix
@@ -15,8 +15,6 @@
     broot
     curl
     difftastic
-    #docker
-    #docker-compose
     duf
     du-dust
     elinks
@@ -26,16 +24,12 @@
     git
     gnupg
     gopass
-    gopass-jsonapi
     ispell
     isync
     jq
     lscolors
     lsd
     lynx
-    mpv
-    mu
-    neovim
     nixfmt
     nix-info
     nix-prefetch-git
@@ -55,17 +49,5 @@
   ];
 
   programs.gpg.enable = true;
-  programs.tmux = {
-    enable = true;
-    terminal = "screen-256color";
-    #tmuxp.enable = true;
-    extraConfig = ''
-      set-option -g status-bg '#666666'
-      set-option -g status-fg '#aaaaaa'
-      set-option -g status-left-length 50
-      set-option -g status-right " #(date ''\'+%a, %b %d - %I:%M''\') "
-    '';
-  };
-
 }
 
diff --git a/nix-conf/home/darwin.nix b/nix-conf/home/darwin.nix
index 735b80d..d1b0d05 100644
--- a/nix-conf/home/darwin.nix
+++ b/nix-conf/home/darwin.nix
@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 {
   imports = [
-    ./clojure.nix
+    ./dev-common.nix
   ];
 
   home.packages = with pkgs; [
diff --git a/nix-conf/home/dev-common.nix b/nix-conf/home/dev-common.nix
new file mode 100644
index 0000000..da3665c
--- /dev/null
+++ b/nix-conf/home/dev-common.nix
@@ -0,0 +1,31 @@
+{ config, pkgs, ... }:
+{
+
+  imports = [
+    ./common.nix
+    ./clojure.nix
+  ];
+
+  home.packages = with pkgs; [
+    docker
+    docker-compose
+    gopass-jsonapi
+    mpv
+    mu
+    neovim
+  ];
+
+  programs.tmux = {
+    enable = true;
+    terminal = "screen-256color";
+    #tmuxp.enable = true;
+    extraConfig = ''
+      set-option -g status-bg '#666666'
+      set-option -g status-fg '#aaaaaa'
+      set-option -g status-left-length 50
+      set-option -g status-right " #(date ''\'+%a, %b %d - %I:%M''\') "
+    '';
+  };
+
+}
+
diff --git a/nix-conf/home/djmuk1.nix b/nix-conf/home/djmuk1.nix
index 2d3a474..fa918f6 100644
--- a/nix-conf/home/djmuk1.nix
+++ b/nix-conf/home/djmuk1.nix
@@ -1,7 +1,6 @@
 { config, pkgs, ... }:
 {
   imports = [ 
-    ./common.nix
     ./linux-server.nix
   ];
 
diff --git a/nix-conf/home/egalmoth.nix b/nix-conf/home/egalmoth.nix
index bbf090c..c7e3827 100644
--- a/nix-conf/home/egalmoth.nix
+++ b/nix-conf/home/egalmoth.nix
@@ -1,7 +1,6 @@
 { config, pkgs, ... }:
 {
   imports = [ 
-    ./common.nix
     ./linux-dev.nix
   ];
 
diff --git a/nix-conf/home/linux-dev.nix b/nix-conf/home/linux-dev.nix
index 9fc4f05..b2c6885 100644
--- a/nix-conf/home/linux-dev.nix
+++ b/nix-conf/home/linux-dev.nix
@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 {
   imports = [
-    ./clojure.nix
+    ./dev-common.nix
   ];
   #services.emacs.package = pkgs.emacsUnstable;
 
diff --git a/nix-conf/home/linux-server.nix b/nix-conf/home/linux-server.nix
index e8136a8..7006350 100644
--- a/nix-conf/home/linux-server.nix
+++ b/nix-conf/home/linux-server.nix
@@ -1,12 +1,16 @@
 { config, pkgs, ... }:
 {
-
-  home.packages = with pkgs; [
-    bitlbee
-    bitlbee-discord
-    emacs-nox
-    irssi
+  imports = [
+    ./common.nix
   ];
 
+  home.packages = with pkgs; [
+    emacs-nox
+    irssi
+    msmtp
+    neomutt
+  ];
+
+  ## TODO tmux
 }
 
diff --git a/nix-conf/home/otm.nix b/nix-conf/home/otm.nix
index c3abe20..f471588 100644
--- a/nix-conf/home/otm.nix
+++ b/nix-conf/home/otm.nix
@@ -1,7 +1,6 @@
 { config, pkgs, ... }:
 {
   imports = [ 
-    ./common.nix
     ./darwin.nix
   ];