From c4d1a0d8cbe85b878868ac4102bde2785164cf7a Mon Sep 17 00:00:00 2001
From: Theo Hahn <theo.hahn1@icloud.com>
Date: Sun, 20 Sep 2026 13:42:02 +0200
Subject: [PATCH] FINAL

---
 configuration.nix |  1 +
 flake.lock        | 37 ++++++++++++-------------------------
 flake.nix         | 12 ++++++++----
 home.nix          | 33 +++++++++++++++++----------------
 4 files changed, 38 insertions(+), 45 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index fa94ff8..4d096e8 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -17,6 +17,7 @@
   boot.loader.efi.efiSysMountPoint = "/boot";
 
   networking.hostName = "tnix"; # Define your hostname.
+  services.upower.enable = true;
 
   hardware.firmware = [
     (pkgs.stdenvNoCC.mkDerivation (final: {
diff --git a/flake.lock b/flake.lock
index 820ef5f..81bb43d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,50 +2,37 @@
   "nodes": {
     "home-manager": {
       "inputs": {
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1789765459,
-        "narHash": "sha256-voJJ5IZR4w2149u2Jm/j2zifeWROlpZQ+JzmCQwjgn8=",
+        "lastModified": 1789267039,
+        "narHash": "sha256-LWiBv9yAYFi2LPbUhDGHPGKYskJQjj2fw12OlyO1uQo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "17903129f47656fa4d07e78ad87f6592ff4f2527",
+        "rev": "ec172013fa62135f58fb58dd17ae9651e8f39727",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
+        "ref": "release-26.05",
         "repo": "home-manager",
         "type": "github"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1788865024,
-        "narHash": "sha256-3YkAzvtt4LoE11IcBDzPshIF3fJ0aIoILqE7dAg8CLI=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "422d1ae605d7fcd9896412b37dc065c456c0eefb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1789632929,
-        "narHash": "sha256-RjR8AyvGlWuw16XRj7C1YDEw4E27ciuyPeB2nDMzgTU=",
+        "lastModified": 1789749394,
+        "narHash": "sha256-cFTsMQz8Hzn8MT49oaeLSHg62tE86NykugCWkeM2ypk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "a32edd7654519351e48e80372a928df336394670",
+        "rev": "cf9d2fb3e50fa1cd5114c47505ea9177f7ff5f49",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixpkgs-unstable",
+        "ref": "nixos-26.05",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -53,7 +40,7 @@
     "root": {
       "inputs": {
         "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index 098d46a..8c27efc 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,9 +1,12 @@
 {
-  description = "NixOS configuration";
+  description = "tNixOS configuration";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
-    home-manager.url = "github:nix-community/home-manager";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05";
+    home-manager = {
+      url = "github:nix-community/home-manager/release-26.05";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = inputs@{ nixpkgs, home-manager, ... }: {
@@ -12,12 +15,13 @@
         system = "x86_64-linux";
         modules = [
           ./configuration.nix
+
+          ./home.nix
           home-manager.nixosModules.home-manager
           {
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
             home-manager.extraSpecialArgs = { inherit inputs; };
-            home-manager.users.theo = ./home.nix;
           }
         ];
       };
diff --git a/home.nix b/home.nix
index d61616a..1d9a264 100644
--- a/home.nix
+++ b/home.nix
@@ -4,26 +4,27 @@
     theo = {
       isNormalUser = true;
       extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
-      packages = with pkgs; [
-        lazygit
-        helix
-        yazi
-
-        git
-        tree
-        just
-        fastfetch
-
-        ashell
-        kitty
-        hyprlauncher
-      ];
     };
   };
   
   home-manager.users.theo = { pkgs, ... }: {
-    home.packages = with pkgs; [ atool httpie ];
+    home.packages = with pkgs; [
+      lazygit
+      helix
+      yazi
+
+      git
+      tree
+      just
+      fastfetch
+
+      ashell
+      kitty
+      hyprlauncher
+    ];
+
     programs.bash.enable = true;
-    home.stateVersion = "26.11";
+
+    home.stateVersion = "26.05";
   };
 }