diff --git a/nixos/desktop/desktops.nix b/nixos/desktop/desktops.nix
new file mode 100644
index 0000000..7694191
--- /dev/null
+++ b/nixos/desktop/desktops.nix
@@ -0,0 +1,6 @@
+{...}:
+{
+  imports = [
+    ./hyprland/hyprland.nix
+  ];
+}
\ No newline at end of file
diff --git a/nixos/desktop/hyprland/hyprland.nix b/nixos/desktop/hyprland/hyprland.nix
index be97947..6fc19b8 100644
--- a/nixos/desktop/hyprland/hyprland.nix
+++ b/nixos/desktop/hyprland/hyprland.nix
@@ -20,7 +20,20 @@
 
     waybar.enable = lib.mkDefault true;
     rofi.enable = lib.mkDefault true;
+    
     services.network-manager-applet.enable = true;
+    services.dunst.enable = true;
+
+    stylix.targets = {
+
+      dunst.enable = true;
+      
+      waybar = {
+        enableCenterBackColors = false;
+        enableLeftBackColors = false;
+        enableRightBackColors = false;
+        };
+    };
 
     wayland.windowManager.hyprland = {
       enable = true;
diff --git a/nixos/desktop/hyprland/packages.nix b/nixos/desktop/hyprland/packages.nix
index 8427d91..52f0314 100644
--- a/nixos/desktop/hyprland/packages.nix
+++ b/nixos/desktop/hyprland/packages.nix
@@ -1,18 +1,4 @@
 {pkgs, lib, ...}: {
-  programs.kitty = {
-    enable = true;
-    font.name = lib.mkDefault "JetBrainsMono Nerd Font";
-    #themeFile = "tokyo_night_night";
-    #themeFile = "Catppuccin-Mocha";
-    settings = {
-      font_size = 11.5;
-      confirm_os_window_close = 0;
-      hide_window_decorations = 0;
-      enable_audio_bell = false;
-      window_padding_width = 25;
-    };
-  };
-
   home.packages = with pkgs; [
     hyprlock
     hyprpicker
diff --git a/nixos/desktops.nix b/nixos/desktops.nix
deleted file mode 100644
index f9569f6..0000000
--- a/nixos/desktops.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{...}:
-{
-  imports = [
-    ./desktop/hyprland/hyprland.nix
-  ];
-}
\ No newline at end of file
diff --git a/nixos/home.nix b/nixos/home.nix
index 84fe78c..81d5d43 100644
--- a/nixos/home.nix
+++ b/nixos/home.nix
@@ -14,28 +14,14 @@
   home.stateVersion = "24.05"; # Please read the comment before changing.
 
   imports = [
-    ./packages.nix
-    ./desktops.nix
+    ./packages/packages.nix
+    ./desktop/desktops.nix
   ];
 
   hyprland.enable = true;
   programming.enable = true;
   games.enable = true;
 
-  services.dunst.enable = true;
-
-  stylix.targets = {
-    bat.enable = true;
-    btop.enable = true;
-    dunst.enable = true;
-    fzf.enable = true;
-    neovim.enable = true;
-    tmux.enable = true;
-    waybar.enableCenterBackColors = false;
-    waybar.enableLeftBackColors = false;
-    waybar.enableRightBackColors = false;
-  };
-
   programs.bash = {
     enable = true;
     enableCompletion = true;
@@ -65,19 +51,6 @@
       pfetch'';
   };
 
-  programs.oh-my-posh = {
-    enable = true;
-    enableBashIntegration = true;
-    #settings = '''';
-    #useTheme = "catppuccin_mocha";
-    useTheme = "kali";
-  };
-
-  programs.zoxide = {
-    enable = true;
-    enableBashIntegration = true;
-  };
-
   # Home Manager is pretty good at managing dotfiles. The primary way to manage
   # plain files is through 'home.file'.
   home.file = {
diff --git a/nixos/packages/games.nix b/nixos/packages/games.nix
index 7f91059..560ae53 100644
--- a/nixos/packages/games.nix
+++ b/nixos/packages/games.nix
@@ -12,6 +12,7 @@
     home.packages = with pkgs; [
       vitetris
       steam
+      wine
 
       (writeShellScriptBin "nvidia-offload" ''
         export __NV_PRIME_RENDER_OFFLOAD=1
@@ -21,9 +22,5 @@
         exec "$@"
       '')
     ];
-
-    nixpkgs.config.allowUnfreePredicate = pkg:
-      builtins.elem (lib.getName pkg) [
-      ];
   };
 }
diff --git a/nixos/packages.nix b/nixos/packages/packages.nix
similarity index 81%
rename from nixos/packages.nix
rename to nixos/packages/packages.nix
index ed5dfcc..a49cb65 100644
--- a/nixos/packages.nix
+++ b/nixos/packages/packages.nix
@@ -4,16 +4,15 @@
   ...
 }: {
   imports = [
-    ./packages/programming/programming.nix
-    ./packages/games.nix
+    ./programming/programming.nix
+    ./games.nix
+    ./terminal_tools.nix
     #./packages/applications.nix
-    #./packages/terminal_tools.nix
   ];
 
-  programs.bat.enable = true;
-  programs.btop.enable = true;
-  programs.fzf.enable = true;
-  programs.tmux.enable = true;
+  terminal_tools.enable = lib.mkDefault true;
+  programming.enable = lib.mkDefault true;
+  games.enable = lib.mkDefault false;
   #programs.neovim.enable = true;
 
   home.packages = with pkgs; [
@@ -21,35 +20,10 @@
     librewolf
     discord
 
-    cmake
-    meson
-    cpio
-
-    pfetch
-    zoxide
-    bat
-    btop
-    cmatrix
-    entr
-    figlet
-    jp2a
-    yt-dlp
-    oh-my-posh
-    eza
-    nvtopPackages.full
-    neofetch
-    wget
-    curl
-
-    fzf
-    tldr
-
     alejandra
     nh
     nixd
 
-    wine
-
     stellarium
     libreoffice
     localsend
diff --git a/nixos/packages/programming/git.nix b/nixos/packages/programming/git.nix
new file mode 100644
index 0000000..e376216
--- /dev/null
+++ b/nixos/packages/programming/git.nix
@@ -0,0 +1,19 @@
+{...}:
+{
+  options = {
+    git.enable = lib.mkEnableOption "enable git";
+  };
+
+  config = lib.mkIf config.git.enable {
+    programs.git = {
+      enable = true;
+      userName = "foglar";
+      userEmail = "kohout.fi.2023@skola.ssps.cz";
+    };
+
+    home.packages = with pkgs; [
+      git
+      github-cli
+      gitkraken
+    ];
+}
diff --git a/nixos/packages/programming/programming.nix b/nixos/packages/programming/programming.nix
index f7d7cec..5c32ca2 100644
--- a/nixos/packages/programming/programming.nix
+++ b/nixos/packages/programming/programming.nix
@@ -6,6 +6,7 @@
 }: {
   imports = [
     ./code.nix
+    ./git.nix
   ];
 
   options = {
@@ -14,20 +15,13 @@
   };
 
   config = lib.mkIf config.programming.enable {
-    programs.git = {
-      enable = true;
-      userName = "foglar";
-      userEmail = "kohout.fi.2023@skola.ssps.cz";
-    };
 
-    vscode.enable = true;
+    vscode.enable = lib.mkDefault true;
+    git.enable = lib.mkDefault true;
 
     home.packages = with pkgs; [
-      git
       neovim
-      gitkraken
       arduino-ide
-      github-cli
       go
       dotnet-sdk_8
       jq
diff --git a/nixos/packages/terminal_tools.nix b/nixos/packages/terminal_tools.nix
index e69de29..09f741a 100644
--- a/nixos/packages/terminal_tools.nix
+++ b/nixos/packages/terminal_tools.nix
@@ -0,0 +1,75 @@
+{ 
+  lib,
+  ...
+}:
+{
+  options = {
+    terminal_tools.enable =
+    lib.mkEnableOption "enable terminal tools module";
+  };
+
+    config = lib.mkIf config.terminal_tools.enable {
+
+    programs = {
+      bat.enable = true;
+      btop.enable = true;
+      fzf.enable = true;
+      tmux.enable = true;
+    };
+
+    stylix.targets = {
+      bat.enable = true;
+      btop.enable = true;
+      fzf.enable = true;
+      neovim.enable = true;
+      tmux.enable = true;
+    };
+
+    programs.oh-my-posh = {
+      enable = true;
+      enableBashIntegration = true;
+      #settings = '''';
+      #useTheme = "catppuccin_mocha";
+      useTheme = "kali";
+    };
+
+    programs.zoxide = {
+      enable = true;
+      enableBashIntegration = true;
+    };
+
+    programs.kitty = {
+    enable = true;
+    font.name = lib.mkDefault "JetBrainsMono Nerd Font";
+    #themeFile = "tokyo_night_night";
+    #themeFile = "Catppuccin-Mocha";
+    settings = {
+      font_size = 11.5;
+      confirm_os_window_close = 0;
+      hide_window_decorations = 0;
+      enable_audio_bell = false;
+      window_padding_width = 25;
+      };
+    };
+
+    home.packages = with pkgs; [
+      pfetch
+      zoxide
+      bat
+      btop
+      cmatrix
+      entr
+      figlet
+      jp2a
+      yt-dlp
+      oh-my-posh
+      eza
+      nvtopPackages.full
+      neofetch
+      wget
+      curl
+      fzf
+      tldr
+    ];
+  };
+}
\ No newline at end of file