diff --git a/flake.lock b/flake.lock index 08ad7e1..dee9cb2 100644 --- a/flake.lock +++ b/flake.lock @@ -428,22 +428,6 @@ "type": "github" } }, - "nixpkgs_3": { - "locked": { - "lastModified": 1737569578, - "narHash": "sha256-6qY0pk2QmUtBT9Mywdvif0i/CLVgpCjMUn6g9vB+f3M=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "47addd76727f42d351590c905d9d1905ca895b82", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, "nmd": { "flake": false, "locked": { @@ -3373,7 +3357,9 @@ "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_3", + "nixpkgs": [ + "nixpkgs" + ], "systems": "systems_4", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", diff --git a/flake.nix b/flake.nix index c037a2d..42aff25 100644 --- a/flake.nix +++ b/flake.nix @@ -25,14 +25,16 @@ }; # Stylix - stylix.url = "github:danth/stylix/release-24.11"; + stylix = { + url = "github:danth/stylix/release-24.11"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = { self, nixpkgs, home-manager, - helix, nvf, ... } @ inputs: let diff --git a/nixos/modules/boot.nix b/nixos/modules/boot.nix index fca6970..fe009d7 100644 --- a/nixos/modules/boot.nix +++ b/nixos/modules/boot.nix @@ -1,6 +1,12 @@ { boot.loader = { - systemd-boot.enable = true; + systemd-boot = { + enable = true; + extraEntries."ubuntu.conf" = '' + title Ubuntu 22.04 + efi /efi/ubuntu/shimx64.efi + ''; + }; efi.canTouchEfiVariables = true; }; }