diff --git a/README.org b/README.org index 4a3a85d..0922968 100644 --- a/README.org +++ b/README.org @@ -740,7 +740,11 @@ Kaladin is my desktop machine. A powerhouse for the most part with a recent i7 a { config, pkgs, ... }: { - <> +imports = + [ + ./hardware-configuration.nix + ]; + <> # Use the systemd-boot EFI boot loader. diff --git a/flake.lock b/flake.lock index f43c045..24b5efc 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1663410592, - "narHash": "sha256-WkcXd6uAfSfJscflb2ivOPqCgCyQGo4nUkQwIUTXtjg=", + "lastModified": 1664189636, + "narHash": "sha256-86txnLOTwjBuY9e2rPJsTq5U0vmHBgWmSmRA9EGXDXE=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "350a3df35560f727046192cefd19e0d7e496a652", + "rev": "117975b8082f22730778f9ad4529ff001b01b6cf", "type": "github" }, "original": { @@ -59,11 +59,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1663328500, - "narHash": "sha256-7n+J/exp8ky4dmk02y5a9R7CGmJvHpzrHMzfEkMtSWA=", + "lastModified": 1664146938, + "narHash": "sha256-fIvsJ3qWiD6o3qH9iU66OsL8uG5C1FGXcuaNEctJv8M=", "owner": "nix-community", "repo": "home-manager", - "rev": "5427f3d1f0ea4357cd4af0bffee7248d640c6ffc", + "rev": "9e7394523eb4f298528d457e316fc752bdf07151", "type": "github" }, "original": { @@ -81,11 +81,11 @@ "wlroots": "wlroots" }, "locked": { - "lastModified": 1663413006, - "narHash": "sha256-eXLuq2YH/uYA6lVzZW5j+mW2c3jgrNuKbLxKLqXreyo=", + "lastModified": 1664130744, + "narHash": "sha256-zM+4pgzsYKS0EuQ3i0Epaq6Gb9xLo4wzxK/WZAw+lpM=", "owner": "vaxerski", "repo": "Hyprland", - "rev": "151e013241e29d0f4f2619db17257343503e20ea", + "rev": "f70b57f360f8117ecca67d6d7f75c1f87b098794", "type": "github" }, "original": { @@ -101,11 +101,11 @@ "nixpkgsUnstable": "nixpkgsUnstable" }, "locked": { - "lastModified": 1662543763, - "narHash": "sha256-Np3xjm+6WIw0fhq305pCuRZqa8d1O1OK01wNzx76+oM=", + "lastModified": 1663873107, + "narHash": "sha256-2Gw/XYByyrpgS0x5x9O/GjOSLeYnMAz7P9h3W7nr9bY=", "owner": "fort-nix", "repo": "nix-bitcoin", - "rev": "4e63301ac3ba170921fdb7adf4e9d3eeef003c35", + "rev": "34f6eb90d7d3971f08f2c5c04aa1b267d49c4743", "type": "github" }, "original": { @@ -117,11 +117,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1662099760, - "narHash": "sha256-MdZLCTJPeHi/9fg6R9fiunyDwP3XHJqDd51zWWz9px0=", + "lastModified": 1663760840, + "narHash": "sha256-ym5Iycs5H4cOaLfE2/vC0tsLp8XuBJQIHGV8/uXSy8M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "67e45078141102f45eff1589a831aeaa3182b41e", + "rev": "9bdbbaa634aa666eb6a27096bdcb991c59181244", "type": "github" }, "original": { @@ -133,11 +133,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1663244735, - "narHash": "sha256-+EukKkeAx6ithOLM1u5x4D12ZFuoi6vpPYjhNDmLz1o=", + "lastModified": 1664107978, + "narHash": "sha256-31I9XnIjXkUa62BM1Zr/ylKMf9eVO5PtoX2mGpmB7/U=", "owner": "nixos", "repo": "nixpkgs", - "rev": "178fea1414ae708a5704490f4c49ec3320be9815", + "rev": "72783a2d0dbbf030bff1537873dd5b85b3fb332f", "type": "github" }, "original": { @@ -149,11 +149,11 @@ }, "nixpkgsUnstable": { "locked": { - "lastModified": 1662096612, - "narHash": "sha256-R+Q8l5JuyJryRPdiIaYpO5O3A55rT+/pItBrKcy7LM4=", + "lastModified": 1663757063, + "narHash": "sha256-H+BPgoXuVcdi3g5BH4cact4osjfjntaTQTdA/HNiCYE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "21de2b973f9fee595a7a1ac4693efff791245c34", + "rev": "a0e390471362e27349abc1090197e09fe8c59d16", "type": "github" }, "original": { @@ -165,11 +165,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1663268520, - "narHash": "sha256-Jf6wkoMOhWUdx9d9UarWHExvOUDzVa98OsPYvbNLVYo=", + "lastModified": 1664106353, + "narHash": "sha256-HMJP80+DSxFySpWyuxz5+iNozS3+dVt0b4n6YMIU5/8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "823e2c9b0a0ec8b61b6583f48338072f137b6889", + "rev": "79d3ca08920364759c63fd3eb562e99c0c17044a", "type": "github" }, "original": { @@ -208,11 +208,11 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1661882030, - "narHash": "sha256-Kw0MG4rXdTnbndVLLCNwkXDmNszwdQZmm7pwI1R3Kds=", + "lastModified": 1663507239, + "narHash": "sha256-LISZtkPVe8lQ2N8YwVe+KxCkXWLP9mdw6Q2kG93wE8A=", "owner": "wlroots", "repo": "wlroots", - "rev": "fd0b0276c9ecc159549acff48b932b83ec3b4f12", + "rev": "2ad25b1460400e66ea26bd6489b04072be7d9dbb", "type": "gitlab" }, "original": { diff --git a/system/kaladin/configuration.nix b/system/kaladin/configuration.nix index e257310..35639eb 100644 --- a/system/kaladin/configuration.nix +++ b/system/kaladin/configuration.nix @@ -1,11 +1,11 @@ { config, pkgs, ... }: { - imports = - [ - ./hardware-configuration.nix - /etc/nixos/cachix.nix - ]; +imports = + [ + ./hardware-configuration.nix + ]; + nix = { extraOptions = "experimental-features = nix-command flakes"; package = pkgs.nixFlakes;