From db5366102b472624294fd1248abc0f647e54bca1 Mon Sep 17 00:00:00 2001
From: martyTF <marty@marty.tf>
Date: Tue, 16 Dec 2025 16:51:22 +0100
Subject: [PATCH] forgor to stage changes but git management in vscodium do be
 fire ngl

---
 modules/{ => development}/git.nix                 |  0
 .../import_development.nix}                       |  2 --
 modules/{ => development}/vscodium.nix            | 14 ++------------
 modules/import_modules.nix                        | 14 ++++++++++++++
 modules/window_manager/hyprland.nix               | 15 +++------------
 .../window_manager/{imports.nix => import_wm.nix} |  0
 modules/window_manager/waybar.nix                 | 11 +----------
 system/{imports.nix => import_system.nix}         |  3 ++-
 8 files changed, 22 insertions(+), 37 deletions(-)
 rename modules/{ => development}/git.nix (100%)
 rename modules/{imports.nix => development/import_development.nix} (85%)
 rename modules/{ => development}/vscodium.nix (63%)
 create mode 100644 modules/import_modules.nix
 rename modules/window_manager/{imports.nix => import_wm.nix} (100%)
 rename system/{imports.nix => import_system.nix} (61%)

diff --git a/modules/git.nix b/modules/development/git.nix
similarity index 100%
rename from modules/git.nix
rename to modules/development/git.nix
diff --git a/modules/imports.nix b/modules/development/import_development.nix
similarity index 85%
rename from modules/imports.nix
rename to modules/development/import_development.nix
index 961fa89..e2b16b0 100644
--- a/modules/imports.nix
+++ b/modules/development/import_development.nix
@@ -11,14 +11,12 @@ let
       [
         ./git.nix
         ./vscodium.nix
-        ./window_manager/imports.nix
 
       ]
     else if config.networking.hostName == "marty-latitude" then
       [
         ./git.nix
         ./vscodium.nix
-        ./window_manager/imports.nix
 
       ]
     else if config.networking.hostName == "marty-server" then
diff --git a/modules/vscodium.nix b/modules/development/vscodium.nix
similarity index 63%
rename from modules/vscodium.nix
rename to modules/development/vscodium.nix
index efe0543..3bfc7a4 100644
--- a/modules/vscodium.nix
+++ b/modules/development/vscodium.nix
@@ -5,21 +5,11 @@
   ...
 }:
 
-let 
-  enable_vscode = 
-    if config.networking.hostName == "marty-pc"
-    then true
-    else if config.networking.hostName == "marty-latitude"
-    then true
-    else false;
-in 
-
-
 {
   programs.vscode = {
-    enable = enable_vscode;
+    enable = true;
     package = pkgs.vscodium;
-    defaultEditor = enable_vscode;
+    defaultEditor = true;
     extensions = with pkgs.vscode-extensions; [
       catppuccin.catppuccin-vsc
       catppuccin.catppuccin-vsc-icons
diff --git a/modules/import_modules.nix b/modules/import_modules.nix
new file mode 100644
index 0000000..7062de3
--- /dev/null
+++ b/modules/import_modules.nix
@@ -0,0 +1,14 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+{
+  imports = [
+    ./development/import_development.nix
+    ./window_manager/import_wm.nix
+
+  ];
+}
diff --git a/modules/window_manager/hyprland.nix b/modules/window_manager/hyprland.nix
index ba9ee16..d4409a5 100644
--- a/modules/window_manager/hyprland.nix
+++ b/modules/window_manager/hyprland.nix
@@ -5,23 +5,14 @@
   ...
 }:
 
-let 
-  enable_hyprland = 
-    if config.networking.hostName == "marty-pc"
-    then true
-    else if config.networking.hostName == "marty-latitude"
-    then true
-    else false;
-in 
-
 {
   programs = {
     hyprland = {
-      enable = enable_hyprland;
-      xwayland.enable = enable_hyprland;
+      enable = true;
+      xwayland.enable = true;
     };
     hyprlock = {
-      enable = enable_hyprland;
+      enable = true;
     };
   };
 }
diff --git a/modules/window_manager/imports.nix b/modules/window_manager/import_wm.nix
similarity index 100%
rename from modules/window_manager/imports.nix
rename to modules/window_manager/import_wm.nix
diff --git a/modules/window_manager/waybar.nix b/modules/window_manager/waybar.nix
index 16308a1..1a45ab0 100644
--- a/modules/window_manager/waybar.nix
+++ b/modules/window_manager/waybar.nix
@@ -5,19 +5,10 @@
   ...
 }:
 
-let 
-  enable_waybar = 
-    if config.networking.hostName == "marty-pc"
-    then true
-    else if config.networking.hostName == "marty-latitude"
-    then true
-    else false;
-in 
-
 {
   programs = {
     waybar = {
-      enable = enable_waybar;
+      enable = true;
     };
   };
 }
diff --git a/system/imports.nix b/system/import_system.nix
similarity index 61%
rename from system/imports.nix
rename to system/import_system.nix
index 393374f..808ae98 100644
--- a/system/imports.nix
+++ b/system/import_system.nix
@@ -5,8 +5,9 @@
   ...
 }:
 
-./system/imports.nix ./modules/imports.nix {
+{
   imports = [
     ./boot.nix
+
   ];
 }