First attempt at adding polybar-dwm-module

- Update flake.lock
- Switch from awesome back to dwm
- Attempt to modify existing polybar nix package
  to point to mihirlad55's polybar-dwm-module

system/gui/default.nix

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

system/gui/dwm.nix

@@ -3,47 +3,29 @@
 {
   imports = [
     ./default.nix
+    ./lightdm.nix
+    ./x11.nix
   ];
 
-  services.xserver = {
+  services.xserver.windowManager.dwm = {
     enable = true;
-
+    package = pkgs.dwm.overrideAttrs {
-    xkb = {
+      src = (/home + "/${userSettings.username}" + /.config/dwm-flexipatch);
-      layout = "us";
+      buildInputs = with pkgs; [
-      variant = "";
+        xorg.libX11.dev
-      options = "";
+        xorg.libXinerama
-    };
+        xorg.libXft
-
+        xorg.libxcb
-    windowManager.dwm = {
+        xorg.xcbutil
-      enable = true;
+        yajl
-
+        jsoncpp
-      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.picom.enable = true;
+  services.xserver.displayManager.defaultSession = "none+dwm";
 
   environment.systemPackages = with pkgs; [
-    arandr
-    autorandr
-    unclutter-xfixes
     (polybar.overrideAttrs (finalAttrs: previousAttrs: {
       pname = previousAttrs.pname + "-dwm-module";
       version = "3.5.2";
@@ -57,7 +39,7 @@
       };
 
       buildInputs = previousAttrs.buildInputs ++ [
-        jsoncpp
+        pkgs.jsoncpp
       ];
     }))
   ];

system/gui/fonts.nix

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

system/gui/gnome.nix

@@ -3,14 +3,12 @@
 {
   imports = [
     ./default.nix
+    (if systemSettings.desktopType == "x11" then ./x11.nix else "")
   ];
 
-  services.xserver = {
+  services.xserver.displayManager.gdm = {
-    displayManager.gdm = {
+    enable = true;
-      enable = true;
+    wayland = (if systemSettings.desktopType == "x11" then false else 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,16 +3,13 @@
 {
   imports = [
     ./default.nix
+    (if systemSettings.desktopType == "x11" then ./x11.nix else "")
   ];
 
   services.xserver.displayManager = {
-    sddm = {
+    sddm.enable = true;
-      enable = true;
+    sddm.wayland.enable = (if systemSettings.desktopType == "x11" then false else 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

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

system/gui/utilities.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
 {
-  security.polkit.enable = true;
   environment.systemPackages = with pkgs; [
-    polkit_gnome
+    arandr
+    autorandr
   ];
 }

system/gui/x11.nix

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

system/hardware/audio.nix

@@ -11,8 +11,4 @@
     pulse.enable = true;
     jack.enable = true;
   };
-  environment.systemPackages = with pkgs; [
-    playerctl
-    pavucontrol
-  ];
 }

system/hardware/bluetooth.nix

@@ -1,10 +1,6 @@
 { config, lib, pkgs, ... }:
 
 {
-  hardware.bluetooth = {
+  hardware.bluetooth.enable = true;
-    enable = true;
-    powerOnBoot = true;
-  };
-
   services.blueman.enable = true;
 }

system/security/default.nix

@@ -4,6 +4,5 @@
   imports = [
     ./firewall.nix
     ./gpg.nix
-    ./polkit.nix
   ];
 }

user/media/creation.nix

@@ -4,6 +4,5 @@
   home.packages = (with pkgs; [
     blender
     obs-studio
-    freecad
   ]);
 }

user/media/editors.nix

@@ -5,6 +5,5 @@
     gimp
     libsForQt5.kdenlive
     ffmpeg
-    audacity
   ]);
 }

user/media/players.nix

@@ -8,7 +8,5 @@
     pocket-casts
     spotify
     spicetify-cli
-    ani-cli
-    calibre
   ]);
 }

user/utilities/default.nix

@@ -8,6 +8,5 @@
     ./keyboard-configuration.nix
     ./passwords.nix
     ./xdg.nix
-    ./screenshot.nix
   ];
 }

user/utilities/screenshot.nix

@@ -1,7 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  home.packages = (with pkgs; [
-    flameshot
-  ]);
-}