cleanup

leanix/configuration.nix

@@ -22,7 +22,7 @@
     };
   };
 
-  # Bootloader.
+  # Bootloader
   boot.loader.systemd-boot.enable = true;
 
   environment.sessionVariables = {
@@ -49,6 +49,7 @@
     locales.enable = true;
     network.enable = true;
     bluetooth.enable = true;
+    bluetooth.blueman.enable = false;
     nvidia.enable = false;
     printing.enable = false;
     sddm.enable = false;

leanix/home.nix

@@ -35,9 +35,16 @@
     oh-my-posh.enable = false;
   };
 
+  programs = {
+    bat.enable = false;
+    btop.enable = false;
+    fzf.enable = false;
+  };
+
   home.packages = with pkgs-stable; [
     libreoffice
     inkscape
+    gimp
   ];
 
   programs.home-manager.enable = true;

nixos/desktop/hyprland/hyprland.nix

@@ -10,7 +10,7 @@
   };
 
   imports = [
-    ./packages.nix
+    ./dependencies.nix
     ./waybar.nix
     ./rofi.nix
     ./wlogout.nix

nixos/packages/terminal_tools.nix

@@ -31,9 +31,9 @@
     };
 
     programs = {
-      bat.enable = true;
+      bat.enable = lib.mkDefault true;
-      btop.enable = true;
+      btop.enable = lib.mkDefault true;
-      fzf.enable = true;
+      fzf.enable = lib.mkDefault true;
     };
 
     stylix.targets = {
@@ -41,7 +41,6 @@
       btop.enable = true;
       fzf.enable = true;
       neovim.enable = true;
-      #spicetify.enable = true;
     };
 
     home.packages = with pkgs; [

nixos/system/sys/loginManager.nix

@@ -0,0 +1,39 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
+  options = {
+    sys.login.sddm.enable = lib.mkEnableOption "Enable SDDM login";
+    sys.login.gdm.enable = lib.mkEnableOption "Enable GDM login";
+  };
+
+  config = lib.mkMerge [
+    (lib.mkIf config.sys.login.sddm.enable {
+      services.displayManager = {
+        defaultSession = "hyprland";
+        sddm = {
+          enable = true;
+          wayland.enable = true;
+          theme = "sddm-astronaut-theme";
+          package = lib.mkDefault pkgs.kdePackages.sddm;
+          extraPackages = [pkgs.sddm-astronaut pkgs.kdePackages.qtvirtualkeyboard];
+        };
+      };
+
+      environment.systemPackages = with pkgs; [
+        (sddm-astronaut.override {
+          themeConfig = {
+            ScreenWidth = 1920;
+            ScreenHeight = 1080;
+            PartialBlur = false;
+          };
+        })
+      ];
+    })
+    (lib.mkIf config.sys.login.gdm.enable {
+      services.xserver.displayManager.gdm.enable = true;
+    })
+  ];
+}

nixos/system/sys/network.nix

@@ -8,6 +8,7 @@
   options = {
     sys.network.enable = lib.mkEnableOption "Enable networking";
     sys.bluetooth.enable = lib.mkEnableOption "Enable Bluetooth support";
+    sys.bluetooth.blueman.enable = lib.mkEnableOption "Enable Blueman App";
   };
 
   config = lib.mkMerge [
@@ -27,6 +28,10 @@
       lib.mkIf config.sys.bluetooth.enable {
         hardware.bluetooth.enable = true; # enables support for Bluetooth
         hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot
+      }
+    )
+    (
+      lib.mkIf config.sys.bluetooth.blueman.enable {
         services.blueman.enable = true;
       }
     )

nixos/system/sys/sddm.nix

@@ -1,33 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}: {
-  options = {
-    sys.sddm.enable = lib.mkEnableOption "Enable SDDM login";
-  };
-
-  config = lib.mkIf config.sys.sddm.enable {
-    services.displayManager = {
-      defaultSession = "hyprland";
-      sddm = {
-        enable = true;
-        wayland.enable = true;
-        theme = "sddm-astronaut-theme";
-        package = lib.mkDefault pkgs.kdePackages.sddm;
-        extraPackages = [pkgs.sddm-astronaut pkgs.kdePackages.qtvirtualkeyboard];
-      };
-    };
-
-    environment.systemPackages = with pkgs; [
-      (sddm-astronaut.override {
-        themeConfig = {
-          ScreenWidth = 1920;
-          ScreenHeight = 1080;
-          PartialBlur = false;
-        };
-      })
-    ];
-  };
-}

nixos/system/system.nix

@@ -7,7 +7,7 @@
     ./sys/network.nix
     ./sys/nvidia.nix
     ./sys/printing.nix
-    ./sys/sddm.nix
+    ./sys/loginManager.nix
     ./sys/style.nix
   ];
 
@@ -21,10 +21,16 @@
     fonts.packages = lib.mkDefault true;
     locales.enable = lib.mkDefault true;
     network.enable = lib.mkDefault true;
-    bluetooth.enable = lib.mkDefault true;
+    bluetooth = {
+      enable = lib.mkDefault true;
+      blueman = lib.mkDefault true;
+    };
     nvidia.enable = lib.mkDefault true;
     printing.enable = lib.mkDefault true;
+    login = {
       sddm.enable = lib.mkDefault true;
+      gdm.enable = lib.mkDefault false;
+    };
     style.enable = lib.mkDefault true;
   };
 }