diff --git a/flake.lock b/flake.lock index 50b3267..313cda4 100755 --- a/flake.lock +++ b/flake.lock @@ -21,18 +21,36 @@ "type": "github" } }, + "nixos-grub-themes": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1769794759, + "narHash": "sha256-1doG74WkbtUpawduk9f8szyzWsw3Liblrh2z+2jQnw4=", + "owner": "jeslie0", + "repo": "nixos-grub-themes", + "rev": "5e75f9b3ea9061dca6c53d34e166e08bf9ebc7c7", + "type": "github" + }, + "original": { + "owner": "jeslie0", + "repo": "nixos-grub-themes", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1771903837, - "narHash": "sha256-sdaqdnsQCv3iifzxwB22tUwN/fSHoN7j2myFW5EIkGk=", + "lastModified": 1702151865, + "narHash": "sha256-9VAt19t6yQa7pHZLDbil/QctAgVsA66DLnzdRGqDisg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e764fc9a405871f1f6ca3d1394fb422e0a0c3951", + "rev": "666fc80e7b2afb570462423cb0e1cf1a3a34fedd", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-25.11", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -53,10 +71,27 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1771903837, + "narHash": "sha256-sdaqdnsQCv3iifzxwB22tUwN/fSHoN7j2myFW5EIkGk=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "e764fc9a405871f1f6ca3d1394fb422e0a0c3951", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-25.11", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "home-manager": "home-manager", - "nixpkgs": "nixpkgs", + "nixos-grub-themes": "nixos-grub-themes", + "nixpkgs": "nixpkgs_2", "nixpkgs-unstable": "nixpkgs-unstable" } } diff --git a/flake.nix b/flake.nix index 9084cae..ba6f713 100644 --- a/flake.nix +++ b/flake.nix @@ -5,6 +5,7 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; # used for some packages + nixos-grub-themes.url = "github:jeslie0/nixos-grub-themes"; home-manager = { url = "github:nix-community/home-manager/release-25.11"; inputs.nixpkgs.follows = "nixpkgs"; @@ -15,7 +16,7 @@ # url = "github:nix-community/nixvim/nixos-25.11"; # }; - outputs = { self, nixpkgs, nixpkgs-unstable, home-manager,... }@inputs: + outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, nixos-grub-themes, ... }@inputs: let system = "x86_64-linux"; pkgs = nixpkgs.legacyPackages.${system}; diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix index 08c13c0..2d09193 100755 --- a/hosts/laptop/configuration.nix +++ b/hosts/laptop/configuration.nix @@ -15,6 +15,14 @@ ../../modules/nixos/udevsimple.nix ]; + + +# grub theme +boot.loader.grub = { + theme = inputs.nixos-grub-themes.packages.${pkgs.system}.nixos; # if you want to use nixos grub theme +}; + + nix.nixPath = [ "nixpkgs=${inputs.nixpkgs.outPath}" "home-manager=${inputs.home-manager.outPath}" diff --git a/modules/scripts/manix.nix b/modules/scripts/manix.nix index 9ff79c8..2ebad5c 100644 --- a/modules/scripts/manix.nix +++ b/modules/scripts/manix.nix @@ -1,4 +1,4 @@ -{ writeShellApplication, manix, ripgrep, fzf, stdenv, ... }: +{ writeShellApplication, manix, ripgrep, fzf, ... }: let cacheTime = "10"; @@ -10,7 +10,6 @@ writeShellApplication { manix ripgrep fzf - stdenv ]; text = '' CACHE_DIR="''${XDG_CACHE_HOME:-$HOME/.cache}"