From d897b364c6c55e7ccedb6f0b7f7420684b745c8a Mon Sep 17 00:00:00 2001
From: Timothy DeHerrera <tim.deh@pm.me>
Date: Tue, 4 Aug 2020 13:44:11 -0600
Subject: [PATCH] profiles: reorganize

---
 profiles/{ => db}/postgres/default.nix            |  0
 profiles/graphical/default.nix                    |  2 +-
 profiles/{misc => graphical}/plex.nix             |  0
 profiles/list.nix                                 | 13 ++++++++++++-
 profiles/misc/default.nix                         |  1 -
 profiles/{misc => network}/adblocking.nix         |  0
 profiles/network/default.nix                      |  3 +++
 profiles/{ => network}/networkmanager/default.nix |  3 ---
 profiles/{misc => network}/stubby.nix             |  0
 profiles/{misc => network}/torrent.nix            |  0
 10 files changed, 16 insertions(+), 6 deletions(-)
 rename profiles/{ => db}/postgres/default.nix (100%)
 rename profiles/{misc => graphical}/plex.nix (100%)
 delete mode 100644 profiles/misc/default.nix
 rename profiles/{misc => network}/adblocking.nix (100%)
 create mode 100644 profiles/network/default.nix
 rename profiles/{ => network}/networkmanager/default.nix (92%)
 rename profiles/{misc => network}/stubby.nix (100%)
 rename profiles/{misc => network}/torrent.nix (100%)

diff --git a/profiles/postgres/default.nix b/profiles/db/postgres/default.nix
similarity index 100%
rename from profiles/postgres/default.nix
rename to profiles/db/postgres/default.nix
diff --git a/profiles/graphical/default.nix b/profiles/graphical/default.nix
index 2b493ae6..5d4af67f 100644
--- a/profiles/graphical/default.nix
+++ b/profiles/graphical/default.nix
@@ -2,7 +2,7 @@
 let inherit (builtins) readFile;
 in
 {
-  imports = [ ./sway ../develop ./xmonad ../networkmanager ./im ];
+  imports = [ ./sway ../develop ./xmonad ../network ./im ];
 
   hardware.opengl.enable = true;
   hardware.opengl.driSupport = true;
diff --git a/profiles/misc/plex.nix b/profiles/graphical/plex.nix
similarity index 100%
rename from profiles/misc/plex.nix
rename to profiles/graphical/plex.nix
diff --git a/profiles/list.nix b/profiles/list.nix
index 25e42df7..9203dbe7 100644
--- a/profiles/list.nix
+++ b/profiles/list.nix
@@ -1,14 +1,25 @@
 [
   ./core
+  ./db/postgres
   ./develop
   ./develop/kakoune
+  ./develop/python
   ./develop/tmux
   ./develop/zsh
   ./graphical
   ./graphical/games
   ./graphical/im
+  ./graphical/plex.nix
   ./graphical/qutebrowser
   ./graphical/sway
-  ./misc
+  ./graphical/xmonad
+  ./laptop
+  ./misc/disable-mitigations.nix
+  ./network
+  ./network/adblocking.nix
+  ./network/networkmanager
+  ./network/stubby.nix
+  ./network/torrent.nix
+  ./ssh
   ./virt
 ]
diff --git a/profiles/misc/default.nix b/profiles/misc/default.nix
deleted file mode 100644
index ae3f2515..00000000
--- a/profiles/misc/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-{ ... }: { imports = [ ./stubby.nix ./adblocking.nix ]; }
diff --git a/profiles/misc/adblocking.nix b/profiles/network/adblocking.nix
similarity index 100%
rename from profiles/misc/adblocking.nix
rename to profiles/network/adblocking.nix
diff --git a/profiles/network/default.nix b/profiles/network/default.nix
new file mode 100644
index 00000000..c3f9e9ad
--- /dev/null
+++ b/profiles/network/default.nix
@@ -0,0 +1,3 @@
+{
+  imports = [ ./networkmanager ./adblocking.nix ];
+}
diff --git a/profiles/networkmanager/default.nix b/profiles/network/networkmanager/default.nix
similarity index 92%
rename from profiles/networkmanager/default.nix
rename to profiles/network/networkmanager/default.nix
index de56a703..d3247a75 100644
--- a/profiles/networkmanager/default.nix
+++ b/profiles/network/networkmanager/default.nix
@@ -1,6 +1,4 @@
 { lib, ... }: {
-  imports = [ ../misc/adblocking.nix ];
-
   networking.networkmanager = {
     enable = true;
     wifi.backend = "iwd";
@@ -24,5 +22,4 @@
       DNSOverTLS=yes
     '';
   };
-
 }
diff --git a/profiles/misc/stubby.nix b/profiles/network/stubby.nix
similarity index 100%
rename from profiles/misc/stubby.nix
rename to profiles/network/stubby.nix
diff --git a/profiles/misc/torrent.nix b/profiles/network/torrent.nix
similarity index 100%
rename from profiles/misc/torrent.nix
rename to profiles/network/torrent.nix