restruct

flake.lock

@@ -243,6 +243,21 @@
         "type": "github"
       }
     },
+    "flake-utils_4": {
+      "locked": {
+        "lastModified": 1659877975,
+        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "git-hooks": {
       "inputs": {
         "flake-compat": "flake-compat_4",
@@ -472,6 +487,27 @@
         "type": "github"
       }
     },
+    "nix-gl": {
+      "inputs": {
+        "flake-utils": "flake-utils_4",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1713543440,
+        "narHash": "sha256-lnzZQYG0+EXl/6NkGpyIz+FEOc/DSEG57AP1VsdeNrM=",
+        "owner": "nix-community",
+        "repo": "nixgl",
+        "rev": "310f8e49a149e4c9ea52f1adf70cdc768ec53f8a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixgl",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1717794163,
@@ -586,6 +622,7 @@
         "home-manager": "home-manager",
         "lanzaboote": "lanzaboote",
         "neovim-nightly-overlay": "neovim-nightly-overlay",
+        "nix-gl": "nix-gl",
         "nixpkgs": "nixpkgs_2",
         "nixpkgs-stable": "nixpkgs-stable_2",
         "systems": "systems_3"

flake.nix

@@ -56,7 +56,7 @@
     nixosConfigurations = {
       cnix = lib.nixosSystem {
         modules = [
-          ./hosts/cnix
+          ./nixos/hosts/cnix
           lanzaboote.nixosModules.lanzaboote
         ];
         specialArgs = {
@@ -64,7 +64,7 @@
         };
       };
       adampad = lib.nixosSystem {
-        modules = [./hosts/adampad];
+        modules = [./nixos/hosts/adampad];
         specialArgs = {
           inherit inputs outputs;
         };

home/extra/cnst.nix

@@ -39,7 +39,6 @@
     wpa_supplicant
 
     # SYSTEM
-    ntfs3g
     btop
     htop
   ];

home/users/cnst/home.nix

@@ -9,8 +9,8 @@
 }: {
   # You can import other home-manager modules here
   imports = [
-    ../core/cnst.nix
+    ../../core/cnst.nix
-    ../extra/cnst.nix
+    ../../extra/cnst.nix
   ];
 
   nixpkgs = {

nixos/core/default.nix

@@ -56,6 +56,7 @@
       unrar
       xdg-utils
       xdg-user-dirs
+      ntfs3g
       udiskie
       wlroots
       fzf