feat!(thrall): Update to nixos-unstable

flake.nix

@@ -1,20 +1,14 @@
 {
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     nixpkgs-droid.url = "github:NixOS/nixpkgs/nixos-23.05";
-    nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
 
     pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";
     pre-commit-hooks.inputs.nixpkgs.follows = "nixpkgs";
 
     home-manager = {
-      url = "github:nix-community/home-manager/release-23.11";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    home-manager-unstable = {
       url = "github:nix-community/home-manager";
-      inputs.nixpkgs.follows = "nixpkgs-unstable";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
 
     # simple mailserver
@@ -30,7 +24,7 @@
 
     emacs = {
       url = "github:nix-community/emacs-overlay";
-      inputs.nixpkgs.follows = "nixpkgs-unstable";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
 
     #    simplex-chat = {
@@ -48,94 +42,88 @@
     disko.inputs.nixpkgs.follows = "nixpkgs";
   };
 
-  outputs = { self, home-manager, nixpkgs, nixpkgs-unstable, pre-commit-hooks
-    , ... }@inputs: {
-      checks."x86_64-linux" = let
-        system = "x86_64-linux";
-        pkgs = import nixpkgs { inherit system; };
-      in {
-        pre-commit-check = pre-commit-hooks.lib.${system}.run {
-          src = ./.;
-          settings = { ormolu.defaultExtensions = [ "GHC2021" ]; };
-          tools.fourmolu = pkgs.haskellPackages.fourmolu;
-          hooks = {
-            nixfmt.enable = true;
-            fourmolu.enable = true;
-            hpack.enable = true;
-            hlint.enable = true;
-          };
+  outputs = { self, home-manager, nixpkgs, pre-commit-hooks, ... }@inputs: {
+    checks."x86_64-linux" = let
+      system = "x86_64-linux";
+      pkgs = import nixpkgs { inherit system; };
+    in {
+      pre-commit-check = pre-commit-hooks.lib.${system}.run {
+        src = ./.;
+        settings = { ormolu.defaultExtensions = [ "GHC2021" ]; };
+        tools.fourmolu = pkgs.haskellPackages.fourmolu;
+        hooks = {
+          nixfmt.enable = true;
+          fourmolu.enable = true;
+          hpack.enable = true;
+          hlint.enable = true;
         };
       };
-
-      nixosConfigurations."thrall" = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
-        specialArgs = { inherit inputs; };
-        modules = let
-          postfix-overlay = final: prev: {
-            postfix = nixpkgs-unstable.legacyPackages."x86_64-linux".postfix;
-          };
-        in [
-          ({ inputs, lib, ... }: {
-            nixpkgs = {
-              config.allowUnfree = true;
-              overlays = with inputs; [ emacs.overlay postfix-overlay ];
-            };
-            nix.registry = lib.mapAttrs (_: value: { flake = value; }) inputs;
-          })
-          ./hosts/thrall
-          home-manager.nixosModules.home-manager
-          {
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-            home-manager.users.alex = import ./home/alex/cli.nix;
-          }
-        ];
-      };
-
-      nixosConfigurations."dregil" = nixpkgs-unstable.lib.nixosSystem {
-        system = "x86_64-linux";
-        specialArgs = { inherit inputs; };
-        modules = [ ./hosts/dregil ];
-      };
-
-      nixosConfigurations."igor" = nixpkgs-unstable.lib.nixosSystem {
-        system = "x86_64-linux";
-        specialArgs = { inherit inputs; };
-        modules = [ ./hosts/igor ];
-      };
-
-      nixOnDroidConfigurations.default = with inputs;
-        nix-on-droid.lib.nixOnDroidConfiguration {
-          modules = [
-            ./hosts/redmi
-            { nix.registry.nixpkgs.flake = nixpkgs-droid; }
-            { nix.nixPath = [ "nixpkgs=${nixpkgs-droid}" ]; }
-          ];
-        };
-
-      devShells."x86_64-linux".default = let
-        system = "x86_64-linux";
-        pkgs = import nixpkgs { inherit system; };
-      in pkgs.haskellPackages.shellFor {
-        inherit (self.checks.${system}.pre-commit-check) shellHook;
-
-        packages = p: [ p.xmonad p.xmonad-contrib ];
-
-        withHoogle = true;
-
-        nativeBuildInputs = with pkgs; [
-          haskellPackages.haskell-language-server
-          haskellPackages.fourmolu
-          haskellPackages.hspec-discover
-          haskellPackages.doctest
-          haskellPackages.xmonad
-          haskellPackages.xmonad-contrib
-          cabal-install
-          ghcid
-          nixfmt
-          hpack
-          hlint
-        ];
-      };
     };
+
+    nixosConfigurations."thrall" = nixpkgs.lib.nixosSystem {
+      system = "x86_64-linux";
+      specialArgs = { inherit inputs; };
+      modules = [
+        ({ inputs, lib, ... }: {
+          nixpkgs = {
+            config.allowUnfree = true;
+            overlays = with inputs; [ emacs.overlay ];
+          };
+        })
+        ./hosts/thrall
+        home-manager.nixosModules.home-manager
+        {
+          home-manager.useGlobalPkgs = true;
+          home-manager.useUserPackages = true;
+          home-manager.users.alex = import ./home/alex/cli.nix;
+        }
+      ];
+    };
+
+    nixosConfigurations."dregil" = nixpkgs.lib.nixosSystem {
+      system = "x86_64-linux";
+      specialArgs = { inherit inputs; };
+      modules = [ ./hosts/dregil ];
+    };
+
+    nixosConfigurations."igor" = nixpkgs.lib.nixosSystem {
+      system = "x86_64-linux";
+      specialArgs = { inherit inputs; };
+      modules = [ ./hosts/igor ];
+    };
+
+    nixOnDroidConfigurations.default = with inputs;
+      nix-on-droid.lib.nixOnDroidConfiguration {
+        modules = [
+          ./hosts/redmi
+          { nix.registry.nixpkgs.flake = nixpkgs-droid; }
+          { nix.nixPath = [ "nixpkgs=${nixpkgs-droid}" ]; }
+        ];
+      };
+
+    devShells."x86_64-linux".default = let
+      system = "x86_64-linux";
+      pkgs = import nixpkgs { inherit system; };
+    in pkgs.haskellPackages.shellFor {
+      inherit (self.checks.${system}.pre-commit-check) shellHook;
+
+      packages = p: [ p.xmonad p.xmonad-contrib ];
+
+      withHoogle = true;
+
+      nativeBuildInputs = with pkgs; [
+        haskellPackages.haskell-language-server
+        haskellPackages.fourmolu
+        haskellPackages.hspec-discover
+        haskellPackages.doctest
+        haskellPackages.xmonad
+        haskellPackages.xmonad-contrib
+        cabal-install
+        ghcid
+        nixfmt
+        hpack
+        hlint
+      ];
+    };
+  };
 }