Re-organize Nix Modules

- Move all programs into system folder
- Create `default.nix` for each folder to reduce number of imports
  in configuration.nix
- Rename some modules to be more generic and less package
  specific to allow for easy swapping of programs in the future
- Update flake.lock

system/gui/default.nix

@@ -0,0 +1,8 @@
+{ config, lib, pkgs, ... }:
+
+{
+  imports = [
+    ./x11.nix
+    ./fonts.nix
+  ];
+}

system/gui/dwm.nix

@@ -2,11 +2,8 @@
 
 {
   imports = [
-    ./x11.nix
+    ./default.nix
     ./lightdm.nix
-    ../app/terminal/kitty.nix
-    ../app/launcher/dmenu.nix
-    ../app/launcher/rofi.nix
   ];
 
   services.xserver.windowManager.dwm.enable = true;

system/gui/fonts.nix

@@ -2,6 +2,7 @@
 
 {
   fonts.packages = with pkgs; [
+    corefonts
     powerline
     font-awesome
     ubuntu_font_family

system/gui/gnome.nix

@@ -2,7 +2,7 @@
 
 {
   imports = [
-    ./x11.nix
+    ./default.nix
   ];
 
   services.xserver.displayManager.gdm.enable = true;

system/gui/x11.nix

@@ -1,12 +1,6 @@
 { config, lib, pkgs, ... }:
 
 {
-  imports = [
-    ../util/dbus.nix
-    ../util/gnome-keyring.nix
-    ./fonts.nix
-  ];
-
   services.xserver = {
     enable = true;
     xkb = {