new structure

kolyma-labs · Sep 15, 2024 · 4789160 · 4789160
1 parent 7f2a9cf
commit 4789160
Show file tree

Hide file tree

Showing 7 changed files with 91 additions and 213 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -25,13 +25,6 @@
 
     # Flake utils for eachSystem
     flake-utils.url = "github:numtide/flake-utils";
-
-    # Astro Neovim
-    # Non-flake repository
-    astronvim = {
-      url = "github:AstroNvim/AstroNvim/v3.40.3";
-      flake = false;
-    };
   };
 
   # In this context, outputs are mostly about getting home-manager what it
@@ -45,128 +38,81 @@
     , ...
     } @ inputs:
     let
-      inherit (self) outputs;
-
-      # Legacy packages are needed for home-manager
-      lib = nixpkgs.lib // home-manager.lib;
-
-      # Supported systems for your flake packages, shell, etc.
-      systems = [
-        "aarch64-linux"
-        "x86_64-linux"
-        "aarch64-darwin"
-        "x86_64-darwin"
-      ];
-
-      # This is a function that generates an attribute by calling a function you
-      # pass to it, with each system as an argument
-      forAllSystems = nixpkgs.lib.genAttrs systems;
-
-      # This is a function that generates an attribute by calling a function you
-      # pass to it, with each system as an argument
-      forEachSystem = f: lib.genAttrs systems (system: f pkgsFor.${system});
-
-      # This is a function that generates an attribute by calling a function you
-      # pass to it, with each system as an argument
-      pkgsFor = lib.genAttrs systems (system:
-        import nixpkgs {
-          inherit system;
-          config.allowUnfree = true;
-        });
+      # Self instance pointer
+      outputs = self;
 
