Mostly security changes, add nouveau as a boot option, simplify settings and prepare for home-manager options

modules/home/programs/terminal/carapace/default.nix

@@ -1,4 +0,0 @@
-{ ... }:
-{
-  programs.carapace.enable = true;
-}

modules/home/programs/terminal/default.nix

@@ -1,7 +1,6 @@
 { ... }:
 {
   imports = [
-    ./carapace
     ./fastfetch
     ./git
     ./ncmpcpp

modules/home/programs/terminal/fastfetch/default.nix

@@ -1,6 +1,7 @@
 { ... }:
 {
   imports = [ ./small ];
+
   programs.fastfetch.enable = true;
   home.file.".config/fastfetch/config.jsonc".source = ./config.jsonc;
 }

modules/home/programs/terminal/git/default.nix

@@ -1,10 +1,10 @@
 { pkgs, config, ... }:
 {
-  imports = [ ./lazygit ];
-
   programs.git = {
     enable = true;
     userName = "Jimbo";
     userEmail = "jimbo@${config.domains.jim2}";
   };
+
+  programs.lazygit.enable = true;
 }

modules/home/programs/terminal/git/lazygit/default.nix

@@ -1,4 +0,0 @@
-{ ... }:
-{
-  programs.lazygit.enable = true;
-}

modules/home/programs/terminal/ncmpcpp/default.nix

@@ -1,5 +1,7 @@
 { pkgs, ... }:
 {
+  home.packages = with pkgs; [ mpc-cli ];
+
   programs.ncmpcpp = {
     enable = true;
     settings = {
@@ -15,6 +17,4 @@
   };
 
   services.mpd-discord-rpc.enable = true;
-
-  home.packages = with pkgs; [ mpc-cli ];
 }