From 6eb9f334d2fd18318bfa7234d96464127497848a Mon Sep 17 00:00:00 2001
From: Matthew Ess <mat@mat.services>
Date: Sun, 10 Jan 2021 23:29:23 -0500
Subject: [PATCH] More more

---
 hm-configs/files-all.nix | 41 ++++++++++++++++++++++++++++++++++++++++
 hm-configs/files.nix     | 39 --------------------------------------
 users/mat-hm-laptop.nix  |  1 -
 users/mat-hm.nix         |  3 +++
 4 files changed, 44 insertions(+), 40 deletions(-)
 create mode 100644 hm-configs/files-all.nix

diff --git a/hm-configs/files-all.nix b/hm-configs/files-all.nix
new file mode 100644
index 0000000..7113832
--- /dev/null
+++ b/hm-configs/files-all.nix
@@ -0,0 +1,41 @@
+{
+  ".config/fish/fishfile".text = ''
+    laughedelic/pisces
+    joehillen/to-fish
+    jethrokuan/z
+    decors/fish-colored-man
+    franciscolourenco/done
+    haslersn/fish-nix-completions
+    gyakovlev/fish-fzy
+    joseluisq/gitnow
+    edc/bass
+    fishpkg/fish-get
+    fishpkg/fish-spin
+    oh-my-fish/plugin-bang-bang
+    fishpkg/fish-humanize-duration
+    jorgebucaran/fish-getopts
+    matthewess/fish-autovenv
+  '';
+  ".config/fish/completions/pijul.fish".source = ../assets/pijul.fish;
+  ".config/fish/completions/systemctl.fish".source = ../assets/systemctl.fish;
+  ".config/fish/functions/colortest.fish".source = ../assets/colortest.fish;
+  ".config/fish/functions/mkdcd.fish".text = ''
+    function mkdcd -a target
+      mkdir $target
+      cd $target
+    end
+  '';
+  ".config/fish/functions/unz.fish".text = ''
+    function unz -a target
+      # strip extensions
+      string match \*.zip $target; and set target (string split -r -m1 . $target)[1]
+      unzip -d $target $target
+    end
+  '';
+  ".config/pijul/config.toml".text = ''
+    [author]
+    name = "mat"
+    full_name = "mat"
+    email = "mat@mat.services"
+  '';
+}
diff --git a/hm-configs/files.nix b/hm-configs/files.nix
index 62ec028..be18d33 100644
--- a/hm-configs/files.nix
+++ b/hm-configs/files.nix
@@ -1,26 +1,6 @@
 {
   ".background-image".source = ../assets/background-image;
   ".lockscreen-image".source = ../assets/lockscreen-image;
-  ".config/fish/fishfile".text = ''
-    laughedelic/pisces
-    joehillen/to-fish
-    jethrokuan/z
-    decors/fish-colored-man
-    franciscolourenco/done
-    haslersn/fish-nix-completions
-    gyakovlev/fish-fzy
-    joseluisq/gitnow
-    edc/bass
-    fishpkg/fish-get
-    fishpkg/fish-spin
-    oh-my-fish/plugin-bang-bang
-    fishpkg/fish-humanize-duration
-    jorgebucaran/fish-getopts
-    matthewess/fish-autovenv
-  '';
-  ".config/fish/completions/pijul.fish".source = ../assets/pijul.fish;
-  ".config/fish/completions/systemctl.fish".source = ../assets/systemctl.fish;
-  ".config/fish/functions/colortest.fish".source = ../assets/colortest.fish;
   ".config/fish/functions/kbl.fish".text = ''
     function kbl -a level
       set -l initial (cat /sys/class/leds/tpacpi\:\:kbd_backlight/brightness)
@@ -28,19 +8,6 @@
       echo $level > /sys/class/leds/tpacpi\:\:kbd_backlight/brightness
     end
   '';
-  ".config/fish/functions/mkdcd.fish".text = ''
-    function mkdcd -a target
-      mkdir $target
-      cd $target
-    end
-  '';
-  ".config/fish/functions/unz.fish".text = ''
-    function unz -a target
-      # strip extensions
-      string match \*.zip $target; and set target (string split -r -m1 . $target)[1]
-      unzip -d $target $target
-    end
-  '';
   ".config/i3status.toml".source = ../assets/i3status.toml;
   ".config/kitty/kitty.conf".text = ''
     font_family Fira Code Regular
@@ -50,10 +17,4 @@
   '';
   ".config/kitty/theme.conf".source = ../assets/kitty-theme.conf;
   ".config/rofi/theme.rasi".source = ../assets/sidetab.rasi;
-  ".config/pijul/config.toml".text = ''
-    [author]
-    name = "mat"
-    full_name = "mat"
-    email = "mat@mat.services"
-  '';
 }
diff --git a/users/mat-hm-laptop.nix b/users/mat-hm-laptop.nix
index 8998dbf..8c53ad6 100644
--- a/users/mat-hm-laptop.nix
+++ b/users/mat-hm-laptop.nix
@@ -65,7 +65,6 @@ in {
       fish = import ../hm-configs/fish.nix { inherit pkgs; };
 
       jq.enable = true;
-      neovim = import ../hm-configs/neovim.nix { inherit pkgs; };
       rofi = {
         enable = true;
         font = "Fira Code 14";
diff --git a/users/mat-hm.nix b/users/mat-hm.nix
index 2793064..c4efeb6 100644
--- a/users/mat-hm.nix
+++ b/users/mat-hm.nix
@@ -25,6 +25,7 @@ in {
         pijul
         mullvad-vpn
       ];
+      file = import ../hm-configs/files-all.nix;
     };
 
     programs = {
@@ -89,6 +90,7 @@ in {
       };
 
       man.enable = true;
+      neovim = import ../hm-configs/neovim.nix { inherit pkgs; };
 
       ssh = {
         enable = true;
@@ -106,6 +108,7 @@ in {
         baseIndex = 1;
       };
     };
+
     services = { lorri.enable = true; };
 
   };