Merge

modules/system/cli/common.nix

@@ -8,4 +8,9 @@
     btop
     git
   ];
+
+  environment.pathsToLink = [ "/share/zsh" ];
+
+  programs.zsh.enable = true;
+  users.defaultUserShell = pkgs.zsh;
 }

modules/system/cli/docker.nix

@@ -1,7 +1,13 @@
 { ... }:
 
 {
-  virtualisation.docker.enable = true;
+  virtualisation.docker = {
+    enable = true;
+    rootless = {
+      enable = true;
+      setSocketVariable = true;
+    };
+  };
 
   users.users.xeovalyte.extraGroups = [ "docker" ];
 }

modules/system/gui/hyprland.nix

@@ -8,16 +8,29 @@
   };
 
   # Configure display manager
-  services.greetd = {
+  # services.greetd = {
+  #   enable = true;
+  #   settings = {
+  #     default_session = {
+  #       command = "${pkgs.greetd.tuigreet}/bin/tuigreet --remember --time --cmd Hyprland";
+  #       user = "xeovalyte";
+  #     };
+  #   };
+  # };
+
+  # SDDM configuration
+  environment.systemPackages = with pkgs; [
+    libsForQt5.qt5.qtquickcontrols2
+    libsForQt5.qt5.qtgraphicaleffects
+  ];
+
+  services.displayManager.sddm = {
     enable = true;
-    settings = {
-      default_session = {
-        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --remember --time --cmd Hyprland";
-        user = "xeovalyte";
-      };
-    };
+    wayland.enable = true;
+    theme = "${import ./sddm-theme.nix { inherit pkgs; }}";
   };
 
+  # Sound configuration
   sound.enable = true;
   hardware.pulseaudio.enable = false;
   security.rtkit.enable = true;
@@ -28,6 +41,7 @@
     pulse.enable = true;
   };
 
+  # Keyring configuration
   security.polkit.enable = true;
   services.gnome.gnome-keyring.enable = true;
   security.pam.services.greetd.enableGnomeKeyring = true;

modules/system/gui/plasma.nix

@@ -1,9 +1,9 @@
 { pkgs, ... }:
 
 {
-  services.xserver.enable = true;
-  
   services.displayManager.sddm.enable = true;
+  services.displayManager.sddm.wayland.enable = true;
+  
   services.desktopManager.plasma6.enable = true;
 
   hardware.pulseaudio.enable = false;

modules/system/gui/sddm-theme.nix

@@ -0,0 +1,15 @@
+{ pkgs }:
+
+pkgs.stdenv.mkDerivation {
+  name = "sddm-theme";
+  src = pkgs.fetchFromGitHub {
+    owner = "MarianArlt";
+    repo = "sddm-sugar-dark";
+    rev = "ceb2c455663429be03ba62d9f898c571650ef7fe";    
+    sha256 = "0153z1kylbhc9d12nxy9vpn0spxgrhgy36wy37pk6ysq7akaqlvy";
+  };
+  installPhase = ''
+    mkdir -p $out
+    cp -R ./* $out/
+  '';
+}