toggle physics

configuration.nix

@@ -16,7 +16,9 @@
   ];
   imports = [
     # Include the results of the hardware scan.
-    ./imports.nix
+    ./system/import_system.nix
+    ./user/marty.nix
+
   ];
   # programs.walker.enable = true;
 

flake.nix

@@ -31,9 +31,8 @@
           system = "x86_64-linux";
           specialArgs = { inherit inputs; };
           modules = [
-            ./marty-pc.nix
+            ./hosts/marty-pc.nix
             ./configuration.nix
-            ./user/marty.nix
             home-manager.nixosModules.home-manager
           ];
         };
@@ -41,9 +40,8 @@
           system = "x86_64-linux";
           specialArgs = { inherit inputs; };
           modules = [
-            ./marty-server.nix
+            ./hosts/marty-server.nix
             ./configuration.nix
-            ./user/marty.nix
             home-manager.nixosModules.home-manager
 
           ];
@@ -52,9 +50,8 @@
           system = "x86_64-linux";
           specialArgs = { inherit inputs; };
           modules = [
-            ./marty-latitude.nix
+            ./hosts/marty-latitude.nix
             ./configuration.nix
-            ./user/marty.nix
             home-manager.nixosModules.home-manager
           ];
         };

hosts/marty-latitude.nix

@@ -19,7 +19,7 @@
     useUserPackages = true;
 
     users = {
-      marty = import ./modules/home.nix;
+      marty = import ./../modules/home.nix;
     };
   };
 

hosts/marty-pc.nix

@@ -26,7 +26,7 @@
     useGlobalPkgs = true;
     useUserPackages = true;
     users = {
-      marty = import ./modules/home.nix;
+      marty = import ./../modules/home.nix;
     };
   };
 

hosts/marty-server.nix

@@ -26,7 +26,7 @@
     useGlobalPkgs = true;
     useUserPackages = true;
     users = {
-      marty = import ./modules/home.nix;
+      marty = import ./../modules/home.nix;
     };
   };
 

imports.nix

@@ -1,15 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  inputs,
-  ...
-}:
-
-{
-  imports = [
-    ./system/import_system.nix
-    ./modules/import_modules.nix
-
-  ];
-}

modules/development/default.nix

@@ -6,6 +6,10 @@
 }:
 
 {
+  development = {
+    vscodium.enable = true;
+    git.enable = true;
+  };
   imports = [
     ./git.nix
     ./vscodium.nix

modules/development/git.nix

@@ -4,34 +4,30 @@
   pkgs,
   ...
 }:
-let
-  enable_git =
-    if config.networking.hostName == "marty-pc" then
-      true
-    else if config.networking.hostName == "marty-latitude" then
-      true
-    else if config.networking.hostName == "marty-server" then
-      true
-    else
-      false;
-in
 
 {
-  programs = {
-    git = {
-      enable = enable_git;
-      config = {
-        init = {
-          defaultBranch = "main";
+  options = {
+    development = {
+      git.enable = lib.mkEnableOption "enable git";
+    };
+  };
+
+  config = lib.mkIf config.development.git.enable {
+    programs = {
+      git = {
+        enable = true;
+        settings = {
+          init = {
+            defaultBranch = "main";
+          };
+          user = {
+            email = "marty@marty.tf";
+            name = "marty";
+          };
+          push = {
+            autoSetupRemote = true;
+          };
         };
-        user = {
-          email = "marty@marty.tf";
-          name = "marty";
-        };
-        push = {
-          autoSetupRemote = true;
-        };
-        credential.helper = "libsecret";
       };
     };
   };

modules/development/vscodium.nix

@@ -5,33 +5,28 @@
   ...
 }:
 
-let
-  enable_vscodium =
-    if config.networking.hostName == "marty-pc" then
-      true
-    else if config.networking.hostName == "marty-latitude" then
-      true
-    else if config.networking.hostName == "marty-server" then
-      false
-    else
-      false;
-in
-
 {
-  programs.vscode = {
-    enable = enable_vscodium;
-    package = pkgs.vscodium;
-    defaultEditor = enable_vscodium;
-    extensions = with pkgs.vscode-extensions; [
-      catppuccin.catppuccin-vsc
-      catppuccin.catppuccin-vsc-icons
-      jnoortheen.nix-ide
-      alefragnani.project-manager
-      naumovs.color-highlight
-      geequlim.godot-tools
-      stylelint.vscode-stylelint
-      ecmel.vscode-html-css
-      esbenp.prettier-vscode
-    ];
+  options = {
+    development = {
+      vscodium.enable = lib.mkEnableOption "enable vscodium";
+    };
+  };
+
+  config = lib.mkIf config.development.vscodium.enable {
+    programs.vscode = {
+      enable = true;
+      package = pkgs.vscodium;
+      profiles.default.extensions = with pkgs.vscode-extensions; [
+        catppuccin.catppuccin-vsc
+        catppuccin.catppuccin-vsc-icons
+        jnoortheen.nix-ide
+        alefragnani.project-manager
+        naumovs.color-highlight
+        geequlim.godot-tools
+        stylelint.vscode-stylelint
+        ecmel.vscode-html-css
+        esbenp.prettier-vscode
+      ];
+    };
   };
 }

modules/home.nix

@@ -83,6 +83,7 @@
 
   imports = [
     ./window_manager
+    ./development
     inputs.walker.homeManagerModules.default
 
   ];

modules/import_modules.nix

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

modules/window_manager/bar.nix

@@ -5,17 +5,17 @@
   ...
 }:
 
-# let
-#   enable_waybar =
-#     if config.networking.hostName == "marty-pc" then
-#       true
-#     else if config.networking.hostName == "marty-latitude" then
-#       true
-#     else if config.networking.hostName == "marty-server" then
-#       false
-#     else
-#       false;
-# in
+let
+  enable_waybar =
+    if config.networking.hostName == "marty-pc" then
+      true
+    else if config.networking.hostName == "marty-latitude" then
+      true
+    else if config.networking.hostName == "marty-server" then
+      false
+    else
+      false;
+in
 
 {
   programs = {

modules/window_manager/window_manager.nix

@@ -5,17 +5,17 @@
   ...
 }:
 
-# let
-#   enable_hyprland =
-#     if config.networking.hostName == "marty-pc" then
-#       true
-#     else if config.networking.hostName == "marty-latitude" then
-#       true
-#     else if config.networking.hostName == "marty-server" then
-#       false
-#     else
-#       false;
-# in
+let
+  enable_hyprland =
+    if config.networking.hostName == "marty-pc" then
+      true
+    else if config.networking.hostName == "marty-latitude" then
+      true
+    else if config.networking.hostName == "marty-server" then
+      false
+    else
+      false;
+in
 
 {
   xdg.portal = {