Gui Reorg and More Programs

- Gui config reorganization
- Enable picom for dwm
- Install some utilities like arandr, autorandr, and unclutter-xfixes
  for dwm
- Add nerdfonts for FiraCode
- Remove conditional imports list syntax
- Add audio tools like playerctl and pavucontrol
- Enable polkit and add GNOME polkit
- Add more media programs like freecad, audacity, ani-cli, and calibre
- Add flameshot

system/gui/default.nix

@@ -3,6 +3,5 @@
 {
   imports = [
     ./fonts.nix
-    ./utilities.nix
   ];
 }

system/gui/dwm.nix

@@ -3,25 +3,46 @@
 {
   imports = [
     ./default.nix
-    ./lightdm.nix
-    ./x11.nix
   ];
 
-  services.xserver.windowManager.dwm = {
+  services.xserver = {
     enable = true;
-    package = pkgs.dwm.overrideAttrs {
-      src = (/home + "/${userSettings.username}" + /.config/dwm-flexipatch);
-      buildInputs = with pkgs; [
-        xorg.libX11.dev
-        xorg.libXinerama
-        xorg.libXft
-        xorg.libxcb
-        xorg.xcbutil
-        yajl
-        jsoncpp
-      ];
+
+    xkb = {
+      layout = "us";
+      variant = "";
+      options = "";
+    };
+
+    windowManager.dwm = {
+      enable = true;
+
+      package = pkgs.dwm.overrideAttrs {
+        src = (/home + "/${userSettings.username}" + /.config/dwm-flexipatch);
+
+        buildInputs = with pkgs; [
+          xorg.libX11.dev
+          xorg.libXinerama
+          xorg.libXft
+          xorg.libxcb
+          xorg.xcbutil
+          yajl
+          jsoncpp
+        ];
+      };
+    };
+
+    displayManager = {
+      defaultSession = "none+dwm";
+      lightdm.enable = true;
     };
   };
 
-  services.xserver.displayManager.defaultSession = "none+dwm";
+  services.picom.enable = true;
+
+  environment.systemPackages = with pkgs; [
+    arandr
+    autorandr
+    unclutter-xfixes
+  ];
 }

system/gui/fonts.nix

@@ -6,5 +6,10 @@
     powerline
     font-awesome
     ubuntu_font_family
+    (nerdfonts.override {
+      fonts = [
+        "FiraCode"
+      ];
+    })
   ];
 }

system/gui/gnome.nix

@@ -3,12 +3,14 @@
 {
   imports = [
     ./default.nix
-    (if systemSettings.desktopType == "x11" then ./x11.nix else "")
   ];
 
-  services.xserver.displayManager.gdm = {
-    enable = true;
-    wayland = (if systemSettings.desktopType == "x11" then false else true);
+  services.xserver = {
+    displayManager.gdm = {
+      enable = true;
+      wayland = (if systemSettings.desktopType == "x11" then false else true);
+    };
+
+    desktopManager.gnome.enable = true;
   };
-  services.xserver.desktopManager.gnome.enable = true;
 }

system/gui/kde.nix

@@ -3,13 +3,16 @@
 {
   imports = [
     ./default.nix
-    (if systemSettings.desktopType == "x11" then ./x11.nix else "")
   ];
 
   services.xserver.displayManager = {
-    sddm.enable = true;
-    sddm.wayland.enable = (if systemSettings.desktopType == "x11" then false else true);
+    sddm = {
+      enable = true;
+      wayland.enable = (if systemSettings.desktopType == "x11" then false else true);
+    };
+
     defaultSession = (if systemSettings.desktopType == "x11" then "plasmax11" else "plasma");
   };
+
   services.desktopManager.plasma6.enable = true;
 }

system/gui/lightdm.nix

@@ -1,5 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  services.xserver.displayManager.lightdm.enable = true;
-}

system/gui/utilities.nix

@@ -1,8 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  environment.systemPackages = with pkgs; [
-    arandr
-    autorandr
-  ];
-}

system/gui/x11.nix

@@ -1,12 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  services.xserver = {
-    enable = true;
-    xkb = {
-      layout = "us";
-      variant = "";
-      options = "";
-    };
-  };
-}