-      # Define a development shell for each system
-      devShellFor = system:
+      afes = flake-utils.lib.eachDefaultSystem (system:
         let
-          pkgs = import nixpkgs {
-            inherit system;
-            config.allowUnfree = true;
-          };
+          pkgs = nixpkgs.legacyPackages.${system};
         in
-        pkgs.mkShell {
-          NIX_CONFIG = "extra-experimental-features = nix-command flakes repl-flake";
-          buildInputs = with pkgs; [
-            nix
-            nil
-            git
-            nixd
-            just
-            nixpkgs-fmt
-            nixpkgs-lint
-          ];
+        # Nixpkgs packages for the current system
+        {
+          # Your custom packages
+          # Acessible through 'nix build', 'nix shell', etc
+          packages = import ./pkgs { inherit pkgs; };
+
+          # Formatter for your nix files, available through 'nix fmt'
+          # Other options beside 'alejandra' include 'nixpkgs-fmt'
+          formatter = pkgs.nixpkgs-fmt;
+
+          # Development shells
+          devShells.default = import ./shell.nix { inherit pkgs; };
+        });
 
-          # Set environment variables, if needed
-          shellHook = ''
-            # export SOME_VAR=some_value
-            echo "Welcome to Kolyma's dotfiles!"
-          '';
+      afse = {
+        # Nixpkgs and Home-Manager helpful functions
+        lib = nixpkgs.lib // home-manager.lib;
+
+        # Your custom packages and modifications, exported as overlays
+        overlays = import ./overlays { inherit inputs; };
+
+        # Reusable nixos modules you might want to export
+        # These are usually stuff you would upstream into nixpkgs
+        nixosModules = import ./modules/nixos;
+
+        # Reusable home-manager modules you might want to export
+        # These are usually stuff you would upstream into home-manager
+        homeManagerModules = import ./modules/home;
+
+        # Reusable server modules you might want to export
+        # These are usually stuff you would upstream services to global
+        serverModules = import ./modules/server;
+
+        # NixOS configuration entrypoint
+        # Available through 'nixos-rebuild --flake .#your-hostname'
+        nixosConfigurations = {
+          "Kolyma-1" = nixpkgs.lib.nixosSystem {
+            specialArgs = { inherit inputs outputs; };
+            modules = [
+              # > Our main nixos configuration file <
+              ./nixos/kolyma-1/configuration.nix
+            ];
+          };
+          "Kolyma-2" = nixpkgs.lib.nixosSystem {
+            specialArgs = { inherit inputs outputs; };
+            modules = [
+              # > Our main nixos configuration file <
+              ./nixos/kolyma-2/configuration.nix
+            ];
+          };
+          "Kolyma-3" = nixpkgs.lib.nixosSystem {
+            specialArgs = { inherit inputs outputs; };
+            modules = [
+              # > Our main nixos configuration file <
+              ./nixos/kolyma-3/configuration.nix
+            ];
+          };
+          "Kolyma-4" = nixpkgs.lib.nixosSystem {
+            specialArgs = { inherit inputs outputs; };
+            modules = [
+              # > Our main nixos configuration file <
+              ./nixos/kolyma-4/configuration.nix
+            ];
+          };
         };
-    in
-    {
-      inherit lib;
 
-      # Your custom packages
-      # Acessible through 'nix build', 'nix shell', etc
-      packages = forEachSystem (pkgs: import ./pkgs { inherit pkgs; });
-
-      # Formatter for your nix files, available through 'nix fmt'
-      # Other options beside 'alejandra' include 'nixpkgs-fmt'
-      formatter =
-        forAllSystems (system: nixpkgs.legacyPackages.${system}.nixpkgs-fmt);
-
-      # Your custom packages and modifications, exported as overlays
-      overlays = import ./overlays { inherit inputs; };
-
-      # Reusable nixos modules you might want to export
-      # These are usually stuff you would upstream into nixpkgs
-      nixosModules = import ./modules/nixos;
-
-      # Reusable home-manager modules you might want to export
-      # These are usually stuff you would upstream into home-manager
-      homeManagerModules = import ./modules/home;
-
-      # Reusable server modules you might want to export
-      # These are usually stuff you would upstream services to global
-      serverModules = import ./modules/server;
-
-      # Reusable home-manager modules you might want to export
-      # These are usually stuff you would upstream into home-manager
-      # homeManagerModules = import ./modules/home;
-
-      # NixOS configuration entrypoint
-      # Available through 'nixos-rebuild --flake .#your-hostname'
-      nixosConfigurations = {
-        "Kolyma-1" = nixpkgs.lib.nixosSystem {
-          specialArgs = { inherit inputs outputs; };
-          modules = [
-            # > Our main nixos configuration file <
-            ./nixos/kolyma-1/configuration.nix
-          ];
-        };
-        "Kolyma-2" = nixpkgs.lib.nixosSystem {
-          specialArgs = { inherit inputs outputs; };
-          modules = [
-            # > Our main nixos configuration file <
-            ./nixos/kolyma-2/configuration.nix
-          ];
-        };
-        "Kolyma-3" = nixpkgs.lib.nixosSystem {
-          specialArgs = { inherit inputs outputs; };
-          modules = [
-            # > Our main nixos configuration file <
-            ./nixos/kolyma-3/configuration.nix
-          ];
-        };
-        "Kolyma-4" = nixpkgs.lib.nixosSystem {
-          specialArgs = { inherit inputs outputs; };
-          modules = [
-            # > Our main nixos configuration file <
-            ./nixos/kolyma-4/configuration.nix
-          ];
-        };
       };
-
-      # Development shells
-      devShell = lib.mapAttrs (system: _: devShellFor system) (lib.genAttrs systems { });
-      # devShells = lib.mapAttrs (system: _: devShellFor system) (lib.genAttrs systems {});
-    };
+    in
+    # Merging all final results
+    afse // afes;
 }
diff --git a/home/muzaffar.nix b/home/muzaffar.nix
diff --git a/modules/nixos/users/default.nix b/modules/nixos/users/default.nix
@@ -4,6 +4,5 @@
   sakhib = import ./sakhib.nix;
   sardor = import ./sardor.nix;
   shakhzod = import ./shakhzod.nix;
-  muzaffar = import ./muzaffar.nix;
   jakhongir = import ./jakhongir.nix;
 }
diff --git a/modules/nixos/users/muzaffar.nix b/modules/nixos/users/muzaffar.nix
diff --git a/nixos/kolyma-3/configuration.nix b/nixos/kolyma-3/configuration.nix
@@ -21,7 +21,6 @@
     outputs.nixosModules.users.sakhib
     outputs.nixosModules.users.sardor
     outputs.nixosModules.users.shakhzod
-    outputs.nixosModules.users.muzaffar
     outputs.nixosModules.users.jakhongir
 
     # Import your deployed service list

diff --git a/shell.nix b/shell.nix
@@ -7,16 +7,16 @@
   in
   import nixpkgs { overlays = [ ]; }
 , ...
-}: {
-  default = pkgs.mkShell {
-    NIX_CONFIG = "extra-experimental-features = nix-command flakes";
-    nativeBuildInputs = with pkgs; [
-      nix
-      nil
-      git
-      nixd
-      nixpkgs-fmt
-      nixpkgs-lint
-    ];
-  };
+}: pkgs.stdenv.mkDerivation {
+  name = "instances";
+
+  nativeBuildInputs = with pkgs; [
+    nix
+    nil
+    nixd
+    nixpkgs-fmt
+    git
+  ];
+
+  NIX_CONFIG = "extra-experimental-features = nix-command flakes";
 }