feat: fix issues with the refactoring

dotfiles/hypr/config/autostart.conf

@@ -7,7 +7,7 @@ source = ~/.config/hypr/config/defaults.conf
 # Autostart wiki https://wiki.hyprland.org/0.45.0/Configuring/Keywords/#executing #
 exec-once = tailscale-systray &
 exec-once = slack &
-exec-once = swaybg -o \* -i ~/.wallpaper.jpg -m fill
+# exec-once = swaybg -o \* -i ~/.wallpaper.jpg -m fill
 exec-once = waybar &
 exec-once = fcitx5 -d &
 exec-once = mako &

dotfiles/hypr/config/keybinds.conf

@@ -46,7 +46,7 @@ bindd = , XF86AudioPrev, Previous track, exec, playerctl previous
 bindel = , XF86MonBrightnessUp, exec, brightnessctl s +5% 	#Increases brightness 5%
 bindel = , XF86MonBrightnessDown, exec, brightnessctl s 5%- 	#Decreases brightness 5%
 bindd = $mainMod SHIFT, P, Runs the calculator application, exec, gnome-calculator
-bindd = $mainMod SHIFT, L, Lock the screen, exec, swaylock-fancy -e -K -p 10 -f Hack-Regular
+bindd = $mainMod SHIFT, L, Lock the screen, exec, swaylock -e -K -p 10 -f Hack-Regular
 bindd = $mainMod, O, Reload/restarts Waybar, exec, killall -SIGUSR2 waybar
 
 # ======= Window Actions =======

modules/home-manager/bundles/shell.nix

@@ -8,6 +8,7 @@
   options.myHome.bundle.shell.enable = lib.mkEnableOption "enable shell bundle";
 
   config = lib.mkIf config.myHome.bundle.shell.enable {
+    myHome.programs.nvim.enable = true;
     home.packages = with pkgs; [
       commitizen
       pre-commit

modules/home-manager/dotfiles.nix

@@ -1,17 +0,0 @@
-{
-  pkgs,
-  lib,
-  config,
-  ...
-}:
-{
-  options = {
-    myHome.dotfiles.enable = lib.mkEnableOption "enables dotfiles";
-  };
-
-  config = lib.mkIf config.myHome.dotfiles.enable {
-    home.file = {
-      ".config/hypr/hyprland.conf".source = ../../dotfiles/hyprland.conf;
-    };
-  };
-}

modules/home-manager/services/hyprland.nix

@@ -5,19 +5,17 @@
   ...
 }:
 {
-  options.myNixOS.feature.hyprland.enable = lib.mkEnableOption "enables hyprland";
+  options.myHome.services.hyprland.enable = lib.mkEnableOption "enables hyprland";
 
-  config = lib.mkIf config.myNixOS.feature.hyprland.enable {
+  config = lib.mkIf config.myHome.services.hyprland.enable {
     home.file.".config/hypr" = {
       source = ../../../dotfiles/hypr;
       recursive = true;
     };
-    programs = {
-      dconf.enable = true;
-      hyprland.enable = true;
-    };
 
-    environment.systemPackages = with pkgs; [
+    wayland.windowManager.hyprland.enable = true;
+
+    home.packages = with pkgs; [
       libnotify
       xclip
       wl-clipboard
@@ -25,18 +23,17 @@
       libnotify
       hyprpicker
       slurp
+      swappy
       grim
       rofi
     ];
 
     services = {
       picom.enable = true;
-      xserver.enable = true;
     };
 
     xdg.portal = {
       enable = true;
-      wlr.enable = true;
       extraPortals = [
         pkgs.xdg-desktop-portal-gtk
         pkgs.xdg-desktop-portal

modules/home-manager/services/nix.nix

@@ -12,7 +12,7 @@
       FLAKE = "${config.home.homeDirectory}/nixos/";
       NH_FLAKE = "${config.home.homeDirectory}/nixos/";
     };
-    systemPackages = map lib.lowPrio [
+    home.packages = map lib.lowPrio [
       pkgs.nh
       pkgs.nil
       pkgs.nixfmt-rfc-style

modules/nixos/cli-environment.nix

@@ -1,29 +0,0 @@
-{
-  pkgs,
-  lib,
-  config,
-  ...
-}:
-with lib;
-let
-  cfg = config.services.cli-environment;
-in
-{
-  imports = [ ];
-
-  options.services.cli-environment = {
-    enable = mkEnableOption "enable cli-environment";
-  };
-
-  config = mkIf cfg.enable {
-    environment.systemPackages = with pkgs; [
-      openssl
-      nixfmt-rfc-style
-      nil
-      ripgrep
-      fd
-      clang
-    ];
-    programs.fish.enable = true;
-  };
-}

modules/nixos/default.nix

@@ -18,6 +18,15 @@
   ];
 
   config = {
+    programs.dconf.enable = true;
+    programs.hyprland.enable = true;
+    services.xserver = {
+      displayManager = {
+        defaultSession = "hyprland";
+      };
+    };
+    xdg.portal.enable = true;
+
     nix.settings.experimental-features = [
       "nix-command"
       "flakes"

modules/nixos/features/gaming.nix

@@ -0,0 +1,28 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
+with lib;
+let
+  cfg = config.services.gaming;
+in
+{
+  imports = [ ];
+
+  options.services.gaming = {
+    enable = mkEnableOption "enable gaming";
+  };
+
+  config = mkIf cfg.enable {
+    environment.systemPackages = with pkgs; [
+      bottles
+      steam
+      discord
+      openttd
+    ];
+    programs.steam.enable = true;
+    programs.gamemode.enable = true;
+  };
+}

modules/nixos/gaming.nix

@@ -1,28 +0,0 @@
-{
-  pkgs,
-  lib,
-  config,
-  ...
-}:
-with lib;
-let
-  cfg = config.services.gaming;
-in
-{
-  imports = [ ];
-
-  options.services.gaming = {
-    enable = mkEnableOption "enable gaming";
-  };
-
-  config = mkIf cfg.enable {
-    environment.systemPackages = with pkgs; [
-      bottles
-      steam
-      discord
-      openttd
-    ];
-    programs.steam.enable = true;
-    programs.gamemode.enable = true;
-  };
-}