123

modules/.examples/umport.nix

@@ -1,12 +0,0 @@
-{
-  imports = inputs.nypkgs.legacyPackages.${pkgs.system}.lib.umport {
-    path = ./.;
-    include = [
-      ./somed4/somef3.nix
-    ];
-    exclude = [
-      ./somed4
-      ./somef4.nix
-    ];
-  };
-}

modules/essentials/default.nix

@@ -5,7 +5,6 @@
 {
   imports = [
     ./packages.nix
-    ./programs.nix
     ./services.nix
     ./settings.nix
     ./tty.nix

modules/essentials/packages.nix

@@ -60,4 +60,31 @@
       nftables
     ];
   };
+  programs = {
+    git = {
+      enable = true;
+      config = {
+        user = {
+          name = "oqyude";
+          email = "oqyude@gmail.com";
+        };
+      };
+    };
+    lazygit.enable = true;
+    yazi = {
+      enable = true;
+    };
+    bat.enable = true;
+    command-not-found.enable = false;
+    nix-index.enable = true;
+    nh = {
+      enable = true;
+      flake = "/etc/nixos";
+      clean = {
+        enable = true;
+        extraArgs = "--keep 3 --keep-since 2d";
+        dates = "daily";
+      };
+    };
+  };
 }

modules/essentials/programs.nix

@@ -1,33 +0,0 @@
-{
-  config,
-  ...
-}:
-{
-  programs = {
-    git = {
-      enable = true;
-      config = {
-        user = {
-          name = "oqyude";
-          email = "oqyude@gmail.com";
-        };
-      };
-    };
-    lazygit.enable = true;
-    yazi = {
-      enable = true;
-    };
-    bat.enable = true;
-    command-not-found.enable = false;
-    nix-index.enable = true;
-    nh = {
-      enable = true;
-      flake = "/etc/nixos";
-      clean = {
-        enable = true;
-        extraArgs = "--keep 3 --keep-since 2d";
-        dates = "daily";
-      };
-    };
-  };
-}