diff --git a/flake.lock b/flake.lock index c3bf32a..6153286 100644 --- a/flake.lock +++ b/flake.lock @@ -1,26 +1,6 @@ { "nodes": { "home-manager": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1746912617, - "narHash": "sha256-SSw/98B3Htw7iJWCyq08fAEL5w+a/Vj+YbQq0msVFTA=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "9ef92f1c6b77944198fd368ec805ced842352a1d", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { "inputs": { "nixpkgs": [ "zen-browser", @@ -59,24 +39,23 @@ }, "root": { "inputs": { - "home-manager": "home-manager", "nixpkgs": "nixpkgs", "zen-browser": "zen-browser" } }, "zen-browser": { "inputs": { - "home-manager": "home-manager_2", + "home-manager": "home-manager", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1746901443, - "narHash": "sha256-fG5B8lWJqtVPgebXtjoPLhPESkzOnqsM0omKY85/A1M=", + "lastModified": 1746915423, + "narHash": "sha256-6SH9pS5q6Q0oWIfD3UJcfGbQBUMdBbRGbhUJ1skYnTI=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "954c70bb7b27882cccf7e282d304ef894344eee8", + "rev": "2f982bed9845cccffebd0cf267c7e1d3dd98117e", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 6a10ef5..030b399 100644 --- a/flake.nix +++ b/flake.nix @@ -1,35 +1,22 @@ { - description = "NixOS configuration for hypr-nix with Home Manager and zen-browser"; + description = "NixOS configuration for hypr-nix with zen-browser"; inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; - home-manager = { - url = "github:nix-community/home-manager"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - zen-browser = { url = "github:0xc000022070/zen-browser-flake"; inputs.nixpkgs.follows = "nixpkgs"; }; }; - outputs = { self, nixpkgs, home-manager, zen-browser, ... }: { + outputs = { self, nixpkgs, zen-browser, ... }: { nixosConfigurations.hypr-nix = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ ./hosts/hypr-nix/configuration.nix - # Home Manager as a NixOS module - home-manager.nixosModules.home-manager - { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - - home-manager.users.micqdf = import ./home/micqdf.nix; - } ]; specialArgs = { diff --git a/home/micqdf.nix b/home/micqdf.nix index aa4b402..e417792 100644 --- a/home/micqdf.nix +++ b/home/micqdf.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: { +{ pkgs, ... }: { home.username = "micqdf"; home.homeDirectory = "/home/micqdf"; home.stateVersion = "24.11"; @@ -11,10 +11,10 @@ }; home.packages = with pkgs; [ - neovim - firefox - ripgrep - zen-browser.packages.${pkgs.system}.twilight +# neovim +# firefox +# ripgrep + #zen-browser.packages.${pkgs.system}.twilight #zen-browser.packages."${system}".twilight ]; } diff --git a/hosts/hypr-nix/packages.nix b/hosts/hypr-nix/packages.nix index 5308e5d..941b37c 100644 --- a/hosts/hypr-nix/packages.nix +++ b/hosts/hypr-nix/packages.nix @@ -6,6 +6,8 @@ let in { environment.systemPackages = with pkgs; [ + #flakes + zen-browser.packages."${system}".twilight # Text Editors vim sublime