From fad29f1c13709c57f3c2d1a628426c5fe4102b0d Mon Sep 17 00:00:00 2001
From: Infinidoge <infinidoge@inx.moe>
Date: Fri, 1 Oct 2021 10:50:20 -0400
Subject: [PATCH] refactor: organize shell settings

---
 flake.nix                        | 2 +-
 users/infinidoge/default.nix     | 1 -
 users/profiles/shells/all.nix    | 7 +++++++
 users/profiles/shells/bash.nix   | 2 ++
 users/profiles/shells/common.nix | 6 +-----
 users/profiles/shells/fish.nix   | 2 ++
 users/profiles/shells/zsh.nix    | 2 ++
 7 files changed, 15 insertions(+), 7 deletions(-)
 create mode 100644 users/profiles/shells/all.nix

diff --git a/flake.nix b/flake.nix
index f68c896..5c12ad5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -158,7 +158,7 @@
                 # Terminal
                 kitty
                 starship
-                shells.common
+                shells.all
               ];
             };
           };
diff --git a/users/infinidoge/default.nix b/users/infinidoge/default.nix
index fe7c1ab..7542edb 100644
--- a/users/infinidoge/default.nix
+++ b/users/infinidoge/default.nix
@@ -17,7 +17,6 @@
       firefox = {
         enable = true;
       };
-      command-not-found.enable = true;
     };
 
     home = {
diff --git a/users/profiles/shells/all.nix b/users/profiles/shells/all.nix
new file mode 100644
index 0000000..7fee820
--- /dev/null
+++ b/users/profiles/shells/all.nix
@@ -0,0 +1,7 @@
+{ ... }: {
+  imports = [
+    ./bash.nix
+    ./fish.nix
+    ./zsh.nix
+  ];
+}
diff --git a/users/profiles/shells/bash.nix b/users/profiles/shells/bash.nix
index 82bcc85..de58b78 100644
--- a/users/profiles/shells/bash.nix
+++ b/users/profiles/shells/bash.nix
@@ -1,4 +1,6 @@
 { config, pkgs, ... }: {
+  imports = [ ./common.nix ];
+
   programs = {
     bash = {
       enable = true;
diff --git a/users/profiles/shells/common.nix b/users/profiles/shells/common.nix
index 7fee820..5c4ac95 100644
--- a/users/profiles/shells/common.nix
+++ b/users/profiles/shells/common.nix
@@ -1,7 +1,3 @@
 { ... }: {
-  imports = [
-    ./bash.nix
-    ./fish.nix
-    ./zsh.nix
-  ];
+  programs.command-not-found.enable = true;
 }
diff --git a/users/profiles/shells/fish.nix b/users/profiles/shells/fish.nix
index cd11d5c..ca93b5f 100644
--- a/users/profiles/shells/fish.nix
+++ b/users/profiles/shells/fish.nix
@@ -1,4 +1,6 @@
 { config, lib, pkgs, ... }: {
+  imports = [ ./common.nix ];
+
   programs = {
     fish = {
       enable = true;
diff --git a/users/profiles/shells/zsh.nix b/users/profiles/shells/zsh.nix
index f3b9abe..dc75dd2 100644
--- a/users/profiles/shells/zsh.nix
+++ b/users/profiles/shells/zsh.nix
@@ -1,4 +1,6 @@
 { config, lib, pkgs, ... }: {
+  imports = [ ./common.nix ];
+
   programs = {
     zsh = rec {
       enable = true;