mv hyprland to module

flake.lock

@@ -349,11 +349,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1751995939,
-        "narHash": "sha256-C5CSTv+b8XSbqJwqTP8SGkZEK3YCCJnmvRbg209ql5w=",
+        "lastModified": 1752008168,
+        "narHash": "sha256-ioQsc5LGGMy8K1NSxutNJ0wThA9BozKCkqwYdSTE8jM=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "8f3259dbc57c8ee871492fde80f77468826bbd63",
+        "rev": "1baa44cf8c3a4699d0beda91f39ba7942b46269d",
         "type": "github"
       },
       "original": {

hosts/common/common.nix

@@ -16,24 +16,17 @@
 
   environment.systemPackages = with pkgs; [
     home-manager
-    wget
     kitty
-    tldr
     fastfetch
-    tree
     font-awesome
-    dig
-    btop
     thunderbird
     lf
-    file
     qalculate-qt
     baobab
     arduino-ide
     piper
     element-desktop
     calibre
-    vlc
     loupe
     gimp3
     mullvad-vpn

hosts/desktop1/configuration.nix

@@ -10,9 +10,10 @@
   networking.hostName = "desktop1";
 
   smayzy = {
+    desktop.enable = true;
     nvidia.enable = true;
     virt.enable = true;
-    desktop.enable = true;
+    hyprland.enable = true;
   };
 
   home-manager = {
@@ -38,23 +39,7 @@
   services.displayManager.sddm.enable = true;
   services.displayManager.sddm.wayland.enable = true;
 
-  programs.hyprland = {
-    enable = true;
-    xwayland.enable = true;
-  };
-
-  xdg.portal.enable = true;
-  xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
-
   environment.systemPackages = with pkgs; [
-  mako
-  wofi
-  wlogout
-  waybar
-  wl-clipboard
-  libnotify
-  hyprpaper
-  hyprpolkitagent
   webcord
   pavucontrol
   cliphist

modules/nix/WM/default.nix

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

modules/nix/WM/hyprland.nix

@@ -0,0 +1,32 @@
+{  lib, config, pkgs, ... }:
+let
+  inherit (lib) mkIf mkOption types;
+in
+{
+  options.smayzy.hyprland.enable = mkOption {
+    type = types.bool;
+    default = false;
+    description = "hyprland";
+  };
+
+  config = mkIf config.smayzy.hyprland.enable {
+    programs.hyprland = {
+      enable = true;
+      xwayland.enable = true;
+    };
+  
+    xdg.portal.enable = true;
+    xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
+  
+    environment.systemPackages = with pkgs; [
+      mako
+      wofi
+      wlogout
+      waybar
+      wl-clipboard
+      libnotify
+      hyprpaper
+      hyprpolkitagent
+    ];
+  };
+}

modules/nix/base-cli/default.nix

@@ -4,5 +4,6 @@
     ./nh.nix
     ./nvf.nix
     ./fzf.nix
+    ./pkgs.nix
   ];
 }

modules/nix/base-cli/pkgs.nix

@@ -0,0 +1,23 @@
+{ config, lib, pkgs, ...}:
+let
+  inherit (lib) mkIf mkOption types;
+in
+{
+  options.smayzy.base-cli-pkgs.enable = mkOption {
+    type = types.bool;
+    default = false;
+    description = "install base cli pkgs that doesn't need extra config";
+  };
+
+  config = mkIf config.smayzy.base-cli-pkgs.enable {
+    environment.systemPackages = with pkgs; [
+      wget
+      tldr
+      tree
+      dig
+      btop
+      file
+      vim
+    ];
+  };
+}

modules/nix/default.nix

@@ -10,6 +10,7 @@
     ./shell
     ./rice
     ./groups
+    ./WM
   ];
 
   # Timzone and locales (same for all machines so I put it here)

modules/nix/groups/base.nix

@@ -15,7 +15,7 @@ in
       nh.enable = true;
       fzf.enable = true;
       zsh.enable = true;
-
+      base-cli-pkgs.enable = true;
     };
   };
 }