From b1a3561040177e56221d82c3fd8706e34c99a68c Mon Sep 17 00:00:00 2001
From: LunarAkai <akai@lunarakai.de>
Date: Fri, 14 Mar 2025 16:30:17 +0100
Subject: [PATCH] blub

---
 flake.lock                                    | 79 +++++++++++++++++++
 flake.nix                                     | 15 +++-
 .../hummingbird/configuration.nix             |  1 +
 home.nix => hosts/hummingbird/home.nix        |  0
 4 files changed, 91 insertions(+), 4 deletions(-)
 rename configuration.nix => hosts/hummingbird/configuration.nix (99%)
 rename home.nix => hosts/hummingbird/home.nix (100%)

diff --git a/flake.lock b/flake.lock
index 8688e7b..8db08a1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,50 @@
 {
   "nodes": {
+    "alejandra": {
+      "inputs": {
+        "fenix": "fenix",
+        "flakeCompat": "flakeCompat",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1730688725,
+        "narHash": "sha256-g0SSfTWZ5mtMOpQic+eqq9sXMy1E/7yKxxfupZd9V4A=",
+        "owner": "kamadorueda",
+        "repo": "alejandra",
+        "rev": "2bb91e309ca99656addff5c74545acbf5813636d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "kamadorueda",
+        "ref": "3.1.0",
+        "repo": "alejandra",
+        "type": "github"
+      }
+    },
+    "fenix": {
+      "inputs": {
+        "nixpkgs": [
+          "alejandra",
+          "nixpkgs"
+        ],
+        "rust-analyzer-src": "rust-analyzer-src"
+      },
+      "locked": {
+        "lastModified": 1730615655,
+        "narHash": "sha256-2HBR3zLn57LXKNRtxBb+O+uDqHM4n0pz51rPayMl4cg=",
+        "owner": "nix-community",
+        "repo": "fenix",
+        "rev": "efeb50e2535b17ffd4a135e6e3e5fd60a525180c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "fenix",
+        "type": "github"
+      }
+    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": "nixpkgs-lib"
@@ -36,6 +81,22 @@
         "type": "github"
       }
     },
+    "flakeCompat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -183,11 +244,29 @@
     },
     "root": {
       "inputs": {
+        "alejandra": "alejandra",
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs",
         "nvf": "nvf"
       }
     },
+    "rust-analyzer-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1730555913,
+        "narHash": "sha256-KNHZUlqsEibg3YtfUyOFQSofP8hp1HKoY+laoesBxRM=",
+        "owner": "rust-lang",
+        "repo": "rust-analyzer",
+        "rev": "f17a5bbfd0969ba2e63a74505a80e55ecb174ed9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rust-lang",
+        "ref": "nightly",
+        "repo": "rust-analyzer",
+        "type": "github"
+      }
+    },
     "rust-overlay": {
       "inputs": {
         "nixpkgs": [
diff --git a/flake.nix b/flake.nix
index 2207f07..a24c52a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,13 +6,16 @@
 	
     nvf.url = "github:notashelf/nvf";
 
+    alejandra.url = "github:kamadorueda/alejandra/3.1.0";
+    alejandra.inputs.nixpkgs.follows = "nixpkgs";
+
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
 
-  outputs = { self, nixpkgs, home-manager, nvf, ... }@inputs: {
+  outputs = { self, nixpkgs, home-manager, nvf, alejandra, ... }@inputs: {
     # use "nixos", or your hostname as the name of the configuration
     # it's a better practice than "default" shown in the video
     
@@ -26,10 +29,14 @@
 	nixos = nixpkgs.lib.nixosSystem {
       		specialArgs = {inherit inputs;};
 			modules = [
-        		./configuration.nix
+            {
+                          environment.systemPackages = [alejandra.defaultPackage.x86_64-linux];
+            }
+
+        		./hosts/hummingbird/configuration.nix
         		inputs.home-manager.nixosModules.default
-			nvf.nixosModules.default
-			./nvf-configuration.nix
+            nvf.nixosModules.default
+            ./nvf-configuration.nix
       			];
     		};
   	};
diff --git a/configuration.nix b/hosts/hummingbird/configuration.nix
similarity index 99%
rename from configuration.nix
rename to hosts/hummingbird/configuration.nix
index 2104e1b..1d92d21 100644
--- a/configuration.nix
+++ b/hosts/hummingbird/configuration.nix
@@ -99,6 +99,7 @@
        git
        neovim
        rustup
+       vscode.fhs
     ];
   };
  
diff --git a/home.nix b/hosts/hummingbird/home.nix
similarity index 100%
rename from home.nix
rename to hosts/hummingbird/home.nix