diff --git a/flake.lock b/flake.lock
index 516da5e..f4af25c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -52,22 +52,34 @@
         "type": "github"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1784796856,
+        "narHash": "sha256-vwxWgF+Gj276WznzGb1LxGsK/39HaQwgQXiU3EkC844=",
+        "rev": "e2587caef70cea85dd97d7daab492899902dbf5d",
+        "type": "tarball",
+        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1040357.e2587caef70c/nixexprs.tar.xz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"
+      }
+    },
     "noctalia": {
       "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
+        "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1784987374,
-        "narHash": "sha256-RfO7GURPZZr30LSRrNJAr7ruyLK11rHnWMntENSKT34=",
+        "lastModified": 1785057679,
+        "narHash": "sha256-7s3NWitLRzpkhWmTjzSvUMI975WTpLV5olfpIeyHTzo=",
         "owner": "noctalia-dev",
         "repo": "noctalia",
-        "rev": "9de30388c0df8bc1e8db7405331a3598fc3a8015",
+        "rev": "2b4764f0709d962c0e123b85977005a187f5d8fa",
         "type": "github"
       },
       "original": {
         "owner": "noctalia-dev",
+        "ref": "cachix",
         "repo": "noctalia",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index cf3d7aa..cf4bf1d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,11 +1,16 @@
 {
   description = "Noctalica test";
 
+  nixConfig = {
+    extra-substituters = [ "https://noctalia.cachix.org" ];
+    extra-trusted-public-keys = [ "noctalia.cachix.org-1:pCOR47nnMEo5thcxNDtzWpOxNFQsBRglJzxWPp3dkU4=" ];
+  };
+
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
     noctalia = {
-      url = "github:noctalia-dev/noctalia";
-      inputs.nixpkgs.follows = "nixpkgs"; 
+      url = "github:noctalia-dev/noctalia/cachix";
+      # inputs.nixpkgs.follows = "nixpkgs"; 
     };
     home-manager = {
       url = "github:nix-community/home-manager";
@@ -20,20 +25,22 @@
   outputs = { self, nixpkgs, noctalia, home-manager, lazyvim, ...}@inputs: {
     nixosConfigurations.vm = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
+      specialArgs = { inherit inputs; };
 
       modules = [
-	home-manager.nixosModules.home-manager {
-	  home-manager.useGlobalPkgs = true;
-	  home-manager.useUserPackages = true;
+        home-manager.nixosModules.home-manager {
+          home-manager.useGlobalPkgs = true;
+          home-manager.useUserPackages = true;
 
           home-manager.extraSpecialArgs = {
             inherit inputs;
           };
 
-	  home-manager.users.peter = import ./modules/home.nix;
-	}
-	./modules/configuration.nix
+          home-manager.users.peter = import ./modules/home.nix;
+        }
 
+        ./modules/niri.nix
+        ./modules/configuration.nix
       ];
     };
   };
diff --git a/modules/configuration.nix b/modules/configuration.nix
index 0fe77c4..0509e31 100644
--- a/modules/configuration.nix
+++ b/modules/configuration.nix
@@ -2,13 +2,17 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ config, pkgs, home-manager, ... }:
+{
+  config,
+  pkgs,
+  ...
+}:
 
 {
-  imports =
-    [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
-   ];
+  imports = [
+    # Include the results of the hardware scan.
+    ./hardware-configuration.nix
+  ];
 
   # Bootloader.
   boot.loader.grub.enable = true;
@@ -59,8 +63,11 @@
   users.users."peter" = {
     isNormalUser = true;
     description = "peter";
-    extraGroups = [ "networkmanager" "wheel" ];
-    packages = with pkgs; [];
+    extraGroups = [
+      "networkmanager"
+      "wheel"
+    ];
+    packages = with pkgs; [ ];
   };
 
   programs.niri.enable = true;
@@ -85,21 +92,24 @@
   xdg.portal.enable = true;
 
   home-manager.users.peter = { pkgs, ... }: {
-  home.packages = [ pkgs.atool pkgs.httpie ];
-  programs.bash.enable = true;
+    home.packages = [
+      pkgs.atool
+      pkgs.httpie
+    ];
+    programs.bash.enable = true;
 
-  programs.alacritty.enable = true; # Super+T in the default setting (terminal)
-  programs.fuzzel.enable = true; # Super+D in the default setting (app launcher)
-  programs.swaylock.enable = true; # Super+Alt+L in the default setting (screen locker)
-  programs.waybar.enable = true; # launch on startup in the default setting (bar)
+    programs.alacritty.enable = true; # Super+T in the default setting (terminal)
+    programs.fuzzel.enable = true; # Super+D in the default setting (app launcher)
+    programs.swaylock.enable = true; # Super+Alt+L in the default setting (screen locker)
+    # programs.waybar.enable = true; # launch on startup in the default setting (bar)
 
-  services.mako.enable = true; # notification daemon
-  services.swayidle.enable = true; # idle management daemon
-  services.polkit-gnome.enable = true; # polkit
+    services.mako.enable = true; # notification daemon
+    services.swayidle.enable = true; # idle management daemon
+    services.polkit-gnome.enable = true; # polkit
 
-  home.stateVersion = "26.05"; # Please read the comment before changing.
+    home.stateVersion = "26.05"; # Please read the comment before changing.
 
-};
+  };
 
   systemd.user.services.niri.enableDefaultPath = false;
 
@@ -109,11 +119,26 @@
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
-  #  vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
-  #  wget
+    #  vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
+    #  wget
     neovim
     xwayland-satellite
-    git 
+    git
+    ghostty
+    python3
+    fd
+    gcc
+    ripgrep
+    fzf
+    lazygit
+    unzip
+    wget
+    lua51Packages.luarocks
+    luaPackages.tree-sitter-cli
+    nodejs
+    rustup
+    nixfmt
+    statix
   ];
   programs.xwayland.enable = true;
 
@@ -144,5 +169,8 @@
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
   system.stateVersion = "26.05"; # Did you read the comment?
 
-  nix.settings.experimental-features = [ "nix-command" "flakes"];
+  nix.settings.experimental-features = [
+    "nix-command"
+    "flakes"
+  ];
 }
diff --git a/modules/home.nix b/modules/home.nix
index a2c3ebd..13725d4 100644
--- a/modules/home.nix
+++ b/modules/home.nix
@@ -15,7 +15,7 @@ in {
   ];
 
   # Beispiel: Git‑Konfiguration
-  programs.git.settings.user = {
+  programs.git.settings.peter = {
     enable = true;
     userName  = "peter";
     userEmail = "peter@email";
diff --git a/modules/niri.nix b/modules/niri.nix
index ed9f82c..13d8142 100644
--- a/modules/niri.nix
+++ b/modules/niri.nix
@@ -1,6 +1,15 @@
-{ inputs, config, pkgs, ... }:
+{ inputs, pkgs, ... }:
 {
-  environmen.systemPackages =  with pkgs; [
-    inputs.noctalia.packages.${pkgs.stdenc.hostPlatform.system}.default
+  environment.systemPackages = with pkgs; [
+    inputs.noctalia.packages.${pkgs.stdenv.hostPlatform.system}.default
   ];
+
+  imports = [
+    inputs.noctalia.nixosModules.default
+  ];
+
+  programs.noctalia = {
+    enable = true;
+    systemd.enable = true;
+  };
 }
diff --git a/modules/noctalia.nix b/modules/noctalia.nix
new file mode 100644
index 0000000..e69de29